svn commit: r927924 - in /ofbiz/trunk/framework/common: config/general.properties webcommon/login.ftl

[erwan]

Author: erwan
Date: Fri Mar 26 15:44:04 2010
New Revision: 927924

URL: http://svn.apache.org/viewvc?rev=927924&view=rev
Log:
As suggested by Adrian, adding an option to hide the tenant ID's textbox in login form

Modified:
    ofbiz/trunk/framework/common/config/general.properties
    ofbiz/trunk/framework/common/webcommon/login.ftl

Modified: ofbiz/trunk/framework/common/config/general.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=927924&r1=927923&r2=927924&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/general.properties (original)
+++ ofbiz/trunk/framework/common/config/general.properties Fri Mar 26 15:44:04 2010
@@ -131,3 +131,6 @@ https.www.ofbiz.it=ABQIAAAAtt0d8djaYFkk8
 
 https.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBQN-clGH2vvMMwJjYtcwF78UzZgEBTN70S6uIgRoAtXRkADNoesbw5etg
 http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxR3euHYk9bpwvdF2Qg1EYO1LQitHA
+
+# -- N if you want to hide the multi-tenant textbox in the login page
+multitenant=Y
\ No newline at end of file

Modified: ofbiz/trunk/framework/common/webcommon/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/login.ftl?rev=927924&r1=927923&r2=927924&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/login.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/login.ftl Fri Mar 26 15:44:04 2010
@@ -18,6 +18,7 @@ under the License.
 -->
 
 <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
 
 <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
 <#if username != "">
@@ -41,10 +42,12 @@ under the License.
             <td class="label">${uiLabelMap.CommonPassword}</td>
             <td><input type="password" name="PASSWORD" value="" size="20"/></td>
           </tr>
-          <tr>
-            <td class="label">${uiLabelMap.CommonTenantId}</td>
-            <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
-          </tr>
+          <#if ("Y" == useMultitenant)>
+            <tr>
+              <td class="label">${uiLabelMap.CommonTenantId}</td>
+              <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
+            </tr>
+          </#if>
           <tr>
             <td colspan="2" align="center">
               <input type="submit" value="${uiLabelMap.CommonLogin}"/>