svn commit: r628244 - in /ofbiz/trunk/specialpurpose/pr
Locked
 
|
Author: hansbak
Date: Fri Feb 15 23:14:25 2008 New Revision: 628244 URL: http://svn.apache.org/viewvc?rev=628244&view=rev Log: first trials to use the <screenlet widgets Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=628244&r1=628243&r2=628244&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Fri Feb 15 23:14:25 2008 @@ -49,6 +49,7 @@ PageTitleEditSubTask=Edit Sub Task PageTitleEditTask=Edit Task PageTitleFindProject=Find Project +PageTitleFindProjectResults=Find Project Results PageTitleFindPhase=Find Phase PageTitleFindResource=Find Resource PageTitleFindSubProject=Find Sub Project @@ -63,6 +64,7 @@ PageTitleListSubProjects=List of Subprojects PageTitleListTaskByParty=List Task by Party PageTitleListTaskNotes=List Task Notes +PageTitleListTaskSearchResult=Task search results PageTitleTimesheets=Timesheet list PageTitleProjectBilling=Project Billing PageTitleProjectInformation=Project Information @@ -132,6 +134,7 @@ ProjectMgrTaskList=List of Project Tasks ProjectMgrTaskMember=You are'nt member of any project, contact your project manager. ProjectMgrTaskName=Task Name +ProjectMgrTaskTeam=Task Team ProjectMgrTaskNoOpen1=Currently no 'open' tasks are assigned to you. ProjectMgrTaskNoOpen2=Add an existing or a new task to a project you are member of. ProjectMgrNoPhasesYet=No phases have been created yet, tasks can not exist without a phase as parent, so create a phase first Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=628244&r1=628243&r2=628244&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Feb 15 23:14:25 2008 @@ -232,7 +232,8 @@ <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/> </and> </condition> - <link target="EditTask?workEffortId=${workEffortId}"/></menu-item> + <link target="EditTask?workEffortId=${workEffortId}"/> + </menu-item> <menu-item name="dependencies" title="${uiLabelMap.ProjectMgrDependencies}"> <condition> <and> @@ -242,7 +243,8 @@ <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/> </and> </condition> - <link target="Dependencies?workEffortId=${workEffortId}"/></menu-item> + <link target="Dependencies?workEffortId=${workEffortId}"/> + </menu-item> <menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}"> <condition> <and> @@ -252,7 +254,8 @@ <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/> </and> </condition> - <link target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/></menu-item> + <link target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/> + </menu-item> <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"> <condition> <and> @@ -262,21 +265,23 @@ <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/> </and> </condition> - <link target="EditTaskSkills?workEffortId=${workEffortId}"/></menu-item> - <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditTaskNotes?workEffortId=${workEffortId}"/></menu-item> - <!--menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildTaskWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item--> + <link target="EditTaskSkills?workEffortId=${workEffortId}"/> + </menu-item> + <menu-item name="notes" title="${uiLabelMap.CommonNotes}"> + <link target="EditTaskNotes?workEffortId=${workEffortId}"/> + </menu-item> </menu> <menu name="TaskSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" > - <condition> - <and> - <not><if-empty field-name="workEffort"/></not> - <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/> - <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/> - </and> - </condition> - <link target="setTaskStatus?workEffortId=${workEffortId}&currentStatusId=PTS_ON_HOLD"/> - </menu-item> + <menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" > + <condition> + <and> + <not><if-empty field-name="workEffort"/></not> + <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/> + <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/> + </and> + </condition> + <link target="setTaskStatus?workEffortId=${workEffortId}&currentStatusId=PTS_ON_HOLD"/> + </menu-item> <menu-item name="release" title="${uiLabelMap.ProjectMgrRelease}" > <condition> <and> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=628244&r1=628243&r2=628244&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Feb 15 23:14:25 2008 @@ -134,40 +134,13 @@ </actions> <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.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"> - <container style="h3"> - <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> - </section> + <decorator-section name="body"> + <screenlet name="findProject" collapsible="true" title="${uiLabelMap.PageTitleFindProject}"> + <include-form name="FindProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleFindProjectResults}" tab-menu-name="projectSubTabBar"> + <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> + </screenlet> </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=628244&r1=628243&r2=628244&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Feb 15 23:14:25 2008 @@ -236,62 +236,40 @@ <widgets> <decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <section> - <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindTask}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindTask" 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.PageTitleFindTask}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <condition> - <or> - <if-has-permission permission="PROJECTMGR_ADMIN"/> - <if-has-permission permission="PROJECTMGR_VIEW"/> - </or> - </condition> - <actions> - <set field="entityName" value="ProjectAndPhaseAndTask"/> - </actions> - <widgets> - <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </widgets> - </section> - <section> - <condition> - <or> - <if-has-permission permission="PROJECTMGR_ROLE_ADMIN"/> - <if-has-permission permission="PROJECTMGR_ROLE_VIEW"/> - </or> - </condition> - <actions> - <set field="entityName" value="ProjectPartyAndPhaseAndTask"/> - <set field="parameters.partyId" from-field="context.userLogin.partyId"/> - </actions> - <widgets> - <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </widgets> - </section> - </container> - </container> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleFindTask}" collapsible="true" id="findTask"> + <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleListTaskSearchResult}"> + <section> + <condition> + <or> + <if-has-permission permission="PROJECTMGR_ADMIN"/> + <if-has-permission permission="PROJECTMGR_VIEW"/> + </or> + </condition> + <actions> + <set field="entityName" value="ProjectAndPhaseAndTask"/> + </actions> + <widgets> + <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + <section> + <condition> + <or> + <if-has-permission permission="PROJECTMGR_ROLE_ADMIN"/> + <if-has-permission permission="PROJECTMGR_ROLE_VIEW"/> + </or> + </condition> + <actions> + <set field="entityName" value="ProjectPartyAndPhaseAndTask"/> + <set field="parameters.partyId" from-field="context.userLogin.partyId"/> + </actions> + <widgets> + <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -655,19 +633,15 @@ </actions> <widgets> <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.TaskTeam}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </widgets> - </section> - </container> - </container> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.ProjectMgrTaskTeam}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> </widgets> </section> </screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |