You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/06/04 01:51:07 UTC
svn commit: r662923 - in /ofbiz/trunk/applications/workeffort:
webapp/workeffort/task/mytasks.ftl widget/WorkEffortScreens.xml
Author: adrianc
Date: Tue Jun 3 16:51:07 2008
New Revision: 662923
URL: http://svn.apache.org/viewvc?rev=662923&view=rev
Log:
Improved Workeffort Task List,
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=662923&r1=662922&r2=662923&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl Tue Jun 3 16:51:07 2008
@@ -16,20 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-
-<#setting locale = locale.toString()>
-<#setting time_zone = timeZone.getID()>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.WorkEffortMyCurrentTaskList}</li>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.WorkEffortNewTask}</a></li>
- </ul>
- <br class="clear"/>
- </div>
- <h3>${uiLabelMap.WorkEffortAssignedTasks}</h3>
+<h1>${uiLabelMap.PageTitleViewActivityAndTaskList}</h1>
+<div class="button-bar">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WorkEffortNewTask}</a>
+</div>
+ <h2>${uiLabelMap.WorkEffortAssignedTasks}</h2>
+ <br/>
<table class="basic-table hover-bar" cellspacing="0">
- <tr class="header-row">
+ <tr class="header-row-2">
<td>${uiLabelMap.CommonStartDateTime}</td>
<td>${uiLabelMap.WorkEffortPriority}</td>
<td>${uiLabelMap.WorkEffortStatus}</td>
@@ -49,9 +43,10 @@
</#list>
</table>
<#if (activities.size() > 0)>
- <h3>${uiLabelMap.WorkEffortWorkflowActivitiesUser}</h3>
+ <h2>${uiLabelMap.WorkEffortWorkflowActivitiesUser}</h2>
+ <br/>
<table class="basic-table hover-bar" cellspacing="0">
- <tr class="header-row">
+ <tr class="header-row-2">
<td>${uiLabelMap.CommonStartDateTime}</td>
<td>${uiLabelMap.WorkEffortPriority}</td>
<td>${uiLabelMap.WorkEffortActivityStatus}</td>
@@ -78,9 +73,10 @@
</table>
</#if>
<#if (roleActivities.size() > 0)>
- <h3>${uiLabelMap.WorkEffortWorkflowActivitiesUserRole}</h3>
+ <h2>${uiLabelMap.WorkEffortWorkflowActivitiesUserRole}</h2>
+ <br/>
<table class="basic-table hover-bar" cellspacing="0">
- <tr class="header-row">
+ <tr class="header-row-2">
<td>${uiLabelMap.CommonStartDateTime}</td>
<td>${uiLabelMap.WorkEffortPriority}</td>
<td>${uiLabelMap.WorkEffortActivityStatus}</td>
@@ -107,9 +103,10 @@
</table>
</#if>
<#if (groupActivities.size() > 0)>
- <h3>${uiLabelMap.WorkEffortWorkflowActivitiesUserGroup}</h3>
+ <h2>${uiLabelMap.WorkEffortWorkflowActivitiesUserGroup}</h2>
+ <br/>
<table class="basic-table hover-bar" cellspacing="0">
- <tr class="header-row">
+ <tr class="header-row-2">
<td>${uiLabelMap.CommonStartDateTime}</td>
<td>${uiLabelMap.WorkEffortPriority}</td>
<td>${uiLabelMap.WorkEffortActivityStatus}</td>
@@ -135,4 +132,3 @@
</#list>
</table>
</#if>
-</div>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=662923&r1=662922&r2=662923&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Jun 3 16:51:07 2008
@@ -82,7 +82,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
+ <if-service-permission service-name="workEffortGenericPermission" main-action="VIEW"/>
</condition>
<widgets>
<platform-specific><html><html-template location="component://workeffort/webapp/workeffort/task/mytasks.ftl"/></html></platform-specific>