From 65e962586753af5c50c8564356e735b6823dbc3e Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 19 May 2012 01:58:37 -0300 Subject: [PATCH] Migrate regitration forms to bootstrap --- .../WEB-INF/classes/messages.properties | 4 +- .../src/main/webapp/css/pageTemplate.css | 22 +-- wise-webapp/src/main/webapp/jsp/footer.jsp | 2 +- .../src/main/webapp/jsp/forgotPassword.jsp | 49 ++---- wise-webapp/src/main/webapp/jsp/login.jsp | 25 +-- .../src/main/webapp/jsp/userRegistration.jsp | 158 ++++++------------ 6 files changed, 86 insertions(+), 174 deletions(-) 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 d4e3f103..249db319 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -83,7 +83,7 @@ KEYBOARD_MSG=These are the keyboard shortcuts you can use in the editor! FIRST_STEPS=Editor First Steps FIRST_STEPS_MSG=Make these first steps in 2 minutes, and start running in 5! HOME=Home -LOGIN_ERROR=The email address or password you provided does not match our records. +LOGIN_ERROR=The email address or password you entered is incorrect. USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!. CREW=The Crew ALREADY_A_MEMBER=Already a member? @@ -100,7 +100,7 @@ PASSWORD_MISSMATCH=Your password entries did not match TYPE_CHARACTER_BELOW=Type the characters you see in the picture below. WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy. -REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.
Registration is Free and takes just a moment. +REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.Registration is Free and takes just a moment. CAPTCHA_ERROR=Enter the letters as they are shown in the image above. DETAIL_INFORMATION=Detail Information CREATOR=Creator diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index f0f57ecf..aa6023a7 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -32,23 +32,12 @@ div#mainBody { div#login { float: right; - width: 250px; + width: 300px; } -#forgotPasswordContainer { - width: 500px; - padding: 10px; -} - -/* This is used to fix IE explorer bug rendering rounded corners*/ div#loginContent { width: 100%; - min-height: 250px; -} - - -div#userRegistration { - padding: 10px; + min-height: 340px; } div#register { @@ -219,10 +208,15 @@ div.installCFG h2 { div.fform { background: #eeeeee; border: 1px solid #cfcfcf; - padding: 5px 20px; + padding: 5px 25px; -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; + +} + +div.fform label { + font-weight: bold; } diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index 2f8a896d..5ef15ec4 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -2,7 +2,7 @@