[kune-commits] r1156 - in kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client: . resources
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Mon Dec 6 21:15:57 CET 2010
Author: vjrj_
Date: 2010-12-06 21:15:56 +0100 (Mon, 06 Dec 2010)
New Revision: 1156
Added:
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/DefaultStyle.css
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/def-theme-doc-arrow-down.png
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/def-theme-tools-arrow-left.png
Removed:
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/DefaultStyle.css
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.java
Modified:
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java
Log:
NEW - # 3: New Armor UI Binder based
http://kune.ourproject.org/issues/ticket/3
Modified: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-06 18:57:06 UTC (rev 1155)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-06 20:15:56 UTC (rev 1156)
@@ -2,13 +2,8 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:with field='res'
- type='org.ourproject.kune.ws.armor.client.WsArmorResources' />
- <ui:style>
- .outter-margin {
- border: 7px solid white;
- }
- </ui:style>
- <g:DockLayoutPanel ui:field="mainpanel" styleName='{style.outter-margin}'
+ type='org.ourproject.kune.ws.armor.client.resources.WsArmorResources' />
+ <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}'
unit="PX">
<g:north size="20">
<g:FlowPanel ui:field="sitebar" height="20px" styleName='{res.style.siteBar}'>
@@ -26,9 +21,11 @@
</g:FlowPanel>
<g:FlowPanel width="100%" height="38px"
styleName="{res.style.docHeader}" ui:field="docHeader">
+
</g:FlowPanel>
<g:FlowPanel width="100%" height="60px"
styleName="{res.style.docSubheader}" ui:field="docSubheader">
+ <g:Image resource='{res.defThemeDocArrowDown}' styleName='{res.style.docHeaderArrow}'/>
</g:FlowPanel>
</g:VerticalPanel>
</g:north>
Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/DefaultStyle.css
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/DefaultStyle.css 2010-12-06 18:57:06 UTC (rev 1155)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/DefaultStyle.css 2010-12-06 20:15:56 UTC (rev 1156)
@@ -1,150 +0,0 @@
- at CHARSET "UTF-8";
-
- at external .gwt-*;
-.floatLeft {
- float: left;
-}
-
-.floatRight {
- float: right;
-}
-
-.siteBar {
- overflow: hidden;
-}
-
-.entityHeader {
- -webkit-border-top-left-radius: 10px;
- -moz-border-top-left-radius: 10px;
- border-top-left-radius: 10px;
- background-color: #f4e3d7;
- overflow: hidden;
-}
-
-.entityFooter {
- -webkit-border-bottom-left-radius: 10px;
- -moz-border-bottom-left-radius: 10px;
- border-top-bottom-radius: 10px;
- background-color: #f7ebe3;
- padding: 7px 10px 0px 17px;
- overflow: hidden;
-}
-
-.entityFooter span {
- color: #784421;
- font-size: 16px;
- font-weight: bold;
-}
-
-.entityHeader span {
- font-size: 56px;
- color: #550000;
- font-weight: bold;
- margin-left: 15px;
- font: 'UbuntuBold', Arial;
-}
-
-.docHeader {
- background-color: #c87137;
- overflow: hidden;
-}
-
-.docHeader span {
- color: #FFF;
- font-size: 28px;
- font-weight: bold;
- margin-left: 15px;
- font: 'UbuntuBold', Arial;
-}
-
-.docSubheader {
- background-color: #f7ebe3;
- padding: 15px 0 0 15px;
- overflow: hidden;
-}
-
-.docSubheader span {
- color: #784421;
- font-size: 20px;
- font-weight: bold;
-}
-
-.docEditorMargin {
- background-color: #f7ebe3;
-}
-
-.docEditor {
- background-color: #FFF;
- border-left: 1px solid #959595;
- border-right: 1px solid #959595;
- border-top: 1px solid #959595;
- -webkit-border-top-left-radius: 7px;
- -moz-border-top-left-radius: 7px;
- border-top-left-radius: 7px;
- -webkit-border-top-right-radius: 7px;
- -moz-border-top-right-radius: 7px;
- border-top-right-radius: 7px;
- padding: 5px;
-}
-
-.docFooter {
- border-left: 1px solid #959595;
- border-right: 1px solid #959595;
- border-bottom: 1px solid #959595;
- background-color: #e3dbdb;
- -webkit-border-bottom-left-radius: 7px;
- -moz-border-bottom-left-radius: 7px;
- border-bottom-left-radius: 7px;
- -webkit-border-bottom-right-radius: 7px;
- -moz-border-bottom-right-radius: 7px;
- border-bottom-right-radius: 7px;
- padding: 7px 7px 0 7px;
- overflow: hidden;
-}
-
-.docFooter span {
- color: #784421;
- font-size: 16px;
- font-weight: bold;
-}
-
-.entityTools {
- -webkit-border-top-right-radius: 10px;
- -moz-border-top-right-radius: 10px;
- border-top-right-radius: 10px;
- -webkit-border-bottom-right-radius: 10px;
- -moz-border-bottom-right-radius: 10px;
- border-bottom-right-radius: 10px;
- background-color: #DEAA87;
-}
-
-.entityToolsNorth {
- margin: 10px;
-}
-
-.entityToolsNorth span {
- color: #a05a2c;
- font-size: 20px;
- font-weight: bold;
-}
-
-.entityToolsCenter {
- margin: 10px;
-}
-
-.entityToolsCenter span {
- color: #FFF;
- font-size: 22px;
- font-weight: bold;
-}
-
-.entityToolsSouth {
- border-top: 2px solid #FFF;
- padding: 10px;
-}
-
-.entityToolsSouth span {
- color: #a05a2c;
- font-size: 20px;
- font-weight: bold;
-}
\ No newline at end of file
Modified: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java 2010-12-06 18:57:06 UTC (rev 1155)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java 2010-12-06 20:15:56 UTC (rev 1156)
@@ -1,5 +1,7 @@
package org.ourproject.kune.ws.armor.client;
+import org.ourproject.kune.ws.armor.client.resources.WsArmorResources;
+
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.RootLayoutPanel;
@@ -28,7 +30,9 @@
armor.getEntityToolsSouth().add(new InlineLabel("Group tags"));
armor.getEntityHeader().add(new InlineLabel("Name of the Initiative"));
armor.getDocHeader().add(new InlineLabel("Some doc title"));
- armor.getDocSubheader().add(new InlineLabel("Editors:"));
+ final InlineLabel editors = new InlineLabel("Editors:");
+ editors.addStyleName(resources.style().docSubheaderLeft());
+ armor.getDocSubheader().add(editors);
armor.getDocFooter().add(new InlineLabel("Tags:"));
armor.getEntityFooter().add(new InlineLabel("Rate it:"));
rootPanel.add(armor);
Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.java
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.java 2010-12-06 18:57:06 UTC (rev 1155)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.java 2010-12-06 20:15:56 UTC (rev 1156)
@@ -1,44 +0,0 @@
-package org.ourproject.kune.ws.armor.client;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.CssResource;
-
-public interface WsArmorResources extends ClientBundle {
- public interface Style extends CssResource {
-
- String docEditor();
-
- String docEditorMargin();
-
- String docFooter();
-
- String docHeader();
-
- String docSubheader();
-
- String entityFooter();
-
- String entityHeader();
-
- String entityTools();
-
- String entityToolsCenter();
-
- String entityToolsNorth();
-
- String entityToolsSouth();
-
- String floatLeft();
-
- String floatRight();
-
- String siteBar();
-
- }
-
- public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class);
-
- @Source("DefaultStyle.css")
- Style style();
-}
\ No newline at end of file
Copied: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/DefaultStyle.css (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/DefaultStyle.css)
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/DefaultStyle.css (rev 0)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/DefaultStyle.css 2010-12-06 20:15:56 UTC (rev 1156)
@@ -0,0 +1,166 @@
+ at CHARSET "UTF-8";
+
+ at external .*;
+.floatLeft {
+ float: left;
+}
+
+.mainPanel {
+ border: 7px solid white;
+}
+
+.floatRight {
+ float: right;
+}
+
+.siteBar {
+ overflow: hidden;
+}
+
+.entityHeader {
+ -webkit-border-top-left-radius: 10px;
+ -moz-border-top-left-radius: 10px;
+ border-top-left-radius: 10px;
+ background-color: #f4e3d7;
+ overflow: hidden;
+}
+
+.entityFooter {
+ -webkit-border-bottom-left-radius: 10px;
+ -moz-border-bottom-left-radius: 10px;
+ border-top-bottom-radius: 10px;
+ background-color: #f7ebe3;
+ padding: 7px 10px 0px 17px;
+ overflow: hidden;
+}
+
+.entityFooter span {
+ color: #784421;
+ font-size: 16px;
+ font-weight: bold;
+}
+
+.entityHeader span {
+ font-size: 56px;
+ margin-left: 15px;
+ color: #550000;
+ font-weight: bold;
+ font: 'UbuntuBold', Arial;
+}
+
+.docHeader {
+ background-color: #c87137;
+ overflow: hidden;
+}
+
+.docHeaderArrow {
+ position: relative;
+ z-index: 10;
+ top: -25px;
+ left: 10px;
+}
+
+.docHeader span {
+ color: #FFF;
+ font-size: 28px;
+ font-weight: bold;
+ margin-left: 15px;
+ font: 'UbuntuBold', Arial;
+}
+
+.docSubheader {
+ background-color: #f7ebe3;
+ padding: 15px 0 0 15px;
+ overflow: hidden;
+}
+
+.docSubheaderLeft {
+ position: relative;
+ top: 0;
+ left: -30px;
+}
+.docSubheader span {
+ color: #784421;
+ font-size: 20px;
+ font-weight: bold;
+}
+
+.docEditorMargin {
+ background-color: #f7ebe3;
+}
+
+.docEditor {
+ background-color: #FFF;
+ border-left: 1px solid #959595;
+ border-right: 1px solid #959595;
+ border-top: 1px solid #959595;
+ -webkit-border-top-left-radius: 7px;
+ -moz-border-top-left-radius: 7px;
+ border-top-left-radius: 7px;
+ -webkit-border-top-right-radius: 7px;
+ -moz-border-top-right-radius: 7px;
+ border-top-right-radius: 7px;
+ padding: 5px;
+}
+
+.docFooter {
+ border-left: 1px solid #959595;
+ border-right: 1px solid #959595;
+ border-bottom: 1px solid #959595;
+ background-color: #e3dbdb;
+ -webkit-border-bottom-left-radius: 7px;
+ -moz-border-bottom-left-radius: 7px;
+ border-bottom-left-radius: 7px;
+ -webkit-border-bottom-right-radius: 7px;
+ -moz-border-bottom-right-radius: 7px;
+ border-bottom-right-radius: 7px;
+ padding: 7px 7px 0 7px;
+ overflow: hidden;
+}
+
+.docFooter span {
+ color: #784421;
+ font-size: 16px;
+ font-weight: bold;
+}
+
+.entityTools {
+ -webkit-border-top-right-radius: 10px;
+ -moz-border-top-right-radius: 10px;
+ border-top-right-radius: 10px;
+ -webkit-border-bottom-right-radius: 10px;
+ -moz-border-bottom-right-radius: 10px;
+ border-bottom-right-radius: 10px;
+ background-color: #DEAA87;
+}
+
+.entityToolsNorth {
+ margin: 10px;
+}
+
+.entityToolsNorth span {
+ color: #a05a2c;
+ font-size: 20px;
+ font-weight: bold;
+}
+
+.entityToolsCenter {
+ margin: 10px;
+}
+
+.entityToolsCenter span {
+ color: #FFF;
+ font-size: 22px;
+ font-weight: bold;
+}
+
+.entityToolsSouth {
+ border-top: 2px solid #FFF;
+ padding: 10px;
+}
+
+.entityToolsSouth span {
+ color: #a05a2c;
+ font-size: 20px;
+ font-weight: bold;
+}
\ No newline at end of file
Copied: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.java)
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java (rev 0)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java 2010-12-06 20:15:56 UTC (rev 1156)
@@ -0,0 +1,56 @@
+package org.ourproject.kune.ws.armor.client.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+
+public interface WsArmorResources extends ClientBundle {
+ public interface Style extends CssResource {
+
+ String docEditor();
+
+ String docEditorMargin();
+
+ String docFooter();
+
+ String docHeader();
+
+ String docHeaderArrow();
+
+ String docSubheader();
+
+ String docSubheaderLeft();
+
+ String entityFooter();
+
+ String entityHeader();
+
+ String entityTools();
+
+ String entityToolsCenter();
+
+ String entityToolsNorth();
+
+ String entityToolsSouth();
+
+ String floatLeft();
+
+ String floatRight();
+
+ String mainPanel();
+
+ String siteBar();
+ }
+
+ public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class);
+
+ @Source("def-theme-doc-arrow-down.png")
+ ImageResource defThemeDocArrowDown();
+
+ @Source("def-theme-tools-arrow-left.png")
+ ImageResource defThemeToolsArrowLeft();
+
+ @Source("DefaultStyle.css")
+ Style style();
+}
\ No newline at end of file
Added: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/def-theme-doc-arrow-down.png
===================================================================
(Binary files differ)
Property changes on: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/def-theme-doc-arrow-down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/def-theme-tools-arrow-left.png
===================================================================
(Binary files differ)
Property changes on: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/def-theme-tools-arrow-left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the kune-commits
mailing list