blog: Make menu responsive by moving it into header

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/base.html b/src/templates/base.html
index 234d4fc9403c1ebb6b6487804671375388d09f5a..727a86a8fc00f5bafa65531deef4699ff1096937 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -65,6 +65,44 @@
                                                </button>
                                        
                                                <div class="collapse navbar-collapse" id="navbar">
+                                                       <ul class="navbar-nav ml-auto d-lg-none">
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">
+                                                                               {{ _("Newest") }}
+                                                                       </a>
+                                                               </li>
+
+                                                               {% if current_user %}
+                                                                       <li class="nav-item">
+                                                                               <a class="nav-link {% if request.path == "/drafts" %}active{% end %}" href="/drafts">
+                                                                                       {{ _("My Drafts") }}
+                                                                               </a>
+                                                                       </li>
+                                                               {% end %}
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link {% if request.path == "/tags/featured" %}active{% end %}" href="/tags/featured">
+                                                                               {{ _("Featured") }}
+                                                                       </a>
+                                                               </li>
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link {% if request.path == "/tags/lightningwirelabs.com" %}active{% end %} d-flex justify-content-between"
+                                                                                       href="/tags/lightningwirelabs.com">
+                                                                               <span>{{ _("Lightning Wire Labs") }}</span>
+
+                                                                               <img class="img-fluid" src="{{ static_url("img/lightningwirelabs-logo.svg") }}"
+                                                                                       alt="{{ _("Lightning Wire Labs") }}">
+                                                                       </a>
+                                                               </li>
+
+                                                               <li class="nav-item">
+                                                                       <a class="nav-link d-flex justify-content-between" href="/feed.xml">
+                                                                               <span>{{ _("RSS Feed") }}</span> <span class="fas fa-rss"></span>
+                                                                       </a>
+                                                               </li>
+                                                       </ul>
+
                                                        <form class="form-inline ml-auto my-2 my-lg-0" action="/search" method="GET">
                                                                <input class="form-control form-control-sm mr-sm-2" type="search" name="q"
                                                                        placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">

diff --git a/src/templates/blog/author.html b/src/templates/blog/author.html
index 8ed4d01d09653786ae793357193ec8b6ee5440f8..b4009f01a13307c60fff40ac47a54c5cceecd639 100644 (file)
--- a/src/templates/blog/author.html
+++ b/src/templates/blog/author.html
@@ -11,13 +11,3 @@
                </div>
        </div>
 {% end block %}
-
-{% block right %}
-       <div class="col-md-3 text-center">
-               <img class="img-fluid rounded-circle mb-4" src="{{ author.avatar_url(160) }}" alt="{{ author.name }}" />
-
-               <p>{{ author.name }}</p>
-
-               <a href="mailto:{{ author.email }}">Email</a>
-       </div>
-{% end block %}

diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
index 58cf769fab564cdcc76b0d2559380000d6cb06c7..eceb8eba2ff1c539d2b8eadd41c735fd1a25b2df 100644 (file)
--- a/src/templates/blog/base.html
+++ b/src/templates/blog/base.html
@@ -6,7 +6,7 @@
 
 {% block content %}
        <div class="row">
-               <div class="col-12 col-md-3">
+               <div class="col-12 col-lg-3 d-none d-lg-block">
                        <nav class="mb-5">
                                <ul class="nav flex-column">
                                        <li class="nav-item">
@@ -50,10 +50,8 @@
                        {% module BlogHistoryNavigation() %}
                </div>
 
-               <div class="col">
+               <div class="col-12 col-lg-9">
                        {% block main %}{% end block %}
                </div>
-
-               {% block right %}{% end block %}
        </div>
 {% end block %}