Merge branch 'master' of mojotrollz.eu:wow-server/mojo_zero_web into pagestate

This commit is contained in:
Ulf Gebhardt 2014-12-21 20:55:25 +01:00
commit d5a52b3994
3 changed files with 22 additions and 11 deletions

View File

@ -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'

View File

@ -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>
</td>
</tr>
</table>

View File

@ -1 +1,9 @@
${id}
<tr>
<td>
${title}
</td>
<td>
${by}
</td>
</tr>