svn commit: r615577 [2/3] - in /ofbiz/trunk/applications: order/config/ workeffort/config/ workeffort/webapp/workeffort/ workeffort/widget/
Locked
 
|
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sun Jan 27 03:18:33 2008 @@ -43,68 +43,96 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label text="${uiLabelMap.WorkEffortMyCurrentTimesheets}" style="head2"/></container> - <container> - <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/> - <link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/> - </container> - <iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList"> - <section> - <actions> - <entity-condition entity-name="TimeEntry" list-name="currentTimeEntryList"> - <condition-list combine="and"> - <condition-expr field-name="partyId" env-name="userLogin.partyId"/> - <condition-expr field-name="timesheetId" env-name="currentTimesheet.timesheetId"/> - </condition-list> - </entity-condition> - </actions> - <widgets> - <container> - <label style="tableheadtext" text="${uiLabelMap.Timesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/> - <link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link> - </container> - <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList"> - <section> - <actions> - <entity-one entity-name="RateType" value-name="currentRateType" auto-field-map="false"> - <field-map field-name="rateTypeId" env-name="currentTimeEntry.rateTypeId"/> - </entity-one> - </actions> - <widgets> - <container> - <label style="tabletext" text="${uiLabelMap.TimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/> - <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.TimesheetHours} "/> - <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/> - <section> - <condition><not><if-empty field-name="currentTimeEntry.workEffortId"/></not></condition> - <widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="linktext"/></widgets> - </section> - </container> - </widgets> - </section> - </iterate-section> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.WorkEffortMyCurrentTimesheets}"/> + </container> + </container> + <container style="screenlet-body"> + <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/> + <link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/> + <iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList"> <section> - <condition><if-compare-field field-name="parameters.showQuickEntry" operator="equals" to-field-name="currentTimesheet.timesheetId"/></condition> + <actions> + <entity-condition entity-name="TimeEntry" list-name="currentTimeEntryList"> + <condition-list combine="and"> + <condition-expr field-name="partyId" env-name="userLogin.partyId"/> + <condition-expr field-name="timesheetId" env-name="currentTimesheet.timesheetId"/> + </condition-list> + </entity-condition> + </actions> <widgets> - <include-form name="QuickCreateTimeEntry" location="component://workeffort/widget/TimesheetForms.xml"/> - </widgets> - <fail-widgets> <container> - <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetQuickTimeEntry}" style="buttontext"></link> - <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetTimeEntries}" style="buttontext"></link> + <label style="tableheadtext" text="${uiLabelMap.Timesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/> + <link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link> </container> - </fail-widgets> + <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList"> + <section> + <actions> + <entity-one entity-name="RateType" value-name="currentRateType" auto-field-map="false"> + <field-map field-name="rateTypeId" env-name="currentTimeEntry.rateTypeId"/> + </entity-one> + </actions> + <widgets> + <container> + <label style="tabletext" text="${uiLabelMap.TimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/> + <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.TimesheetHours} "/> + <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/> + <section> + <condition><not><if-empty field-name="currentTimeEntry.workEffortId"/></not></condition> + <widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="buttontext"/></widgets> + </section> + </container> + </widgets> + </section> + </iterate-section> + <section> + <condition><if-compare-field field-name="parameters.showQuickEntry" operator="equals" to-field-name="currentTimesheet.timesheetId"/></condition> + <widgets> + <include-form name="QuickCreateTimeEntry" location="component://workeffort/widget/TimesheetForms.xml"/> + </widgets> + <fail-widgets> + <container> + <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetQuickTimeEntry}" style="buttontext"></link> + <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetTimeEntries}" style="buttontext"></link> + </container> + </fail-widgets> + </section> + </widgets> </section> - </widgets> - </section> - </iterate-section> - + </iterate-section> + </container> + </container> <!-- createQuickTimeEntry --> - - <container><label text="${uiLabelMap.WorkEffortMyRates}" style="head2"/></container> - <include-form name="ListMyRates" location="component://workeffort/widget/TimesheetForms.xml"/> - <container><label text="${uiLabelMap.WorkEffortMyTimesheets}" style="head2"/></container> - <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <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="head4"> + <label text="${uiLabelMap.WorkEffortMyTimesheets}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -127,10 +155,35 @@ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleFindTimesheet}</label></container> - <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container> - <include-form name="FindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> - <include-form name="ListFindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindTimesheet}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.TimesheetCreate}" 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="head4"> + <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> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label> @@ -159,16 +212,80 @@ <if-empty field-name="timesheet"/> </condition> <widgets> - <label style="head1">${uiLabelMap.PageTitleAddTimesheet}</label> - <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <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> </widgets> <fail-widgets> - <container><label style="head1">${uiLabelMap.PageTitleEditTimesheet}</label></container> - <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container> - <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/> - <include-form name="DisplayTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/> - <include-form name="AddTimesheetToInvoice" location="component://workeffort/widget/TimesheetForms.xml"/> - <include-form name="AddTimesheetToNewInvoice" location="component://workeffort/widget/TimesheetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditTimesheet}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.TimesheetCreate}" 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="head4"> + <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="head4"> + <label text="${uiLabelMap.PageTitleDisplayTimesheetEntries}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.TimesheetCreate}" 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="head4"> + <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> </fail-widgets> </section> </decorator-section> @@ -189,10 +306,35 @@ <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditTimesheetRoles}</label></container> - <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container> - <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/> - <include-form name="AddTimesheetRole" location="component://workeffort/widget/TimesheetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditTimesheetRoles}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.TimesheetCreate}" 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="head4"> + <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> </decorator-section> </decorator-screen> </widgets> @@ -211,10 +353,35 @@ <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditTimesheetEntries}</label></container> - <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container> - <include-form name="ListTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/> - <include-form name="AddTimesheetEntry" location="component://workeffort/widget/TimesheetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditTimesheetEntries}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.TimesheetCreate}" 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="head4"> + <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> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Sun Jan 27 03:18:33 2008 @@ -19,7 +19,8 @@ --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListWorkEffortCommEvents" separate-columns="false" target="updateCommunicationEventWorkEff" title="" type="list"> + <form name="ListWorkEffortCommEvents" separate-columns="false" target="updateCommunicationEventWorkEff" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortCommunicationEventView"> <condition-list combine="and"> @@ -38,7 +39,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteCommunicationEventWorkEff?workEffortId=${workEffortId}&communicationEventId=${communicationEventId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field> </form> - <form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single" extends="EditCommEvent" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> + <form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single" extends="EditCommEvent" + extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="description"><textarea/></field> <field name="communicationEventId"><lookup target-form-name="LookupCommEvent"/></field> @@ -51,4 +53,4 @@ <sort-field name="description"/> </sort-order> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Jan 27 03:18:33 2008 @@ -805,10 +805,10 @@ <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> <field name="isPrintable" use-when="internalNote.equals("N")"><display description="${uiLabelMap.OrderPrintableNote}"/></field> <field name="isPrintable" use-when="internalNote.equals("Y")"><display description="${uiLabelMap.OrderNotPrintableNote}"/></field> - <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals("N")"> + <field name="Private/Public" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("N")"> <hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}" /> </field> - <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals("Y")"> + <field name="Private/Public" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("Y")"> <hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=N" description="${uiLabelMap.OrderNotesPublic}"/> </field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Sun Jan 27 03:18:33 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListWorkEffortOrderHeaders" separate-columns="true" target="" title="" type="list"> + <form name="ListWorkEffortOrderHeaders" separate-columns="true" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortOrderHeaderView"> <field-map field-name="workEffortId"/> @@ -37,9 +38,10 @@ <field name="grandTotal"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteWorkEffortOrderHeader?workEffortId=${workEffortId}&orderId=${orderId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field> </form> - <form name="AddWorkEffortOrderHeader" target="createWorkEffortOrderHeader" title="" type="single"> + <form name="AddWorkEffortOrderHeader" target="createWorkEffortOrderHeader" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml Sun Jan 27 03:18:33 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListWorkEffortPartyAssigns" separate-columns="false" target="updateWorkEffortPartyAssign" title="" type="list"> + <form name="ListWorkEffortPartyAssigns" separate-columns="false" target="updateWorkEffortPartyAssign" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortPartyAssignment"> <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/> @@ -59,7 +60,8 @@ <field name="comments"><text size="60" maxlength="255"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditWorkEffortPartyAssign" default-map-name="workEffortPartyAssignment" target="updateWorkEffortPartyAssign" title="" type="single"> + <form name="EditWorkEffortPartyAssign" default-map-name="workEffortPartyAssignment" target="updateWorkEffortPartyAssign" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffortPartyAssign" use-when="workEffortPartyAssignment==null"/> <field name="workEffortId"><hidden/></field> <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> @@ -94,4 +96,4 @@ <field name="comments"><text size="60" maxlength="255"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml Sun Jan 27 03:18:33 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListWorkEffortQuotes" separate-columns="true" target="ListWorkEffortQuotes" title="" type="list"> + <form name="ListWorkEffortQuotes" separate-columns="true" target="ListWorkEffortQuotes" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortQuoteView"> <field-map field-name="workEffortId"/> @@ -36,13 +37,15 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuote?workEffortId=${workEffortId}&quoteId=${quoteId}"/> </field> </form> - <form name="AddWorkEffortQuote" target="createWorkEffortQuote" title="" type="single"> + <form name="AddWorkEffortQuote" target="createWorkEffortQuote" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="quoteId"><lookup target-form-name="LookupQuote"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWorkEffortQuoteItems" separate-columns="true" target="ListWorkEffortQuoteItems" title="" type="list"> + <form name="ListWorkEffortQuoteItems" separate-columns="true" target="ListWorkEffortQuoteItems" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="QuoteItem"> <field-map field-name="workEffortId"/> @@ -62,10 +65,11 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuoteItem?workEffortId=${workEffortId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}"/> </field> </form> - <form name="AddWorkEffortQuoteItem" target="createWorkEffortQuoteItem" title="" type="single"> + <form name="AddWorkEffortQuoteItem" target="createWorkEffortQuoteItem" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="quoteId"><lookup target-form-name="LookupQuote"/></field> <field name="quoteItemSeqId"><lookup target-form-name="LookupQuoteItem" target-parameter="quoteId"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml Sun Jan 27 03:18:33 2008 @@ -54,94 +54,134 @@ <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <label style="head1">${uiLabelMap.PageTitleWorkEffortRelatedSummary} ${uiLabelMap.CommonFor} ${uiLabelMap.CommonId} [${workEffortId}]</label> - <container><label style="head2">${uiLabelMap.WorkEffortWorkEffort}</label></container> - <container> - <label text="${uiLabelMap.CommonName}: " style="tableheadtext"/><label text="${workEffort.workEffortName}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonType}: " style="tableheadtext"/><label text="${workEffortType.description}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonPurpose}: " style="tableheadtext"/><label text="${workEffortPurposeType.description}" style="tabletext"/> - </container> - <container> - <label text="${uiLabelMap.CommonStatus}: " style="tableheadtext"/><label text="${currentStatusItem.description}" style="tabletext"/> - <label text=", ${uiLabelMap.WorkEffortPercentComplete}: " style="tableheadtext"/><label text="${workEffort.percentComplete}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonPriority}: " style="tableheadtext"/><label text="${workEffort.priority}" style="tabletext"/> - </container> - <container> - <label text="${uiLabelMap.WorkEffortEstimatedStartDate}: " style="tableheadtext"/><label text="${workEffort.estimatedStartDate}" style="tabletext"/> - <label text=", ${uiLabelMap.WorkEffortEstimatedCompletionDate}: " style="tableheadtext"/><label text="${workEffort.estimatedCompletionDate}" style="tabletext"/> - </container> - <container><label style="head2">${uiLabelMap.PartyPartyAssignmentsDetail}</label></container> - <iterate-section list-name="relatedPartyAssigns" entry-name="partyAssign"> - <section> - <actions> - <get-related-one value-name="partyAssign" relation-name="RoleType" to-value-name="partyAssignRoleType" use-cache="true"/> - <get-related-one value-name="partyAssign" relation-name="StatusItem" to-value-name="partyAssignStatusItem" use-cache="true"/> - <get-related-one value-name="partyAssign" relation-name="ExpectationEnumeration" to-value-name="partyAssignExpectationEnumeration" use-cache="true"/> - </actions> - <widgets> - <container> - <link target="/partymgr/control/viewprofile?partyId=${partyAssign.partyId}" url-mode="inter-app" text="[${partyAssign.partyId}]" style="linktext"/> - <label text="${partyAssign.firstName} ${partyAssign.lastName} ${partyAssign.groupName}" style="tabletext"/> - <label text=", ${uiLabelMap.PartyRoleId}" style="tableheadtext"/><label text="${partyAssignRoleType.description}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonStatus}: " style="tableheadtext"/><label text="${partyAssignStatusItem.description}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonExpectation}: " style="tableheadtext"/><label text="${partyAssignExpectationEnumeration.description}" style="tabletext"/> - </container> - </widgets> - </section> - </iterate-section> - - <container><label style="head2">${uiLabelMap.WorkEffortCommEvents}</label></container> - <iterate-section list-name="commEvents" entry-name="commEvent"> - <section> - <widgets> - <container> - <link target="/partymgr/control/EditCommunicationEvent?communicationEventId=${commEvent.communicationEventId}" url-mode="inter-app" text="[${commEvent.communicationEventId}]" style="linktext"/> - <label text="${commEvent.subject}" style="tabletext"/> - </container> - </widgets> - </section> - </iterate-section> - - <container><label style="head2">${uiLabelMap.WorkEffortShopLists}</label></container> - <iterate-section list-name="shoppingLists" entry-name="shopList"> - <section> - <widgets> - <container> - <link target="/partymgr/control/editShoppingList?shoppingListId=${shopList.shoppingListId}" url-mode="inter-app" text="[${shopList.shoppingListId}]" style="linktext"/> - <label text="${shopList.listName} ${shopList.description}" style="tabletext"/> - </container> - </widgets> - </section> - </iterate-section> - - <container><label style="head2">${uiLabelMap.WorkEffortQuotes}</label></container> - <iterate-section list-name="quotes" entry-name="quote"> - <section> - <widgets> - <container> - <link target="/ordermgr/control/EditQuote?quoteId=${quote.quoteId}" url-mode="inter-app" text="[${quote.quoteId}]" style="linktext"/> - <label text="${quote.quoteName} ${quote.description}" style="tabletext"/> - </container> - </widgets> - </section> - </iterate-section> - - <container><label style="head2">${uiLabelMap.WorkEffortOrderHeaders}</label></container> - <iterate-section list-name="orderHeaders" entry-name="orderHeader"> - <section> - <widgets> - <container> - <link target="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" url-mode="inter-app" text="[${orderHeader.orderId}]" style="linktext"/> - <label text="${uiLabelMap.CommonType}: " style="tableheadtext"/><label text="${orderHeader.orderTypeDescription}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonStatus} : " style="tableheadtext"/><label text="${orderHeader.statusItemDescription}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonTotal}: " style="tableheadtext"/><label text="${orderHeader.grandTotal}" style="tabletext"/> - <label text=", ${uiLabelMap.CommonDate}: " style="tableheadtext"/><label text="${orderHeader.orderDate}" style="tabletext"/> - </container> - </widgets> - </section> - </iterate-section> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.WorkEffortWorkEffort}"/> + </container> + </container> + <container style="screenlet-body"> + <label text="${uiLabelMap.CommonName} " style="label"/><label text="${workEffort.workEffortName}"/> + <label text="${uiLabelMap.CommonType} " style="label"/><label text="${workEffortType.description}"/> + <label text="${uiLabelMap.CommonPurpose} " style="label"/><label text="${workEffortPurposeType.description}"/> + <label text="${uiLabelMap.CommonStatus} " style="label"/><label text="${currentStatusItem.description}"/> + </container> + <container style="screenlet-body"> + <label text="${uiLabelMap.WorkEffortPercentComplete} " style="label"/><label text="${workEffort.percentComplete}"/> + <label text="${uiLabelMap.CommonPriority} " style="label"/><label text="${workEffort.priority}"/> + <label text="${uiLabelMap.WorkEffortEstimatedStartDate} " style="label"/><label text="${workEffort.estimatedStartDate}"/> + <label text="${uiLabelMap.WorkEffortEstimatedCompletionDate} " style="label"/><label text="${workEffort.estimatedCompletionDate}"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PartyPartyAssignmentsDetail}"/> + </container> + </container> + <container style="screenlet-body"> + <iterate-section list-name="relatedPartyAssigns" entry-name="partyAssign"> + <section> + <actions> + <get-related-one value-name="partyAssign" relation-name="RoleType" to-value-name="partyAssignRoleType" use-cache="true"/> + <get-related-one value-name="partyAssign" relation-name="StatusItem" to-value-name="partyAssignStatusItem" use-cache="true"/> + <get-related-one value-name="partyAssign" relation-name="ExpectationEnumeration" to-value-name="partyAssignExpectationEnumeration" use-cache="true"/> + </actions> + <widgets> + <container> + <link target="/partymgr/control/viewprofile?partyId=${partyAssign.partyId}" url-mode="inter-app" text="${partyAssign.partyId}" style="buttontext"/> + <label text="${partyAssign.firstName} ${partyAssign.lastName} ${partyAssign.groupName}"/> + <label text="${uiLabelMap.PartyRoleId} " style="label"/><label text="${partyAssignRoleType.description}"/> + <label text="${uiLabelMap.CommonStatus} " style="label"/><label text="${partyAssignStatusItem.description}"/> + <label text="${uiLabelMap.CommonExpectation} " style="label"/><label text="${partyAssignExpectationEnumeration.description}"/> + </container> + </widgets> + </section> + </iterate-section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.WorkEffortCommEvents}"/> + </container> + </container> + <container style="screenlet-body"> + <iterate-section list-name="commEvents" entry-name="commEvent"> + <section> + <widgets> + <container> + <link target="/partymgr/control/EditCommunicationEvent?communicationEventId=${commEvent.communicationEventId}" url-mode="inter-app" text="${commEvent.communicationEventId}" style="buttontext"/> + <label text="${commEvent.subject}"/> + </container> + </widgets> + </section> + </iterate-section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.WorkEffortShopLists}"/> + </container> + </container> + <container style="screenlet-body"> + <iterate-section list-name="shoppingLists" entry-name="shopList"> + <section> + <widgets> + <container> + <link target="/partymgr/control/editShoppingList?shoppingListId=${shopList.shoppingListId}" url-mode="inter-app" text="${shopList.shoppingListId}" style="buttontext"/> + <label text="${shopList.listName} ${shopList.description}"/> + </container> + </widgets> + </section> + </iterate-section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.WorkEffortQuotes}"/> + </container> + </container> + <container style="screenlet-body"> + <iterate-section list-name="quotes" entry-name="quote"> + <section> + <widgets> + <container> + <link target="/ordermgr/control/EditQuote?quoteId=${quote.quoteId}" url-mode="inter-app" text="${quote.quoteId}" style="buttontext"/> + <label text="${quote.quoteName} ${quote.description}"/> + </container> + </widgets> + </section> + </iterate-section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.WorkEffortOrderHeaders}"/> + </container> + </container> + <container style="screenlet-body"> + <iterate-section list-name="orderHeaders" entry-name="orderHeader"> + <section> + <widgets> + <container> + <link target="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" url-mode="inter-app" text="${orderHeader.orderId}" style="buttontext"/> + <label text="${uiLabelMap.CommonType} " style="label"/><label text="${orderHeader.orderTypeDescription}"/> + <label text="${uiLabelMap.CommonStatus} " style="label"/><label text="${orderHeader.statusItemDescription}"/> + <label text="${uiLabelMap.CommonTotal} " style="label"/><label text="${orderHeader.grandTotal}"/> + <label text="${uiLabelMap.CommonDate} " style="label"/><label text="${orderHeader.orderDate}"/> + </container> + </widgets> + </section> + </iterate-section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml Sun Jan 27 03:18:33 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListWorkEffortRequests" separate-columns="true" target="ListWorkEffortRequests" title="" type="list"> + <form name="ListWorkEffortRequests" separate-columns="true" target="ListWorkEffortRequests" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortCustRequestView"> <field-map field-name="workEffortId"/> @@ -35,7 +36,8 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortRequest?workEffortId=${workEffortId}&custRequestId=${custRequestId}"/> </field> </form> - <form name="AddWorkEffortRequest" target="createWorkEffortRequest" title="" type="single"> + <form name="AddWorkEffortRequest" target="createWorkEffortRequest" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="custRequestId"><lookup target-form-name="LookupCustRequest"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"> @@ -43,7 +45,8 @@ </field> </form> - <form name="ListWorkEffortRequestItems" separate-columns="true" target="ListWorkEffortRequestItems" title="" type="list"> + <form name="ListWorkEffortRequestItems" separate-columns="true" target="ListWorkEffortRequestItems" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortCustRequestItemView"> <field-map field-name="workEffortId"/> @@ -60,10 +63,11 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequestItem?workEffortId=${workEffortId}&custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}"/> </field> </form> - <form name="AddWorkEffortRequestItem" target="createWorkEffortRequestItem" title="" type="single"> + <form name="AddWorkEffortRequestItem" target="createWorkEffortRequestItem" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="custRequestId"><lookup target-form-name="LookupCustRequest"/></field> <field name="custRequestItemSeqId"><lookup target-form-name="LookupCustRequestItem" target-parameter="custRequestId"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=615577&r1=615576&r2=615577&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Sun Jan 27 03:18:33 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListWorkEffortRequirements" separate-columns="true" target="" title="" type="list"> + <form name="ListWorkEffortRequirements" separate-columns="true" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortRequirementView"> <field-map field-name="workEffortId"/> @@ -36,7 +37,8 @@ <field name="requirementDescription"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteWorkEffortRequirement?workEffortId=${workEffortId}&requirementId=${requirementId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field> </form> - <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement" extends-resource="component://order/webapp/ordermgr/requirement/RequirementForms.xml"> + <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement" + extends-resource="component://order/webapp/ordermgr/requirement/RequirementForms.xml" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="requirementId"><lookup target-form-name="/ordermgr/control/LookupRequirement"/></field> <field name="workReqFulfTypeId"> @@ -54,4 +56,4 @@ <sort-field name="workReqFulfTypeId"/> </sort-order> </form> -</forms> +</forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |