svn commit: r618698 [1/3] - in /ofbiz/trunk: applications/workeffort/config
Locked
svn commit: r618698 [1/3] - in /ofbiz/trunk: applications/workeffort/config
 
|
Author: mrisaliti
Date: Tue Feb 5 08:47:50 2008 New Revision: 618698 URL: http://svn.apache.org/viewvc?rev=618698&view=rev Log: All the Project Manager forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1618) Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties Tue Feb 5 08:47:50 2008 @@ -253,6 +253,7 @@ WorkEffortMyRates=Mie Percentuali WorkEffortMyRequestList=Mia Lista Richieste WorkEffortMyStatus=Mio Stato +WorkEffortMyTasks=Miei Compiti WorkEffortMyTimesheets=Mie Timbrature WorkEffortName=Nome WorkEffortNameIsMissing=Nome Impegno di Lavoro \u00e8 mancante. Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Tue Feb 5 08:47:50 2008 @@ -20,6 +20,7 @@ fr=French de=German nl=Dutch +it=Italian # Override Page and Label title PageTitleAddATimesheet=Add a new weekly Timesheet @@ -49,14 +50,18 @@ PageTitleEditTask=Edit Task PageTitleFindProject=Find Project PageTitleFindPhase=Find Phase +PageTitleFindResource=Find Resource PageTitleFindSubProject=Find Sub Project PageTitleFindSubTask=Find Sub Task PageTitleFindTask=Find Task +PageTitleFindTimeSheet=Find TimeSheet PageTitleHoursNotYetBilled=Hours not yet billed PageTitleListPartyAssigns=Current Resource Assignments +PageTitleListProjectByParty=List Project by Party PageTitleListProjectNotes=List Project Notes PageTitleListResources=Resources PageTitleListSubProjects=List of Subprojects +PageTitleListTaskByParty=List Task by Party PageTitleListTaskNotes=List Task Notes PageTitleTimesheets=Timesheet list PageTitleProjectBilling=Project Billing @@ -69,11 +74,12 @@ PageTitleUnassignedTask=Unassigned Task ProjectMgrActualHours=Actual Hours ProjectMgrAddNewTask=Add a new task to one of my projects. +ProjectMgrApplication=Project Manager Application ProjectMgrAssignATaskToMe=Assign an existing Task to me. ProjectMgrAssignMyTaskToSomebodyElse=Assign My Task To Somebody Else. ProjectMgrSchedule=Schedule ProjectMgrBilling=Billing -ProjectMgrCompanyName=Ofbiz Company +ProjectMgrCompanyName=OFBiz: Project ProjectMgrCompanySubtitle=Project ProjectMgrCopyProject=Copy Project ProjectMgrDependencies=Dependencies @@ -107,6 +113,7 @@ ProjectMgrProjectSummary=Project Summary ProjectMgrProjectTeam=Project Team ProjectMgrPartySkills=Party Skills +ProjectMgrRates=Rates ProjectMgrRelease=Release ProjectMgrResources=Resources ProjectMgrResourceName=Resource Name @@ -123,7 +130,10 @@ ProjectMgrTaskCurrent=Current Task ProjectMgrTaskDetails=Enter the Task Details below ProjectMgrTaskList=List of Project Tasks +ProjectMgrTaskMember=You are'nt member of any project, contact your project manager. ProjectMgrTaskName=Task Name +ProjectMgrTaskNoOpen1=Currently no 'open' tasks are assigned to you. +ProjectMgrTaskNoOpen2=Add an existing or a new task to a project you are member of. ProjectMgrTaskId=Task Id ProjectMgrTasks=Tasks ProjectMgrTreeDetails=TreeDetails Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Tue Feb 5 08:47:50 2008 @@ -26,7 +26,7 @@ <li class="head3"> ${uiLabelMap.PageTitleAddTask}</li> </#if> </ul> - <br class="clear" /> + <br class="clear"/> </div> <div class="screenlet-body"> <#assign workEffortIdFrom = parameters.workEffortIdFrom> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Tue Feb 5 08:47:50 2008 @@ -24,8 +24,10 @@ <section> <actions> <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <!-- The two default (global) stylesheets are added to the list Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Tue Feb 5 08:47:50 2008 @@ -20,7 +20,7 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="ProjectMgrAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectManagerApplication}" menu-container-style="button-bar tab-bar"> + <menu name="ProjectMgrAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectMgrApplication}" menu-container-style="button-bar tab-bar"> <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item> <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheet"/></menu-item> @@ -340,16 +340,16 @@ </menu-item> </menu> <menu name="ResourcesTabBar" menu-container-style="button-bar tab-bar" default-menu-item-name="edittimesheet" default-selected-style="selected"> - <menu-item name="ResourcesProfile" title="Profile"> + <menu-item name="ResourcesProfile" title="${uiLabelMap.PartyProfile}"> <link target="viewprofile?partyId=${partyId}"/> </menu-item> - <menu-item name="listResourcesProject" title="Project"> + <menu-item name="listResourcesProject" title="${uiLabelMap.ProjectMgrProjectId}"> <link target="listResourcesProject?partyId=${partyId}"></link> </menu-item> - <menu-item name="listResourcesTask" title="Task"> + <menu-item name="listResourcesTask" title="${uiLabelMap.ProjectMgrTaskId}"> <link target="listResourcesTask?partyId=${partyId}"></link> </menu-item> - <menu-item name="EditPartyRates" title="Rates"> + <menu-item name="EditPartyRates" title="${uiLabelMap.ProjectMgrRates}"> <link target="EditPartyRates?partyId=${partyId}"></link> </menu-item> </menu> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Tue Feb 5 08:47:50 2008 @@ -34,18 +34,34 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleListSubProjects}</label></container> - <container style="screenlet-body"> - <include-form name="EditSubProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddSubProject}</label></container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleListSubProjects}"/> + </container> + </container> <container style="screenlet-body"> - <include-form name="AddSubProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> + <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="head3"> + <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> </decorator-screen> </widgets> @@ -70,22 +86,32 @@ <decorator-section name="body"> <section> <widgets> - <!--container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleFindResource}</label></container> - <container style="screenlet-body"> - <include-form name="FindResource" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container--> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleListResources}</label></container> - <container style="screenlet-body"> - <include-form name="ListResources" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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"><label style="boxhead">${uiLabelMap.PageTitleAddResource}</label></container> - <container style="screenlet-body"> - <include-form name="AddResource" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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> @@ -112,16 +138,32 @@ <section> <widgets> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}</label></container> - <container style="screenlet-body"> - <include-form name="FindProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> - <container style="button-bar"><link target="EditProject" text="${uiLabelMap.ProjectMgrNewProject}" style="buttontext"/></container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="FindProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> + </container> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}</label></container> - <container style="screenlet-body"> - <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"><link target="EditProject" text="${uiLabelMap.ProjectMgrNewProject}" style="buttontext"/></container> + <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> </container> </container> </widgets> @@ -146,11 +188,19 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}</label></container> - <container style="screenlet-body"> - <include-form name="EditProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -170,11 +220,19 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleHoursNotYetBilled} ${uiLabelMap.CommonInformation}</label></container> - <container style="screenlet-body"> - <include-form name="hoursNotYetBilled" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleHoursNotYetBilled} ${uiLabelMap.CommonInformation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="hoursNotYetBilled" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -195,14 +253,21 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTreeWorkEfforts}</label></container> - <container style="screenlet-body"> - <!--container><label style="head1">${uiLabelMap.PageTitleTreeWorkEfforts}</label></container--> - <container><link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container> - <include-tree name="TreeWorkEffort" location="component://projectmgr/widget/WorkEffortTrees.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTreeWorkEfforts}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container> + <include-tree name="TreeWorkEffort" location="component://projectmgr/widget/WorkEffortTrees.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -277,27 +342,49 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> + <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead">${uiLabelMap.${titleProperty}}</label> - </container> - <container style="screenlet-body"> - <include-form name="EditProjectTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> + <container style="head3"> + <label text="${uiLabelMap.${titleProperty}}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProjectTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> </container> <container style="lefthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTask}</label></container> - <container style="screenlet-body"> - <include-form name="AddProjectTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddTask}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddProjectTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> </container> </container> </container> <container style="righthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddPhase}</label></container> - <container style="screenlet-body"> - <include-form name="AddProjectPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddPhase}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddProjectPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> </container> </container> </container> @@ -383,17 +470,32 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.${titleProperty}}</label></container> - <container style="screenlet-body"> - <!--container style="button-bar"><link target="EditTask?projectId=${parameters.projectId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN" text="${uiLabelMap.ProjectMgrNewTask}" style="buttontext"/></container--> - <include-form name="ListPhases" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddPhase}</label></container> - <container style="screenlet-body"> - <include-form name="AddPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> @@ -418,18 +520,34 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleListPartyAssigns}</label></container> - <container style="screenlet-body"> - <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddPartyAssign}</label></container> - <container style="screenlet-body"> - <include-form name="AddWorkEffortPartyAssign" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> </decorator-section> </decorator-screen> </widgets> @@ -453,12 +571,20 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.${titleProperty}}</label></container> - <container style="screenlet-body"> - <include-form name="EditProjectSkills" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.${titleProperty}}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProjectSkills" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> + </container> <platform-specific> <html><html-template location="component://projectmgr/webapp/projectmgr/project/editProjectskills.ftl"/></html> </platform-specific> @@ -509,12 +635,20 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.${titleProperty}} ${workEffortId}</label></container> - <container style="screenlet-body"> - <include-form name="ListTimeEntries" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.${titleProperty}} ${workEffortId}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListTimeEntries" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> + </container> <platform-specific> <html><html-template location="component://projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl"/></html> </platform-specific> @@ -539,16 +673,34 @@ <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.${titleProperty}}</label></container> - <container style="screenlet-body"> - <include-form name="ListProjectNotes" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddProjectNotes}</label></container> - <container style="screenlet-body"> - <include-form name="AddWorkEffortNote" location="component://workeffort/widget/WorkEffortForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> </decorator-section> </decorator-screen> </widgets> @@ -556,7 +708,8 @@ </screen> <screen name="ProjectView"> <section> - <actions> + <actions> + <set field="titleProperty" value="ProjectMgrProjectSummary"/> <set field="tabButtonItem" value="projectView"/> <set field="projectId" from-field="parameters.projectId" default-value="parameters.workEffortId"/> <service service-name="getProject" result-map-name="result"> @@ -569,16 +722,24 @@ <decorator-section name="body"> <section> <widgets> - <container style="lefthalf"> + <container style="lefthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.PageTitleProjectInformation}"/></container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleProjectInformation}"/> + </container> + </container> <container style="screenlet-body"> - <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + <section> + <widgets> + <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> </container> - </container> + </container> <include-screen name="PhasesInfo"/> - <include-screen name="TasksInfo"/> - </container> + <include-screen name="TasksInfo"/> + </container> <container style="righthalf"> <include-screen name="SubProjectsInfo"/> <include-screen name="PartiesInfo"/> @@ -594,6 +755,7 @@ <screen name="ganttChart"> <section> <actions> + <set field="titleProperty" value="ProjectMgrGanttChart"/> <set field="tabButtonItem" value="ganttchart"/> <set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/> <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.bsh"/> @@ -603,13 +765,21 @@ <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.PageTitleProjectGanttChart}"/></container> - <container style="screenlet-body"> - <platform-specific> - <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html> - </platform-specific> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleProjectGanttChart}"/> </container> </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -624,14 +794,20 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> </actions> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="boxhead">${uiLabelMap.ProjectMgrSubProjectList}</label> - </container> - <container style="screenlet-body"> - <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrSubProjectList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </screen> @@ -648,12 +824,18 @@ <widgets> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.ProjectMgrPhaseList}</label> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrPhaseList}"/> + </container> </container> <container style="screenlet-body"> - <include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + <section> + <widgets> + <include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> </container> - </container> + </container> </widgets> </section> </screen> @@ -670,12 +852,18 @@ <widgets> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.ProjectMgrTaskList}</label> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrTaskList}"/> + </container> </container> <container style="screenlet-body"> - <include-form name="ListTaskInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + <section> + <widgets> + <include-form name="ListTaskInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> </container> - </container> + </container> </widgets> </section> </screen> @@ -690,14 +878,20 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> </actions> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.ProjectMgrProjectTeam}</label> - </container> - <container style="screenlet-body"> - <include-form name="ListProjectParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrProjectTeam}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListProjectParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </screen> @@ -761,7 +955,7 @@ <section> <actions> <set field="tabButtonItem" value="listResourcesProject"/> - <set field="titleProperty" value="List Project by Party"/> + <set field="titleProperty" value="PageTitleListProjectByParty"/> <set field="workEffortId" from-field="parameters.projectId"/> <entity-and entity-name="WorkEffortAndPartyAssign" list-name="parties"> <field-map field-name="workEffortTypeId" value="PROJECT"/> @@ -784,19 +978,33 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.PageTitleProjectInformation}</label> - </container> - <container style="screenlet-body"> - <include-form name="listResourcesProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddProject}</label></container> - <container style="screenlet-body"> - <include-form name="AddResourceProjectParty" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> @@ -810,7 +1018,7 @@ <section> <actions> <set field="tabButtonItem" value="listResourcesTask"/> - <set field="titleProperty" value="List Task by Party"/> + <set field="titleProperty" value="PageTitleListTaskByParty"/> <set field="workEffortId" from-field="parameters.projectId"/> <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks"> <field-map field-name="partyId" env-name="parameters.partyId"/> @@ -828,19 +1036,33 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.PageTitleTaskInformation}</label> - </container> - <container style="screenlet-body"> - <include-form name="listResourcesTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTask}</label></container> - <container style="screenlet-body"> - <include-form name="AddResourceTaskParty" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> @@ -1027,9 +1249,34 @@ <widgets> <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1" text="${uiLabelMap.PageTitleEditPartyRates}"/></container> - <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/> - <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> </decorator-section> </decorator-screen> </widgets> @@ -1190,4 +1437,4 @@ </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Tue Feb 5 08:47:50 2008 @@ -34,26 +34,35 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="head1">${uiLabelMap.WorkEffortMyRequestList}</label> - </container> - <container style="screenlet-body"> - <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> - </container> - <container style="screenlet-body"> - <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.OrderRequestList}"/></container> - <container style="screenlet"> - <container style="screenlet-body"> - <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OrderRequestList}"/> </container> </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="screenlet-body"> + <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> + </container> + <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/> + </widgets> + </section> + </container> </container> - <container style="screenlet-body"> - <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.ProjectMgrRequestWorkEffortList}"/></container> - <container style="screenlet"> - <container style="screenlet-body"> - <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrRequestWorkEffortList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/> + </widgets> + </section> </container> </container> </decorator-section> @@ -77,7 +86,20 @@ <widgets> <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OrderRequest}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -102,17 +124,33 @@ <decorator-section name="body"> <container style="lefthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead" text="${custRequest.custRequestName} [${custRequestId}] ${uiLabelMap.CommonInformation}"/></container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${custRequest.custRequestName} ${custRequestId} ${uiLabelMap.CommonInformation}"/> + </container> + </container> <container style="screenlet-body"> - <include-form name="RequestInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/> + <section> + <widgets> + <include-form name="RequestInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/> + </widgets> + </section> </container> </container> </container> <container style="righthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.OrderRequestRoles}"/></container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OrderRequestRoles}"/> + </container> + </container> <container style="screenlet-body"> - <include-form name="RequestRolesInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/> + <section> + <widgets> + <include-form name="RequestRolesInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/> + </widgets> + </section> </container> </container> </container> @@ -121,5 +159,4 @@ </widgets> </section> </screen> -</screens> - +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |