Author: adrianc
Date: Thu Jan 5 17:28:52 2012
New Revision: 1227713
URL: http://svn.apache.org/viewvc?rev=1227713&view=rev
Log:
Cleaned up Work Effort Calendar UI layout.
Modified:
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1227713&r1=1227712&r2=1227713&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Thu Jan 5
17:28:52 2012
@@ -50,7 +50,7 @@ under the License.
<widgets>
<include-screen name="eventDetail"/>
<container style="bothclear">
- <screenlet title="${uiLabelMap.WorkEffortDayView}:
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM
d, yyyy", timeZone, locale)}" navigation-menu-name="Day">
+ <screenlet title="${uiLabelMap.WorkEffortDayView}:
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM
d, yyyy", timeZone, locale)}" navigation-menu-name="Day" padded="false">
<include-menu name="Day"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
<platform-specific>
<html><html-template
location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
@@ -72,7 +72,7 @@ under the License.
<widgets>
<include-screen name="eventDetail"/>
<container style="bothclear">
- <screenlet title="${uiLabelMap.WorkEffortWeekView}:
${uiLabelMap.CommonWeek}
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w",
timeZone, locale)}" navigation-menu-name="Week">
+ <screenlet title="${uiLabelMap.WorkEffortWeekView}:
${uiLabelMap.CommonWeek}
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w",
timeZone, locale)}" navigation-menu-name="Week" padded="false">
<include-menu name="Week"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
<platform-specific>
<html><html-template
location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
@@ -91,7 +91,7 @@ under the License.
<widgets>
<include-screen name="eventDetail"/>
<container style="bothclear">
- <screenlet title="${uiLabelMap.WorkEffortMonthView}:
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM
yyyy", timeZone, locale)}" navigation-menu-name="Month">
+ <screenlet title="${uiLabelMap.WorkEffortMonthView}:
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM
yyyy", timeZone, locale)}" navigation-menu-name="Month" padded="false">
<include-menu name="Month"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
<platform-specific>
<html><html-template
location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=1227713&r1=1227712&r2=1227713&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Thu Jan 5
17:28:52 2012
@@ -149,27 +149,23 @@ under the License.
<screen name="CommonCalendarDecorator">
<section>
<actions>
- <set field="headerItem" value="calendar"/>
+ <set field="headerItem" value="calendar" />
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
- <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW" />
</condition>
<actions>
- <script
location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/>
+ <script
location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"
/>
</actions>
<widgets>
- <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
- <decorator-section name="search-options">
- <include-form
name="FilterCalendarEvents"
location="component://workeffort/widget/CalendarForms.xml"/>
- </decorator-section>
- <decorator-section name="search-results">
- <decorator-section-include
name="body"/>
- </decorator-section>
- </decorator-screen>
+ <screenlet id="calendarOptions"
name="calendarOptionsScreenlet" collapsible="true"
title="${uiLabelMap.WorkEffortCalendarFindEntries}">
+ <include-form name="FilterCalendarEvents"
location="component://workeffort/widget/CalendarForms.xml" />
+ </screenlet>
+ <decorator-section-include name="body" />
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.WorkEffortViewPermissionError}</label>
