OFBiz › OFBiz - Commits

svn commit: r902175 - in /ofbiz/trunk/applications: accounting/widget/ content/widget/content/ product/webapp/catalog/feature/ product/widget/catalog/ product/widget/facility/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r902175 - in /ofbiz/trunk/applications: accounting/widget/ content/widget/content/ product/webapp/catalog/feature/ product/widget/catalog/ product/widget/facility/

Author: buscob
Date: Fri Jan 22 17:00:55 2010
New Revision: 902175

URL: http://svn.apache.org/viewvc?rev=902175&view=rev
Log:
Added several "button-bar" wrapping divs to have button bars rendered consistently.
Added several "create" class styles for create/new buttons.
All this will be used in a new theme me and Erik Schuessler are working on...

Modified:
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Jan 22 17:00:55 2010
@@ -157,7 +157,7 @@
</menu>

<menu name="InvoiceSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
- <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" >
+ <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create">
<link target="newInvoice"/>
</menu-item>
<menu-item name="copyInvoice" title="${uiLabelMap.CommonCopy}">
@@ -393,7 +393,7 @@
<actions>
<set field="isDisbursement" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/>
</actions>
- <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}">
+ <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create" >
<condition>
<not><if-empty field="payment.paymentId"/></not>
</condition>
@@ -501,7 +501,7 @@

<menu name="PaymentGroupSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
- <menu-item name="createNew" title="${uiLabelMap.AccountingCreateNewPaymentGroup}">
+ <menu-item name="createNew" title="${uiLabelMap.AccountingCreateNewPaymentGroup}" widget-style="buttontext create">
<condition>
<not><if-empty field="paymentGroup"/></not>
</condition>

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Fri Jan 22 17:00:55 2010
@@ -94,7 +94,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext"/>
+ <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext create"/>
</container>
</decorator-section>
<decorator-section name="search-options">

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Fri Jan 22 17:00:55 2010
@@ -81,7 +81,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditBillingAccount" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
+ <link target="EditBillingAccount" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/>
</container>
</decorator-section>
<decorator-section name="search-options">

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Fri Jan 22 17:00:55 2010
@@ -127,9 +127,11 @@
<not><if-empty field="finAccountId"/></not>
</condition>
<widgets>
+ <container style="button-bar">
+ <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext create"/>
+ </container>
<label style="h1" text="${uiLabelMap.AccountingEditFinAccount}"></label>
<screenlet id="EditFinAccountPanel" collapsible="true">
- <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext"/>
<include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>
</widgets>

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Fri Jan 22 17:00:55 2010
@@ -39,7 +39,9 @@
<if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
</condition>
<widgets>
- <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container>
+ <container style="button-bar">
+ <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext create"/>
+ </container>
</widgets>
</section>
</decorator-section>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml Fri Jan 22 17:00:55 2010
@@ -39,7 +39,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditPaymentGroup" text="${uiLabelMap.AccountingCreateNewPaymentGroup}" style="buttontext"/>
+ <link target="EditPaymentGroup" text="${uiLabelMap.AccountingCreateNewPaymentGroup}" style="buttontext create"/>
</container>
</decorator-section>
<decorator-section name="search-options">

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Jan 22 17:00:55 2010
@@ -75,7 +75,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext"/>
+ <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext create"/>
<link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext"/>
<link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext"/>
</container>

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Fri Jan 22 17:00:55 2010
@@ -78,8 +78,10 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
+ <container style="button-bar">
+ <link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext create"/>
+ </container>
<screenlet title="${uiLabelMap.PageTitleFindTaxAuthority}">
- <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
<include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
</screenlet>
</decorator-section>

Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Fri Jan 22 17:00:55 2010
@@ -184,10 +184,10 @@
</menu-item>
</menu>

- <menu name="blogSub" menu-container-style="button-bar button-style-2" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ <menu name="blogSub" menu-container-style="button-bar" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
- <menu-item name="NewBlog" title="${uiLabelMap.ContentCreateNewBlog}">
+ <menu-item name="NewBlog" title="${uiLabelMap.ContentCreateNewBlog}" widget-style="buttontext create">
<link target="editBlog"/>
</menu-item>
<menu-item name="NewBlogArticle" title="${uiLabelMap.ContentCreateNewBlogArticle}">

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Fri Jan 22 17:00:55 2010
@@ -21,7 +21,9 @@
<h3>${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"</h3>
</div>
<div class="screenlet-body">
- <a href="<@ofbizUrl>CreateFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a>
+ <div class="button-bar">
+ <a href="<@ofbizUrl>CreateFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductCreateNewFeature}</a>
+ </div>
<br>
<form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post">
<div>

Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Fri Jan 22 17:00:55 2010
@@ -55,9 +55,9 @@
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label>
</container>

- <container>
- <link target="EditCategory" text="${uiLabelMap.ProductNewCategory}" style="buttontext"/>
- <link target="createProductInCategoryStart" text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext">
+ <container style="button-bar">
+ <link target="EditCategory" text="${uiLabelMap.ProductNewCategory}" style="buttontext create"/>
+ <link target="createProductInCategoryStart" text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext create">
<parameter param-name="productCategoryId"/>
</link>
<link target="advancedsearch" text="${uiLabelMap.ProductSearchInCategory}" style="buttontext">

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml Fri Jan 22 17:00:55 2010
@@ -294,7 +294,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}"><text-find size="25"></text-find></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find size="25"></text-find></field>
- <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit find"><submit/></field>
</form>

<form name="ListProductFeature" type="list" list-name="listIt" paginate-target="EditFeatureCategories"

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=902175&r1=902174&r2=902175&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Jan 22 17:00:55 2010
@@ -56,7 +56,7 @@
</condition>
<widgets>
<container style="button-bar">
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
<link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" style="buttontext" url-mode="inter-app">
<parameter param-name="facilityId"/>
<parameter param-name="externalLoginKey" from-field="parameters.externalLoginKey"/>
@@ -88,10 +88,12 @@
<if-service-permission service-name="facilityGenericPermission" main-action="CREATE"/>
</condition>
<widgets>
- <container style="button-bar"><link target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}" style="buttontext"/></container>
+ <container style="button-bar"><link target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}" style="buttontext create"/></container>
</widgets>
</section>
- <include-form name="FindFacility10" location="component://product/widget/facility/FacilityForms.xml"/>
+ <screenlet>
+ <include-form name="FindFacility10" location="component://product/widget/facility/FacilityForms.xml"/>
+ </screenlet>
</widgets>
</section>
<section>