Author: vjrj_ Date: 2010-12-06 16:42:29 +0100 (Mon, 06 Dec 2010) New Revision: 1154 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/DefaultStyle.css kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.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 14:47:07 UTC (rev 1153) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-06 15:42:29 UTC (rev 1154) @@ -50,10 +50,16 @@ </g:VerticalPanel> </g:north> <g:center> - <g:DockLayoutPanel unit="PX"> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.docEditorMargin}"> + <g:west size="15"> + <g:HTMLPanel /> + </g:west> + <g:east size="15"> + <g:HTMLPanel /> + </g:east> <g:center> - <g:ScrollPanel - addStyleNames="{res.style.docEditor} {res.style.docEditorMargin}"> + <g:ScrollPanel styleName="{res.style.docEditor}"> <g:HTML wordWrap="true" width="100%" height="100%">吗 台湾 六种辅音韵尾 @@ -327,20 +333,22 @@ 晋语</g:HTML> </g:ScrollPanel> </g:center> - <g:south size="69.0"> - <g:VerticalPanel height="69px" width="100%"> + <g:south size="33.0"> + <g:VerticalPanel height="33px" width="100%"> <g:HorizontalPanel width="100%" height="33"> <g:InlineLabel text="New InlineLabel" /> </g:HorizontalPanel> - <g:HorizontalPanel height="36" - width="100%"> - <g:InlineLabel text="New InlineLabel" /> - </g:HorizontalPanel> </g:VerticalPanel> </g:south> </g:DockLayoutPanel> </g:center> + <g:south size="36"> + <g:HorizontalPanel height="36px" width="100%" + styleName="{res.style.entityFooter}"> + <g:InlineLabel text="New InlineLabel" /> + </g:HorizontalPanel> + </g:south> </g:DockLayoutPanel> </g:center> <g:east size="200.0"> Modified: 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 14:47:07 UTC (rev 1153) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/DefaultStyle.css 2010-12-06 15:42:29 UTC (rev 1154) @@ -8,6 +8,18 @@ background-color: #f4e3d7; } +.entityFooter { + -webkit-border-bottom-left-radius: 10px; + -moz-border-bottom-left-radius: 10px; + border-top-bottom-radius: 10px; + background-color: #f7ebe3; +} + +.entityFooter span { + color: #784421; + font-size: 16px; +} + .entityHeader span { font-size: 56px; color: #550000; @@ -29,19 +41,19 @@ } .docAuth { - background-color: #f7ebe3; + background-color: #f7ebe3; } .docAuth span { - color: #784421; - font-size: 20px; - font-weight: bold; - margin: 15px 0 0 15px; + color: #784421; + font-size: 20px; + font-weight: bold; + margin: 15px 0 0 15px; } .docEditorMargin { -background-color: #f7ebe3; -padding: 0 15px; + background-color: #f7ebe3; + padding: 15px; } .docEditor { @@ -52,12 +64,21 @@ border-radius: 7px; } +.docFooter { + background-color: #e3dbdb; +} + +.docFooter span { + color: #784421; + font-size: 16px; +} + .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; + -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; } \ No newline at end of file Modified: 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 14:47:07 UTC (rev 1153) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmorResources.java 2010-12-06 15:42:29 UTC (rev 1154) @@ -12,8 +12,12 @@ String docEditorMargin(); + String docFooter(); + String docTitle(); + String entityFooter(); + String entityHeader(); String entityTools();