svn commit: r1761923 - in /ofbiz/trunk/specialpurpose: ecommerce/widget/ForumForms.xml ecommerce/widget/blog/BlogForms.xml myportal/widget/PortalAdmForms.xml

Author: jleroux
Date: Thu Sep 22 12:19:46 2016
New Revision: 1761923

URL: http://svn.apache.org/viewvc?rev=1761923&view=rev
Log:
Reverts: Maximise the utilisation of common labels in various applications
(OFBIZ-8102) (OFBIZ-8130)
Reverts r1758774 for OFBIZ-8102 w/o reverting changes which slipped in
Reverts r1761687 for OFBIZ-8130
 
We decided this is not a good way, we prefer to keep the FormFieldTitle_ way

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1761923&r1=1761922&r2=1761923&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Thu Sep 22 12:19:46 2016
@@ -254,7 +254,7 @@ under the License.
         </field>
 
         <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="60"/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+        <field name="statusId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
                 <list-options list-name="statusList" key-name="statusId"/>
             </drop-down>
@@ -359,7 +359,7 @@ under the License.
                 <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+        <field name="statusId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
@@ -397,7 +397,7 @@ under the License.
                 <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+        <field name="statusId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
@@ -580,7 +580,7 @@ under the License.
         <field name="privilegeEnumId" >
             <ignored />
         </field>
-        <field name="statusId"  title="${uiLabelMap.CommonStatus}">
+        <field name="statusId" >
             <hidden value="CTNT_PUBLISHED"/>
         </field>
         <field name="contentAssocTypeId" >

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1761923&r1=1761922&r2=1761923&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml Thu Sep 22 12:19:46 2016
@@ -98,7 +98,7 @@
         <field name="textData" title="${uiLabelMap.EcommerceRespond}" map-name="rsp" widget-style="inputBox dojo-ResizableTextArea">
             <textarea cols="60" rows="12"/>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+        <field name="statusId">
             <radio no-current-selected-key="CTNT_INITIAL_DRAFT">
                 <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/>
                 <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>
@@ -165,7 +165,7 @@
         <field name="textData" title="${uiLabelMap.EcommerceRespond}" map-name="electronicText" widget-style="inputBox dojo-ResizableTextArea">
             <textarea cols="60" rows="12"/>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+        <field name="statusId">
             <radio no-current-selected-key="CTNT_INITIAL_DRAFT">
                 <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/>
                 <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml?rev=1761923&r1=1761922&r2=1761923&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml Thu Sep 22 12:19:46 2016
@@ -27,7 +27,7 @@ under the License.
         <field name="originalPortalPageId" position="2"><text-find/></field>
         <field name="portalPageName" title="${uiLabelMap.CommonName}"><text-find/></field>
         <field name="parentPortalPageId" position="2"><text-find/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
+        <field name="description"><text-find/></field>
         <field name="securityGroupId" position="2" title="${uiLabelMap.CommonSecurityGroupId}"><text-find/></field>
         <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -88,8 +88,8 @@ under the License.
             <text/>
         </field>
         <field name="parentPortalPageId" position="2"><text/></field>
-        <field name="portalPageName" title="${uiLabelMap.CommonName}"><text/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}" position="2"><text size="60"/></field>
+        <field name="portalPageName"><text/></field>
+        <field name="description" position="2"><text size="60"/></field>
         <field name="sequenceNum"><text/></field>
         <field name="securityGroupId" >
             <drop-down allow-empty="true">