svn commit: r1190180 - in /ofbiz/trunk: applications/content/config/ContentUiLabels.xml applications/content/widget/forum/BlogForms.xml specialpurpose/ecommerce/config/EcommerceUiLabels.xml specialpurpose/ecommerce/widget/blog/BlogForms.xml

[hansbak-2]

Author: hansbak
Date: Fri Oct 28 07:17:34 2011
New Revision: 1190180

URL: http://svn.apache.org/viewvc?rev=1190180&view=rev
Log:
 move blog labels from ecommerce to content and use them from there.....

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=1190180&r1=1190179&r2=1190180&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Fri Oct 28 07:17:34 2011
@@ -218,6 +218,16 @@
         <value xml:lang="zh">博客名称</value>
         <value xml:lang="zh_TW">部落格名稱</value>
     </property>
+    <property key="ContentBlogPreview">
+        <value xml:lang="da">Vis</value>
+        <value xml:lang="en">Preview</value>
+        <value xml:lang="fr">Visionner</value>
+        <value xml:lang="it">Anteprima</value>
+        <value xml:lang="nl">Bekijken</value>      
+        <value xml:lang="pt_BR">Pré-visualizar</value>
+        <value xml:lang="zh">预览</value>
+        <value xml:lang="zh_TW">預覽</value>
+    </property>
     <property key="ContentBlogPost">
         <value xml:lang="da">POST</value>
         <value xml:lang="en">POST</value>
@@ -227,6 +237,16 @@
         <value xml:lang="zh">发表</value>
         <value xml:lang="zh_TW">發表</value>
     </property>
+    <property key="ContentBlogPublish">
+        <value xml:lang="da">Publicer</value>
+        <value xml:lang="en">Publish</value>
+        <value xml:lang="fr">Publier</value>
+        <value xml:lang="it">Pubblica</value>
+        <value xml:lang="nl">Publiceren</value>    
+        <value xml:lang="pt_BR">Publicar</value>
+        <value xml:lang="zh">发布</value>
+        <value xml:lang="zh_TW">發佈</value>
+    </property>
     <property key="ContentBlogSummary">
         <value xml:lang="da">Resumé</value>
         <value xml:lang="en">Summary</value>
@@ -245,6 +265,26 @@
         <value xml:lang="zh">博客</value>
         <value xml:lang="zh_TW">部落格</value>
     </property>
+    <property key="ContentBlogTopCenter">
+        <value xml:lang="da">Midt for i toppen</value>
+        <value xml:lang="en">Top Center</value>
+        <value xml:lang="fr">En haut au centre</value>
+        <value xml:lang="it">Alto al centro</value>
+        <value xml:lang="nl">Boven in het midden</value>        
+        <value xml:lang="pt_BR">Centralizado no topo</value>
+        <value xml:lang="zh">顶部居中</value>
+        <value xml:lang="zh_TW">上方居中</value>
+    </property>
+    <property key="ContentBlogTopLeft">
+        <value xml:lang="da">Til venstre i toppen</value>
+        <value xml:lang="en">Top Left</value>
+        <value xml:lang="fr">En haut à gauche</value>
+        <value xml:lang="it">Alto a sinistra</value>
+        <value xml:lang="nl">Boven rechts</value>      
+        <value xml:lang="pt_BR">No topo à esquerda</value>
+        <value xml:lang="zh">顶部居左</value>
+        <value xml:lang="zh_TW">上方居左</value>
+    </property>
     <property key="ContentBrowse">
         <value xml:lang="da">Browse</value>
         <value xml:lang="en">Browse</value>

Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=1190180&r1=1190179&r2=1190180&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Fri Oct 28 07:17:34 2011
@@ -75,14 +75,14 @@ under the License.
         <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field>
         <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}">
             <drop-down>
-                <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.EcommerceBlogTopLeft}"/>
-                <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.EcommerceBlogTopCenter}"/>
+                <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.ContentBlogTopLeft}"/>
+                <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.ContentBlogTopCenter}"/>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
-                <option key="CTNT_PUBLISHED" description="${uiLabelMap.EcommerceBlogPublish}"/>
-                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
+                <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPublish}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1190180&r1=1190179&r2=1190180&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Fri Oct 28 07:17:34 2011
@@ -425,46 +425,6 @@
         <value xml:lang="zh">提交</value>
         <value xml:lang="zh_TW">提交</value>
     </property>
-    <property key="EcommerceBlogPreview">
-        <value xml:lang="da">Vis</value>
-        <value xml:lang="en">Preview</value>
-        <value xml:lang="fr">Visionner</value>
-        <value xml:lang="it">Anteprima</value>
-        <value xml:lang="nl">Bekijken</value>      
-        <value xml:lang="pt_BR">Pré-visualizar</value>
-        <value xml:lang="zh">预览</value>
-        <value xml:lang="zh_TW">預覽</value>
-    </property>
-    <property key="EcommerceBlogPublish">
-        <value xml:lang="da">Publicer</value>
-        <value xml:lang="en">Publish</value>
-        <value xml:lang="fr">Publier</value>
-        <value xml:lang="it">Pubblica</value>
-        <value xml:lang="nl">Publiceren</value>    
-        <value xml:lang="pt_BR">Publicar</value>
-        <value xml:lang="zh">发布</value>
-        <value xml:lang="zh_TW">發佈</value>
-    </property>
-    <property key="EcommerceBlogTopCenter">
-        <value xml:lang="da">Midt for i toppen</value>
-        <value xml:lang="en">Top Center</value>
-        <value xml:lang="fr">En haut au centre</value>
-        <value xml:lang="it">Alto al centro</value>
-        <value xml:lang="nl">Boven in het midden</value>        
-        <value xml:lang="pt_BR">Centralizado no topo</value>
-        <value xml:lang="zh">顶部居中</value>
-        <value xml:lang="zh_TW">上方居中</value>
-    </property>
-    <property key="EcommerceBlogTopLeft">
-        <value xml:lang="da">Til venstre i toppen</value>
-        <value xml:lang="en">Top Left</value>
-        <value xml:lang="fr">En haut à gauche</value>
-        <value xml:lang="it">Alto a sinistra</value>
-        <value xml:lang="nl">Boven rechts</value>      
-        <value xml:lang="pt_BR">No topo à esquerda</value>
-        <value xml:lang="zh">顶部居左</value>
-        <value xml:lang="zh_TW">上方居左</value>
-    </property>
     <property key="EcommerceBlogViewArticle">
         <value xml:lang="da">Vis blog artikel</value>
         <value xml:lang="en">View Blog Article</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1190180&r1=1190179&r2=1190180&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml Fri Oct 28 07:17:34 2011
@@ -101,7 +101,7 @@
         <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.EcommerceBlogPreview}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>
             </radio>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
@@ -168,7 +168,7 @@
         <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.EcommerceBlogPreview}"/>
+                <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>
             </radio>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">