r4585 - trunk/lib/admin

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-19 15:10:40 -0800 (Wed, 19 Nov 2008)
New Revision: 4585

Modified:
   trunk/lib/admin/admin-login.jsp
   trunk/lib/admin/admin.css
Log:
Remove organization from login screen.  Require fully qualified user name.

Modified: trunk/lib/admin/admin-login.jsp
===================================================================
--- trunk/lib/admin/admin-login.jsp	2008-11-19 23:09:43 UTC (rev 4584)
+++ trunk/lib/admin/admin-login.jsp	2008-11-19 23:10:40 UTC (rev 4585)
@@ -46,7 +46,7 @@
 <h2>Administrator Login</h2>
 
 Account login page.
-<br class="ldap-header">
+<br class="auth-header">
 
 <%@ include file="./page-message-section.jsp"%>
 <hr class="config-line">
@@ -60,33 +60,18 @@
 		<td>username:</td>
 		<td><input class="login-input" name="username" type="text" value=""></td>
 	</tr>
-
 	<tr>
-		<td>organization:</td>
-		<td><select class="login-input"
-			name="organization">
-			<option value="" selected>&#8212; choose one &#8212;</option>
-<%
-			for (String orgName : organizationList) {
-%>
-			<option value="<%= orgName %>"
-<%
-			if (PropertyService.getProperty("organization.base." + orgName) == null || PropertyService.getProperty("organization.base." + orgName).equals("")) {
-%>
-			disabled="disabled"
-<%
-			}
-%>			
-			><%= orgName %></option>
-<%
-			}
-%>
-		</select></td>
+	    <td></td>
+	    <td class="textinput-description">[Fully qualified administrator username]</td>
 	</tr>
 	<tr>
 		<td>password:</td>
 		<td><input class="login-input" name="password" type="password" maxlength="50" value=""></td>
 	</tr>
+	<tr>
+	    <td></td>
+	    <td class="textinput-description">[Administrator password]</td>
+	</tr>
 </table>
 
 <br>

Modified: trunk/lib/admin/admin.css
===================================================================
--- trunk/lib/admin/admin.css	2008-11-19 23:09:43 UTC (rev 4584)
+++ trunk/lib/admin/admin.css	2008-11-19 23:10:40 UTC (rev 4585)
@@ -80,14 +80,14 @@
 }
 
 .login-input {
-	width: 150px;
+	width: 300px;
 }
 
 br {
 	clear: left;
 }
 
-br.ldap-header {
+br.auth-header {
 	margin-bottom: 80px;
 }