svn commit: r634225 [2/4] - in /ofbiz/trunk/specialpurpose/projectmgr: ./ data/ entitydef/ script/org/ofbiz/project/ servicedef/ src/org/ofbiz/project/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/js/ widget/ widget/forms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r634225 [2/4] - in /ofbiz/trunk/specialpurpose/projectmgr: ./ data/ entitydef/ script/org/ofbiz/project/ servicedef/ src/org/ofbiz/project/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/js/ widget/ widget/forms/

ChrisG-2
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Thu Mar  6 03:32:39 2008
@@ -1,232 +1,232 @@
-<?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
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../framework/widget/dtd/widget-menu.xsd">
-    <menu name="ProjectMgrAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectMgrApplication}" menu-container-style="button-bar tab-bar">
-    
+<?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
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../framework/widget/dtd/widget-menu.xsd">
+    <menu name="ProjectMgrAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectMgrApplication}" menu-container-style="button-bar tab-bar">
+    
         <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item>
         <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheet"/></menu-item>
         <menu-item name="projects" title="${uiLabelMap.WorkEffortProjects}"><link target="FindProject"/></menu-item>
-        <menu-item name="task" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask"/></menu-item>
-        <menu-item name="resources" title="${uiLabelMap.ProjectMgrResources}">
-            <condition>
-                <if-has-permission permission="PROJECTMGR_ADMIN"/>
-            </condition>
-            <link target="FindResource"/>
-        </menu-item>
-        <menu-item name="timesheet" title="${uiLabelMap.Timesheet}">
-            <condition>
-                <if-has-permission permission="PROJECTMGR_ADMIN"/>
-            </condition>
-            <link target="FindTimeSheet"/>
-        </menu-item>
-        <menu-item name="SkillType" title="${uiLabelMap.ProjectMgrSkillType}">
-            <condition>
-                <if-has-permission permission="PROJECTMGR_ADMIN"/>
-            </condition>
-            <link target="findSkillTypes"/>
-        </menu-item>
-        <!--menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item-->
-        <menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}">
-            <condition>
-                <if-has-permission permission="PROJECTMGR_ADMIN"/>
-            </condition>
-            <link target="requestlist"/>
-        </menu-item>
+        <menu-item name="task" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask"/></menu-item>
+        <menu-item name="resources" title="${uiLabelMap.ProjectMgrResources}">
+            <condition>
+                <if-has-permission permission="PROJECTMGR_ADMIN"/>
+            </condition>
+            <link target="FindResource"/>
+        </menu-item>
+        <menu-item name="timesheet" title="${uiLabelMap.Timesheet}">
+            <condition>
+                <if-has-permission permission="PROJECTMGR_ADMIN"/>
+            </condition>
+            <link target="FindTimeSheet"/>
+        </menu-item>
+        <menu-item name="SkillType" title="${uiLabelMap.ProjectMgrSkillType}">
+            <condition>
+                <if-has-permission permission="PROJECTMGR_ADMIN"/>
+            </condition>
+            <link target="findSkillTypes"/>
+        </menu-item>
+        <!--menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item-->
+        <menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}">
+            <condition>
+                <if-has-permission permission="PROJECTMGR_ADMIN"/>
+            </condition>
+            <link target="requestlist"/>
+        </menu-item>
         
         <menu-item name="help" title="Help" align-style="col-right">
             <link target="http://docs.ofbiz.org/display/OFBENDUSER/Project+Manager+Application+Roles?decorator=printable" url-mode="plain" target-window="new"/>
         </menu-item>
-        <menu-item name="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
-            <condition><not><if-empty field-name="userLogin"/></not></condition>
-            <link target="logout"/>
-        </menu-item>
-        <menu-item name="Login" title="Login" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
-            <condition><if-empty field-name="userLogin"/></condition>
-            <link target="${checkLoginUrl}"/>
-        </menu-item>
-    </menu>
+        <menu-item name="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
+            <condition><not><if-empty field-name="userLogin"/></not></condition>
+            <link target="logout"/>
+        </menu-item>
+        <menu-item name="Login" title="Login" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
+            <condition><if-empty field-name="userLogin"/></condition>
+            <link target="${checkLoginUrl}"/>
+        </menu-item>
+    </menu>
     <menu name="ProjectTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
         <actions>
-            <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-            <set field="hasUpdatePermission" value="${bsh:
-                result = dispatcher.runSync(&quot;projectMgrPermission&quot;,
-                org.ofbiz.base.util.UtilMisc.toMap(&quot;userLogin&quot;, parameters.get(&quot;userLogin&quot;),
-                &quot;resourceDescription&quot;, &quot;Project&quot;,
-                &quot;mainAction&quot;, &quot;UPDATE&quot;,
-                &quot;projectId&quot;, projectId));
-                return result.get(&quot;hasPermission&quot;); }" type="Boolean"/>
-            <set field="hasViewPermission" value="${bsh:
-                result = dispatcher.runSync(&quot;projectMgrPermission&quot;,
-                org.ofbiz.base.util.UtilMisc.toMap(&quot;userLogin&quot;, parameters.get(&quot;userLogin&quot;),
-                &quot;resourceDescription&quot;, &quot;Project&quot;,
-                &quot;mainAction&quot;, &quot;VIEW&quot;,
-                &quot;projectId&quot;, projectId));
-                return result.get(&quot;hasPermission&quot;); }" type="Boolean"/>
+            <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
+            <set field="hasUpdatePermission" value="${bsh:
+                result = dispatcher.runSync(&quot;projectMgrPermission&quot;,
+                org.ofbiz.base.util.UtilMisc.toMap(&quot;userLogin&quot;, parameters.get(&quot;userLogin&quot;),
+                &quot;resourceDescription&quot;, &quot;Project&quot;,
+                &quot;mainAction&quot;, &quot;UPDATE&quot;,
+                &quot;projectId&quot;, projectId));
+                return result.get(&quot;hasPermission&quot;); }" type="Boolean"/>
+            <set field="hasViewPermission" value="${bsh:
+                result = dispatcher.runSync(&quot;projectMgrPermission&quot;,
+                org.ofbiz.base.util.UtilMisc.toMap(&quot;userLogin&quot;, parameters.get(&quot;userLogin&quot;),
+                &quot;resourceDescription&quot;, &quot;Project&quot;,
+                &quot;mainAction&quot;, &quot;VIEW&quot;,
+                &quot;projectId&quot;, projectId));
+                return result.get(&quot;hasPermission&quot;); }" type="Boolean"/>
         </actions>
-        <menu-item name="ganttchart" title="${uiLabelMap.ProjectMgrGanttChart}">
-            <condition>
-                <if-compare field-name="hasViewPermission" operator="equals" value="true"/>
-            </condition>
-            <link target="ganttChart?projectId=${projectId}"/>
-        </menu-item>
-        <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}">
-            <condition>
-                <if-compare field-name="hasViewPermission" operator="equals" value="true"/>
-            </condition>
-            <link target="projectView?projectId=${projectId}"/>
-        </menu-item>
-        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="EditProject?projectId=${projectId}"/>
-        </menu-item>
-        <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="FindPhase?projectId=${projectId}"/>
-        </menu-item>
-        <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="EditProjectTasks?projectId=${projectId}"/>
+        <menu-item name="ganttchart" title="${uiLabelMap.ProjectMgrGanttChart}">
+            <condition>
+                <if-compare field-name="hasViewPermission" operator="equals" value="true"/>
+            </condition>
+            <link target="ganttChart?projectId=${projectId}"/>
+        </menu-item>
+        <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}">
+            <condition>
+                <if-compare field-name="hasViewPermission" operator="equals" value="true"/>
+            </condition>
+            <link target="projectView?projectId=${projectId}"/>
+        </menu-item>
+        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="EditProject?projectId=${projectId}"/>
+        </menu-item>
+        <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="FindPhase?projectId=${projectId}"/>
+        </menu-item>
+        <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="EditProjectTasks?projectId=${projectId}"/>
         </menu-item>        
-        <menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="ListWorkEffortPartyAssigns?projectId=${projectId}"/>
-        </menu-item>
-        <menu-item name="notes" title="${uiLabelMap.CommonNotes}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="EditWorkEffortNotes?projectId=${projectId}"/>
-        </menu-item>
-        <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="ListSubProjects?projectId=${projectId}&amp;subProjects=true"/>
-        </menu-item>
-        <menu-item name="billing" title="${uiLabelMap.ProjectMgrBilling}">
-            <condition>
-                <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
-                </and>
-            </condition>
-            <link target="projectBilling?projectId=${projectId}"/>
-        </menu-item>
+        <menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="ListWorkEffortPartyAssigns?projectId=${projectId}"/>
+        </menu-item>
+        <menu-item name="notes" title="${uiLabelMap.CommonNotes}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="EditWorkEffortNotes?projectId=${projectId}"/>
+        </menu-item>
+        <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="ListSubProjects?projectId=${projectId}&amp;subProjects=true"/>
+        </menu-item>
+        <menu-item name="billing" title="${uiLabelMap.ProjectMgrBilling}">
+            <condition>
+                <and>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                    <if-compare field-name="project.currentStatusId" operator="not-equals" value="PTS_CANCELED"/>
+                </and>
+            </condition>
+            <link target="projectBilling?projectId=${projectId}"/>
+        </menu-item>
     </menu>
     <menu name="ProjectSubTabBar" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected">
         <actions>
             <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-            <set field="hasUpdatePermission" value="${bsh:
-                result = dispatcher.runSync(&quot;projectMgrPermission&quot;,
-                org.ofbiz.base.util.UtilMisc.toMap(&quot;userLogin&quot;, parameters.get(&quot;userLogin&quot;),
-                &quot;resourceDescription&quot;, &quot;Project&quot;,
-                &quot;mainAction&quot;, &quot;UPDATE&quot;,
-                &quot;projectId&quot;, projectId));
-                return result.get(&quot;hasPermission&quot;); }" type="Boolean"/>
+            <set field="hasUpdatePermission" value="${bsh:
+                result = dispatcher.runSync(&quot;projectMgrPermission&quot;,
+                org.ofbiz.base.util.UtilMisc.toMap(&quot;userLogin&quot;, parameters.get(&quot;userLogin&quot;),
+                &quot;resourceDescription&quot;, &quot;Project&quot;,
+                &quot;mainAction&quot;, &quot;UPDATE&quot;,
+                &quot;projectId&quot;, projectId));
+                return result.get(&quot;hasPermission&quot;); }" type="Boolean"/>
         </actions>
         <menu-item name="newProject" title="${uiLabelMap.ProjectMgrNewProject}">
-            <condition>
+            <condition>
                 <and>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
                 </and>
             </condition>
             <link target="EditProject"></link>
         </menu-item>
         <menu-item name="copyProject" title="${uiLabelMap.ProjectMgrCopyProject}">
-            <condition>
-                <and>
-                    <not>
-                        <if-empty field-name="project"/>
-                    </not>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                </and>
-            </condition>
+            <condition>
+                <and>
+                    <not>
+                        <if-empty field-name="project"/>
+                    </not>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                </and>
+            </condition>
             <link target="copyProject?projectId=${projectId}"></link>
         </menu-item>
         <menu-item name="schedule" title="${uiLabelMap.ProjectMgrSchedule}">
-            <condition>
-                <and>
-                    <not>
-                        <if-empty field-name="project"/>
-                    </not>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                </and>
-            </condition>
+            <condition>
+                <and>
+                    <not>
+                        <if-empty field-name="project"/>
+                    </not>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                </and>
+            </condition>
             <link target="scheduleProject?projectId=${projectId}"></link>
         </menu-item>
         <menu-item name="copyProjectToTemplate" title="${uiLabelMap.ProjectMgrSaveAsTemplate}">
-            <condition>
-                <and>
-                    <not>
-                        <if-empty field-name="project"/>
-                    </not>
-                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
-                </and>
-            </condition>
+            <condition>
+                <and>
+                    <not>
+                        <if-empty field-name="project"/>
+                    </not>
+                    <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
+                </and>
+            </condition>
             <link target="copyProjectToTemplate?projectId=${projectId}"></link>
         </menu-item>
     </menu>
-    <menu name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
-        <menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}"><link target="taskView?workEffortId=${workEffortId}"/></menu-item>
+    <menu name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+        <menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}"><link target="taskView?workEffortId=${workEffortId}"/></menu-item>
         <menu-item name="edittask" title="${uiLabelMap.ProjectMgrEditTask}">
             <condition>
                 <and>
@@ -236,8 +236,8 @@
                     <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
                 </and>
             </condition>
-            <link target="EditTask?workEffortId=${workEffortId}"/>
-        </menu-item>
+            <link target="EditTask?workEffortId=${workEffortId}"/>
+        </menu-item>
         <menu-item name="dependencies" title="${uiLabelMap.ProjectMgrDependencies}">
             <condition>
                 <and>
@@ -247,8 +247,8 @@
                     <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
                 </and>
             </condition>
-            <link target="Dependencies?workEffortId=${workEffortId}"/>
-        </menu-item>
+            <link target="Dependencies?workEffortId=${workEffortId}"/>
+        </menu-item>
         <menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}">
             <condition>
                 <and>
@@ -258,45 +258,45 @@
                     <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
                 </and>
             </condition>
-            <link target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/>
+            <link target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/>
+        </menu-item>
+        <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="workEffort"/></not>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                </and>
+            </condition>
+            <link target="EditTaskSkills?workEffortId=${workEffortId}"/>
+        </menu-item>
+        <menu-item name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="workEffort"/></not>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                </and>
+            </condition>
+            <link target="EditTimeEntries?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}">
-            <condition>
-                <and>
-                    <not><if-empty field-name="workEffort"/></not>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                </and>
-            </condition>
-            <link target="EditTaskSkills?workEffortId=${workEffortId}"/>
-        </menu-item>
-        <menu-item name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}">
-            <condition>
-                <and>
-                    <not><if-empty field-name="workEffort"/></not>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                </and>
-            </condition>
-            <link target="EditTimeEntries?workEffortId=${workEffortId}"/>
-        </menu-item>
-        <menu-item name="notes" title="${uiLabelMap.CommonNotes}">
-            <link target="EditTaskNotes?workEffortId=${workEffortId}"/>
-        </menu-item>
-    </menu>
+        <menu-item name="notes" title="${uiLabelMap.CommonNotes}">
+            <link target="EditTaskNotes?workEffortId=${workEffortId}"/>
+        </menu-item>
+    </menu>
     <menu name="TaskSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">  
-        <menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" >
-            <condition>
-                <and>
-                    <not><if-empty field-name="workEffort"/></not>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
-                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
-                </and>
-            </condition>
-            <link target="setTaskStatus?workEffortId=${workEffortId}&amp;currentStatusId=PTS_ON_HOLD"/>
-        </menu-item>
+        <menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" >
+            <condition>
+                <and>
+                    <not><if-empty field-name="workEffort"/></not>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
+                    <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+                </and>
+            </condition>
+            <link target="setTaskStatus?workEffortId=${workEffortId}&amp;currentStatusId=PTS_ON_HOLD"/>
+        </menu-item>
         <menu-item name="release" title="${uiLabelMap.ProjectMgrRelease}" >
             <condition>
                 <and>
@@ -317,71 +317,71 @@
             <link target="setTaskStatus?workEffortId=${workEffortId}&amp;currentStatusId=PTS_CANCELLED"/>
         </menu-item>
     </menu>
-    <menu name="TimesheetTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected">
-        <menu-item name="findtimesheet" title="${uiLabelMap.CommonFind}">
-            <link target="FindTimeSheet"/>
-        </menu-item>
-        <menu-item name="addTimesheet" title="${uiLabelMap.CommonAdd}">
-            <link target="addWeeklyTimesheet"/>
-        </menu-item>
-    </menu>
-    <menu name="TimesheetSubTabBar" menu-container-style="button-bar button-style-2" default-menu-item-name="StatustoProgress">  
-        <menu-item name="addTimesheet" title="${uiLabelMap.CommonNew}">
-            <link target="addWeeklyTimesheet"/>
-        </menu-item>
-        <menu-item name="TimeSheetStatustoComplete" title="${uiLabelMap.CommonStatustoComplete}">
-            <condition>
-                <and>
-                    <not><if-empty field-name="timesheet"/></not>
-                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
-                </and>
-            </condition>
-            <link target="TimeSheetStatustoComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
-        </menu-item>
-        <menu-item name="TimeSheetStatustoProgress" title="Set status to In Progress">
-            <condition>
-                <and>
-                    <not><if-empty field-name="timesheet"/></not>
-                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
-                </and>
-            </condition>
-            <link target="TimeSheetStatustoProgress?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_IN_PROCESS"/>
-        </menu-item>
-    </menu>
-    <menu name="MyTimeSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">  
-        <menu-item name="TimeSheetStatustoComplete" title="${uiLabelMap.CommonStatustoComplete}">
-            <condition>
-                <and>
-                    <not><if-empty field-name="timesheet"/></not>
-                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
-                </and>
-            </condition>
-            <link target="myTimeSheetStatustoComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
-        </menu-item>
-    </menu>
-    <menu name="ResourceTabBar" menu-container-style="button-bar tab-bar" default-menu-item-name="edittimesheet" default-selected-style="selected">
-        <menu-item name="ResourcesProfile" title="${uiLabelMap.PartyProfile}">
-            <link target="viewprofile?partyId=${partyId}"/>
-        </menu-item>
-        <menu-item name="listResourcesProject" title="${uiLabelMap.ProjectMgrProjectId}">
-            <link target="listResourcesProject?partyId=${partyId}"></link>
-        </menu-item>
-        <menu-item name="listResourcesTask"  title="${uiLabelMap.ProjectMgrTaskId}">
-            <link target="listResourcesTask?partyId=${partyId}"></link>
-        </menu-item>
-        <menu-item name="EditPartyRates"  title="${uiLabelMap.ProjectMgrRates}">
-            <link target="EditPartyRates?partyId=${partyId}"></link>
-        </menu-item>
-        <menu-item name="ListUnBilledHours"  title="${uiLabelMap.ProjectMgrBilling}">
-            <link target="ListResourcesUnBilledHours?partyId=${partyId}"></link>
-        </menu-item>
-    </menu>
-    <menu name="RequestTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected">
-        <menu-item name="viewRequest" title="${uiLabelMap.ProjectMgrView}">
-            <link target="ViewRequest?custRequestId=${parameters.custRequestId}"/>
-        </menu-item>
-        <menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">
-            <link target="EditRequest?custRequestId=${parameters.custRequestId}"/>
-        </menu-item>
-    </menu>
+    <menu name="TimesheetTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+        <menu-item name="findtimesheet" title="${uiLabelMap.CommonFind}">
+            <link target="FindTimeSheet"/>
+        </menu-item>
+        <menu-item name="addTimesheet" title="${uiLabelMap.CommonAdd}">
+            <link target="addWeeklyTimesheet"/>
+        </menu-item>
+    </menu>
+    <menu name="TimesheetSubTabBar" menu-container-style="button-bar button-style-2" default-menu-item-name="StatustoProgress">  
+        <menu-item name="addTimesheet" title="${uiLabelMap.CommonNew}">
+            <link target="addWeeklyTimesheet"/>
+        </menu-item>
+        <menu-item name="TimeSheetStatustoComplete" title="${uiLabelMap.CommonStatustoComplete}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="timesheet"/></not>
+                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+                </and>
+            </condition>
+            <link target="TimeSheetStatustoComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
+        </menu-item>
+        <menu-item name="TimeSheetStatustoProgress" title="Set status to In Progress">
+            <condition>
+                <and>
+                    <not><if-empty field-name="timesheet"/></not>
+                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+                </and>
+            </condition>
+            <link target="TimeSheetStatustoProgress?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_IN_PROCESS"/>
+        </menu-item>
+    </menu>
+    <menu name="MyTimeSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">  
+        <menu-item name="TimeSheetStatustoComplete" title="${uiLabelMap.CommonStatustoComplete}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="timesheet"/></not>
+                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+                </and>
+            </condition>
+            <link target="myTimeSheetStatustoComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
+        </menu-item>
+    </menu>
+    <menu name="ResourceTabBar" menu-container-style="button-bar tab-bar" default-menu-item-name="edittimesheet" default-selected-style="selected">
+        <menu-item name="ResourcesProfile" title="${uiLabelMap.PartyProfile}">
+            <link target="viewprofile?partyId=${partyId}"/>
+        </menu-item>
+        <menu-item name="listResourcesProject" title="${uiLabelMap.ProjectMgrProjectId}">
+            <link target="listResourcesProject?partyId=${partyId}"></link>
+        </menu-item>
+        <menu-item name="listResourcesTask"  title="${uiLabelMap.ProjectMgrTaskId}">
+            <link target="listResourcesTask?partyId=${partyId}"></link>
+        </menu-item>
+        <menu-item name="EditPartyRates"  title="${uiLabelMap.ProjectMgrRates}">
+            <link target="EditPartyRates?partyId=${partyId}"></link>
+        </menu-item>
+        <menu-item name="ListUnBilledHours"  title="${uiLabelMap.ProjectMgrBilling}">
+            <link target="ListResourcesUnBilledHours?partyId=${partyId}"></link>
+        </menu-item>
+    </menu>
+    <menu name="RequestTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+        <menu-item name="viewRequest" title="${uiLabelMap.ProjectMgrView}">
+            <link target="ViewRequest?custRequestId=${parameters.custRequestId}"/>
+        </menu-item>
+        <menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">
+            <link target="EditRequest?custRequestId=${parameters.custRequestId}"/>
+        </menu-item>
+    </menu>
 </menus>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Thu Mar  6 03:32:39 2008
@@ -1,48 +1,48 @@
-<?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
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-    <screen name="ListUnBilledHours">
-        <section>            
-            <actions>
-                <set field="titleProperty" value="PageTitleListUnbilledHours"/>
-                <set field="tabButtonItem" value="ListUnBilledHours"/>
-                <set field="labelTitleProperty" value="ProjectMgrProjectName"/>
+<?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
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <screen name="ListUnBilledHours">
+        <section>            
+            <actions>
+                <set field="titleProperty" value="PageTitleListUnbilledHours"/>
+                <set field="tabButtonItem" value="ListUnBilledHours"/>
+                <set field="labelTitleProperty" value="ProjectMgrProjectName"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh"/>
-            </actions>                                                
-            <widgets>  
-                <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet>
-                            <screenlet title="Unbilled hours">
-                                <include-form name="ListUnBilledHours" location="component://projectmgr/widget/forms/ResourceForms.xml"/>
-                            </screenlet>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh"/>
+            </actions>                                                
+            <widgets>  
+                <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet>
+                            <screenlet title="Unbilled hours">
+                                <include-form name="ListUnBilledHours" location="component://projectmgr/widget/forms/ResourceForms.xml"/>
+                            </screenlet>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native