From 4de9c1efd264c454275af5f98661b502485b1175 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 30 Dec 2018 15:27:07 +0100 Subject: [PATCH 1/3] Make URL hash control Bootstrap collapse --- static/js/collapse-from-url.js | 33 +++++++++++++++++++++++++++++++++ templates/base.html | 1 + 2 files changed, 34 insertions(+) create mode 100644 static/js/collapse-from-url.js diff --git a/static/js/collapse-from-url.js b/static/js/collapse-from-url.js new file mode 100644 index 00000000..6c85762b --- /dev/null +++ b/static/js/collapse-from-url.js @@ -0,0 +1,33 @@ +// Re2o est un logiciel d'administration développé initiallement au rezometz. Il +// se veut agnostique au réseau considéré, de manière à être installable en +// quelques clics. +// +// Copyright © 2018 Alexandre Iooss +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// 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. + +// This script makes URL hash controls Bootstrap collapse +// e.g. if there is #information in the URL +// then the collapse with id "information" will be open. + +$(document).ready(function () { + if(location.hash != null && location.hash !== ""){ + // Open the collapse corresponding to URL hash + $(location.hash + '.collapse').collapse('show'); + } else { + // Open default collapse + $('.collapse-default.collapse').collapse('show'); + } +}); diff --git a/templates/base.html b/templates/base.html index 76ba975a..867be422 100644 --- a/templates/base.html +++ b/templates/base.html @@ -45,6 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% bootstrap_javascript %} + {# Load CSS #} {% bootstrap_css %} From 45cda20c71249837d83b60ba7559ee901f35f770 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 30 Dec 2018 15:36:15 +0100 Subject: [PATCH 2/3] Rename user profile collapses --- users/templates/users/profil.html | 46 +++++++++++++++++-------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 741ecac0..b4fa7875 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} -{% load bootstrap3 %} {% load acl %} {% load logs_extra %} {% load design %} @@ -78,8 +77,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if solde_activated %}
-
- {{ users.solde }} +
+ {{ users.solde }}
@@ -92,8 +92,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if nb_machines %}
-
- {% trans " Machines" %} {{ nb_machines }} +
+ {% trans " Machines" %} {{ nb_machines }}
@@ -103,7 +104,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %}
-
{% trans "No machine" %}
+
+ {% trans "No machine" %} +
{% trans " Add a machine" %} @@ -118,12 +122,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ data-target="#information">

{% trans " Detailed information" %}

-
+
@@ -305,12 +309,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if users.is_class_club %}
-
+

{% trans " Manage the club" %}

-
+
@@ -361,14 +365,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %}
-
+

{% trans "Machines" %} {{nb_machines}}

-
+
-
+

{% trans "Subscriptions" %}

-
+
-
+

{% trans "Bans" %}

-
+
-
+

{% trans "Whitelists" %}

-
+
-
+

{% trans " Email settings" %}

-
+
{% can_edit users %} From 3ed137cf3183b15b3ed9e4c630d0191c4b1c7998 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 30 Dec 2018 16:28:03 +0100 Subject: [PATCH 3/3] Paginator styling and go to id feature --- machines/templates/machines/aff_machines.html | 4 +- templates/pagination.html | 59 ++++++++++++++----- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index 60e1a57a..d5a83ed3 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if machines_list.paginator %} - {% include "pagination.html" with list=machines_list %} + {% include "pagination.html" with list=machines_list go_to_id="machines" %} {% endif %} @@ -215,6 +215,6 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if machines_list.paginator %} - {% include "pagination.html" with list=machines_list %} + {% include "pagination.html" with list=machines_list go_to_id="machines" %} {% endif %} diff --git a/templates/pagination.html b/templates/pagination.html index cf488c5d..5ecced6d 100644 --- a/templates/pagination.html +++ b/templates/pagination.html @@ -23,23 +23,52 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load url_insert_param %} +{% load i18n %} {% if list.paginator.num_pages > 1 %} - {% endif %} -