OFBiz › OFBiz - Commits

svn commit: r735131 [5/5] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/manufacturing/config/ applications/marketing/config/ applications/marketing/webapp/marketing/segment/ applications/order/config/ a...

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

svn commit: r735131 [5/5] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/manufacturing/config/ applications/marketing/config/ applications/marketing/webapp/marketing/segment/ applications/order/config/ a...

mrisaliti
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Fri Jan 16 13:03:44 2009
@@ -118,7 +118,7 @@
                                     </condition>
                                     <widgets>                                        
                                         <include-menu name="TaskTabBar" location="component://projectmgr/widget/Menus.xml"/>
-                                        <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] Phase: ${phaseName} Project: ${projectName}"/>
+                                        <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] ${uiLabelMap.ProjectMgrPhaseName}: ${phaseName} ${uiLabelMap.ProjectMgrProjectName}: ${projectName}"/>
                                         <link style="h1" text="[${projectId}]" target="projectView?projectId=${projectId}"/>
                                     </widgets>                                    
                                 </section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Jan 16 13:03:44 2009
@@ -86,7 +86,7 @@
             </condition>
             <link target="projectView?projectId=${projectId}"/>
         </menu-item>
-        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}">
+        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditProject}">
             <condition>
                 <and>
                     <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
@@ -376,7 +376,7 @@
             </condition>
             <link target="setTaskStatus?workEffortId=${workEffortId}&amp;currentStatusId=PTS_CANCELLED"/>
         </menu-item>
-        <menu-item name="custRequestContent" title="Content">
+        <menu-item name="custRequestContent" title="${uiLabelMap.CommonContent}">
             <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
         </menu-item>
     </menu>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Jan 16 13:03:44 2009
@@ -69,6 +69,7 @@
     <screen name="EditProject">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleEditProject"/>
                 <set field="tabButtonItem" value="editproject"/>                
                 <set field="labelTitleProperty" value="PageTitleEditProject"/>
@@ -421,7 +422,8 @@
     <screen name="EditPartySkills">
         <section>
             <actions>
-                <set field="tabButtonItem" value="parties"/>                
+                <set field="titleProperty" value="ProjectMgrEditPartySkill"/>
+                <set field="tabButtonItem" value="parties"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="workEffortId" from-field="parameters.projectId"/>
             </actions>
@@ -616,14 +618,14 @@
             </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.ProjectMgrResources}">
-                    <label style="h3" text="Providers"></label>
+                    <label style="h3" title="${uiLabelMap.ProjectMgrProviders}"/>
                     <include-form name="ListProjectProviderParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                     <section>
                         <condition>
                             <not><if-empty field-name="clientAssigns"/></not>
                         </condition>
                         <widgets>
-                            <label style="h3" text="ClientContacts"></label>
+                            <label style="h3" text="${uiLabelMap.ProjectMgrClientContacts}"></label>
                             <include-form name="ListProjectClientParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                         </widgets>
                     </section>
@@ -632,7 +634,7 @@
                             <not><if-empty field-name="companyAssigns"/></not>
                         </condition>
                         <widgets>
-                            <label style="h3" text="Companies"></label>
+                            <label style="h3" text="${uiLabelMap.ProjectMgrCompanies}"></label>
                             <include-form name="ListProjectCompanyParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                         </widgets>
                     </section>
@@ -1083,6 +1085,7 @@
     <screen name="ListProjectContent">
         <section>
             <actions>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap"/>
                 <set field="parameters.workEffortId" from-field="parameters.projectId"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Fri Jan 16 13:03:44 2009
@@ -38,7 +38,7 @@
                             <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
                             <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.ReviewedCustomerRequestTaskList}" navigation-form-name="ListRequestsWorkEffortForm">
+                        <screenlet title="${uiLabelMap.ProjectMgrReviewedCustomerRequestTaskList}" navigation-form-name="ListRequestsWorkEffortForm">
                             <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Jan 16 13:03:44 2009
@@ -610,7 +610,7 @@
                                 </or>
                             </condition>
                             <widgets>
-                                <screenlet title="${uiLabelMap.TaskContentList}">
+                                <screenlet title="${uiLabelMap.ProjectMgrTaskContentList}">
                                     <container><link target="EditTaskContents?workEffortId=${workEffortId}" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"/></container>
                                     <include-form name="ListContents" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                                 </screenlet>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Jan 16 13:03:44 2009
@@ -109,7 +109,7 @@
         <field name="timesheetId"><hyperlink description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/></field>
         <field name="hours"><display/></field>
         <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}"/></field>
-        <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
         <field name="fromDate"><display type="date"/></field>
     </form>
     <form name="ListProjects" type="list" list-name="listIt" paginate-target="FindProject"
@@ -173,10 +173,10 @@
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
-        <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="estimatedStartDate"><display type="date"/></field>
+        <field name="estimatedCompletionDate"><display type="date"/></field>
+        <field name="actualStartDate"><display type="date"/></field>
+        <field name="actualCompletionDate"><display type="date"/></field>
         <field name="plannedHours"><display/></field>
         <field name="actualHours"><display/></field>
         <field name="createdStamp"><display type="date"/></field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Fri Jan 16 13:03:44 2009
@@ -154,7 +154,7 @@
         <field name="custRequestId">
             <hyperlink target="ViewRequest?custRequestId=${custRequestId}" description="${custRequestName} [${custRequestId}]"/>
          </field>
-        <field name="projectId" map-name="sResult">
+        <field name="projectId" title="${uiLabelMap.ProjectMgrProjectId}" map-name="sResult">
             <hyperlink target="projectView?projectId=${sResult.projectId}" description="${sResult.projectName} [${sResult.projectId}]"/>
         </field>
         <field name="phaseId" map-name="sResult">

Modified: ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml Fri Jan 16 13:03:44 2009
@@ -17,18 +17,12 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="FrameworkShark">
-        <value xml:lang="en">Framework Shark</value>
-        <value xml:lang="fr">Shark workflow engine : moteur de gestion des flux de travail</value>
-        <value xml:lang="it">Applicazione Flussi di Lavoro</value>
-        <value xml:lang="ro">Aplictie Fluxuri de Lucru</value>
-        <value xml:lang="th">Framework Shark</value>
-    </property>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="SharkCompanyName">
         <value xml:lang="en">OFBiz: Shark</value>
         <value xml:lang="fr">OFBiz : Shark</value>
-        <value xml:lang="it">OFBiz: Flussi di Lavoro</value>
+        <value xml:lang="it">OFBiz: Flussi di lavoro</value>
         <value xml:lang="ro">OFBiz: Fluxuri de Lucru</value>
         <value xml:lang="th">OFBiz: Shark</value>
     </property>
@@ -38,7 +32,7 @@
         <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
         <value xml:lang="es">Parte de la familia de software Open For Business de código abierto</value><!--value xml:lang="es">Parte de la familia "Open for Bussiness" de Software Libre</value-->
         <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
-        <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value>
+        <value xml:lang="it">Parte del progetto open source Open For Business Family</value>
         <value xml:lang="nl">Deel van de Open For Business-suite van Open Source Software</value><!--value xml:lang="nl">Onderdeel van de Open For Business'-suite</value-->
         <value xml:lang="pt_BR">Parte da família OfBiz de software de fonte aberta</value>
         <value xml:lang="pt_PT">Parte da família OfBiz de software de fonte aberta</value><!--value xml:lang="pt_PT">Parte do Software de Fonte Aberta para Grupos Abertos Para o Negócio</value-->
@@ -48,10 +42,17 @@
         <value xml:lang="zh">开源软件OFBiz家族的一部分</value><!--value xml:lang="zh">开源软件OFBiz的组成部分</value--><!--value xml:lang="zh">开源软件OFBiz的组成部分</value-->
         <value xml:lang="zh_CN">OFBiz的一部分</value>
     </property>
+    <property key="SharkFramework">
+        <value xml:lang="en">Framework Shark</value>
+        <value xml:lang="fr">Shark workflow engine : moteur de gestion des flux de travail</value>
+        <value xml:lang="it">Applicazione flussi di lavoro</value>
+        <value xml:lang="ro">Aplictie Fluxuri de Lucru</value>
+        <value xml:lang="th">Framework Shark</value>
+    </property>
     <property key="SharkMainPage">
         <value xml:lang="en">Shark Manager Main Page</value>
         <value xml:lang="fr">Shark : page principale</value>
-        <value xml:lang="it">Pagina Principale</value>
+        <value xml:lang="it">Pagina principale</value>
         <value xml:lang="ro">Pagina Principala</value>
         <value xml:lang="th">หน้าหลักของการจัดการ Shark</value>
     </property>

Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl Fri Jan 16 13:03:44 2009
@@ -18,7 +18,7 @@
 -->
 <#assign selected = headerItem?default("void")>
 <div id="app-navigation">
-    <h2>${uiLabelMap.FrameworkShark}</h2>
+    <h2>${uiLabelMap.SharkFramework}</h2>
     <ul>                              
         <#if userLogin?has_content>
             <li<#if selected == "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.WorkEffortTaskList}</a></li>    

Modified: ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml Fri Jan 16 13:03:44 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="WebPosAdjustments">
         <value xml:lang="en">Adjustments</value>
         <value xml:lang="fr">Ajustements</value>


Free forum by Nabble Edit this page