You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/08/08 09:20:31 UTC
svn commit: r802308 [2/2] - in /ofbiz/trunk/applications: humanres/config/
humanres/data/ humanres/entitydef/ humanres/script/org/ofbiz/humanres/
humanres/servicedef/ humanres/webapp/humanres/WEB-INF/ humanres/widget/
humanres/widget/forms/ workeffort/...
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=802308&r1=802307&r2=802308&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Sat Aug 8 07:20:30 2009
@@ -49,7 +49,7 @@
</#if>
<td<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<span class="h1"><a href='<@o...@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
- <a class="add-new" href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=month&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</...@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+ <a class="add-new" href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=month&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</...@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
<br class="clear"/>
<#list period.calendarEntries as calEntry>
@@ -84,7 +84,7 @@
${startDate?time?string.short}-${completionDate?time?string.short}
</#if>
<br/>
- <a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> ${calEntry.eventStatus?default(" ")}
+ <a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> ${calEntry.eventStatus?default(" ")}
<br/>
</#list>
</td>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=802308&r1=802307&r2=802308&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Sat Aug 8 07:20:30 2009
@@ -33,7 +33,7 @@
<tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
<a href="<@o...@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br/>
- <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate?exists>
@@ -70,7 +70,7 @@
<#else>
${startDate?time?string.short}-${completionDate?time?string.short}
</#if>
- <br/><a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
+ <br/><a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
</#if>
</#list>
<#if (period.calendarEntries?size < maxConcurrentEntries)>