Re: svn commit: r667116 - in /ofbiz/trunk/specialpurpose/pr
Locked
Re: svn commit: r667116 - in /ofbiz/trunk/specialpurpose/pr
 
|
Why are the page titles being removed if the purpose of the commit is to
convert container elements to screenlet elements? It would be nice to keep the page title in the screen - https://127.0.0.1:8443/accounting/control/EditFixedAssetIdents?fixedAssetId=DEMO_MACHINE -Adrian [hidden email] wrote: > Author: ashish > Date: Thu Jun 12 07:49:51 2008 > New Revision: 667116 > > URL: http://svn.apache.org/viewvc?rev=667116&view=rev > Log: > Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839. > Container to Screenlet conversion is done on Projectmgr component. > > Thanks Awdesh Singh Parihar for your patch. > > Modified: > ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml > ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml > ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml > ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml > ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml > > Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=667116&r1=667115&r2=667116&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) > +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Jun 12 07:49:51 2008 > @@ -221,12 +221,6 @@ > <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸µà¹à¸à¸³à¸£à¸²à¸¢à¸à¸²à¸£à¹à¸¡à¹à¹à¸ªà¸£à¹à¸</value> > <value xml:lang="zh">æªå¼è´¦åçå·¥æ¶</value> > </property> > - <property key="PageTitleListPartyAssigns"> > - <value xml:lang="en">Current Resource Assignments</value> > - <value xml:lang="it">Risorse Attualmente Assegnate</value> > - <value xml:lang="th">à¸à¸³à¸«à¸à¸à¹à¸«à¸¥à¹à¸à¸à¸µà¹à¸¡à¸²à¸à¸µà¹à¹à¸à¹à¸à¸±à¸à¸à¸¢à¸¹à¹à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value> > - <value xml:lang="zh">å½åèµæºåé </value> > - </property> > <property key="PageTitleListProjectByParty"> > <value xml:lang="en">List Project by Party</value> > <value xml:lang="it">Lista Progetti per Soggetto</value> > @@ -245,12 +239,6 @@ > <value xml:lang="th">à¹à¸«à¸¥à¹à¸à¸à¸µà¹à¸¡à¸²</value> > <value xml:lang="zh">èµæº</value> > </property> > - <property key="PageTitleListSubProjects"> > - <value xml:lang="en">List of Subprojects</value> > - <value xml:lang="it">Lista dei Sotto-Progetti</value> > - <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸à¸à¹à¸à¸£à¹à¸à¸à¸¢à¹à¸à¸¢</value> > - <value xml:lang="zh">å项ç®å表</value> > - </property> > <property key="PageTitleListTaskByParty"> > <value xml:lang="en">List Task by Party</value> > <value xml:lang="it">Lista Compito per Soggetto</value> > > Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=667116&r1=667115&r2=667116&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) > +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Jun 12 07:49:51 2008 > @@ -36,35 +36,11 @@ > </actions> > <widgets> > <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleListSubProjects}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="EditSubProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddSubProject}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddSubProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <decorator-section name="body"> > + <screenlet id="SubProjectsPanel" title="${uiLabelMap.PageTitleAddSubProject}" collapsible="true"> > + <include-form name="AddSubProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <include-form name="EditSubProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -86,39 +62,11 @@ > </actions> > <widgets> > <decorator-screen name="CommonResourceDecorator" location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleListResources}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="ListResources" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddResource}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddResource" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - </widgets> > - </section> > + <decorator-section name="body"> > + <screenlet id="AddResourcePanel" title="${uiLabelMap.PageTitleAddResource}" collapsible="true"> > + <include-form name="AddResource" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <include-form name="ListResources" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -453,38 +401,10 @@ > <widgets> > <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <section> > - <widgets> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.${titleProperty}}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="ListPhases" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddPhase}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - </widgets> > - </section> > + <screenlet id="AddPhasePanel" title="${uiLabelMap.PageTitleAddPhase}" collapsible="true"> > + <include-form name="AddPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> > + </screenlet> > + <include-form name="ListPhases" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -505,34 +425,10 @@ > <widgets> > <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleListPartyAssigns}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddPartyAssign}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddWorkEffortPartyAssign" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="WorkEffortPartyAssignPanel" title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> > + <include-form name="AddWorkEffortPartyAssign" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -618,34 +514,10 @@ > <widgets> > <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.${titleProperty}}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="ListProjectNotes" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddProjectNotes}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddWorkEffortNote" location="component://workeffort/widget/WorkEffortForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="WorkEffortNotePanel" title="${uiLabelMap.PageTitleAddProjectNotes}" collapsible="true"> > + <include-form name="AddWorkEffortNote" location="component://workeffort/widget/WorkEffortForms.xml"/> > + </screenlet> > + <include-form name="ListProjectNotes" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -921,38 +793,10 @@ > <widgets> > <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <section> > - <widgets> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleProjectInformation}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="listResourcesProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddProject}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddResourceProjectParty" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - </widgets> > - </section> > + <screenlet id="ResourceProjectPartyPanel" title="${uiLabelMap.PageTitleAddProject}" collapsible="true"> > + <include-form name="AddResourceProjectParty" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <include-form name="listResourcesProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -979,38 +823,10 @@ > <widgets> > <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <section> > - <widgets> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleTaskInformation}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="listResourcesTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddTask}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddResourceTaskParty" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - </widgets> > - </section> > + <screenlet id="ResourceTaskPartyPanel" title="${uiLabelMap.PageTitleAddTask}" collapsible="true"> > + <include-form name="AddResourceTaskParty" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <include-form name="listResourcesTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -1194,34 +1010,10 @@ > <widgets> > <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleEditPartyRates}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleEditPartyRates}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="PartyRatePanel" title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true"> > + <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/> > + </screenlet> > + <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > > Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=667116&r1=667115&r2=667116&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) > +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Jun 12 07:49:51 2008 > @@ -1,4 +1,4 @@ > -<?xml version="1.0" encoding="UTF-8"?> > +f<?xml version="1.0" encoding="UTF-8"?> > <!-- > Licensed to the Apache Software Foundation (ASF) under one > or more contributor license agreements. See the NOTICE file > @@ -46,34 +46,10 @@ > </actions> > <widgets> > <container style="lefthalf"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleTasksBefore}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="DependenciesBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddDependencyBefore}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddDependencyBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="DependenciesBeforePanel" title="${uiLabelMap.PageTitleAddDependencyBefore}" collapsible="true"> > + <include-form name="AddDependencyBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> > + </screenlet> > + <include-form name="DependenciesBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> > </container> > </widgets> > </section> > @@ -86,34 +62,10 @@ > </actions> > <widgets> > <container style="righthalf"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleTasksAfter}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="DependenciesAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddDependencyAfter}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddDependencyAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="DependenciesAfterPanel" title="${uiLabelMap.PageTitleAddDependencyAfter}" collapsible="true"> > + <include-form name="AddDependencyAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> > + </screenlet> > + <include-form name="DependenciesAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> > </container> > </widgets> > </section> > @@ -456,34 +408,10 @@ > <widgets> > <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleListPartyAssigns}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddPartyAssign}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddWorkEffortPartyAssign" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="TaskPartyAssignsPanel" title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> > + <include-form name="AddWorkEffortPartyAssign" location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/TaskForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -504,34 +432,10 @@ > <widgets> > <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.${titleProperty}}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="ListTaskNotes" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > - <container style="screenlet"> > - <container style="screenlet-title-bar"> > - <container style="h3"> > - <label text="${uiLabelMap.PageTitleAddTaskNotes}"/> > - </container> > - </container> > - <container style="screenlet-body"> > - <section> > - <widgets> > - <include-form name="AddTaskNote" location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </widgets> > - </section> > - </container> > - </container> > + <screenlet id="TaskNotesPanel" title="${uiLabelMap.PageTitleAddTaskNotes}" collapsible="true"> > + <include-form name="AddTaskNote" location="component://projectmgr/widget/forms/TaskForms.xml"/> > + </screenlet> > + <include-form name="ListTaskNotes" location="component://projectmgr/widget/forms/TaskForms.xml"/> > </decorator-section> > </decorator-screen> > </widgets> > > Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=667116&r1=667115&r2=667116&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) > +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Jun 12 07:49:51 2008 > @@ -78,7 +78,7 @@ > <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field> > </form> > <form name="ListResources" type="list" list-name="resources" paginate-target="FindResource" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <row-actions> > <service service-name="getPartyEmail" result-map-name="emailResult"/> > <service service-name="getPartyTelephone" result-map-name="telResult"/> > @@ -157,7 +157,7 @@ > <field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> > </form> > <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <actions> > <entity-and entity-name="WorkEffort"> > <field-map field-name="workEffortParentId" env-name="projectId"/> > @@ -302,7 +302,7 @@ > <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> > </form> > <form name="ListPhases" target="updateProjectPhase" title="" list-name="phases" type="list" separate-columns="true" paginate-target="FindPhase" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <field name="projectId"><hidden value="${parameters.projectId}"/></field> > <field name="phaseId" parameter-name="workEffortId"><hidden/></field> > <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> > @@ -368,7 +368,7 @@ > </field> > </form> > <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <actions> > <entity-condition entity-name="WorkEffortPartyAssignView"> > <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/> > @@ -424,7 +424,7 @@ > <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> > </form> > <form name="ListProjectNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" paginate-target="EditWorkEffortNotes" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <actions> > <entity-condition entity-name="WorkEffortNoteAndData"> > <condition-expr field-name="workEffortId" env-name="workEffortId"/> > @@ -436,7 +436,7 @@ > <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field> > </form> > <form name="listResourcesTasks" type="list" list-name="tasks" paginate-target="listResourcesTask" target="updateResourcesTaskAssigment" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <row-actions> > <service service-name="getProjectIdAndNameFromTask" result-map-name="resultProject"> > <field-map field-name="taskId" env-name="workEffortId"/> > @@ -470,7 +470,7 @@ > <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field> > </form> > <form name="listResourcesProjects" type="list" list-name="parties" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <row-actions> > <service service-name="getProject" result-map-name="result"> > <field-map field-name="projectId" env-name="workEffortId"/> > > Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=667116&r1=667115&r2=667116&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) > +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Jun 12 07:49:51 2008 > @@ -297,7 +297,7 @@ > <field name="addButton"><submit/></field> > </form> > <form name="DependenciesBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <row-actions> > <service service-name="getProjectTask" result-map-name="r"> > <field-map field-name="taskId" env-name="workEffortIdFrom"/> > @@ -317,7 +317,7 @@ > <field name="deleteButton"><submit button-type="button"/></field> > </form> > <form name="DependenciesAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <row-actions> > <service service-name="getProjectTask" result-map-name="r"> > <field-map field-name="taskId" env-name="workEffortIdTo"/> > @@ -455,7 +455,7 @@ > <field name="addButton" title="${uiLabelMap.CommonAdd}"><submit/></field> > </form> > <form name="ListTaskNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" list-name="taskNotes" paginate-target="EditTaskNotes" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <actions> > <entity-condition entity-name="WorkEffortNoteAndData"> > <condition-expr field-name="workEffortId" env-name="workEffortId"/> > @@ -491,7 +491,7 @@ > <field name="createdDate"><display type="date"/></field> > </form> > <form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="EditTaskPartyAssigns" > - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> > + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> > <actions> > <entity-condition entity-name="WorkEffortPartyAssignment"> > <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/> > > > |
Re: svn commit: r667116 - in /ofbiz/trunk/specialpurpose/pr
|
|
Adrian,
If you will notice that the page titles removed only for the contents that are used to display at the top of list form. For Example :- - <property key="PageTitleListPartyAssigns"> This was being displayed at the top of the list form. But now in the present scenario we are not displaying any heading at the top of List form. So keeping the code clean we had removed those entries. Do you have still any question or concern then please let me know ? Thanks for looking at this commits Adrain. -- Ashish On Thu, Jun 12, 2008 at 11:43 AM, Adrian Crum <[hidden email]> wrote: > Why are the page titles being removed if the purpose of the commit is to > convert container elements to screenlet elements? > > It would be nice to keep the page title in the screen - > > > https://127.0.0.1:8443/accounting/control/EditFixedAssetIdents?fixedAssetId=DEMO_MACHINE > > -Adrian > > > [hidden email] wrote: > >> Author: ashish >> Date: Thu Jun 12 07:49:51 2008 >> New Revision: 667116 >> >> URL: http://svn.apache.org/viewvc?rev=667116&view=rev >> Log: >> Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839. >> Container to Screenlet conversion is done on Projectmgr component. >> >> Thanks Awdesh Singh Parihar for your patch. >> >> Modified: >> ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >> ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >> ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >> >> Modified: >> ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=667116&r1=667115&r2=667116&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >> (original) >> +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >> Thu Jun 12 07:49:51 2008 >> @@ -221,12 +221,6 @@ >> <value >> xml:lang="th">ชั่วโมงที่ทำรายภ>> ารไม่เสร็จ</value> >> <value xml:lang="zh">æœªå¼€è´¦å •çš„å·¥æ—¶</value> >> </property> >> - <property key="PageTitleListPartyAssigns"> >> - <value xml:lang="en">Current Resource Assignments</value> >> - <value xml:lang="it">Risorse Attualmente Assegnate</value> >> - <value xml:lang="th">ภำหนà¸"๠>> หล่งที่มาที่ใช้ภ>> ันà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™</value> >> - <value xml:lang="zh">å½"å‰ èµ„æº åˆ†é… </value> >> - </property> >> <property key="PageTitleListProjectByParty"> >> <value xml:lang="en">List Project by Party</value> >> <value xml:lang="it">Lista Progetti per Soggetto</value> >> @@ -245,12 +239,6 @@ >> <value xml:lang="th">๠หล่งที่มา</value> >> <value xml:lang="zh">èµ„æº </value> >> </property> >> - <property key="PageTitleListSubProjects"> >> - <value xml:lang="en">List of Subprojects</value> >> - <value xml:lang="it">Lista dei Sotto-Progetti</value> >> - <value xml:lang="th">๠สà¸"งรายภ>> ารขà¸à¸‡à¹‚ปรเจคย่à¸à¸¢</value> >> - <value xml:lang="zh">å 项ç›(R)列表</value> >> - </property> >> <property key="PageTitleListTaskByParty"> >> <value xml:lang="en">List Task by Party</value> >> <value xml:lang="it">Lista Compito per Soggetto</value> >> >> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=667116&r1=667115&r2=667116&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >> (original) >> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu >> Jun 12 07:49:51 2008 >> @@ -36,35 +36,11 @@ >> </actions> >> <widgets> <decorator-screen >> name="CommonProjectDecorator" >> location="${parameters.mainDecoratorLocation}"> >> - <decorator-section name="body"> >> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleListSubProjects}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="EditSubProjects" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddSubProject}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddSubProject" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> + <decorator-section name="body"> >> + <screenlet id="SubProjectsPanel" >> title="${uiLabelMap.PageTitleAddSubProject}" collapsible="true"> >> + <include-form name="AddSubProject" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> + </screenlet> >> + <include-form name="EditSubProjects" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -86,39 +62,11 @@ >> </actions> >> <widgets> <decorator-screen >> name="CommonResourceDecorator" >> location="${parameters.mainDecoratorLocation}"> >> - <decorator-section name="body"> >> >> - <section> >> - <widgets> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleListResources}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="ListResources" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddResource}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddResource" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - </widgets> - >> </section> >> + <decorator-section name="body"> >> + <screenlet id="AddResourcePanel" >> title="${uiLabelMap.PageTitleAddResource}" collapsible="true"> >> + <include-form name="AddResource" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> + </screenlet> >> + <include-form name="ListResources" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -453,38 +401,10 @@ >> <widgets> >> <decorator-screen name="CommonProjectDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <section> - >> <widgets> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.${titleProperty}}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="ListPhases" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddPhase}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddPhase" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - </widgets> - >> </section> >> + <screenlet id="AddPhasePanel" >> title="${uiLabelMap.PageTitleAddPhase}" collapsible="true"> >> + <include-form name="AddPhase" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> + </screenlet> >> + <include-form name="ListPhases" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -505,34 +425,10 @@ >> <widgets> >> <decorator-screen name="CommonProjectDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleListPartyAssigns}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="EditWorkEffortPartyAssigns" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddPartyAssign}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddWorkEffortPartyAssign" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> + <screenlet id="WorkEffortPartyAssignPanel" >> title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> >> + <include-form name="AddWorkEffortPartyAssign" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> + </screenlet> >> + <include-form name="EditWorkEffortPartyAssigns" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -618,34 +514,10 @@ >> <widgets> >> <decorator-screen name="CommonProjectDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.${titleProperty}}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="ListProjectNotes" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddProjectNotes}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddWorkEffortNote" >> location="component://workeffort/widget/WorkEffortForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> + >> <screenlet id="WorkEffortNotePanel" >> title="${uiLabelMap.PageTitleAddProjectNotes}" collapsible="true"> >> + <include-form name="AddWorkEffortNote" >> location="component://workeffort/widget/WorkEffortForms.xml"/> >> + </screenlet> >> + <include-form name="ListProjectNotes" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -921,38 +793,10 @@ >> <widgets> <decorator-screen >> name="CommonListResourceDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <section> >> - <widgets> - >> <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleProjectInformation}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="listResourcesProjects" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddProject}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form >> name="AddResourceProjectParty" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - </widgets> >> - </section> + >> <screenlet id="ResourceProjectPartyPanel" >> title="${uiLabelMap.PageTitleAddProject}" collapsible="true"> >> + <include-form name="AddResourceProjectParty" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> + </screenlet> >> + <include-form name="listResourcesProjects" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> </widgets> >> @@ -979,38 +823,10 @@ >> <widgets> <decorator-screen >> name="CommonListResourceDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <section> >> - <widgets> - >> <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleTaskInformation}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="listResourcesTasks" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddTask}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddResourceTaskParty" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - </widgets> >> - </section> >> + <screenlet id="ResourceTaskPartyPanel" >> title="${uiLabelMap.PageTitleAddTask}" collapsible="true"> >> + <include-form name="AddResourceTaskParty" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> + </screenlet> >> + <include-form name="listResourcesTasks" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -1194,34 +1010,10 @@ >> <widgets> >> <decorator-screen name="CommonListResourceDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleEditPartyRates}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="ListPartyRates" >> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleEditPartyRates}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddPartyRate" >> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> + <screenlet id="PartyRatePanel" >> title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true"> >> + <include-form name="AddPartyRate" >> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >> + </screenlet> >> + <include-form name="ListPartyRates" >> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> >> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=667116&r1=667115&r2=667116&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >> (original) >> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Jun >> 12 07:49:51 2008 >> @@ -1,4 +1,4 @@ >> -<?xml version="1.0" encoding="UTF-8"?> >> +f<?xml version="1.0" encoding="UTF-8"?> >> <!-- >> Licensed to the Apache Software Foundation (ASF) under one >> or more contributor license agreements. See the NOTICE file >> @@ -46,34 +46,10 @@ >> </actions> >> <widgets> >> <container style="lefthalf"> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleTasksBefore}"/> >> - </container> >> - </container> >> - <container >> style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form >> name="DependenciesBefore" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddDependencyBefore}"/> >> - </container> >> - </container> >> - <container >> style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form >> name="AddDependencyBefore" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> + <screenlet >> id="DependenciesBeforePanel" >> title="${uiLabelMap.PageTitleAddDependencyBefore}" collapsible="true"> >> + <include-form >> name="AddDependencyBefore" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> + </screenlet> >> + <include-form >> name="DependenciesBefore" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> </container> >> </widgets> >> </section> >> @@ -86,34 +62,10 @@ >> </actions> >> <widgets> >> <container style="righthalf"> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleTasksAfter}"/> >> - </container> >> - </container> >> - <container >> style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form >> name="DependenciesAfter" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container >> style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddDependencyAfter}"/> >> - </container> >> - </container> >> - <container >> style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form >> name="AddDependencyAfter" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> + <screenlet >> id="DependenciesAfterPanel" >> title="${uiLabelMap.PageTitleAddDependencyAfter}" collapsible="true"> >> + <include-form >> name="AddDependencyAfter" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> + </screenlet> >> + <include-form >> name="DependenciesAfter" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> </container> >> </widgets> >> </section> >> @@ -456,34 +408,10 @@ >> <widgets> >> <decorator-screen name="CommonTaskDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleListPartyAssigns}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="EditWorkEffortPartyAssigns" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddPartyAssign}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddWorkEffortPartyAssign" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> + <screenlet id="TaskPartyAssignsPanel" >> title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> >> + <include-form name="AddWorkEffortPartyAssign" >> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >> + </screenlet> >> + <include-form name="EditWorkEffortPartyAssigns" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> @@ -504,34 +432,10 @@ >> <widgets> >> <decorator-screen name="CommonTaskDecorator" >> location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.${titleProperty}}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="ListTaskNotes" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> >> - <container style="screenlet"> >> - <container style="screenlet-title-bar"> >> - <container style="h3"> >> - <label >> text="${uiLabelMap.PageTitleAddTaskNotes}"/> >> - </container> >> - </container> >> - <container style="screenlet-body"> >> - <section> >> - <widgets> - >> <include-form name="AddTaskNote" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> - </widgets> >> - </section> >> - </container> >> - </container> + >> <screenlet id="TaskNotesPanel" >> title="${uiLabelMap.PageTitleAddTaskNotes}" collapsible="true"> >> + <include-form name="AddTaskNote" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> + </screenlet> >> + <include-form name="ListTaskNotes" >> location="component://projectmgr/widget/forms/TaskForms.xml"/> >> </decorator-section> >> </decorator-screen> >> </widgets> >> >> Modified: >> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=667116&r1=667115&r2=667116&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >> (original) >> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >> Thu Jun 12 07:49:51 2008 >> @@ -78,7 +78,7 @@ >> <field name="find" >> title="${uiLabelMap.CommonFind}"><submit/></field> >> </form> >> <form name="ListResources" type="list" list-name="resources" >> paginate-target="FindResource" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <row-actions> >> <service service-name="getPartyEmail" >> result-map-name="emailResult"/> >> <service service-name="getPartyTelephone" >> result-map-name="telResult"/> >> @@ -157,7 +157,7 @@ >> <field name="createdStamp" >> title="${uiLabelMap.FormFieldTitle_createdDate}"><display >> type="date"/></field> >> </form> >> <form name="EditSubProjects" list-name="projects" type="list" >> target="RemoveSubProject" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <actions> >> <entity-and entity-name="WorkEffort"> >> <field-map field-name="workEffortParentId" >> env-name="projectId"/> >> @@ -302,7 +302,7 @@ >> <field name="submitButton" >> title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> >> </form> <form name="ListPhases" target="updateProjectPhase" >> title="" list-name="phases" type="list" separate-columns="true" >> paginate-target="FindPhase" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <field name="projectId"><hidden >> value="${parameters.projectId}"/></field> >> <field name="phaseId" >> parameter-name="workEffortId"><hidden/></field> >> <field name="phaseName" parameter-name="workEffortName" >> title="${uiLabelMap.CommonName}*"><text/></field> >> @@ -368,7 +368,7 @@ >> </field> >> </form> >> <form name="EditWorkEffortPartyAssigns" >> target="deleteWorkEffortPartyAssign" title="" type="list" >> paginate-target="ListWorkEffortPartyAssigns" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <actions> >> <entity-condition entity-name="WorkEffortPartyAssignView"> >> <condition-expr field-name="workEffortId" >> operator="equals" env-name="workEffortId"/> >> @@ -424,7 +424,7 @@ >> <field name="submitButton" title="${uiLabelMap.CommonAdd}" >> widget-style="smallSubmit"><submit button-type="button"/></field> >> </form> >> <form name="ListProjectNotes" extends="ListWorkEffortNotes" >> extends-resource="component://workeffort/widget/WorkEffortForms.xml" >> type="list" paginate-target="EditWorkEffortNotes" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <actions> >> <entity-condition entity-name="WorkEffortNoteAndData"> >> <condition-expr field-name="workEffortId" >> env-name="workEffortId"/> >> @@ -436,7 +436,7 @@ >> <field name="noteParty" title="${uiLabelMap.CommonBy}" >> widget-style="tabletext"><display >> description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, >> noteParty, true)} at ${bsh: >> org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, >> "dd-MM-yyyy HH:mm", TimeZone.getDefault(), >> context.get("locale"))}"/></field> >> </form> >> <form name="listResourcesTasks" type="list" list-name="tasks" >> paginate-target="listResourcesTask" target="updateResourcesTaskAssigment" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <row-actions> >> <service service-name="getProjectIdAndNameFromTask" >> result-map-name="resultProject"> >> <field-map field-name="taskId" env-name="workEffortId"/> >> @@ -470,7 +470,7 @@ >> <field name="toComplete" >> title="${uiLabelMap.CommonStatustoComplete}"><hyperlink >> target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_COMPLETED" >> description="${uiLabelMap.CommonStatustoComplete}"/></field> >> </form> >> <form name="listResourcesProjects" type="list" list-name="parties" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <row-actions> >> <service service-name="getProject" result-map-name="result"> >> <field-map field-name="projectId" >> env-name="workEffortId"/> >> >> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=667116&r1=667115&r2=667116&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >> (original) >> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu >> Jun 12 07:49:51 2008 >> @@ -297,7 +297,7 @@ >> <field name="addButton"><submit/></field> >> </form> >> <form name="DependenciesBefore" target="removeDependency" title="" >> list-name="depList" type="list" separate-columns="true" >> paginate-target="Dependencies" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <row-actions> >> <service service-name="getProjectTask" result-map-name="r"> >> <field-map field-name="taskId" >> env-name="workEffortIdFrom"/> >> @@ -317,7 +317,7 @@ >> <field name="deleteButton"><submit button-type="button"/></field> >> </form> >> <form name="DependenciesAfter" target="removeDependency" title="" >> list-name="depList" type="list" separate-columns="true" >> paginate-target="Dependencies" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <row-actions> >> <service service-name="getProjectTask" result-map-name="r"> >> <field-map field-name="taskId" env-name="workEffortIdTo"/> >> @@ -455,7 +455,7 @@ >> <field name="addButton" >> title="${uiLabelMap.CommonAdd}"><submit/></field> >> </form> <form name="ListTaskNotes" >> extends="ListWorkEffortNotes" >> extends-resource="component://workeffort/widget/WorkEffortForms.xml" >> type="list" list-name="taskNotes" paginate-target="EditTaskNotes" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + odd-row-style="alternate-row" header-row-style="header-row-2" >> default-table-style="basic-table hover-bar"> >> <actions> >> <entity-condition entity-name="WorkEffortNoteAndData"> >> <condition-expr field-name="workEffortId" >> env-name="workEffortId"/> >> @@ -491,7 +491,7 @@ >> <field name="createdDate"><display type="date"/></field> >> </form> <form >> name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" >> type="list" paginate-target="EditTaskPartyAssigns" >> - odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + > > |
Re: svn commit: r667116 - in /ofbiz/trunk/specialpurpose/pr
|
|
Ashish,
Stepping back in time a little... The "de-facto" screen layout was to have the page title in the <h1> element (or use the h1 container style) at the top of the main content area. Somewhere along the line the page titles were moved out of the <h1> element and into the screenlet title bars. Now those screenlet title bars are being removed, so we are completely losing the page title being displayed at the top of the page. Instead of deleting the page title, put it inside an <h1> element or a container with the h1 style. That's why I provided the link - so you can see how the page should look. Also, while everyone is working on this, it would be helpful to use the FindScreenDecorator for the Find screens - which will insure correct layout: https://localhost:8443/facility/control/main -Adrian Ashish Vijaywargiya wrote: > Adrian, > > If you will notice that the page titles removed only for the contents that > are used to display at the top of list form. > For Example :- > > - <property key="PageTitleListPartyAssigns"> > > This was being displayed at the top of the list form. > But now in the present scenario we are not displaying any heading at the top > of List form. > > So keeping the code clean we had removed those entries. > Do you have still any question or concern then please let me know ? > Thanks for looking at this commits Adrain. > > -- > Ashish > > > > On Thu, Jun 12, 2008 at 11:43 AM, Adrian Crum <[hidden email]> wrote: > >> Why are the page titles being removed if the purpose of the commit is to >> convert container elements to screenlet elements? >> >> It would be nice to keep the page title in the screen - >> >> >> https://127.0.0.1:8443/accounting/control/EditFixedAssetIdents?fixedAssetId=DEMO_MACHINE >> >> -Adrian >> >> >> [hidden email] wrote: >> >>> Author: ashish >>> Date: Thu Jun 12 07:49:51 2008 >>> New Revision: 667116 >>> >>> URL: http://svn.apache.org/viewvc?rev=667116&view=rev >>> Log: >>> Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839. >>> Container to Screenlet conversion is done on Projectmgr component. >>> >>> Thanks Awdesh Singh Parihar for your patch. >>> >>> Modified: >>> ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>> ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >>> ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >>> >>> Modified: >>> ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=667116&r1=667115&r2=667116&view=diff >>> >>> ============================================================================== >>> --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>> (original) >>> +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>> Thu Jun 12 07:49:51 2008 >>> @@ -221,12 +221,6 @@ >>> <value >>> xml:lang="th">ชั่วโมงที่ทำรายภ>>> ารไม่เสร็จ</value> >>> <value xml:lang="zh">æœªå¼€è´¦å •çš„å·¥æ—¶</value> >>> </property> >>> - <property key="PageTitleListPartyAssigns"> >>> - <value xml:lang="en">Current Resource Assignments</value> >>> - <value xml:lang="it">Risorse Attualmente Assegnate</value> >>> - <value xml:lang="th">ภำหนà¸"๠>>> หล่งที่มาที่ใช้ภ>>> ันà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™</value> >>> - <value xml:lang="zh">å½"å‰ èµ„æº åˆ†é… </value> >>> - </property> >>> <property key="PageTitleListProjectByParty"> >>> <value xml:lang="en">List Project by Party</value> >>> <value xml:lang="it">Lista Progetti per Soggetto</value> >>> @@ -245,12 +239,6 @@ >>> <value xml:lang="th">๠หล่งที่มา</value> >>> <value xml:lang="zh">èµ„æº </value> >>> </property> >>> - <property key="PageTitleListSubProjects"> >>> - <value xml:lang="en">List of Subprojects</value> >>> - <value xml:lang="it">Lista dei Sotto-Progetti</value> >>> - <value xml:lang="th">๠สà¸"งรายภ>>> ารขà¸à¸‡à¹‚ปรเจคย่à¸à¸¢</value> >>> - <value xml:lang="zh">å 项ç›(R)列表</value> >>> - </property> >>> <property key="PageTitleListTaskByParty"> >>> <value xml:lang="en">List Task by Party</value> >>> <value xml:lang="it">Lista Compito per Soggetto</value> >>> >>> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=667116&r1=667115&r2=667116&view=diff >>> >>> ============================================================================== >>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >>> (original) >>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu >>> Jun 12 07:49:51 2008 >>> @@ -36,35 +36,11 @@ >>> </actions> >>> <widgets> <decorator-screen >>> name="CommonProjectDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> - <decorator-section name="body"> >>> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleListSubProjects}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="EditSubProjects" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddSubProject}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddSubProject" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> + <decorator-section name="body"> >>> + <screenlet id="SubProjectsPanel" >>> title="${uiLabelMap.PageTitleAddSubProject}" collapsible="true"> >>> + <include-form name="AddSubProject" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> + </screenlet> >>> + <include-form name="EditSubProjects" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -86,39 +62,11 @@ >>> </actions> >>> <widgets> <decorator-screen >>> name="CommonResourceDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> - <decorator-section name="body"> >>> >>> - <section> >>> - <widgets> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleListResources}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="ListResources" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddResource}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddResource" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - </widgets> - >>> </section> >>> + <decorator-section name="body"> >>> + <screenlet id="AddResourcePanel" >>> title="${uiLabelMap.PageTitleAddResource}" collapsible="true"> >>> + <include-form name="AddResource" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> + </screenlet> >>> + <include-form name="ListResources" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -453,38 +401,10 @@ >>> <widgets> >>> <decorator-screen name="CommonProjectDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <section> - >>> <widgets> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.${titleProperty}}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="ListPhases" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddPhase}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddPhase" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - </widgets> - >>> </section> >>> + <screenlet id="AddPhasePanel" >>> title="${uiLabelMap.PageTitleAddPhase}" collapsible="true"> >>> + <include-form name="AddPhase" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> + </screenlet> >>> + <include-form name="ListPhases" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -505,34 +425,10 @@ >>> <widgets> >>> <decorator-screen name="CommonProjectDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleListPartyAssigns}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="EditWorkEffortPartyAssigns" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddPartyAssign}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddWorkEffortPartyAssign" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> + <screenlet id="WorkEffortPartyAssignPanel" >>> title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> >>> + <include-form name="AddWorkEffortPartyAssign" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> + </screenlet> >>> + <include-form name="EditWorkEffortPartyAssigns" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -618,34 +514,10 @@ >>> <widgets> >>> <decorator-screen name="CommonProjectDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.${titleProperty}}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="ListProjectNotes" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddProjectNotes}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddWorkEffortNote" >>> location="component://workeffort/widget/WorkEffortForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> + >>> <screenlet id="WorkEffortNotePanel" >>> title="${uiLabelMap.PageTitleAddProjectNotes}" collapsible="true"> >>> + <include-form name="AddWorkEffortNote" >>> location="component://workeffort/widget/WorkEffortForms.xml"/> >>> + </screenlet> >>> + <include-form name="ListProjectNotes" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -921,38 +793,10 @@ >>> <widgets> <decorator-screen >>> name="CommonListResourceDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <section> >>> - <widgets> - >>> <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleProjectInformation}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="listResourcesProjects" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddProject}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form >>> name="AddResourceProjectParty" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - </widgets> >>> - </section> + >>> <screenlet id="ResourceProjectPartyPanel" >>> title="${uiLabelMap.PageTitleAddProject}" collapsible="true"> >>> + <include-form name="AddResourceProjectParty" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> + </screenlet> >>> + <include-form name="listResourcesProjects" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> </widgets> >>> @@ -979,38 +823,10 @@ >>> <widgets> <decorator-screen >>> name="CommonListResourceDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <section> >>> - <widgets> - >>> <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleTaskInformation}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="listResourcesTasks" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddTask}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddResourceTaskParty" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - </widgets> >>> - </section> >>> + <screenlet id="ResourceTaskPartyPanel" >>> title="${uiLabelMap.PageTitleAddTask}" collapsible="true"> >>> + <include-form name="AddResourceTaskParty" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> + </screenlet> >>> + <include-form name="listResourcesTasks" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -1194,34 +1010,10 @@ >>> <widgets> >>> <decorator-screen name="CommonListResourceDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleEditPartyRates}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="ListPartyRates" >>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleEditPartyRates}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddPartyRate" >>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> + <screenlet id="PartyRatePanel" >>> title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true"> >>> + <include-form name="AddPartyRate" >>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>> + </screenlet> >>> + <include-form name="ListPartyRates" >>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> >>> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=667116&r1=667115&r2=667116&view=diff >>> >>> ============================================================================== >>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >>> (original) >>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Jun >>> 12 07:49:51 2008 >>> @@ -1,4 +1,4 @@ >>> -<?xml version="1.0" encoding="UTF-8"?> >>> +f<?xml version="1.0" encoding="UTF-8"?> >>> <!-- >>> Licensed to the Apache Software Foundation (ASF) under one >>> or more contributor license agreements. See the NOTICE file >>> @@ -46,34 +46,10 @@ >>> </actions> >>> <widgets> >>> <container style="lefthalf"> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleTasksBefore}"/> >>> - </container> >>> - </container> >>> - <container >>> style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form >>> name="DependenciesBefore" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddDependencyBefore}"/> >>> - </container> >>> - </container> >>> - <container >>> style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form >>> name="AddDependencyBefore" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> + <screenlet >>> id="DependenciesBeforePanel" >>> title="${uiLabelMap.PageTitleAddDependencyBefore}" collapsible="true"> >>> + <include-form >>> name="AddDependencyBefore" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> + </screenlet> >>> + <include-form >>> name="DependenciesBefore" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> </container> >>> </widgets> >>> </section> >>> @@ -86,34 +62,10 @@ >>> </actions> >>> <widgets> >>> <container style="righthalf"> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleTasksAfter}"/> >>> - </container> >>> - </container> >>> - <container >>> style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form >>> name="DependenciesAfter" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container >>> style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddDependencyAfter}"/> >>> - </container> >>> - </container> >>> - <container >>> style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form >>> name="AddDependencyAfter" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> + <screenlet >>> id="DependenciesAfterPanel" >>> title="${uiLabelMap.PageTitleAddDependencyAfter}" collapsible="true"> >>> + <include-form >>> name="AddDependencyAfter" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> + </screenlet> >>> + <include-form >>> name="DependenciesAfter" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> </container> >>> </widgets> >>> </section> >>> @@ -456,34 +408,10 @@ >>> <widgets> >>> <decorator-screen name="CommonTaskDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleListPartyAssigns}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="EditWorkEffortPartyAssigns" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddPartyAssign}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddWorkEffortPartyAssign" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> + <screenlet id="TaskPartyAssignsPanel" >>> title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> >>> + <include-form name="AddWorkEffortPartyAssign" >>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>> + </screenlet> >>> + <include-form name="EditWorkEffortPartyAssigns" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> @@ -504,34 +432,10 @@ >>> <widgets> >>> <decorator-screen name="CommonTaskDecorator" >>> location="${parameters.mainDecoratorLocation}"> >>> <decorator-section name="body"> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.${titleProperty}}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="ListTaskNotes" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> >>> - <container style="screenlet"> >>> - <container style="screenlet-title-bar"> >>> - <container style="h3"> >>> - <label >>> text="${uiLabelMap.PageTitleAddTaskNotes}"/> >>> - </container> >>> - </container> >>> - <container style="screenlet-body"> >>> - <section> >>> - <widgets> - >>> <include-form name="AddTaskNote" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> - </widgets> >>> - </section> >>> - </container> >>> - </container> + >>> <screenlet id="TaskNotesPanel" >>> title="${uiLabelMap.PageTitleAddTaskNotes}" collapsible="true"> >>> + <include-form name="AddTaskNote" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> + </screenlet> >>> + <include-form name="ListTaskNotes" >>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>> </decorator-section> >>> </decorator-screen> >>> </widgets> >>> >>> Modified: >>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=667116&r1=667115&r2=667116&view=diff >>> >>> ============================================================================== >>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>> (original) >>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>> Thu Jun 12 07:49:51 2008 >>> @@ -78,7 +78,7 @@ >>> <field name="find" >>> title="${uiLabelMap.CommonFind}"><submit/></field> >>> </form> >>> <form name="ListResources" type="list" list-name="resources" >>> paginate-target="FindResource" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <row-actions> >>> <service service-name="getPartyEmail" >>> result-map-name="emailResult"/> >>> <service service-name="getPartyTelephone" >>> result-map-name="telResult"/> >>> @@ -157,7 +157,7 @@ >>> <field name="createdStamp" >>> title="${uiLabelMap.FormFieldTitle_createdDate}"><display >>> type="date"/></field> >>> </form> >>> <form name="EditSubProjects" list-name="projects" type="list" >>> target="RemoveSubProject" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <actions> >>> <entity-and entity-name="WorkEffort"> >>> <field-map field-name="workEffortParentId" >>> env-name="projectId"/> >>> @@ -302,7 +302,7 @@ >>> <field name="submitButton" >>> title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> >>> </form> <form name="ListPhases" target="updateProjectPhase" >>> title="" list-name="phases" type="list" separate-columns="true" >>> paginate-target="FindPhase" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <field name="projectId"><hidden >>> value="${parameters.projectId}"/></field> >>> <field name="phaseId" >>> parameter-name="workEffortId"><hidden/></field> >>> <field name="phaseName" parameter-name="workEffortName" >>> title="${uiLabelMap.CommonName}*"><text/></field> >>> @@ -368,7 +368,7 @@ >>> </field> >>> </form> >>> <form name="EditWorkEffortPartyAssigns" >>> target="deleteWorkEffortPartyAssign" title="" type="list" >>> paginate-target="ListWorkEffortPartyAssigns" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <actions> >>> <entity-condition entity-name="WorkEffortPartyAssignView"> >>> <condition-expr field-name="workEffortId" >>> operator="equals" env-name="workEffortId"/> >>> @@ -424,7 +424,7 @@ >>> <field name="submitButton" title="${uiLabelMap.CommonAdd}" >>> widget-style="smallSubmit"><submit button-type="button"/></field> >>> </form> >>> <form name="ListProjectNotes" extends="ListWorkEffortNotes" >>> extends-resource="component://workeffort/widget/WorkEffortForms.xml" >>> type="list" paginate-target="EditWorkEffortNotes" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <actions> >>> <entity-condition entity-name="WorkEffortNoteAndData"> >>> <condition-expr field-name="workEffortId" >>> env-name="workEffortId"/> >>> @@ -436,7 +436,7 @@ >>> <field name="noteParty" title="${uiLabelMap.CommonBy}" >>> widget-style="tabletext"><display >>> description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, >>> noteParty, true)} at ${bsh: >>> org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, >>> "dd-MM-yyyy HH:mm", TimeZone.getDefault(), >>> context.get("locale"))}"/></field> >>> </form> >>> <form name="listResourcesTasks" type="list" list-name="tasks" >>> paginate-target="listResourcesTask" target="updateResourcesTaskAssigment" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <row-actions> >>> <service service-name="getProjectIdAndNameFromTask" >>> result-map-name="resultProject"> >>> <field-map field-name="taskId" env-name="workEffortId"/> >>> @@ -470,7 +470,7 @@ >>> <field name="toComplete" >>> title="${uiLabelMap.CommonStatustoComplete}"><hyperlink >>> target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_COMPLETED" >>> description="${uiLabelMap.CommonStatustoComplete}"/></field> >>> </form> >>> <form name="listResourcesProjects" type="list" list-name="parties" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <row-actions> >>> <service service-name="getProject" result-map-name="result"> >>> <field-map field-name="projectId" >>> env-name="workEffortId"/> >>> >>> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=667116&r1=667115&r2=667116&view=diff >>> >>> ============================================================================== >>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >>> (original) >>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu >>> Jun 12 07:49:51 2008 >>> @@ -297,7 +297,7 @@ >>> <field name="addButton"><submit/></field> >>> </form> >>> <form name="DependenciesBefore" target="removeDependency" title="" >>> list-name="depList" type="list" separate-columns="true" >>> paginate-target="Dependencies" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <row-actions> >>> <service service-name="getProjectTask" result-map-name="r"> >>> <field-map field-name="taskId" >>> env-name="workEffortIdFrom"/> >>> @@ -317,7 +317,7 @@ >>> <field name="deleteButton"><submit button-type="button"/></field> >>> </form> >>> <form name="DependenciesAfter" target="removeDependency" title="" >>> list-name="depList" type="list" separate-columns="true" >>> paginate-target="Dependencies" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <row-actions> >>> <service service-name="getProjectTask" result-map-name="r"> >>> <field-map field-name="taskId" env-name="workEffortIdTo"/> >>> @@ -455,7 +455,7 @@ >>> <field name="addButton" >>> title="${uiLabelMap.CommonAdd}"><submit/></field> >>> </form> <form name="ListTaskNotes" >>> extends="ListWorkEffortNotes" >>> extends-resource="component://workeffort/widget/WorkEffortForms.xml" >>> type="list" list-name="taskNotes" paginate-target="EditTaskNotes" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>> default-table-style="basic-table hover-bar"> >>> <actions> >>> <entity-condition entity-name="WorkEffortNoteAndData"> >>> <condition-expr field-name="workEffortId" >>> env-name="workEffortId"/> >>> @@ -491,7 +491,7 @@ >>> <field name="createdDate"><display type="date"/></field> >>> </form> <form >>> name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" >>> type="list" paginate-target="EditTaskPartyAssigns" >>> - odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + >> > |
Re: svn commit: r667116 - in /ofbiz/trunk/specialpurpose/pr
|
|
Adrian,
Thanks for pointing it out. Now I understand what you are saying. We will take care of this and will commit those changes ASAP. -- Ashish On Fri, Jun 13, 2008 at 10:39 AM, Adrian Crum <[hidden email]> wrote: > Ashish, > > Stepping back in time a little... > > The "de-facto" screen layout was to have the page title in the <h1> element > (or use the h1 container style) at the top of the main content area. > Somewhere along the line the page titles were moved out of the <h1> element > and into the screenlet title bars. Now those screenlet title bars are being > removed, so we are completely losing the page title being displayed at the > top of the page. > > Instead of deleting the page title, put it inside an <h1> element or a > container with the h1 style. That's why I provided the link - so you can see > how the page should look. > > Also, while everyone is working on this, it would be helpful to use the > FindScreenDecorator for the Find screens - which will insure correct layout: > https://localhost:8443/facility/control/main > > -Adrian > > Ashish Vijaywargiya wrote: > >> Adrian, >> >> If you will notice that the page titles removed only for the contents that >> are used to display at the top of list form. >> For Example :- >> >> - <property key="PageTitleListPartyAssigns"> >> >> This was being displayed at the top of the list form. >> But now in the present scenario we are not displaying any heading at the >> top >> of List form. >> >> So keeping the code clean we had removed those entries. >> Do you have still any question or concern then please let me know ? >> Thanks for looking at this commits Adrain. >> >> -- >> Ashish >> >> >> >> On Thu, Jun 12, 2008 at 11:43 AM, Adrian Crum <[hidden email]> wrote: >> >> Why are the page titles being removed if the purpose of the commit is to >>> convert container elements to screenlet elements? >>> >>> It would be nice to keep the page title in the screen - >>> >>> >>> >>> https://127.0.0.1:8443/accounting/control/EditFixedAssetIdents?fixedAssetId=DEMO_MACHINE >>> >>> -Adrian >>> >>> >>> [hidden email] wrote: >>> >>> Author: ashish >>>> Date: Thu Jun 12 07:49:51 2008 >>>> New Revision: 667116 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=667116&view=rev >>>> Log: >>>> Patch from JIRA issue # >>>> https://issues.apache.org/jira/browse/OFBIZ-1839. >>>> Container to Screenlet conversion is done on Projectmgr component. >>>> >>>> Thanks Awdesh Singh Parihar for your patch. >>>> >>>> Modified: >>>> ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >>>> >>>> Modified: >>>> ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=667116&r1=667115&r2=667116&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>>> (original) >>>> +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml >>>> Thu Jun 12 07:49:51 2008 >>>> @@ -221,12 +221,6 @@ >>>> <value >>>> xml:lang="th">ชั่วโมงที่ทำรายภ>>>> ารไม่เสร็จ</value> >>>> <value xml:lang="zh">æœªå¼€è´¦å •çš„å·¥æ—¶</value> >>>> </property> >>>> - <property key="PageTitleListPartyAssigns"> >>>> - <value xml:lang="en">Current Resource Assignments</value> >>>> - <value xml:lang="it">Risorse Attualmente Assegnate</value> >>>> - <value xml:lang="th">ภำหนà¸"๠>>>> หล่งที่มาที่ใช้ภ>>>> ันà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™</value> >>>> - <value xml:lang="zh">å½"å‰ èµ„æº åˆ†é… </value> >>>> - </property> >>>> <property key="PageTitleListProjectByParty"> >>>> <value xml:lang="en">List Project by Party</value> >>>> <value xml:lang="it">Lista Progetti per Soggetto</value> >>>> @@ -245,12 +239,6 @@ >>>> <value xml:lang="th">๠หล่งที่มา</value> >>>> <value xml:lang="zh">èµ„æº </value> >>>> </property> >>>> - <property key="PageTitleListSubProjects"> >>>> - <value xml:lang="en">List of Subprojects</value> >>>> - <value xml:lang="it">Lista dei Sotto-Progetti</value> >>>> - <value xml:lang="th">๠สà¸"งรายภ>>>> ารขà¸à¸‡à¹‚ปรเจคย่à¸à¸¢</value> >>>> - <value xml:lang="zh">å 项ç›(R)列表</value> >>>> >>>> - </property> >>>> <property key="PageTitleListTaskByParty"> >>>> <value xml:lang="en">List Task by Party</value> >>>> <value xml:lang="it">Lista Compito per Soggetto</value> >>>> >>>> Modified: >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=667116&r1=667115&r2=667116&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml >>>> (original) >>>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu >>>> Jun 12 07:49:51 2008 >>>> @@ -36,35 +36,11 @@ >>>> </actions> >>>> <widgets> <decorator-screen >>>> name="CommonProjectDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> - <decorator-section name="body"> >>>> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleListSubProjects}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="EditSubProjects" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddSubProject}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddSubProject" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> + <decorator-section name="body"> >>>> + <screenlet id="SubProjectsPanel" >>>> title="${uiLabelMap.PageTitleAddSubProject}" collapsible="true"> >>>> + <include-form name="AddSubProject" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="EditSubProjects" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -86,39 +62,11 @@ >>>> </actions> >>>> <widgets> <decorator-screen >>>> name="CommonResourceDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> - <decorator-section name="body"> >>>> >>>> - <section> >>>> - <widgets> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleListResources}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="ListResources" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddResource}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddResource" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - </widgets> - >>>> </section> >>>> + <decorator-section name="body"> >>>> + <screenlet id="AddResourcePanel" >>>> title="${uiLabelMap.PageTitleAddResource}" collapsible="true"> >>>> + <include-form name="AddResource" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="ListResources" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -453,38 +401,10 @@ >>>> <widgets> >>>> <decorator-screen name="CommonProjectDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <section> - >>>> <widgets> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.${titleProperty}}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="ListPhases" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddPhase}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddPhase" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - </widgets> - >>>> </section> >>>> + <screenlet id="AddPhasePanel" >>>> title="${uiLabelMap.PageTitleAddPhase}" collapsible="true"> >>>> + <include-form name="AddPhase" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="ListPhases" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -505,34 +425,10 @@ >>>> <widgets> >>>> <decorator-screen name="CommonProjectDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleListPartyAssigns}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="EditWorkEffortPartyAssigns" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddPartyAssign}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddWorkEffortPartyAssign" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> + <screenlet id="WorkEffortPartyAssignPanel" >>>> title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> >>>> + <include-form >>>> name="AddWorkEffortPartyAssign" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="EditWorkEffortPartyAssigns" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -618,34 +514,10 @@ >>>> <widgets> >>>> <decorator-screen name="CommonProjectDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.${titleProperty}}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="ListProjectNotes" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddProjectNotes}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddWorkEffortNote" >>>> location="component://workeffort/widget/WorkEffortForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> + >>>> <screenlet id="WorkEffortNotePanel" >>>> title="${uiLabelMap.PageTitleAddProjectNotes}" collapsible="true"> >>>> + <include-form name="AddWorkEffortNote" >>>> location="component://workeffort/widget/WorkEffortForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="ListProjectNotes" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -921,38 +793,10 @@ >>>> <widgets> <decorator-screen >>>> name="CommonListResourceDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <section> >>>> - <widgets> - >>>> <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleProjectInformation}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="listResourcesProjects" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddProject}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="AddResourceProjectParty" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - </widgets> >>>> - </section> + >>>> <screenlet id="ResourceProjectPartyPanel" >>>> title="${uiLabelMap.PageTitleAddProject}" collapsible="true"> >>>> + <include-form >>>> name="AddResourceProjectParty" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="listResourcesProjects" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> </widgets> >>>> @@ -979,38 +823,10 @@ >>>> <widgets> <decorator-screen >>>> name="CommonListResourceDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <section> >>>> - <widgets> - >>>> <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleTaskInformation}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="listResourcesTasks" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddTask}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="AddResourceTaskParty" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - </widgets> >>>> - </section> >>>> + <screenlet id="ResourceTaskPartyPanel" >>>> title="${uiLabelMap.PageTitleAddTask}" collapsible="true"> >>>> + <include-form name="AddResourceTaskParty" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="listResourcesTasks" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -1194,34 +1010,10 @@ >>>> <widgets> >>>> <decorator-screen name="CommonListResourceDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleEditPartyRates}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="ListPartyRates" >>>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleEditPartyRates}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddPartyRate" >>>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> + <screenlet id="PartyRatePanel" >>>> title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true"> >>>> + <include-form name="AddPartyRate" >>>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="ListPartyRates" >>>> location="component://party/webapp/partymgr/party/PartyForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> >>>> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=667116&r1=667115&r2=667116&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml >>>> (original) >>>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Jun >>>> 12 07:49:51 2008 >>>> @@ -1,4 +1,4 @@ >>>> -<?xml version="1.0" encoding="UTF-8"?> >>>> +f<?xml version="1.0" encoding="UTF-8"?> >>>> <!-- >>>> Licensed to the Apache Software Foundation (ASF) under one >>>> or more contributor license agreements. See the NOTICE file >>>> @@ -46,34 +46,10 @@ >>>> </actions> >>>> <widgets> >>>> <container style="lefthalf"> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleTasksBefore}"/> >>>> - </container> >>>> - </container> >>>> - <container >>>> style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="DependenciesBefore" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddDependencyBefore}"/> >>>> - </container> >>>> - </container> >>>> - <container >>>> style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="AddDependencyBefore" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> + <screenlet >>>> id="DependenciesBeforePanel" >>>> title="${uiLabelMap.PageTitleAddDependencyBefore}" collapsible="true"> >>>> + <include-form >>>> name="AddDependencyBefore" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> + </screenlet> >>>> + <include-form >>>> name="DependenciesBefore" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> </container> >>>> </widgets> >>>> </section> >>>> @@ -86,34 +62,10 @@ >>>> </actions> >>>> <widgets> >>>> <container style="righthalf"> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleTasksAfter}"/> >>>> - </container> >>>> - </container> >>>> - <container >>>> style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="DependenciesAfter" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container >>>> style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddDependencyAfter}"/> >>>> - </container> >>>> - </container> >>>> - <container >>>> style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form >>>> name="AddDependencyAfter" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> + <screenlet >>>> id="DependenciesAfterPanel" >>>> title="${uiLabelMap.PageTitleAddDependencyAfter}" collapsible="true"> >>>> + <include-form >>>> name="AddDependencyAfter" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> + </screenlet> >>>> + <include-form >>>> name="DependenciesAfter" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> </container> >>>> </widgets> >>>> </section> >>>> @@ -456,34 +408,10 @@ >>>> <widgets> >>>> <decorator-screen name="CommonTaskDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleListPartyAssigns}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="EditWorkEffortPartyAssigns" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddPartyAssign}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddWorkEffortPartyAssign" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> + <screenlet id="TaskPartyAssignsPanel" >>>> title="${uiLabelMap.PageTitleAddPartyAssign}" collapsible="true"> >>>> + <include-form >>>> name="AddWorkEffortPartyAssign" >>>> location="component://projectmgr/widget/forms/ProjectForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="EditWorkEffortPartyAssigns" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> @@ -504,34 +432,10 @@ >>>> <widgets> >>>> <decorator-screen name="CommonTaskDecorator" >>>> location="${parameters.mainDecoratorLocation}"> >>>> <decorator-section name="body"> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.${titleProperty}}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="ListTaskNotes" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet"> >>>> - <container style="screenlet-title-bar"> >>>> - <container style="h3"> >>>> - <label >>>> text="${uiLabelMap.PageTitleAddTaskNotes}"/> >>>> - </container> >>>> - </container> >>>> - <container style="screenlet-body"> >>>> - <section> >>>> - <widgets> - >>>> <include-form name="AddTaskNote" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> - </widgets> >>>> - </section> >>>> - </container> >>>> - </container> + >>>> <screenlet id="TaskNotesPanel" >>>> title="${uiLabelMap.PageTitleAddTaskNotes}" collapsible="true"> >>>> + <include-form name="AddTaskNote" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> + </screenlet> >>>> + <include-form name="ListTaskNotes" >>>> location="component://projectmgr/widget/forms/TaskForms.xml"/> >>>> </decorator-section> >>>> </decorator-screen> >>>> </widgets> >>>> >>>> Modified: >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=667116&r1=667115&r2=667116&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>>> (original) >>>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml >>>> Thu Jun 12 07:49:51 2008 >>>> @@ -78,7 +78,7 @@ >>>> <field name="find" >>>> title="${uiLabelMap.CommonFind}"><submit/></field> >>>> </form> >>>> <form name="ListResources" type="list" list-name="resources" >>>> paginate-target="FindResource" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <row-actions> >>>> <service service-name="getPartyEmail" >>>> result-map-name="emailResult"/> >>>> <service service-name="getPartyTelephone" >>>> result-map-name="telResult"/> >>>> @@ -157,7 +157,7 @@ >>>> <field name="createdStamp" >>>> title="${uiLabelMap.FormFieldTitle_createdDate}"><display >>>> type="date"/></field> >>>> </form> >>>> <form name="EditSubProjects" list-name="projects" type="list" >>>> target="RemoveSubProject" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <actions> >>>> <entity-and entity-name="WorkEffort"> >>>> <field-map field-name="workEffortParentId" >>>> env-name="projectId"/> >>>> @@ -302,7 +302,7 @@ >>>> <field name="submitButton" >>>> title="${uiLabelMap.CommonUpdate}"><submit >>>> button-type="button"/></field> >>>> </form> <form name="ListPhases" target="updateProjectPhase" >>>> title="" list-name="phases" type="list" separate-columns="true" >>>> paginate-target="FindPhase" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <field name="projectId"><hidden >>>> value="${parameters.projectId}"/></field> >>>> <field name="phaseId" >>>> parameter-name="workEffortId"><hidden/></field> >>>> <field name="phaseName" parameter-name="workEffortName" >>>> title="${uiLabelMap.CommonName}*"><text/></field> >>>> @@ -368,7 +368,7 @@ >>>> </field> >>>> </form> >>>> <form name="EditWorkEffortPartyAssigns" >>>> target="deleteWorkEffortPartyAssign" title="" type="list" >>>> paginate-target="ListWorkEffortPartyAssigns" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <actions> >>>> <entity-condition entity-name="WorkEffortPartyAssignView"> >>>> <condition-expr field-name="workEffortId" >>>> operator="equals" env-name="workEffortId"/> >>>> @@ -424,7 +424,7 @@ >>>> <field name="submitButton" title="${uiLabelMap.CommonAdd}" >>>> widget-style="smallSubmit"><submit button-type="button"/></field> >>>> </form> >>>> <form name="ListProjectNotes" extends="ListWorkEffortNotes" >>>> extends-resource="component://workeffort/widget/WorkEffortForms.xml" >>>> type="list" paginate-target="EditWorkEffortNotes" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <actions> >>>> <entity-condition entity-name="WorkEffortNoteAndData"> >>>> <condition-expr field-name="workEffortId" >>>> env-name="workEffortId"/> >>>> @@ -436,7 +436,7 @@ >>>> <field name="noteParty" title="${uiLabelMap.CommonBy}" >>>> widget-style="tabletext"><display >>>> >>>> description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, >>>> noteParty, true)} at ${bsh: >>>> org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, >>>> "dd-MM-yyyy HH:mm", TimeZone.getDefault(), >>>> context.get("locale"))}"/></field> >>>> </form> >>>> <form name="listResourcesTasks" type="list" list-name="tasks" >>>> paginate-target="listResourcesTask" >>>> target="updateResourcesTaskAssigment" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <row-actions> >>>> <service service-name="getProjectIdAndNameFromTask" >>>> result-map-name="resultProject"> >>>> <field-map field-name="taskId" env-name="workEffortId"/> >>>> @@ -470,7 +470,7 @@ >>>> <field name="toComplete" >>>> title="${uiLabelMap.CommonStatustoComplete}"><hyperlink >>>> >>>> target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_COMPLETED" >>>> description="${uiLabelMap.CommonStatustoComplete}"/></field> >>>> </form> >>>> <form name="listResourcesProjects" type="list" list-name="parties" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <row-actions> >>>> <service service-name="getProject" result-map-name="result"> >>>> <field-map field-name="projectId" >>>> env-name="workEffortId"/> >>>> >>>> Modified: >>>> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=667116&r1=667115&r2=667116&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml >>>> (original) >>>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu >>>> Jun 12 07:49:51 2008 >>>> @@ -297,7 +297,7 @@ >>>> <field name="addButton"><submit/></field> >>>> </form> >>>> <form name="DependenciesBefore" target="removeDependency" title="" >>>> list-name="depList" type="list" separate-columns="true" >>>> paginate-target="Dependencies" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <row-actions> >>>> <service service-name="getProjectTask" result-map-name="r"> >>>> <field-map field-name="taskId" >>>> env-name="workEffortIdFrom"/> >>>> @@ -317,7 +317,7 @@ >>>> <field name="deleteButton"><submit button-type="button"/></field> >>>> </form> >>>> <form name="DependenciesAfter" target="removeDependency" title="" >>>> list-name="depList" type="list" separate-columns="true" >>>> paginate-target="Dependencies" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <row-actions> >>>> <service service-name="getProjectTask" result-map-name="r"> >>>> <field-map field-name="taskId" >>>> env-name="workEffortIdTo"/> >>>> @@ -455,7 +455,7 @@ >>>> <field name="addButton" >>>> title="${uiLabelMap.CommonAdd}"><submit/></field> >>>> </form> <form name="ListTaskNotes" >>>> extends="ListWorkEffortNotes" >>>> extends-resource="component://workeffort/widget/WorkEffortForms.xml" >>>> type="list" list-name="taskNotes" paginate-target="EditTaskNotes" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + odd-row-style="alternate-row" header-row-style="header-row-2" >>>> default-table-style="basic-table hover-bar"> >>>> <actions> >>>> <entity-condition entity-name="WorkEffortNoteAndData"> >>>> <condition-expr field-name="workEffortId" >>>> env-name="workEffortId"/> >>>> @@ -491,7 +491,7 @@ >>>> <field name="createdDate"><display type="date"/></field> >>>> </form> <form >>>> name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" >>>> title="" >>>> type="list" paginate-target="EditTaskPartyAssigns" >>>> - odd-row-style="alternate-row" default-table-style="basic-table >>>> hover-bar"> >>>> + >>>> >>> >>> >> |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |