svn commit: r664522 - in /ofbiz/trunk/applications/ecommerce/webapp/ecommerce: catalog/choosecatalog.ftl includes/language.ftl

Author: jleroux
Date: Sun Jun  8 09:59:27 2008
New Revision: 664522

URL: http://svn.apache.org/viewvc?rev=664522&view=rev
Log:
A patch from Bruno Busco "Change buttons should not be displayed in the language and catalog selection widgets" (https://issues.apache.org/jira/browse/OFBIZ-1828) - OFBIZ-1828

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl?rev=664522&r1=664521&r2=664522&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Sun Jun  8 09:59:27 2008
@@ -28,7 +28,7 @@
     </div>
     <div class="screenlet-body" style="text-align: center;">
         <form name="choosecatalogform" method="post" action="<@ofbizUrl>main</@ofbizUrl>" style='margin: 0;'>
-          <select name='CURRENT_CATALOG_ID' class='selectBox'>
+          <select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()">
             <option value='${currentCatalogId}'>${currentCatalogName}</option>
             <option value='${currentCatalogId}'></option>
             <#list catalogCol as catalogId>
@@ -36,7 +36,6 @@
               <option value='${catalogId}'>${thisCatalogName}</option>
             </#list>
           </select>
-          <div><a href="javascript:document.choosecatalogform.submit()" class="buttontext">${uiLabelMap.CommonChange}</a></div>
         </form>
     </div>
 </div>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl?rev=664522&r1=664521&r2=664522&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl Sun Jun  8 09:59:27 2008
@@ -23,7 +23,7 @@
     </div>
     <div class="screenlet-body" style="text-align: center;">
         <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
-          <select name="newLocale" class="selectBox" style="width:95%">
+          <select name="newLocale" class="selectBox" style="width:95%" onchange="submit()">
             <#list availableLocales as availableLocale>
               <#assign langAttr = availableLocale.toString()?replace("_", "-")>
               <#assign langDir = "ltr">
@@ -33,7 +33,6 @@
               <option lang="${langAttr}" dir="${langDir}" value="${availableLocale.toString()}"<#if locale.toString() = availableLocale.toString()> selected="selected"</#if>>${availableLocale.getDisplayName(availableLocale)}</option>
             </#list>
           </select>
-          <div><a href="javascript:document.chooseLanguage.submit()" class="buttontext">${uiLabelMap.CommonChange}</a></div>
         </form>
     </div>
 </div>