Author: jleroux
Date: Fri Nov 13 22:47:44 2009
New Revision: 836044
URL: http://svn.apache.org/viewvc?rev=836044&view=rev
Log:
A patch from Bruno Busco "A new droppingcrumbs theme"
(https://issues.apache.org/jira/browse/OFBIZ-3156) - OFBIZ-3156
An updated patch to be used to show correctly the tabbars with this theme.
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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
Fri Nov 13 22:47:44 2009
@@ -29,11 +29,16 @@
<widgets>
<!-- main defines the regions of the HTML page -->
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <!-- body is the primary display for this page and is called
recursively -->
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<widgets>
<include-menu
name="PaymentGatewayConfigTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <widgets>
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Fri Nov
13 22:47:44 2009
@@ -30,13 +30,19 @@
<widgets>
<!-- main defines the regions of the HTML page -->
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <!-- body is the primary display for this page and is called
recursively -->
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<widgets>
<include-menu name="TransactionsTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
- <label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
+ <!-- body is the primary display for this page and is
called recursively -->
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Fri Nov 13
22:47:44 2009
@@ -219,11 +219,17 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<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>
@@ -331,11 +337,18 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <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>
+ <container style="clear"/>
<decorator-section-include name="body"/>
</widgets>
</section>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Fri Nov 13
22:47:44 2009
@@ -106,10 +106,16 @@
<section>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <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>
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Nov
13 22:47:44 2009
@@ -32,7 +32,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for CATALOG, _VIEW permission -->
<condition>
@@ -41,6 +41,17 @@
<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 -->
+ <condition>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <!-- add Create Product and View Product (in
ecommerce) links -->
<container style="no-clear">
<decorator-section-include name="body"/>
</container>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Fri Nov 13
22:47:44 2009
@@ -29,7 +29,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for CATALOG, _VIEW permission -->
<condition>
@@ -40,7 +40,21 @@
<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 -->
+ <condition>
+ <if-has-permission permission="CATALOG"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty
field="productPromoId"/></not></condition>
+ <widgets>
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonMenus.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonMenus.xml Fri Nov 13 22:47:44 2009
@@ -28,5 +28,5 @@
</menu>
<menu name="CommonTabBarMenu"
selected-menuitem-context-field-name="tabButtonItem" type="simple"
- menu-container-style="button-bar tab-bar no-clear"
default-selected-style="selected"/>
+ menu-container-style="tab-bar" 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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Nov 13 22:47:44
2009
@@ -196,6 +196,9 @@
<!-- 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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Fri Nov 13 22:47:44
2009
@@ -81,6 +81,7 @@
<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">
@@ -99,7 +100,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
<condition>
@@ -107,6 +108,16 @@
</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 -->
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -126,7 +137,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
<condition>
@@ -134,6 +145,16 @@
</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 -->
+ <condition>
+ <if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -153,7 +174,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
<condition>
@@ -161,6 +182,16 @@
</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 -->
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -180,7 +211,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
<condition>
@@ -188,6 +219,16 @@
</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 -->
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -207,7 +248,7 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="tabbar">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
<condition>
@@ -215,6 +256,16 @@
</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 -->
+ <condition>
+ <if-has-permission permission="ENTITY_MAINT"/>
+ </condition>
+ <widgets>
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Fri Nov 13 22:47:44
2009
@@ -27,13 +27,22 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <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>
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Fri Nov 13 22:47:44 2009
@@ -61,7 +61,7 @@
</menu>
<menu name="importExportTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="page.tabButtonItem">
+ selected-menuitem-context-field-name="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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Fri Nov 13 22:47:44
2009
@@ -42,6 +42,7 @@
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Fri Nov 13
22:47:44 2009
@@ -53,6 +53,7 @@
<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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Fri Nov
13 22:47:44 2009
@@ -756,12 +756,12 @@
Tab Bar Navigation
***********************************************/
.tab-bar {
- margin:0px 0px 10px 0px;
+ margin:0px 0px 10px 220px;
background:url(../images/wr.png) top right no-repeat;
padding-right:18px;
float:left;
clear:both;
- width:95%;
+ width:80%;
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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Fri Nov 13 22:47:44
2009
@@ -1418,12 +1418,18 @@
/* tab-bar decorator intended to be used at
the top of the main content area */
.tab-bar {
- display: table;
+ margin-left:7px;
+ margin-right:7px;
+ padding-left: 10px;
+ padding-bottom:5px;
+ background-color: #FFFFFF;
}
.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=836044&r1=836043&r2=836044&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Fri Nov 13 22:47:44
2009
@@ -1427,14 +1427,16 @@
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,
