svn commit: r618698 [2/3] - in /ofbiz/trunk: applications/workeffort/config
Locked
svn commit: r618698 [2/3] - in /ofbiz/trunk: applications/workeffort/config
 
|
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Tue Feb 5 08:47:50 2008 @@ -47,15 +47,31 @@ <widgets> <container style="lefthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksBefore}</label></container> - <container style="screenlet-body"> - <include-form name="DependenciesBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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"><label style="boxhead">${uiLabelMap.PageTitleAddDependencyBefore}</label></container> - <container style="screenlet-body"> - <include-form name="AddDependencyBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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> </container> @@ -71,15 +87,31 @@ <widgets> <container style="righthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksAfter}</label></container> - <container style="screenlet-body"> - <include-form name="DependenciesAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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"><label style="boxhead">${uiLabelMap.PageTitleAddDependencyAfter}</label></container> - <container style="screenlet-body"> - <include-form name="AddDependencyAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <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> </container> @@ -93,7 +125,7 @@ <screen name="MyTasks"> <section> <actions> - <set field="titleProperty" value="PageTitleMyTask"/> + <set field="titleProperty" value="WorkEffortMyTasks"/> <set field="headerItem" value="mytasks"/> <set field="labelTitleProperty" value="ProjectMgrMyTasks"/> <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks" filter-by-date="true"> @@ -117,57 +149,68 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTaskAssignedToMe}</label></container> - <container style="screenlet-body"> - <section> - <condition> - <not><if-empty field-name="tasks"/></not> - </condition> - <widgets> - <include-form name="MyTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </widgets> - <fail-widgets> - <label style="head3" text="Currently no 'open' tasks are assigned to you.<br/> Add an existing or a new task to a project you are member of."></label> - </fail-widgets> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTaskAssignedToMe}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <condition> + <not><if-empty field-name="tasks"/></not> + </condition> + <widgets> + <include-form name="MyTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + <fail-widgets> + <label style="head3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label> + <label style="head3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label> + </fail-widgets> </section> - </container> - </container> - <!--container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleMemberOfProjects}</label></container> - <container style="screenlet-body"> - <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/> - </container> - </container--> + </container> + </container> <section> <condition> <not><if-empty field-name="projects"/></not> </condition> <widgets> <container style="lefthalf"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAssignATaskToMe}</label></container> - <container style="screenlet-body"> - <include-form name="assignTaskToMe" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrAssignATaskToMe}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="assignTaskToMe" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> </container> <container style="righthalf"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAddNewTask}</label></container> - <container style="screenlet-body"> - <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrAddNewTask}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> </container> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrAssignATaskToMe}</label></container> - <container style="screenlet-body"> - <label style="head3" text="You are'nt member of any project, contact your project manager."></label> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrAssignATaskToMe}"/> + </container> + </container> + <container style="screenlet-body"> + <label style="head3" text="${uiLabelMap.ProjectMgrTaskMember}"></label> + </container> + </container> </fail-widgets> </section> </widgets> @@ -192,41 +235,57 @@ <section> <widgets> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleFindTask}</label></container> - <container style="screenlet-body"> - <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> - <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 style="screenlet-title-bar"> + <container style="head3"> + <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="head3"> + <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> </decorator-section> @@ -238,7 +297,7 @@ <section> <actions> <set field="headerItem" value="task"/> - <set field="titleProperty" value="PageTitleEditTaskList"/> + <set field="titleProperty" value="PageTitleEditTask"/> <set field="tabButtonItem" value="edittask"/> <set field="labelTitleProperty" value="PageTitleEditTaskList"/> <set field="workEffortId" from-field="parameters.workEffortId"/> @@ -252,9 +311,17 @@ <!-- To add a new Project --> <widgets> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTask} #${task.workEffortId} ${uiLabelMap.CommonInformation}</label></container> - <container style="screenlet-body"> - <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditTask} #${task.workEffortId} ${uiLabelMap.CommonInformation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> </container> </container> </widgets> @@ -307,13 +374,19 @@ <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="ListTaskSkills" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </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="ListTaskSkills" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </container> </container> <platform-specific> <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittaskskills.ftl"/></html> @@ -391,17 +464,33 @@ <decorator-screen name="CommonTaskDecorator" 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-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleListPartyAssigns}"/> + </container> + </container> <container style="screenlet-body"> - <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <section> + <widgets> + <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> </container> - </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 style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddPartyAssign}"/> + </container> </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> @@ -422,16 +511,34 @@ <widgets> <decorator-screen name="CommonTaskDecorator" 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="ListTaskNotes" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTaskNotes}</label></container> - <container style="screenlet-body"> - <include-form name="AddTaskNote" location="component://projectmgr/widget/forms/TaskForms.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="ListTaskNotes" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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> </decorator-section> </decorator-screen> </widgets> @@ -440,6 +547,7 @@ <screen name="TaskView"> <section> <actions> + <set field="titleProperty" value="ProjectMgrTaskSummary"/> <set field="headerItem" value="task"/> <set field="tabButtonItem" value="taskView"/> <set field="workEffortId" from-field="parameters.workEffortId"/> @@ -457,13 +565,21 @@ <not><if-empty field-name="task"/></not> </condition> <widgets> - <container style="lefthalf"> + <container style="lefthalf"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.PageTitleTaskInformation}"/></container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTaskInformation}"/> + </container> + </container> <container style="screenlet-body"> - <include-form name="TaskInfo" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <section> + <widgets> + <include-form name="TaskInfo" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> </container> - </container> + </container> <include-screen name="taskBefore"/> <include-screen name="taskAfter"/> </container> @@ -534,14 +650,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.TaskTeam}</label> - </container> - <container style="screenlet-body"> - <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <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> </widgets> </section> </screen> @@ -554,12 +676,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.PageTitleRequestList}"/></container> - <container style="screenlet-body"> - <include-form name="ListWorkEffortRequests" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleRequestList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListWorkEffortRequests" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </screen> @@ -574,12 +704,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">${uiLabelMap.PageTitleTasksBefore}</label></container> - <container style="screenlet-body"> - <include-form name="TaskBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTasksBefore}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="TaskBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </screen> @@ -594,12 +732,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">${uiLabelMap.PageTitleTasksAfter}</label></container> - <container style="screenlet-body"> - <include-form name="TaskAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTasksAfter}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="TaskAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </screen> @@ -621,26 +767,42 @@ <section> <widgets> <container style="lefthalf"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleCreateTaskbyRequest}</label></container> - <container style="screenlet-body"> - <include-form name="createTaskbyRequest" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleCreateTaskbyRequest}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="createTaskbyRequest" 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.ProjectMgrCreateByExistingTask}</label></container> - <container style="screenlet-body"> - <include-form name="CreateCustRequestWorkEffortByExistingTaskForm" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.ProjectMgrCreateByExistingTask}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreateCustRequestWorkEffortByExistingTaskForm" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </widgets> + </section> + </container> </container> </container> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Tue Feb 5 08:47:50 2008 @@ -34,17 +34,33 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">Find TimeSheet</label></container> - <container style="screenlet-body"> - <include-form name="FindTimeSheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">TimeSheet Listing</label></container> - <container style="screenlet-body"> - <include-form name="ListFindTimeSheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleFindTimeSheet}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="FindTimeSheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTimesheets}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFindTimeSheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </widgets> + </section> + </container> </container> </widgets> </section> @@ -56,7 +72,7 @@ <screen name="Timesheet"> <section> <actions> - <set field="titleProperty" value="PageTitleFindTimeSheet"/> + <set field="titleProperty" value="PageTitleTimesheet"/> <set field="headerItem" value="timesheet"/> <set field="tabButtonItem" value="editTimesheet"/> <set field="labelTitleProperty" value="ProjectMgrTimeSheetMyTime"/> @@ -67,27 +83,39 @@ <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTimesheet} # ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}</label></container> - <container style="screenlet-body"> - <section> - <condition> - <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> - </condition> - <widgets> - <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </widgets> - <fail-widgets> - <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </fail-widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddATimesheet}</label></container> - <container style="screenlet-body"> - <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTimesheet} # ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <condition> + <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> + </condition> + <widgets> + <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </widgets> + <fail-widgets> + <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </fail-widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddATimesheet}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </widgets> + </section> + </container> </container> <include-screen name="ListTimesheets"/> </decorator-section> @@ -154,7 +182,7 @@ <screen name="MyTimesheet"> <section> <actions> - <set field="titleProperty" value="PageTitleFindTimesheet"/> + <set field="titleProperty" value="TimesheetMyTime"/> <set field="tabButtonItem" value="edittimesheet"/> <set field="labelTitleProperty" value="PageTitleAddTimesheet"/> <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/> @@ -166,26 +194,34 @@ <decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}</label></container> - <container style="screenlet-body"> - <section> - <condition> - <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> - </condition> - <widgets> - <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </widgets> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <condition> + <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> + </condition> + <widgets> + <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </widgets> <fail-widgets> - <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </fail-widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddATimesheet}</label></container> - <container style="screenlet-body"> - <include-form name="AddMyWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </container> + <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </fail-widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddATimesheet}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddMyWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </container> </container> <include-screen name="ListTimesheets"/> </decorator-section> @@ -260,13 +296,21 @@ <screen name="ListTimesheets"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTimesheets} ${uiLabelMap.CommonOf} ${partyNameView.firstName} ${partyNameView.middleName} ${partyNameView.lastName} </label></container> - <container style="screenlet-body"> - <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> - </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleTimesheets} ${uiLabelMap.CommonOf} ${partyNameView.firstName} ${partyNameView.middleName} ${partyNameView.lastName}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> + </widgets> + </section> + </container> </container> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Feb 5 08:47:50 2008 @@ -19,7 +19,8 @@ --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditProject" type="single" target="updateProject" default-map-name="project"> + <form name="EditProject" type="single" target="updateProject" default-map-name="project" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="project==null" target="createProject"/> <field use-when="project==null" name="templateId"> <drop-down allow-empty="true"> @@ -57,7 +58,8 @@ <field use-when="project!=null" name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display description="${bsh:project.get("actualCompletionDate")!=null?project.get("actualCompletionDate").toString().substring(0,10):"";}"/></field> <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="AddSubProject" type="single" target="AddSubProject"> + <form name="AddSubProject" type="single" target="AddSubProject" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortParentId"><hidden value="${projectId}"/></field> <field name="projectId"><hidden/></field> <field name="workEffortId" title="${uiLabelMap.ProjectMgrProjectName}"> @@ -70,11 +72,13 @@ </field> <field name="add"><submit/></field> </form> - <form name="FindResource" type="single" target="FindResource"> + <form name="FindResource" type="single" target="FindResource" + header-row-style="header-row" default-table-style="basic-table"> <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}"><text/></field> <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field> </form> - <form name="ListResources" type="list" list-name="resources" paginate-target="FindResource"> + <form name="ListResources" type="list" list-name="resources" paginate-target="FindResource" + odd-row-style="alternate-row" 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"/> @@ -89,18 +93,21 @@ <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field> <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="removeResource?partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field> </form> - <form name="AddResource" type="single" target="addResource"> + <form name="AddResource" type="single" target="addResource" + header-row-style="header-row" default-table-style="basic-table"> <field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId"><hidden value="PROJECT_TEAM"/></field> <field name="addButton" ><submit/></field> </form> - <form name="FindProject" type="single" target="FindProject" title="Find and List Project"> + <form name="FindProject" type="single" target="FindProject" title="Find and List Project" + header-row-style="header-row" default-table-style="basic-table"> <field name="projectId" title="${uiLabelMap.ProjectMgrProjectId}"><text-find size="25" default-option="contains"></text-find></field> <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><text-find size="25" default-option="contains"></text-find></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date" /></field> <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field> </form> - <form name="hoursNotYetBilled" type="list" list-name="entryList"> + <form name="hoursNotYetBilled" type="list" list-name="entryList" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/hoursNotYetBilled.bsh"/> </actions> @@ -110,7 +117,8 @@ <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}"/></field> <field name="fromDate"><display type="date"/></field> </form> - <form name="ListProjects" type="list" list-name="projects" paginate-target="FindProject"> + <form name="ListProjects" type="list" list-name="projects" paginate-target="FindProject" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/> </field> @@ -124,7 +132,8 @@ <field name="actualHours"><display/></field> <field name="createdStamp"><display type="date"/></field> </form> - <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject"> + <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden/></field> <field name="workEffortParentId"><hidden value=""/></field> <field name="workEffortId"><hidden value="${projectId}"/></field> @@ -142,7 +151,8 @@ <field name="createdStamp"><display type="date"/></field> <!--field name="removeButton"><submit/></field--><!-- TODO: difficult to clear the workEffortParentId field in the record have to find solution--> </form> - <form name="ProjectInfo" type="single" default-map-name="project" paginate-target="FindProject"> + <form name="ProjectInfo" type="single" default-map-name="project" paginate-target="FindProject" + header-row-style="header-row" default-table-style="basic-table"> <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><display/></field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> @@ -160,7 +170,8 @@ <field name="actualHours"><display/></field> <field name="createdDate"><display type="date"/></field> </form> - <form name="ListChildEfforts" target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject"> + <form name="ListChildEfforts" target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <entity-one entity-name="StatusItem" value-name="currentStatus"> <field-map field-name="statusId" env-name="currentStatusId"/> @@ -194,7 +205,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="EditProjectTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="EditProjectTasks"> + <form name="EditProjectTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="EditProjectTasks" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <service service-name="getProjectTask" result-map-name="result"> <field-map field-name="taskId" env-name="workEffortId"/> @@ -224,7 +236,8 @@ <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask"> + <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <entity-one entity-name="StatusItem" value-name="currentStatus"> <field-map field-name="statusId" env-name="currentStatusId"/> @@ -254,7 +267,8 @@ </field> <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"> + <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"> <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> @@ -267,7 +281,8 @@ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="ListPhaseInfo" type="list" list-name="phases"> + <form name="ListPhaseInfo" type="list" list-name="phases" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="parameters.projectId"/></field> <field name="phase"><hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/></field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> @@ -277,7 +292,8 @@ <field name="plannedHours"><display/></field> <field name="actualHours"><display/></field> </form> - <form name="ListTaskInfo" type="list" list-name="tasks"> + <form name="ListTaskInfo" type="list" list-name="tasks" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="parameters.projectId"/></field> <field name="task"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}"/></field> <field name="phaseName"><display/></field> @@ -288,7 +304,8 @@ <field name="plannedHours"><display/></field> <field name="actualHours"><display/></field> </form> - <form name="ListProjectParties" type="list" list-name="parties"> + <form name="ListProjectParties" type="list" list-name="parties" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden/></field> <field name="partyName" title="${uiLabelMap.CommonName}"> <hyperlink target="viewprofile?partyId=${partyId}" description="${partyName}"/> @@ -298,7 +315,8 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field> <field name="actualHours"><display/></field> </form> - <form name="EditProjectSkills" type="list" target="updateProjectSkillStandard" list-name="workEffortSkillStandardList" paginate-target="EditProjectSkills"> + <form name="EditProjectSkills" type="list" target="updateProjectSkillStandard" list-name="workEffortSkillStandardList" paginate-target="EditProjectSkills" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}"> <display-entity entity-name="WorkEffort" description="${workEffortName} ${workEffortId}"> <sub-hyperlink target="EditProject?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/> @@ -313,7 +331,8 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectSkillStandard?workEffortId=${workEffortId}&skillTypeId=${skillTypeId}"/> </field> </form> - <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns"> + <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortPartyAssignView"> <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/> @@ -330,7 +349,8 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field> <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign" title="" type="single"> + <form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="workEffortId!=projectId" target="createTaskPartyAssign"/><!-- this used for tasks else for project --> <field name="projectId"><hidden/></field> <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field> @@ -367,7 +387,8 @@ <field entry-name="xx" name="thruDate"><date-time type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries"> + <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="TimeEntry"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -406,7 +427,8 @@ <hyperlink target="deleteTimeEntry?workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="ListProjectNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" list-name="projectNotes" paginate-target="EditWorkEffortNotes"> + <form name="ListProjectNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" list-name="projectNotes" paginate-target="EditWorkEffortNotes" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortNoteAndData"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -417,7 +439,8 @@ <field name="workEffortId"><hidden/></field> <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"> + <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"> <row-actions> <service service-name="getProjectIdAndNameFromTask" result-map-name="resultProject"> <field-map field-name="taskId" env-name="workEffortId"/> @@ -450,7 +473,8 @@ <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field> <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" default-title-style="tableheadtext"> + <form name="listResourcesProjects" type="list" list-name="parties" + odd-row-style="alternate-row" 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"/> @@ -480,7 +504,8 @@ <field name="actualHours" widget-area-style="tabletextcenter"><display/></field> <field name="CreatedStamp" title="CreatedStamp"><display type="date"/></field> </form> - <form name="AddResourceProjectParty" target="addWorkEffortPartyAssign" title="" type="single"> + <form name="AddResourceProjectParty" target="addWorkEffortPartyAssign" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="projectId"><hidden/></field> <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> @@ -506,7 +531,8 @@ <field entry-name="test" name="thruDate"><date-time type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddResourceTaskParty" target="addTaskPartyAssign" title="" type="single"> + <form name="AddResourceTaskParty" target="addTaskPartyAssign" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="projectId"><hidden/></field> <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> @@ -532,4 +558,4 @@ <field entry-name="test" name="thruDate"><date-time type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=618698&r1=618697&r2=618698&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Feb 5 08:47:50 2008 @@ -20,14 +20,15 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListRequests" type="list" use-row-submit="true" title="" list-name="requests"> + <form name="ListRequests" type="list" use-row-submit="true" title="" list-name="requests" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="CustRequest" list-name="requests"> <field-map field-name="statusId" value="CRQ_SUBMITTED"/> </entity-and> </actions> <field name="custRequestName" widget-style="buttontext"> - <hyperlink description="${custRequestName}[${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/> + <hyperlink description="${custRequestName} ${custRequestId}" target="ViewRequest?custRequestId=${custRequestId}"/> </field> <field name="priority"><display/></field> <field name="createdDate"><display type="date"/></field> @@ -41,7 +42,7 @@ </field> </form> <form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="custRequest==null" target="createrequest"/> <auto-fields-service service-name="updateCustRequest" default-field-type="edit"/> <field name="custRequestId"><hidden/></field> @@ -101,7 +102,8 @@ <field name="lastModifiedByUserLogin"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="RequestInfo" type="single" default-entity-name="CustRequest" default-map-name="custRequest"> + <form name="RequestInfo" type="single" default-entity-name="CustRequest" default-map-name="custRequest" + header-row-style="header-row" default-table-style="basic-table"> <actions> <entity-one entity-name="WorkEffort" value-name="workEffort"> <field-map field-name="workEffortId" env-name="workEffortId"/> @@ -128,7 +130,8 @@ <field name="createdDate"><display type="date"/></field> <field name="lastModifiedDate"><display type="date"/></field> </form> - <form name="RequestRolesInfo" type="list"> + <form name="RequestRolesInfo" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="CustRequestRole"> <field-map field-name="custRequestId" env-name="custRequestId"/> @@ -144,7 +147,8 @@ </field> <field name="RequestTaker"><display description="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName}"/></field> </form> - <form name="ListRequestsWorkEffortForm" type="list" use-row-submit="true" list-name="requests" paginate-target="requestlist"> + <form name="ListRequestsWorkEffortForm" type="list" use-row-submit="true" list-name="requests" paginate-target="requestlist" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="CustRequest" list-name="requests"> <field-map field-name="statusId" value="CRQ_ACCEPTED"/> @@ -154,7 +158,7 @@ <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/> </row-actions> <field name="custRequestName" widget-style="buttontext"> - <hyperlink description="${custRequestName}[${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/> + <hyperlink description="${custRequestName} ${custRequestId}" target="ViewRequest?custRequestId=${custRequestId}"/> </field> <field name="workEffortId"> <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortId}"/> @@ -167,5 +171,4 @@ </field> <field name="description"><display/></field> </form> -</forms> - +</forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |