Author: hansbak
Date: Sun Jun 28 03:29:33 2009
New Revision: 789040
URL: http://svn.apache.org/viewvc?rev=789040&view=rev
Log:
small corrections to move between week/month/day
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
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=789040&r1=789039&r2=789040&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
Sun Jun 28 03:29:33 2009
@@ -81,7 +81,7 @@
${startDate?time?string.short}-${completionDate?time?string.short}
</#if>
<br/>
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=show&period=day&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>"
class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> ${calEntry.eventStatus?default(" ")}
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=show&period=month&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@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=789040&r1=789039&r2=789040&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Sun
Jun 28 03:29:33 2009
@@ -32,7 +32,7 @@
<#if (nowTimestamp >= period.start) && (nowTimestamp <=
period.end)><#assign currentPeriod = true/></#if>
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&start=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br/>
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@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}&workEffortTypeId=EVENT¤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}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>