wizard guild, summary, toolbar, charcreation

This commit is contained in:
Ulf Gebhardt 2014-11-20 16:17:33 +01:00
parent 283dd853b5
commit 23b599aee3
15 changed files with 46 additions and 26 deletions

View File

@ -7,6 +7,7 @@ class charcreation {
const MOJO_CC_SESSIONKEY = 'mojo_charcreation'; const MOJO_CC_SESSIONKEY = 'mojo_charcreation';
const DEFAULT_CHAR_APPEARANCE = 0; const DEFAULT_CHAR_APPEARANCE = 0;
const DEFAULT_CHAR_SPAWN = 0; const DEFAULT_CHAR_SPAWN = 0;
const DEFAULT_CHAR_GUILD = 'no_guild';
public static function data($json = NULL, $returnasjson = true){ public static function data($json = NULL, $returnasjson = true){
if(!\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)){ if(!\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)){
\SYSTEM\SECURITY\Security::save(self::MOJO_CC_SESSIONKEY, self::session_default());} \SYSTEM\SECURITY\Security::save(self::MOJO_CC_SESSIONKEY, self::session_default());}

View File

@ -21,7 +21,7 @@ class charcreation_validator {
public static function char_race($value){ public static function char_race($value){
$data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY);
$data['char_race'] = $value; $data['char_race'] = $value;
if(!is_char_race($value) || !charcreation::checkClassRace($data['char_class'], $data['char_race'])){ if(!self::is_char_race($value) || !charcreation::checkClassRace($data['char_class'], $data['char_race'])){
$data['char_class'] = charcreation::DEFAULT_CHAR_CLASS;} $data['char_class'] = charcreation::DEFAULT_CHAR_CLASS;}
\SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data);
} }
@ -92,8 +92,12 @@ class charcreation_validator {
public static function char_equip($value){} public static function char_equip($value){}
public static function is_char_guild($value){ public static function is_char_guild($value){
return false;} return ($value == charcreation::DEFAULT_CHAR_GUILD) ? true : false;}
public static function char_guild($value){} public static function char_guild($value){
$data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY);
$data['char_guild'] = self::is_char_guild($value) ? $value : charcreation::DEFAULT_CHAR_GUILD;
\SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data);
}
public static function is_char_spawn($value){ public static function is_char_spawn($value){
return player_spawns::is($value);} return player_spawns::is($value);}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -14,6 +14,8 @@
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/city/','city','*.png'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/city/','city','*.png');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/guild/','guild','*.png');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/equipment/','equipment','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/equipment/','equipment','*.*');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/inventory/','inventory','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/inventory/','inventory','*.*');

View File

@ -92,7 +92,7 @@ body {
} }
#frame_content_wrapper{ #frame_content_wrapper{
height: 550px; //height: 550px;
} }
#frame_content_right { #frame_content_right {
@ -109,7 +109,7 @@ body {
} }
.table_summ{ .table_summ{
color: black; padding: 10px; margin-left: 20px; margin-top: 20px; width: 100%; color: black; padding: 10px; margin-left: auto; margin-right: auto; margin-top: 20px; width: 90%;
} }
.table_summ tr{ .table_summ tr{

View File

@ -39,7 +39,7 @@ function load_visualisation(id){
}); });
$.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));}); $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));});
var options = {title: id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"}; var options = {title: id, backgroundColor: { fill:'transparent' }, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"};
new google.visualization.LineChart(document.getElementById(id)).draw(data, options); new google.visualization.LineChart(document.getElementById(id)).draw(data, options);
}, },
{},'json',true); {},'json',true);

View File

@ -1,6 +1,6 @@
<div id="frame_content_left">${default_page_welcome}</div> <div id="frame_content_left">${default_page_welcome}</div>
<div id="frame_content_center"> <div id="frame_content_center">
<div class="threecol_parent" style="width: 30%; height: 462px;"> <div class="threecol_parent" style="width: 30%;">
<div class="threecol_row" style="height: 12px;"> <div class="threecol_row" style="height: 12px;">
<div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_l.png) no-repeat;"></div> <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_l.png) no-repeat;"></div>
<div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_m.png) repeat-x;"></div> <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_m.png) repeat-x;"></div>
@ -19,7 +19,7 @@
</div> </div>
</div> </div>
<div id="frame_content_right"> <div id="frame_content_right">
<div class="threecol_parent" style="width: 30%; height: 462px;"> <div class="threecol_parent" style="width: 30%;">
<div class="threecol_row" style="height: 12px;"> <div class="threecol_row" style="height: 12px;">
<div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_l.png) no-repeat;"></div> <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_l.png) no-repeat;"></div>
<div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_m.png) repeat-x;"></div> <div class="threecol_col" style="background: url(${PICPATH_DEFAULT}border_tops_m.png) repeat-x;"></div>
@ -38,4 +38,4 @@
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="frame_content_toolbar"></div> <div id="frame_content_toolbar" style="height: 35px;"></div>

View File

@ -1,2 +1,5 @@
function init_wizard_guild(){ function init_wizard_guild(){
$('#btn_no_guild').click(function(){
sendInfo('{"char_guild" : "no_guild"}','wizard_guild');
});
} }

View File

@ -1,2 +1,2 @@
guild <li class="btn_menu_off" id="btn_no_guild">No Guild</li>
<div id="frame_content_toolbar" style="padding-top: 15px; height: 75px;"></div> <div id="frame_content_toolbar" style="padding-top: 15px; height: 75px;"></div>

View File

@ -0,0 +1,6 @@
function init_wizard_summary(){
$('.table_summ tr').click(function(){
system.load($(this).attr('sysload'));});
}

View File

@ -3,67 +3,67 @@
</div> </div>
<table class="table_summ"> <table class="table_summ">
<tr> <tr sysload="wizard_details" href="#wizard_details">
<td><b>Name</b></td> <td><b>Name</b></td>
<td>${char_name}</td> <td>${char_name}</td>
<td><img src="${WOWICONS}${char_name_ok}.png"/></td> <td><img src="${WOWICONS}${char_name_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_details" href="#wizard_details">
<td><b>Gender</b></td> <td><b>Gender</b></td>
<td><img src="${WOW_GENDER}${char_gender}.png"/></td> <td><img src="${WOW_GENDER}${char_gender}.png"/></td>
<td><img src="${WOWICONS}${char_gender_ok}.png"/></td> <td><img src="${WOWICONS}${char_gender_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_details" href="#wizard_details">
<td><b>Race</b></td> <td><b>Race</b></td>
<td><img src="${WOW_RACE}${char_race}_${char_gender}.png"/></td> <td><img src="${WOW_RACE}${char_race}_${char_gender}.png"/></td>
<td><img src="${WOWICONS}${char_race_ok}.png"/></td> <td><img src="${WOWICONS}${char_race_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_details" href="#wizard_details">
<td><b>Class</b></td> <td><b>Class</b></td>
<td><img src="${WOW_CLASS}${char_class}.png"/></td> <td><img src="${WOW_CLASS}${char_class}.png"/></td>
<td><img src="${WOWICONS}${char_class_ok}.png"/></td> <td><img src="${WOWICONS}${char_class_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_visuals" href="#wizard_visuals">
<td>Skin Color</td> <td>Skin Color</td>
<td>${char_skin_color}</td> <td>${char_skin_color}</td>
<td><img src="${WOWICONS}${char_skin_color_ok}.png"/></td> <td><img src="${WOWICONS}${char_skin_color_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_visuals" href="#wizard_visuals">
<td>Hair</td> <td>Hair</td>
<td>${char_hair}</td> <td>${char_hair}</td>
<td><img src="${WOWICONS}${char_hair_ok}.png"/></td> <td><img src="${WOWICONS}${char_hair_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_visuals" href="#wizard_visuals">
<td>Hair Color</td> <td>Hair Color</td>
<td>${char_hair_color}</td> <td>${char_hair_color}</td>
<td><img src="${WOWICONS}${char_hair_color_ok}.png"/></td> <td><img src="${WOWICONS}${char_hair_color_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_visuals" href="#wizard_visuals">
<td>Face</td> <td>Face</td>
<td>${char_face}</td> <td>${char_face}</td>
<td><img src="${WOWICONS}${char_face_ok}.png"/></td> <td><img src="${WOWICONS}${char_face_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_visuals" href="#wizard_visuals">
<td>Facial Hair</td> <td>Facial Hair</td>
<td>${char_facial_hair}</td> <td>${char_facial_hair}</td>
<td><img src="${WOWICONS}${char_facial_hair_ok}.png"/></td> <td><img src="${WOWICONS}${char_facial_hair_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_visuals" href="#wizard_visuals">
<td>Facial Hair Color</td> <td>Facial Hair Color</td>
<td>${char_facial_hair_color}</td> <td>${char_facial_hair_color}</td>
<td><img src="${WOWICONS}${char_facial_hair_color_ok}.png"/></td> <td><img src="${WOWICONS}${char_facial_hair_color_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_skills" href="#wizard_skills">
<td>Skill Tree</td> <td>Skill Tree</td>
<td>${char_skill_tree}</td> <td>${char_skill_tree}</td>
<td><img src="${WOWICONS}${char_skill_tree_ok}.png"/></td> <td><img src="${WOWICONS}${char_skill_tree_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_guild" href="#wizard_guild">
<td><b>Guild</b></td> <td><b>Guild</b></td>
<td>${char_guild}</td> <td><img src="${WOW_GUILD}${char_guild}.png"/></td>
<td><img src="${WOWICONS}${char_guild_ok}.png"/></td> <td><img src="${WOWICONS}${char_guild_ok}.png"/></td>
</tr> </tr>
<tr> <tr sysload="wizard_spawn" href="#wizard_spawn">
<td><b>Spawn</b></td> <td><b>Spawn</b></td>
<td><img src="${WOW_CITY}${char_spawn}.png"/></td> <td><img src="${WOW_CITY}${char_spawn}.png"/></td>
<td><img src="${WOWICONS}${char_spawn_ok}.png"/></td> <td><img src="${WOWICONS}${char_spawn_ok}.png"/></td>

View File

@ -1,6 +1,8 @@
<?php <?php
class wizard_summary extends SYSTEM\PAGE\Page { class wizard_summary extends SYSTEM\PAGE\Page {
public static function js(){
return array( \SYSTEM\WEBPATH(new PPAGE(),'wizard_summary/js/wizard_summary.js'));}
public function html(){ public function html(){
$vars = charcreation::check(); $vars = charcreation::check();
foreach($vars as $key=>$value){ foreach($vars as $key=>$value){
@ -23,6 +25,7 @@ class wizard_summary extends SYSTEM\PAGE\Page {
$vars['char_spawn'] = player_spawns::name($vars['char_spawn']); $vars['char_spawn'] = player_spawns::name($vars['char_spawn']);
$vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons');
$vars['WOW_GUILD'] = \SYSTEM\FILES\files::getURL('guild');
$vars['WOW_GENDER'] = \SYSTEM\FILES\files::getURL('gender'); $vars['WOW_GENDER'] = \SYSTEM\FILES\files::getURL('gender');
$vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race');
$vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class');

View File

@ -4,7 +4,7 @@
<a class="tb_link" id="tb_class" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;"><img src="${WOW_CLASS}${char_class}.png" /></a> <a class="tb_link" id="tb_class" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;"><img src="${WOW_CLASS}${char_class}.png" /></a>
<a class="tb_link" id="tb_visuals" sysload="wizard_visuals" href="#wizard_visuals" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a> <a class="tb_link" id="tb_visuals" sysload="wizard_visuals" href="#wizard_visuals" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
<a class="tb_link" id="tb_skills" sysload="wizard_skills" href="#wizard_skills" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a> <a class="tb_link" id="tb_skills" sysload="wizard_skills" href="#wizard_skills" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
<a class="tb_link" id="tb_guild" sysload="wizard_guild" href="#wizard_guild" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a> <a class="tb_link" id="tb_guild" sysload="wizard_guild" href="#wizard_guild" style="padding-left: 30px;"><img src="${WOW_GUILD}${char_guild}.png" /></a>
<a class="tb_link" id="tb_spawn" sysload="wizard_spawn" href="#wizard_spawn" style="padding-left: 30px;"><img src="${WOW_CITY}${char_spawn}.png" /></a> <a class="tb_link" id="tb_spawn" sysload="wizard_spawn" href="#wizard_spawn" style="padding-left: 30px;"><img src="${WOW_CITY}${char_spawn}.png" /></a>
<a class="tb_link" id="tb_summary" sysload="wizard_summary" href="#wizard_summary" style="padding-left: 30px;"><img src="${WOWICONS}${char_summary}.png" /></a> <a class="tb_link" id="tb_summary" sysload="wizard_summary" href="#wizard_summary" style="padding-left: 30px;"><img src="${WOWICONS}${char_summary}.png" /></a>
<a class="tb_link" id="tb_next" sysload="${next}" href="#${next}" style="padding-left: 15px;"><img src="${WOWICONS}arrow_right.png" /></a> <a class="tb_link" id="tb_next" sysload="${next}" href="#${next}" style="padding-left: 15px;"><img src="${WOWICONS}arrow_right.png" /></a>

View File

@ -22,6 +22,7 @@ class wizard_toolbar extends SYSTEM\PAGE\Page {
$vars['last'] = $this->last; $vars['last'] = $this->last;
$vars['next'] = $this->next; $vars['next'] = $this->next;
$vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons');
$vars['WOW_GUILD'] = \SYSTEM\FILES\files::getURL('guild');
$vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race');
$vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class');
$vars['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city'); $vars['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city');