diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties index c9e2c93e..d4e3f103 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -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 diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index f05930cc..f0f57ecf 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -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; -} \ No newline at end of file +} + +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; +} + diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index 075fd1c9..954fbf1c 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -3,78 +3,49 @@ <%@ include file="/jsp/init.jsp" %>