X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..2cc473d49594f6d9856e5ec3ea18818230fd5eab:/forum/skins/default/templates/auth/complete.html

diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html
index cb2dc5a..5b293eb 100644
--- a/forum/skins/default/templates/auth/complete.html
+++ b/forum/skins/default/templates/auth/complete.html
@@ -9,8 +9,15 @@
     </div>      
 	<div id="completetxt" >
         <div class="message">
-            <b>{% trans "You are here for the first time with " %}{{ provider }}</b>
-            {% trans "Please create your screen name and save your email address. Saved email address will let you subscribe for the updates on the most interesting questions and will be used to create and retrieve your unique avatar image. " %}
+            {# Only display the OpenID greeting if a provider is detected. #}
+            {% if provider %}
+                <p>
+                    <b>{% trans "You are here for the first time with " %}{{ provider }}</b>
+                </p>
+            {% endif %}
+            <p>
+                {% trans "Please choose your screen name and confirm your email address. A valid email address is necessary to receive notifications about activity in the areas of this community you're most interested in, and will help you become an involved participant in this community." %}
+            </p>
         </div>
     	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
 	</div>
@@ -24,48 +31,50 @@
         {% 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>
-            <p>{% trans "receive updates motivational blurb" %}</p>
-            <div class='simple-subscribe-options'>
-            {{email_feeds_form.subscribe}}
-            {% if email_feeds_form.errors %}
-            <p class="error">{% trans "please select one of the options above" %}</p>
+            {% 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 %}
-            </div>
-            <p class='space-above'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p>
-            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
+            {% if form1.recaptcha %}
+                <div class="form-row-vertical margin-bottom">
+                <label for="recaptcha_id">{{ form1.recaptcha.label }}</label>
+                {% if form1.recaptcha.errors %} 
+                    <p class="error">{{ form1.recaptcha.errors|join:", " }}</p>
+                {% endif %}
+                {{ form1.recaptcha }}
+                </div>
+            {% endif %}
+            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" id="bnewaccount" value="{% trans "create account" %}"/></div>
 		</form>
 	</div>
     {% comment %}<!-- this form associates openID with an existing password-protected account, not yet functional -->
@@ -78,9 +87,6 @@
 				<div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div>
 				<div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div>
                 <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p>
-                <div class='simple-subscribe-options'>
-                {{email_feeds_form.subscribe}}
-                </div>
 				<!--todo double check translation from chinese 确认 = "Register" -->
 				<div class="submit-row">
 					<input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/>