From 4b21512f56060cada46440aac7091a7ab9595681 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 17 Nov 2015 19:56:32 +0100
Subject: [PATCH 1/4] This is a quick fix for the the forumlist.

---
 view/templates/widget_forumlist.tpl | 10 +++++-----
 view/theme/vier/style.css           | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index 4d155fd0a..0298dc6ff 100644
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -18,7 +18,7 @@ function showHideForumlist() {
 
 	{{foreach $forums as $forum}}
 		{{if $forum.id <= $visible_forums}}
-		<div class="forum-widget-entry" id="forum-widget-entry" role="menuitem">
+		<div class="forum-widget-entry" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
@@ -27,7 +27,7 @@ function showHideForumlist() {
 		{{/if}}
 	
 		{{if $forum.id > $visible_forums}}
-		<div class="forum-widget-entry" id="forum-widget-entry-extended" role="menuitem" style="display: none;">
+		<div class="forum-widget-entry" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
@@ -37,9 +37,9 @@ function showHideForumlist() {
 	{{/foreach}}
 
 	{{if $total > $visible_forums }}
-	<ul class="forum-widget-ul">
-		<li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="fakelink tool">{{$showmore}}</li>
-	</ul>
+	<div id="forum-widget-showmore" class="forum-widget-entry" role="menuitem">
+		<a onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link">{{$showmore}}</a>
+	</div>
 	{{/if}}
 
 </div>
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index a59d7a9df..db96be9fb 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -401,7 +401,7 @@ code {
 }
 
 .sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover,
-#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover, #forum-list-right div:hover,
+#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar div:hover, #forum-list-right div:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover {
   /* background-color: #ddd; */
 /*  background-color: #e5e5e5; */
@@ -420,7 +420,7 @@ code {
   font-weight: bold;
 }
 
-#sidebar-new-group, #hide-forum-list, #forum-list, #forum-list-right, #sidebar-ungrouped,
+#forum-widget-showmore, #sidebar-new-group, #hide-forum-list, #forum-list-right, #sidebar-ungrouped,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
   padding-left: 10px;
   padding-top: 3px;
@@ -429,6 +429,17 @@ code {
   display: block;
 }
 
+#forumlist-sidebar {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  display: block;
+}
+
+.forum-widget-entry {
+  padding-left: 10px;
+  padding-right: 5px;
+}
+
 a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a {
   display: block;
   color: #737373;
@@ -456,11 +467,11 @@ a.sidebar-group-element {
   color: black;
 }
 
-#forum-list a, #forum-list-right a, .tool a, .admin.link a {
+#forumlist-sidebar a, #forum-list-right a, .tool a, .admin.link a {
   color: #737373;
 }
 
-#forum-list, #forum-list-right {
+#forumlist-sidebar, #forum-list-right {
   margin-top: 2px;
 }
 

From a9444ec7742878fb7ac23b866e26df2f4adb85bc Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 17 Nov 2015 20:11:06 +0100
Subject: [PATCH 2/4] The mobile.css was commented out ...

---
 view/theme/vier/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 3ab1c7edb..a7f8ea99a 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -33,7 +33,7 @@ function vier_init(&$a) {
 		$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
 		$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
 	}
-		#$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
+		$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
 
 $a->page['htmlhead'] .= <<< EOT
 <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />

From cd059aa68f2647f6044870d1eda8b0d4d28645e1 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 17 Nov 2015 20:31:40 +0100
Subject: [PATCH 3/4] Some SQL fixes

---
 include/forums.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/forums.php b/include/forums.php
index e604a3156..d8da36cc5 100644
--- a/include/forums.php
+++ b/include/forums.php
@@ -2,13 +2,13 @@
 
 /**
  * @file include/forums.php
- * @brief Functions related to forum functionality * 
+ * @brief Functions related to forum functionality *
  */
 
 
 /**
  * @brief Function to list all forums a user is connected with
- * 
+ *
  * @param int $uid of the profile owner
  * @param boolean $showhidden
  *	Show frorums which are not hidden
@@ -16,7 +16,7 @@
  *	Sort by lastitem
  * @param boolean $showprivate
  *	Show private groups
- * 
+ *
  * @returns array
  *	'url'	=> forum url
  *	'name'	=> forum name
@@ -27,16 +27,17 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
 
 	$forumlist = array();
 
-	$order = (($showhidden) ? '' : ' AND `hidden` = 0 ');
-	$order .= (($lastitem) ? ' ORDER BY `last-item` ASC ' : ' ORDER BY `name` ASC ');
-	$select = '`forum` = 1';
+	$order = (($showhidden) ? '' : ' AND NOT `hidden` ');
+	$order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
+	$select = '`forum` ';
 	if ($showprivate) {
-		$select = '( `forum` = 1 OR `prv` = 1 )';
+		$select = '(`forum` OR `prv`)';
 	}
 
-	$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM contact 
+	$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM `contact`
 			WHERE `network`= 'dfrn' AND $select AND `uid` = %d
-			AND `blocked` = 0 AND `hidden` = 0 AND `pending` = 0 AND `archive` = 0
+			AND NOT `blocked` AND NOT `hidden` AND NOT `pending` AND NOT `archive`
+			AND `success_update` > `failure_update`
 			$order ",
 			intval($uid)
 	);

From 5a1f763de0b8f663498add07ad35910bcb6329d5 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 17 Nov 2015 20:39:30 +0100
Subject: [PATCH 4/4] The mobile.css seems to only work for mobiles at the
 moment.

---
 view/theme/vier/theme.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a7f8ea99a..3c808b52a 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -33,7 +33,8 @@ function vier_init(&$a) {
 		$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
 		$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
 	}
-		$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
+		// deactivated since it doesn't work with desktop browsers at the moment (To-Do)
+		//$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
 
 $a->page['htmlhead'] .= <<< EOT
 <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />