Commit c340e3ec authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos
Browse files

Modified templates to support social auth logins

parent 09c731d8
......@@ -43,6 +43,10 @@ body {
width: 300px;
}
.navbar .brand { max-height: 40px; overflow: visible;padding-top: 0;padding-bottom: 0; }
.dropdown-menu.loginoptions a {
width: 80px;
display: inline-table;
}
</style>
<link href="/static/css/bootstrap-responsive.min.css" rel="stylesheet">
<script type="text/javascript" src="/static/js/jquery.min.js"></script>
......@@ -80,9 +84,9 @@ body {
<li {% block faqtop %}{% endblock %}>
<a href="/faq/{{LANGUAGE_CODE}}/">FAQ</a>
</li>
<li {% block managetop %}{% endblock %}>
<a href="{% url manage %}" style="padding-top: 3px; padding-bottom: 0px;">{% trans "Manage" %}<img class="hidden-phone" src="/static/img/image_shibboleth_logo_color.png" style="padding: 0px;"></a>
</li>
{% include "front/management_dropdown.html" %}
</ul>
{% endblock %}
......
<li class="dropdown"><a id="drop2" class="dropdown-toggle"
data-toggle="dropdown" role="button" href="#"> {% trans "Manage" %}
<b class="caret"></b>
</a>
<ul class="dropdown-menu loginoptions" role="menu"
aria-labelledby="drop2">
<li><a tabindex="-1" href="{% url manage %}">Shibboleth</a><img
class="hidden-phone"
src="/static/img/image_shibboleth_logo_color.png"
style="padding: 0px;"></li>
<li><a tabindex="-1" href="{% url socialauth_begin 'twitter' %}">Twitter</a><img
class="hidden-phone" src="/static/img/twitter_img.png"
style="padding: 0px;"></li>
<li><a tabindex="-1" href="{% url socialauth_begin 'facebook' %}">Facebook</a><img
class="hidden-phone" src="/static/img/facebook_img.png"
style="padding: 0px;"></li>
<li><a tabindex="-1" href="{% url socialauth_begin 'google' %}">Google</a><img
class="hidden-phone" src="/static/img/google_img.png"
style="padding: 0px;"></li>
<li><a tabindex="-1" href="{% url socialauth_begin 'linkedin' %}">LinkedIn</a><img
class="hidden-phone" src="/static/img/linkedin_img.png"
style="padding: 0px;"></li>
<li><a tabindex="-1" href="{% url socialauth_begin 'yahoo' %}">Yahoo</a><img
class="hidden-phone" src="/static/img/yahoo_img.png"
style="padding: 0px;"></li>
</ul>
</li>
\ No newline at end of file
......@@ -8,9 +8,7 @@
<li>
<a href="/faq/{{LANGUAGE_CODE}}/">FAQ</a>
</li>
<li>
<a href="{% url login %}" style="padding-top: 3px; padding-bottom: 0px;">{% trans "Manage" %}<img src="/static/img/image_shibboleth_logo_color.png" style="padding: 0px;"></a>
</li>
{% include "front/management_dropdown.html" %}
</ul>
{% endblock %}
{% block content %}
......@@ -42,6 +40,20 @@ Select your institution to proceed. Our administrators will activate your accoun
<div style="display: none">
{{form.user}}
</div>
{% if nomail %}
<div class="control-group {% if form.email.errors %} error {% endif %}">
<label class="control-label" for="id_email"><b>{% trans "Email" %}</b></label>
<div class="controls">
{{ form.email }}
{% if form.email.errors %} <span class="help-inline"> {{ form.email.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.institution.help_text }}</span>
</div>
</div>
{% else %}
<div style="display: none">
{{form.email}}
</div>
{% endif %}
<div class="control-group {% if form.institution.errors %} error {% endif %}">
<label class="control-label" for="id_institution"><b>{% trans "Institution" %}</b></label>
<div class="controls">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment