modified login/register/passwd change&reset ui; modified checkbox ui

media/css/seahub.css

@@ -547,8 +547,8 @@ textarea:-moz-placeholder {/* for FF */
 .checkbox {
     display:inline-block;
     background: url('../img/checkbox.png');
-    width:16px;
-    height:16px;
+    width:15px;
+    height:15px;
     margin-right:4px;
     position:relative;
 }
@@ -626,6 +626,32 @@ textarea:-moz-placeholder {/* for FF */
     font-size: 11px;
     margin: 2px 0 5px;
 }
+/**** new narrow panel  ****/
+.new-narrow-panel {
+    width:388px;
+    border-style:solid;
+    border-width:1px;
+    border-color:#f5f5f5 #d5d5d5 #a7a7a7;
+    border-radius:4px;
+    box-shadow:0 3px 2px #f5f5f5;
+    margin:5em auto;
+}
+.new-narrow-panel .hd {
+    color:#fff;
+    font-size:16px;
+    padding:5px 20px;
+    background:#feab79;
+    border-bottom:1px solid #c79d85;
+}
+.new-narrow-panel .con {
+    /*padding:30px 60px 75px;*/
+    padding:30px 60px 60px;
+}
+.new-narrow-panel .input {
+    border-color:#c7c7c7;
+    box-shadow:inset 0 1px 1px #f1f1f1;
+    margin:5px 0 20px;
+}
 /**** wide panel ****/ /* e.g. repo decrypt page */
 .wide-panel {
     width: 928px;
@@ -1198,10 +1224,6 @@ textarea:-moz-placeholder {/* for FF */
 
 /*** for separate pages ***/
 /* login */
-.login-form a {
-    font-size:12px;
-    vertical-align:middle;
-}
 .captcha {
     float:right;
 }
@@ -1367,7 +1389,7 @@ textarea:-moz-placeholder {/* for FF */
     margin-bottom:0.7em;
 }
 #user-basic-info label {
-    width:5.5em;
+    width:5.6em;
     margin-right:1em;
 }
 .ru #user-basic-info label {

seahub/base/accounts.py

@@ -384,7 +384,7 @@ class RegistrationForm(forms.Form):
     Validates that the requested email is not already in use, and
     requires the password to be entered twice to catch typos.    
     """
-    attrs_dict = { 'class': 'required' }
+    attrs_dict = { 'class': 'input' }
 
     email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict,
                                                                maxlength=75)),

seahub/templates/registration/login.html

@@ -28,14 +28,14 @@
 {% endblock %}
 
 {% block main_panel %}
-<div class="narrow-panel">
-<h2>{% trans "Log In" %}</h2>
-<form action="" method="post" class="login-form">{% csrf_token %}
+<div class="new-narrow-panel">
+<h2 class="hd">{% trans "Log In" %}</h2>
+<form action="" method="post" class="con">{% csrf_token %}
     <label for="username">{% trans "Email" %}</label>
-	<input type="text" name="username" value="" />
+	<input type="text" name="username" value="" class="input" />
 	<label for="password">{% trans "Password" %}</label>
 	<a href="{{ SITE_ROOT }}accounts/password/reset/">{% trans "(forgot password)" %}</a>
-	<input type="password" name="password" value="" />
+	<input type="password" name="password" value="" class="input" />
     {% if form.captcha %}
     <label>{% trans "CAPTCHA" %}</label><br />
     {{ form.captcha }}
@@ -57,9 +57,9 @@
         <span class="checkbox-option">{% blocktrans %}Remember me for {{remember_days}} days {% endblocktrans %}</span>
     </label>
 
-    <input type="submit" value="{% trans "Submit" %}" class="submit" />
+    <input type="submit" value="{% trans "Log In" %}" class="submit" />
     {% if enable_signup %}
-    <a href="{{ SITE_ROOT }}accounts/register/" style="font-size:13px;">{% trans "Signup" %}</a>
+    <a href="{{ SITE_ROOT }}accounts/register/">{% trans "Signup" %}</a>
     {% endif %}
 </form>
 </div>
@@ -68,7 +68,7 @@
 {% block extra_script %}
 <script type="text/javascript">
 function setCaptchaInputWidth() {
-    $('#id_captcha_1').css({'width': 318 - $('.captcha').width() - 10});
+    $('#id_captcha_1').css({'width': $('.input').outerWidth() - $('.captcha').width() - 10});
 }
 $(window).load(setCaptchaInputWidth);
 $('.captcha').load(setCaptchaInputWidth);
@@ -101,7 +101,7 @@ $('input[type="submit"]').click(function(){
 });
 // set tabindex
 $(function() {
-    $('input:not([type="hidden"])', $('.login-form')).each(function(index) {
+    $('input:not([type="hidden"])').each(function(index) {
         $(this).attr('tabindex', index + 1);
     });
 });

seahub/templates/registration/password_change_form.html

@@ -3,9 +3,9 @@
 {% block title %}{% trans "Password Modification" %}{% endblock %}
 
 {% block main_panel %}
-<div class="narrow-panel">
-  <h2>{% trans "Password Modification" %}</h2>
-  <form action="" method="post">{% csrf_token %}
+<div class="new-narrow-panel">
+  <h2 class="hd">{% trans "Password Modification" %}</h2>
+  <form action="" method="post" class="con">{% csrf_token %}
     <label for="id_old_password">{% trans "Current Password: " %}</label>
     {{ form.old_password }}    {{ form.old_password.errors }}
     <label for="id_new_password1">{% trans "New Password: " %}</label>
@@ -22,5 +22,6 @@
 
 {% block extra_script %}
 <script type="text/javascript">
+    $('[type="password"]').addClass('input');
 </script>
 {% endblock %}

seahub/templates/registration/password_reset_confirm.html

@@ -7,9 +7,9 @@
 
 {% if validlink %}
 
-<div class="narrow-panel">
-    <h2>{% trans "Input new password" %}</h2>
-    <form action="" method="post">{% csrf_token %}
+<div class="new-narrow-panel">
+    <h2 class="hd">{% trans "Input new password" %}</h2>
+    <form action="" method="post" class="con">{% csrf_token %}
         <label for="id_new_password1">{% trans "New Password: " %}</label>
         {{ form.new_password1 }}
         {{ form.new_password1.errors }}
@@ -28,3 +28,9 @@
 
 {% endif %}
 {% endblock %}
+
+{% block extra_script %}
+<script type="text/javascript">
+    $('[type="password"]').addClass('input');  
+</script>
+{% endblock %}

seahub/templates/registration/password_reset_form.html

@@ -3,14 +3,20 @@
 
 {% block title %}{% trans "Password Reset" %}{% endblock %}
 {% block main_panel %}
-<div class="narrow-panel">
-    <h2>{% trans "Password Reset" %}</h2>
-    <form action="" method="post">{% csrf_token %}
+<div class="new-narrow-panel">
+    <h2 class="hd">{% trans "Password Reset" %}</h2>
+    <form action="" method="post" class="con">{% csrf_token %}
         <label for="id_email">{% trans "Your email used in login: " %}</label>
         {{ form.email }}
         {{ form.email.errors }}
-        <p class="note">{% trans "We will send you an email to set new password" %}</p>
+        <p class="tip">{% trans "We will send you an email to set new password" %}</p>
         <input type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
 </div>
 {% endblock %}
+
+{% block extra_script %}
+<script type="text/javascript">
+    $('[name="email"]').addClass('input');
+</script>
+{% endblock %}

seahub/templates/registration/registration_form.html

@@ -2,11 +2,12 @@
 {% load i18n %}
 {% block title %}{% trans "Register" %}{% endblock %}
 {% block main_panel %}
-<div class="narrow-panel">
+<div class="new-narrow-panel">
+    <h2 class="hd">{% trans "Signup" %}</h2>
+    <div class="con">
 {% if request.user.is_authenticated %}
-    <h2>{% trans "Welcome back, you are already signed in." %}</h2>
+    <p>{% trans "Welcome back, you are already signed in." %}</p>
 {% else %}
-    <h2>{% trans "Signup" %}</h2>
     <form action="" method="post">{% csrf_token %}
         {% if form.name %}
         <label for="id_name">{% trans "Name" %}</label>
@@ -30,9 +31,10 @@
         {% endif %}
 
         <p class="error hide"></p>
-        <input type="submit" value="{% trans "Submit" %}" class="submit" />
+        <input type="submit" value="{% trans "Sign Up" %}" class="submit" />
     </form>
 {% endif %}
+    </div>
 </div>
 {% endblock %}