Merge branch 'master' of https://code.grnet.gr/git/astakos

[astakos] / snf-astakos-app / astakos / im / templates / im / login_base.html

diff --git a/snf-astakos-app/astakos/im/templates/im/login_base.html b/snf-astakos-app/astakos/im/templates/im/login_base.html
index fc725a7..33b1872 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/login_base.html
+++ b/snf-astakos-app/astakos/im/templates/im/login_base.html
@@ -1,13 +1,5 @@
 {% extends 'im/base_two_cols.html'%}
 
-{% block extra_messages %}
-    {% if not messages %}
-        {% for msg_type, msg in LOGIN_MESSAGES.items %}
-            <li class="{{ msg_type }}">{{ msg|safe }}</li>
-        {% endfor %}
-    {% endif %}
-{% endblock %}
-
 {% block signup_class %}hidden{% endblock %}
 {% block page.title %}{% endblock %}
 
@@ -24,25 +16,24 @@
                        {% include "im/form_render.html" %}
                    {% endwith %}
                    <input type="hidden" name="next" value="{{ next }}">
-                   <div class="form-row submit">
-                       <a class="extra-link" href="{% url django.contrib.auth.views.password_reset %}">Forgot your password?</a>
+                   <div class="form-row submit clearfix">
+                       
                        <input type="submit" class="submit altcol" value="SUBMIT" />
-                       
+                       <a class="extra-link" href="{% url django.contrib.auth.views.password_reset %}">Forgot your password?</a>
                    </div>
        </form>
     {% endif %}
-
     <div class="extralogin">
          {% for o in im_modules %}
        <div>
         {% if o != 'local' %}
         LOGIN using
-               <a href="/im/login/{{ o }}{% ifnotequal next "" %}&next={{ next|urlencode }}{% endifnotequal %}{% ifnotequal code ""%}{% if next != "" %}&{% else %}?{% endif %}code={{ code }}{% endifnotequal %}"
+            <a href="/im/login/{{ o }}?{% ifnotequal next "" %}&next={{ next|urlencode }}{% endifnotequal %}{% ifnotequal code ""%}{% if next != "" %}&{% else %}?{% endif %}code={{ code }}{% endifnotequal %}"
             alt="{{ o|title }}">{{ o }}</a>
         {% endif %}
         </div>
         {% endfor %}
-    </div>
+    </div><br />
     {% block body.signup %}
            {% for o in im_modules %}
                {% if o != 'local' %}