Some improvements in cache.

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