From 768c34cddfcf8fe984c665f1ca841e58ae271c15 Mon Sep 17 00:00:00 2001 From: Tobi Date: Fri, 14 Nov 2014 14:31:06 +0100 Subject: [PATCH 1/4] achievement menu --- .../page/user_achievements/tpl/user_achievements.tpl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mojotrollz/page/user_achievements/tpl/user_achievements.tpl b/mojotrollz/page/user_achievements/tpl/user_achievements.tpl index 30d74d2..04383f7 100644 --- a/mojotrollz/page/user_achievements/tpl/user_achievements.tpl +++ b/mojotrollz/page/user_achievements/tpl/user_achievements.tpl @@ -1 +1,9 @@ -test \ No newline at end of file +
+
  • Community & Account
    • +
  • Dungeonboss Compendium
    • +
  • PvP Legacy
    • +
  • Creature Compendium
    • +
  • Quest Compendium
    • +
  • Item Compendium
    • +
  • Economic Success
    • +
    \ No newline at end of file From 486b97373ee6a49696af0499905cec94318768d2 Mon Sep 17 00:00:00 2001 From: Tobi Date: Sun, 16 Nov 2014 17:15:57 +0100 Subject: [PATCH 2/4] load --- mojotrollz/page/autoload.inc | 1 + mojotrollz/page/page_mojotrollz.php | 5 ++++ .../js/user_achievement_content.js | 2 ++ .../tpl/user_achievement_content.tpl | 1 + .../user_achievement_content.php | 23 +++++++++++++++++++ .../user_achievements/js/user_achievements.js | 6 ++++- .../tpl/user_achievements.tpl | 5 +++- 7 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 mojotrollz/page/user_achievement_content/js/user_achievement_content.js create mode 100644 mojotrollz/page/user_achievement_content/tpl/user_achievement_content.tpl create mode 100644 mojotrollz/page/user_achievement_content/user_achievement_content.php diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index be0b89a..d191fd7 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -18,4 +18,5 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_character',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_menu',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievement_content',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_database',''); \ No newline at end of file diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php index f1df058..8e9c573 100644 --- a/mojotrollz/page/page_mojotrollz.php +++ b/mojotrollz/page/page_mojotrollz.php @@ -66,6 +66,11 @@ class page_mojotrollz extends \SYSTEM\API\api_default { throw new ERROR("You need to be logged in to view this ressource.");} return new user_achievements();} + public static function page_user_achievement_content(){ + if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ + throw new ERROR("You need to be logged in to view this ressource.");} + return new user_achievement_content();} + public static function page_user_logout(){ if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ throw new ERROR("You need to be logged in to view this ressource.");} diff --git a/mojotrollz/page/user_achievement_content/js/user_achievement_content.js b/mojotrollz/page/user_achievement_content/js/user_achievement_content.js new file mode 100644 index 0000000..3814f40 --- /dev/null +++ b/mojotrollz/page/user_achievement_content/js/user_achievement_content.js @@ -0,0 +1,2 @@ +function user_achievement_content(){ +} \ No newline at end of file diff --git a/mojotrollz/page/user_achievement_content/tpl/user_achievement_content.tpl b/mojotrollz/page/user_achievement_content/tpl/user_achievement_content.tpl new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/mojotrollz/page/user_achievement_content/tpl/user_achievement_content.tpl @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/mojotrollz/page/user_achievement_content/user_achievement_content.php b/mojotrollz/page/user_achievement_content/user_achievement_content.php new file mode 100644 index 0000000..93a7066 --- /dev/null +++ b/mojotrollz/page/user_achievement_content/user_achievement_content.php @@ -0,0 +1,23 @@ + +
  • Community & Account
  • Dungeonboss Compendium
  • PvP Legacy
    • @@ -6,4 +6,7 @@
  • Quest Compendium
  • Item Compendium
  • Economic Success
    • +
    +
    +
    \ No newline at end of file From 6c1571f3f8b7f3e6e7b79efc71012116e47b2790 Mon Sep 17 00:00:00 2001 From: Tobi Date: Sun, 16 Nov 2014 20:54:21 +0100 Subject: [PATCH 3/4] achievements menu structure --- mojotrollz/dbd/sql/page.sql | 4 ++++ mojotrollz/page/autoload.inc | 5 +++-- mojotrollz/page/page_mojotrollz.php | 13 +++++++++---- .../js/user_achievement_content.js | 2 -- .../user_achievements/js/user_achievements.js | 5 ----- .../tpl/creature.tpl} | 0 .../user_achievements_content.php | 18 ++++++++++++++++++ .../js/user_achievements_menu.js | 5 +++++ .../tpl/user_achievements_menu.tpl} | 5 ++++- .../user_achievements_menu.php} | 6 +++--- .../js/user_achievements_menu_sub.js | 6 ++++++ .../tpl/user_achievements_menu_sub.tpl | 1 + .../user_achievements_menu_sub.php} | 9 +++------ mojotrollz/page/user_menu/js/user_menu.js | 2 +- mojotrollz/page/user_menu/user_menu.tpl | 2 +- 15 files changed, 58 insertions(+), 25 deletions(-) delete mode 100644 mojotrollz/page/user_achievement_content/js/user_achievement_content.js delete mode 100644 mojotrollz/page/user_achievements/js/user_achievements.js rename mojotrollz/page/{user_achievement_content/tpl/user_achievement_content.tpl => user_achievements_content/tpl/creature.tpl} (100%) create mode 100644 mojotrollz/page/user_achievements_content/user_achievements_content.php create mode 100644 mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js rename mojotrollz/page/{user_achievements/tpl/user_achievements.tpl => user_achievements_menu/tpl/user_achievements_menu.tpl} (78%) rename mojotrollz/page/{user_achievements/user_achievements.php => user_achievements_menu/user_achievements_menu.php} (85%) create mode 100644 mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub.tpl rename mojotrollz/page/{user_achievement_content/user_achievement_content.php => user_achievements_menu_sub/user_achievements_menu_sub.php} (83%) diff --git a/mojotrollz/dbd/sql/page.sql b/mojotrollz/dbd/sql/page.sql index 7ec1bef..8c33f75 100644 --- a/mojotrollz/dbd/sql/page.sql +++ b/mojotrollz/dbd/sql/page.sql @@ -2,3 +2,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (10, 1, 2, 1, 'default_info', 'id', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (110, 1, 2, 1, 'wizard_toolbar', 'last', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (111, 1, 2, 1, 'wizard_toolbar', 'next', 'STRING'); + + +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (120, 1, 2, 1, 'user_achievements_content', 'type', 'STRING'); + diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index d191fd7..e9d7ba9 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -17,6 +17,7 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_start',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_character',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_menu',''); -\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements',''); -\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievement_content',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements_menu',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements_menu_sub',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements_content',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_database',''); \ No newline at end of file diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php index 8e9c573..2799970 100644 --- a/mojotrollz/page/page_mojotrollz.php +++ b/mojotrollz/page/page_mojotrollz.php @@ -61,15 +61,20 @@ class page_mojotrollz extends \SYSTEM\API\api_default { throw new ERROR("You need to be logged in to view this ressource.");} return new user_database();} - public static function page_user_achievements(){ + public static function page_user_achievements_menu(){ if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ throw new ERROR("You need to be logged in to view this ressource.");} - return new user_achievements();} + return new user_achievements_menu();} - public static function page_user_achievement_content(){ + public static function page_user_achievements_menu_sub(){ if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ throw new ERROR("You need to be logged in to view this ressource.");} - return new user_achievement_content();} + return new user_achievements_menu_sub();} + + public static function page_user_achievements_content($type){ + if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ + throw new ERROR("You need to be logged in to view this ressource.");} + return new user_achievements_content($type);} public static function page_user_logout(){ if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ diff --git a/mojotrollz/page/user_achievement_content/js/user_achievement_content.js b/mojotrollz/page/user_achievement_content/js/user_achievement_content.js deleted file mode 100644 index 3814f40..0000000 --- a/mojotrollz/page/user_achievement_content/js/user_achievement_content.js +++ /dev/null @@ -1,2 +0,0 @@ -function user_achievement_content(){ -} \ No newline at end of file diff --git a/mojotrollz/page/user_achievements/js/user_achievements.js b/mojotrollz/page/user_achievements/js/user_achievements.js deleted file mode 100644 index 2f43eae..0000000 --- a/mojotrollz/page/user_achievements/js/user_achievements.js +++ /dev/null @@ -1,5 +0,0 @@ -function init_user_achievements(){ - $("#btn_achieve_menu_creature").click(function(){ - sys.load('user_achievement_content'); - }); -} \ No newline at end of file diff --git a/mojotrollz/page/user_achievement_content/tpl/user_achievement_content.tpl b/mojotrollz/page/user_achievements_content/tpl/creature.tpl similarity index 100% rename from mojotrollz/page/user_achievement_content/tpl/user_achievement_content.tpl rename to mojotrollz/page/user_achievements_content/tpl/creature.tpl diff --git a/mojotrollz/page/user_achievements_content/user_achievements_content.php b/mojotrollz/page/user_achievements_content/user_achievements_content.php new file mode 100644 index 0000000..0be36f2 --- /dev/null +++ b/mojotrollz/page/user_achievements_content/user_achievements_content.php @@ -0,0 +1,18 @@ +type = $type; + } + public static function js(){ + return array();} + + public static function css (){ + return array();} + + + public function html(){ + $vars = array(); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), $vars); + } +} \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js b/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js new file mode 100644 index 0000000..a909202 --- /dev/null +++ b/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js @@ -0,0 +1,5 @@ +function init_user_achievements_menu(){ + $("#btn_achieve_menu_creature").click(function(){ + sys.load('user_achievements_menu_sub'); + }); +} \ No newline at end of file diff --git a/mojotrollz/page/user_achievements/tpl/user_achievements.tpl b/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl similarity index 78% rename from mojotrollz/page/user_achievements/tpl/user_achievements.tpl rename to mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl index af0181d..2f201fd 100644 --- a/mojotrollz/page/user_achievements/tpl/user_achievements.tpl +++ b/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl @@ -2,11 +2,14 @@
  • Community & Account
  • Dungeonboss Compendium
  • PvP Legacy
    • -
  • Creature Compendium
    • +
  • Creature Compendium
  • Quest Compendium
  • Item Compendium
  • Economic Success
    • +
    +
    +
    \ No newline at end of file diff --git a/mojotrollz/page/user_achievements/user_achievements.php b/mojotrollz/page/user_achievements_menu/user_achievements_menu.php similarity index 85% rename from mojotrollz/page/user_achievements/user_achievements.php rename to mojotrollz/page/user_achievements_menu/user_achievements_menu.php index 98d8545..84c462e 100644 --- a/mojotrollz/page/user_achievements/user_achievements.php +++ b/mojotrollz/page/user_achievements_menu/user_achievements_menu.php @@ -1,7 +1,7 @@ humanoid \ No newline at end of file diff --git a/mojotrollz/page/user_achievement_content/user_achievement_content.php b/mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php similarity index 83% rename from mojotrollz/page/user_achievement_content/user_achievement_content.php rename to mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php index 93a7066..ba64ed6 100644 --- a/mojotrollz/page/user_achievement_content/user_achievement_content.php +++ b/mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php @@ -1,13 +1,10 @@
  • News
    • -
  • Achievements
    • +
  • Achievements
  • Inventory
  • Armory
  • Database
    • From 8147129665273460d590f36b05552b796133fdac Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 17 Nov 2014 01:16:36 +0100 Subject: [PATCH 4/4] quest compendium functional examples for achievement tables and sql --- mojotrollz/dbd/qq/QUEST_TYPE.php | 13 ++ mojotrollz/dbd/sql/page.sql | 4 +- mojotrollz/page/page_mojotrollz.php | 8 +- .../user_achievements_content/tpl/quest.tpl | 3 + .../tpl/quest_element.tpl | 9 ++ .../user_achievements_content.php | 134 +++++++++++++++++- .../js/user_achievements_menu.js | 20 ++- .../tpl/user_achievements_menu.tpl | 23 ++- .../js/user_achievements_menu_sub.js | 4 +- .../tpl/user_achievements_menu_sub_1.tpl | 1 + .../tpl/user_achievements_menu_sub_2.tpl | 1 + .../tpl/user_achievements_menu_sub_3.tpl | 1 + .../tpl/user_achievements_menu_sub_4.tpl | 1 + .../tpl/user_achievements_menu_sub_6.tpl | 1 + .../tpl/user_achievements_menu_sub_7.tpl | 1 + .../tpl/user_achievements_menu_sub_quest.tpl | 9 ++ .../user_achievements_menu_sub.php | 31 ++-- .../page/user_character/user_character.php | 3 +- .../page/user_character/user_character.tpl | 2 +- .../page/user_default/css/user_default.css | 12 +- mojotrollz/page/user_default/user_default.tpl | 1 + mojotrollz/page/user_menu/user_menu.php | 1 + mojotrollz/page/user_menu/user_menu.tpl | 14 +- 23 files changed, 252 insertions(+), 45 deletions(-) create mode 100644 mojotrollz/dbd/qq/QUEST_TYPE.php create mode 100644 mojotrollz/page/user_achievements_content/tpl/quest.tpl create mode 100644 mojotrollz/page/user_achievements_content/tpl/quest_element.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_1.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_2.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_3.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_4.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_6.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_7.tpl create mode 100644 mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_quest.tpl diff --git a/mojotrollz/dbd/qq/QUEST_TYPE.php b/mojotrollz/dbd/qq/QUEST_TYPE.php new file mode 100644 index 0000000..a8f975c --- /dev/null +++ b/mojotrollz/dbd/qq/QUEST_TYPE.php @@ -0,0 +1,13 @@ + + ${content} + \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl b/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl new file mode 100644 index 0000000..10bc85c --- /dev/null +++ b/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl @@ -0,0 +1,9 @@ + + + ${Title} + + ${ReqItemId1}:${ReqItemCount1}
    + ${ReqItemId2}:${ReqItemCount2}
    + ${ReqItemId3}:${ReqItemCount3}
    + ${ReqItemId4}:${ReqItemCount4} + \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_content/user_achievements_content.php b/mojotrollz/page/user_achievements_content/user_achievements_content.php index 0be36f2..d819780 100644 --- a/mojotrollz/page/user_achievements_content/user_achievements_content.php +++ b/mojotrollz/page/user_achievements_content/user_achievements_content.php @@ -1,8 +1,11 @@ type = $type; + var $menu = null; + var $filter = null; + public function __construct($menu, $filter) { + new \SYSTEM\LOG\INFO($menu.' '.$filter); + $this->menu = $menu; + $this->filter = $filter; } public static function js(){ return array();} @@ -10,9 +13,130 @@ class user_achievements_content extends SYSTEM\PAGE\Page { public static function css (){ return array();} + private function menu_1(){ + switch($this->filter){ + default: + return 'filter fail'; + } + } + + private function menu_2(){ + switch($this->filter){ + default: + return 'filter fail'; + } + } + + private function menu_3(){ + switch($this->filter){ + default: + return 'filter fail'; + } + } + + private function menu_4(){ + switch($this->filter){ + default: + return 'filter fail'; + } + } + + private function menu_quest(){ + switch($this->filter){ + case 1: + $result = ''; + $data = \DBD\QUEST_TYPE::QQ(array(81)); + 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 = ''; + $data = \DBD\QUEST_TYPE::QQ(array(62)); + 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 = ''; + $data = \DBD\QUEST_TYPE::QQ(array(1)); + 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 = ''; + $data = \DBD\QUEST_TYPE::QQ(array(83)); + 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 = ''; + $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 = ''; + $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 = ''; + $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'; + } + } + + private function menu_6(){ + switch($this->filter){ + default: + return 'filter fail'; + } + } + + private function menu_7(){ + switch($this->filter){ + default: + return 'filter fail'; + } + } public function html(){ - $vars = array(); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), $vars); + switch($this->menu){ + case 1: + return $this->menu_1(); + case 2: + return $this->menu_2(); + case 3: + return $this->menu_3(); + case 4: + return $this->menu_4(); + case 5: + return $this->menu_quest(); + case 6: + return $this->menu_6(); + case 7: + return $this->menu_7(); + default: + return 'menu fail'; + } + } } \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js b/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js index a909202..c6831d4 100644 --- a/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js +++ b/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js @@ -1,5 +1,23 @@ function init_user_achievements_menu(){ + $("#btn_achieve_menu_acc").click(function(){ + sys.load('user_achievements_menu_sub_1'); + }); + $("#btn_achieve_menu_boss").click(function(){ + sys.load('user_achievements_menu_sub_2'); + }); + $("#btn_achieve_menu_pvp").click(function(){ + sys.load('user_achievements_menu_sub_3'); + }); $("#btn_achieve_menu_creature").click(function(){ - sys.load('user_achievements_menu_sub'); + sys.load('user_achievements_menu_sub_4'); + }); + $("#btn_achieve_menu_quest").click(function(){ + sys.load('user_achievements_menu_sub_5'); + }); + $("#btn_achieve_menu_item").click(function(){ + sys.load('user_achievements_menu_sub_6'); + }); + $("#btn_achieve_menu_eco").click(function(){ + sys.load('user_achievements_menu_sub_7'); }); } \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl b/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl index 2f201fd..91acee2 100644 --- a/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl +++ b/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl @@ -1,15 +1,14 @@ -
    -
  • Community & Account
    • -
  • Dungeonboss Compendium
    • -
  • PvP Legacy
    • -
  • Creature Compendium
    • -
  • Quest Compendium
    • -
  • Item Compendium
    • -
  • Economic Success
    • + -
    - -
    -
    + +
    \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js b/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js index 101a1d2..141b669 100644 --- a/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js +++ b/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js @@ -1,6 +1,6 @@ function init_user_achievements_menu_sub(){ console.log('init'); - $(".btn_achieve_menu_creature").click(function(){ - $('#achievement_list').load('./?page=user_achievements_content&type=' + $(this).attr('creature_type')); + $(".btn_achieve_menu").click(function(){ + $('#achievement_list').load('./?page=user_achievements_content&menu=' + $(this).attr('menu') + '&filter=' + $(this).attr('filter')); }); } \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_1.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_1.tpl new file mode 100644 index 0000000..a12aa90 --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_1.tpl @@ -0,0 +1 @@ +
  • default
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_2.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_2.tpl new file mode 100644 index 0000000..dbf3e1a --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_2.tpl @@ -0,0 +1 @@ +
  • humanoid
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_3.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_3.tpl new file mode 100644 index 0000000..d9d23dc --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_3.tpl @@ -0,0 +1 @@ +
  • 3
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_4.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_4.tpl new file mode 100644 index 0000000..0b2acf8 --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_4.tpl @@ -0,0 +1 @@ +
  • 4
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_6.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_6.tpl new file mode 100644 index 0000000..dbf3e1a --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_6.tpl @@ -0,0 +1 @@ +
  • humanoid
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_7.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_7.tpl new file mode 100644 index 0000000..dbf3e1a --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_7.tpl @@ -0,0 +1 @@ +
  • humanoid
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_quest.tpl b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_quest.tpl new file mode 100644 index 0000000..472410d --- /dev/null +++ b/mojotrollz/page/user_achievements_menu_sub/tpl/user_achievements_menu_sub_quest.tpl @@ -0,0 +1,9 @@ +
  • Dungeonquests
    • +
  • Raidquests
    • +
  • Groupquests
    • +
  • Legendary Quests
    • +
  • Escort
    • + +
  • PvP Quests
    • +
  • Normal Quests
    • +
  • Attunements
    • \ No newline at end of file diff --git a/mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php b/mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php index ba64ed6..6243fd6 100644 --- a/mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php +++ b/mojotrollz/page/user_achievements_menu_sub/user_achievements_menu_sub.php @@ -1,5 +1,10 @@ menu = $menu; + } + public static function js(){ return array( \SYSTEM\WEBPATH(new PPAGE(),'user_achievements_menu_sub/js/user_achievements_menu_sub.js'));} @@ -7,14 +12,24 @@ class user_achievements_menu_sub extends SYSTEM\PAGE\Page { return array();} public function html(){ - $vars = array(); + switch ($this->menu){ + case 1: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_1.tpl'), array()); + case 2: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_2.tpl'), array()); + case 3: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_3.tpl'), array()); + case 4: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_4.tpl'), array()); + case 5: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_quest.tpl'), array()); + case 6: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_6.tpl'), array()); + case 7: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub_7.tpl'), array()); + default: + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub.tpl'), array()); + } - $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id='; - $vars['PIC'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id='; - $vars['PI'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id='; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE), - \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO), - \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu_sub/tpl/user_achievements_menu_sub.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/user_character/user_character.php b/mojotrollz/page/user_character/user_character.php index 93c5598..39d4c50 100644 --- a/mojotrollz/page/user_character/user_character.php +++ b/mojotrollz/page/user_character/user_character.php @@ -2,7 +2,8 @@ class user_character extends SYSTEM\PAGE\Page { public function html(){ - $vars = array(); + $vars = array(); + $vars['char_visual'] = equipment::generate(11, 'test', 4, 'female', 1, 1, 2, 3, 2, 1, 2); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_character/user_character.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/user_character/user_character.tpl b/mojotrollz/page/user_character/user_character.tpl index 397e659..5e40f96 100644 --- a/mojotrollz/page/user_character/user_character.tpl +++ b/mojotrollz/page/user_character/user_character.tpl @@ -1 +1 @@ -Character \ No newline at end of file +${char_visual} \ No newline at end of file diff --git a/mojotrollz/page/user_default/css/user_default.css b/mojotrollz/page/user_default/css/user_default.css index 97e7ccc..b8a908b 100644 --- a/mojotrollz/page/user_default/css/user_default.css +++ b/mojotrollz/page/user_default/css/user_default.css @@ -84,17 +84,23 @@ html, body { #char_container{ height: 250px; - position: absolute; - bottom: 0; +/* position: absolute; + bottom: 0;*/ } #frame_character{ float: left; - width: 70%; } #frame_menu{ float: left; width: 30%; +} + +.btn_blue{ + background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=buttons&id=nav_off.png) no-repeat; + background-size: cover; + + } \ No newline at end of file diff --git a/mojotrollz/page/user_default/user_default.tpl b/mojotrollz/page/user_default/user_default.tpl index 38b30a0..bc6bc9a 100644 --- a/mojotrollz/page/user_default/user_default.tpl +++ b/mojotrollz/page/user_default/user_default.tpl @@ -18,6 +18,7 @@
    +
    diff --git a/mojotrollz/page/user_menu/user_menu.php b/mojotrollz/page/user_menu/user_menu.php index a39875b..4f42546 100644 --- a/mojotrollz/page/user_menu/user_menu.php +++ b/mojotrollz/page/user_menu/user_menu.php @@ -5,6 +5,7 @@ class user_menu extends SYSTEM\PAGE\Page { return array( \SYSTEM\WEBPATH(new PPAGE(),'user_menu/js/user_menu.js'));} public static function css (){ + return array();} public function html(){ diff --git a/mojotrollz/page/user_menu/user_menu.tpl b/mojotrollz/page/user_menu/user_menu.tpl index f8c21ae..d9c834a 100644 --- a/mojotrollz/page/user_menu/user_menu.tpl +++ b/mojotrollz/page/user_menu/user_menu.tpl @@ -1,10 +1,10 @@ -
    -
  • News
    • -
  • Achievements
    • -
  • Inventory
    • -
  • Armory
    • -
  • Database
    • -
  • Logout
    • +
    +
  • News
    • +
  • Achievements
    • +
  • Inventory
    • +
  • Armory
    • +
  • Database
    • +
  • Logout
    • \ No newline at end of file