From e999260d52846ba574ae553a036a367ee48c13ff Mon Sep 17 00:00:00 2001
From: shrykedude <shrykedude@alumni.egroupware.org>
Date: Wed, 13 Oct 2004 14:49:03 +0000
Subject: [PATCH] Really hide domain selection when not needed; UI cleanup of
 Login button

---
 login.php                          | 11 ++++++++++-
 phpgwapi/templates/idots/login.tpl |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/login.php b/login.php
index b18d02219a..429663a85f 100755
--- a/login.php
+++ b/login.php
@@ -288,7 +288,9 @@
 		}
 	}
 
+	$tmpl->set_block('login_form','domain_selection');
 	$domain_select = '&nbsp;';
+	$lang_domain_select = '&nbsp;';
 	$last_loginid = $_COOKIE['last_loginid'];
 	if($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
 	{
@@ -304,6 +306,7 @@
 			$domain_select .= '>' . $domain_name . "</option>\n";
 		}
 		$domain_select .= "</select>\n";
+		$lang_domain_select = lang('Domain');
 	}
 	elseif($last_loginid !== '')
 	{
@@ -315,8 +318,14 @@
 			$last_loginid .= '@' . $_COOKIE['last_domain'];
 		}
 	}
-	$tmpl->set_var('lang_select_domain',lang('Domain'));
+	$tmpl->set_var('lang_select_domain',$lang_domain_select);
 	$tmpl->set_var('select_domain',$domain_select);
+	
+	if(!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
+	{
+	   /* trick to make domain selection disappear */
+		$tmpl->set_var('domain_selection','');
+	}
 
 	foreach($_GET as $name => $value)
 	{
diff --git a/phpgwapi/templates/idots/login.tpl b/phpgwapi/templates/idots/login.tpl
index 85758f8135..e115993bb9 100755
--- a/phpgwapi/templates/idots/login.tpl
+++ b/phpgwapi/templates/idots/login.tpl
@@ -94,11 +94,13 @@
 			<td align="left" colspan="2">{select_language}</td>
 		</tr>
 <!-- END language_select -->
+<!-- BEGIN domain_selection -->
 			<tr>
 			<td align="right" tablindex="1">{lang_select_domain}&nbsp;</td>
 			<td align="left">{select_domain}</td>
 			<td align="left"></td>
 			</tr>
+<!-- END domain_selection -->
 			<tr>
 			<td align="right" tablindex="1">{lang_username}&nbsp;</td>
 			<td align="left"><input name="login" value="{cookie}" style="width: 100px; border: 1px solid silver;"></td>
@@ -109,7 +111,8 @@
 			<td align="left"><input name="passwd" type="password" onChange="this.form.submit()" style="width: 100px; border: 1px solid silver;"></td>
 		</tr>
 		<tr>
-			<td colspan="2" align="center" style="margin-top:5px;">
+			<td align="right">&nbsp;</td>
+			<td align="left" style="margin-top:5px;">
 				<input type="submit" value="{lang_login}" name="submitit" style="border: 1px solid silver;width:100px;">
 			</td>
 		</tr>