svn commit: r671453 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/project/edittaskskills.ftl widget/Menus.xml widget/TaskScreens.xml widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Jun 25 00:48:54 2008
New Revision: 671453

URL: http://svn.apache.org/viewvc?rev=671453&view=rev
Log:
replace ftl by form and fix menu highlight

Removed:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl
Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=671453&r1=671452&r2=671453&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Jun 25 00:48:54 2008
@@ -172,7 +172,7 @@
             <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">
+    <menu name="ProjectSubTabBar" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
         <actions>
             <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
             <set field="hasUpdatePermission" value="${bsh:
@@ -225,7 +225,7 @@
             <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 name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}"><link target="taskView?workEffortId=${workEffortId}"/></menu-item>
         <menu-item name="edittask" title="${uiLabelMap.ProjectMgrEditTask}">
             <condition>
@@ -317,7 +317,7 @@
             <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 name="TimesheetTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="findtimesheet" title="${uiLabelMap.CommonFind}">
             <link target="FindTimeSheet"/>
         </menu-item>
@@ -325,7 +325,7 @@
             <link target="addWeeklyTimesheet"/>
         </menu-item>
     </menu>
-    <menu name="TimesheetSubTabBar" menu-container-style="button-bar button-style-2" default-menu-item-name="StatustoProgress">  
+    <menu name="TimesheetSubTabBar" menu-container-style="button-bar button-style-2" default-menu-item-name="StatustoProgress" selected-menuitem-context-field-name="tabButtonItem">  
         <menu-item name="addTimesheet" title="${uiLabelMap.CommonNew}">
             <link target="addWeeklyTimesheet"/>
         </menu-item>
@@ -348,7 +348,7 @@
             <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 name="MyTimeSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">  
         <menu-item name="TimeSheetStatustoComplete" title="${uiLabelMap.CommonStatustoComplete}">
             <condition>
                 <and>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=671453&r1=671452&r2=671453&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Jun 25 00:48:54 2008
@@ -313,9 +313,9 @@
                         <screenlet title="${uiLabelMap.${titleProperty}}">
                             <include-form name="ListTaskSkills" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                         </screenlet>
-                        <platform-specific>
-                            <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittaskskills.ftl"/></html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.${titleProperty}}">
+                            <include-form name="AddTaskSkill" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=671453&r1=671452&r2=671453&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Jun 25 00:48:54 2008
@@ -383,6 +383,18 @@
         <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
+    <form name="AddTaskSkill" type="single" target="createTaskSkillStandard"
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="workEffortId"><hidden value="${workEffortId}"/></field>
+        <field name="skillTypeId"><drop-down>
+            <entity-options entity-name="SkillType" description="${description}"/>    
+        </drop-down>
+        </field>
+        <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
+        <field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
+        <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
+        <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
+    </form>
     <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>