Commit 5a959062 authored by chirac's avatar chirac

Merge branch 'beta-test' into 'dev'

Beta test

See merge request federez/re2o!262
parents 2747fa46 d574194e
......@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-15 16:11+0200\n"
"POT-Creation-Date: 2018-08-23 15:03+0200\n"
"PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
......@@ -185,12 +185,56 @@ msgstr "Historique de %(object)s"
msgid "Home"
msgstr "Accueil"
#: templates/re2o/index.html:33
#: templates/re2o/index.html:34
#, python-format
msgid "Welcome to %(name_website)s!"
msgstr "Bienvenue sur %(name_website)s !"
msgid "Welcome to %(name_website)s"
msgstr "Bienvenue sur %(name_website)s"
#: templates/re2o/index.html:47
#: templates/re2o/index.html:43 templates/re2o/index.html:45
msgid "Registration"
msgstr "Inscription"
#: templates/re2o/index.html:44
msgid ""
"If you don't have an account yet and you want to access the Internet and the "
"organisation's services, create your own personal account."
msgstr ""
"Si vous n'avez pas encore de compte et que vous voulez accéder à Internet et "
"aux services de l'association, créez votre espace personnel."
#: templates/re2o/index.html:55 templates/re2o/index.html:57
msgid "Logging in"
msgstr "Identification"
#: templates/re2o/index.html:56
msgid ""
"If you already have an account, log in. You can manage your subscription to "
"the organisation, your machines and all your services."
msgstr ""
"Si vous avez déjà un compte, identifiez-vous. Vous pouvez gérer votre "
"cotisation à l'association, vos machines et tous vos services."
#: templates/re2o/index.html:68
msgid "My profile"
msgstr "Mon profil"
#: templates/re2o/index.html:69
msgid ""
"To manage your subscription, your machines and all your services, access "
"your profile."
msgstr ""
"Pour gérer votre cotisation, vos machines et tous vos services, accéder à "
"votre profil."
#: templates/re2o/index.html:70
msgid "Access my profile"
msgstr "Accéder à mon profil"
#: templates/re2o/index.html:79
msgid "Services of the organisation"
msgstr "Serices de l'association"
#: templates/re2o/index.html:93
msgid "Go there"
msgstr "Accéder"
......
......@@ -30,8 +30,54 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Home" %}{% endblock %}
{% block content %}
<h1>{% blocktrans %}Welcome to {{ name_website }}!{% endblocktrans %}</h1>
<div class="panel-heading">
<h2>{% blocktrans %}Welcome to {{ name_website }}{% endblocktrans %}</h2>
</div>
{% if not request.user.is_authenticated %}
<div class="row">
{% if var_sa %}
<div class="col-sm-6 col-md-6">
<div class="col-12">
<div class="thumbnail">
<div class="caption">
<h3>{% trans "Registration" %}</h3>
<p>{% trans "If you don't have an account yet and you want to access the Internet and the organisation's services, create your own personal account." %}</p>
<p><a href="{% url 'users:new-user' %}" class="btn btn-primary" role="button">{% trans "Registration" %}</a></p>
</div>
</div>
</div>
</div>
{% endif %}
<div class="col-sm-6 col-md-6">
<div class="col-12">
<div class="thumbnail">
<div class="caption">
<h3>{% trans "Logging in" %}</h3>
<p>{% trans "If you already have an account, log in. You can manage your subscription to the organisation, your machines and all your services." %}</p>
<p><a href="{% url 'login' %}" class="btn btn-primary" role="button">{% trans "Logging in" %}</a></p>
</div>
</div>
</div>
</div>
{% else %}
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-12">
<div class="thumbnail">
<div class="caption">
<h3>{% trans "My profile" %}</h3>
<p>{% trans "To manage your subscription, your machines and all your services, access your profile." %}</p>
<p><a href="{% url 'users:mon-profil' %}" class="btn btn-primary" role="button">{% trans "Access my profile" %}</a></p>
</div>
</div>
</div>
</div>
{% endif %}
</div>
<div class="panel-heading">
<h2>{% trans "Services of the organisation" %}</h2>
</div>
<div class="row">
{% for service_list in services_urls %}
<div class="col-sm-6 col-md-4">
......
......@@ -316,6 +316,9 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
self.fields['room'].label = _("Room")
self.fields['room'].empty_label = _("No room")
self.fields['school'].empty_label = _("Select a school")
self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Leave empty if you don't have any GPG key.")
if 'shell' in self.fields:
self.fields['shell'].empty_label = _("Default shell")
def clean_email(self):
if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'):
......@@ -334,9 +337,9 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
'email',
'school',
'comment',
'telephone',
'room',
'shell',
'telephone',
'gpg_fingerprint'
]
......
This diff is collapsed.
......@@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<i class="text-danger">{% blocktrans with end_ban=users.end_ban|date:"SHORT_DATE_FORMAT" %}End of the ban: {{ end_ban }}{% endblocktrans %}</i>
</div>
</div>
{% elif not users.is_adherent %}
{% elif not users.has_access %}
<div class="panel panel-danger">
<div class="panel-heading dashboard">{% trans "No connection" %}</div>
<div class="panel-body dashboard">
......@@ -64,9 +64,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</div>
{% else %}
<div class="panel panel-success">
<div class="panel-heading dashboard">{% trans "Connection" %}</div>
<div class="panel-heading dashboard">{% blocktrans with end_connection=user.end_access|date:"SHORT_DATE_FORMAT" %}Connection (until {{ end_connection }} ){% endblocktrans %}</div>
<div class="panel-body dashboard">
<i class="text-success">{% blocktrans with end_connection=user.end_adhesion|date:"SHORT_DATE_FORMAT" %}End of connection: {{ end_connection }}{% endblocktrans %}</i>
{% can_create Facture %}
<a class="btn btn-success btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}">
<i class="fas fa-sign-in-alt"></i> {% trans "Extend the connection period" %}
</a>
{% acl_end %}
</div>
</div>
{% endif %}
......@@ -89,7 +93,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if nb_machines %}
<div class="panel panel-info">
<div class="panel-heading dashboard" data-parent="#accordion" data-toggle="collapse" data-target="#collapse3">
<i class="fa fa-desktop"></i>{% trans " Machines" %}<span class="badge">{{ nb_machines }}</span>
<i class="fa fa-desktop"></i>{% trans " Machines" %} <span class="badge"> {{ nb_machines }}</span>
</div>
<div class="panel-body dashboard">
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
......
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