svn commit: r733454 [5/5] - in /ofbiz/trunk/framework/common: config/ script/org/ofbiz/common/ webcommon/includes/ widget/

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=733454&r1=733453&r2=733454&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Sun Jan 11 03:22:56 2009
@@ -118,7 +118,7 @@
     
         <if-empty field="uomConversion">
             <!-- if still no uom conversion entity, then no conversion is possible -->
-            <add-error><fail-property property="NoUomConversionFound" resource="CommonUiLabels"/></add-error>
+            <add-error><fail-property property="CommonNoUomConversionFound" resource="CommonUiLabels"/></add-error>
             <check-errors/>        
         <else>
             <!-- Do custom conversion, if we have customMethodId -->
@@ -164,7 +164,7 @@
         <entity-one entity-name="CustomMethod" value-field="customMethod" auto-field-map="true" use-cache="true"/>
         
         <if-empty field="customMethod.customMethodName">
-            <add-error> <fail-property property="NoCustomMethodName" resource="CommonUiLabels"/> </add-error>
+            <add-error> <fail-property property="CommonNoCustomMethodName" resource="CommonUiLabels"/> </add-error>
             <check-errors/>
         <else>
             <log level="verbose" message="calling custom method ${customMethod.customMethodName}"/>
@@ -198,7 +198,7 @@
     <simple-method method-name="getVisualThemeResources" short-description="Get visual theme resources" login-required="false">
         <set field="visualThemeId" from-field="parameters.visualThemeId"/>
         <if-empty field="visualThemeId">
-            <add-error><fail-property property="VisualThemeIdNotFound" resource="CommonUiLabels"/></add-error>
+            <add-error><fail-property property="CommonVisualThemeIdNotFound" resource="CommonUiLabels"/></add-error>
             <check-errors/>
         </if-empty>
         <set field="themeResources" from-field="parameters.themeResources"/>
@@ -208,14 +208,14 @@
             <order-by field-name="sequenceId"/>
         </entity-condition>
         <if-empty field="resourceList">
-            <add-error><fail-property property="VisualThemeResourcesNotFound" resource="CommonUiLabels"/></add-error>
+            <add-error><fail-property property="CommonVisualThemeResourcesNotFound" resource="CommonUiLabels"/></add-error>
             <check-errors/>
         </if-empty>
         <iterate list="resourceList" entry="resourceRecord">
             <set field="resourceTypeEnumId" from-field="resourceRecord.resourceTypeEnumId"/>
             <set field="resourceValue" from-field="resourceRecord.resourceValue"/>
             <if-empty field="resourceValue">
-                <property-to-field field="warningMsg" property="VisualThemeInvalidRecord" resource="CommonUiLabels"/>
+                <property-to-field field="warningMsg" property="CommonVisualThemeInvalidRecord" resource="CommonUiLabels"/>
                 <log level="warning" message="${warningMsg}"/>
                 <else>
                     <set field="themeResources.${resourceTypeEnumId}[]" from-field="resourceValue"/>

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=733454&r1=733453&r2=733454&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Sun Jan 11 03:22:56 2009
@@ -105,10 +105,10 @@
         <li>
           <#if person?has_content>
             ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
-            <#if defaultOrganizationPartyId?exists>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</#if>
+            <#if defaultOrganizationPartyId?exists>${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</#if>
           <#elseif partyGroup?has_content>
             ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
-            <#if defaultOrganizationPartyId?exists>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</#if>
+            <#if defaultOrganizationPartyId?exists>${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</#if>
           <#else>
             ${uiLabelMap.CommonWelcome}!
           </#if>
@@ -131,17 +131,17 @@
         <li class="control-area"<#if layoutSettings.headerRightBackgroundUrl?has_content> background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
           <#if userLogin?exists>
             <p class="expanded">
-              <a href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>" class="buttontext">${uiLabelMap.VisualThemes}</a>
+              <a href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonVisualThemes}</a>
               <a href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&amp;userPrefTypeId=COMPACT_HEADER&amp;userPrefValue=Y">&nbsp;&nbsp;</a>
             </p>
           </#if>
           <p>
           <#if person?has_content>
             ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
-            <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
+            <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
           <#elseif partyGroup?has_content>
             ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
-            <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
+            <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
           <#else>
             ${uiLabelMap.CommonWelcome}!
           </#if>

Modified: ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl?rev=733454&r1=733453&r2=733454&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl Sun Jan 11 03:22:56 2009
@@ -26,7 +26,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <li class="h3">${uiLabelMap.VisualThemes}</li>
+      <li class="h3">${uiLabelMap.CommonVisualThemes}</li>
       <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li>
     </ul>
     <br class="clear"/>
@@ -45,7 +45,7 @@
             <a href="<@ofbizUrl>setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&amp;userPrefTypeId=VISUAL_THEME&amp;userPrefValue=${visualTheme.visualThemeId}</@ofbizUrl>">${visualTheme.description}</a>
           </td>
           <td>
-            <#if visualTheme.visualThemeId == visualThemeId>${uiLabelMap.VisualThemeSelected}<#else>&nbsp;</#if>
+            <#if visualTheme.visualThemeId == visualThemeId>${uiLabelMap.CommonVisualThemeSelected}<#else>&nbsp;</#if>
           </td>
           <td>
             <#if screenshots?has_content>
@@ -53,7 +53,7 @@
                 <a href="<@ofbizContentUrl>${screenshot.resourceValue}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${screenshot.resourceValue}</@ofbizContentUrl>" width="150"/></a>
               </#list>
            <#else>
-              ${uiLabelMap.VisualThemeNoScreenshots}
+              ${uiLabelMap.CommonVisualThemeNoScreenshots}
             </#if>
           </td>
         </tr>

Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=733454&r1=733453&r2=733454&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Sun Jan 11 03:22:56 2009
@@ -89,7 +89,7 @@
     <screen name="LookupVisualThemes">
         <section>
             <actions>
-                <set field="title" value="${uiLabelMap.VisualThemes}"/>
+                <set field="title" value="${uiLabelMap.CommonVisualThemes}"/>
                 <entity-condition entity-name="VisualTheme" list-name="visualThemes"/>
             </actions>
             <widgets>