svn commit: r826275 - in /ofbiz/trunk/applications/work
Locked
 
|
Author: buscob
Date: Sat Oct 17 16:01:42 2009 New Revision: 826275 URL: http://svn.apache.org/viewvc?rev=826275&view=rev Log: Changed <container style="screenlet"> pattern to <screenlet...>. Modified: ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Modified: ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml?rev=826275&r1=826274&r2=826275&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml Sat Oct 17 16:01:42 2009 @@ -36,20 +36,9 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.WorkEffortMyRequestList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListRequests" location="component://workeffort/widget/CustRequestForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.WorkEffortMyRequestList}"> + <include-form name="ListRequests" location="component://workeffort/widget/CustRequestForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=826275&r1=826274&r2=826275&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sat Oct 17 16:01:42 2009 @@ -43,110 +43,81 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.WorkEffortMyCurrentTimesheets}"/> - </container> - </container> - <container style="screenlet-body"> - <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek" style="buttontext"> - <parameter param-name="partyId" from-field="userLogin.partyId"/> - </link> - <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"> - <parameter param-name="partyId" from-field="userLogin.partyId"/> - </link> - <iterate-section entry="currentTimesheet" list="currentTimesheetList"> - <section> - <actions> - <entity-condition entity-name="TimeEntry" list="currentTimeEntryList"> - <condition-list combine="and"> - <condition-expr field-name="partyId" from-field="userLogin.partyId"/> - <condition-expr field-name="timesheetId" from-field="currentTimesheet.timesheetId"/> - </condition-list> - </entity-condition> - </actions> - <widgets> - <container> - <label style="tableheadtext" text="${uiLabelMap.WorkEffortTimesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/> - <link target="EditTimesheet" text="${currentTimesheet.timesheetId}" style="buttontext"> - <parameter param-name="timesheetId" from-field="currentTimesheet.timesheetId"/> - </link> - </container> - <iterate-section entry="currentTimeEntry" list="currentTimeEntryList"> - <section> - <actions> - <entity-one entity-name="RateType" value-field="currentRateType" auto-field-map="false"> - <field-map field-name="rateTypeId" from-field="currentTimeEntry.rateTypeId"/> - </entity-one> - </actions> - <widgets> - <container> - <label style="tabletext" text="${uiLabelMap.WorkEffortTimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/> - <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.WorkEffortTimesheetHours} "/> - <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/> - <section> - <condition><not><if-empty field="currentTimeEntry.workEffortId"/></not></condition> - <widgets> - <link target="WorkEffortSummary" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="buttontext"> - <parameter param-name="workEffortId" from-field="currentTimeEntry.workEffortId"/> - </link> - </widgets> - </section> - </container> - </widgets> - </section> - </iterate-section> + <screenlet title="${uiLabelMap.WorkEffortMyCurrentTimesheets}"> + <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek" style="buttontext"> + <parameter param-name="partyId" from-field="userLogin.partyId"/> + </link> + <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"> + <parameter param-name="partyId" from-field="userLogin.partyId"/> + </link> + <iterate-section entry="currentTimesheet" list="currentTimesheetList"> + <section> + <actions> + <entity-condition entity-name="TimeEntry" list="currentTimeEntryList"> + <condition-list combine="and"> + <condition-expr field-name="partyId" from-field="userLogin.partyId"/> + <condition-expr field-name="timesheetId" from-field="currentTimesheet.timesheetId"/> + </condition-list> + </entity-condition> + </actions> + <widgets> + <container> + <label style="tableheadtext" text="${uiLabelMap.WorkEffortTimesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/> + <link target="EditTimesheet" text="${currentTimesheet.timesheetId}" style="buttontext"> + <parameter param-name="timesheetId" from-field="currentTimesheet.timesheetId"/> + </link> + </container> + <iterate-section entry="currentTimeEntry" list="currentTimeEntryList"> <section> - <condition><if-compare-field field="parameters.showQuickEntry" operator="equals" to-field="currentTimesheet.timesheetId"/></condition> + <actions> + <entity-one entity-name="RateType" value-field="currentRateType" auto-field-map="false"> + <field-map field-name="rateTypeId" from-field="currentTimeEntry.rateTypeId"/> + </entity-one> + </actions> <widgets> - <include-form name="QuickCreateTimeEntry" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - <fail-widgets> <container> - <link target="MyTimesheets" text="${uiLabelMap.WorkEffortTimesheetQuickTimeEntry}" style="buttontext"> - <parameter param-name="showQuickEntry" from-field="currentTimesheet.timesheetId"/> - </link> - <link target="EditTimesheetEntries" text="${uiLabelMap.WorkEffortTimesheetTimeEntries}" style="buttontext"> - <parameter param-name="timesheetId" from-field="currentTimesheet.timesheetId"/> - </link> + <label style="tabletext" text="${uiLabelMap.WorkEffortTimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/> + <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.WorkEffortTimesheetHours} "/> + <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/> + <section> + <condition><not><if-empty field="currentTimeEntry.workEffortId"/></not></condition> + <widgets> + <link target="WorkEffortSummary" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="buttontext"> + <parameter param-name="workEffortId" from-field="currentTimeEntry.workEffortId"/> + </link> + </widgets> + </section> </container> - </fail-widgets> + </widgets> </section> - </widgets> - </section> - </iterate-section> - </container> - </container> - <!-- createQuickTimeEntry --> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.WorkEffortMyRates}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListMyRates" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.WorkEffortMyTimesheets}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/> + </iterate-section> + <section> + <condition><if-compare-field field="parameters.showQuickEntry" operator="equals" to-field="currentTimesheet.timesheetId"/></condition> + <widgets> + <include-form name="QuickCreateTimeEntry" location="component://workeffort/widget/TimesheetForms.xml"/> + </widgets> + <fail-widgets> + <container> + <link target="MyTimesheets" text="${uiLabelMap.WorkEffortTimesheetQuickTimeEntry}" style="buttontext"> + <parameter param-name="showQuickEntry" from-field="currentTimesheet.timesheetId"/> + </link> + <link target="EditTimesheetEntries" text="${uiLabelMap.WorkEffortTimesheetTimeEntries}" style="buttontext"> + <parameter param-name="timesheetId" from-field="currentTimesheet.timesheetId"/> + </link> + </container> + </fail-widgets> + </section> </widgets> </section> - </container> - </container> + </iterate-section> + </screenlet> + <!-- createQuickTimeEntry --> + <screenlet title="${uiLabelMap.WorkEffortMyRates}"> + <include-form name="ListMyRates" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.WorkEffortMyTimesheets}"> + <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -169,35 +140,13 @@ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindTimesheet}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> - <include-form name="FindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindTimesheet}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFindTimesheet}"> + <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> + <include-form name="FindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleFindTimesheet}"> + <include-form name="ListFindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.WorkEffortViewPermissionError}</label> @@ -226,80 +175,25 @@ <if-empty field="timesheet"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTimesheet}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddTimesheet}"> + <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTimesheet}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> - <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTimesheetToInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddTimesheetToInvoice" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleDisplayTimesheetEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> - <include-form name="DisplayTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTimesheetToNewInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddTimesheetToNewInvoice" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditTimesheet}"> + <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> + <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddTimesheetToInvoice}"> + <include-form name="AddTimesheetToInvoice" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleDisplayTimesheetEntries}"> + <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> + <include-form name="DisplayTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddTimesheetToNewInvoice}"> + <include-form name="AddTimesheetToNewInvoice" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -320,35 +214,13 @@ <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTimesheetRoles}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> - <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTimesheetRoles}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddTimesheetRole" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditTimesheetRoles}"> + <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> + <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddTimesheetRoles}"> + <include-form name="AddTimesheetRole" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -367,35 +239,13 @@ <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTimesheetEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> - <include-form name="ListTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTimesheetEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddTimesheetEntry" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditTimesheetEntries}"> + <container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container> + <include-form name="ListTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddTimesheetEntries}"> + <include-form name="AddTimesheetEntry" location="component://workeffort/widget/TimesheetForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=826275&r1=826274&r2=826275&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sat Oct 17 16:01:42 2009 @@ -41,21 +41,10 @@ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.WorkEffortJobList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FilterUserJobs" location="component://workeffort/widget/WorkEffortForms.xml"/> - <include-form name="UserJobsList" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.WorkEffortJobList}"> + <include-form name="FilterUserJobs" location="component://workeffort/widget/WorkEffortForms.xml"/> + <include-form name="UserJobsList" location="component://workeffort/widget/WorkEffortForms.xml"/> + </screenlet> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.WorkEffortViewPermissionError}</label> @@ -130,22 +119,11 @@ <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/> </fail-widgets> </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.WorkEffortDuplicateWorkEffort}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.WorkEffortDuplicateWorkEffort}"> + <platform-specific> + <html><html-template location="component://workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl"/></html> + </platform-specific> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -324,20 +302,9 @@ <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditWorkEffortAssoc}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditWorkEffortAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditWorkEffortAssoc}"> + <include-form name="EditWorkEffortAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -558,38 +525,15 @@ <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> + <screenlet> <include-form name="ListWorkEffortTimeEntries" location="component://workeffort/widget/WorkEffortForms.xml"/> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddWorkEffortTimeEntry}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddWorkEffortTimeEntry" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> - </container> - - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddWorkEffortTimeToInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddWorkEffortTimeToInvoice" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> - </container> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddWorkEffortTimeEntry}"> + <include-form name="AddWorkEffortTimeEntry" location="component://workeffort/widget/WorkEffortForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddWorkEffortTimeToInvoice}"> + <include-form name="AddWorkEffortTimeToInvoice" location="component://workeffort/widget/WorkEffortForms.xml"/> + </screenlet> <screenlet title="${uiLabelMap.PageTitleAddWorkEffortTimeToNewInvoice}"> <include-form name="AddWorkEffortTimeToNewInvoice" location="component://workeffort/widget/WorkEffortForms.xml"/> </screenlet> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |