mojotrollz/mojo_zero_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	mojotrollz/api/autoload.inc
	mojotrollz/api/database/autoload.inc
	system
This commit is contained in:
Tobi 2014-11-28 11:46:51 +01:00
commit 4e5f6d8e09
20 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.dist.php
View File

@ -15,8 +15,9 @@ $mojotrollz_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPO
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG, 'http://www.mojotrollz.eu/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
//array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://mojotrollz.eu/sai.php?'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://mojotrollz.eu/web/mojotrollz/sai.php?'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.mojotrollz.eu/web/mojotrollz/sai.php?'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'mojotrollz - Admin Area'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://www.mojotrollz.eu/" target="_blank">mojotrollz</a>, &copy; WebCraft Media 2013'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'enUS'));
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'enUS'),
array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH, '/home/web/webdir/mojotrollz/mojotrollz/files/log/'));

2
mojotrollz/api/char/css/skilltree.css
View File

@ -114,7 +114,7 @@
.icon_border_green_inc_top_right{background-position: -65px -603px;}
.icon_border_yellow {background-position: -260px 0px;}
.icon_border_grey_left {background-position: -260px -67px;}
.icon_border_yellow_left {background-position: -260px -67px;}
.icon_border_yellow_right {background-position: -260px -134px;}
.icon_border_yellow_down {background-position: -260px -201px;}
.icon_border_yellow_inc {background-position: -260px -268px;}

7
mojotrollz/api/database/autoload.inc
View File

@ -1,6 +1,3 @@
<?php
SYSTEM\autoload::registerFolder(dirname(__FILE__));
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature/qq','DBD');
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log');

0
mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php → mojotrollz/api/database/log/WOW_STATS_PLAYER_ONLINE.php
View File

0
mojotrollz/api/population_statistics/population_statistics.php → mojotrollz/api/database/population_statistics.php
View File

3
mojotrollz/api/realm/autoload.inc Normal file
View File

@ -0,0 +1,3 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log');

0
mojotrollz/log/WOW_STATS_REALM_OFFLINE.php → mojotrollz/api/realm/log/WOW_STATS_REALM_OFFLINE.php
View File

0
mojotrollz/log/WOW_STATS_REALM_ONLINE.php → mojotrollz/api/realm/log/WOW_STATS_REALM_ONLINE.php
View File

3
mojotrollz/api/world/autoload.inc Normal file
View File

@ -0,0 +1,3 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log');

0
mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php → mojotrollz/api/world/log/WOW_STATS_WORLD_OFFLINE.php
View File

0
mojotrollz/log/WOW_STATS_WORLD_ONLINE.php → mojotrollz/api/world/log/WOW_STATS_WORLD_ONLINE.php
View File

1
mojotrollz/autoload.inc.php
View File

@ -5,4 +5,3 @@ require_once dirname(__FILE__).'/dbd/autoload.inc.php';
require_once dirname(__FILE__).'/api/autoload.inc';
require_once dirname(__FILE__).'/docu/autoload.inc.php';
require_once dirname(__FILE__).'/files/autoload.inc.php';
require_once dirname(__FILE__).'/log/autoload.inc.php';

BIN
mojotrollz/files/skilltree/skilltree_icons.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

2
mojotrollz/log/autoload.inc.php
View File

@ -1,2 +0,0 @@
<?php
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');

10
mojotrollz/sai/saimod_mojotrollz_skilltree/js/saimod_mojotrollz_skilltree.js
View File

@ -8,13 +8,14 @@ function init_saimod_mojotrollz_skilltree() {
load_skilltree_tab(1);
};
function load_skilltree_tab(tree){
function load_skilltree_tab(tree,subtree){
$('img#loader').show();
$('#tab_skilltree').load(SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=tree&tree='+tree, function(){
$('#tabs_skilltree_icons a').click(function(e) {
e.preventDefault();
$(this).tab('show');
});
if(subtree){$('#tl_t'+subtree).tab('show');}
register_icon_add();
register_icon_edit();
register_icon_delete();
@ -41,7 +42,7 @@ function register_icon_add(){
'&parent_column='+$('#input_parent_column_'+_tree).val(),
success : function(data) {
if(data.status){
load_skilltree_tab(_class);
load_skilltree_tab(_class,_tree);
}else{
alert('Problem: '+data);}
}
@ -71,15 +72,16 @@ function register_icon_delete(){
$('.btn_icon_del').click(function(){
if (confirm('Are you sure you want to delete?')) {
_class = $(this).attr('_class');
_tree = $(this).attr('tree');
$.ajax({ type :'GET',
url : SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=icon_delete'+
'&class='+_class+
'&tree='+$(this).attr('tree')+
'&tree='+_tree+
'&row='+$(this).attr('row')+
'&column='+$(this).attr('column'),
success : function(data) {
if(data.status){
load_skilltree_tab(_class);
load_skilltree_tab(_class,_tree);
}else{
alert('Problem: '+data);}
}

12
mojotrollz/sai/saimod_mojotrollz_skilltree/qq/SKILLTREE_TREE_ICON.php Normal file
View File

@ -0,0 +1,12 @@
<?php
namespace DBD;
class SKILLTREE_TREE_ICON extends \SYSTEM\DB\QP {
protected static function query(){
return new \SYSTEM\DB\QQuery(get_class(),
//pg
'',
//mys
'SELECT * FROM mojotrollz_talent_icon WHERE class = ? ORDER BY `tree`, `row` DESC, `column` DESC;'
);}}

2
mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.php
View File

@ -14,7 +14,7 @@ class saimod_mojotrollz_skilltree extends \SYSTEM\SAI\SaiModule {
$vars['tree_entry'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_tree_entry.tpl'), $tree_data);
$vars = array_merge($vars,$tree_data);
$vars['icon_entry_1'] = $vars['icon_entry_2'] = $vars['icon_entry_3'] = '';
$res = \DBD\TALENT_TREE_ICON::QQ(array($tree));
$res = \DBD\SKILLTREE_TREE_ICON::QQ(array($tree));
while($row = $res->next()){
$vars['icon_entry_'.$row['tree']] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl'), $row);}
$vars['tree1'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl'), array_merge($vars,array('tree' => 1, 'icon_entry' => $vars['icon_entry_1'])));

7
mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl
View File

@ -5,7 +5,12 @@
<td>${column}</td>
<td>${type}</td>
<td>${border}</td>
<td>${icon}</td>
<td>${icon}<br/>
<a href="http://www.wowprovider.com/img/Spells/${icon}" target="_blank"><img src="http://www.wowprovider.com/img/Spells/${icon}" alt="S"/></a>
<a href="http://www.wowprovider.com/img/SpellsGrey/${icon}" target="_blank"><img src="http://www.wowprovider.com/img/SpellsGrey/${icon}" alt="G"/></a>
<a href="./api.php?call=files&cat=skilltree_skills&id=${icon}" target="_blank"><img src="./api.php?call=files&cat=skilltree_skills&id=${icon}" alt="MS"/></a>
<a href="./api.php?call=files&cat=skilltree_skills_grey&id=${icon}" target="_blank"><img src="./api.php?call=files&cat=skilltree_skills_grey&id=${icon}" alt="MG"/></a>
</td>
<td>${max}</td>
<td>${parent_row}</td>
<td>${parent_column}</td>

2
mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl
View File

@ -12,7 +12,6 @@
<th>parent_column</th>
<th>action</th>
</tr>
${icon_entry}
<tr>
<td>${class}</td>
<td>${tree}</td>
@ -26,4 +25,5 @@
<td><input id="input_parent_column_${tree}" type="number" placeholder="parent_column" style="width: 80%;"/></td>
<td><button class="btn btn-success btn_icon_add" _class="${class}" _tree="${tree}">Add/Edit</button></td>
</tr>
${icon_entry}
</table>

6
mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl
View File

@ -17,9 +17,9 @@ ${skilltree}
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_skilltree_icons">
<li class="active"><a href="#tab_tree1">${tree1_name}</a></li>
<li><a href="#tab_tree2">${tree2_name}</a></li>
<li><a href="#tab_tree3">${tree3_name}</a></li>
<li class="active"><a id="tl_t1" href="#tab_tree1">${tree1_name}</a></li>
<li><a id="tl_t2" href="#tab_tree2">${tree2_name}</a></li>
<li><a id="tl_t3" href="#tab_tree3">${tree3_name}</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_tree1" style="width: 900px;">${tree1}</div>