fixed some wrong id attributes

diff --git a/views/changepasswd.jade b/views/changepasswd.jade
index fac6e99631984ac281d49bb39663d6be06605848..031e04a68a325b359a6a8021a46f5762b5bed9a9 100644 (file)
--- a/views/changepasswd.jade
+++ b/views/changepasswd.jade
@@ -35,30 +35,30 @@ block sections
                                 .control-group
                                     label.control-label(for="oldpassword") Old password
                                     .controls
-                                        input#username(type="password", name="oldpassword",
+                                        input#oldpassword(type="password", name="oldpassword",
                                             placeholder="enter your current password...")
                             - if (errors.newpassword)
                                 .control-group.error
                                     label.control-label(for="newpassword") New password
                                     .controls
-                                        input#password(type="password", name="newpassword")
+                                        input#newpassword(type="password", name="newpassword")
                                         span.help-inline #{errors.newpassword}
                             - else
                                 .control-group
                                     label.control-label(for="newpassword") New password
                                     .controls
-                                        input#password(type="password", name="newpassword",
+                                        input#newpassword(type="password", name="newpassword",
                                             placeholder="enter your new password...")
                         - else
                             .control-group
                                 label.control-label(for="oldpassword") Old password
                                 .controls
-                                    input#username(type="password", name="oldpassword",
+                                    input#oldpassword(type="password", name="oldpassword",
                                         placeholder="enter your current password...")
                             .control-group
                                 label.control-label(for="password") New password
                                 .controls
-                                    input#password(type="password", name="newpassword",
+                                    input#newpassword(type="password", name="newpassword",
                                         placeholder="enter your new password...")
                         button.submit-button.btn.btn-primary(type="submit")
                             i.icon-edit.icon-white

diff --git a/views/login.jade b/views/login.jade
index ea3184fe1e91714f1aa516517daecd9fb415c4ad..382df575e7ff491a1d3604e65d9a2bdc62c7b4df 100644 (file)
--- a/views/login.jade
+++ b/views/login.jade
@@ -37,14 +37,14 @@ block sections
                                     label.control-label(for="username") Name
                                     .controls
                                         input#username(type="text", name="username",
-                                            value=oldvalues.username)
+                                            maxlength="15", value=oldvalues.username)
                                         span.help-inline #{errors.username}
                             - else
                                 .control-group
                                     label.control-label(for="username") Name
                                     .controls
                                         input#username(type="text", name="username",
-                                            value=oldvalues.username)
+                                            maxlength="15", value=oldvalues.username)
                             - if (errors.password)
                                 .control-group.error
                                     label.control-label(for="password") Password
@@ -62,7 +62,7 @@ block sections
                                 label.control-label(for="username") Name
                                 .controls
                                     input#username(type="text", name="username",
-                                        placeholder="enter your nickname...")
+                                        maxlength="15", placeholder="enter your nickname...")
                             .control-group
                                 label.control-label(for="password") Password
                                 .controls

diff --git a/views/recoverpasswd.jade b/views/recoverpasswd.jade
index d52343bf264840465afaa7d58579cd7649faa519..c83ab09250cb5444ac4c0ade501180c2c095992e 100644 (file)
--- a/views/recoverpasswd.jade
+++ b/views/recoverpasswd.jade
@@ -37,21 +37,22 @@ block sections
                                     .control-group.error
                                         label.control-label(for="email") Email
                                         .controls
-                                            input#oldpassword(type="text", name="email",
+                                            input#email(type="text", name="email",
                                                 value=oldvalues.email)
                                             span.help-inline #{errors.email}
                                 - else
                                     .control-group
                                         label.control-label(for="email") Email
                                         .controls
-                                            input#username(type="text", name="email",
+                                            input#email(type="text", name="email",
                                                 value=oldvalues.email)
                                 - if (errors.captcha)
                                     .control-group.error
                                         label.control-label(for="captcha-input") Are you human?
                                         .controls
                                             img#captcha(src=captchaurl)
-                                            input#captcha-input(type="text", name="captcha")
+                                            input#captcha-input(type="text", name="captcha",
+                                                maxlength="4")
                                             span.help-inline #{errors.captcha}
                                 - else
                                     .control-group
@@ -59,7 +60,7 @@ block sections
                                         .controls
                                             img#captcha(src=captchaurl)
                                             input#captcha-input(type="text", name="captcha",
-                                                placeholder="type what you see...")
+                                                maxlength="4", placeholder="type what you see...")
                             - else
                                 .control-group
                                     label.control-label(for="email") Email
@@ -71,7 +72,7 @@ block sections
                                     .controls
                                         img#captcha(src=captchaurl)
                                         input#captcha-input(type="text", name="captcha",
-                                            placeholder="type what you see...")
+                                            maxlength="4", placeholder="type what you see...")
                             button.submit-button.btn.btn-primary(type="submit")
                                 i.icon-envelope.icon-white
                                 |  Send password reset link

diff --git a/views/resetpasswd.jade b/views/resetpasswd.jade
index 2aec8063ebfc10e0751c66a4e55db533bbe249a2..cee041e9f1361ce4137da55bc2115acd1e54707f 100644 (file)
--- a/views/resetpasswd.jade
+++ b/views/resetpasswd.jade
@@ -18,24 +18,17 @@ block sections
                         |  #{errors.alert}
                 form.form-horizontal.well(method="post", action="/resetpasswd?token=#{token}")
                     fieldset
-                        - if (locals.errors)
-                            - if (errors.password)
-                                .control-group.error
-                                    label.control-label(for="password") New password
-                                    .controls
-                                        input#oldpassword(type="password", name="password")
-                                        span.help-inline #{errors.password}
-                            - else
-                                .control-group
-                                    label.control-label(for="password") New password
-                                    .controls
-                                        input#username(type="password", name="password",
-                                            placeholder="enter your new password...")
+                        - if (locals.errors && errors.password)
+                            .control-group.error
+                                label.control-label(for="password") New password
+                                .controls
+                                    input#password(type="password", name="password")
+                                    span.help-inline #{errors.password}
                         - else
                             .control-group
-                                label.control-label(for="oldpassword") New password
+                                label.control-label(for="password") New password
                                 .controls
-                                    input#username(type="password", name="password",
+                                    input#password(type="password", name="password",
                                         placeholder="enter your new password...")
                         button.submit-button.btn.btn-primary(type="submit")
                             i.icon-edit.icon-white

diff --git a/views/signup.jade b/views/signup.jade
index 1e58dcecaec01670594f20b4f16f8ec07f6ae522..ee10d0c5f271a032f744b369692fbe92f2945aa5 100644 (file)
--- a/views/signup.jade
+++ b/views/signup.jade
@@ -39,14 +39,14 @@ block sections
                                     label.control-label(for="username") Name
                                     .controls
                                         input#username(type="text", name="username",
-                                            value=oldvalues.username)
+                                            maxlength="15", value=oldvalues.username)
                                         span.help-inline #{errors.username}
                             - else
                                 .control-group
                                     label.control-label(for="username") Name
                                     .controls
                                         input#username(type="text", name="username",
-                                            value=oldvalues.username)
+                                            maxlength="15", value=oldvalues.username)
                             - if (errors.email)
                                 .control-group.error
                                     label.control-label(for="email") Email
@@ -77,7 +77,8 @@ block sections
                                     label.control-label(for="captcha-input") Are you human?
                                     .controls
                                         img#captcha(src=captchaurl)
-                                        input#captcha-input(type="text", name="captcha")
+                                        input#captcha-input(type="text", name="captcha",
+                                            maxlength="4")
                                         span.help-inline #{errors.captcha}
                             - else
                                 .control-group
@@ -85,13 +86,13 @@ block sections
                                     .controls
                                         img#captcha(src=captchaurl)
                                         input#captcha-input(type="text", name="captcha",
-                                            placeholder="type what you see...")
+                                            maxlength="4", placeholder="type what you see...")
                         - else
                             .control-group
                                 label.control-label(for="username") Name
                                 .controls
                                     input#username(type="text", name="username",
-                                        placeholder="enter a nickname...")
+                                        maxlength="15", placeholder="enter a nickname...")
                             .control-group
                                 label.control-label(for="email") Email
                                 .controls
@@ -107,7 +108,7 @@ block sections
                                 .controls
                                     img#captcha(src=captchaurl)
                                     input#captcha-input(type="text", name="captcha",
-                                        placeholder="type what you see...")
+                                        maxlength="4", placeholder="type what you see...")
                         button.submit-button.btn.btn-success(type="submit")
                             i.icon-user.icon-white
                             |  Sign up!