You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/06/04 02:10:24 UTC
svn commit: r662931 - in /ofbiz/trunk: applications/workeffort/config/
specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/
specialpurpose/assetmaint/webapp/assetmaint/includes/
specialpurpose/assetmaint/widget/
Author: adrianc
Date: Tue Jun 3 17:10:24 2008
New Revision: 662931
URL: http://svn.apache.org/viewvc?rev=662931&view=rev
Log:
More work on the Asset Maintenance component. I added a task list screen and made it the main (initial) screen. It seems to me a maintenance worker would want to see his/her tasks first.
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=662931&r1=662930&r2=662931&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Jun 3 17:10:24 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -3541,7 +3541,7 @@
<value xml:lang="zh">ä»»å¡è¯¦ç»</value>
</property>
<property key="WorkEffortTaskList">
- <value xml:lang="en">TaskList</value>
+ <value xml:lang="en">Task List</value>
<value xml:lang="es">Lista de tareas</value>
<value xml:lang="fr">Liste des tâches</value>
<value xml:lang="it">Lista Compito</value>
Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=662931&r1=662930&r2=662931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Tue Jun 3 17:10:24 2008
@@ -28,7 +28,7 @@
<request-map uri="main">
<security https="true" auth="true"/>
- <response name="success" type="view" value="main"/>
+ <response name="success" type="view" value="mytasks"/>
</request-map>
<!-- FixedAssetMaintenance -->
@@ -60,12 +60,16 @@
<response name="success" type="view" value="EditFixedAssetMaint"/>
<response name="error" type="view" value="EditFixedAssetMaint"/>
</request-map>
-
<request-map uri="findFixedAssetMaints">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindFixedAssetMaints"/>
<response name="error" type="view" value="FindFixedAssetMaints"/>
</request-map>
+ <request-map uri="ListFixedAssetCalendar">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="month"/>
+ <response name="error" type="view" value="month"/>
+ </request-map>
<!-- WorkEffort request mappings -->
<request-map uri="EditWorkEfforts">
@@ -161,7 +165,6 @@
<!-- end of request mappings -->
<!-- View Mappings -->
- <view-map name="main" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/>
<!-- FixedAsset Maintenance screens -->
<view-map name="FindFixedAssetMaints" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#FindFixedAssetMaints"/>
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=662931&r1=662930&r2=662931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl Tue Jun 3 17:10:24 2008
@@ -21,6 +21,7 @@
<h2>${uiLabelMap.AssetMaintApplication}</h2>
<ul>
<#if userLogin?has_content>
+ <li<#if selected == "task"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.WorkEffortTaskList}</a></li>
<li<#if selected == "ListFixedAssets"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>
<li<#if selected == "fixedAssetMaints"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingFixedAssetMaints}</a></li>
<li<#if selected == "facility"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ProductFacility}</a></li>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml?rev=662931&r1=662930&r2=662931&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml Tue Jun 3 17:10:24 2008
@@ -31,7 +31,7 @@
<set field="title" value="${uiLabelMap.AssetMaintMaintenanceCalendar}: ${fixedAsset.fixedAssetName}"/>
</actions>
<widgets>
- <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonFixedAssetDecorator" location="component://accounting/widget/FixedAssetScreens.xml">
<decorator-section name="body">
<include-menu name="CalendarTabBar" location="component://assetmaint/widget/Menus.xml"/>
<decorator-section-include name="body"/>