svn commit: r1646944 - in /ofbiz/trunk/specialpurpose/ecommerce: config/EcommerceUiLabels.xml webapp/ecommerce/catalog/LayeredNavBar.ftl webapp/ecommerce/catalog/ProductCategories.ftl webapp/ecommerce/catalog/minireorderprods.ftl widget/CatalogScreens.xml

[ashish]

Author: ashish
Date: Sat Dec 20 10:23:47 2014
New Revision: 1646944

URL: http://svn.apache.org/r1646944
Log:
Applied patch from OFBIZ-4511 - Non-standard markup for categories screenlet.
Thanks Anne for creating the issue and providing the first patch. Thanks Arun 
for providing the updated patch.

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl
    ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1646944&r1=1646943&r2=1646944&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Sat Dec 
20 10:23:47 2014
@@ -1759,6 +1759,9 @@
         <value xml:lang="zh">最近浏览</value>
         <value xml:lang="zh_TW">最近看過</value>
     </property>
+    <property key="EcommerceLayeredNavigation">
+        <value xml:lang="en">Layered Navigation</value>
+    </property>
     <property key="EcommerceLength">
         <value xml:lang="da">Længde</value>
         <value xml:lang="de">Länge</value>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=1646944&r1=1646943&r2=1646944&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl 
Sat Dec 20 10:23:47 2014
@@ -19,7 +19,11 @@ under the License.
 
 <#if currentSearchCategory??>
   <div id="layeredNav" class="screenlet">
-    <h3>Layered Navigation</h3>
+    <div class="screenlet-title-bar">
+      <ul>
+        <li class="h3">${uiLabelMap.EcommerceLayeredNavigation}</li>
+      </ul>
+    </div>
     <#escape x as x?xml>
       <#if productCategory.productCategoryId != 
currentSearchCategory.productCategoryId>
         <#assign currentSearchCategoryName = 
categoryContentWrapper.get("CATEGORY_NAME")?string />

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl?rev=1646944&r1=1646943&r2=1646944&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
 Sat Dec 20 10:23:47 2014
@@ -199,7 +199,11 @@ var rawdata = [
 
 
 <div id="quickadd" class="screenlet">
-    <h3>${uiLabelMap.ProductCategories}</h3>
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="h3">${uiLabelMap.ProductCategories}</li>
+        </ul>
+    </div>
     <div class="screenlet-body" id="tree">
     </div>
 </div>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl?rev=1646944&r1=1646943&r2=1646944&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl
 Sat Dec 20 10:23:47 2014
@@ -18,7 +18,11 @@ under the License.
 -->
 <#if reorderProducts?has_content>
 <div id ="minireorderprods" class="screenlet">
-    <h3>${uiLabelMap.ProductQuickReorder}...</h3>
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="h3">${uiLabelMap.ProductQuickReorder}...</li>
+        </ul>
+    </div>
     <div class="screenlet-body">
         <#list reorderProducts as miniProduct>
           <div>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1646944&r1=1646943&r2=1646944&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml Sat Dec 20 
10:23:47 2014
@@ -475,6 +475,9 @@ under the License.
     </screen>
     <screen name="LayeredNavBar">
         <section>
+            <actions>
+                <property-map resource="EcommerceUiLabels" 
map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <platform-specific><html><html-template 
location="component://ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl"/></html></platform-specific>
             </widgets>