svn commit: r755368 [1/2] - in /ofbiz/trunk/specialpurpose: ebay/config/ projectmgr/webapp/projectmgr/project/ projectmgr/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: r755368 [1/2] - in /ofbiz/trunk/specialpurpose: ebay/config/ projectmgr/webapp/projectmgr/project/ projectmgr/widget/forms/

mrisaliti
Author: mrisaliti
Date: Tue Mar 17 19:51:28 2009
New Revision: 755368

URL: http://svn.apache.org/viewvc?rev=755368&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references

Modified:
    ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl   (contents, props changed)
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl   (contents, props changed)
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl   (contents, props changed)
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl   (contents, props changed)
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=755368&r1=755367&r2=755368&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Tue Mar 17 19:51:28 2009
@@ -309,13 +309,17 @@
         <value xml:lang="it">Errore Ricavando externalId da orderId</value>
         <value xml:lang="th">ผิดพลาดการเรียกข้อมูลรหัสภายในคืนมาจากรหัสรายการสั่งซื้อ</value>
     </property>
+    <property key="ordersImportFromEbay.errorRetrievingOrderFromOrderId">
+        <value xml:lang="en">Error Retrieving Order From Order Id</value>
+        <value xml:lang="it">Errore nella ricerca dell'ordine attraverso il numero ordine</value>
+    </property>
     <property key="ordersImportFromEbay.exceptionDuringBuildingCompleteSaleRequest">
         <value xml:lang="en">Exception during building CompleteSaleRequest</value>
         <value xml:lang="fr">Exception durant la construction de confirmation de la demande de vente</value>
         <value xml:lang="it">Eccezione durante la costruzione di CompleteSaleRequest</value>
         <value xml:lang="th">ข้อยกเว้นระหว่างการสร้างคำร้องการขายเสร็จสมบูรณ์</value>
     </property>
-    <property key="ordersImportFromEbay.exceptionDuringBuildingGetEbayDetailsReques">
+    <property key="ordersImportFromEbay.exceptionDuringBuildingGetEbayDetailsRequest">
         <value xml:lang="en">Exception during building get eBay details request</value>
         <value xml:lang="fr">Exception durant la construction de réception de demande de détails Ebay</value>
         <value xml:lang="it">Eccezione durante la creazione della richiesta get eBay details</value>
@@ -405,6 +409,10 @@
         <value xml:lang="it">Errore durante l'autenticazione su eBay</value>
         <value xml:lang="th">ผิดพลาดระหว่างเครื่องหมายที่รับรองว่าเป็นของแท้ถึงอีเบย์</value>
     </property>
+    <property key="productsExportToEbay.exceptionDuringBuildingAddTransactionConfirmationItemRequestToEbay">
+        <value xml:lang="en">Exception during building AddTransactionConfirmationItemRequestToEbay</value>
+        <value xml:lang="it">Eccezione durante la costruzione della richiesta AddTransactionConfirmationItemRequestToEbay ad eBay</value>
+    </property>
     <property key="productsExportToEbay.exceptionDuringBuildingDataItemsToEbay">
         <value xml:lang="en">Exception occurred during building data items to eBay</value>
         <value xml:lang="fr">Une exception s'est produite durant la construction des données d'articles vers Ebay</value>
@@ -417,6 +425,10 @@
         <value xml:lang="it">Eccezione accaduta durante la creazione della richiesta di ottenimento delle categorie</value>
         <value xml:lang="th">ข้อยกเว้นเกิดขึ้นระหว่างการสร้างคำร้องหมวดหมู่</value>
     </property>
+    <property key="productsExportToEbay.exceptionDuringBuildingRequestSetTaxTableToEbay">
+        <value xml:lang="en">Exception during building request SetTaxTableToEbay</value>
+        <value xml:lang="it">Eccezione durante la costruzione della richiesta SetTaxTableToEbay ad eBay</value>
+    </property>
     <property key="productsExportToEbay.exceptionInExportToEbay">
         <value xml:lang="en">Exception in exportToEbay</value>
         <value xml:lang="fr">Exception dans l'export vers Ebay</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl?rev=755368&r1=755367&r2=755368&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl Tue Mar 17 19:51:28 2009
@@ -1,214 +1,214 @@
-<#--
-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.
--->
-
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <#if project?has_content>
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleEditSubProject}&nbsp;#${project.workEffortName?if_exists} ${uiLabelMap.CommonInformation}</li>
-      <#else>
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddSubProject}</li>
-      </#if>
-    </ul>
-    <br class="clear" />
-  </div>
-  <div class="screenlet-body">
-    <#assign workEffortIdFrom = parameters.workEffortIdFrom>
-    <#if project?has_content>
-      <form name="addProjectAndAssocForm" method="get" action="<@ofbizUrl>updateProjectAndAssoc</@ofbizUrl>">
-    <#else>
-      <br/>  
-      <form name="addProjectAndAssocForm" method="get" action="<@ofbizUrl>createProjectAndAssoc</@ofbizUrl>">
-    </#if>
-        <table width="100%" cellpadding="2" cellspacing="0">
-          <tr>
-            <#if !(project?exists)>
-              <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td>
-            <#else>
-              <td><input type="hidden" name="workEffortTypeId" value="${project.workEffortTypeId?if_exists}"/></td>
-              <td><input type="hidden" name="workEffortId" value="${project.workEffortId?if_exists}"/></td>
-              <td><input type="hidden" name="workEffortName" value="${project.workEffortName?if_exists}"/></td>
-            </#if>
-          </tr>
-          <tr>
-            <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/>
-            <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
-            <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
-          </tr>
-          <tr>
-            <td width="20%">
-              ${uiLabelMap.ProjectMgrSubProjectDetails}
-            </td>
-          </tr>
-          <tr>    
-            <#if project?exists>
-              <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>    
-              <td>${project.workEffortId?if_exists}</td>    
-            </#if>
-          </tr>
-          <tr>    
-            <td class="label" >${uiLabelMap.CommonName}*</td>
-            <#if project?exists>
-              <td>${project.workEffortName?if_exists} <span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
-            <#else>
-              <td><input type="text" name="workEffortName" value=""/> <span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
-            </#if>
-          </tr>
-          <tr>    
-            <td class="label" >${uiLabelMap.CommonDescription}</td>
-            <#if project?exists>
-              <td><input type="text" name="description" value="${project.description?if_exists}"/></td>
-            <#else>
-              <td><input type="text" name="description" value=""/></td>
-            </#if>
-          </tr>  
-          <tr>    
-            <td class="label" >${uiLabelMap.CommonStatus}</td>
-            <td>    
-              <select name="currentStatusId">
-                <#if project?exists>
-                  <#assign currentStatus = project.getRelatedOne("CurrentStatusItem")?if_exists>
-                  <option value="${currentStatus.statusId}">${currentStatus.description}</option>
-                  <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.statusId))>
-                  <#list statusValidChangeToDetailList as statusValidChangeToDetail>
-                    <option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
-                  </#list>
-                <#else>
-                  <#assign statusItemGenrals = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "CALENDAR_STATUS"))>
-                  <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"))>
-                  <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"))>
-                  <#list statusItemGenrals as statusItem>
-                    <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
-                  </#list>                
-                  <#list statusItemTasks as statusItem>
-                    <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
-                  </#list>                
-                  <#list statusItemEvents as statusItem>
-                    <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
-                  </#list>
-                </#if>        
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td class="label">${uiLabelMap.CommonPriority}</td>
-            <td>
-              <#if project?has_content>
-                <#assign priority = project.priority?if_exists>      
-              </#if>
-              <select name="priority" size="1">
-                <#if priority?exists>          
-                  <option SELECTED value="${priority}">${priority}</option>      
-                  <option></option>
-                  <option value=1>1 (${uiLabelMap.WorkEffortPriorityHigh})</option>
-                  <option value=2>2</option>
-                  <option value=3>3</option>
-                  <option value=4>4</option>
-                  <option value=5>5</option>
-                  <option value=6>6</option>
-                  <option value=7>7</option>
-                  <option value=8>8</option>
-                  <option value=9>9 (${uiLabelMap.WorkEffortPriorityLow})</option>
-                <#else>
-                  <option></option>
-                  <option value=1>1 (${uiLabelMap.WorkEffortPriorityHigh})</option>
-                  <option value=2>2</option>
-                  <option value=3>3</option>
-                  <option value=4>4</option>
-                  <option value=5>5</option>
-                  <option value=6>6</option>
-                  <option value=7>7</option>
-                  <option value=8>8</option>
-                  <option value=9>9 (${uiLabelMap.WorkEffortPriorityLow})</option>
-                </#if>
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
-            <td>            
-              <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
-              <select name="scopeEnumId">
-                <#if project?exists>
-                  <#assign scopeEnumId = project.scopeEnumId?if_exists>            
-                  <#list enumerations as enumeration>                    
-                    <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
-                  </#list>
-                <#else>
-                  <#list enumerations as enumeration>                    
-                    <option value="${enumeration.enumId}">${enumeration.description}</option>
-                  </#list>    
-                </#if>    
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
-            <td>
-              <#if project?exists>
-                 <input type="text" name="estimatedStartDate" value="${project.estimatedStartDate?if_exists}"/>
-              <#else>
-                <input type="text" name="estimatedStartDate" value=""/>
-              </#if>
-              <a href="javascript:call_cal(document.addProjectAndAssocForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-            </td>
-          </tr>    
-          <tr>
-            <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
-            <td>
-              <#if project?exists>
-                <input type="text" name="estimatedCompletionDate" value="${project.estimatedCompletionDate?if_exists}"/>
-              <#else>
-                <input type="text" name="estimatedCompletionDate" value=""/>
-              </#if>
-              <a href="javascript:call_cal(document.addProjectAndAssocForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-            </td>
-          </tr>
-          <tr>
-            <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
-            <td>
-              <#if project?exists>
-                <input type="text" name="actualStartDate" value="${project.actualStartDate?if_exists}"/>
-              <#else>
-                <input type="text" name="actualStartDate" value=""/>
-              </#if>
-              <a href="javascript:call_cal(document.addProjectAndAssocForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-            </td>
-          </tr>
-          <tr>
-            <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
-            <td>
-              <#if project?exists>
-                <input type="text" name="actualCompletionDate" value="${project.actualCompletionDate?if_exists}"/>
-              <#else>
-                <input type="text" name="actualCompletionDate" value=""/>
-              </#if>
-              <a href="javascript:call_cal(document.addProjectAndAssocForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-            </td>
-          </tr>    
-          <tr>
-            <td>&nbsp;</td>    
-            <td>
-              <input type="submit" name="submit" value="${uiLabelMap.CommonSave}"/>
-            </td>
-          </tr>    
-        </table>    
-      </form>
-  </div>
-</div>
+<#--
+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.
+-->
+
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <#if project?has_content>
+        <li class="h3">&nbsp;${uiLabelMap.PageTitleEditSubProject}&nbsp;#${project.workEffortName?if_exists} ${uiLabelMap.CommonInformation}</li>
+      <#else>
+        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddSubProject}</li>
+      </#if>
+    </ul>
+    <br class="clear" />
+  </div>
+  <div class="screenlet-body">
+    <#assign workEffortIdFrom = parameters.workEffortIdFrom>
+    <#if project?has_content>
+      <form name="addProjectAndAssocForm" method="get" action="<@ofbizUrl>updateProjectAndAssoc</@ofbizUrl>">
+    <#else>
+      <br/>  
+      <form name="addProjectAndAssocForm" method="get" action="<@ofbizUrl>createProjectAndAssoc</@ofbizUrl>">
+    </#if>
+        <table width="100%" cellpadding="2" cellspacing="0">
+          <tr>
+            <#if !(project?exists)>
+              <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td>
+            <#else>
+              <td><input type="hidden" name="workEffortTypeId" value="${project.workEffortTypeId?if_exists}"/></td>
+              <td><input type="hidden" name="workEffortId" value="${project.workEffortId?if_exists}"/></td>
+              <td><input type="hidden" name="workEffortName" value="${project.workEffortName?if_exists}"/></td>
+            </#if>
+          </tr>
+          <tr>
+            <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/>
+            <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
+            <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
+          </tr>
+          <tr>
+            <td width="20%">
+              ${uiLabelMap.ProjectMgrSubProjectDetails}
+            </td>
+          </tr>
+          <tr>    
+            <#if project?exists>
+              <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>    
+              <td>${project.workEffortId?if_exists}</td>    
+            </#if>
+          </tr>
+          <tr>    
+            <td class="label" >${uiLabelMap.CommonName}*</td>
+            <#if project?exists>
+              <td>${project.workEffortName?if_exists} <span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+            <#else>
+              <td><input type="text" name="workEffortName" value=""/> <span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+            </#if>
+          </tr>
+          <tr>    
+            <td class="label" >${uiLabelMap.CommonDescription}</td>
+            <#if project?exists>
+              <td><input type="text" name="description" value="${project.description?if_exists}"/></td>
+            <#else>
+              <td><input type="text" name="description" value=""/></td>
+            </#if>
+          </tr>  
+          <tr>    
+            <td class="label" >${uiLabelMap.CommonStatus}</td>
+            <td>    
+              <select name="currentStatusId">
+                <#if project?exists>
+                  <#assign currentStatus = project.getRelatedOne("CurrentStatusItem")?if_exists>
+                  <option value="${currentStatus.statusId}">${currentStatus.description}</option>
+                  <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.statusId))>
+                  <#list statusValidChangeToDetailList as statusValidChangeToDetail>
+                    <option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
+                  </#list>
+                <#else>
+                  <#assign statusItemGenrals = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "CALENDAR_STATUS"))>
+                  <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"))>
+                  <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"))>
+                  <#list statusItemGenrals as statusItem>
+                    <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
+                  </#list>                
+                  <#list statusItemTasks as statusItem>
+                    <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
+                  </#list>                
+                  <#list statusItemEvents as statusItem>
+                    <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
+                  </#list>
+                </#if>        
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.CommonPriority}</td>
+            <td>
+              <#if project?has_content>
+                <#assign priority = project.priority?if_exists>      
+              </#if>
+              <select name="priority" size="1">
+                <#if priority?exists>          
+                  <option SELECTED value="${priority}">${priority}</option>
+                  <option></option>
+                  <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+                  <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+                  <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+                  <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+                  <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+                  <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+                  <option value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+                  <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+                  <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+                <#else>
+                  <option></option>
+                  <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+                  <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+                  <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+                  <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+                  <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+                  <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+                  <option value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+                  <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+                  <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+                </#if>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
+            <td>            
+              <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
+              <select name="scopeEnumId">
+                <#if project?exists>
+                  <#assign scopeEnumId = project.scopeEnumId?if_exists>            
+                  <#list enumerations as enumeration>                    
+                    <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
+                  </#list>
+                <#else>
+                  <#list enumerations as enumeration>                    
+                    <option value="${enumeration.enumId}">${enumeration.description}</option>
+                  </#list>    
+                </#if>    
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
+            <td>
+              <#if project?exists>
+                 <input type="text" name="estimatedStartDate" value="${project.estimatedStartDate?if_exists}"/>
+              <#else>
+                <input type="text" name="estimatedStartDate" value=""/>
+              </#if>
+              <a href="javascript:call_cal(document.addProjectAndAssocForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+            </td>
+          </tr>    
+          <tr>
+            <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
+            <td>
+              <#if project?exists>
+                <input type="text" name="estimatedCompletionDate" value="${project.estimatedCompletionDate?if_exists}"/>
+              <#else>
+                <input type="text" name="estimatedCompletionDate" value=""/>
+              </#if>
+              <a href="javascript:call_cal(document.addProjectAndAssocForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+            </td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
+            <td>
+              <#if project?exists>
+                <input type="text" name="actualStartDate" value="${project.actualStartDate?if_exists}"/>
+              <#else>
+                <input type="text" name="actualStartDate" value=""/>
+              </#if>
+              <a href="javascript:call_cal(document.addProjectAndAssocForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+            </td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
+            <td>
+              <#if project?exists>
+                <input type="text" name="actualCompletionDate" value="${project.actualCompletionDate?if_exists}"/>
+              <#else>
+                <input type="text" name="actualCompletionDate" value=""/>
+              </#if>
+              <a href="javascript:call_cal(document.addProjectAndAssocForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+            </td>
+          </tr>    
+          <tr>
+            <td>&nbsp;</td>    
+            <td>
+              <input type="submit" name="submit" value="${uiLabelMap.CommonSave}"/>
+            </td>
+          </tr>    
+        </table>    
+      </form>
+  </div>
+</div>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=755368&r1=755367&r2=755368&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Tue Mar 17 19:51:28 2009
@@ -1,220 +1,220 @@
-<#--
-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.
--->
-
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <#if task?has_content>
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleEditTask}&nbsp;#${project.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
-      <#else>
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddTask}</li>
-      </#if>
-    </ul>
-    <br class="clear"/>
-  </div>  
-  <div class="screenlet-body">
-    <#assign workEffortIdFrom = parameters.workEffortIdFrom>
-    <#if task?has_content>
-      <form name="addTaskAndAssocForm" method="get" action="<@ofbizUrl>updateTaskAndAssoc</@ofbizUrl>">
-    <#else>  
-      <br/>
-      <form name="addTaskAndAssocForm" method="get" action="<@ofbizUrl>createTaskAndAssoc</@ofbizUrl>">
-    </#if>
-        <table width="100%" cellpadding="2" cellspacing="0">
-        <tr>
-          <#if !(task?exists)>
-            <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td>
-          <#else>
-            <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId?if_exists}"/></td>
-            <td><input type="hidden" name="workEffortId" value="${task.workEffortId?if_exists}"/></td>
-            <td><input type="hidden" name="workEffortName" value="${task.workEffortName?if_exists}"/></td>
-          </#if>
-        </tr>    
-        <tr>
-            <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td>
-            <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
-            <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
-        </tr>
-        <tr>
-          <td width="20%">
-            ${uiLabelMap.ProjectMgrTaskDetails}
-          </td>
-        </tr>
-        <tr>
-          <td class="label" >${uiLabelMap.ProjectMgrQuickAssignPartyId}</td>
-          <td><input type="text" name="quickAssignPartyId" value=""/>
-            <a href="javascript:call_fieldlookup2(document.addTaskAndAssocForm.quickAssignPartyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a></td>
-          </td>
-        </tr>
-        <tr>    
-          <#if task?exists>
-            <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>    
-            <td>${task.workEffortId?if_exists}</td>    
-          </#if>
-        </tr>    
-        <tr>
-          <td class="label" >${uiLabelMap.CommonName}*</td>
-            <#if task?exists>
-              <td>${task.workEffortName?if_exists}<span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
-            <#else>
-              <td><input type="text" name="workEffortName" value=""/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
-            </#if>
-        </tr>
-        <tr>    
-          <td class="label" >${uiLabelMap.CommonDescription}</td>
-            <#if task?exists>
-              <td><input type="text" name="description" value="${task.description?if_exists}"/></td>
-            <#else>
-              <td><input type="text" name="description" value=""/></td>
-          </#if>
-        </tr>  
-        <tr>    
-          <td class="label" >${uiLabelMap.CommonStatus}</td>
-          <td>    
-            <select name="currentStatusId">
-              <#if task?exists>
-                <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
-                <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
-                <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
-                <#list statusValidChangeToDetailList as statusValidChangeToDetail>
-                  <option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
-                </#list>
-              <#else>
-                <#assign statusItemGenrals = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "CALENDAR_STATUS"))>
-                <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"))>
-                <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"))>
-                <#list statusItemGenrals as statusItem>
-                  <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
-                </#list>                
-                <#list statusItemTasks as statusItem>
-                  <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
-                </#list>                
-                <#list statusItemEvents as statusItem>
-                  <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
-                </#list>
-              </#if>        
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td class="label">${uiLabelMap.CommonPriority}</td>
-          <td>
-            <#if task?has_content>
-              <#assign priority = task.priority?if_exists>      
-            </#if>
-            <select name="priority" size="1">
-              <#if priority?exists>          
-                <option SELECTED value="${priority}">${priority}</option>      
-                <option></option>
-                <option value=1>1 (${uiLabelMap.WorkEffortPriorityHigh})</option>
-                <option value=2>2</option>
-                <option value=3>3</option>
-                <option value=4>4</option>
-                <option value=5>5</option>
-                <option value=6>6</option>
-                <option value=7>7</option>
-                <option value=8>8</option>
-                <option value=9>9 (${uiLabelMap.WorkEffortPriorityLow})</option>
-              <#else>
-                <option></option>
-                <option value=1>1 (${uiLabelMap.WorkEffortPriorityHigh})</option>
-                <option value=2>2</option>
-                <option value=3>3</option>
-                <option value=4>4</option>
-                <option value=5>5</option>
-                <option value=6>6</option>
-                <option value=7>7</option>
-                <option value=8>8</option>
-                <option value=9>9 (${uiLabelMap.WorkEffortPriorityLow})</option>
-              </#if>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
-          <td>            
-            <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
-            <select name="scopeEnumId">
-              <#if task?exists>
-                <#assign scopeEnumId = task.scopeEnumId?if_exists>            
-                <#list enumerations as enumeration>                    
-                  <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
-                </#list>
-              <#else>
-                <#list enumerations as enumeration>                    
-                  <option value="${enumeration.enumId}">${enumeration.description}</option>
-                </#list>    
-              </#if>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
-          <td>
-            <#if task?exists>
-              <input type="text" name="estimatedStartDate" value="${task.estimatedStartDate?if_exists}"/>
-            <#else>
-              <input type="text" name="estimatedStartDate" value=""/>
-            </#if>
-            <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-          </td>
-         </tr>    
-         <tr>
-           <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
-           <td>
-             <#if task?exists>
-               <input type="text" name="estimatedCompletionDate" value="${task.estimatedCompletionDate?if_exists}"/>
-             <#else>
-               <input type="text" name="estimatedCompletionDate" value=""/>
-             </#if>
-             <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-           </td>
-         </tr>
-         <tr>
-           <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
-           <td>
-             <#if task?exists>
-               <input type="text" name="actualStartDate" value="${task.actualStartDate?if_exists}"/>
-             <#else>
-               <input type="text" name="actualStartDate" value=""/>
-             </#if>
-             <a href="javascript:call_cal(document.addTaskAndAssocForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-           </td>
-         </tr>
-         <tr>
-           <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
-           <td>
-             <#if task?exists>
-               <input type="text" name="actualCompletionDate" value="${task.actualCompletionDate?if_exists}"/>
-             <#else>
-               <input type="text" name="actualCompletionDate" value=""/>
-             </#if>
-             <a href="javascript:call_cal(document.addTaskAndAssocForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-           </td>
-         </tr>    
-         <tr>
-           <td>&nbsp;</td>    
-           <td>
-             <input type="submit" name="submit" value="${uiLabelMap.CommonSave}"/>
-           </td>
-         </tr>    
-       </table>
-     </form>
-   </div>
-</div>
+<#--
+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.
+-->
+
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <#if task?has_content>
+        <li class="h3">&nbsp;${uiLabelMap.PageTitleEditTask}&nbsp;#${project.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
+      <#else>
+        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddTask}</li>
+      </#if>
+    </ul>
+    <br class="clear"/>
+  </div>  
+  <div class="screenlet-body">
+    <#assign workEffortIdFrom = parameters.workEffortIdFrom>
+    <#if task?has_content>
+      <form name="addTaskAndAssocForm" method="get" action="<@ofbizUrl>updateTaskAndAssoc</@ofbizUrl>">
+    <#else>  
+      <br/>
+      <form name="addTaskAndAssocForm" method="get" action="<@ofbizUrl>createTaskAndAssoc</@ofbizUrl>">
+    </#if>
+        <table width="100%" cellpadding="2" cellspacing="0">
+        <tr>
+          <#if !(task?exists)>
+            <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td>
+          <#else>
+            <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId?if_exists}"/></td>
+            <td><input type="hidden" name="workEffortId" value="${task.workEffortId?if_exists}"/></td>
+            <td><input type="hidden" name="workEffortName" value="${task.workEffortName?if_exists}"/></td>
+          </#if>
+        </tr>    
+        <tr>
+            <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td>
+            <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
+            <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
+        </tr>
+        <tr>
+          <td width="20%">
+            ${uiLabelMap.ProjectMgrTaskDetails}
+          </td>
+        </tr>
+        <tr>
+          <td class="label" >${uiLabelMap.ProjectMgrQuickAssignPartyId}</td>
+          <td><input type="text" name="quickAssignPartyId" value=""/>
+            <a href="javascript:call_fieldlookup2(document.addTaskAndAssocForm.quickAssignPartyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a></td>
+          </td>
+        </tr>
+        <tr>    
+          <#if task?exists>
+            <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>    
+            <td>${task.workEffortId?if_exists}</td>    
+          </#if>
+        </tr>    
+        <tr>
+          <td class="label" >${uiLabelMap.CommonName}*</td>
+            <#if task?exists>
+              <td>${task.workEffortName?if_exists}<span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+            <#else>
+              <td><input type="text" name="workEffortName" value=""/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+            </#if>
+        </tr>
+        <tr>    
+          <td class="label" >${uiLabelMap.CommonDescription}</td>
+            <#if task?exists>
+              <td><input type="text" name="description" value="${task.description?if_exists}"/></td>
+            <#else>
+              <td><input type="text" name="description" value=""/></td>
+          </#if>
+        </tr>  
+        <tr>    
+          <td class="label" >${uiLabelMap.CommonStatus}</td>
+          <td>    
+            <select name="currentStatusId">
+              <#if task?exists>
+                <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
+                <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
+                <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
+                <#list statusValidChangeToDetailList as statusValidChangeToDetail>
+                  <option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
+                </#list>
+              <#else>
+                <#assign statusItemGenrals = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "CALENDAR_STATUS"))>
+                <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"))>
+                <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"))>
+                <#list statusItemGenrals as statusItem>
+                  <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
+                </#list>                
+                <#list statusItemTasks as statusItem>
+                  <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
+                </#list>                
+                <#list statusItemEvents as statusItem>
+                  <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
+                </#list>
+              </#if>        
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.CommonPriority}</td>
+          <td>
+            <#if task?has_content>
+              <#assign priority = task.priority?if_exists>      
+            </#if>
+            <select name="priority" size="1">
+              <#if priority?exists>          
+                <option SELECTED value="${priority}">${priority}</option>
+                <option></option>
+                <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+                <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+                <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+                <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+                <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+                <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+                <option value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+                <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+                <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+              <#else>
+                <option></option>
+                <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+                <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+                <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+                <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+                <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+                <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+                <option value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+                <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+                <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+              </#if>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
+          <td>            
+            <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
+            <select name="scopeEnumId">
+              <#if task?exists>
+                <#assign scopeEnumId = task.scopeEnumId?if_exists>            
+                <#list enumerations as enumeration>                    
+                  <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
+                </#list>
+              <#else>
+                <#list enumerations as enumeration>                    
+                  <option value="${enumeration.enumId}">${enumeration.description}</option>
+                </#list>    
+              </#if>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
+          <td>
+            <#if task?exists>
+              <input type="text" name="estimatedStartDate" value="${task.estimatedStartDate?if_exists}"/>
+            <#else>
+              <input type="text" name="estimatedStartDate" value=""/>
+            </#if>
+            <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+          </td>
+         </tr>    
+         <tr>
+           <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
+           <td>
+             <#if task?exists>
+               <input type="text" name="estimatedCompletionDate" value="${task.estimatedCompletionDate?if_exists}"/>
+             <#else>
+               <input type="text" name="estimatedCompletionDate" value=""/>
+             </#if>
+             <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+           </td>
+         </tr>
+         <tr>
+           <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
+           <td>
+             <#if task?exists>
+               <input type="text" name="actualStartDate" value="${task.actualStartDate?if_exists}"/>
+             <#else>
+               <input type="text" name="actualStartDate" value=""/>
+             </#if>
+             <a href="javascript:call_cal(document.addTaskAndAssocForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+           </td>
+         </tr>
+         <tr>
+           <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
+           <td>
+             <#if task?exists>
+               <input type="text" name="actualCompletionDate" value="${task.actualCompletionDate?if_exists}"/>
+             <#else>
+               <input type="text" name="actualCompletionDate" value=""/>
+             </#if>
+             <a href="javascript:call_cal(document.addTaskAndAssocForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+           </td>
+         </tr>    
+         <tr>
+           <td>&nbsp;</td>    
+           <td>
+             <input type="submit" name="submit" value="${uiLabelMap.CommonSave}"/>
+           </td>
+         </tr>    
+       </table>
+     </form>
+   </div>
+</div>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl?rev=755368&r1=755367&r2=755368&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl Tue Mar 17 19:51:28 2009
@@ -1,245 +1,245 @@
-<#--
-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.
--->
-
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <ul>
-      <#if task?has_content>
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleEditTask}&nbsp;#${task.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
-      <#else>
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddTask}</li>
-      </#if>
-    </ul>
-    <br class="clear" />
-  </div>  
-  <div class="screenlet-body">
-    <#if task?has_content>
-      <a href="<@ofbizUrl>EditTaskList?DONE_PAGE=${donePage}</@ofbizUrl>"></a>
-      <form name="editTaskForm" action="<@ofbizUrl>updateTaskListandAssoc</@ofbizUrl>">
-    <#else>
-      <form name="editTaskForm" action="<@ofbizUrl>createTaskList</@ofbizUrl>">
-    </#if>
-        <table width="100%" cellpadding="2" cellspacing="0" border="0">
-          <tr>
-            <#if !(task?exists)>
-              <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td>
-            <#else>
-              <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId?if_exists}"/></td>
-              <td><input type="hidden" name="workEffortId" value="${task.workEffortId?if_exists}"/></td>  
-              <td><input type="hidden" name="workEffortName" value="${task.workEffortName?if_exists}"/></td>
-            </#if>
-          </tr>
-          <#if task?has_content>
-            <tr>
-              <td><div class="h1">${uiLabelMap.PageTitleAddTask}</div></td>
-              <td><div class="headtext">${uiLabelMap.WorkEffortAssociatedFromParentToChild}</div></td>  
-              </tr>
-              <tr>
-                <td class="label" >${uiLabelMap.ProjectMgrWorkEffortIdFrom}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</td>
-                <td>
-                  <input type="text" size="20"  name="workEffortIdFrom">
-                  <a href="javascript:call_fieldlookup2(document.editTaskForm.workEffortIdFrom,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a></td>
-                </td>
-              </tr>
-              <tr>
-                <td class="label" >${uiLabelMap.ProjectMgrWorkEffortAssocTypeId}</td>
-                <td>
-                  <select name="workEffortAssocTypeId">
-                    <#assign WorkEffortAssocTypes = delegator.findList("WorkEffortAssocType", null, null, Static["org.ofbiz.base.util.UtilMisc"].toList("description"), null, false)>
-                    <#list WorkEffortAssocTypes as WorkEffortAssocType>
-                      <option value="${WorkEffortAssocType.workEffortAssocTypeId?if_exists}">${WorkEffortAssocType.description?if_exists}</option>
-                    </#list>
-                  </select>  
-                </td>
-              </tr>
-              <tr>
-                <td class="label" >${uiLabelMap.CommonSequenceNum}</td>
-                <td><input type="text" name="sequenceNum" value=""/></td>
-              </tr>
-              <tr>
-                <td class="label" >${uiLabelMap.CommonFromDate}</td>
-                <td>
-                  <input type="text" size="20" name="fromDate"/>
-                  <a href="javascript:call_cal(document.addProjectAndAssocForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-                </td>
-              </tr>
-              <tr>
-                <td class="label" >${uiLabelMap.CommonThruDate}</td>
-                <td>
-                  <input type="text" size="20" name="thruDate"/>
-                  <a href="javascript:call_cal(document.addProjectAndAssocForm.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-                </td>
-              </tr>
-            </#if>  
-            <tr>    
-              <#if task?exists>
-                <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>    
-                <td>${task.workEffortId?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td>    
-              </#if>
-            </tr>    
-            <tr>
-              <td class="label" >${uiLabelMap.CommonName}*</td>
-              <#if task?exists>
-                <td>${task.workEffortName?if_exists}</td>
-              <#else>
-                <td><input type="text" name="workEffortName" value=""/></td>
-              </#if>
-            </tr>
-            <tr>    
-              <td class="label" >${uiLabelMap.CommonDescription}</td>
-              <#if task?exists>
-                <td><input type="text" name="description" value="${task.description?if_exists}"/></td>
-              <#else>
-                <td><input type="text" name="description" value=""/></td>
-              </#if>
-            </tr>  
-            <tr>    
-              <td class="label" >${uiLabelMap.CommonStatus}</td>
-              <td>    
-                <select name="currentStatusId">
-                  <#if task?exists>
-                    <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
-                    <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
-                    <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
-                    <#list statusValidChangeToDetailList as statusValidChangeToDetail>
-                      <option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
-                    </#list>
-                  <#else>
-                    <#assign statusItemGenrals = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "CALENDAR_STATUS"))>
-                    <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"))>
-                    <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"))>
-                    <#list statusItemGenrals as statusItem>
-                      <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
-                    </#list>                
-                    <#list statusItemTasks as statusItem>
-                      <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
-                    </#list>                
-                    <#list statusItemEvents as statusItem>
-                      <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
-                    </#list>
-                  </#if>        
-                </select>
-              </td>
-             </tr>
-             <tr>
-               <td class="label">${uiLabelMap.CommonPriority}</td>
-               <td>
-                 <#if task?has_content>
-                   <#assign priority = task.priority?if_exists>      
-                 </#if>
-                 <select name="priority" size="1">
-                   <#if priority?exists>          
-                     <option SELECTED value="${priority}">${priority}</option>      
-                     <option></option>
-                     <option value=1>1 (${uiLabelMap.WorkEffortPriorityHigh})</option>
-                     <option value=2>2</option>
-                     <option value=3>3</option>
-                     <option value=4>4</option>
-                     <option value=5>5</option>
-                     <option value=6>6</option>
-                     <option value=7>7</option>
-                     <option value=8>8</option>
-                     <option value=9>9 (${uiLabelMap.WorkEffortPriorityLow})</option>
-                   <#else>
-                     <option></option>
-                     <option value=1>1 (${uiLabelMap.WorkEffortPriorityHigh})</option>
-                     <option value=2>2</option>
-                     <option value=3>3</option>
-                     <option value=4>4</option>
-                     <option value=5>5</option>
-                     <option value=6>6</option>
-                     <option value=7>7</option>
-                     <option value=8>8</option>
-                     <option value=9>9 (${uiLabelMap.WorkEffortPriorityLow})</option>
-                   </#if>
-                 </select>
-               </td>
-             </tr>
-             <tr>
-               <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
-               <td>            
-                 <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
-                 <select name="scopeEnumId">
-                   <#if task?exists>
-                     <#assign scopeEnumId = task.scopeEnumId?if_exists>            
-                     <#list enumerations as enumeration>                    
-                       <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
-                     </#list>
-                   <#else>
-                     <#list enumerations as enumeration>                    
-                       <option value="${enumeration.enumId}">${enumeration.description}</option>
-                     </#list>    
-                   </#if>
-                 </select>
-               </td>
-             </tr>
-             <tr>
-               <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
-               <td>
-                 <#if task?exists>
-                   <input type="text" name="estimatedStartDate" value="${task.estimatedStartDate?if_exists}"/>
-                 <#else>
-                   <input type="text" name="estimatedStartDate" value=""/>
-                 </#if>
-                 <a href="javascript:call_cal(document.editTaskForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-               </td>
-             </tr>    
-             <tr>
-               <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
-               <td>
-                 <#if task?exists>
-                   <input type="text" name="estimatedCompletionDate" value="${task.estimatedCompletionDate?if_exists}"/>
-                 <#else>
-                   <input type="text" name="estimatedCompletionDate" value=""/>
-                 </#if>
-                 <a href="javascript:call_cal(document.editTaskForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-               </td>
-             </tr>
-             <tr>
-               <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
-               <td>
-                 <#if task?exists>
-                   <input type="text" name="actualStartDate" value="${task.actualStartDate?if_exists}"/>
-                 <#else>
-                   <input type="text" name="actualStartDate" value=""/>
-                 </#if>
-                 <a href="javascript:call_cal(document.editTaskForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-               </td>
-             </tr>
-             <tr>
-               <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
-               <td>
-                 <#if task?exists>
-                   <input type="text" name="actualCompletionDate" value="${task.actualCompletionDate?if_exists}"/>
-                 <#else>
-                   <input type="text" name="actualCompletionDate" value=""/>
-                 </#if>
-                 <a href="javascript:call_cal(document.editTaskForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-               </td>
-             </tr>    
-             <tr>
-               <td>&nbsp;</td>    
-               <td>
-                 <input type="submit" name="submit" value="${uiLabelMap.CommonSave}"/>
-               </td>
-             </tr>    
-          </table>    
-       </form>
-  </div>
-</div>
+<#--
+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.
+-->
+
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <#if task?has_content>
+        <li class="h3">&nbsp;${uiLabelMap.PageTitleEditTask}&nbsp;#${task.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
+      <#else>
+        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddTask}</li>
+      </#if>
+    </ul>
+    <br class="clear" />
+  </div>  
+  <div class="screenlet-body">
+    <#if task?has_content>
+      <a href="<@ofbizUrl>EditTaskList?DONE_PAGE=${donePage}</@ofbizUrl>"></a>
+      <form name="editTaskForm" action="<@ofbizUrl>updateTaskListandAssoc</@ofbizUrl>">
+    <#else>
+      <form name="editTaskForm" action="<@ofbizUrl>createTaskList</@ofbizUrl>">
+    </#if>
+        <table width="100%" cellpadding="2" cellspacing="0" border="0">
+          <tr>
+            <#if !(task?exists)>
+              <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td>
+            <#else>
+              <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId?if_exists}"/></td>
+              <td><input type="hidden" name="workEffortId" value="${task.workEffortId?if_exists}"/></td>  
+              <td><input type="hidden" name="workEffortName" value="${task.workEffortName?if_exists}"/></td>
+            </#if>
+          </tr>
+          <#if task?has_content>
+            <tr>
+              <td><div class="h1">${uiLabelMap.PageTitleAddTask}</div></td>
+              <td><div class="headtext">${uiLabelMap.WorkEffortAssociatedFromParentToChild}</div></td>  
+              </tr>
+              <tr>
+                <td class="label" >${uiLabelMap.ProjectMgrWorkEffortIdFrom}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</td>
+                <td>
+                  <input type="text" size="20"  name="workEffortIdFrom">
+                  <a href="javascript:call_fieldlookup2(document.editTaskForm.workEffortIdFrom,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a></td>
+                </td>
+              </tr>
+              <tr>
+                <td class="label" >${uiLabelMap.ProjectMgrWorkEffortAssocTypeId}</td>
+                <td>
+                  <select name="workEffortAssocTypeId">
+                    <#assign WorkEffortAssocTypes = delegator.findList("WorkEffortAssocType", null, null, Static["org.ofbiz.base.util.UtilMisc"].toList("description"), null, false)>
+                    <#list WorkEffortAssocTypes as WorkEffortAssocType>
+                      <option value="${WorkEffortAssocType.workEffortAssocTypeId?if_exists}">${WorkEffortAssocType.description?if_exists}</option>
+                    </#list>
+                  </select>  
+                </td>
+              </tr>
+              <tr>
+                <td class="label" >${uiLabelMap.CommonSequenceNum}</td>
+                <td><input type="text" name="sequenceNum" value=""/></td>
+              </tr>
+              <tr>
+                <td class="label" >${uiLabelMap.CommonFromDate}</td>
+                <td>
+                  <input type="text" size="20" name="fromDate"/>
+                  <a href="javascript:call_cal(document.addProjectAndAssocForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                </td>
+              </tr>
+              <tr>
+                <td class="label" >${uiLabelMap.CommonThruDate}</td>
+                <td>
+                  <input type="text" size="20" name="thruDate"/>
+                  <a href="javascript:call_cal(document.addProjectAndAssocForm.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                </td>
+              </tr>
+            </#if>  
+            <tr>    
+              <#if task?exists>
+                <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>    
+                <td>${task.workEffortId?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td>    
+              </#if>
+            </tr>    
+            <tr>
+              <td class="label" >${uiLabelMap.CommonName}*</td>
+              <#if task?exists>
+                <td>${task.workEffortName?if_exists}</td>
+              <#else>
+                <td><input type="text" name="workEffortName" value=""/></td>
+              </#if>
+            </tr>
+            <tr>    
+              <td class="label" >${uiLabelMap.CommonDescription}</td>
+              <#if task?exists>
+                <td><input type="text" name="description" value="${task.description?if_exists}"/></td>
+              <#else>
+                <td><input type="text" name="description" value=""/></td>
+              </#if>
+            </tr>  
+            <tr>    
+              <td class="label" >${uiLabelMap.CommonStatus}</td>
+              <td>    
+                <select name="currentStatusId">
+                  <#if task?exists>
+                    <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
+                    <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
+                    <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
+                    <#list statusValidChangeToDetailList as statusValidChangeToDetail>
+                      <option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
+                    </#list>
+                  <#else>
+                    <#assign statusItemGenrals = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "CALENDAR_STATUS"))>
+                    <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"))>
+                    <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"))>
+                    <#list statusItemGenrals as statusItem>
+                      <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
+                    </#list>                
+                    <#list statusItemTasks as statusItem>
+                      <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
+                    </#list>                
+                    <#list statusItemEvents as statusItem>
+                      <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
+                    </#list>
+                  </#if>        
+                </select>
+              </td>
+             </tr>
+             <tr>
+               <td class="label">${uiLabelMap.CommonPriority}</td>
+               <td>
+                 <#if task?has_content>
+                   <#assign priority = task.priority?if_exists>      
+                 </#if>
+                 <select name="priority" size="1">
+                   <#if priority?exists>
+                     <option SELECTED value="${priority}">${priority}</option>
+                     <option></option>
+                     <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+                     <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+                     <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+                     <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+                     <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+                     <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+                     <option value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+                     <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+                     <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+                   <#else>
+                     <option></option>
+                     <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+                     <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+                     <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+                     <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+                     <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+                     <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+                     <option value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+                     <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+                     <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+                   </#if>
+                 </select>
+               </td>
+             </tr>
+             <tr>
+               <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
+               <td>            
+                 <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
+                 <select name="scopeEnumId">
+                   <#if task?exists>
+                     <#assign scopeEnumId = task.scopeEnumId?if_exists>            
+                     <#list enumerations as enumeration>                    
+                       <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
+                     </#list>
+                   <#else>
+                     <#list enumerations as enumeration>                    
+                       <option value="${enumeration.enumId}">${enumeration.description}</option>
+                     </#list>    
+                   </#if>
+                 </select>
+               </td>
+             </tr>
+             <tr>
+               <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
+               <td>
+                 <#if task?exists>
+                   <input type="text" name="estimatedStartDate" value="${task.estimatedStartDate?if_exists}"/>
+                 <#else>
+                   <input type="text" name="estimatedStartDate" value=""/>
+                 </#if>
+                 <a href="javascript:call_cal(document.editTaskForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+               </td>
+             </tr>    
+             <tr>
+               <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
+               <td>
+                 <#if task?exists>
+                   <input type="text" name="estimatedCompletionDate" value="${task.estimatedCompletionDate?if_exists}"/>
+                 <#else>
+                   <input type="text" name="estimatedCompletionDate" value=""/>
+                 </#if>
+                 <a href="javascript:call_cal(document.editTaskForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+               </td>
+             </tr>
+             <tr>
+               <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
+               <td>
+                 <#if task?exists>
+                   <input type="text" name="actualStartDate" value="${task.actualStartDate?if_exists}"/>
+                 <#else>
+                   <input type="text" name="actualStartDate" value=""/>
+                 </#if>
+                 <a href="javascript:call_cal(document.editTaskForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+               </td>
+             </tr>
+             <tr>
+               <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
+               <td>
+                 <#if task?exists>
+                   <input type="text" name="actualCompletionDate" value="${task.actualCompletionDate?if_exists}"/>
+                 <#else>
+                   <input type="text" name="actualCompletionDate" value=""/>
+                 </#if>
+                 <a href="javascript:call_cal(document.editTaskForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+               </td>
+             </tr>    
+             <tr>
+               <td>&nbsp;</td>    
+               <td>
+                 <input type="submit" name="submit" value="${uiLabelMap.CommonSave}"/>
+               </td>
+             </tr>    
+          </table>    
+       </form>
+  </div>
+</div>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain