From 51211ac9a77d39c52d7ceb1102b89bfca66bfb05 Mon Sep 17 00:00:00 2001 From: Miguel Astor Date: Sun, 20 Aug 2023 12:44:41 -0400 Subject: [PATCH] Reworked nav bar and paging links --- viewer/static/css/styles.css | 12 ++++++++ viewer/templates/gallery_view.html | 37 ++++++++++++++++------- viewer/templates/image_view.html | 15 ++++++++- viewer/templates/partials/navigation.html | 9 ------ 4 files changed, 52 insertions(+), 21 deletions(-) delete mode 100644 viewer/templates/partials/navigation.html diff --git a/viewer/static/css/styles.css b/viewer/static/css/styles.css index d48d2ca..47131ed 100644 --- a/viewer/static/css/styles.css +++ b/viewer/static/css/styles.css @@ -36,10 +36,22 @@ width: 100px; } +.small-nav-icon { + width: 3em; +} + .mb-2 { margin-bottom: 2em; } +.mr-2 { + margin-right: 2em; +} + +.ml-2 { + margin-left: 2em; +} + /**************************************************************************** * Grid. * ****************************************************************************/ diff --git a/viewer/templates/gallery_view.html b/viewer/templates/gallery_view.html index 67a6f76..16dfa7c 100644 --- a/viewer/templates/gallery_view.html +++ b/viewer/templates/gallery_view.html @@ -9,19 +9,34 @@ - {% include 'partials/navigation.html'%} {% if images|length > 0 %} + + + + + + {% if num_pages > 1 %} + + {% endif %} + +
+ + + + + + + + +

+ {{request.path}} - Files ({{num_files}}) +

+ 		+
+ {% for page in pages %}{{page}}{% if not forloop.last %} {% endif %}{% endfor %} +
+
-

- {{request.path}} - Files ({{num_files}}) -

-
-
- {% if num_pages > 1 %} -
- {% for page in pages %}{{page}}{% if not forloop.last %} {% endif %}{% endfor %} -
- {% endif %} {% if page != 1 %} diff --git a/viewer/templates/image_view.html b/viewer/templates/image_view.html index f691054..8f29469 100644 --- a/viewer/templates/image_view.html +++ b/viewer/templates/image_view.html @@ -9,7 +9,20 @@ - {% include 'partials/navigation.html'%} +
+ + + + +
+ + + + + + + +
diff --git a/viewer/templates/partials/navigation.html b/viewer/templates/partials/navigation.html deleted file mode 100644 index 7108e5a..0000000 --- a/viewer/templates/partials/navigation.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load static %} -
- - - - - - -