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

mojotrollz/api/api_mojotrollz.php

@@ -6,4 +6,9 @@ class api_mojotrollz extends \SYSTEM\API\api_system {
         return \SYSTEM\LOG\JsonResult::toString($result);}
      public static function call_charcreation($json=NULL){
          return charcreation::data($json);}
+     public static function call_quest($entry){
+        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
+            throw new ERROR("You need to be logged in to view this ressource.");}
+            $quest = quest::test($entry);
+        return $quest;}
 }

mojotrollz/api/autoload.inc.php

@@ -6,4 +6,7 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/world','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/database','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char/qq','DBD');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client','');
+
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD');

mojotrollz/api/quest/qq/GET_BASE_DATA.php

@@ -0,0 +1,13 @@
+<?php
+namespace DBD;
+
+class GET_BASE_DATA extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM quest_template WHERE entry = ?;',
+new \DBD\mangos_world()
+);}}
+

mojotrollz/api/quest/qq/GET_CREATURE_QUESTRELATION.php

@@ -0,0 +1,12 @@
+<?php
+namespace DBD;
+
+class GET_CREATURE_QUESTRELATION extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM creature_questrelation LEFT JOIN creature_template ON (creature_questrelation.id = creature_template.entry) WHERE quest = ?;',
+new \DBD\mangos_world()
+);}}

mojotrollz/api/quest/qq/GET_ITEM_QUESTRELATION.php

@@ -0,0 +1,12 @@
+<?php
+namespace DBD;
+
+class GET_ITEM_QUESTRELATION extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM item_template WHERE startquest = ?;',
+new \DBD\mangos_world()
+);}}

mojotrollz/api/quest/qq/GET_OBJECT_QUESTRELATION.php

@@ -0,0 +1,12 @@
+<?php
+namespace DBD;
+
+class GET_OBJECT_QUESTRELATION extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM gameobject_questrelation LEFT JOIN gameobject_template ON (gameobject_questrelation.id = gameobject_template.entry) WHERE quest = ?;',
+new \DBD\mangos_world()
+);}}

mojotrollz/api/quest/quest.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of quest
+ *
+ * @author Nael
+ */
+class quest {
+    
+    public static function test($entry){
+        $vars = '';
+        $vars = \DBD\GET_BASE_DATA::Q1(array($entry));
+        $vars['creature_questrelation'] = quest::get_creature_questrelation($entry);
+        $vars['item_questrelation'] = quest::get_item_questrelation($entry);
+        $vars['object_questrelation'] = quest::get_object_questrelation($entry);
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'quest/tpl/quest.tpl'), $vars);
+    }
+    
+    public static function get_creature_questrelation($entry){
+        $result = '';
+        $questrelation = \DBD\GET_CREATURE_QUESTRELATION::QQ(array($entry));
+        while ($rel = $questrelation->next()){
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'quest/tpl/creature_questrelation.tpl'), $rel);           
+        }
+        return $result;
+    }
+    
+    public static function get_item_questrelation($entry){
+        $result = '';
+        $questrelation = \DBD\GET_ITEM_QUESTRELATION::QQ(array($entry));
+        while ($rel = $questrelation->next()){
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'quest/tpl/item_questrelation.tpl'), $rel);           
+        }
+        return $result;
+    }
+    
+    public static function get_object_questrelation($entry){
+        $result = '';
+        $questrelation = \DBD\GET_OBJECT_QUESTRELATION::QQ(array($entry));
+        while ($rel = $questrelation->next()){
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'quest/tpl/object_questrelation.tpl'), $rel);           
+        }
+        return $result;
+    }
+            
+}

mojotrollz/api/quest/tpl/creature_questrelation.tpl

@@ -0,0 +1 @@
+${Name}

mojotrollz/api/quest/tpl/item_questrelation.tpl

@@ -0,0 +1 @@
+${name}

mojotrollz/api/quest/tpl/object_questrelation.tpl

@@ -0,0 +1 @@
+${name}

mojotrollz/api/quest/tpl/quest.tpl

@@ -0,0 +1,51 @@
+<table>
+    <tr>
+    <td>
+        <p>${Title}<br>
+            No.${entry}<p>
+    </td>
+    <td>
+        
+    </td>
+    <td>
+        <p>
+        min. Level:&nbsp;&nbsp;${MinLevel}<br>
+        QuestLevel:&nbsp;${QuestLevel}
+        </p>
+    </td>
+
+</tr>
+<tr class="spacer"></tr>
+<tr>
+    <td>
+        <p>
+            Obtainable from:<br>
+            <a href="#">${creature_questrelation}</a>
+            <a href="#">${item_questrelation}</a>
+            <a href="#">${object_questrelation}</a>
+        </p> 
+    </td>
+    <td>
+         
+    </td>
+</tr>
+<tr>
+    <td style="max-width: 400px;">
+        <p>
+          Details:<br>
+        ${Details}  
+        </p>  
+    </td>
+</tr>
+<tr class="spacer"></tr>
+<tr>
+    <td style="max-width: 400px;">
+        <p>
+           Objectives:<br>
+        ${Objectives} 
+        </p>
+    </td>
+</tr>
+</table>
+
+

mojotrollz/page/user_achievements_content/js/user_achievements_content.js

@@ -0,0 +1,7 @@
+function init_user_achievements_content(){
+    alert('init');
+    console.log('init');
+    $(".btn_quest_info").click(function(){
+        $('#achievement_list').load('./?page=user_achievements_content_quest&entry=' + $(this).attr('entry'));
+    });
+}

mojotrollz/page/user_achievements_content/tpl/quest_element.tpl

@@ -1,14 +1,15 @@
 <tr class="element_bg2">
     <td>
-        <a href="http://www.wowhead.com/quest=${entry}/" target="_blank">${Title}</a>
+        <p>${Title}<br>
-        <p>Min&nbsp;Lvl:&nbsp;${MinLevel}<br>
+        Min&nbsp;Lvl:&nbsp;${MinLevel}<br>
         Quest&nbsp;Lvl:&nbsp;${QuestLevel}</p>
+        <button class="btn btn_menu_add btn_quest_info" entry="${entry}" href="#">Detail</button>
     </td>
     
     <td style="min-width: 170px;">
-        <p>Previous Quest: ${PrevQuestId}<br>
+        ${prevquest}<br>
-        Next Quest: ${NextQuestId}<br>
+        ${nextquest}
-        Next Quest in Chain: ${NextQuestInChain}</p>
+        <p></p>
     </td>
     
     <td style="max-width: 450px;">

mojotrollz/page/user_achievements_content/user_achievements_content.php

@@ -8,7 +8,7 @@ class user_achievements_content extends SYSTEM\PAGE\Page {
         $this->filter = $filter;
     }
     public static function js(){
-        return array();}
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'user_achievements_content/js/user_achievements_content.js'));}
       
     public static function css (){
        return array();}
@@ -68,158 +68,53 @@ class user_achievements_content extends SYSTEM\PAGE\Page {
     }
     
     private function menu_creature(){
-        switch($this->filter){
+        $result = '';
-            case 1:
+        $data = \DBD\CREATURE_TYPE::QQ(array($this->filter));
-                $result = '';
+        while($row=$data->next()){    
-                $data = \DBD\CREATURE_TYPE::QQ(array(1));
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 2:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(2));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 3:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(3));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 4:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(4));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 5:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(5));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 6:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(6));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 7:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(7));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 8:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(8));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 9:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(9));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 10:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(10));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 11:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(11));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 12:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(12));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            
-                default:
-                return 'filter fail';
         }
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
     }
     
     private function menu_quest(){
+        $_filter = null;
         switch($this->filter){
             case 1:
-                $result = '';
+                $_filter = 81;
-                $data = \DBD\QUEST_TYPE::QQ(array(81));
+                break;
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
             case 2:
-                $result = '';
+                $_filter = 62;
-                $data = \DBD\QUEST_TYPE::QQ(array(62));
+                break;
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
             case 3:
-                $result = '';
+                $_filter = 1;
-                $data = \DBD\QUEST_TYPE::QQ(array(1));
+                break;
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
             case 4:
-                $result = '';
+                $_filter = 83;
-                $data = \DBD\QUEST_TYPE::QQ(array(83));
+                break;
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
             case 5:
-                $result = '';
+                $_filter = 84;
-                $data = \DBD\QUEST_TYPE::QQ(array(84));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
-           
             case 7:
-                $result = '';
+                $_filter = 41;
-                $data = \DBD\QUEST_TYPE::QQ(array(41));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-             
             case 8:
-                $result = '';
+                $_filter = 0;                
-                $data = \DBD\QUEST_TYPE::QQ(array(0));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-                
             default:
                 return 'filter fail';
         }
+        
+        $result = '';
+        $data = \DBD\QUEST_TYPE::QQ(array($_filter));
+        while($row=$data->next()){
+            $row['prevquest'] = '';
+            if ($row['PrevQuestId']){
+              $row['prevquest'] = 'Previous:&nbsp;<a class=" btn_quest_info" entry="${PrevQuestId}" href="#">'.\DBD\GET_BASE_DATA::Q1(array($row['PrevQuestId']))['Title'].'</a>';  
+            }
+            $row['nextquest'] = '';
+            if ($row['NextQuestId']){
+              $row['nextquest'] = 'Next:&nbsp;<a class=" btn_quest_info" entry="${NextQuestId}" href="#">'.\DBD\GET_BASE_DATA::Q1(array($row['NextQuestId']))['Title'].'</a';  
+            }
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
+        }
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
     }
     
     private function menu_item(){
@@ -346,6 +241,7 @@ class user_achievements_content extends SYSTEM\PAGE\Page {
     }
      
     public function html(){
+        
         switch($this->menu){
             case 1:
                 return $this->menu_acc();

mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js

@@ -1,23 +1,51 @@
 function init_user_achievements_menu(){
     $("#btn_achieve_menu_acc").click(function(){
-       sys.load('user_achievements_menu_sub_1'); 
+        if($('#achievement_content_acc').html() == ''){
+            sys.load('user_achievements_menu_sub_1');
+        } else {
+            $('#achievement_content_acc').html('');
+        }
     });
     $("#btn_achieve_menu_boss").click(function(){
-       sys.load('user_achievements_menu_sub_2'); 
+        if($('#achievement_content_boss').html() == ''){
+            sys.load('user_achievements_menu_sub_2');
+        } else {
+            $('#achievement_content_boss').html('');
+        }
     });
     $("#btn_achieve_menu_pvp").click(function(){
-       sys.load('user_achievements_menu_sub_3'); 
+        if($('#achievement_content_pvp').html() == ''){
+            sys.load('user_achievements_menu_sub_3');
+        } else {
+            $('#achievement_content_pvp').html('');
+        }
     });
     $("#btn_achieve_menu_creature").click(function(){
-       sys.load('user_achievements_menu_sub_4'); 
+        if($('#achievement_content_creature').html() == ''){
+            sys.load('user_achievements_menu_sub_4');
+        } else {
+            $('#achievement_content_creature').html('');
+        }
     });
     $("#btn_achieve_menu_quest").click(function(){
-       sys.load('user_achievements_menu_sub_5'); 
+        if($('#achievement_content_quest').html() == ''){
+            sys.load('user_achievements_menu_sub_5');
+        } else {
+            $('#achievement_content_quest').html('');
+        } 
     });
     $("#btn_achieve_menu_item").click(function(){
-       sys.load('user_achievements_menu_sub_6'); 
+        if($('#achievement_content_item').html() == ''){
+            sys.load('user_achievements_menu_sub_6');
+        } else {
+            $('#achievement_content_item').html('');
+        } 
     });
     $("#btn_achieve_menu_eco").click(function(){
-       sys.load('user_achievements_menu_sub_7'); 
+        if($('#achievement_content_eco').html() == ''){
+            sys.load('user_achievements_menu_sub_7');
+        } else {
+            $('#achievement_content_eco').html('');
+        }
     });
 }

mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js

@@ -2,5 +2,16 @@ function init_user_achievements_menu_sub(){
     console.log('init');
     $(".btn_achieve_menu").click(function(){
         $('#achievement_list').load('./?page=user_achievements_content&menu=' + $(this).attr('menu') + '&filter=' + $(this).attr('filter'));
+        btn_info();
+        
     });
-}
+    
+    function btn_info(){
+        alert('info');
+        $(".btn_quest_info").click(function(){
+            alert('test');
+            $('#achievement_list').load('./api.php?call=quest&entry=' + $(this).attr('entry'));
+//                $('#achievement_list').load('./?page=user_achievements_content_quest&entry=' + $(this).attr('entry'));
+        });
+    }
+}

mojotrollz/page/user_default/css/user_default.css

@@ -107,6 +107,7 @@ a:hover{
 #frame_menu{
     float: left;
     padding-top: 20px;
+    width: 400px;
 }
 
 #frame_start_stats{
@@ -151,6 +152,22 @@ a:hover{
     text-align: left;
     text-decoration: none;
     
+}
+
+.btn_menu_add{
+
+    background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wowicons&id=button_submenu.png) no-repeat;
+    background-size: cover;
+    padding-top: 1px;
+    padding-left: 20px;
+    margin-bottom: 5px;
+    height: 27px;
+    width: 140px;
+    font-size: 13pt;
+    list-style: none;
+    text-align: left;
+    text-decoration: none;
+    
 }
 .btn_submenu:hover{
     background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wowicons&id=button_red.png) no-repeat;
@@ -159,6 +176,13 @@ a:hover{
     color: gold;
 }
 
+.btn_menu_add:hover{
+    background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wowicons&id=button_red.png) no-repeat;
+    background-size: cover;
+    text-decoration: none;
+    color: gold;
+}
+
 .window_bg2{
     float: left; padding: 10px; margin-left: 20px; margin-top: 20px; background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wowicons&id=bg2.png);
 }

mojotrollz/page/user_menu/user_menu.tpl

@@ -1,7 +1,14 @@
-<div style="width: 180px;">
+<div style="width: 180px; float: left">
     <button class="btn btn_blue no_deco" id="btn_news" href="#user_start">Overview</button>
     <button class="btn btn_blue no_deco" id="btn_achieve" href="#user_achievements_menu">Compendium</button>
     <button class="btn btn_blue no_deco" id="btn_shop" href="user_shop_menu">Shop</button>
     <button class="btn btn_blue no_deco" id="btn_arm" href="#">Armory</button>
     <button class="btn btn_blue no_deco" id="btn_logout" href="#">Logout</button>    
+</div>
+<div style=" float: right; margin-top: 2px;">
+    <button class="btn btn_menu_add no_deco" id="btn_news" href="#">Inventory</button><br>
+    <button class="btn btn_menu_add no_deco" id="btn_news" href="#">Questlog</button><br>
+    <button class="btn btn_menu_add no_deco" id="btn_news" href="#">My Guild</button><br>
+    <button class="btn btn_menu_add no_deco" id="btn_news" href="#">My Profile</button><br>
+    <button class="btn btn_menu_add no_deco" id="btn_news" href="#">FAQ</button>
 </div>

mojotrollz/page/user_start/tpl/user_start.tpl

@@ -67,5 +67,9 @@
             </div>
             </div>
             
+            
         </div>
+            <div class="window_bg2">
+                        ${test}
+            </div>
 </div>

mojotrollz/page/user_start/user_start.php

@@ -52,6 +52,7 @@ class user_start extends SYSTEM\PAGE\Page {
         $vars['guildcount'] = \DBD\COUNT_GUILDS::Q1()['count'];
         $vars['realm_status'] = realm::status();
         $vars['world_status'] = world::status();
+        $vars['test'] = quest::test(248);
         $vars['player_online'] = database::player_online();
         $vars['factionbalance'] = $this->get_faction_balance();
         $vars['role_balance'] =$this->get_role_balance();

system

@@ -1 +1 @@
-Subproject commit 69390d4c59bf3a2a3cd2add9f5b3bc3f571f1287
+Subproject commit b3bf40d17d3c707d7af17943b1f6ff147c0e71a6