You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/06/12 11:36:33 UTC
svn commit: r667014 - in /ofbiz/trunk/applications: humanres/config/
humanres/widget/ humanres/widget/forms/ party/widget/partymgr/
Author: ashish
Date: Thu Jun 12 02:36:32 2008
New Revision: 667014
URL: http://svn.apache.org/viewvc?rev=667014&view=rev
Log:
Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Human Resource component.
Thanks Harsha Chadhar for your patch.
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml
ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml
ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Thu Jun 12 02:36:32 2008
@@ -375,6 +375,9 @@
<property key="HumanResAddPerfReviewItems">
<value xml:lang="en">Add PerfReview Items</value>
</property>
+ <property key="HumanResAddPartySkill">
+ <value xml:lang="en">Add Party Skill</value>
+ </property>
<property key="HumanResAddPersonTraining">
<value xml:lang="en">Add Person Training</value>
</property>
@@ -587,15 +590,6 @@
<property key="HumanResGlobalHRSettings">
<value xml:lang="en">Global HR Settings</value>
</property>
- <property key="HumanResListEmplLeaveType">
- <value xml:lang="en">List EmplLeave Type</value>
- </property>
- <property key="HumanResListEmplPositionsReportedTo">
- <value xml:lang="en">List Employee Positions, Reported To [${parameters.emplPositionId}]</value>
- </property>
- <property key="HumanResListEmplPositionsReportsTo">
- <value xml:lang="en">List Employee Positions, [${parameters.emplPositionId}] Reports To</value>
- </property>
<property key="HumanResListEmployments">
<value xml:lang="en">List Employment</value>
<value xml:lang="it">Lista Impiegato</value>
@@ -606,66 +600,15 @@
<value xml:lang="it">Lista Benefits Soggetto </value>
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸à¸£à¸°à¹à¸¢à¸à¸à¹</value>
</property>
- <property key="HumanResListPartyQual">
- <value xml:lang="en">List Party Qualification</value>
- <value xml:lang="it">Lista Qualifica Soggetto</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´</value>
- </property>
- <property key="HumanResListPartyResumes">
- <value xml:lang="en">List Party Resumes</value>
- <value xml:lang="it">Lista Riassunti Soggetto</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸°à¸§à¸±à¸à¸´à¸¢à¹à¸</value>
- </property>
- <property key="HumanResListPartySkill">
- <value xml:lang="en">List Party Skills</value>
- <value xml:lang="it">Lista Abilità Soggetto</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸±à¸à¸©à¸°</value>
- </property>
- <property key="HumanResListPayGrade">
- <value xml:lang="en">List Pay Grades</value>
- <value xml:lang="it">Lista Grado Paga</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸£à¸°à¸à¸±à¸à¸à¸²à¸£à¸à¹à¸²à¸¢</value>
- </property>
<property key="HumanResListPayHistories">
<value xml:lang="en">List Pay Histories</value>
<value xml:lang="it">Lista Storia Paghe</value>
<value xml:lang="th">รายà¸à¸²à¸£à¸à¹à¸²à¸¢à¸à¹à¸à¸¡à¸¹à¸¥</value>
</property>
- <property key="HumanResListPayrollPreferences">
- <value xml:lang="en">List Payroll Preferences</value>
- <value xml:lang="it">Lista Preferenze Paghe</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¹à¸²à¸à¸à¸´à¸à¹à¸à¸´à¸à¹à¸à¸·à¸à¸</value>
- </property>
- <property key="HumanResListPersonTraining">
- <value xml:lang="en">List Person Training</value>
- </property>
- <property key="HumanResListSalaryStep">
- <value xml:lang="en">List Salary Step</value>
- <value xml:lang="it">Lista Passi Salario</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸±à¹à¸à¹à¸à¸´à¸à¹à¸à¸·à¸à¸</value>
- </property>
- <property key="PageTitleListSalarySteps">
- <value xml:lang="en">List Salary Steps</value>
- </property>
<property key="HumanResListSkillTypes">
<value xml:lang="en">List Skill Types</value>
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸©à¸°</value>
</property>
- <property key="HumanResListTerminationReasons">
- <value xml:lang="en">List Termination Reasons</value>
- <value xml:lang="it">Lista Motivazioni Licenziamento</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¹à¸à¸à¹à¸«à¸à¸¸à¸à¸¥</value>
- </property>
- <property key="HumanResListUnemploymentClaim">
- <value xml:lang="en">List Unemployment Claim</value>
- <value xml:lang="it">Lista Reclamo Disoccupazione</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸³à¸à¸§à¸à¸à¸¹à¹à¸§à¹à¸²à¸à¸à¸²à¸à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸</value>
- </property>
- <property key="HumanResListValidResponsibility">
- <value xml:lang="en">List Valid Responsibility</value>
- <value xml:lang="it">Lista Validità Responsibilità </value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸«à¸à¹à¸²à¸à¸µà¹à¸£à¸±à¸à¸à¸´à¸à¸à¸à¸</value>
- </property>
<property key="HumanResLookupBudgetByName">
<value xml:lang="en">Lookup Budget by Name</value>
<value xml:lang="it">Ricerca Budget per Nome</value>
@@ -1079,21 +1022,11 @@
<value xml:lang="it">Lista Posizione Impiegato</value>
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸</value>
</property>
- <property key="PageTitleListEmplPositionFulfillments">
- <value xml:lang="en">List EmplPosition Fulfillments</value>
- <value xml:lang="it">Lista Posizione Impiegato Adempimenti</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸à¸à¸µà¹à¸à¸à¸´à¸à¸±à¸à¸´à¸ ารà¸à¸´à¸</value>
- </property>
<property key="PageTitleListEmplPositionReportingStructs">
<value xml:lang="en">List EmplPosition Reporting Structs</value>
<value xml:lang="it">Lista Posizione Impiegato Struttura Stampe</value>
<value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸à¹à¸à¸£à¸à¸ªà¸£à¹à¸²à¸à¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸</value>
</property>
- <property key="PageTitleListEmplPositionResponsibilities">
- <value xml:lang="en">List EmplPosition Responsibilities</value>
- <value xml:lang="it">Lista Posizione Responsabilità Impiegato</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸«à¸à¹à¸²à¸à¸µà¹à¸£à¸±à¸à¸à¸´à¸à¸à¸à¸</value>
- </property>
<property key="PageTitleListPartyReview">
<value xml:lang="en">List PerfReview</value>
<value xml:lang="it">Lista Rassegna Prestazioni</value>
Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Thu Jun 12 02:36:32 2008
@@ -90,20 +90,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmplLeave}">
- <section>
- <widgets>
- <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddEmplLeave}">
- <section>
- <widgets>
- <include-form name="AddEmplLeave" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="EmplLeavePanel" title="${uiLabelMap.HumanResAddEmplLeave}" collapsible="true">
+ <include-form name="AddEmplLeave" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
</screenlet>
+ <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -121,20 +111,10 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListEmplLeaveType}">
- <section>
- <widgets>
- <include-form name="ListEmplLeaveTypes" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddEmplLeaveType}">
- <section>
- <widgets>
- <include-form name="AddEmplLeaveType" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="EmplLeaveTypePanel" title="${uiLabelMap.HumanResAddEmplLeaveType}" collapsible="true">
+ <include-form name="AddEmplLeaveType" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
</screenlet>
+ <include-form name="ListEmplLeaveTypes" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Thu Jun 12 02:36:32 2008
@@ -84,41 +84,17 @@
<screen name="EditEmplPositionFulfillments">
<section>
<actions>
- <set field="titleProperty" value="PageTitleListEmplPositionFulfillments"/>
+ <set field="titleProperty" value="HumanResAddEmplPositionFulfillment"/>
<set field="tabButtonItem" value="EditEmplPositionFulfillments"/>
<set field="emplPositionId" from-field="parameters.emplPositionId"/>
</actions>
<widgets>
<decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListEmplPositionFulfillments}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListEmplPositionFulfillments" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResAddEmplPositionFulfillment}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddEmplPositionFulfillment" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="EmplPositionFulfillmentPanel" title="${uiLabelMap.HumanResAddEmplPositionFulfillment}" collapsible="true">
+ <include-form name="AddEmplPositionFulfillment" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ </screenlet>
+ <include-form name="ListEmplPositionFulfillments" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -127,41 +103,17 @@
<screen name="EditEmplPositionResponsibilities">
<section>
<actions>
- <set field="titleProperty" value="PageTitleListEmplPositionResponsibilities"/>
+ <set field="titleProperty" value="HumanResAddEmplPositionResponsibility"/>
<set field="tabButtonItem" value="EditEmplPositionResponsibilities"/>
<set field="emplPositionId" from-field="parameters.emplPositionId"/>
</actions>
<widgets>
<decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListEmplPositionResponsibilities}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListEmplPositionResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResAddEmplPositionResponsibility}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddEmplPositionResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="EmplPositionResponsibilityPanel" title="${uiLabelMap.HumanResAddEmplPositionResponsibility}" collapsible="true">
+ <include-form name="AddEmplPositionResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ </screenlet>
+ <include-form name="ListEmplPositionResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -180,34 +132,14 @@
<container>
<label style="h1" text="${uiLabelMap.HumanResEditEmplPositionReportingStruct} ${uiLabelMap.CommonFor}: [${uiLabelMap.CommonId}:${parameters.emplPositionId}]"/>
</container>
- <screenlet title="${uiLabelMap.HumanResListEmplPositionsReportsTo}">
- <section>
- <widgets>
- <include-form name="ListReportsToEmplPositionReportingStructs" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddReportsToEmplPositionReportingStruct}">
- <section>
- <widgets>
- <include-form name="AddReportsToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResListEmplPositionsReportedTo}">
- <section>
- <widgets>
- <include-form name="ListReportedToEmplPositionReportingStructs" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="ReportsToEmplPositionReportingStructPanel" title="${uiLabelMap.HumanResAddReportsToEmplPositionReportingStruct}" collapsible="true">
+ <include-form name="AddReportsToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</screenlet>
- <screenlet title="${uiLabelMap.HumanResAddReportedToEmplPositionReportingStruct}">
- <section>
- <widgets>
- <include-form name="AddReportedToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
+ <include-form name="ListReportsToEmplPositionReportingStructs" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ <screenlet id="ReportedToEmplPositionReportingStructPanel" title="${uiLabelMap.HumanResAddReportedToEmplPositionReportingStruct}" collapsible="true">
+ <include-form name="AddReportedToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</screenlet>
+ <include-form name="ListReportedToEmplPositionReportingStructs" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -263,7 +195,7 @@
<container>
<link target="EditValidResponsibility" text="${uiLabelMap.HumanResNewValidResponsibility}" style="buttontext"/>
</container>
- <include-form name="AddValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ <include-form name="AddValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</widgets>
</section>
</container>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml Thu Jun 12 02:36:32 2008
@@ -63,20 +63,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmploymentApp}">
- <section>
- <widgets>
- <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResNewEmploymentApp}">
- <section>
- <widgets>
- <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="EmploymentAppPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmploymentApp}" collapsible="true">
+ <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</screenlet>
+ <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Thu Jun 12 02:36:32 2008
@@ -125,20 +125,10 @@
<widgets>
<decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListPartyBenefits}">
- <section>
- <widgets>
- <include-form name="ListPartyBenefits" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddPartyBenefit}">
- <section>
- <widgets>
- <include-form name="AddPartyBenefit" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PartyBenefitPanel" title="${uiLabelMap.HumanResAddPartyBenefit}" collapsible="true">
+ <include-form name="AddPartyBenefit" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</screenlet>
+ <include-form name="ListPartyBenefits" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -147,7 +137,7 @@
<screen name="EditPayrollPreferences">
<section>
<actions>
- <set field="titleProperty" value="HumanResListPayrollPreferences"/>
+ <set field="titleProperty" value="HumanResAddPayrollPreference"/>
<set field="headerItem" value="Employment"/>
<set field="tabButtonItem" value="EditPayrollPreference"/>
<set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
@@ -163,20 +153,10 @@
<widgets>
<decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListPayrollPreferences}">
- <section>
- <widgets>
- <include-form name="ListPayrollPreferences" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddPayrollPreference}">
- <section>
- <widgets>
- <include-form name="AddPayrollPreference" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PayrollPreferencePanel" title="${uiLabelMap.HumanResAddPayrollPreference}" collapsible="true">
+ <include-form name="AddPayrollPreference" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</screenlet>
+ <include-form name="ListPayrollPreferences" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -199,20 +179,10 @@
<widgets>
<decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListUnemploymentClaim}">
- <section>
- <widgets>
- <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddUnemploymentClaim}">
- <section>
- <widgets>
- <include-form name="AddUnemploymentClaim" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="UnemploymentClaimPanel" title="${uiLabelMap.HumanResAddUnemploymentClaim}" collapsible="true">
+ <include-form name="AddUnemploymentClaim" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</screenlet>
+ <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -229,20 +199,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResPerfNote}">
- <section>
- <widgets>
- <include-form name="ListPerformanceNotes" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddPerfNote}">
- <section>
- <widgets>
- <include-form name="AddPerformanceNote" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PerformanceNotePanel" title="${uiLabelMap.HumanResAddPerfNote}" collapsible="true">
+ <include-form name="AddPerformanceNote" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</screenlet>
+ <include-form name="ListPerformanceNotes" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -265,20 +225,10 @@
<widgets>
<decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResAgreementEmploymentAppl}">
- <section>
- <widgets>
- <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResAgreementEmploymentAppl}">
- <section>
- <widgets>
- <include-form name="AddAgreementEmploymentAppl" location="component://humanres/widget/forms/EmploymentForms.xml" />
- </widgets>
- </section>
+ <screenlet id="AgreementEmploymentApplPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResAgreementEmploymentAppl}" collapsible="true">
+ <include-form name="AddAgreementEmploymentAppl" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</screenlet>
+ <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Thu Jun 12 02:36:32 2008
@@ -31,20 +31,10 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.PageTitleListSkillTypes}">
- <section>
- <widgets>
- <include-form name="ListSkillTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.ProjectMgrSkillType}">
- <section>
- <widgets>
- <include-form name="AddSkillType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
- </widgets>
- </section>
+ <screenlet id="SkillTypePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ProjectMgrSkillType}" collapsible="true">
+ <include-form name="AddSkillType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
+ <include-form name="ListSkillTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -61,27 +51,10 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <widgets>
- <screenlet title="${uiLabelMap.${titleProperty}}">
- <section>
- <widgets>
- <include-form name="ListResponsibilityTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddEmplPositionResponsibility}">
- <section>
- <widgets>
- <include-form name="AddResponsibilityType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.HumanResViewPermissionError}</label>
- </fail-widgets>
- </section>
- </screenlet>
- </widgets>
- </section>
+ <screenlet id="ResponsibilityTypePanel" title="${uiLabelMap.HumanResAddEmplPositionResponsibility}" collapsible="true">
+ <include-form name="AddResponsibilityType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+ </screenlet>
+ <include-form name="ListResponsibilityTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -98,20 +71,10 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResTerminationType}">
- <section>
- <widgets>
- <include-form name="ListTerminationTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResTerminationType}">
- <section>
- <widgets>
- <include-form name="AddTerminationType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
- </widgets>
- </section>
+ <screenlet id="TerminationTypePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResTerminationType}" collapsible="true">
+ <include-form name="AddTerminationType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
+ <include-form name="ListTerminationTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -195,21 +158,11 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/>
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}">
- <section>
- <widgets>
- <include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}">
- <section>
- <widgets>
- <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
- </widgets>
- </section>
+ <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/>
+ <screenlet id="EmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}" collapsible="true">
+ <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
+ <include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -226,20 +179,10 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListTerminationReasons}">
- <section>
- <widgets>
- <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddTerminationReason}">
- <section>
- <widgets>
- <include-form name="AddTerminationReason" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="TerminationReasonPanel" title="${uiLabelMap.HumanResAddTerminationReason}" collapsible="true">
+ <include-form name="AddTerminationReason" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
+ <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml Thu Jun 12 02:36:32 2008
@@ -68,20 +68,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListPartyQual}">
- <section>
- <widgets>
- <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyQualForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddPartyQual}">
- <section>
- <widgets>
- <include-form name="AddPartyQual" location="component://humanres/widget/forms/PartyQualForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PartyQualPanel" title="${uiLabelMap.HumanResAddPartyQual}" collapsible="true">
+ <include-form name="AddPartyQual" location="component://humanres/widget/forms/PartyQualForms.xml"/>
</screenlet>
+ <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyQualForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml Thu Jun 12 02:36:32 2008
@@ -67,20 +67,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListPartySkill}">
- <section>
- <widgets>
- <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResNewPartySkill}">
- <section>
- <widgets>
- <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PartySkillPanel" title="${uiLabelMap.HumanResAddPartySkill}" collapsible="true">
+ <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</screenlet>
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml Thu Jun 12 02:36:32 2008
@@ -89,12 +89,10 @@
<widgets>
<decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.PageTitleListSalarySteps}">
- <include-form name="ListSalarySteps" location="component://humanres/widget/forms/PayGradeForms.xml"/>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddSalaryStep}">
+ <screenlet id="SalaryStepPanel" title="${uiLabelMap.HumanResAddSalaryStep}" collapsible="true">
<include-form name="AddSalaryStep" location="component://humanres/widget/forms/PayGradeForms.xml"/>
</screenlet>
+ <include-form name="ListSalarySteps" location="component://humanres/widget/forms/PayGradeForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml Thu Jun 12 02:36:32 2008
@@ -87,20 +87,10 @@
<widgets>
<decorator-screen name="CommonPerfReviewDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEditPerfReviewItems}">
- <section>
- <widgets>
- <include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResAddPerfReviewItems}">
- <section>
- <widgets>
- <include-form name="AddPerfReviewItem" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PerfReviewItemPanel" title="${uiLabelMap.HumanResAddPerfReviewItems}" collapsible="true">
+ <include-form name="AddPerfReviewItem" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
</screenlet>
+ <include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Thu Jun 12 02:36:32 2008
@@ -67,20 +67,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListPersonTraining}">
- <section>
- <widgets>
- <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResNewPersonTraining}">
- <section>
- <widgets>
- <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PersonTrainingPanel" title="${uiLabelMap.HumanResAddPersonTraining}" collapsible="true">
+ <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</screenlet>
+ <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Thu Jun 12 02:36:32 2008
@@ -67,7 +67,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListEmplLeaveTypes" type="multi" title="" target="updateEmplLeaveType"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EmplLeaveType"><order-by field-name="leaveTypeId"/></entity-condition>
</actions>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Thu Jun 12 02:36:32 2008
@@ -82,7 +82,7 @@
<field name="submitButton" use-when="emplPosition!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListEmplPositionFulfillments" type="list" target="updateEmplPositionFulfillment" title="" paginate-target="findEmplPositionFulfillments"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EmplPositionFulfillment">
<condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/>
@@ -112,7 +112,7 @@
</form>
<form name="ListReportsToEmplPositionReportingStructs" type="list" target="updateEmplPositionReportingStruct" title="" paginate-target="EditReportsToEmplPositionReportingStruct"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructList">
<condition-expr field-name="emplPositionIdManagedBy" env-name="parameters.emplPositionId"/>
@@ -140,7 +140,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="ListReportedToEmplPositionReportingStructs" type="list" target="updateEmplPositionReportingStruct" title="" paginate-target="EditReportedToEmplPositionReportingStruct"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructList">
<condition-expr field-name="emplPositionIdReportingTo" env-name="parameters.emplPositionId"/>
@@ -168,7 +168,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="ListEmplPositionResponsibilities" type="list" target="updateEmplPositionResponsibility" title="" paginate-target="findEmplPositionResponsibilities"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EmplPositionResponsibility">
<condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Thu Jun 12 02:36:32 2008
@@ -127,7 +127,7 @@
</field>
</form>
<form name="ListPartyBenefits" type="multi" target="updatePartyBenefit?benefitTypeId=${benefitTypeId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" title="" paginate-target="findPartyBenefits"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PartyBenefit"><order-by field-name="fromDate"/></entity-condition>
</actions>
@@ -178,7 +178,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="ListPayrollPreferences" type="multi" target="updatePayrollPreference?partyId=${partyId}&roleTypeId=${roleTypeId}&payrollPreferenceSeqId=${payrollPreferenceSeqId}" separate-columns="true" paginate-target="findPayRollPreferences"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PayrollPreference">
<condition-list combine="and">
@@ -258,7 +258,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListUnemploymentClaims" type="multi" target="updateUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" paginate-target="FindUnemploymentClaim"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="UnemploymentClaim" filter-by-date="true">
<condition-list combine="and">
@@ -312,7 +312,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListAgreementEmploymentAppls" type="multi" title="" target="updateAgreementEmploymentAppl?agreementId=${agreementId}&partyIdTo=${partyIdTo}&partyIdFrom=${partyIdFrom}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}&agreementItemSeqId=${agreementItemSeqId}" paginate-target="EditAgreementEmploymentAppls"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="AgreementEmploymentAppl"><order-by field-name="fromDate"/></entity-condition>
</actions>
Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Thu Jun 12 02:36:32 2008
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="ListSkillTypes" type="multi" title="" target="updateSkillType"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="SkillType"><order-by field-name="skillTypeId"/></entity-condition>
</actions>
@@ -42,7 +42,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListResponsibilityTypes" type="multi" list-name="responsibilityTypes" target="updateResponsibilityType"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ResponsibilityType"><order-by field-name="responsibilityTypeId"/></entity-condition>
</actions>
@@ -62,7 +62,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListTerminationTypes" type="multi" title="" target="updateTerminationType"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TerminationType"><order-by field-name="terminationTypeId"/></entity-condition>
</actions>
@@ -118,7 +118,7 @@
<field name="submitButton" use-when="emplPositionType!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListEmplPositionTypeRates" type="multi" title="" target="updateEmplPositionTypeRate"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EmplPositionTypeRate"><order-by field-name="fromDate"/></entity-condition>
</actions>
@@ -165,7 +165,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListTerminationReasons" type="multi" title="" target="updateTerminationReason" paginate-target="EditTerminationReasons"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TerminationReason"><order-by field-name="terminationReasonId"/></entity-condition>
</actions>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Thu Jun 12 02:36:32 2008
@@ -50,7 +50,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListSalarySteps" type="multi" target="updateSalaryStep?salaryStepSeqId=${salaryStepSeqId}&payGradeId=${payGradeId}" paginate-target="findSalarySteps"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-one entity-name="SalaryStep" auto-field-map="true"/>
<entity-condition entity-name="SalaryStep"><order-by field-name="salaryStepSeqId"/></entity-condition>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Thu Jun 12 02:36:32 2008
@@ -67,7 +67,7 @@
<field name="submitButton" use-when="perfReview!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListPerfReviewItems" type="list" target="updatePerfReviewItem" title="updatePerfReviewItem" paginate-target="findPerfReviewItems"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PerfReviewItem">
<condition-expr field-name="perfReviewId" env-name="perfReviewId"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=667014&r1=667013&r2=667014&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu Jun 12 02:36:32 2008
@@ -1052,20 +1052,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResListPartyResumes}">
- <section>
- <widgets>
- <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyResumeForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResNewPartyResume}">
- <section>
- <widgets>
- <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml"/>
- </widgets>
- </section>
+ <screenlet id="PartyResumePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.PartyParty} ${uiLabelMap.HumanResPartyResume}" collapsible="true">
+ <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml"/>
</screenlet>
+ <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyResumeForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>