X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..1499c00bc696972ab79ecb6ea45e09b21014682b:/forum/skins/default/templates/auth/signin.html

diff --git a/forum/skins/default/templates/auth/signin.html b/forum/skins/default/templates/auth/signin.html
index 4c06278..5514cc5 100644
--- a/forum/skins/default/templates/auth/signin.html
+++ b/forum/skins/default/templates/auth/signin.html
@@ -3,6 +3,8 @@
 {% load i18n %}
 {% load extra_tags %}
 
+{% block title %}{% spaceless %}{% trans "Login" %}{% endspaceless %}{% endblock %}
+        
 {% block forejs %}
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/auth.css" %}"/>
     {% for provider in all_providers %}
@@ -22,10 +24,11 @@
 	    {% trans "User login" %}
     </div>
     {% if msg %}
-        <p class="warning">{{ msg }}</p>
+        <p class="error">{{ msg }}</p>
     {% endif %}
     {% for provider in top_stackitem_providers %}
-        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}">
+        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}" accept-charset="utf-8">
+            {% csrf_token %}
             {% include provider.stack_item_template %}
             <input type="hidden" class="validate_email" name="validate_email" value="yes" />
         </form>
@@ -34,63 +37,75 @@
         <h3 class="or_label">{% trans 'Or...' %}</h3>
     {% endif %}
     <div style="width:600px;float:left;margin-bottom:5px;">
-        {% trans "Click to sign in through any of these services." %}
+    {% blocktrans %}
+        External login services use <b><a href="http://openid.net/">OpenID</a></b> technology, where your password always stays confidential between
+        you and your login provider and you don't have to remember another one.
+    {% endblocktrans %}
     </div>
     {% if request.user.is_anonymous %}
         <div style="width:600px;float:left;margin-bottom:5px;">
             <input type="checkbox" checked="checked" id="validate_email" />
-            {% trans "Take the oppurtunity to validate my email next to the external provider I choose." %}
+            {% trans "Validate my email after I login." %}
         </div>
     {% endif %}
     <div id="bigicon_providers">
         {% for provider in bigicon_providers %}
             <div class="provider_logo big" name="{{ provider.id }}">
-                {% ifequal provider.type "DIRECT" %}
-                    <a class="provider_direct" href="{% url auth_provider_signin provider=provider.id %}">
-                        <img src="{% media provider.icon %}" />
-                    </a>
-                {% endifequal %}
-                {% ifequal provider.type "CUSTOM" %}
-                    {% include provider.code_template %}
-                {% endifequal %}
-                {% ifequal provider.type "SIMPLE_FORM" %}
-                    <img alt="{{ provider.simple_form_context.your_what }}" class="simple_form_provider" src="{% media provider.icon %}" />
-                {% endifequal %}
+                <div class="inner">
+                    {% ifequal provider.type "DIRECT" %}
+                        <a class="provider_direct" href="{% url auth_provider_signin provider=provider.id %}">
+                            <img src="{% media provider.icon %}" />
+                        </a>
+                    {% endifequal %}
+                    {% ifequal provider.type "CUSTOM" %}
+                        {% include provider.code_template %}
+                    {% endifequal %}
+                    {% ifequal provider.type "SIMPLE_FORM" %}
+                        <img alt="{{ provider.simple_form_context.your_what }}" class="simple_form_provider" src="{% media provider.icon %}" />
+                    {% endifequal %}
+                </div>
             </div>
         {% endfor %}
     </div>
     <div id="smallicon_providers">
         {% for provider in smallicon_providers %}
             <div class="provider_logo small" name="{{ provider.id }}">
-                {% ifequal provider.type "DIRECT" %}
-                    <a class="provider_direct" href="{% url auth_provider_signin provider=provider.id %}">
-                        <img src="{% media provider.icon %}" />
-                    </a>
-                {% endifequal %}
-                {% ifequal provider.type "CUSTOM" %}
-                    {% include provider.code_template %}
-                {% endifequal %}
-                {% ifequal provider.type "SIMPLE_FORM" %}
-                    <img alt="{{ provider.simple_form_context.your_what }}" class="simple_form_provider" src="{% media provider.icon %}" />
-                {% endifequal %}
+                <div class="inner">
+                    {% ifequal provider.type "DIRECT" %}
+                        <a class="provider_direct" href="{% url auth_provider_signin provider=provider.id %}">
+                            <img src="{% media provider.icon %}" />
+                        </a>
+                    {% endifequal %}
+                    {% ifequal provider.type "CUSTOM" %}
+                        {% include provider.code_template %}
+                    {% endifequal %}
+                    {% ifequal provider.type "SIMPLE_FORM" %}
+                        <img alt="{{ provider.simple_form_context.your_what }}" class="simple_form_provider" src="{% media provider.icon %}" />
+                    {% endifequal %}
+                </div>
             </div>
         {% endfor %}
     </div>
     <form name="signin_form" id="signin_form" class="signin_form" method="POST" action="">
+        {% csrf_token %}
         <div id="signin_form_slot"></div>
         <input type="hidden" class="validate_email" name="validate_email" value="yes" />
     </form>
     {% for provider in stackitem_providers %}
         <h3 class="or_label">{% trans 'Or...' %}</h3>
-        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}">
+        <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}" accept-charset="utf-8">
+            {% csrf_token %}
             {% include provider.stack_item_template %}
             <input type="hidden" class="validate_email" name="validate_email" value="yes" />
         </form>
     {% endfor %}
     <h3 class="or_label">{% trans 'Or...' %}</h3>
-    <fieldset>
-        {% trans 'Click' %} <a href="{% url auth_request_tempsignin %}">here</a> {% trans "if you're having troubles signing in." %}
-    </fieldset>
+    <form name="signin_form" id="dummy_form_unused" class="signin_form" method="POST" action="">
+        {% csrf_token %}
+        <fieldset>
+            {% trans 'Click' %} <a href="{% url auth_request_tempsignin %}">{% trans 'here' %}</a> {% trans "if you're having trouble signing in." %}
+        </fieldset>
+    </form>
     <script type="text/html" id="simple_form_template">
         <fieldset id="slot_form">
               <p id="provider_name_slot">{% trans 'Enter your ' %}%%YOUR_WHAT%%</p>
@@ -170,4 +185,4 @@
         <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} </a>
     </p>
 </div>
-{% endblock%}
\ No newline at end of file
+{% endblock%}