svn commit: r544095 - in /ofbiz/trunk/framework: common/widget/CommonScreens.xm
Locked
 
|
Author: jacopoc
Date: Mon Jun 4 02:00:50 2007 New Revision: 544095 URL: http://svn.apache.org/viewvc?view=rev&rev=544095 Log: Applied patch from Adrian Crum to simplify outermost HTML containers: OFBIZ-1061 Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/images/webapp/images/maincss.css Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?view=diff&rev=544095&r1=544094&r2=544095 ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Mon Jun 4 02:00:50 2007 @@ -108,32 +108,30 @@ <!-- render appbar --> <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific> - <container style="centerarea"> - <!-- render appheader: both menu widget style and ftl template style menus are supported--> - <section> - <condition> - <if-empty field-name="applicationMenuName"/> - </condition> - <widgets> - <platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific> - </widgets> - <fail-widgets> - <label style="apptitle">${applicationTitle}</label> - <include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/> - </fail-widgets> - </section> - <container style="contentarea"> - <container id="column-container"> - <!-- by default will render left-bar only if leftbarScreen value not empty --> - <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> + <!-- render appheader: both menu widget style and ftl template style menus are supported--> + <section> + <condition> + <if-empty field-name="applicationMenuName"/> + </condition> + <widgets> + <platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific> + </widgets> + <fail-widgets> + <label style="apptitle">${applicationTitle}</label> + <include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/> + </fail-widgets> + </section> + <container style="contentarea"> + <container id="column-container"> + <!-- by default will render left-bar only if leftbarScreen value not empty --> + <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> - <container id="content-main-section" style="${MainColumnStyle}"> - <!-- render messages --> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> - <decorator-section-include name="body"/> - </container> - <container style="clear"></container> + <container id="content-main-section" style="${MainColumnStyle}"> + <!-- render messages --> + <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <decorator-section-include name="body"/> </container> + <container style="clear"></container> </container> </container> Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?view=diff&rev=544095&r1=544094&r2=544095 ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Mon Jun 4 02:00:50 2007 @@ -228,25 +228,6 @@ font-size: 1.1em; } -.headerboxoutside { -background-color: #FFFFFF; -} - -.headerboxtop { -background-color: #FFFFFF; -border-color: #FFFFFF; -border-style: solid; -border-width: 0.1em 0.1em 0 0.1em; -padding: 0.4em; -} - -.headerboxbottom { -background-color: #FFFFFF; -border-color: #FFFFFF; -border-style: solid; -border-width: 0 0.1em 0.1em 0.1em; -} - .boxhead { color: #FFFFFF; font-size: 1.1em; @@ -581,82 +562,6 @@ padding-left: 1em; } -.headerCenter { -background-color: #B4B0AA; -color: #000000; -font-weight: bold; -padding-right: 1em; -padding-left: 1em; -} - -A.headerCenter { -background-color: #D4D0C8; -color: #000099; -font-weight: bold; -padding-right: 1em; -padding-left: 1em; -} - -A.headerCenter:hover { -background-color: #D4D0C8; -color: #000000; -} - -.headerCenterSelected { -background-color: #D4D0C8; -color: #000000; -font-size: 1.1em; -font-weight: bold; -padding-right: 1em; -padding-left: 1em; -} - -.headerCompanyName { -color: #000099; -font-size: 1.6em; -font-weight: bold; -white-space: nowrap; -} - -.headerCompanySubtitle { -color: #330099; -font-size: 0.8em; -white-space: nowrap; -} - -.insideHeaderText { -color: #000000; -font-weight: bold; -} - -A.insideHeaderLink { -color: #000099; -} - -A.insideHeaderLink:hover { -color: #000000; -} - -.insideHeaderDisabled { -color: #666666; -font-weight: bold; -} - -.headersmalltext { -color: #000000; -font-size: 1.1em; -font-weight: bold; -} - -a.headersmalllink { -font-size: 1.1em; -color: #000099; -} - -a.headersmalllink:hover { -color: #ff0000; -} - hr, .sepbar { /* .sepbar deprecated */ background-color: #999999; @@ -678,50 +583,6 @@ font-weight: bold; } -.ontab { -background-color: #000000; -border-style: inset; -border-width: 0.3em; -font-size: 1.1em; -padding: 0.2em; -} - -a.onlnk { -color: #FFFFFF; -font-size: 1.1em; -padding: 0.2em; -} - -.offtab { -background-color: #CCCCCC; -border-style: outset; -border-width: 0.3em; -padding: 0.2em; -} - -a.offlnk { -color: #000099; -padding: 0.2em; -} - -a.offlnk:hover { -color: #ff0000; -} - -.areaheader { -background-color: #000000; -color: #FFFFFF; -font-weight: bold; -padding: 0.2em; -width: 100%; -} - -.edittable { -border-color: #000000 #000000 #003333; -border-style: solid; -border-width: thin; -} - .viewOneTR1 { background-color: #B4B0AA; } @@ -730,10 +591,6 @@ background-color: #D4D0C8; } -.viewManyHeaderTR { -background-color: #99CCFF; -} - .viewManyTR1 { background-color: #D4D0C8; } @@ -742,13 +599,6 @@ background-color: #FFFFFF; } -.editInputBox { -background-color: #ffffff; -border: #999999 solid 0.1em; -font-size: 1.1em; -margin: 0.2em; -} - .radioButton { background-color: #FFFFFF; font-size: 1.1em; @@ -788,25 +638,6 @@ color: #ff0000; } -/* Form layout styles to simulate a table-style layout */ -.form-row { -clear: both; -padding-top: 0.2em; -} - -.form-label { -float: left; -padding-top: 0.5em; -text-align: right; -width: 18em; -} - -.form-field { -float: left; -margin-left: 1em; -text-align: left; -} - /* ===== Product Summary Styles ===== */ .product-prevnext { text-align: right; @@ -947,12 +778,6 @@ font-weight: bold; } -DIV.centerarea { -margin-left: 1em; -margin-right: 1em; -margin-top: 1em; -} - .appbar { background-color: #ffffff; } @@ -965,65 +790,6 @@ background-color: #000000; } -.mainblock { -background-color: #D4D0C8; -vertical-align: top; -} - -.tabdownblock { -background-color: #B4B0AA; -} - -.tabdowncenter { -background-color: #B4B0AA; -background-image: url(/images/tabs/tab_down_fill.gif); -color: #000000; -font-size: 1.05em; -text-align: center; -vertical-align: middle; -} - -.tabdownleft { -background-color: #B4B0AA; -background-image: url(/images/tabs/tab_down_left.gif); -} - -.tabdownright { -background-color: #B4B0AA; -background-image: url(/images/tabs/tab_down_right.gif); -} - -.tabupcenter { -background-color: #D4D0C8; -background-image: url(/images/tabs/tab_up_fill.gif); -color: #000000; -font-size: 1.05em; -text-align: center; -vertical-align: middle; -} - -.tabupleft { -background-color: #D4D0C8; -background-image: url(/images/tabs/tab_up_left.gif); -border: 0; -} - -.tabupright { -background-color: #D4D0C8; -background-image: url(/images/tabs/tab_up_right.gif); -} - -A.tablink, A.tablink:hover, A.tablinkselected, A.tablinkselected:hover { -color: #000000; -font-size: 1.05em; -text-align: center; -text-decoration: none; -} - -A.tablink:hover,A.tablink:active,A.tablinkselected { -color: #000099; -} - .apptitle { background-color: #000099; color: #FFFFFF; @@ -1064,7 +830,7 @@ DIV.contentarea { background-color: #FFFFFF; border: solid #000000 0.1em; -margin-top: 1em; +margin: 1em; padding: 1em; } @@ -1341,6 +1107,7 @@ background-repeat: repeat-y; border: 0.1em solid #69a9d9; height: 1%; /* IE fix */ +margin: 1em; } #app-navigation h1, |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |