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

This commit is contained in:
Ulf Gebhardt 2014-11-17 13:50:36 +01:00
commit 7b8471e9dc
29 changed files with 307 additions and 20 deletions

View File

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

View File

@ -2,3 +2,9 @@ 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 (131, 1, 2, 1, 'user_achievements_content', 'menu', 'INT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (130, 1, 2, 1, 'user_achievements_content', 'filter', 'INT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (121, 1, 2, 1, 'user_achievements_menu_sub', 'menu', 'INT');

View File

@ -17,5 +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_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','');

View File

@ -61,10 +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_achievements_menu_sub($menu){
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
throw new ERROR("You need to be logged in to view this ressource.");}
return new user_achievements_menu_sub($menu);}
public static function page_user_achievements_content($menu, $filter){
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
throw new ERROR("You need to be logged in to view this ressource.");}
return new user_achievements_content($menu, $filter);}
public static function page_user_logout(){
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){

View File

@ -1 +0,0 @@
function init_user_achievements(){}

View File

@ -0,0 +1,3 @@
<table>
${content}
</table>

View File

@ -0,0 +1,9 @@
<tr>
<td>
<a href="http://www.wowhead.com/quest=${entry}/" target="_blank">${Title}</a>
</td>
<td>${ReqItemId1}:${ReqItemCount1}<br>
${ReqItemId2}:${ReqItemCount2}<br>
${ReqItemId3}:${ReqItemCount3}<br>
${ReqItemId4}:${ReqItemCount4}</td>
</tr>

View File

@ -0,0 +1,142 @@
<?php
class user_achievements_content extends SYSTEM\PAGE\Page {
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();}
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(){
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';
}
}
}

View File

@ -0,0 +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_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');
});
}

View File

@ -0,0 +1,14 @@
<div style="width: 200px; height: 100%; float: left; padding: 20px;" class="">
<li class="btn_blue"><a id="btn_achieve_menu_acc" href="#user_achievements_default">Community & Account</a></li>
<li class="btn_blue"><a id="btn_achieve_menu_boss" href="#user_achievements_boss">Dungeonboss Compendium</a></li>
<li class="btn_blue"><a id="btn_achieve_menu_pvp" href="#user_achievements_pvp">PvP Legacy</a></li>
<li class="btn_blue"><a id="btn_achieve_menu_creature" href="#user_achievements_creature">Creature Compendium</a></li>
<li class="btn_blue"><a id="btn_achieve_menu_quest" href="#user_achievements_quest">Quest Compendium</a></li>
<li class="btn_blue"><a id="btn_achieve_menu_item" href="#user_achievements_item">Item Compendium</a></li>
<li class="btn_blue"><a id="btn_achieve_menu_eco" href="#user_achievements_eco">Economic Success</a></li>
<div style="width: 100%;" id="achievement_content"></div>
</div>
<div style="float: left; padding: 20px;" id="achievement_list">
</div>

View File

@ -1,7 +1,7 @@
<?php
class user_achievements extends SYSTEM\PAGE\Page {
class user_achievements_menu extends SYSTEM\PAGE\Page {
public static function js(){
return array( \SYSTEM\WEBPATH(new PPAGE(),'user_achievements/js/user_achievements.js'));}
return array( \SYSTEM\WEBPATH(new PPAGE(),'user_achievements_menu/js/user_achievements_menu.js'));}
public static function css (){
return array();}
@ -18,6 +18,6 @@ class user_achievements extends SYSTEM\PAGE\Page {
$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/tpl/user_achievements.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_menu/tpl/user_achievements_menu.tpl'), $vars);
}
}

View File

@ -0,0 +1,6 @@
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'));
});
}

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" creature_type="humanoid" href="#">humanoid</a></li>

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" filter="1" href="#">default</a></li>

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" creature_type="humanoid" href="#">humanoid</a></li>

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" creature_type="humanoid" href="#">3</a></li>

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" creature_type="humanoid" href="#">4</a></li>

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" creature_type="humanoid" href="#">humanoid</a></li>

View File

@ -0,0 +1 @@
<li><a class="btn_achieve_menu_creature" creature_type="humanoid" href="#">humanoid</a></li>

View File

@ -0,0 +1,9 @@
<li><a class="btn_achieve_menu" menu="5" filter="1" href="#">Dungeonquests</a></li>
<li><a class="btn_achieve_menu" menu="5" filter="2" href="#">Raidquests</a></li>
<li><a class="btn_achieve_menu" menu="5" filter="3" href="#">Groupquests</a></li>
<li><a class="btn_achieve_menu" menu="5" filter="4" href="#">Legendary Quests</a></li>
<li><a class="btn_achieve_menu" menu="5" filter="5" href="#">Escort</a></li>
<!--<li><a class="btn_achieve_menu" menu="5" filter="6" href="#">Crossfaction</a></li>-->
<li><a class="btn_achieve_menu" menu="5" filter="7" href="#">PvP Quests</a></li>
<li><a class="btn_achieve_menu" menu="5" filter="8" href="#">Normal Quests</a></li>
<li><a class="btn_achieve_menu" menu="5" filter="9" href="#">Attunements</a></li>

View File

@ -0,0 +1,35 @@
<?php
class user_achievements_menu_sub extends SYSTEM\PAGE\Page {
var $menu = NULL;
public function __construct($menu) {
$this->menu = $menu;
}
public static function js(){
return array( \SYSTEM\WEBPATH(new PPAGE(),'user_achievements_menu_sub/js/user_achievements_menu_sub.js'));}
public static function css (){
return array();}
public function html(){
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());
}
}
}

View File

@ -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);
}
}

View File

@ -1 +1 @@
Character
${char_visual}

View File

@ -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;
}

View File

@ -18,6 +18,7 @@
<div id="frame_left_border" class="threecol_col" style="background: url(${PICPATH}border_left.png) repeat-y;"></div>
<div id="frame_content_user">
<div id="frame_content" style="background: url(${PICPATH}background.png)no repeat;"></div>
<div style="clear: both"></div>
<div id="char_container">
<div id="frame_character"></div>
<div id="frame_menu" style=""></div>

View File

@ -7,7 +7,7 @@ function init_user_menu(){
sys.load('user_database');
});
$("#btn_achieve").click(function(){
sys.load('user_achievements');
sys.load('user_achievements_menu');
});
}
function register_logout(){

View File

@ -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(){

View File

@ -1,10 +1,10 @@
<div style="width: 180px; background: white" class="">
<li><a id="btn_news" href="#user_start">News</a></li>
<li><a id="btn_achieve" href="#user_achievements">Achievements</a></li>
<li><a id="btn_inv" href="#">Inventory</a></li>
<li><a id="btn_arm" href="#">Armory</a></li>
<li><a id="btn_db" href="#">Database</a></li>
<li><a id="btn_logout" href="#">Logout</a></li>
<div style="width: 180px;" class="btn_blue">
<li class="btn_blue"><a id="btn_news" href="#user_start">News</a></li>
<li class="btn_blue"><a id="btn_achieve" href="#user_achievements_menu">Achievements</a></li>
<li class="btn_blue"><a id="btn_inv" href="#">Inventory</a></li>
<li class="btn_blue"><a id="btn_arm" href="#">Armory</a></li>
<li class="btn_blue"><a id="btn_db" href="#">Database</a></li>
<li ><a class="btn_blue" id="btn_logout" href="#">Logout</a></li>
</div>