OFBiz › OFBiz - Commits

svn commit: r1553940 [8/8] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/config/ applications/commonext/config/ applications/content/config/ applications/manufacturing/webapp/manufacturing/bom/ applications/...

‹ 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: r1553940 [8/8] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/config/ applications/commonext/config/ applications/content/config/ applications/manufacturing/webapp/manufacturing/bom/ applications/...

jleroux@apache.org
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml Sat Dec 28 22:12:50 2013
@@ -165,7 +165,7 @@ under the License.
         <section>
             <actions>
                 <set field="tabButtonItem" value="ExampleGeoLocationPointSet1"/>
-                <set field="geoPoints[+0].lat" value="37.4419" type="Float"/>
+                <set field="geoPoints[+0].lat" value="37,4459" type="Float"/>
                 <set field="geoPoints[0].lon" value="-122.1419" type="Float"/>
                 <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
                 <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
@@ -184,7 +184,7 @@ under the License.
         <section>
             <actions>
                 <set field="tabButtonItem" value="ExampleGeoLocationPointSet2"/>
-                <set field="geoPoints[+0].lat" value="37.4459" type="Float"/>
+                <set field="geoPoints[+0].lat" value="37.4419" type="Float"/>
                 <set field="geoPoints[0].lon" value="-122.1489" type="Float"/>
                 <set field="geoPoints[+1].lat" value="37.4829" type="Float"/>
                 <set field="geoPoints[1].lon" value="-122.1599" type="Float"/>
@@ -193,6 +193,7 @@ under the License.
                 <set field="geoCenter.lat" value="37.4419" type="Float"/>
                 <set field="geoCenter.lon" value="-122.1419" type="Float"/>
                 <set field="geoCenter.zoom" value="12"/>
+                <script location="component://common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy"/>
             </actions>
             <widgets>
                 <include-screen name="CommonExampleGeoLocationDecorator" location="${parameters.mainDecoratorLocation}"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml Sat Dec 28 22:12:50 2013
@@ -88,12 +88,7 @@
         <value xml:lang="zh">自动更新选项</value>
     </property>
     <property key="GoogleBaseCompanyName">
-        <value xml:lang="en">Ofbiz</value>
-        <value xml:lang="fr">Ofbiz</value>
-        <value xml:lang="it">Ofbiz</value>
-        <value xml:lang="ja">Ofbiz</value>
-        <value xml:lang="th">Ofbiz</value>
-        <value xml:lang="zh">OFBiz</value>
+        <value xml:lang="en">OFBiz</value>
     </property>
     <property key="GoogleBaseConfiguration">
         <value xml:lang="en">Google Base Configurations</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/config/MyPortalUiLabels.xml Sat Dec 28 22:12:50 2013
@@ -59,7 +59,6 @@
         <value xml:lang="it">Nome mancante</value>
         <value xml:lang="ja">姓/firstNameが正しくありません</value>
         <value xml:lang="th">กรุณากรอกชื่อของท่าน</value>
-        <value xml:lang="vi"></value>
         <value xml:lang="zh">缺少你的名</value>
         <value xml:lang="zh_TW">缺少名字(Firstname)</value>
     </property>
@@ -198,7 +197,6 @@
         <value xml:lang="it">Miei compiti</value>
         <value xml:lang="ja">私のタスク</value>
         <value xml:lang="th">งานของฉัน</value>
-        <value xml:lang="vi"></value>
         <value xml:lang="zh">我的任务</value>
         <value xml:lang="zh_TW">我的任務</value>
     </property>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/secondary-appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/secondary-appbar.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/secondary-appbar.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/secondary-appbar.ftl Sat Dec 28 22:12:50 2013
@@ -38,7 +38,7 @@ under the License.
       <#if thisApp != "/">
         <#assign thisURL = thisURL + "/control/main">
       </#if>
-      <li><a<#if selected> class="current-section"</#if> href="${thisURL}${externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li>
+      <li><a<#if selected> class="current-section"</#if> href="${thisURL}${StringUtil.wrapString(externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li>
     </#list>
   </ul>
 </#if>
\ No newline at end of file

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/appbar.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/appbar.ftl Sat Dec 28 22:12:50 2013
@@ -52,7 +52,7 @@ under the License.
               <li>
             </#if>
           </#if>
-          <a href="${thisURL}${externalKeyParam}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
+          <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
           <#assign appCount = appCount + 1>
         </#if>
       </#list>
@@ -76,7 +76,7 @@ under the License.
             <li>
           </#if>
         </#if>
-        <a href="${thisURL}${externalKeyParam}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
+        <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
         <#assign appCount = appCount + 1>
       </#list>
       <#if appCount != 0>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl Sat Dec 28 22:12:50 2013
@@ -133,7 +133,7 @@ under the License.
             <#if layoutSettings.topLines?has_content>
               <#list layoutSettings.topLines as topLine>
                 <#if topLine.text?exists>
-                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${externalKeyParam}">${topLine.urlText?if_exists}</a></li>
+                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText?if_exists}</a></li>
                 <#elseif topLine.dropDownList?exists>
                   <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li>
                 <#else>


Free forum by Nabble Edit this page