From 817e9659375f475f685ef86b2b8ccf1f1249ea38 Mon Sep 17 00:00:00 2001 From: Grizzly Date: Sat, 1 Dec 2018 11:59:17 +0000 Subject: [PATCH 1/6] =?UTF-8?q?Navigation=20dans=20les=20pr=C3=A9f=C3=A9re?= =?UTF-8?q?nces?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/preferences/sidebar.html | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/preferences/templates/preferences/sidebar.html b/preferences/templates/preferences/sidebar.html index 4f69298b..41a11df0 100644 --- a/preferences/templates/preferences/sidebar.html +++ b/preferences/templates/preferences/sidebar.html @@ -22,7 +22,51 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} +{% load acl %} +{% load i18n %} {% block sidebar %} + {% if request.user.is_authenticated %} + + + {% trans "Générale" %} + + + + {% trans "Association" %} + + + + {% trans "Utilisateurs" %} + + + + {% trans "Machines" %} + + + + {% trans "Topologie" %} + + + + {% trans "Switchs" %} + + + + {% trans "Mail" %} + + + + {% trans "Rappels" %} + + + + {% trans "Services" %} + + + + {% trans "Adresses de contact" %} + + {% endif %} {% endblock %} From 58006000fee897e57063342efe8c88374466787b Mon Sep 17 00:00:00 2001 From: Grizzly Date: Sat, 1 Dec 2018 14:42:38 +0000 Subject: [PATCH 2/6] =?UTF-8?q?Premier=20changement=20en=20accord=C3=A9on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferences/display_preferences.html | 213 +++++++++++------- 1 file changed, 129 insertions(+), 84 deletions(-) diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index 96d3fe16..a5ee9f8d 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -31,50 +31,53 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block title %}{% trans "Preferences" %}{% endblock %} {% block content %} -

{% trans "User preferences" %}

- +
+ +
+
+

+ {% trans "General preferences" %} +

+
+ +
+ {% trans "Edit" %} - -

-

-
{% trans "General preferences" %}
+ + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + +
{% trans "Creation of members by everyone" %}{{ useroptions.all_can_create_adherent|tick }}{% trans "Creation of clubs by everyone" %}{{ useroptions.all_can_create_club|tick }}{% trans "Website name" %}{{ generaloptions.site_name }}{% trans "Email address for automatic emailing" %}{{ generaloptions.email_from }}
{% trans "Self registration" %}{{ useroptions.self_adhesion|tick }}{% trans "Delete not yet active users after" %}{{ useroptions.delete_notyetactive }} days{% trans "Number of results displayed when searching" %}{{ generaloptions.search_display_page }}{% trans "Number of items per page (standard size)" %}{{ generaloptions.pagination_number }}
{% trans "Number of items per page (large size)" %}{{ generaloptions.pagination_large_number }}{% trans "Time before expiration of the reset password link (in hours)" %}{{ generaloptions.req_expire_hrs }}
{% trans "General message displayed on the website" %}{{ generaloptions.general_message }}{% trans "Main site url" %}{{ generaloptions.main_site_url }}
{% trans "Summary of the General Terms of Use" %}{{ generaloptions.GTU_sum_up }}{% trans "General Terms of Use" %}{{ generaloptions.GTU }}
- -
{% trans "Users general permissions" %}
- - - - - - - - - - - - - - - - - -
{% trans "Default shell for users" %}{{ useroptions.shell_default }}{% trans "Users can edit their shell" %}{{ useroptions.self_change_shell|tick }}
{% trans "Users can edit their room" %}{{ useroptions.self_change_room|tick }}{% trans "Telephone number required" %}{{ useroptions.is_tel_mandatory|tick }}
{% trans "GPG fingerprint field" %}{{ useroptions.gpg_fingerprint|tick }}
- -
{% trans "Email accounts preferences" %}
@@ -87,7 +90,66 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Local email accounts enabled" %}{{ useroptions.max_email_address }}
-

{% trans "Machines preferences" %}

+
+
+ +
+
+

+ {% trans "User preferences" %} +

+
+ +
+ + + {% trans "Edit" %} + + + + + + + + + + + + + + +
{% trans "Creation of members by everyone" %}{{ useroptions.all_can_create_adherent|tick }}{% trans "Creation of clubs by everyone" %}{{ useroptions.all_can_create_club|tick }}
{% trans "Self registration" %}{{ useroptions.self_adhesion|tick }}{% trans "Delete not yet active users after" %}{{ useroptions.delete_notyetactive }} days
+ +

{% trans "Users general permissions" %}

+ + + + + + + + + + + + + + + + + +
{% trans "Default shell for users" %}{{ useroptions.shell_default }}{% trans "Users can edit their shell" %}{{ useroptions.self_change_shell|tick }}
{% trans "Users can edit their room" %}{{ useroptions.self_change_room|tick }}{% trans "Telephone number required" %}{{ useroptions.is_tel_mandatory|tick }}
{% trans "GPG fingerprint field" %}{{ useroptions.gpg_fingerprint|tick }}
+
+
+
+ + + + -

Configuration des switches

+
+
+

+ Configuration des Switches +

+
+
@@ -192,49 +272,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% if switchmanagementcred_list %} OK{% else %}Manquant{% endif %} {% include "preferences/aff_switchmanagementcred.html" with switchmanagementcred_list=switchmanagementcred_list %} + + -

{% trans "General preferences" %}

- - - {% trans "Edit" %} - -

-

-
Web management, activé si provision automatique
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Website name" %}{{ generaloptions.site_name }}{% trans "Email address for automatic emailing" %}{{ generaloptions.email_from }}
{% trans "Number of results displayed when searching" %}{{ generaloptions.search_display_page }}{% trans "Number of items per page (standard size)" %}{{ generaloptions.pagination_number }}
{% trans "Number of items per page (large size)" %}{{ generaloptions.pagination_large_number }}{% trans "Time before expiration of the reset password link (in hours)" %}{{ generaloptions.req_expire_hrs }}
{% trans "General message displayed on the website" %}{{ generaloptions.general_message }}{% trans "Main site url" %}{{ generaloptions.main_site_url }}
{% trans "Summary of the General Terms of Use" %}{{ generaloptions.GTU_sum_up }}{% trans "General Terms of Use" %}{{ generaloptions.GTU }} -
-

{% trans "Information about the organisation" %}

+

{% trans "Information about the organisation" %}

{% trans "Edit" %} @@ -269,7 +312,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ assooptions.description|safe }} -

{% trans "Custom email message" %}

+

{% trans "Custom email message" %}

 {% trans "Edit" %} @@ -286,13 +329,13 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ mailmessageoptions.welcome_mail_en|safe }} -

Options pour le mail de fin d'adhésion

+

Options pour le mail de fin d'adhésion

{% can_create preferences.Reminder%} Ajouter un rappel {% acl_end %} {% include "preferences/aff_reminder.html" with reminder_list=reminder_list %} -

{% trans "List of services and homepage preferences" %}

+

{% trans "List of services and homepage preferences" %}

{% can_create preferences.Service%} {% trans " Add a service" %} {% acl_end %} @@ -301,7 +344,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "Edit" %} -

{% trans "List of contact email addresses" %}

+

{% trans "List of contact email addresses" %}

{% can_create preferences.MailContact %} {% trans "Add an address" %} {% acl_end %} @@ -321,5 +364,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ homeoptions.facebook_url }} + +
{% endblock %} From 42bbdb67c7e5296e587bdf5c669b50b03a18223d Mon Sep 17 00:00:00 2001 From: Grizzly Date: Sat, 1 Dec 2018 16:11:17 +0000 Subject: [PATCH 3/6] =?UTF-8?q?Accord=C3=A9on=20complet=20et=20suppression?= =?UTF-8?q?=20de=20la=20sidebar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferences/display_preferences.html | 43 ++++++++++++++++--- .../templates/preferences/sidebar.html | 42 ------------------ 2 files changed, 38 insertions(+), 47 deletions(-) diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index a5ee9f8d..05bbc1bd 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -276,8 +276,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- -

{% trans "Information about the organisation" %}

+ + + + +
+
+

+ Options pour le mail de fin d'adhésion +

+
+
{% can_create preferences.Reminder%} Ajouter un rappel {% acl_end %} @@ -344,7 +367,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "Edit" %} -

{% trans "List of contact email addresses" %}

+
+
+ +
+
+

+ {% trans "List of contact email addresses" %} +

+
+
{% can_create preferences.MailContact %} {% trans "Add an address" %} {% acl_end %} @@ -364,6 +396,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ homeoptions.facebook_url }} +
{% endblock %} diff --git a/preferences/templates/preferences/sidebar.html b/preferences/templates/preferences/sidebar.html index 41a11df0..98b597ea 100644 --- a/preferences/templates/preferences/sidebar.html +++ b/preferences/templates/preferences/sidebar.html @@ -27,46 +27,4 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block sidebar %} - {% if request.user.is_authenticated %} - - - {% trans "Générale" %} - - - - {% trans "Association" %} - - - - {% trans "Utilisateurs" %} - - - - {% trans "Machines" %} - - - - {% trans "Topologie" %} - - - - {% trans "Switchs" %} - - - - {% trans "Mail" %} - - - - {% trans "Rappels" %} - - - - {% trans "Services" %} - - - - {% trans "Adresses de contact" %} - - {% endif %} {% endblock %} From bb57aa3bd0b45cc9fb7e0c4b6120bc9e919f306b Mon Sep 17 00:00:00 2001 From: Grizzly Date: Mon, 3 Dec 2018 20:32:18 +0000 Subject: [PATCH 4/6] Icones et heading cliquables --- .../preferences/display_preferences.html | 85 ++++++++++++------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index 05bbc1bd..ecdacf84 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -34,17 +34,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- {% trans "General preferences" %} -

-
+ {% trans "General preferences" %} + +
+ +
-
- - - {% trans "Edit" %} - + + + {% trans "Edit" %} + @@ -94,9 +95,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- {% trans "User preferences" %} + {% trans "User preferences" %}

@@ -144,9 +145,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- {% trans "Machines preferences" %} + {% trans "Machines preferences" %}

@@ -178,9 +179,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- {% trans "Topology preferences" %} + {% trans "Topology preferences" %}

@@ -219,9 +220,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- Configuration des Switches + Configuration des Switches

@@ -277,9 +278,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- {% trans "Information about the organisation" %} + {% trans "Information about the organisation" %}

@@ -321,9 +322,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- Message pour les mails + Message pour les mails

@@ -347,9 +348,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

- Options pour le mail de fin d'adhésion + Options pour le mail de fin d'adhésion

@@ -357,23 +358,29 @@ with this program; if not, write to the Free Software Foundation, Inc., Ajouter un rappel {% acl_end %} {% include "preferences/aff_reminder.html" with reminder_list=reminder_list %} +
+
-

{% trans "List of services and homepage preferences" %}

+ +
+
+

+ {% trans "List of services and homepage preferences" %} +

+
+
{% can_create preferences.Service%} {% trans " Add a service" %} {% acl_end %} {% include "preferences/aff_service.html" with service_list=service_list %} - - - {% trans "Edit" %} - +
-
+

- {% trans "List of contact email addresses" %} + {% trans "List of contact email addresses" %}

@@ -382,8 +389,20 @@ with this program; if not, write to the Free Software Foundation, Inc., {% acl_end %} {% trans "Delete one or several addresses" %} {% include "preferences/aff_mailcontact.html" with mailcontact_list=mailcontact_list %} -

-

+
+
+ +
@@ -397,7 +416,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Twitter account URL" %}
+
-
{% endblock %} From dd2421411fb8965ea1c3fb04eb7d59c44a65ad6f Mon Sep 17 00:00:00 2001 From: Grizzly Date: Mon, 3 Dec 2018 21:31:50 +0000 Subject: [PATCH 5/6] Espacement des boutons --- .../preferences/display_preferences.html | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index ecdacf84..f52f721a 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -42,10 +42,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- - + {% trans "Edit" %} +

@@ -102,10 +102,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
@@ -150,13 +154,15 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "Machines preferences" %} +
{% trans "Creation of members by everyone" %}
@@ -185,12 +191,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Password per machine" %}
@@ -284,12 +291,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "General policy for VLAN setting" %}
@@ -327,13 +335,15 @@ with this program; if not, write to the Free Software Foundation, Inc., Message pour les mails -
+
{% trans "Name" %}
@@ -355,7 +365,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% can_create preferences.Reminder%} +

Ajouter un rappel +

{% acl_end %} {% include "preferences/aff_reminder.html" with reminder_list=reminder_list %}
@@ -370,7 +382,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% can_create preferences.Service%} +

{% trans " Add a service" %} +

{% acl_end %} {% include "preferences/aff_service.html" with service_list=service_list %} @@ -384,10 +398,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+

{% can_create preferences.MailContact %} {% trans "Add an address" %} {% acl_end %} {% trans "Delete one or several addresses" %} +

{% include "preferences/aff_mailcontact.html" with mailcontact_list=mailcontact_list %}
@@ -399,10 +415,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Welcome email (in French)" %}
From 3f63cb4b8f441ec3d3481c268f95d835d35a7cb9 Mon Sep 17 00:00:00 2001 From: Grizzly Date: Wed, 5 Dec 2018 17:32:24 +0000 Subject: [PATCH 6/6] Espacement des boutons --- .../preferences/display_preferences.html | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index f52f721a..3fde911d 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -95,13 +95,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Twitter account URL" %}
@@ -190,9 +188,8 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "Topology preferences" %} -
- +
+ + + + {% trans "Edit" %} + +

+ +
+ @@ -290,9 +294,8 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "Information about the organisation" %} -
+
-

{% trans "Edit" %} @@ -335,9 +338,8 @@ with this program; if not, write to the Free Software Foundation, Inc., Message pour les mails
-
+
-

{% trans "Edit" %} @@ -363,9 +365,9 @@ with this program; if not, write to the Free Software Foundation, Inc., Options pour le mail de fin d'adhésion
-
+
{% can_create preferences.Reminder%} -

+ Ajouter un rappel

{% acl_end %} @@ -380,9 +382,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "List of services and homepage preferences" %}
-
+
{% can_create preferences.Service%} -

+ {% trans " Add a service" %}

{% acl_end %} @@ -397,8 +399,8 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "List of contact email addresses" %}
-
-

+
+ {% can_create preferences.MailContact %} {% trans "Add an address" %} {% acl_end %} @@ -414,9 +416,8 @@ with this program; if not, write to the Free Software Foundation, Inc., Réseaux sociaux
-
Web management, activé si provision automatique {{ topologieoptions.switchs_web_management }} Rest management, activé si provision auto