You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/11/16 09:27:59 UTC
svn commit: r880658 - in /ofbiz/trunk: applications/accounting/widget/
applications/accounting/widget/ap/ applications/accounting/widget/ar/
applications/product/widget/catalog/ framework/common/widget/
framework/webtools/widget/ themes/bizznesstime/we...
Author: jleroux
Date: Mon Nov 16 08:27:36 2009
New Revision: 880658
URL: http://svn.apache.org/viewvc?rev=880658&view=rev
Log:
Reverted changes 836044 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
Modified:
ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
ofbiz/trunk/framework/common/widget/CommonMenus.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/Menus.xml
ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml Mon Nov 16 08:27:36 2009
@@ -29,16 +29,11 @@
<widgets>
<!-- main defines the regions of the HTML page -->
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <widgets>
- <include-menu name="PaymentGatewayConfigTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
+ <!-- body is the primary display for this page and is called recursively -->
<decorator-section name="body">
<section>
<widgets>
+ <include-menu name="PaymentGatewayConfigTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Mon Nov 16 08:27:36 2009
@@ -30,19 +30,13 @@
<widgets>
<!-- main defines the regions of the HTML page -->
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
+ <!-- body is the primary display for this page and is called recursively -->
+ <decorator-section name="body">
<section>
<widgets>
<include-menu name="TransactionsTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
- <!-- body is the primary display for this page and is called recursively -->
- <decorator-section name="body">
- <section>
- <widgets>
- <label style="h1">${uiLabelMap[labelTitleProperty]}</label>
+ <label style="h1">${uiLabelMap[labelTitleProperty]}</label>
<!-- Now call the SimpleScreen form -->
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Mon Nov 16 08:27:36 2009
@@ -219,17 +219,11 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
+ <decorator-section name="body">
<section>
<widgets>
<include-menu location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/>
<container style="clear"/>
- </widgets>
- </section>
- </decorator-section>
- <decorator-section name="body">
- <section>
- <widgets>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -337,17 +331,10 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <widgets>
- <include-menu name="ApReportTabBar" location="component://accounting/widget/ap/ApMenus.xml"/>
- <container style="clear"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<widgets>
+ <include-menu name="ApReportTabBar" location="component://accounting/widget/ap/ApMenus.xml"/>
<container style="clear"/>
<decorator-section-include name="body"/>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Mon Nov 16 08:27:36 2009
@@ -106,16 +106,10 @@
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <widgets>
- <include-menu name="ArPaymentTabBar" location="component://accounting/widget/ar/ArMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<widgets>
+ <include-menu name="ArPaymentTabBar" location="component://accounting/widget/ar/ArMenus.xml"/>
<decorator-section-include name="body"/>
</widgets>
</section>
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Mon Nov 16 08:27:36 2009
@@ -32,18 +32,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for CATALOG, _VIEW permission -->
- <condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <!-- add Create Product and View Product (in ecommerce) links -->
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -51,6 +39,7 @@
<if-has-permission permission="CATALOG" action="_VIEW"/>
</condition>
<widgets>
+ <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
<!-- add Create Product and View Product (in ecommerce) links -->
<container style="no-clear">
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Mon Nov 16 08:27:36 2009
@@ -29,22 +29,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for CATALOG, _VIEW permission -->
- <condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition><not><if-empty field="productPromoId"/></not></condition>
- <widgets>
- <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- </widgets>
- </section>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -55,6 +39,8 @@
<section>
<condition><not><if-empty field="productPromoId"/></not></condition>
<widgets>
+ <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label>
</container>
Modified: ofbiz/trunk/framework/common/widget/CommonMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonMenus.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonMenus.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonMenus.xml Mon Nov 16 08:27:36 2009
@@ -28,5 +28,5 @@
</menu>
<menu name="CommonTabBarMenu" selected-menuitem-context-field-name="tabButtonItem" type="simple"
- menu-container-style="tab-bar" default-selected-style="selected"/>
+ menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected"/>
</menus>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Mon Nov 16 08:27:36 2009
@@ -196,9 +196,6 @@
<!-- render messages -->
<platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific>
-
- <decorator-section-include name="tabbar"/>
-
<container style="contentarea">
<!-- may be used by sight disabled persons to skip directly to content area-->
<decorator-section-include name="pre-body"/>
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Mon Nov 16 08:27:36 2009
@@ -81,7 +81,6 @@
<actions>
<set field="headerItem" value="main"/>
<set field="titleProperty" value="WebtoolsCertsX509"/>
- <set field="tabButtonItem" value="myCertificates"/>
</actions>
<widgets>
<decorator-screen name="CommonConfigurationDecorator" location="component://webtools/widget/CommonScreens.xml">
@@ -100,17 +99,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="ENTITY_MAINT"/>
- </condition>
- <widgets>
- <include-menu name="EntityTabBar" location="component://webtools/widget/Menus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -118,6 +106,7 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
+ <include-menu name="EntityTabBar" location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -137,17 +126,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="WEBTOOLS" action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu name="serviceTabBar" location="component://webtools/widget/Menus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -155,6 +133,7 @@
<if-has-permission permission="WEBTOOLS" action="_VIEW"/>
</condition>
<widgets>
+ <include-menu name="serviceTabBar" location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -174,17 +153,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="ENTITY_MAINT"/>
- </condition>
- <widgets>
- <include-menu name="importExportTabBar" location="component://webtools/widget/Menus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -192,6 +160,7 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
+ <include-menu name="importExportTabBar" location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -211,17 +180,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="ENTITY_MAINT"/>
- </condition>
- <widgets>
- <include-menu name="artifactTabBar" location="component://webtools/widget/Menus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -229,6 +187,7 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
+ <include-menu name="artifactTabBar" location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -248,17 +207,6 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="ENTITY_MAINT"/>
- </condition>
- <widgets>
- <include-menu name="configurationTabBar" location="component://webtools/widget/Menus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -266,6 +214,7 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
+ <include-menu name="configurationTabBar" location="component://webtools/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Mon Nov 16 08:27:36 2009
@@ -27,22 +27,13 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="tabbar">
- <section>
- <condition>
- <if-has-permission permission="WEBTOOLS" action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu location="component://webtools/widget/Menus.xml" name="LoggingTabBar"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="body">
<section>
<condition>
<if-has-permission permission="WEBTOOLS" action="_VIEW"/>
</condition>
<widgets>
+ <include-menu location="component://webtools/widget/Menus.xml" name="LoggingTabBar"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Mon Nov 16 08:27:36 2009
@@ -61,7 +61,7 @@
</menu>
<menu name="importExportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="tabButtonItem">
+ selected-menuitem-context-field-name="page.tabButtonItem">
<menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
<link target="viewdatafile"/>
</menu-item>
Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Mon Nov 16 08:27:36 2009
@@ -42,7 +42,6 @@
<actions>
<set field="headerItem" value="main"/>
<set field="titleProperty" value="WebtoolsDataFileMainTitle"/>
- <set field="tabButtonItem" value="data"/>
<script location="component://webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy"/>
</actions>
<widgets>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Mon Nov 16 08:27:36 2009
@@ -53,7 +53,6 @@
<actions>
<set field="tabMenuItem" value="findExpression"/>
<set field="titleProperty" value="${titleProperty}" default-value="TemporalExpressionFind"/>
- <set field="tabButtonItem" value="tempexpr"/>
</actions>
<widgets>
<decorator-screen name="TemporalExpressionDecorator" location="${parameters.tempExprDecoratorLocation}">
Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Mon Nov 16 08:27:36 2009
@@ -756,12 +756,12 @@
Tab Bar Navigation
***********************************************/
.tab-bar {
- margin:0px 0px 10px 220px;
+ margin:0px 0px 10px 0px;
background:url(../images/wr.png) top right no-repeat;
padding-right:18px;
float:left;
clear:both;
- width:80%;
+ width:95%;
display:inline;
}
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Mon Nov 16 08:27:36 2009
@@ -1418,18 +1418,12 @@
/* tab-bar decorator intended to be used at
the top of the main content area */
.tab-bar {
- margin-left:7px;
- margin-right:7px;
- padding-left: 10px;
- padding-bottom:5px;
- background-color: #FFFFFF;
+ display: table;
}
.tab-bar ul li {
- float: left;
background-color: #0366b0;
margin: 0;
- padding: 0.1em 0.4em 0.1em 0.4em;
}
.tab-bar ul a,.tab-bar ul a:visited {
Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=880658&r1=880657&r2=880658&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Mon Nov 16 08:27:36 2009
@@ -1427,16 +1427,14 @@
the top of the main content area */
.tab-bar {
display:table;
-margin-left:10px;
}
.tab-bar ul li {
-float: left;
background-color: #0366b0;
border-right: 0.1em solid #5f9fcf;
border-bottom: 0.1em solid #5f9fcf;
-padding: 0.1em 0.4em 0.1em 0.4em;
margin: 0;
+padding: 0;
}
.tab-bar ul a,