From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 11 May 2010 14:06:41 +0000 (+0000)
Subject: Wasting OSQA-225
X-Git-Tag: live~910
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/8f046a503d21585015e85c7526675eead570d294

Wasting OSQA-225

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@219 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index f2882da..7514be0 100644
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -21,7 +21,10 @@ h1,h2,h3,ul,li,form,img,p {
 	padding: 0;
 }
 
-label { vertical-align: middle; }
+label {vertical-align: middle;}
+
+.login label {display: block;}
+.login .form-row-vertical {margin-bottom: 8px;}
 
 hr {
 	border-color: #CCCCCE -moz-use-text-color -moz-use-text-color;
diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html
index cb2dc5a..a7f891a 100644
--- a/forum/skins/default/templates/auth/complete.html
+++ b/forum/skins/default/templates/auth/complete.html
@@ -24,39 +24,40 @@
         {% endif %}
         </ul>
 	{% endif %}
-    {% comment %}
-	{% if form2.errors %}<!--form2 is dysfunctional so commented out -->
-	<div class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-        <ul class="error-list">
-		{% if form2.username.errors %} 
-			<li><span class="error">{{ form2.username.errors|join:", " }}</span></li>
-		{% endif %}
-		{% if form2.password.errors %} 
-			<li><span class="error">{{ form2.password.errors|join:", " }}</span></li>
-		{% endif %}
-       </ul>
-	</div>
-	{% endif %}
-    {% endcomment %}
 
 	<div class="login">
         <form name="fregister" action="" method="POST">
             {{ form1.next }}
-            <div class="form-row-vertical">
-                <label for="id_username">{% trans "Screen name label" %}</label>
+            <div class="form-row-vertical margin-bottom">
+                <label for="id_username">{{ form1.username.label }}</label>
                 {% if form1.username.errors %} 
                     <p class="error">{{ form1.username.errors|join:", " }}</p>
                 {% endif %}
                 {{ form1.username }}
             </div>
             <div class="form-row-vertical margin-bottom">
-                <label for="id_email">{% trans "Email address label" %}</label>
+                <label for="id_email">{{ form1.email.label }}</label>
                 {% if form1.email.errors %} 
                     <p class="error">{{ form1.email.errors|join:", " }}</p>
                 {% endif %}
                 {{ form1.email }}
             </div>
+            {% if form1.password1 %}
+                <div class="form-row-vertical margin-bottom">
+                    <label for="password1_id">{{ form1.password1.label }}</label>
+                    {% if form1.password1.errors %}
+                        <p class="error">{{ form1.password1.errors|join:", " }}</p>
+                    {% endif %}
+                    {{ form1.password1 }}
+                </div>
+                <div class="form-row-vertical margin-bottom">
+                    <label for="password2_id">{{ form1.password2.label }}</label>
+                    {% if form1.password2.errors %} 
+                        <p class="error">{{ form1.password2.errors|join:", " }}</p>
+                    {% endif %}
+                    {{ form1.password2 }}
+                </div>
+            {% endif %}
             <p>{% trans "receive updates motivational blurb" %}</p>
             <div class='simple-subscribe-options'>
             {{email_feeds_form.subscribe}}
diff --git a/forum_modules/localauth/views.py b/forum_modules/localauth/views.py
index 3767dae..8df278c 100644
--- a/forum_modules/localauth/views.py
+++ b/forum_modules/localauth/views.py
@@ -37,7 +37,7 @@ def register(request):
         form = ClassicRegisterForm(initial={'next':'/'})
         email_feeds_form = SimpleEmailSubscribeForm()
 
-    return render_to_response('auth/signup.html', {
-        'form': form,
+    return render_to_response('auth/complete.html', {
+        'form1': form,
         'email_feeds_form': email_feeds_form
         }, context_instance=RequestContext(request))
\ No newline at end of file