From 8f36a1554e179b51de1f7e53b8543176ae9211d9 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 11 Jan 2020 06:42:47 +0000
Subject: [PATCH 1/7] The widget are now inflated by default as well

---
 view/templates/widget/filter.tpl                    | 4 ++--
 view/templates/widget/saved_searches.tpl            | 4 ++--
 view/templates/widget_forumlist.tpl                 | 4 ++--
 view/theme/frio/templates/widget/saved_searches.tpl | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/view/templates/widget/filter.tpl b/view/templates/widget/filter.tpl
index acb95ea23d..f710978d90 100644
--- a/view/templates/widget/filter.tpl
+++ b/view/templates/widget/filter.tpl
@@ -1,7 +1,7 @@
-<span id="{{$type}}-sidebar-inflated" class="widget fakelink" style="display: block;" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
+<span id="{{$type}}-sidebar-inflated" class="widget fakelink" style="display: none;" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div id="{{$type}}-sidebar" class="widget" style="display: none;">
+<div id="{{$type}}-sidebar" class="widget" style="display: block;">
 	<span class="fakelink" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
 		<h3>{{$title}}</h3>
 	</span>
diff --git a/view/templates/widget/saved_searches.tpl b/view/templates/widget/saved_searches.tpl
index 2baf1f1cbd..4b23ff9253 100644
--- a/view/templates/widget/saved_searches.tpl
+++ b/view/templates/widget/saved_searches.tpl
@@ -1,7 +1,7 @@
-<span id="saved-search-list-inflated" class="widget fakelink" style="display: block;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
+<span id="saved-search-list-inflated" class="widget fakelink" style="display: none;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div class="widget" id="saved-search-list" style="display: none;">
+<div class="widget" id="saved-search-list" style="display: block;">
 	<span class="fakelink" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
 		<h3 id="search">{{$title}}</h3>
 	</span>
diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index 272cdd92e8..a742a13b21 100644
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -11,10 +11,10 @@ function showHideForumlist() {
 	}
 }
 </script>
-<span id="forumlist-sidebar-inflated" class="widget fakelink" style="display: block;" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
+<span id="forumlist-sidebar-inflated" class="widget fakelink" style="display: none;" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div id="forumlist-sidebar" class="widget" style="display: none;">
+<div id="forumlist-sidebar" class="widget" style="display: block;">
 	<span class="fakelink" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
 		<h3 id="forumlist">{{$title}}</h3>
 	</span>
diff --git a/view/theme/frio/templates/widget/saved_searches.tpl b/view/theme/frio/templates/widget/saved_searches.tpl
index 645718e3ac..a974555069 100644
--- a/view/theme/frio/templates/widget/saved_searches.tpl
+++ b/view/theme/frio/templates/widget/saved_searches.tpl
@@ -1,8 +1,8 @@
 {{if $saved}}
-<span id="saved-search-list-inflated" class="widget fakelink" style="display: block;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
+<span id="saved-search-list-inflated" class="widget fakelink" style="display: none;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div class="widget" id="saved-search-list" style="display: none;">
+<div class="widget" id="saved-search-list" style="display: block;">
 	<span class="fakelink" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
 		<h3 id="search">{{$title}}</h3>
 	</span>

From cfeef7afeddc92bb4159b20b32c052b908458deb Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 11 Jan 2020 08:41:14 +0000
Subject: [PATCH 2/7] We now store the state in a cookie

---
 view/js/main.js                               | 44 +++++++++++++++++++
 view/templates/group_side.tpl                 |  7 ++-
 view/templates/widget/filter.tpl              |  9 ++--
 view/templates/widget/saved_searches.tpl      |  9 ++--
 view/templates/widget_forumlist.tpl           |  9 ++--
 view/theme/frio/templates/group_side.tpl      | 12 +++--
 .../frio/templates/widget/saved_searches.tpl  |  9 ++--
 7 files changed, 83 insertions(+), 16 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index 37975dd338..c6cf0a85b3 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -33,6 +33,50 @@ function _resizeIframe(obj, desth) {
 	setTimeout(_resizeIframe, 100, obj, ch);
 }
 
+function getCookie(name) {
+	var value = "; " + document.cookie;
+	var parts = value.split("; " + name + "=");
+
+	if (parts.length == 2) {
+		return parts.pop().split(";").shift();
+	}
+}
+
+function initWidget(inflated, deflated) {
+	var elInf = document.getElementById(inflated);
+	var elDef = document.getElementById(deflated);
+
+	if (!elInf || !elDef) {
+		return;
+	}
+	if (getCookie(window.location.pathname + ":" + inflated) != "none") {
+		elInf.style.display = "block";
+		elDef.style.display = "none";
+	} else {
+		elInf.style.display = "none";
+		elDef.style.display = "block";
+	}
+}
+
+function openCloseWidget(inflated, deflated) {
+	var elInf = document.getElementById(inflated);
+	var elDef = document.getElementById(deflated);
+
+	if (!elInf || !elDef) {
+		return;
+	}
+
+	if (window.getComputedStyle(elInf).display === "none") {
+		elInf.style.display = "block";
+		elDef.style.display = "none";
+		document.cookie = window.location.pathname + ":" + inflated + "=block";
+	} else {
+		elInf.style.display = "none";
+		elDef.style.display = "block";
+		document.cookie = window.location.pathname + ":" + inflated + "=none";
+	}
+}
+
 function openClose(theID) {
 	var el = document.getElementById(theID);
 	if (el) {
diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index 31b9287ba8..029a0464e2 100644
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -1,5 +1,10 @@
-<div class="widget" id="group-sidebar">
+<span id="group-sidebar-inflated" class="widget fakelink" style="display: none;" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
 	<h3>{{$title}}</h3>
+</span>
+<div class="widget" id="group-sidebar">
+	<span class="fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
+		<h3>{{$title}}</h3>
+	</span>
 
 	<div id="sidebar-group-list">
 		<ul role="menu" id="sidebar-group-ul">
diff --git a/view/templates/widget/filter.tpl b/view/templates/widget/filter.tpl
index f710978d90..557b8794be 100644
--- a/view/templates/widget/filter.tpl
+++ b/view/templates/widget/filter.tpl
@@ -1,8 +1,8 @@
-<span id="{{$type}}-sidebar-inflated" class="widget fakelink" style="display: none;" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
+<span id="{{$type}}-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div id="{{$type}}-sidebar" class="widget" style="display: block;">
-	<span class="fakelink" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
+<div id="{{$type}}-sidebar" class="widget">
+	<span class="fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');">
 		<h3>{{$title}}</h3>
 	</span>
 	<div id="{{$type}}-desc">{{$desc nofilter}}</div>
@@ -13,3 +13,6 @@
 		{{/foreach}}
 	</ul>
 </div>
+<script>
+initWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');
+</script>
diff --git a/view/templates/widget/saved_searches.tpl b/view/templates/widget/saved_searches.tpl
index 4b23ff9253..6957e706d2 100644
--- a/view/templates/widget/saved_searches.tpl
+++ b/view/templates/widget/saved_searches.tpl
@@ -1,8 +1,8 @@
-<span id="saved-search-list-inflated" class="widget fakelink" style="display: none;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
+<span id="saved-search-list-inflated" class="widget fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div class="widget" id="saved-search-list" style="display: block;">
-	<span class="fakelink" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
+<div class="widget" id="saved-search-list">
+	<span class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
 		<h3 id="search">{{$title}}</h3>
 	</span>
 	{{$searchbox nofilter}}
@@ -17,3 +17,6 @@
 	</ul>
 	<div class="clear"></div>
 </div>
+<script>
+initWidget('saved-search-list', 'saved-search-list-inflated');
+</script>
diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index a742a13b21..8f049d9b0f 100644
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -11,11 +11,11 @@ function showHideForumlist() {
 	}
 }
 </script>
-<span id="forumlist-sidebar-inflated" class="widget fakelink" style="display: none;" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
+<span id="forumlist-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div id="forumlist-sidebar" class="widget" style="display: block;">
-	<span class="fakelink" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
+<div id="forumlist-sidebar" class="widget">
+	<span class="fakelink" onclick="openCloseWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');">
 		<h3 id="forumlist">{{$title}}</h3>
 	</span>
 	<ul id="forumlist-sidbar-ul" role="menu">
@@ -46,3 +46,6 @@ function showHideForumlist() {
 		{{/if}}
 	</ul>
 </div>
+<script>
+initWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');
+</script>
diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
index 75983b36ee..0c5e76a05e 100644
--- a/view/theme/frio/templates/group_side.tpl
+++ b/view/theme/frio/templates/group_side.tpl
@@ -1,6 +1,11 @@
+<span id="group-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
+        <h3>{{$title}}</h3>
+</span>
 <div class="widget" id="group-sidebar">
 	<div id="sidebar-group-header">
-		<h3>{{$title}}</h3>
+		<span class="fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
+			<h3>{{$title}}</h3>
+		</span>
 		{{if ! $newgroup}}
 		<a class="group-edit-tool pull-right widget-action faded-icon" id="sidebar-edit-group" href="{{$grouppage}}" data-toggle="tooltip" title="{{$editgroupstext}}">
 			<i class="fa fa-pencil" aria-hidden="true"></i>
@@ -49,6 +54,7 @@
 			{{if $ungrouped}}<li class="{{if $ungrouped_selected}}selected{{/if}} sidebar-group-li" id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></li>{{/if}}
 		</ul>
 	</div>
-
-
 </div>
+<script>
+initWidget('group-sidebar', 'group-sidebar-inflated');
+</script>
diff --git a/view/theme/frio/templates/widget/saved_searches.tpl b/view/theme/frio/templates/widget/saved_searches.tpl
index a974555069..88a6906678 100644
--- a/view/theme/frio/templates/widget/saved_searches.tpl
+++ b/view/theme/frio/templates/widget/saved_searches.tpl
@@ -1,9 +1,9 @@
 {{if $saved}}
-<span id="saved-search-list-inflated" class="widget fakelink" style="display: none;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
+<span id="saved-search-list-inflated" class="widget fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
 	<h3>{{$title}}</h3>
 </span>
-<div class="widget" id="saved-search-list" style="display: block;">
-	<span class="fakelink" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
+<div class="widget" id="saved-search-list">
+	<span class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
 		<h3 id="search">{{$title}}</h3>
 	</span>
 	<ul role="menu" id="saved-search-ul">
@@ -18,4 +18,7 @@
 	</ul>
 	<div class="clearfix"></div>
 </div>
+<script>
+initWidget('saved-search-list', 'saved-search-list-inflated');
+</script>
 {{/if}}

From 579fd2962eebd981475a4a597be7a4970a5769b1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 11 Jan 2020 09:05:43 +0000
Subject: [PATCH 3/7] Some more widgets added

---
 view/templates/widget/posted_date.tpl   | 10 +++++++++-
 view/templates/widget/tagcloud.tpl      | 11 +++++++++--
 view/templates/widget/trending_tags.tpl | 10 +++++++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/view/templates/widget/posted_date.tpl b/view/templates/widget/posted_date.tpl
index 42c04d2266..0d5490d98f 100644
--- a/view/templates/widget/posted_date.tpl
+++ b/view/templates/widget/posted_date.tpl
@@ -11,8 +11,13 @@ function showHideDates() {
 }
 </script>
 
-<div id="datebrowse-sidebar" class="widget">
+<span id="datebrowse-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');">
 	<h3>{{$title}}</h3>
+</span>
+<div id="datebrowse-sidebar" class="widget">
+	<span class="fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');">
+		<h3>{{$title}}</h3>
+	</span>
 	<ul id="posted-date-selector" class="datebrowse-ul">
 		{{foreach $dates as $y => $arr}}
 
@@ -41,3 +46,6 @@ function showHideDates() {
 	</ul>
 	{{/if}}
 </div>
+<script>
+initWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');
+</script>
diff --git a/view/templates/widget/tagcloud.tpl b/view/templates/widget/tagcloud.tpl
index fd007c9c10..e0301e722e 100644
--- a/view/templates/widget/tagcloud.tpl
+++ b/view/templates/widget/tagcloud.tpl
@@ -1,6 +1,10 @@
-
-<div class="tagblock widget">
+<span id="tagblock-inflated" class="widget fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');">
 	<h3>{{$title}}</h3>
+</span>
+<div class="tagblock widget">
+	<span class="fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');">
+		<h3>{{$title}}</h3>
+        </span>
 
 	<div class="tag-cloud">
 		{{foreach $tags as $tag}}
@@ -11,3 +15,6 @@
 	</div>
 	<div class="tagblock-widget-end clear"></div>
 </div>
+<script>
+initWidget('tagblock', 'tagblock-inflated');
+</script>
diff --git a/view/templates/widget/trending_tags.tpl b/view/templates/widget/trending_tags.tpl
index a2788af653..072d72831c 100644
--- a/view/templates/widget/trending_tags.tpl
+++ b/view/templates/widget/trending_tags.tpl
@@ -1,5 +1,10 @@
-<div id="trending-tags-sidebar" class="widget">
+<span id="trending-tags-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
 	<h3>{{$title}}</h3>
+</span>
+<div id="trending-tags-sidebar" class="widget">
+	<span class="fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
+		<h3>{{$title}}</h3>
+	</span>
 	<ul>
 {{section name=ol loop=$tags max=10}}
 		<li><a href="search?tag={{$tags[ol].term}}">#{{$tags[ol].term}}</a></li>
@@ -16,3 +21,6 @@
 	</details>
 {{/if}}
 </div>
+<script>
+initWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');
+</script>

From f801e55d1582600fa6bceeccd01851ef0cb099ea Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 11 Jan 2020 09:10:22 +0000
Subject: [PATCH 4/7] "init" function for sidebar added

---
 view/templates/group_side.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index 029a0464e2..2aca4cdf45 100644
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -1,4 +1,4 @@
-<span id="group-sidebar-inflated" class="widget fakelink" style="display: none;" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
+<span id="group-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
 	<h3>{{$title}}</h3>
 </span>
 <div class="widget" id="group-sidebar">
@@ -43,5 +43,6 @@
 
 	{{if $ungrouped}}<div id="sidebar-ungrouped"><a class="{{if $ungrouped_selected}}group-selected{{/if}}" href="nogroup">{{$ungrouped}}</a></div>{{/if}}
 </div>
-
-
+<script>
+initWidget('group-sidebar', 'group-sidebar-inflated');
+</script>

From e1ed4c604be10a7a30d29f2120935614f5969a42 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 11 Jan 2020 09:33:52 +0000
Subject: [PATCH 5/7] Added open/close indicator for Frio

---
 view/theme/frio/css/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index c8dfdc1441..ae925ebbac 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2932,10 +2932,12 @@ details.profile-jot-net[open] summary:before {
 .fakelink > h3:before {
     padding-right: 10px;
 }
+.widget.fakelink > h3:before,
 .settings-block.fakelink > h3:before {
     font-family: ForkAwesome;
     content: "\f0da"; /* Right Plain Pointer */
 }
+.widget > .fakelink > h3:before,
 .settings-block > .fakelink > h3:before {
     font-family: ForkAwesome;
     content: "\f0d7"; /* Bottom Plain Pointer */

From d46a940d20b57aa064f9e3914f95e7ccea1686bf Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 11 Jan 2020 09:40:10 +0000
Subject: [PATCH 6/7] Group sidebar now has got the indicator as well

---
 view/theme/frio/css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index ae925ebbac..2ae29f1063 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2938,6 +2938,7 @@ details.profile-jot-net[open] summary:before {
     content: "\f0da"; /* Right Plain Pointer */
 }
 .widget > .fakelink > h3:before,
+#sidebar-group-header > .fakelink > h3:before,
 .settings-block > .fakelink > h3:before {
     font-family: ForkAwesome;
     content: "\f0d7"; /* Bottom Plain Pointer */

From d9f26aed66df02b64501dee7ccfb3506c4585201 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 12 Jan 2020 12:56:44 +0000
Subject: [PATCH 7/7] Use local storage

---
 view/js/main.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/view/js/main.js b/view/js/main.js
index c6cf0a85b3..a5aa6d434e 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -33,15 +33,6 @@ function _resizeIframe(obj, desth) {
 	setTimeout(_resizeIframe, 100, obj, ch);
 }
 
-function getCookie(name) {
-	var value = "; " + document.cookie;
-	var parts = value.split("; " + name + "=");
-
-	if (parts.length == 2) {
-		return parts.pop().split(";").shift();
-	}
-}
-
 function initWidget(inflated, deflated) {
 	var elInf = document.getElementById(inflated);
 	var elDef = document.getElementById(deflated);
@@ -49,7 +40,7 @@ function initWidget(inflated, deflated) {
 	if (!elInf || !elDef) {
 		return;
 	}
-	if (getCookie(window.location.pathname + ":" + inflated) != "none") {
+	if (localStorage.getItem(window.location.pathname + ":" + inflated) != "none") {
 		elInf.style.display = "block";
 		elDef.style.display = "none";
 	} else {
@@ -69,11 +60,11 @@ function openCloseWidget(inflated, deflated) {
 	if (window.getComputedStyle(elInf).display === "none") {
 		elInf.style.display = "block";
 		elDef.style.display = "none";
-		document.cookie = window.location.pathname + ":" + inflated + "=block";
+		localStorage.setItem(window.location.pathname + ":" + inflated, "block");
 	} else {
 		elInf.style.display = "none";
 		elDef.style.display = "block";
-		document.cookie = window.location.pathname + ":" + inflated + "=none";
+		localStorage.setItem(window.location.pathname + ":" + inflated, "none");
 	}
 }