Commits

Paola Morales  committed 634ff1d Merge

Merge branch 'development' of github.com:encuestame/encuestame into dianmorales

  • Participants
  • Parent commits 1fa060d, 2103272

Comments (0)

Files changed (16)

File encuestame-war/src/main/webapp/WEB-INF/messages/messages_en_US.properties

 signin.signup = You need account?
 signin.social.message = Do you already have an account on one of these sites? Click the logo to log in with it here:
 
+signup.social.signup = Are already have social account? Sign up easily !
+signup.title = Sign Up on Encuestame
+signup.username = Username
+signup.email = Email
+signup.complete = Complete name
+signup.password = A new password
+signup.button = Sign Up now
 
 forgot.username = Please instroduce your email or username
 forgot.submit = Rescover my password

File encuestame-war/src/main/webapp/WEB-INF/messages/messages_es_ES.properties

 signin.signup = Necesitas una cuenta?
 signin.social.message = Ya tienes cuenta en alguno de estos sitios? Clickea en el logo e inicia sesión con ella.
 
+signup.social.signup = Ya dispones de una cuenta en redes sociales? Registrate facilmente!
+signup.title = Regístrate en
+signup.username = Nombre de usuario
+signup.email = Correo Electronico
+signup.complete = Tu nombre real
+signup.password = Escribe una gran contraseña
+signup.button = Crear mi cuenta
+
 forgot.username = Escriba su nombre de usuario o correo electrónico
 forgot.submit = Recuperar mi contraseña
 

File encuestame-war/src/main/webapp/WEB-INF/views/user/web/signin.jsp

                      <a href="<c:url value="/user/signup" />">
                        <spring:message code="signin.error.signup" /> <spring:message code="signin.error.free" />
                      </a>
-
                 </div>
             </c:if>
         </div>
             <label class="section-wrapper" for="j_username">
                  <spring:message code="signin.username" />:
              </label>
-            <div class="login-section-wrapper">
+            <div class="input-design">
                 <fieldset>
                     <input type="text" name="j_username" id="j_username" />
                  </fieldset>
             <label class="section-wrapper" for="j_password">
                 <spring:message code="signin.password" />:
              </label>
-            <div class="login-section-wrapper">
+            <div class="input-design">
                 <fieldset>
                     <input type="password" name="j_password" id="j_password" />
                 </fieldset>

File encuestame-war/src/main/webapp/WEB-INF/views/user/web/signup.jsp

 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <div id="web-signup-wrapper" class="enme-auto-center">
     <div class="web-form-wrapper" id="web-form-wrapper">
-            <div class="leftMessage">
-            </div>
             <form method="POST" id="signupForm"
                 dojoType="dijit.form.Form"
                 jsId="signupForm"
                 action="<%=request.getContextPath()%>/user/signup/create"
                 class="signup-form defaultForm"
                 autocomplete="off">
-                <div dojoType="encuestame.org.core.commons.panel.PanelBar"></div>
                     <div class="section-signup" title="Sign Up with Username" collapsed="false">
-                        <div style="text-align: center;">
+                        <div class="web-form-singup-container">
+                        <h1>
+                            <spring:message code="signup.title" />
+                        </h1>
                         <fieldset class="textbox">
                             <div class="section name">
-                                <div id="rm" dojoType="encuestame.org.core.commons.validator.RealNameValidator" enviroment="ext"></div>
+                                <div id="rm"
+                                    dojoType="encuestame.org.core.commons.validator.RealNameValidator"
+                                    placeholder="<spring:message code="signup.complete" />"
+                                    enviroment="ext"></div>
                             </div>
                             <div class="section password">
-                                 <div id="pssw" dojoType="encuestame.org.core.commons.validator.PasswordValidator" enviroment="ext"></div>
+                                 <div id="pssw"
+                                      dojoType="encuestame.org.core.commons.validator.PasswordValidator"
+                                      placeholder="<spring:message code="signup.password" />"
+                                      enviroment="ext"></div>
                             </div>
                             <div class="section email">
-                                <div id="em" dojoType="encuestame.org.core.commons.validator.EmailValidator" enviroment="ext"></div>
+                                <div id="em"
+                                     dojoType="encuestame.org.core.commons.validator.EmailValidator"
+                                     placeholder="<spring:message code="signup.email" />"
+                                     enviroment="ext"></div>
                             </div>
                              <div class="section username">
-                                <div id="usrva" dojoType="encuestame.org.core.commons.validator.UsernameValidator" enviroment="ext"></div>
+                                <div id="usrva"
+                                     dojoType="encuestame.org.core.commons.validator.UsernameValidator"
+                                     placeholder="<spring:message code="signup.username" />"
+                                     enviroment="ext"></div>
                             </div>
                             <input type="hidden" name="context" value="front">
                         </fieldset>
                         <fieldset>
                             <div class="center">
-                                <div dojoType="encuestame.org.core.commons.signup.Signup"></div>
+                                <div dojoType="encuestame.org.core.commons.signup.Signup"
+                                     value="<spring:message code="signup.button" />"></div>
                             </div>
                             <div>
                                 <input type="hidden" value="1">
                     </div>
                     <div class="section-signup" title="Sign up with your favourite social network" collapsed="false">
                             <div class="web-social-signin">
-                                <h2>Select one of these thrid-party accouns to sign in</h2>
+                                <h3>
+                                   <spring:message code="signup.social.signup" />
+                                </h3>
                                 <%@ include file="/WEB-INF/jsp/includes/web/social.jsp" %>
                               </div>
                     </div>
             <div class="standby">
-                <div id="standby" dojoType="encuestame.org.core.shared.utils.StandBy" target="web-form-wrapper"></div>
+                <div id="standby" dojoType="encuestame.org.core.shared.utils.StandBy" target="mainWrapper"></div>
             </div>
             </form>
     </div>

File encuestame-war/src/main/webapp/resource/css/common.css

     -webkit-box-shadow: 0px 0px 2px rgba(0,0,0,0.5);
 }
 
+.input-design {
+    background: -moz-linear-gradient(center top, #F0F0F2, #FFFFFF) repeat
+        scroll 0 0 transparent;
+    border: 1px solid #CCCCCC;
+    border-radius: 7px 7px 7px 7px;
+    box-shadow: 0 1px #FFFFFF;
+    display: block;
+    height: 27px;
+    line-height: 27px;
+    margin-top: 6px;
+    position: relative;
+    width: 100%;
+}
+
+.input-design fieldset {
+    left: 10px;
+    position: absolute;
+    right: 10px;
+}
+
+.input-design fieldset input {
+    background: none repeat scroll 0 0 transparent;
+    border: 0 none;
+    color: #7E7E7E;
+    font-size: 13px;
+    font-weight: inherit;
+    height: 19px;
+    line-height: 19px;
+    position: relative;
+    width: 100%;
+}
+
 .btn-default:hover {
     text-shadow: 1px 1px 1px rgba(0,0,0,0.5);
     cursor:pointer;

File encuestame-war/src/main/webapp/resource/css/web/default.css

     margin-bottom: 3px;
 }
 
-.defaultForm input {
-  border: 1px solid #CCCCCC;
-  -webkit-border-radius:  4px 4px 4px 4px;
-  -moz-border-radius:  4px 4px 4px 4px;
-  border-radius:  4px 4px 4px 4px;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset, 0 1px 0 rgba(255, 255, 255, 0.2);
-  outline: 0 none;
-  padding: 8px 6px;
-  width: 382px;
-  -moz-box-shadow: 0px 0px 1px #CFCFCF;
-  -webkit-box-shadow: 0x 0px 1px #CFCFCF;
-  box-shadow: 0px 0px 1px #CFCFCF;
-}
-
 .defaultForm button.button {
   background-color: #258E24;
   border: 1px solid #CCCCCC;
   font-weight: bold;
   outline: 0 none;
   padding: 8px 6px;
-  width: 395px;
+  width: 170px;
 }
 
 .success-message{

File encuestame-war/src/main/webapp/resource/css/web/public.css

 
 /** sign up **/
 #web-signup-wrapper {
-    margin: 5em auto;
+    margin: 5em 10em;
     width: 100%;
     z-index: 1;
 }
 
+#web-signup-wrapper .web-form-singup-container {
+    width: 300px;
+}
+
+#web-signup-wrapper h1{
+    font-size: 18px;
+    margin-bottom: 10px;
+}
+
 #web-signup-wrapper,#page-container {
 
 }
     width: 90px;
 }
 
+#web-signup-wrapper .section-signup{
+    margin-top: 20px;
+}
+
+#web-signup-wrapper h3{
+    color: #919090;
+    margin: 0;
+    margin-bottom: 5px;
+}
+
 #web-signup-wrapper div.web-form-wrapper {
 
 }
 }
 
 #web-signup-wrapper div.sidetip {
-    left: 540px;
+    left: 310px;
     position: absolute;
-    width: 149px;
+    width: 100%;
 }
 
 #web-signup-wrapper .section div.tooltip {
 }
 
 #web-login-container .section-wrapper label {
-    font-size: 12px;
-    left: 8px;
+  color: #919090;
+  font-size: 10px;
+  left: 8px;
 }
 
 .section-shadow-wrapper {
   left: 342px;
   position: relative;
   top: -20px;
+  font-size: 10px;
 }
 
 #web-login-container .signup {
   position: relative;
   text-align: left;
   top: -19px;
+  font-size: 10px;
 }
 
 .login-section-wrapper fieldset input {

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/AbstractValidatorWidget.js

     isValid : false,
     inputTextValue : "",
     toolTip : true,
+    placeholder:"",
     postCreate : function(){
         this.inherited(arguments);
         if (this.focusDefault) {
                 this._validate(event);
             }));
         }
-        dojo.connect(this._input, "onkeydown", dojo.hitch(this, function(event) {
-            this._evaluateShadowMessage(event);
-        }));
-        if(this.toolTip){
-            dojo.connect(this._input, "onfocus", dojo.hitch(this, function(event) {
-                this._showToolTip();
-            }));
-            dojo.connect(this._input, "onblur", dojo.hitch(this, function(event) {
-                this._hideToolTip();
-            }));
-        }
     },
 
     getServiceUrl : function(){

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/EmailValidator.js

         [encuestame.org.core.commons.validator.AbstractValidatorWidget], {
     templatePath : dojo.moduleUrl("encuestame.org.core.commons.validator", "templates/emailValidator.html"),
     widgetsInTemplate : true,
+
+    placeholder : "Write your email",
+
     postCreate : function(){
         this.inherited(arguments);
     },

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/PasswordValidator.js

     templatePath : dojo.moduleUrl("encuestame.org.core.commons.validator", "templates/passwordValidator.html"),
     widgetsInTemplate : true,
     noEvents : true,
+    placeholder : "Write your password",
     exclude : encuestame.constants.passwordExcludes,
     toolTip : false,
     postCreate : function(){

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/RealNameValidator.js

 dojo.declare("encuestame.org.core.commons.validator.RealNameValidator",
         [encuestame.org.core.commons.validator.AbstractValidatorWidget], {
     templatePath : dojo.moduleUrl("encuestame.org.core.commons.validator", "templates/realNameValidator.html"),
+
     widgetsInTemplate : true,
+
     focusDefault: true,
+
+    placeholder : "Write your Real Name",
+
     postCreate : function(){
         this.inherited(arguments);
     },

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/UsernameValidator.js

 dojo.declare("encuestame.org.core.commons.validator.UsernameValidator",
         [encuestame.org.core.commons.validator.AbstractValidatorWidget], {
     templatePath : dojo.moduleUrl("encuestame.org.core.commons.validator", "templates/usernameValidator.html"),
+
     widgetsInTemplate : true,
+
+    placeholder : "Write your username",
+
     postCreate : function(){
         this.inherited(arguments);
     },

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/templates/emailValidator.html

             email account please check in all your mailbox SPAM folder.
         </p>
      </div>
-        <input id="input_${id}" type="text"  autocomplete="off" name="email" class="" dojoAttachPoint="_input">
-        <span  class="shadow-input-message" dojoAttachPoint="_shadow"  >Email</span>
+     <div class="input-design">
+        <fieldset>
+            <input id="input_${id}" placeholder="${placeholder}"  type="text"  autocomplete="off" name="email" dojoAttachPoint="_input">
+        </fieldset>
+     </div>
     </div>
 </div>

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/templates/passwordValidator.html

     <div class="validator-wrapper">
         <div class="sidetip" id="_message_${id}">
         </div>
-        <input id="input_${id}" name="password" type="password" value="" class="" dojoAttachPoint="_input" autocomplete="false">
-            <span class="shadow-input-message" dojoAttachPoint="_shadow" >Password</span>
+    <div class="input-design">
+        <fieldset>
+        <input id="input_${id}" placeholder="${placeholder}"  name="password" type="password" value="" class="" dojoAttachPoint="_input" autocomplete="false">
+       </fieldset>
+   </div>
     </div>
     <div class="tooltip" dojoAttachPoint="_tooltip" id="_tooltip_${id}">
         <p>

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/templates/realNameValidator.html

 <div class="validator-wrapper">
     <div class="sidetip" id="_message_${id}">
     </div>
-    <input id="input_${id}" type="text" autocomplete="off" name="realName"
-           maxlength="20" aria-required="true"  dojoAttachPoint="_input" autocomplete="false">
-        <span class="shadow-input-message" dojoAttachPoint="_shadow" >Full name</span>
+    <div class="input-design">
+        <fieldset>
+        <input id="input_${id}" type="text"
+               autocomplete="off" name="realName"
+               maxlength="20" aria-required="true"
+               placeholder="${placeholder}"
+               dojoAttachPoint="_input"
+               autocomplete="false">
+            </fieldset>
+     </div>
      <div class="tooltip" dojoAttachPoint="_tooltip" id="_tooltip_${id}">
         <p>
             <h1>Full Name</h1>

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/validator/templates/usernameValidator.html

     <div class="validator-wrapper">
         <div class="sidetip" id="_message_${id}">
         </div>
-        <input id="input_${id}" type="text" autocomplete="off"  maxlength="15"
-               class=""
-               name="username"
-               dojoAttachPoint="_input">
-        <span class="shadow-input-message" dojoAttachPoint="_shadow" >Username</span>
+        <div class="input-design">
+             <fieldset>
+                <input id="input_${id}" placeholder="${placeholder}"
+                       type="text"
+                       autocomplete="off"
+                       maxlength="15"
+                       class=""
+                       name="username"
+                       dojoAttachPoint="_input">
+             </fieldset>
+        </div>
     </div>
     <div class="tooltip" dojoAttachPoint="_tooltip" id="_tooltip_${id}">
         <p>