From 31068235111eddc307e85085185a7890a92c4938 Mon Sep 17 00:00:00 2001 From: TLSM Date: Mon, 30 May 2022 04:16:03 -0400 Subject: [PATCH] Rearrange nav icons, move some to sidebar. After the recent addition of the Lottershe, some narrow phone screens caused the header to wrap to two lines. Prompted by this, a more general rework of the header nav icons was initiated. Notably: random user, random post, all comments has been moved to sidebar on all sites, and a .sidebar-link CSS class was created to support it. Additionally, on rDrama, links for Badges and Marseys were added, since I believe these are presently inaccessible from the UI. Further, a Modlog link was added to be more accessible. Additionally, the icons in the header were rearranged on desktop and mobile to better fit relative priority. --- files/templates/header.html | 97 +++++++++++------------- files/templates/sidebar_Cringetopia.html | 6 ++ files/templates/sidebar_PCM.html | 6 ++ files/templates/sidebar_WPD.html | 6 ++ files/templates/sidebar_rDrama.html | 8 ++ files/templates/util/assetcache.html | 2 +- 6 files changed, 70 insertions(+), 55 deletions(-) diff --git a/files/templates/header.html b/files/templates/header.html index db2b59392..6bbeb6bd7 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -10,7 +10,7 @@
- {% if SITE == 'rdrama.net' %} + {% if SITE_NAME == 'rDrama' %} {% include "journoid_banner.html" %} {%- else -%} @@ -74,9 +74,21 @@ {% endif %} {% endif %} - {% if not err %} - - + {% if not err %} + {% if v and v.admin_level > 1 %} + + {% endif %} + + {% if v %} + + {% else %} + + {% endif %} + + {% if v -%} + + {%- endif %} + {% if v and LOTTERY_ENABLED %} {% endif %} - {% if v and v.admin_level > 1 %} - - {% endif %} - {% if v %} - - {% else %} - - {% endif %}
- {% else %} + {% else %}
  • Contact us
    • diff --git a/files/templates/sidebar_Cringetopia.html b/files/templates/sidebar_Cringetopia.html index 41fca9958..243d0c175 100644 --- a/files/templates/sidebar_Cringetopia.html +++ b/files/templates/sidebar_Cringetopia.html @@ -8,6 +8,12 @@ sidebar image +

    + + + +

    + {% if sub %} {% if sub.sidebar_html %}
    {{sub.sidebar_html|safe}}
    diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html index c4f7b742b..65158edc1 100644 --- a/files/templates/sidebar_PCM.html +++ b/files/templates/sidebar_PCM.html @@ -1,5 +1,11 @@
    +

    + + + +

    + {% if sub %} {% if sub.sidebar_html %}
    {{sub.sidebar_html|safe}}
    diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 94554f405..2c0a7bdfe 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -8,6 +8,12 @@ sidebar image +

    + + + +

    + {% if sub %} {% if sub.sidebar_html %}
    {{sub.sidebar_html|safe}}
    diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index ccb266e0d..bb0062960 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -52,6 +52,14 @@ set VISITORS_HERE_FLAVOR = [ {%- endif %}

    +

    + + + + + +

    + {% if sub %} {% if sub.sidebar_html %}
    {{sub.sidebar_html|safe}}
    diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index 5f1be641b..b67907e52 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -1,6 +1,6 @@ {%- set CACHE_VER = { - 'css/main.css': 285, + 'css/main.css': 286, 'css/4chan.css': 59, 'css/classic.css': 59,