From 7052ea9fe30de6f910b1df42f28d773837370b6b Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Mon, 20 Sep 2010 13:40:58 +0000 Subject: [PATCH] HS-Theme, Tickets #1 und #8 --- .../jsp/hostsharing/ui/casBlockedView.jsp | 10 +- .../jsp/hostsharing/ui/casConfirmView.jsp | 6 +- .../jsp/hostsharing/ui/casGenericSuccess.jsp | 10 +- .../view/jsp/hostsharing/ui/casLoginView.jsp | 96 ++++++------------- .../view/jsp/hostsharing/ui/casLogoutView.jsp | 33 +------ .../jsp/hostsharing/ui/includes/bottom.jsp | 9 +- .../view/jsp/hostsharing/ui/includes/top.jsp | 38 +++----- .../hostsharing/ui/serviceErrorSsoView.jsp | 9 +- .../jsp/hostsharing/ui/serviceErrorView.jsp | 8 +- .../webapp/themes/hostsharing/cas.css | 27 +----- 10 files changed, 76 insertions(+), 170 deletions(-) diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casBlockedView.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casBlockedView.jsp index 44a2214..b393635 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casBlockedView.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casBlockedView.jsp @@ -1,8 +1,6 @@ - -
-

- -

-
+
+

+

+
diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casConfirmView.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casConfirmView.jsp index 513e8d9..2462394 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casConfirmView.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casConfirmView.jsp @@ -1,3 +1,7 @@ -

+

+ +

diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casGenericSuccess.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casGenericSuccess.jsp index a9919fd..9f0d0de 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casGenericSuccess.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casGenericSuccess.jsp @@ -1,8 +1,8 @@ -
-

-

-

-
+
+

+

+

+
diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLoginView.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLoginView.jsp index 8abed75..0bad0b3 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLoginView.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLoginView.jsp @@ -1,68 +1,34 @@ -<%-- - - Licensed to Jasig under one or more contributor license - agreements. See the NOTICE file distributed with this work - for additional information regarding copyright ownership. - Jasig licenses this file to you under the Apache License, - Version 2.0 (the "License"); you may not use this file - except in compliance with the License. You may obtain a - copy of the License at: - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on - an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---%> - <%@ page contentType="text/html; charset=UTF-8" %> - - -
- -

Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.

-
- - - ${sessionScope.openIdLocalId} - - - - - - - -
-
- - <%-- - NOTE: Certain browsers will offer the option of caching passwords for a user. There is a non-standard attribute, - "autocomplete" that when set to "off" will tell certain browsers not to prompt to cache credentials. For more - information, see the following web page: - http://www.geocities.com/technofundo/tech/web/ie_autocomplete.html - --%> - - -
-
- " type="checkbox" checked="checked" /> - -
-
- - - - " tabindex="4" type="submit" /> - " tabindex="5" type="reset" /> -
-
- - - + + +
+

Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.

+
+ + + ${sessionScope.openIdLocalId} + + + + + + +
+
+ + + +
+
+ + + + " tabindex="4" type="submit" /> + " tabindex="5" type="reset" /> +
+
+ + diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLogoutView.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLogoutView.jsp index e0e7ada..79ac2bc 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLogoutView.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/casLogoutView.jsp @@ -1,30 +1,7 @@ -<%-- - - Licensed to Jasig under one or more contributor license - agreements. See the NOTICE file distributed with this work - for additional information regarding copyright ownership. - Jasig licenses this file to you under the Apache License, - Version 2.0 (the "License"); you may not use this file - except in compliance with the License. You may obtain a - copy of the License at: - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on - an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---%> - - -
-

- -

-

-
+
+

+

+

+
diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/bottom.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/bottom.jsp index b58d45e..c010c6f 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/bottom.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/bottom.jsp @@ -1,8 +1,7 @@ - - - + + diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/top.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/top.jsp index 467508c..bdcf9e3 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/top.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/includes/top.jsp @@ -6,32 +6,18 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - - + Hostsharing - Central Authentication Service (CAS) - - - - - - " /> - " /> - - - - " /> - - - - " type="image/x-icon" /> + + + - -
-
- - -
+ +
+ + +
diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorSsoView.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorSsoView.jsp index e8d1f16..9238ac3 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorSsoView.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorSsoView.jsp @@ -2,13 +2,12 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - -
-

-

-
+
+

+

+
diff --git a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorView.jsp b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorView.jsp index 4af6f90..d9ea9e8 100644 --- a/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorView.jsp +++ b/authenticator/webapp/WEB-INF/view/jsp/hostsharing/ui/serviceErrorView.jsp @@ -1,6 +1,6 @@ -
-

-

-
+
+

+

+
diff --git a/authenticator/webapp/themes/hostsharing/cas.css b/authenticator/webapp/themes/hostsharing/cas.css index 048e107..4d22e59 100644 --- a/authenticator/webapp/themes/hostsharing/cas.css +++ b/authenticator/webapp/themes/hostsharing/cas.css @@ -60,19 +60,8 @@ a img,#header img { #header a:hover.task, #header a:focus.task {background-color:#c33 !important;} -#header a.task#helpBtn { - background:#b00 url(../../images/help.gif) 5px 5px no-repeat scroll; -/* display:none; */ - } - -#header a.task#aboutBtn {background:#b00 url(../../images/about.gif) 5px 5px no-repeat scroll;} - -#header a.task#menuBtn {background:#b00 url(../../images/menu.gif) 5px 5px no-repeat scroll;} - -#header a.task#logoutBtn {background:#b00 url(../../images/logout.gif) 5px 5px no-repeat scroll;} - #logo { - margin:0 0 0 5%; + margin:20px 0 0 5%; padding:0; width:90%; height:100px; @@ -156,7 +145,6 @@ html>body .clear:after { } #content ul li { - background:url(../images/bullet_orange.gif) 0px 2px no-repeat scroll; padding-left:20px; margin-top:.5em; } @@ -293,11 +281,8 @@ input.numeric {text-align:right;} color:#ffc !important; font-weight:normal; line-height:19px; - background:#b00 url(../images/close.gif) 5px 5px no-repeat scroll; } -#help h4 a:hover, #help h4 a:focus {background:#c33 url(../images/close.gif) 5px 5px no-repeat scroll !important;} - fieldset { border-top:solid 1px #ccc; border-bottom:0; @@ -348,12 +333,7 @@ table .appHeadingRow th { } -#content .button#add {background:#d0d0d0 url(../../images/arrowd.gif) right center no-repeat scroll;} -#content .button#update {background:#d0d0d0 url(../../images/update.gif) right center no-repeat scroll;margin-top:10px;} - #login {float:left; margin:0 -296px 0 0; padding:15px; width:258px; min-height:15em; background:#eee; position:relative; border:0;} -#login:before {line-height:0.1; font-size:1px; background:transparent url("../../images/key-point_tr.gif") no-repeat top right; margin:-15px -15px 0 -15px; height:15px; display:block; content:url("../images/key-point_tl.gif");} -#login:after {display:block; clear:both; padding-top:15px; line-height:0.1; font-size:1px; content:url("../../images/key-point_bl.gif"); margin:-15px; height:8px; background:transparent url("../images/key-point_br.gif") scroll no-repeat bottom right;} #login h2 {border-bottom:1px solid #ddd; padding:3px 0; font:normal 400 17px Georgia, "Times New Roman", Times, serif; color:#333;} #login label {font-size:11px;} #login label span.accesskey {text-decoration:underline;} @@ -368,10 +348,7 @@ table .appHeadingRow th { /* MESSAGES --------------------------------- */ .info, .errors, .success {clear:both; margin:18px 0; padding:20px 20px 20px 100px; font-size:10px; line-height:1.5;} -.info {border:1px dotted 008; background:#eff url(../images/info.gif) no-repeat 20px 18px; color:#008;} -.errors {border:1px dotted #d21033; background:#fed url(../images/error.gif) no-repeat 20px 18px; color:#d21033; padding-bottom: 40px;} -.success {border:1px dotted #390; background:#dfa url(../images/confirm.gif) no-repeat 20px 18px; color:#390;} -#content .errors h2, #content .success h2 {font-family:Georgia,"Times New Roman",Times,serif; font-size:18px; line-height:48px; font-weight:400; margin:0 18px 0 0; padding:0;} +#content .errors h2, #content .success h2 {font-family:Arial,Helvetica,Verdana,sans-serif; font-size:18px; line-height:48px; font-weight:400; margin:0 18px 0 0; padding:0;} #content .success h2 {color: #008 !important;} #content .errors h2 {color:#b00 !important;} #content .success h2 {color:#060 !important;}