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