From a59034c25cfaa4271ac04442274bf9c1d09a172a Mon Sep 17 00:00:00 2001
From: Tobi <t.rechel@gmx.de>
Date: Sun, 21 Dec 2014 20:19:09 +0100
Subject: [PATCH] clearstate

---
 mojotrollz/dbd/qq/GET_TOPICS_BY_FAQ.php        |  5 +++--
 .../user_nexus_menu/tpl/user_nexus_menu.tpl    | 18 ++++++++++--------
 .../user_nexus_menu_sub_topics_bulletin.tpl    | 10 +++++++++-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/mojotrollz/dbd/qq/GET_TOPICS_BY_FAQ.php b/mojotrollz/dbd/qq/GET_TOPICS_BY_FAQ.php
index 70d63d1..9d5b63a 100644
--- a/mojotrollz/dbd/qq/GET_TOPICS_BY_FAQ.php
+++ b/mojotrollz/dbd/qq/GET_TOPICS_BY_FAQ.php
@@ -7,9 +7,10 @@ class GET_TOPICS_BY_FAQ extends \SYSTEM\DB\QQ {
 //pg            
 '',
 //mys
-'SELECT mojotrollz_tags.*,mojotrollz_tags_type.name as tag_name,mojotrollz_tags_value.value as tag_value FROM mojotrollz_tags 
+'SELECT mojotrollz_tags.*,mojotrollz_tags_type.name as tag_name,mojotrollz_tags_value.value as tag_value, mojotrollz_topics .* FROM mojotrollz_tags 
 LEFT JOIN mojotrollz_tags_type ON mojotrollz_tags.type=mojotrollz_tags_type.id 
-RIGHT JOIN mojotrollz_tags_value ON mojotrollz_tags.type=mojotrollz_tags_value.type AND mojotrollz_tags.value=mojotrollz_tags_value.id 
+LEFT JOIN mojotrollz_tags_value ON mojotrollz_tags.type=mojotrollz_tags_value.type AND mojotrollz_tags.value=mojotrollz_tags_value.id
+LEFT JOIN mojotrollz_topics ON mojotrollz_tags.id=mojotrollz_topics.id 
 WHERE mojotrollz_tags.`table` = 7 AND
 		mojotrollz_tags.`type` = 12 AND
 		mojotrollz_tags_type.`table` = 7'
diff --git a/mojotrollz/page/user_nexus_menu/tpl/user_nexus_menu.tpl b/mojotrollz/page/user_nexus_menu/tpl/user_nexus_menu.tpl
index bfd474a..4b9928c 100644
--- a/mojotrollz/page/user_nexus_menu/tpl/user_nexus_menu.tpl
+++ b/mojotrollz/page/user_nexus_menu/tpl/user_nexus_menu.tpl
@@ -10,14 +10,16 @@
     <button class="btn btn_blue no_deco" id="btn_nexus_menu_topics" href="#user_nexus_topics">Topics</button>
     <div style="width: 100%;" id="nexus_content_topics"></div>
 </div>
-<div class="window_bg2" style="float: left; padding: 20px; width: 70%;" id="nexus_list">
-    <div style="float: left; width: 50%;">
-        <img width="400" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wizard_start&id=help_gnome.png"/>
-    </div>
+<table class="window_bg2" style="float: left; padding: 20px; width: 70%;" id="nexus_list">
+    <tr>
+        <td>
+            <img width="400" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wizard_start&id=help_gnome.png"/>
+        </td>
     
-    <div style="float: left; width: 50%;">
+    
+    <td>
     <H3>Social Web Section</H3>
     <p>Welcome to the mingling Section. It's currently under construction,so gtfo. Thanks.</p>
-    </div>
-    
-</div>
\ No newline at end of file
+    </td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/mojotrollz/page/user_nexus_menu_sub/tpl/user_nexus_menu_sub_topics_bulletin.tpl b/mojotrollz/page/user_nexus_menu_sub/tpl/user_nexus_menu_sub_topics_bulletin.tpl
index 0a8ec99..2bf3e56 100644
--- a/mojotrollz/page/user_nexus_menu_sub/tpl/user_nexus_menu_sub_topics_bulletin.tpl
+++ b/mojotrollz/page/user_nexus_menu_sub/tpl/user_nexus_menu_sub_topics_bulletin.tpl
@@ -1 +1,9 @@
-${id}
+    <tr>
+        <td>
+          ${title}  
+        </td>
+        <td>
+          ${by}  
+        </td>
+    </tr>
+