svn commit: r677670 - in /ofbiz/trunk/applications/work
Locked
 
|
Author: adrianc
Date: Thu Jul 17 11:25:16 2008 New Revision: 677670 URL: http://svn.apache.org/viewvc?rev=677670&view=rev Log: Reverting my last commit - I was a bit hasty. This will require more thought. Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=677670&r1=677669&r2=677670&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Thu Jul 17 11:25:16 2008 @@ -16,10 +16,6 @@ specific language governing permissions and limitations under the License. --> - -<#-- The allowAddItem variable is used by components that reuse the WorkEffort -calendar to control if the "Add New" links appear --> -<#assign allowAddItem = allowAddItem?default(false)/> <div class="screenlet-title-bar"> <ul> <li class="h3">${start?date?string("EEEE")?cap_first} ${start?date?string.long}</li> @@ -46,9 +42,7 @@ <tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>> <td class="label"> ${period.start?time?string.short}<br/> - <#if allowAddItem> - <a href="<@ofbizUrl>EditWorkEffort?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> - </#if> + <a href="<@ofbizUrl>EditWorkEffort?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> <#if calEntry.startOfPeriod> 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=677670&r1=677669&r2=677670&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Thu Jul 17 11:25:16 2008 @@ -16,11 +16,6 @@ specific language governing permissions and limitations under the License. --> - -<#-- The allowAddItem variable is used by components that reuse the WorkEffort -calendar to control if the "Add New" links appear --> -<#assign allowAddItem = allowAddItem?default(false)/> - <style type="text/css"> .calendar tr td { height: 8em; @@ -63,9 +58,7 @@ </#if> <td<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>> <span class="h1"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span> - <#if allowAddItem> - <a class="add-new" href='<@ofbizUrl>EditWorkEffort?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> - </#if> + <a class="add-new" href='<@ofbizUrl>EditWorkEffort?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> <br class="clear"/> <#list period.calendarEntries as calEntry> <hr/> 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=677670&r1=677669&r2=677670&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Thu Jul 17 11:25:16 2008 @@ -16,10 +16,6 @@ specific language governing permissions and limitations under the License. --> - -<#-- The allowAddItem variable is used by components that reuse the WorkEffort -calendar to control if the "Add New" links appear --> -<#assign allowAddItem = allowAddItem?default(false)/> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.CommonWeek} ${start?date?string("w")}</li> @@ -46,9 +42,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="<@ofbizUrl>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/> - <#if allowAddItem> - <a href="<@ofbizUrl>EditWorkEffort?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> - </#if> + <a href="<@ofbizUrl>EditWorkEffort?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> <#if calEntry.startOfPeriod> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=677670&r1=677669&r2=677670&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Thu Jul 17 11:25:16 2008 @@ -27,7 +27,6 @@ <set field="titleProperty" value="PageTitleCalendarDay"/> <set field="headerItem" value="calendar"/> <set field="tabButtonItem" value="day"/> - <set field="allowAddItem" value="true" type="Boolean"/> <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/> </actions> <widgets> @@ -48,7 +47,6 @@ <set field="titleProperty" value="PageTitleCalendarWeek"/> <set field="headerItem" value="calendar"/> <set field="tabButtonItem" value="week"/> - <set field="allowAddItem" value="true" type="Boolean"/> <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/> </actions> <widgets> @@ -69,7 +67,6 @@ <set field="titleProperty" value="PageTitleCalendarMonth"/> <set field="headerItem" value="calendar"/> <set field="tabButtonItem" value="month"/> - <set field="allowAddItem" value="true" type="Boolean"/> <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |