OFBiz › OFBiz - Commits

svn commit: r902885 - in /ofbiz/trunk: applications/manufacturing/widget/manufacturing/ applications/product/widget/catalog/ applications/workeffort/webapp/workeffort/task/ applications/workeffort/widget/ framework/webtools/webapp/webtools/cache/ frame...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r902885 - in /ofbiz/trunk: applications/manufacturing/widget/manufacturing/ applications/product/widget/catalog/ applications/workeffort/webapp/workeffort/task/ applications/workeffort/widget/ framework/webtools/webapp/webtools/cache/ frame...

Author: buscob
Date: Mon Jan 25 17:28:28 2010
New Revision: 902885

URL: http://svn.apache.org/viewvc?rev=902885&view=rev
Log:
Added "create", "refresh", "collapse-all" and "expand-all" classes to the pertinent button-bar buttontext links.

Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Mon Jan 25 17:28:28 2010
@@ -115,7 +115,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/>
+ <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext create"/>
</container>
</decorator-section>
<decorator-section name="search-options">
@@ -147,7 +147,7 @@
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditRouting}">
<container style="button-bar">
- <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/>
+ <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext create"/>
</container>
<include-form name="EditRouting" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
</screenlet>
@@ -174,7 +174,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/>
+ <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext create"/>
</container>
</decorator-section>
<decorator-section name="search-options">
@@ -206,7 +206,7 @@
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditRoutingTask}">
<container style="button-bar">
- <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/>
+ <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext create"/>
</container>
<include-form name="EditRoutingTask" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
</screenlet>

Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Mon Jan 25 17:28:28 2010
@@ -53,8 +53,8 @@
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}] ${${extraFunctionName}}</label>
</container>
- <container>
- <link target="EditProductConfigItem" text="[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigItem}]" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditProductConfigItem" text="[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigItem}]" style="buttontext create"/>
</container>
</widgets>
</section>
@@ -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="EditProductConfigItem" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
+ <link target="EditProductConfigItem" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/>
</container>
</decorator-section>
<decorator-section name="search-options">

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Mon Jan 25 17:28:28 2010
@@ -229,7 +229,9 @@
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <container style="button-bar"><link target="CreateProductFeature" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+ <container style="button-bar">
+ <link target="CreateProductFeature" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/>
+ </container>
</decorator-section>
<decorator-section name="search-options">
<include-form name="FindProductFeature" location="component://product/widget/catalog/FeatureForms.xml"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Mon Jan 25 17:28:28 2010
@@ -43,7 +43,7 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext"/>
+ <link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext create"/>
<link target="FindSubscriptionResource" text="${uiLabelMap.PageTitleFindSubscriptionResource}" style="buttontext"/>
</container>
</decorator-section>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl Mon Jan 25 17:28:28 2010
@@ -18,7 +18,7 @@
-->
<h1>${uiLabelMap.PageTitleViewActivityAndTaskList}</h1>
<div class="button-bar">
- <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizUrl>" class="buttontext">${uiLabelMap.WorkEffortNewTask}</a>
+ <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizUrl>" class="buttontext create">${uiLabelMap.WorkEffortNewTask}</a>
</div>
<h2>${uiLabelMap.WorkEffortAssignedTasks}</h2>
<br/>

Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Mon Jan 25 17:28:28 2010
@@ -44,12 +44,14 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.WorkEffortMyCurrentTimesheets}">
- <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek" style="buttontext">
- <parameter param-name="partyId" from-field="userLogin.partyId"/>
- </link>
- <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext">
- <parameter param-name="partyId" from-field="userLogin.partyId"/>
- </link>
+ <container style="button-bar">
+ <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek" style="buttontext">
+ <parameter param-name="partyId" from-field="userLogin.partyId"/>
+ </link>
+ <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext">
+ <parameter param-name="partyId" from-field="userLogin.partyId"/>
+ </link>
+ </container>
<iterate-section entry="currentTimesheet" list="currentTimesheetList">
<section>
<actions>
@@ -141,7 +143,9 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.PageTitleFindTimesheet}">
- <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+ <container style="button-bar">
+ <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext create"/>
+ </container>
<include-form name="FindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleFindTimesheet}">
@@ -181,7 +185,9 @@
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleEditTimesheet}">
- <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+ <container style="button-bar">
+ <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext create"/>
+ </container>
<include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleAddTimesheetToInvoice}">
@@ -215,7 +221,9 @@
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditTimesheetRoles}">
- <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+ <container style="button-bar">
+ <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext create"/>
+ </container>
<include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleAddTimesheetRoles}">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Mon Jan 25 17:28:28 2010
@@ -105,10 +105,9 @@
<if-empty field="workEffort"/>
</condition>
<widgets>
- <container style="h1">
- <label text="${uiLabelMap.PageTitleAddWorkEffort}"/>
- </container>
- <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ <screenlet title="${uiLabelMap.PageTitleAddWorkEffort}">
+ <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<container style="button-bar">
@@ -116,7 +115,9 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ <screenlet>
+ <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </screenlet>
</fail-widgets>
</section>
<screenlet title="${uiLabelMap.WorkEffortDuplicateWorkEffort}">

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl Mon Jan 25 17:28:28 2010
@@ -19,10 +19,10 @@

<#macro displayButtonBar>
<div class="button-bar">
- <a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsReloadCacheList}</a>
- <a href="<@ofbizUrl>FindUtilCacheClearAll</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsClearAllCaches}</a>
- <a href="<@ofbizUrl>FindUtilCacheClearAllExpired</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsClearExpiredFromAll}</a>
- <a href="<@ofbizUrl>ForceGarbageCollection</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsRunGC}</a>
+ <a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="buttontext refresh">${uiLabelMap.WebtoolsReloadCacheList}</a>
+ <a href="<@ofbizUrl>FindUtilCacheClearAll</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearAllCaches}</a>
+ <a href="<@ofbizUrl>FindUtilCacheClearAllExpired</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearExpiredFromAll}</a>
+ <a href="<@ofbizUrl>ForceGarbageCollection</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsRunGC}</a>
</div>
</#macro>
<div class="screenlet">

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Mon Jan 25 17:28:28 2010
@@ -21,8 +21,10 @@
<div class="h3">${uiLabelMap.WebtoolsStatsMainPageTitle}</div>
</div>
<div class="screenlet-body">
- <div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart?clear=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsClearSince}</a>
- <a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
+ <div class="button-bar">
+ <a href="<@ofbizUrl>StatsSinceStart?clear=true</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsStatsClearSince}</a>
+ <a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="buttontext refresh">${uiLabelMap.WebtoolsStatsReloadPage}</a>
+ </div>
<p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${nowTimestamp}</p>
</div>
</div>

Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Mon Jan 25 17:28:28 2010
@@ -114,7 +114,7 @@
<decorator-section name="body">
<screenlet title="${uiLabelMap.WebtoolsViewLog}">
<container style="button-bar">
- <link target="LogView" text="${uiLabelMap.CommonRefresh}" style="buttontext"/>
+ <link target="LogView" text="${uiLabelMap.CommonRefresh}" style="buttontext refresh"/>
</container>
<container style="button-bar">
<label style="label">${uiLabelMap.WebtoolsLogFileName}:</label>

Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Mon Jan 25 17:28:28 2010
@@ -64,7 +64,9 @@
<if-service-permission service-name="tempExprPermissionCheck" main-action="CREATE"/>
</condition>
<widgets>
- <container style="button-bar"><link target="editTemporalExpression" text="${uiLabelMap.CommonCreate}" style="buttontext"/></container>
+ <container style="button-bar">
+ <link target="editTemporalExpression" text="${uiLabelMap.CommonCreate}" style="buttontext create"/>
+ </container>
</widgets>
</section>
</decorator-section>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=902885&r1=902884&r2=902885&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Mon Jan 25 17:28:28 2010
@@ -66,7 +66,9 @@
<if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
</condition>
<widgets>
- <container style="button-bar"><link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container>
+ <container style="button-bar">
+ <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext create"/>
+ </container>
</widgets>
</section>
</decorator-section>
@@ -121,7 +123,7 @@
<condition><not><if-empty field="maintHistSeqId"/></not></condition>
<widgets>
<container style="button-bar">
- <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext">
+ <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext create">
<parameter param-name="fixedAssetId"/>
</link>
<link target="printFixedAssetMaint.pdf" text="${uiLabelMap.CommonPrint}" style="buttontext">
@@ -185,7 +187,7 @@
</widgets>
<fail-widgets>
<container style="button-bar">
- <link target="EditWorkEfforts" style="buttontext" text="${uiLabelMap.CommonNew}">
+ <link target="EditWorkEfforts" style="buttontext create" text="${uiLabelMap.CommonNew}">
<parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/>
<parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/>
<parameter param-name="workEffortId"/>
@@ -209,7 +211,7 @@
</widgets>
<fail-widgets>
<container style="button-bar">
- <link target="EditWorkEfforts" style="buttontext" text="${uiLabelMap.CommonNew}">
+ <link target="EditWorkEfforts" style="buttontext create" text="${uiLabelMap.CommonNew}">
<parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/>
<parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/>
<parameter param-name="workEffortId"/>