OFBiz › OFBiz - Commits

svn commit: r1858516 - in /ofbiz: ofbiz-framework/trunk/applications/order/config/ ofbiz-framework/trunk/applications/order/template/entry/ ofbiz-framework/trunk/applications/order/template/order/ ofbiz-framework/trunk/applications/party/template/party...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1858516 - in /ofbiz: ofbiz-framework/trunk/applications/order/config/ ofbiz-framework/trunk/applications/order/template/entry/ ofbiz-framework/trunk/applications/order/template/order/ ofbiz-framework/trunk/applications/party/template/party...

jleroux@apache.org
Author: jleroux
Date: Thu May  2 06:44:47 2019
New Revision: 1858516

URL: http://svn.apache.org/viewvc?rev=1858516&view=rev
Log:
Improved: Missing uiLabel for Create New on CMS Content Find Screen
(OFBIZ-11005)

Steps to regenerate:
    Go to https://demo-trunk.ofbiz.apache.org/content/control/CMSContentFind
    Find missing uiLabel for Create New, showing as CommonCreateNew.

jleroux: This is related with OFBIZ-9905, we decided to use only CommonCreate
This do that and fix others which were missing in OFBIZ-9905

Thanks: Pawan Verma for report, Suraj for comment

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderTerms.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Attributes.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Contact.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Notes.ftl
    ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl
    ofbiz/ofbiz-plugins/trunk/ebay/widget/EbayMenus.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumForms.xml
    ofbiz/ofbiz-plugins/trunk/lucene/widget/LuceneScreens.xml
    ofbiz/ofbiz-plugins/trunk/projectmgr/widget/TaskScreens.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml Thu May  2 06:44:47 2019
@@ -7049,24 +7049,6 @@
         <value xml:lang="zh-CN">注释</value>
         <value xml:lang="zh-TW">便箋</value>
     </property>
-    <property key="OrderNotesCreateNew">
-        <value xml:lang="ar">خلق جديد</value>
-        <value xml:lang="de">Neu erstellen</value>
-        <value xml:lang="en">Create New</value>
-        <value xml:lang="es">Crear nueva nota</value>
-        <value xml:lang="fr">Créer une nouvelle note</value>
-        <value xml:lang="it">Creare Nuovo</value>
-        <value xml:lang="ja">新規作成</value>
-        <value xml:lang="nl">Nieuwe aanmaken</value>
-        <value xml:lang="pt-BR">Criar nova nota</value>
-        <value xml:lang="ro">Creare Noi</value>
-        <value xml:lang="ru">Создть новый</value>
-        <value xml:lang="th">สร้างใหม่</value>
-        <value xml:lang="vi">Tạo mới</value>
-        <value xml:lang="zh">新建</value>
-        <value xml:lang="zh-CN">新建</value>
-        <value xml:lang="zh-TW">新建</value>
-    </property>
     <property key="OrderNotesForRequestItem">
         <value xml:lang="ar">ملاحظات لبند الطلب</value>
         <value xml:lang="de">Anmerkung für Anfrage Element</value>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl Thu May  2 06:44:47 2019
@@ -43,7 +43,7 @@ function makeExpDate() {
             <table width="100%" cellpadding="1" cellspacing="0" border="0">
               <tr>
                 <td colspan="2">
-                  <a href="<@ofbizUrl>setBilling?createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a>
+                  <a href="<@ofbizUrl>setBilling?createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreate}</a>
                 </td>
               </tr>
               <tr><td colspan="3"><hr /></td></tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderTerms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderTerms.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderTerms.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderTerms.ftl Thu May  2 06:44:47 2019
@@ -52,7 +52,7 @@ under the License.
                                 </#list>
                                 <tr>
                                     <td colspan="5">
-                                        <a href="<@ofbizUrl>setOrderTerm?createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a>
+                                        <a href="<@ofbizUrl>setOrderTerm?createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreate}</a>
                                     </td>
                                 </tr>
                             </table>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl Thu May  2 06:44:47 2019
@@ -166,7 +166,7 @@ under the License.
       <table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxoutside">
         <tr>
           <td>
-            <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a>
+            <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreate} ${uiLabelMap.OrderShipGroup}</a>
             <a href="<@ofbizUrl>EditShipAddress</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShippingAddress}</a>
             <#list 1..cart.getShipGroupSize() as currIndex>
               <#assign shipGroupIndex = currIndex - 1>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderNotes.ftl Thu May  2 06:44:47 2019
@@ -24,7 +24,7 @@ under the License.
       <ul>
         <li class="h3">&nbsp;${uiLabelMap.OrderNotes}</li>
         <#if security.hasEntityPermission("ORDERMGR", "_NOTE", session)>
-          <li><a href="<@ofbizUrl>createnewnote?${paramString}</@ofbizUrl>">${uiLabelMap.OrderNotesCreateNew}</a></li>
+          <li><a href="<@ofbizUrl>createnewnote?${paramString}</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
         </#if>
       </ul>
       <br class="clear"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditShoppingList.ftl Thu May  2 06:44:47 2019
@@ -25,7 +25,7 @@ under the License.
       <li>
         <form id="createEmptyShoppingList" action="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>" method="post">
           <input type="hidden" name="partyId" value="${partyId!}" />
-          <input type="submit" value="${uiLabelMap.CommonCreateNew}"/>
+          <input type="submit" value="${uiLabelMap.CommonCreate}"/>
         </form>
       </li>
     </ul>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Attributes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Attributes.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Attributes.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Attributes.ftl Thu May  2 06:44:47 2019
@@ -22,7 +22,7 @@ under the License.
       <ul>
         <li class="h3">${uiLabelMap.PartyAttributes}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
-          <li><a href="<@ofbizUrl>editPartyAttribute?partyId=${party.partyId!}&amp;CANCEL_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+          <li><a href="<@ofbizUrl>editPartyAttribute?partyId=${party.partyId!}&amp;CANCEL_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
         </#if>
       </ul>
       <br class="clear"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Contact.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Contact.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Contact.ftl Thu May  2 06:44:47 2019
@@ -22,7 +22,7 @@ under the License.
       <ul>
         <li class="h3">${uiLabelMap.PartyContactInformation}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session) || userLogin.partyId == partyId>
-          <li><a href="<@ofbizUrl>editcontactmech?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+          <li><a href="<@ofbizUrl>editcontactmech?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
         </#if>
       </ul>
       <br class="clear" />

Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Notes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Notes.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Notes.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Notes.ftl Thu May  2 06:44:47 2019
@@ -22,7 +22,7 @@ under the License.
       <ul>
         <li class="h3">${uiLabelMap.CommonNotes}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)>
-          <li><a href="<@ofbizUrl>AddPartyNote?partyId=${partyId}&amp;DONE_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+          <li><a href="<@ofbizUrl>AddPartyNote?partyId=${partyId}&amp;DONE_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
         </#if>
       </ul>
       <br class="clear" />

Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/UserLogin.ftl Thu May  2 06:44:47 2019
@@ -22,7 +22,7 @@ under the License.
       <ul>
         <li class="h3">${uiLabelMap.PartyUserName}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
-          <li><a href="<@ofbizUrl>ProfileCreateNewLogin?partyId=${party.partyId}&amp;CANCEL_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+          <li><a href="<@ofbizUrl>ProfileCreateNewLogin?partyId=${party.partyId}&amp;CANCEL_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
         </#if>
       </ul>
       <br class="clear" />

Modified: ofbiz/ofbiz-plugins/trunk/ebay/widget/EbayMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/widget/EbayMenus.xml?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/widget/EbayMenus.xml Thu May  2 06:44:47 2019
@@ -48,7 +48,7 @@ under the License.
     </menu>
     <menu name="EbayConfigSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
             menu-container-style="button-bar button-style-2">
-        <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}">
+        <menu-item name="createNew" title="${uiLabelMap.CommonCreate}">
             <condition>
                 <not><if-empty field="ebayConfig"/></not>
             </condition>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl Thu May  2 06:44:47 2019
@@ -146,7 +146,7 @@ under the License.
   <div class="card-header">
     <div class="row">
       <div class="col-lg-3"><strong>${uiLabelMap.PartyContactInformation}</strong></div>
-      <div class="col-lg-9 text-right"><a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="card-link">${uiLabelMap.CommonCreateNew}</a></div>
+      <div class="col-lg-9 text-right"><a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="card-link">${uiLabelMap.CommonCreate}</a></div>
     </div>
   </div>
 

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl Thu May  2 06:44:47 2019
@@ -85,7 +85,7 @@ under the License.
     <strong>${uiLabelMap.EcommerceShoppingLists}</strong>
     <form id="createEmptyShoppingList" action="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>" method="post">
        <input type="hidden" name="productStoreId" value="${productStoreId!}" />
-       <a href="javascript:document.getElementById('createEmptyShoppingList').submit();" class="float-right">${uiLabelMap.CommonCreateNew}</a>
+       <a href="javascript:document.getElementById('createEmptyShoppingList').submit();" class="float-right">${uiLabelMap.CommonCreate}</a>
     </form>
   </div>
     <div class="card-body">
@@ -112,7 +112,7 @@ under the License.
           <label class="mb-2">${uiLabelMap.EcommerceNoShoppingListsCreate}.</label>
           <form id="createEmptyShoppingList" action="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>" method="post">
              <input type="hidden" name="productStoreId" value="${productStoreId!}" />
-             <input type="submit" name="submit" class="btn btn-primary" value="${uiLabelMap.CommonCreateNew}"/>
+             <input type="submit" name="submit" class="btn btn-primary" value="${uiLabelMap.CommonCreate}"/>
           </form>
         </#if>
     </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumForms.xml?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumForms.xml Thu May  2 06:44:47 2019
@@ -325,7 +325,7 @@ under the License.
         <field name="lastModifiedDate" position="2"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="createLink" title=" " widget-style="buttontext" position="1">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}"  target="AddContent"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}"  target="AddContent"/>
         </field>
         <field name="findContent" title=" " widget-style="buttontext" position="2">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonFind}"  target="FindContent"/>

Modified: ofbiz/ofbiz-plugins/trunk/lucene/widget/LuceneScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/widget/LuceneScreens.xml?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/lucene/widget/LuceneScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/lucene/widget/LuceneScreens.xml Thu May  2 06:44:47 2019
@@ -44,7 +44,7 @@ under the License.
                                 <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <container style="button-bar"><link target="EditAddContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container>
+                                <container style="button-bar"><link target="EditAddContent" text="${uiLabelMap.CommonCreate}" style="buttontext create"/></container>
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>

Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/TaskScreens.xml?rev=1858516&r1=1858515&r2=1858516&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/TaskScreens.xml Thu May  2 06:44:47 2019
@@ -524,7 +524,7 @@ under the License.
                             <widgets>
                                 <screenlet title="${uiLabelMap.ProjectMgrTaskContentList}">
                                     <container>
-                                        <link target="EditTaskContents" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
+                                        <link target="EditTaskContents" text="${uiLabelMap.CommonCreate}" style="smallSubmit">
                                             <parameter param-name="workEffortId"/>
                                         </link>
                                     </container>


Free forum by Nabble Edit this page