vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 06:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean login ...

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-05-19 01:19:55 -03:00
parent 6a6efd58f4
commit 95d02a4d25
5 changed files with 58 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
View File

@ -15,7 +15,7 @@ CANCEL=Cancel
SUBMIT=Submit
FIRSTNAME=Firstname
LASTNAME=Lastname
EMAIL=E-mail
EMAIL=Email
HELP=Help
LOGOUT=Logout
PASSWORD=Password
@ -23,7 +23,7 @@ MY_WISEMAPS=My Wisemaps
SAVE_AND_CLOSE=Save and Close
RETYPE_PASSWORD=Retype Password
REGISTER=Register
REMEMBER_ME=Remember me on this computer
REMEMBER_ME=Stay signed in
SIGN_IN=Sign In
SIGN_UP=Sign Up
SETTINGS=Settings

107
wise-webapp/src/main/webapp/css/pageTemplate.css
View File

@ -1,4 +1,6 @@
@import "../bootstrap/css/bootstrap.min.css";
@import "../bootstrap/css/bootstrap-responsive.min.css";
@import "pageHeaders.css";
/* INTRO STYLES */
@ -13,7 +15,7 @@
#loginContent .loginNews {
float: left;
width: 400px;
width: 300px;
}
#joinContent {
@ -24,14 +26,13 @@
div#mainBody {
margin: 10px auto;
width: 800px; /*margin-bottom: 100px; *//* height brokes all the tables on IE*/
width: 900px; /*margin-bottom: 100px; *//* height brokes all the tables on IE*/
height: 300px;
}
div#login {
float: right;
width: 350px;
padding: 10px;
width: 250px;
}
#forgotPasswordContainer {
@ -45,24 +46,6 @@ div#loginContent {
min-height: 250px;
}
div#loginContent td, div#userRegistrationContent td, div#forgotPasswordContent td {
padding: 3px;
}
div#login h1, div#forgotPasswordContainer h1, div#userRegistration h1 {
color: gray;
font-size: 200%;
margin-bottom: 10px;
font-weight: normal;
}
div#forgotPasswordContainer h2, div#userRegistration h2 {
color: black;
margin-bottom: 5px;
font-size: 110%;
border: none;
font-weight: normal;
}
div#userRegistration {
padding: 10px;
@ -146,57 +129,6 @@ div.pageBodyContent ol li {
list-style-type: decimal;
}
#login.sb, #userRegistration.sb, #forgotPasswordContainer.sb {
background: #eeeeee;
border: 1px solid #cfcfcf;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 8px;
}
#detailContent.sb {
background: #C3DEF5;
border: 1px solid #A7C6DF;
-moz-border-radius: 16px;
-khtml-border-radius: 16px;
-webkit-border-radius: 16px;
border-radius: 16px;
}
#detail.sb {
background: white;
border: 1px solid #E5E5E5;
-moz-border-radius: 16px;
-khtml-border-radius: 16px;
-webkit-border-radius: 16px;
border-radius: 16px;
}
#userRegistration.sb {
background: #eeeeee;
border: 1px solid #cfcfcf;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 16px;
}
#importContainer table {
background: #eeeeee;
border: 1px solid #cfcfcf;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 16px;
}
.errorMsg {
color: #990000;
font-size: 90%;
font-weight: bold;
padding-left: 5px;
}
div.pageBody {
margin: 10px auto;
@ -210,7 +142,7 @@ div.pageBodyContent {
div.pageBodyContent h1 {
color: #093A9D;
font-size: 200%;
font-size: 150%;
margin-bottom: 5px;
font-weight: bold;
}
@ -262,20 +194,6 @@ div.pageBodyContent li {
border: 1px dotted gray;
}
td.formLabel {
text-align: right;
padding: 2px 10px;
white-space: nowrap;
font-weight: bolder;
vertical-align: top;
}
span.fieldRequired {
font-weight: bold;
color: #ff4500;
margin: 0 4px;
}
div.installCFG {
width: 100%;
font-size: 130%;
@ -296,4 +214,15 @@ div.installCFG h2 {
left: 0;
top: 0;
margin: 0;
}
}
div.fform {
background: #eeeeee;
border: 1px solid #cfcfcf;
padding: 5px 20px;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 8px;
}

89
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@ -3,78 +3,49 @@
<%@ include file="/jsp/init.jsp" %>
<div id="loginContent">
<div class="sb loginNews">
<div class="loginNews">
<h1>What is New: </h1>
<ul>
<li>Links Between Nodes</li>
<li>FreeMind 0.9 Update</li>
<li>Improved HTML 5.0 Support</li>
<li>Firefox 6.0 is officially supported</li>
<li>Firefox 12 officially supported</li>
</ul>
</div>
<div id="login" class="sb">
<div id="login" class="fform">
<h1>
<spring:message code="SIGN_IN"/>
</h1>
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST">
<table>
<tbody>
<c:if test="${not empty param.login_error}">
<tr>
<td>
&nbsp;
</td>
<td class="errorMsg">
<c:choose>
<c:when test="${param.login_error == 3}">
<spring:message code="USER_INACTIVE"/>
</c:when>
<c:otherwise>
<spring:message code="LOGIN_ERROR"/>
</c:otherwise>
</c:choose>
</td>
</tr>
</c:if>
<tr>
<td class="formLabel">
<label for="email"><spring:message code="EMAIL"/>:</label>
</td>
<td>
<input type='text' tabindex="1" id="email" name='j_username'/>
</td>
</tr>
<tr>
<td class="formLabel">
<label for="password"><spring:message code="PASSWORD"/>:</label>
</td>
<td>
<input type='password' tabindex="2" id="password" name='j_password'/>
</td>
</tr>
<tr>
<td class="formLabel">
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
</td>
<td>
<label for="rememberme"><spring:message code="REMEMBER_ME"/>:</label>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input type="submit" class="btn btn-primary" id="submitButton"
value="<spring:message code="SIGN_IN"/>">
<c:if test="${not empty param.login_error}">
<c:choose>
<c:when test="${param.login_error == 3}">
<spring:message code="USER_INACTIVE"/>
</c:when>
<c:otherwise>
<spring:message code="LOGIN_ERROR"/>
</c:otherwise>
</c:choose>
</c:if>
<div style="text-align:right;"><a href="<c:url value="/c/forgotPassword.htm"/>">
<spring:message code="FORGOT_PASSWORD"/>
</a></div>
</td>
</tr>
</tbody>
</table>
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST">
<fieldset>
<label for="email">
<spring:message code="EMAIL"/>
<input type='email' tabindex="1" id="email" name='j_username' required="required"/>
<label for="password"><spring:message code="PASSWORD"/></label>
<input type='password' tabindex="2" id="password" name='j_password' required="required"/>
<div class="form-inline">
<input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>" data-toggle="button">&nbsp;&nbsp;&nbsp;
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
<label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
</div>
</fieldset>
</form>
<a href="<c:url value="/c/forgotPassword.htm"/>"><spring:message code="FORGOT_PASSWORD"/></a>
</div>
</div>

6
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -338,7 +338,7 @@
<fieldset>
<div class="control-group">
<label for="title" class="control-label"><spring:message code="NAME"/>: </label>
<input name="title" id="title" type="text" required="true" class="control"/>
<input name="title" id="title" type="text" required="required" class="control"/>
</div>
<div class="control-group">
<label for="description" class="control-label"><spring:message
@ -350,7 +350,7 @@
</form>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept">Duplicate</button>
<button class="btn btn-primary btn-accept" data-loading-text="Duplicating ...">Duplicate</button>
<button class="btn btn-cancel">Close</button>
</div>
</div>
@ -367,7 +367,7 @@
<fieldset>
<div class="control-group">
<label for="renTitle" class="control-label"><spring:message code="NAME"/>: </label>
<input name="title" id="renTitle" class="control" required="true"/>
<input name="title" id="renTitle" class="control" required="required"/>
</div>
<div class="control-group">
<label for="renDescription" class="control-label"><spring:message

5
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@ -22,8 +22,13 @@
</title>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="css/pageTemplate.css"/>
<link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
</head>
<body>