From 590be2077917fbeb3ee169604bef99b42029ffba Mon Sep 17 00:00:00 2001
From: Radek Czajka <rczajka@rczajka.pl>
Date: Sat, 6 Jun 2020 22:08:49 +0200
Subject: [PATCH] Menu reorder.

---
 src/club/templates/club/membership_form.html   |  5 ++++-
 src/wolnelektury/templates/base/superbase.html | 16 ++++++++--------
 src/wolnelektury/templates/main_page.html      |  2 ++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/club/templates/club/membership_form.html b/src/club/templates/club/membership_form.html
index 480d65186..36cd0528a 100644
--- a/src/club/templates/club/membership_form.html
+++ b/src/club/templates/club/membership_form.html
@@ -11,6 +11,9 @@
 
   <style>
 
+   .plan-select {
+       margin-bottom: 15px;
+   }
 .methods {
  color: #888;
 line-height: 30px;
@@ -167,7 +170,7 @@ vertical-align: middle;
 
         {{ form.amount }}
         {{ form.monthly }}
-        <div>
+        <div class="plan-select">
           <span class="button plan-toggle" data-plan="plan-single" data-monthly="False">jednorazowo</span>
           <span class="button plan-toggle active" data-plan="plan-monthly" data-monthly="True">miesięcznie</span>
         </div>
diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index 1edf11f8c..33344bd52 100644
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -108,6 +108,9 @@
                 </ul>
 
                 <ul id="main-menu">
+                  <li{% if active_menu_item == 'club' %} class="active"{% endif %}>
+                    <a href="{% url 'club_join' %}">{% trans "Wesprzyj nas" %}</a>
+                  </li>
                   <li{% if active_menu_item == 'books' %} class="active"{% endif %}>
                     <a href="{% url 'book_list' %}">{% trans "Literature" %}</a>
                   </li>
@@ -117,14 +120,11 @@
                   <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
                     <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
                   </li>
-                  <!--li{% if active_menu_item == 'club' %} class="active"{% endif %}>
-                    <a href="{% url 'club_join' %}">{% trans "Wesprzyj nas" %}</a>
-                  </li-->
-                  {% url 'infopage' 'wesprzyj-nas' as u %}
-		  <li{% if request.path == u %} class="active"{% endif %}>
-		    <a href="{{ u }}">{% trans "Donate 1%" %}</a>
-                  <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
-                    <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
+                  {% url 'subscribe' as u %}
+                  <li{% if request.path == u %} class="active"{% endif %}>
+                    <a href="{{ u }}">
+                      {% trans "Newsletter" %}
+                    </a>
                   </li>
                 </ul>
               </nav>
diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index 2d168c6ff..74eaec928 100644
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -80,6 +80,8 @@
         <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
         <li><a href="{% url 'reporting_catalogue_pdf' %}">{% trans "Download the catalogue in PDF format." %}</a></li>
 	<li><a href="{% url 'gallery' %}">{% trans "Gallery" %}</a></li>
+        <li><a href="{% url 'catalogue' %}">{% trans "All works" %}</a></li>
+
         <li><a href="{% url 'dictionary_notes' %}">{% trans "Footnotes" %}</a></li>
         <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
         <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
-- 
2.20.1