From: Clifton Palmer Date: Mon, 16 Dec 2024 09:50:58 +0000 (-0600) Subject: Updated to 1.7.0 X-Git-Tag: 1.7.0 X-Git-Url: http://git.purplebirdman.com/web-gallery.git/commitdiff_plain/refs/tags/1.7.0 Updated to 1.7.0 * Using nginx alpine for server * Using flask template inheritance --- diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index c62f321..679110e 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -6,13 +6,13 @@ networks: driver: overlay services: navigator: - image: cjpalmer/gallery-navigator:1.6.0 + image: cjpalmer/gallery-navigator:1.7.0 volumes: - gallery_data:/app/gallery networks: - backend server: - image: cjpalmer/gallery-server:1.6.0 + image: cjpalmer/gallery-server:1.7.0 volumes: - gallery_data:/data/images depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 56a649b..f6334ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: navigator: build: ./navigator - image: cjpalmer/gallery-navigator:1.6.0 + image: cjpalmer/gallery-navigator:1.7.0 volumes: - ./navigator/app:/app # dev testing - gallery_data_dev:/app/gallery @@ -10,7 +10,7 @@ services: FLASK_DEBUG: 1 server: build: ./server - image: cjpalmer/gallery-server:1.6.0 + image: cjpalmer/gallery-server:1.7.0 volumes: - gallery_data_dev:/data/images ports: diff --git a/navigator/app/templates/base.html b/navigator/app/templates/base.html new file mode 100644 index 0000000..7bbcd1f --- /dev/null +++ b/navigator/app/templates/base.html @@ -0,0 +1,12 @@ + + + {% block title %}{% endblock %} + + + + +
+ {% block content %}{% endblock %} +
+ + diff --git a/navigator/app/templates/gallery.html b/navigator/app/templates/gallery.html index d9404e0..72c7f33 100644 --- a/navigator/app/templates/gallery.html +++ b/navigator/app/templates/gallery.html @@ -1,21 +1,17 @@ - - - - {{ title }} - - - - -
-

{{ title }}

+{% extends 'base.html' %} - -
- - +{% block title %} +{{ title }} +{% endblock %} + +{% block content %} +

{{ title }}

+ + +{% endblock %} diff --git a/navigator/app/templates/page.html b/navigator/app/templates/page.html index fe075ed..3668625 100644 --- a/navigator/app/templates/page.html +++ b/navigator/app/templates/page.html @@ -1,5 +1,4 @@ - {{ title }} diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html index 9b4a70d..8ff8c83 100644 --- a/navigator/app/templates/pages.html +++ b/navigator/app/templates/pages.html @@ -1,28 +1,22 @@ - - - - {{ title }} - - - - -
+{% extends 'base.html' %} - {% if header %} -
- {% autoescape false %} - {{ header }} - {% endautoescape %} -
- {% endif %} +{% block title %} +{{ title }} +{% endblock %} - -
- - +{% block content %} +{% if header %} +
+{% autoescape false %} +{{ header }} +{% endautoescape %} +
+{% endif %} + +