svn commit: r615338 - in /ofbiz/trunk/applications/humanres: config/HumanResUiLabels.properties config/HumanResUiLabels_it.properties widget/LookupScreens.xml widget/forms/LookupForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r615338 - in /ofbiz/trunk/applications/humanres: config/HumanResUiLabels.properties config/HumanResUiLabels_it.properties widget/LookupScreens.xml widget/forms/LookupForms.xml

mrisaliti
Author: mrisaliti
Date: Fri Jan 25 12:54:43 2008
New Revision: 615338

URL: http://svn.apache.org/viewvc?rev=615338&view=rev
Log:
Lookup forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1595)

Modified:
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties
    ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties?rev=615338&r1=615337&r2=615338&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties Fri Jan 25 12:54:43 2008
@@ -201,4 +201,9 @@
 FormFieldTitle_yearsExperience=Years Experience
 FormFieldTitle_rating=Rating
 FormFieldTitle_skillLevel=Skill Level
-FormFieldTitle_startedUsingDate=Started Using Date
\ No newline at end of file
+FormFieldTitle_startedUsingDate=Started Using Date
+FormFieldTitle_budgetTypeId=Budget Type Id
+FormFieldTitle_customTimePeriodId=Custom Time Period Id
+FormFieldTitle_budgetItemTypeId=Budget Item Type Id
+FormFieldTitle_purpose=Purpose
+FormFieldTitle_justification=Justification
\ No newline at end of file

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties?rev=615338&r1=615337&r2=615338&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels_it.properties Fri Jan 25 12:54:43 2008
@@ -200,4 +200,9 @@
 FormFieldTitle_yearsExperience=Anni di Esperienza
 FormFieldTitle_rating=Tasso
 FormFieldTitle_skillLevel=Livello Abilit\u00e0
-FormFieldTitle_startedUsingDate=Data di Inizio Usata
\ No newline at end of file
+FormFieldTitle_startedUsingDate=Data di Inizio Usata
+FormFieldTitle_budgetTypeId=Tipo Budget
+FormFieldTitle_customTimePeriodId=Periodo di Tempo Personalizzato
+FormFieldTitle_budgetItemTypeId=Tipo Budget Riga
+FormFieldTitle_purpose=Funzione
+FormFieldTitle_justification=Giustificazione
\ No newline at end of file

Modified: ofbiz/trunk/applications/humanres/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/LookupScreens.xml?rev=615338&r1=615337&r2=615338&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/LookupScreens.xml Fri Jan 25 12:54:43 2008
@@ -23,6 +23,7 @@
     <screen name="LookupBudget">
         <section>
             <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupBudgetByName}"/>
             </actions>
             <widgets>
@@ -51,6 +52,7 @@
     <screen name="LookupBudgetItem">
         <section>
             <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupBudgetItemByName}"/>
             </actions>
             <widgets>
@@ -79,6 +81,7 @@
     <screen name="LookupEmplPosition">
         <section>
             <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupEmplPositionByName}"/>
             </actions>
             <widgets>
@@ -107,6 +110,7 @@
     <screen name="LookupTerminationReason">
         <section>
             <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupTerminationReason}"/>
             </actions>
             <widgets>
@@ -135,6 +139,7 @@
     <screen name="LookupSalaryStep">
         <section>
             <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupTerminationReason}"/>
             </actions>
             <widgets>
@@ -163,6 +168,7 @@
     <screen name="LookupPayGrade">
         <section>
             <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupPayGrade}"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=615338&r1=615337&r2=615338&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Fri Jan 25 12:54:43 2008
@@ -144,7 +144,7 @@
                 <field-map field-name="entityName" value="SalaryStep"/>
             </service>
         </actions>
-        <field name="salaryStepId" widget-style="buttontext">
+        <field name="salaryStepId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${salaryStepId}" target="javascript:set_value('${salaryStepId}')"/>
         </field>        
         <field name="description"><display/></field>