HS-Theme, Tickets #1 und #8

This commit is contained in:
Peter Hormanns 2010-09-20 13:40:58 +00:00
parent 7f6432f4e8
commit 7052ea9fe3
10 changed files with 76 additions and 170 deletions

View File

@ -1,8 +1,6 @@
<jsp:directive.include file="/WEB-INF/view/jsp/default/ui/includes/top.jsp" /> <jsp:directive.include file="/WEB-INF/view/jsp/default/ui/includes/top.jsp" />
<div id="status" class="errors">
<div id="status" class="errors"> <h2><spring:message code="screen.blocked.header" /></h2>
<h2><spring:message code="screen.blocked.header" /></h2> <p><spring:message code="screen.blocked.message" /></p>
</div>
<p><spring:message code="screen.blocked.message" /></p>
</div>
<jsp:directive.include file="/WEB-INF/view/jsp/default/ui/includes/bottom.jsp" /> <jsp:directive.include file="/WEB-INF/view/jsp/default/ui/includes/bottom.jsp" />

View File

@ -1,3 +1,7 @@
<jsp:directive.include file="includes/top.jsp" /> <jsp:directive.include file="includes/top.jsp" />
<div class="info"><p><spring:message code="screen.confirmation.message" arguments="${fn:escapeXml(param.service)}${fn:indexOf(param.service, '?') eq -1 ? '?' : '&'}ticket=${serviceTicketId}" /></p></div> <div class="info"><p>
<spring:message
code="screen.confirmation.message"
arguments="${fn:escapeXml(param.service)}${fn:indexOf(param.service, '?') eq -1 ? '?' : '&'}ticket=${serviceTicketId}" />
</p></div>
<jsp:directive.include file="includes/bottom.jsp" /> <jsp:directive.include file="includes/bottom.jsp" />

View File

@ -1,8 +1,8 @@
<jsp:directive.include file="includes/top.jsp" /> <jsp:directive.include file="includes/top.jsp" />
<div id="msg" class="success"> <div id="msg" class="success">
<h2><spring:message code="screen.success.header" /></h2> <h2><spring:message code="screen.success.header" /></h2>
<p><spring:message code="screen.success.success" /></p> <p><spring:message code="screen.success.success" /></p>
<p><spring:message code="screen.success.security" /></p> <p><spring:message code="screen.success.security" /></p>
</div> </div>
<jsp:directive.include file="includes/bottom.jsp" /> <jsp:directive.include file="includes/bottom.jsp" />

View File

@ -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" %> <%@ page contentType="text/html; charset=UTF-8" %>
<jsp:directive.include file="includes/top.jsp" /> <jsp:directive.include file="includes/top.jsp" />
<form:form method="post" id="fm1" cssClass="fm-v clearfix" commandName="${commandName}" htmlEscape="true"> <form:form method="post" id="fm1" cssClass="fm-v clearfix" commandName="${commandName}" htmlEscape="true">
<form:errors path="*" cssClass="errors" id="status" element="div" /> <form:errors path="*" cssClass="errors" id="status" element="div" />
<div class="box fl-panel" id="login"> <div class="box fl-panel" id="login">
<!-- <spring:message code="screen.welcome.welcome" /> --> <h2>Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.</h2>
<h2>Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.</h2> <div class="row fl-controls-left">
<div class="row fl-controls-left"> <label for="username" class="fl-label">Benutzername</label>
<label for="username" class="fl-label">Benutzername</label> <c:if test="${not empty sessionScope.openIdLocalId}">
<c:if test="${not empty sessionScope.openIdLocalId}"> <strong>${sessionScope.openIdLocalId}</strong>
<strong>${sessionScope.openIdLocalId}</strong> <input type="hidden" id="username" name="username" value="${sessionScope.openIdLocalId}" />
<input type="hidden" id="username" name="username" value="${sessionScope.openIdLocalId}" /> </c:if>
</c:if> <c:if test="${empty sessionScope.openIdLocalId}">
<spring:message code="screen.welcome.label.netid.accesskey" var="userNameAccessKey" />
<c:if test="${empty sessionScope.openIdLocalId}"> <form:input cssClass="required" cssErrorClass="error" id="username" size="25" tabindex="1" accesskey="${userNameAccessKey}" path="username" htmlEscape="true" />
<spring:message code="screen.welcome.label.netid.accesskey" var="userNameAccessKey" /> </c:if>
<form:input cssClass="required" cssErrorClass="error" id="username" size="25" tabindex="1" accesskey="${userNameAccessKey}" path="username" autocomplete="false" htmlEscape="true" /> </div>
</c:if> <div class="row fl-controls-left">
</div> <label for="password" class="fl-label">Passwort</label>
<div class="row fl-controls-left"> <spring:message code="screen.welcome.label.password.accesskey" var="passwordAccessKey" />
<label for="password" class="fl-label">Passwort</label> <form:password cssClass="required" cssErrorClass="error" id="password" size="25" tabindex="2" path="password" accesskey="${passwordAccessKey}" htmlEscape="true" />
<%-- </div>
NOTE: Certain browsers will offer the option of caching passwords for a user. There is a non-standard attribute, <div class="row btn-row">
"autocomplete" that when set to "off" will tell certain browsers not to prompt to cache credentials. For more <input id="warn" name="warn" value="true" type="hidden" />
information, see the following web page: <input type="hidden" name="lt" value="${flowExecutionKey}" />
http://www.geocities.com/technofundo/tech/web/ie_autocomplete.html <input type="hidden" name="_eventId" value="submit" />
--%> <input class="btn-submit" name="submit" accesskey="l" value="<spring:message code="screen.welcome.button.login" />" tabindex="4" type="submit" />
<spring:message code="screen.welcome.label.password.accesskey" var="passwordAccessKey" /> <input class="btn-reset" name="reset" accesskey="c" value="<spring:message code="screen.welcome.button.clear" />" tabindex="5" type="reset" />
<form:password cssClass="required" cssErrorClass="error" id="password" size="25" tabindex="2" path="password" accesskey="${passwordAccessKey}" htmlEscape="true" autocomplete="off" /> </div>
</div> </div>
<div class="row check"> </form:form>
<input id="warn" name="warn" value="true" tabindex="3" accesskey="<spring:message code="screen.welcome.label.warn.accesskey" />" type="checkbox" checked="checked" /> <div id="sidebar">
<label for="warn"><spring:message code="screen.welcome.label.warn" /></label> </div>
</div>
<div class="row btn-row">
<input type="hidden" name="lt" value="${flowExecutionKey}" />
<input type="hidden" name="_eventId" value="submit" />
<input class="btn-submit" name="submit" accesskey="l" value="<spring:message code="screen.welcome.button.login" />" tabindex="4" type="submit" />
<input class="btn-reset" name="reset" accesskey="c" value="<spring:message code="screen.welcome.button.clear" />" tabindex="5" type="reset" />
</div>
</div>
</form:form>
<div id="sidebar">
</div>
<jsp:directive.include file="includes/bottom.jsp" /> <jsp:directive.include file="includes/bottom.jsp" />

View File

@ -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.
--%>
<jsp:directive.include file="includes/top.jsp" /> <jsp:directive.include file="includes/top.jsp" />
<div id="msg" class="success">
<div id="msg" class="success"> <h2><spring:message code="screen.logout.header" /></h2>
<h2><spring:message code="screen.logout.header" /></h2> <p><spring:message code="screen.logout.success" /></p>
<p><spring:message code="screen.logout.security" /></p>
<p><spring:message code="screen.logout.success" /></p> </div>
<p><spring:message code="screen.logout.security" /></p>
</div>
<jsp:directive.include file="includes/bottom.jsp" /> <jsp:directive.include file="includes/bottom.jsp" />

View File

@ -1,8 +1,7 @@
</div> </div>
<div id="footer" class="fl-panel fl-note fl-bevel-white fl-font-size-80"> <div id="footer">
<a href="https://www.hostsharing.net/impressum" title="Impressum">Impressum</a> <a href="https://www.hostsharing.net/impressum" title="Impressum">Impressum</a>
</div> </div>
</div>
</div> </div>
</body> </body>
</html> </html>

View File

@ -6,32 +6,18 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<spring:theme code="mobile.custom.css.file" var="mobileCss" text="" /> <html xmlns="http://www.w3.org/1999/xhtml" lang="de">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head> <head>
<title>Hostsharing - Central Authentication Service (CAS)</title> <title>Hostsharing - Central Authentication Service (CAS)</title>
<c:choose> <link type="text/css" rel="stylesheet" href="themes/hostsharing/cas.css" />
<c:when test="${not empty requestScope['isMobile'] and not empty mobileCss}"> <link rel="icon" href="themes/hostsharing/favicon.ico" type="image/x-icon" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" /> <script type="text/javascript" src="js/common_rosters.js"></script>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link type="text/css" rel="stylesheet" media="screen" href="<c:url value="/css/fss-framework-1.1.2.css" />" />
<link type="text/css" rel="stylesheet" href="<c:url value="/css/fss-mobile-${requestScope['browserType']}-layout.css" />" />
<link type="text/css" rel="stylesheet" href="${mobileCss}" />
</c:when>
<c:otherwise>
<link type="text/css" rel="stylesheet" href="<spring:theme code="standard.custom.css.file" />" />
<script type="text/javascript" src="js/common_rosters.js"></script>
</c:otherwise>
</c:choose>
<link rel="icon" href="<c:url value="/themes/hostsharing/favicon.ico" />" type="image/x-icon" />
</head> </head>
<body id="cas" onload="init();" class="fl-theme-iphone"> <body onload="init();">
<div class="flc-screenNavigator-view-container"> <div id="page">
<div class="fl-screenNavigator-view"> <div id="logo">
<div id="logo"> </div>
</div> <div id="header">
<div id="header" class="flc-screenNavigator-navbar fl-navbar fl-table"> <h1 id="app-name">Hostsharing - Central Authentication Service (CAS)</h1>
<h1 id="app-name" class="fl-table-cell">Hostsharing - Central Authentication Service (CAS)</h1> </div>
</div> <div id="content">
<div id="content" class="fl-screenNavigator-scroll-container">

View File

@ -2,13 +2,12 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<jsp:directive.include file="includes/top.jsp" /> <jsp:directive.include file="includes/top.jsp" />
<c:url var="url" value="/login"> <c:url var="url" value="/login">
<c:param name="service" value="${param.service}" /> <c:param name="service" value="${param.service}" />
<c:param name="renew" value="true" /> <c:param name="renew" value="true" />
</c:url> </c:url>
<div id="status" class="errors"> <div id="status" class="errors">
<h2><spring:message code="screen.service.sso.error.header" /></h2> <h2><spring:message code="screen.service.sso.error.header" /></h2>
<p><spring:message code="screen.service.sso.error.message" arguments="${url}" /></p> <p><spring:message code="screen.service.sso.error.message" arguments="${url}" /></p>
</div> </div>
<jsp:directive.include file="includes/bottom.jsp" /> <jsp:directive.include file="includes/bottom.jsp" />

View File

@ -1,6 +1,6 @@
<jsp:directive.include file="includes/top.jsp" /> <jsp:directive.include file="includes/top.jsp" />
<div id="status" class="errors"> <div id="status" class="errors">
<h2><spring:message code="screen.service.error.header" /></h2> <h2><spring:message code="screen.service.error.header" /></h2>
<p><spring:message code="screen.service.error.message" /></p> <p><spring:message code="screen.service.error.message" /></p>
</div> </div>
<jsp:directive.include file="includes/bottom.jsp" /> <jsp:directive.include file="includes/bottom.jsp" />

View File

@ -60,19 +60,8 @@ a img,#header img {
#header a:hover.task, #header a:focus.task {background-color:#c33 !important;} #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 { #logo {
margin:0 0 0 5%; margin:20px 0 0 5%;
padding:0; padding:0;
width:90%; width:90%;
height:100px; height:100px;
@ -156,7 +145,6 @@ html>body .clear:after {
} }
#content ul li { #content ul li {
background:url(../images/bullet_orange.gif) 0px 2px no-repeat scroll;
padding-left:20px; padding-left:20px;
margin-top:.5em; margin-top:.5em;
} }
@ -293,11 +281,8 @@ input.numeric {text-align:right;}
color:#ffc !important; color:#ffc !important;
font-weight:normal; font-weight:normal;
line-height:19px; 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 { fieldset {
border-top:solid 1px #ccc; border-top:solid 1px #ccc;
border-bottom:0; 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 {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 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 {font-size:11px;}
#login label span.accesskey {text-decoration:underline;} #login label span.accesskey {text-decoration:underline;}
@ -368,10 +348,7 @@ table .appHeadingRow th {
/* MESSAGES --------------------------------- */ /* MESSAGES --------------------------------- */
.info, .errors, .success {clear:both; margin:18px 0; padding:20px 20px 20px 100px; font-size:10px; line-height:1.5;} .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;} #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;}
.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 .success h2 {color: #008 !important;} #content .success h2 {color: #008 !important;}
#content .errors h2 {color:#b00 !important;} #content .errors h2 {color:#b00 !important;}
#content .success h2 {color:#060 !important;} #content .success h2 {color:#060 !important;}