From 8b7419082f04e5ba22e18d875f1e1ba2c91b0e6b Mon Sep 17 00:00:00 2001
From: Kappa Wingman <64772920+kappa-wingman@users.noreply.github.com>
Date: Thu, 28 May 2020 01:54:12 +0800
Subject: [PATCH] Collapse layout for sidebar archive.html Update the variables
 in sidebar recent_posts.html

---
 README.md                                    |  9 ++++--
 templates/includes/sidebar/archive.html      | 30 +++++++++++---------
 templates/includes/sidebar/recent_posts.html |  8 +++---
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 49f4514..b6125de 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,14 @@ Pelican-bootstrap3-nero is forked from pelican-bootstrap3 and customized. It is
 
 ## Usage
 
-All the parameters used by pelican-bootstrap3 are still usable.
+* Most of the parameters used by pelican-bootstrap3 are still usable.
+This theme changed a lot from the original theme.
+Some of the parameters may not work.
 
-We have new settings specific to this theme, also check CHANGELOG.rst
+* Know problems
+	* DISABLE_SIDEBAR_TITLE_ICONS may not be working
+
+* We have new settings specific to this theme, also check CHANGELOG.rst
 
 * Setup Cookie Consent 2
 	* COOKIE_CONSENT2 = True
diff --git a/templates/includes/sidebar/archive.html b/templates/includes/sidebar/archive.html
index 246512b..6a9a7b8 100644
--- a/templates/includes/sidebar/archive.html
+++ b/templates/includes/sidebar/archive.html
@@ -2,24 +2,28 @@
   {% from 'includes/sidebar/macros.jinja' import title %}
 
 <!-- Sidebar/Archive -->
-<section class="well">
-<!--<li class="list-group-item">-->
-  <h4>{{ title(_('Archive'), DISABLE_SIDEBAR_TITLE_ICONS) }}</h4>
-  <ul class="list-group" id="archive">
+<div class="well accordion" id="sb_accordion_Archive">
+  <div class="card">
+    <div class="card-header" id="sb_Archive_Heading">
+      <h2 class="mb-0">
+        <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#collapse_sb_Archive" aria-expanded="true" aria-controls="collapse_sb_Archive">
+          <i class="fa fa-chevron-up pull-left"></i>Archives
+        </button>
+      </h2>
+    </div>
+
+    <div id="collapse_sb_Archive" class="collapse multi-collapse" aria-labelledby="sb_Archive_Heading" data-parent="#sb_accordion_Archive">
     {% for year, date_year in dates|groupby( 'date.year' )|sort(reverse=True) %}
       {% for month, articles in date_year|groupby( 'date.month' )|sort(reverse=True) %}
-        <li class="list-group-item">
+        <p style="text-align: left">
           <a href="{{ SITEURL }}/{{ MONTH_ARCHIVE_SAVE_AS.format(date=articles[0].date) }}">
-            {%- if not DISABLE_SIDEBAR_TITLE_ICONS -%}
-            <i class="fa fa-calendar fa-lg"></i>
-            {%- endif -%}
-            {{ articles[0].date.strftime('%B') }} {{ year }} ({{ articles|count }})
+            *  {{ year }} {{ articles[0].date.strftime('%B') }} ({{ articles|count }})
           </a>
-        </li>
+       </p>
       {% endfor %}
     {% endfor %}
-  </ul>
-<!--</li>-->
-</section>
+    </div>
+  </div>
+</div>
 <!-- End Sidebar/Archive -->
 {% endif %}
diff --git a/templates/includes/sidebar/recent_posts.html b/templates/includes/sidebar/recent_posts.html
index 95e25a6..bdad5f5 100644
--- a/templates/includes/sidebar/recent_posts.html
+++ b/templates/includes/sidebar/recent_posts.html
@@ -4,17 +4,17 @@
     {% set RECENT_POST_COUNT = 5 %}
   {% endif %}
 
-<div class="well well-sm accordion" id="sb_accordion_Recent_Posts">
+<div class="well well-sm accordion" id="sb_accordion_RecentPosts">
   <div class="card">
-    <div class="card-header" id="sb_Recent_Posts_Heading">
+    <div class="card-header" id="sb_RecentPosts_Heading">
       <h2 class="mb-0">
-        <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+        <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#collapse_sb_RecentPosts" aria-expanded="true" aria-controls="collapse_sb_RecentPosts">
 	  <i class="fa fa-chevron-up pull-left"></i>Recent Posts
         </button>
       </h2>
     </div>
 
-    <div id="collapseOne" class="collapse multi-collapse" aria-labelledby="sb_Recent_Posts_Heading" data-parent="#sb_accordion_Recent_Posts">
+    <div id="collapse_sb_RecentPosts" class="collapse multi-collapse" aria-labelledby="sb_RecentPosts_Heading" data-parent="#sb_accordion_RecentPosts">
       <!-- <div class="card card-body"> -->
       <!-- <div class="well"> -->
       {% for article in articles[:RECENT_POST_COUNT] %}