You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/15 22:53:12 UTC
svn commit: r815479 [3/3] - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortEntityLabels.xml config/WorkEffortUiLabels.xml
widget/CalendarForms.xml widget/CalendarScreens.xml
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml?rev=815479&r1=815478&r2=815479&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml Tue Sep 15 20:53:11 2009
@@ -69,7 +69,7 @@
<form name="cancelEvent" type="single" target="updateWorkEffort">
<field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
<field name="currentStatusId"><hidden value="CAL_CANCELLED"/></field>
- <field name="cancel" title="Cancel the Event"><submit/></field>
+ <field name="cancel" title="${uiLabelMap.WorkEffortCancelCalendarEvent}"><submit/></field>
</form>
<form name="showCalEvent" type="single" default-map-name="workEffort">
<field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
@@ -106,7 +106,7 @@
</field>
</form>
<form name="showCalEventRolesDel" type="list" extends="showCalEventRoles" target="deleteWorkEffortPartyAssign">
- <field name="remove"><submit/></field>
+ <field name="remove" title="${uiLabelMap.CommonRemove}"><submit/></field>
</form>
<form name="addCalEventRole" type="single" target="createWorkEffortPartyAssign">
<field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
@@ -120,7 +120,7 @@
</entity-options>
</drop-down>
</field>
- <field name="add"><submit/></field>
+ <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
</form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=815479&r1=815478&r2=815479&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Tue Sep 15 20:53:11 2009
@@ -40,13 +40,15 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/>
</actions>
<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">
<include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/>
- <include-screen name="eventDetail"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
</platform-specific>
</screenlet>
+ </container>
</widgets>
</section>
<section>
@@ -60,13 +62,15 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/>
</actions>
<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">
<include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/>
- <include-screen name="eventDetail"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
</platform-specific>
</screenlet>
+ </container>
</widgets>
</section>
<section>
@@ -77,13 +81,15 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/>
</actions>
<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">
<include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/>
- <include-screen name="eventDetail"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
</platform-specific>
</screenlet>
+ </container>
</widgets>
</section>
<section>
@@ -94,12 +100,15 @@
<script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy"/>
</actions>
<widgets>
+ <include-screen name="eventDetail"/>
+ <container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}" navigation-menu-name="Upcoming">
<include-menu name="Upcoming" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/upcoming.ftl"/></html>
</platform-specific>
</screenlet>
+ </container>
</widgets>
</section>
</widgets>
@@ -154,12 +163,21 @@
</and>
</condition>
<widgets><!-- edit section -->
- <container style="lefthalf">
- <label style="h1" text="Add/Edit a Calendar Event"/>
- <include-form name="editCalEvent" location="component://workeffort/widget/CalendarForms.xml"/>
+ <container style="lefthalf" >
+ <screenlet title="${uiLabelMap.WorkEffortAddCalendarEvent}">
+ <section>
+ <condition>
+ <not><if-empty field="workEffort"/></not>
+ </condition>
+ <widgets>
+ <include-form name="cancelEvent" location="component://workeffort/widget/CalendarForms.xml"/>
+ </widgets>
+ </section>
+ <include-form name="editCalEvent" location="component://workeffort/widget/CalendarForms.xml"/>
+ </screenlet>
</container>
<container style="righthalf">
- <label style="h1" text="Participants"/>
+ <screenlet title="${uiLabelMap.WorkEffortParticipants}">
<include-form name="showCalEventRolesDel" location="component://workeffort/widget/CalendarForms.xml"/>
<section>
<condition>
@@ -170,26 +188,21 @@
</condition>
<widgets>
<include-form name="addCalEventRole" location="component://workeffort/widget/CalendarForms.xml"/>
- <section>
- <condition>
- <not><if-empty field="workEffort"/></not>
- </condition>
- <widgets>
- <include-form name="cancelEvent" location="component://workeffort/widget/CalendarForms.xml"/>
- </widgets>
- </section>
</widgets>
</section>
+ </screenlet>
</container>
</widgets>
<fail-widgets><!-- view section -->
<container style="lefthalf">
- <label style="h1" text="Calendar Event Summary"/>
+ <screenlet title="${uiLabelMap.WorkEffortSummary}">
<include-form name="showCalEvent" location="component://workeffort/widget/CalendarForms.xml"/>
+ </screenlet>
</container>
<container style="righthalf">
- <label style="h1" text="Participants"/>
+ <screenlet title="${uiLabelMap.WorkEffortParticipants}">
<include-form name="showCalEventRoles" location="component://workeffort/widget/CalendarForms.xml"/>
+ </screenlet>
</container>
</fail-widgets>
</section>