Improved user notifications

[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 227fc12..4cfce43 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/login_base.html
+++ b/snf-astakos-app/astakos/im/templates/im/login_base.html
@@ -2,6 +2,9 @@
 
 {% block extra_messages %}
     {% if not messages %}
+        {% for msg_type, msg in GLOBAL_MESSAGES.items %}
+            <li class="{{ msg_type }}">{{ msg|safe }}</li>
+        {% endfor %}
         {% for msg_type, msg in LOGIN_MESSAGES.items %}
             <li class="{{ msg_type }}">{{ msg|safe }}</li>
         {% endfor %}
@@ -42,7 +45,7 @@ Login
               <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>