From 4a979458a90dd1b75cf118b7c22c89e718191940 Mon Sep 17 00:00:00 2001 From: lza_menace Date: Thu, 10 Mar 2022 22:15:14 -0800 Subject: [PATCH] update navbar --- tubbymemes/templates/about.html | 2 +- tubbymemes/templates/includes/meme_card.html | 2 +- tubbymemes/templates/includes/navbar.html | 63 +++++++++++--------- tubbymemes/templates/index.html | 2 +- tubbymemes/templates/meme.html | 3 +- tubbymemes/templates/publish.html | 2 +- tubbymemes/templates/remotes.html | 3 +- 7 files changed, 41 insertions(+), 36 deletions(-) diff --git a/tubbymemes/templates/about.html b/tubbymemes/templates/about.html index cb1e4ef..e96d23a 100644 --- a/tubbymemes/templates/about.html +++ b/tubbymemes/templates/about.html @@ -2,9 +2,9 @@ {% include 'includes/head.html' %} + {% include 'includes/navbar.html' %}
- {% include 'includes/navbar.html' %}
diff --git a/tubbymemes/templates/includes/meme_card.html b/tubbymemes/templates/includes/meme_card.html index 377d7b1..7d2df90 100644 --- a/tubbymemes/templates/includes/meme_card.html +++ b/tubbymemes/templates/includes/meme_card.html @@ -2,7 +2,7 @@
- + {% if meme.file_name %} {% if meme.file_name.endswith('mp4') %}
-

- tubbymemes. -

-

- Memes. Interplanetary! -

- {% if request.path == '/' %} - About - {% if current_user.is_authenticated %} - Disconnect - {% if current_user.is_moderator() %} - Mod - {% endif %} - New Meme - {% else %} - Connect - {% endif %} - {% else %} - Go Home - {% endif %} +
+ + diff --git a/tubbymemes/templates/index.html b/tubbymemes/templates/index.html index 036b6dd..3a8c0b7 100644 --- a/tubbymemes/templates/index.html +++ b/tubbymemes/templates/index.html @@ -2,9 +2,9 @@ {% include 'includes/head.html' %} + {% include 'includes/navbar.html' %}
- {% include 'includes/navbar.html' %} {% if request.args.get('ipfs_error') %}
diff --git a/tubbymemes/templates/meme.html b/tubbymemes/templates/meme.html index 1af599c..bed7fae 100644 --- a/tubbymemes/templates/meme.html +++ b/tubbymemes/templates/meme.html @@ -3,11 +3,10 @@ {% include 'includes/head.html' %} + {% include 'includes/navbar.html' %}
- {% include 'includes/navbar.html' %} - {% if meme %} {% if meme.meta_ipfs_hash %} {% set meta_url = config.IPFS_SERVER + "/ipfs/" + meme.meta_ipfs_hash %} diff --git a/tubbymemes/templates/publish.html b/tubbymemes/templates/publish.html index 18d0b56..fab701b 100644 --- a/tubbymemes/templates/publish.html +++ b/tubbymemes/templates/publish.html @@ -2,9 +2,9 @@ {% include 'includes/head.html' %} + {% include 'includes/navbar.html' %}
- {% include 'includes/navbar.html' %}
diff --git a/tubbymemes/templates/remotes.html b/tubbymemes/templates/remotes.html index 185ebf5..e01c31e 100644 --- a/tubbymemes/templates/remotes.html +++ b/tubbymemes/templates/remotes.html @@ -2,10 +2,9 @@ {% include 'includes/head.html' %} + {% include 'includes/navbar.html' %}
- {% include 'includes/navbar.html' %} -