Commit 7f1f9f3b authored by Kroustouris Stauros's avatar Kroustouris Stauros

ui improvements

parent 89c4d4f6
......@@ -4,38 +4,36 @@
{% block homepage %}{% endblock %}
{% block hometop %}{% endblock %}
{% block mgmt %}class="active"{% endblock %}
{% block subcontent %}
<h4>{% trans "Management" %}</h4>
{% block subcontent %}
<h4>{% trans "Management" %}</h4>
<hr>
<div class="span6">
<p>{% blocktrans %}The management application provides an interface for administrators of federation member institutions to maintain the data that is necessary for participating in the federation.{% endblocktrans %}</p>
<p>{% blocktrans %}Administrators can log in using either Social Networks or the AAI Federation:{% endblocktrans %}</p>
<h5>Social Networks</h5>
<hr>
<div class="span6">
<p>{% blocktrans %}The management application provides an interface for administrators of federation member institutions to maintain the data that is necessary for participating in the federation.{% endblocktrans %}</p>
<p>{% blocktrans %}Administrators can log in using either Social Networks or the AAI Federation:{% endblocktrans %}</p>
<h5>Social Networks</h5>
<hr>
<p>{% blocktrans %}Social networks that have been enabled for authenticating users to the management application are listed under the <b>Manage</b> drop-down menu. Once authenticated, a user may need to assert any missing information that is required by the application (such as an e-mail address). After that, the user can proceed with activation.{% endblocktrans %}</p>
<h5>AAI Federation</h5>
<hr>
<p>{% blocktrans %}Authentication and authorization are carried out through a{% endblocktrans %} <a href="http://shibboleth.net/products/service-provider.html">Shibboleth SP</a>.</p>
<p>{% blocktrans %}The following attributes are required for administrators and must be released by their home IdPs to the SP{% endblocktrans %} {% trans "according to the" %} <a href="http://aai.grnet.gr/documentation">{% trans "policy and procedures documentation" %}</a> {% trans "provided by the GRNET AAI federation" %}:
<table class="table table-bordered">
<thead><tr><th>{% trans "Attribute" %}</th><th>{% trans "Description" %}</th></tr></thead>
<tbody>
<tr class="success"><td>eduPersonPrincipalName</td><td>{% trans "Provides a string that uniquely identifies an administrator in the management application." %}</td></tr>
<tr class="success"><td>eduPersonEntitlement</td><td>{% trans "A specific URN value must be provided to authorize an administrator:" %} <strong>urn:mace:grnet.gr:eduroam:admin</strong></td></tr>
<tr class="success"><td>mail</td><td>{% trans "The e-mail address (one or more) of the administrator. It is used for notifications from the management application. It may also be used for further communication, with prior consent." %}</td></tr>
<tr class="info"><td>givenName (optional)</td><td>{% trans "The person's first name." %}</td></tr>
<tr class="info"><td>sn (optional)</td><td>{% trans "The person's last name." %}</td></tr>
</tbody>
</table>
</p>
<p>{% blocktrans %}Once attribute release is setup properly an administrator can login to the management application.{% endblocktrans %}</p>
<h5>Activation</h5>
<hr>
<p>{% blocktrans %}After the first login, administrators are asked to associate their account with the institution they want to manage. Their choice must then be ratified by the operators of their management application. Following that, they will be notified through e-mail and they will then be able to start using the management application.{% endblocktrans %}</p>
<h5>Metadata</h5>
<hr>
<p>{% blocktrans %}Among other things, the metadata provided by administrators through the management application are used to compile database data for the federation{% endblocktrans %}: <a href="{% url instxml %}">institution.xml</a>, <a href="{% url realmxml %}">realm.xml</a>, <a href="{% url realmdataxml %}">realm_data.xml</a></p>
</div>
{% endblock %}
<p>{% blocktrans %}Social networks that have been enabled for authenticating users to the management application are listed under the <b>Manage</b> drop-down menu. Once authenticated, a user may need to assert any missing information that is required by the application (such as an e-mail address). After that, the user can proceed with activation.{% endblocktrans %}</p>
<h5>AAI Federation</h5>
<hr>
<p>{% blocktrans %}Authentication and authorization are carried out through a{% endblocktrans %} <a href="http://shibboleth.net/products/service-provider.html">Shibboleth SP</a>.</p>
<p>{% blocktrans %}The following attributes are required for administrators and must be released by their home IdPs to the SP{% endblocktrans %} {% trans "according to the" %} <a href="http://aai.grnet.gr/documentation">{% trans "policy and procedures documentation" %}</a> {% trans "provided by the GRNET AAI federation" %}:
<table class="table table-bordered">
<thead><tr><th>{% trans "Attribute" %}</th><th>{% trans "Description" %}</th></tr></thead>
<tbody>
<tr class="success"><td>eduPersonPrincipalName</td><td>{% trans "Provides a string that uniquely identifies an administrator in the management application." %}</td></tr>
<tr class="success"><td>eduPersonEntitlement</td><td>{% trans "A specific URN value must be provided to authorize an administrator:" %} <strong>urn:mace:grnet.gr:eduroam:admin</strong></td></tr>
<tr class="success"><td>mail</td><td>{% trans "The e-mail address (one or more) of the administrator. It is used for notifications from the management application. It may also be used for further communication, with prior consent." %}</td></tr>
<tr class="info"><td>givenName (optional)</td><td>{% trans "The person's first name." %}</td></tr>
<tr class="info"><td>sn (optional)</td><td>{% trans "The person's last name." %}</td></tr>
</tbody>
</table>
</p>
<p>{% blocktrans %}Once attribute release is setup properly an administrator can login to the management application.{% endblocktrans %}</p>
<h5>Activation</h5>
<hr>
<p>{% blocktrans %}After the first login, administrators are asked to associate their account with the institution they want to manage. Their choice must then be ratified by the operators of their management application. Following that, they will be notified through e-mail and they will then be able to start using the management application.{% endblocktrans %}</p>
<h5>Metadata</h5>
<hr>
<p>{% blocktrans %}Among other things, the metadata provided by administrators through the management application are used to compile database data for the federation{% endblocktrans %}: <a href="{% url instxml %}">institution.xml</a>, <a href="{% url realmxml %}">realm.xml</a>, <a href="{% url realmdataxml %}">realm_data.xml</a></p>
</div>
{% endblock %}
{% load i18n %}
{% load staticfiles %}
{% if request.user.is_authenticated %}
<li class="dropdown"><a href="{% url manage %}"> {% trans "Manage" %}</a></li>
{% else %}
<li class="dropdown"><a id="drop2" class="dropdown-toggle"
data-toggle="dropdown" role="button" href="#"> {% trans "Manage" %}
<b class="caret"></b>
......@@ -27,3 +30,4 @@
style="padding: 0px;"></li>{% endcomment %}
</ul>
</li>
{% endif %}
......@@ -6,7 +6,7 @@ import math
import datetime
from xml.etree import ElementTree
from django.shortcuts import render_to_response, redirect
from django.shortcuts import render_to_response, redirect, render
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound
from django.template import RequestContext
from django.core.urlresolvers import reverse
......@@ -62,9 +62,9 @@ from utils.cat_helper import CatQuery
@never_cache
def index(request):
return render_to_response(
return render(
request,
'front/index.html',
context_instance=RequestContext(request)
)
......@@ -79,16 +79,18 @@ def manage_login_front(request):
context_instance=RequestContext(request, base_response(request))
)
except AttributeError:
return render_to_response(
return render(
request,
'edumanage/welcome_manage.html',
context_instance=RequestContext(request, base_response(request))
{}
)
if user.is_authenticated() and user.is_active and profile.is_social_active:
return redirect(reverse('manage'))
else:
return render_to_response(
return render(
request,
'edumanage/welcome_manage.html',
context_instance=RequestContext(request, base_response(request))
{}
)
......@@ -1454,7 +1456,10 @@ def get_service_points(request):
else:
response_location['enc'] = u"-"
response_location['AP_no'] = u"%s" % (sl.AP_no)
response_location['name'] = sl.loc_name.get(lang='en').name
try:
response_location['name'] = sl.loc_name.get(lang='en').name
except Name_i18n.DoesNotExist:
response_location['name'] = 'unknown'
response_location['port_restrict'] = u"%s" % (sl.port_restrict)
response_location['transp_proxy'] = u"%s" % (sl.transp_proxy)
response_location['IPv6'] = u"%s" % (sl.IPv6)
......@@ -1514,13 +1519,10 @@ def get_all_services(request):
lang=lang
).name
except Name_i18n.DoesNotExist:
response_location['inst'] = sl.institutionid.org_name.get(
lang='en'
).name
try:
response_location['name'] = sl.loc_name.get(lang=lang).name
except Name_i18n.DoesNotExist:
response_location['name'] = sl.loc_name.get(lang='en').name
try:
response_location['name'] = sl.loc_name.get(lang='en').name
except Name_i18n.DoesNotExist:
response_location['name'] = 'unknown'
response_location['port_restrict'] = u"%s" % (sl.port_restrict)
response_location['transp_proxy'] = u"%s" % (sl.transp_proxy)
response_location['IPv6'] = u"%s" % (sl.IPv6)
......
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