Author: adrianc
Date: Wed Sep 5 11:12:52 2007
New Revision: 573018
URL: http://svn.apache.org/viewvc?rev=573018&view=rev
Log:
Some UI changes to the Asset Maintenance screens - I made the component look
more like the other components. No functional changes.
Modified:
ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
Modified:
ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties?rev=573018&r1=573017&r2=573018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
Wed Sep 5 11:12:52 2007
@@ -24,6 +24,7 @@
# Override Page and Label title
+AssetMaintApplication=Asset Maintenance Application
AssetMaintCompanyName=Ofbiz Company
AssetMaintCompanySubtitle=Maintenance Department
Modified:
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl?rev=573018&r1=573017&r2=573018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
Wed Sep 5 11:12:52 2007
@@ -16,14 +16,19 @@
specific language governing permissions and limitations
under the License.
-->
-<#if userLogin?has_content>
- <div id="main-navigation">
- <ul>
- <li<#if appbarItem?if_exists == "fixedAssets">
class="selected"</#if>><a
href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>
- <li<#if appbarItem?if_exists == "fixedAssetMaints">
class="selected"</#if>><a
href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>">${uiLabelMap.AccountingFixedAssetMaints}</a></li>
- <li<#if appbarItem?if_exists == "facility">
class="selected"</#if>><a
href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>">${uiLabelMap.ProductWarehouse}</a></li>
- </ul>
- <br class="clear"/>
- </div>
-</#if>
+<#assign selected = headerItem?default("void")>
+<div id="app-navigation">
+ <h2>${uiLabelMap.AssetMaintApplication}</h2>
+ <ul>
+ <#if userLogin?has_content>
+ <li<#if selected == "fixedAssets"> class="selected"</#if>><a
href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>
+ <li<#if selected == "fixedAssetMaints"> class="selected"</#if>><a
href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>">${uiLabelMap.AccountingFixedAssetMaints}</a></li>
+ <li<#if selected == "facility"> class="selected"</#if>><a
href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>">${uiLabelMap.ProductWarehouse}</a></li>
+ <li class="opposed"><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+ <#else>
+ <li class="opposed"><a
href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+ </#if>
+ </ul>
+ <br class="clear"/>
+</div>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=573018&r1=573017&r2=573018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Wed Sep
5 11:12:52 2007
@@ -37,8 +37,7 @@
<include-form name="FindFixedAssetMaint"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
</container>
</container>
- <label><br/></label>
- <container><link target="EditFixedAssetMaint"
text="${uiLabelMap.AccountingNewFixedAssetMaint}"
style="buttontext"/></container>
+ <container style="button-bar"><link
target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}"
style="buttontext"/></container>
<include-form name="ListFixedAssetMaints"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
</decorator-section>
</decorator-screen>
@@ -68,8 +67,10 @@
<widgets>
<decorator-screen name="CommonFixedAssetMaintDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetMaint}"
style="buttontext"/></container>
- <container><link
target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"
text="${uiLabelMap.CommonPrint}" style="buttontext"/></container>
+ <container style="button-bar">
+ <link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
+ <link
target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"
text="${uiLabelMap.CommonPrint}" style="buttontext"/>
+ </container>
<container style="screenlet">
<container style="screenlet-header">
<label
style="boxhead">${uiLabelMap.AccountingNewFixedAssetMaint}</label>
@@ -244,7 +245,7 @@
</actions>
<widgets>
<platform-specific>
- <html><html-template
location="component://assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl"/></html>
+ <html><html-template
location="component://assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl"/></html>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=573018&r1=573017&r2=573018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Wed Sep 5
11:12:52 2007
@@ -29,6 +29,8 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="activeApp" value="assetmaint" global="true"/>
+ <set field="appheaderTemplate"
value="component://assetmaint/webapp/assetmaint/includes/appbar.ftl"
global="true"/>
<!-- The two default (global) stylesheets are added to the list
of stylesheets to the first and second position -->
@@ -43,19 +45,7 @@
<set field="layoutSettings.headerImageUrl"
value="/images/ofbiz_logo.jpg" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template
location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template
location="component://assetmaint/webapp/assetmaint/includes/appbar.ftl"/></html></platform-specific>
- <container style="contentarea">
- <container 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>
- <!-- render footer -->
- <platform-specific><html><html-template
location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator"
location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
@@ -90,7 +80,7 @@
<screen name="CommonFixedAssetDecorator"><!--Appbar level decorator-->
<section>
<actions>
- <set field="appbarItem" global="true" value="fixedAssets"/>
+ <set field="headerItem" global="true" value="fixedAssets"/>
</actions>
<widgets>
<decorator-screen name="main-decorator">
@@ -123,7 +113,7 @@
<screen name="CommonFixedAssetMaintDecorator"><!--Appbar level decorator-->
<section>
<actions>
- <set field="appbarItem" value="fixedAssetMaints"/>
+ <set field="headerItem" value="fixedAssetMaints"/>
</actions>
<widgets>
<decorator-screen name="main-decorator">
@@ -161,7 +151,7 @@
<screen name="CommonFacilityDecorator">
<section>
<actions>
- <set field="appbarItem" value="facility"/>
+ <set field="headerItem" value="facility"/>
<set field="facilityId" from-field="parameters.facilityId"/>
<entity-one entity-name="Facility" value-name="facility"/>
</actions>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=573018&r1=573017&r2=573018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Wed Sep 5
11:12:52 2007
@@ -23,7 +23,7 @@
<screen name="FindFacility">
<section>
<actions>
- <set field="appbarItem" value="facility"/>
+ <set field="headerItem" value="facility"/>
<entity-condition entity-name="Facility"
list-name="facilities">
<condition-expr field-name="facilityTypeId"
value="WAREHOUSE"/>
<order-by field-name="facilityId"/>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=573018&r1=573017&r2=573018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Wed Sep 5 11:12:52
2007
@@ -21,7 +21,8 @@
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
- <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset"
type="simple">
+ <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset"
type="simple"
+ default-selected-style="selected" menu-container-style="button-bar
tab-bar">
<menu-item name="EditFixedAsset"
title="${uiLabelMap.AccountingFixedAsset}">
<link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
</menu-item>
@@ -48,7 +49,8 @@
</menu-item>
</menu>
- <menu name="FixedAssetMaintTabBar"
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint"
default-menu-item-name="EditFixedAssetMaint">
+ <menu name="FixedAssetMaintTabBar"
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint"
default-menu-item-name="EditFixedAssetMaint"
+ default-selected-style="selected" menu-container-style="button-bar
tab-bar">
<menu-item name="EditFixedAssetMaint"
title="${uiLabelMap.AccountingFixedAssetMaint}">
<link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
</menu-item>
@@ -72,7 +74,8 @@
</menu-item>
</menu>
- <menu name="FacilityTabBar"
default-menu-item-name="ViewFacilityInventoryByProduct">
+ <menu name="FacilityTabBar"
default-menu-item-name="ViewFacilityInventoryByProduct"
+ default-selected-style="selected" menu-container-style="button-bar
tab-bar">
<menu-item name="EditFacility" title="${uiLabelMap.ProductFacility}">
<link target="EditFacility?facilityId=${facilityId}"/>
</menu-item>
