diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index 96d3fe16..3fde911d 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -31,50 +31,54 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block title %}{% trans "Preferences" %}{% endblock %} {% block content %} -

{% trans "User preferences" %}

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

-

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

+ {% trans "General 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 "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,13 +91,76 @@ 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 }}
+
+
+
+ +
+
+

+ {% trans "Machines preferences" %} +

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

-

+ +

@@ -112,13 +179,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Password per machine" %}{{ machineoptions.create_machine|tick }}
-

{% trans "Topology preferences" %}

+
+
+ +
+
+

+ {% trans "Topology preferences" %} +

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

-

+

@@ -138,15 +214,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "General policy for VLAN setting" %}
-
Clef radius
+

Clef radius

{% can_create RadiusKey%} Ajouter une clef radius {% acl_end %} {% include "preferences/aff_radiuskey.html" with radiuskey_list=radiuskey_list %} + +
+
-

Configuration des switches

- - +
+
+

+ Configuration des Switches +

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

+ +
+ @@ -192,55 +284,23 @@ 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 "Information about the organisation" %} +

+
+
-

{% trans "General preferences" %}

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

-

-
Web management, activé si provision automatique {{ topologieoptions.switchs_web_management }} Rest management, activé si provision auto
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% 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 "Edit" %} -

-

+

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

{% trans "Custom email message" %}

+ + + +
+
+

+ Message pour les mails +

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

-

+

+ @@ -286,29 +356,73 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Welcome email (in French)" %}{{ 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 %} {% include "preferences/aff_service.html" with service_list=service_list %} - - - {% trans "Edit" %} - -

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

+ +
+
+ +
+
+

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

+
+
+ {% 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 %} -

-

+
+
+ +
+
+

+ Réseaux sociaux +

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

@@ -321,5 +435,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Twitter account URL" %}{{ homeoptions.facebook_url }}
+
+
+ {% endblock %} diff --git a/preferences/templates/preferences/sidebar.html b/preferences/templates/preferences/sidebar.html index 4f69298b..98b597ea 100644 --- a/preferences/templates/preferences/sidebar.html +++ b/preferences/templates/preferences/sidebar.html @@ -22,6 +22,8 @@ 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 %}