summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Noel <thomas@univnautes-idp.dev>2014-03-21 17:54:27 (GMT)
committerThomas Noel <thomas@univnautes-idp.dev>2014-03-21 17:54:27 (GMT)
commit971b29c91b0c79a59b3266bb52e709ae302f8b8b (patch)
treefb4480c71fb98840fe05df131c62ad86fec91493
parentef1996fd59582eba7e24b54859c3013bdc444330 (diff)
downloadunivnautes-idp-971b29c91b0c79a59b3266bb52e709ae302f8b8b.zip
univnautes-idp-971b29c91b0c79a59b3266bb52e709ae302f8b8b.tar.gz
univnautes-idp-971b29c91b0c79a59b3266bb52e709ae302f8b8b.tar.bz2
wording
-rw-r--r--base/templates/base.html2
-rw-r--r--base/templates/univnautes-idp/create-tenant.html2
-rw-r--r--base/templates/univnautes-idp/homepage.html10
-rw-r--r--base/views.py1
4 files changed, 8 insertions, 7 deletions
diff --git a/base/templates/base.html b/base/templates/base.html
index 97ac474..3311f53 100644
--- a/base/templates/base.html
+++ b/base/templates/base.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" href="{{ STATIC_URL }}authentic2/css/style.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}jquery/css/jquery-ui.custom.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}ulx/css/ulx.css" />
- <title>{% block title %}User test{% endblock %}</title>
+ <title>{% block title %}Univnautes IdP &mdash; POC{% endblock %}</title>
{{ openid_meta }}
{% block extra_scripts %}
{% endblock %}
diff --git a/base/templates/univnautes-idp/create-tenant.html b/base/templates/univnautes-idp/create-tenant.html
index cacacfd..75518ba 100644
--- a/base/templates/univnautes-idp/create-tenant.html
+++ b/base/templates/univnautes-idp/create-tenant.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% block content %}
-<h1>Nouveau tenant</h1>
+<h1>Demande d'un nouveau fournisseur d'identités</h1>
<p>
Indiquer ci-dessous le nom du nouveau tenant choisi.<br />
Utilisez uniquement des lettres minuscules, des chiffres et le trait d'union.
diff --git a/base/templates/univnautes-idp/homepage.html b/base/templates/univnautes-idp/homepage.html
index 4cbaa52..964ae14 100644
--- a/base/templates/univnautes-idp/homepage.html
+++ b/base/templates/univnautes-idp/homepage.html
@@ -2,17 +2,17 @@
{% load i18n %}
{% block content %}
-<h1>Gestion des tenants</h1>
+<h1>Fournisseurs d'identités disponibles</h1>
<ul>
-{% for obj in object_list %}
+{% for obj in object_list|dictsort:"schema_name" %}
{% if obj.schema_name != "public" %}
-<li><a href="//{{ obj.domain_url }}">{{ obj.domain_url }}</a> &mdash; tenant &laquo;{{obj}}&raquo;</li>
+<li>{{obj.schema_name}} : <a href="//{{ obj.domain_url }}">{{ obj.domain_url }}</a></li>
{% endif %}
{% endfor %}
</ul>
-<h1>Demander un tenant</h1>
+<h1>Demander un nouveau fournisseur d'identités</h1>
<p>
-<a href="/create/">Cr&eacute;ation d'un tenant</a>
+<a href="/create/">Cr&eacute;ation d'un fournisseur d'identités</a>
</p>
<h1>Administration</h1>
<p>
diff --git a/base/views.py b/base/views.py
index 8a49bea..ca136ff 100644
--- a/base/views.py
+++ b/base/views.py
@@ -8,6 +8,7 @@ CREATION_SCRIPT = '/home/thomas/univnautes-idp/create-dirty-tenant.py'
class TenantCreateForm(forms.Form):
schema_name = forms.RegexField(regex='^[a-z0-9_-]+$',
+ label='Nom',
required=True,
max_length=16)