[Hyperic-hq-discuss] hq r14248 - in trunk/web: WEB-INF/classes WEB-INF/jsp css images/4.0/backgrounds

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-01-29 14:56:33 -0800 (Fri, 29 Jan 2010)
New Revision: 14248
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14248

Added:
   trunk/web/images/4.0/backgrounds/button-green-background.jpg
   trunk/web/images/4.0/backgrounds/button-grey-background.jpg
Modified:
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/WEB-INF/jsp/login.jsp
   trunk/web/css/HQ_40.css
Log:
Tweaked UI a bit

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-01-29 20:00:31 UTC (rev 14247)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-01-29 22:56:33 UTC (rev 14248)
@@ -135,7 +135,8 @@
 login.signin=Sign in
 login.signin.message=Sign in to Hyperic HQ
 login.signin.instructions=Please enter your username and password to sign in.
-login.signInAsGuest=Sign in as guest user
+login.or=Or, 
+login.signInAsGuest=sign in as guest user
 login.field.password=Password
 login.field.username=Username
 login.error.login=You have entered an invalid username and/or password.

Modified: trunk/web/WEB-INF/jsp/login.jsp
===================================================================
--- trunk/web/WEB-INF/jsp/login.jsp	2010-01-29 20:00:31 UTC (rev 14247)
+++ trunk/web/WEB-INF/jsp/login.jsp	2010-01-29 22:56:33 UTC (rev 14248)
@@ -56,11 +56,13 @@
 						<label for="j_password"><fmt:message key="login.field.password" /></label> 
 						<input style="width: 75%;" id="passwordInput" type="password" id="j_password" name="j_password" />
 					</div>
-					<div class="button">
+					<div class="submitButtonContainer">
+						<input type="submit" name="submit" class="button42" value="<fmt:message key="login.signin" />" />
 						<c:if test="${guestEnabled}">
-							<a href="#" id="guestLoginLink" class="guestuser"><fmt:message key="login.signInAsGuest" /></a>
+							<div class="guestUserLinkContainer">
+								<fmt:message key="login.or" />&nbsp;<a href="#" id="guestLoginLink" class="guestUser"><fmt:message key="login.signInAsGuest" /></a>
+							</div>
 						</c:if>
-						<input type="submit" name="submit" class="button42" value="<fmt:message key="login.signin" />" />
 					</div>
 				</fieldset>
 			</form>

Modified: trunk/web/css/HQ_40.css
===================================================================
--- trunk/web/css/HQ_40.css	2010-01-29 20:00:31 UTC (rev 14247)
+++ trunk/web/css/HQ_40.css	2010-01-29 22:56:33 UTC (rev 14248)
@@ -502,9 +502,23 @@
     margin-right:5px;
 }
 
-.loginPanel .guestuser {
+.loginPanel input[type="submit"] {
+	font-size: 1.1em ! important;
+}
+
+.loginPanel .submitButtonContainer {
+	text-align: right; 
+	margin-right: 10px;
+}
+
+.loginPanel .guestUserLinkContainer {
+	margin-top: 5px; 
+	text-align: right;
+}
+
+.loginPanel .guestUser {
 	color:#45A8DF;
-	margin-right:10px;
+	margin-right:0;
 }
 
 .loginButtons {
@@ -2370,9 +2384,9 @@
 	width:auto;
 	overflow:visible;
     border: 1px solid #84B96D;
-    background-color: #2DBF3D;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
+    background: #2DBF3D url(../images/4.0/backgrounds/button-green-background.jpg) repeat-x bottom;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
     border-radius: 3px;
     padding: 3px 5px;
     cursor:pointer;
@@ -2380,7 +2394,7 @@
 
 .button42disabled {
 	color: #888;
-	background-color: #ccc;
+	background: #bbb url(../images/4.0/backgrounds/button-grey-background.jpg) repeat-x bottom;
 	border-color: #aaa;	
 	cursor: default
 }
@@ -2568,4 +2582,26 @@
 	background: url(../images/icon_available_error.gif) no-repeat;
 	height: 12px;
 	width: 12px;
+}
+
+.formButtonContainer {
+	margin-top:25px; 
+	text-align:center; 
+	width:100%;
+}
+
+.formButtonContainer input[type=button] {
+	margin-right:8px;
+}
+
+.formButtonContainer .reset,
+.formButtonContainer .cancel {
+	background: #bbb url(../images/4.0/backgrounds/button-grey-background.jpg) repeat-x bottom;
+	border-color:#ddd;
+}
+
+.footerMessageContainer {
+	margin-top:15px; 
+	text-align:center; 
+	width:100%;
 }
\ No newline at end of file

Added: trunk/web/images/4.0/backgrounds/button-green-background.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/web/images/4.0/backgrounds/button-green-background.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/web/images/4.0/backgrounds/button-grey-background.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/web/images/4.0/backgrounds/button-grey-background.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream