svn commit: r998745 - in /ofbiz/trunk: applications/party/config/PartyUiLabels.xml applications/party/widget/partymgr/PartyForms.xml applications/party/widget/partymgr/SecurityForms.xml framework/common/config/CommonUiLabels.xml

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

svn commit: r998745 - in /ofbiz/trunk: applications/party/config/PartyUiLabels.xml applications/party/widget/partymgr/PartyForms.xml applications/party/widget/partymgr/SecurityForms.xml framework/common/config/CommonUiLabels.xml

buscob
Author: buscob
Date: Sun Sep 19 22:40:00 2010
New Revision: 998745

URL: http://svn.apache.org/viewvc?rev=998745&view=rev
Log:
- Moved a SecurityGroupId UiLabel from Party to Common
- Added some UiLabel for PortalPage FormFields

Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=998745&r1=998744&r2=998745&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Sep 19 22:40:00 2010
@@ -9358,21 +9358,6 @@
         <value xml:lang="th">กลุ่มความปลอดภัย</value>
         <value xml:lang="zh">安全组</value>
     </property>
-    <property key="PartySecurityGroupId">
-        <value xml:lang="de">Sicherheitsgruppe ID</value>
-        <value xml:lang="en">Security Group ID</value>
-        <value xml:lang="es">Grupo de seguridad</value>
-        <value xml:lang="fr">Groupe de sécurité </value>
-        <value xml:lang="hi_IN">सुरक्षा समूह क्रमांक</value>
-        <value xml:lang="it">Codice gruppo sicurezza</value>
-        <value xml:lang="nl">ID beveiligingsgroep</value>
-        <value xml:lang="pt_BR">ID de grupo de segurança</value>
-        <value xml:lang="pt_PT">Identificação de Grupo de Segurança</value>
-        <value xml:lang="ro">Cod Grup De Siguranta</value>
-        <value xml:lang="ru">Код группы безопасности</value>
-        <value xml:lang="th">รหัสกลุ่มความปลอดภัย</value>
-        <value xml:lang="zh">安全组标识</value>
-    </property>
     <property key="PartySecurityGroups">
         <value xml:lang="de">Sicherheitsgruppen</value>
         <value xml:lang="en">Security Groups</value>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=998745&r1=998744&r2=998745&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sun Sep 19 22:40:00 2010
@@ -834,7 +834,7 @@ under the License.
         </field>
         <field name="fromDate"><date-time/></field>
         <field name="thruDate"><date-time/></field>
-        <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}">
+        <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="SecurityGroup" description="${description}">
                     <entity-order-by field-name="description"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=998745&r1=998744&r2=998745&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sun Sep 19 22:40:00 2010
@@ -28,7 +28,7 @@ under the License.
                 <order-by field-name="groupId"/>
             </entity-condition>
         </actions>
-        <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}" widget-style="buttontext">
+        <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${groupId}" target="EditSecurityGroup">
                 <parameter param-name="groupId"/>
             </hyperlink>
@@ -40,9 +40,9 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="securityGroup==null" target="createSecurityGroup"/>
         <auto-fields-service service-name="updateSecurityGroup" map-name="securityGroup"/>
-        <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}"  tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="securityGroup==null&amp;&amp;groupId==null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}"><text size="20" maxlength="20"/></field>
-        <field use-when="securityGroup==null&amp;&amp;groupId!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${groupId}]"><text size="20" maxlength="20"/></field>
+        <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}"  tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="securityGroup==null&amp;&amp;groupId==null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}"><text size="20" maxlength="20"/></field>
+        <field use-when="securityGroup==null&amp;&amp;groupId!=null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${groupId}]"><text size="20" maxlength="20"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=998745&r1=998744&r2=998745&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Sep 19 22:40:00 2010
@@ -6325,6 +6325,21 @@
         <value xml:lang="zh">安全</value>
         <value xml:lang="zh_CN">安全</value>
     </property>
+    <property key="CommonSecurityGroupId">
+        <value xml:lang="de">Sicherheitsgruppe ID</value>
+        <value xml:lang="en">Security Group ID</value>
+        <value xml:lang="es">Grupo de seguridad</value>
+        <value xml:lang="fr">Groupe de sécurité </value>
+        <value xml:lang="hi_IN">सुरक्षा समूह क्रमांक</value>
+        <value xml:lang="it">Codice gruppo sicurezza</value>
+        <value xml:lang="nl">ID beveiligingsgroep</value>
+        <value xml:lang="pt_BR">ID de grupo de segurança</value>
+        <value xml:lang="pt_PT">Identificação de Grupo de Segurança</value>
+        <value xml:lang="ro">Cod Grup De Siguranta</value>
+        <value xml:lang="ru">Код группы безопасности</value>
+        <value xml:lang="th">รหัสกลุ่มความปลอดภัย</value>
+        <value xml:lang="zh">安全组标识</value>
+    </property>
     <property key="CommonSecurityGroups">
         <value xml:lang="en">Security Groups</value>
         <value xml:lang="fr">Groupes de sécurité</value>
@@ -8968,6 +8983,18 @@
         <value xml:lang="it">Modificato dall'utente</value>
         <value xml:lang="zh">由用户登录标识修改</value>
     </property>
+    <property key="FormFieldTitle_originalPortalPageId">
+        <value xml:lang="en">Original Portal Page Id</value>
+        <value xml:lang="it">Codice pagina portale originale</value>
+    </property>
+    <property key="FormFieldTitle_parentPortalPageId">
+        <value xml:lang="en">Parent Portal Page Id</value>
+        <value xml:lang="it">Codice pagina portale padre</value>
+    </property>
+    <property key="FormFieldTitle_ownerUserLoginId">
+        <value xml:lang="en">Owner User Login ID</value>
+        <value xml:lang="it">Codice login proprietario</value>
+    </property>
     <property key="FormFieldTitle_price">
         <value xml:lang="ar">السعر</value>
         <value xml:lang="de">Preis</value>