From 92b2360823d23ad39ab3bede65e887023d6c53c8 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 15 Jun 2014 01:05:52 +0200 Subject: [PATCH] new toolbar, fixed start button --- .../page/default_navbar/default_navbar.php | 18 ---- .../page/default_navbar/user_navbar.tpl | 6 -- .../page/default_navbar/wizard_navbar.tpl | 8 -- .../page/default_page/css/default_page.css | 4 +- mojotrollz/page/default_page/js/wizard.js | 87 ++----------------- mojotrollz/page/page_mojotrollz.php | 6 +- mojotrollz/page/register_page_classes.php | 2 +- mojotrollz/page/wizard_details/details.tpl | 3 +- .../page/wizard_details/js/wizard_details.js | 2 + .../page/wizard_details/wizard_details.php | 13 ++- .../page/wizard_toolbar/wizard_toolbar.php | 17 ++++ .../page/wizard_toolbar/wizard_toolbar.tpl | 10 +++ 12 files changed, 48 insertions(+), 128 deletions(-) delete mode 100644 mojotrollz/page/default_navbar/default_navbar.php delete mode 100644 mojotrollz/page/default_navbar/user_navbar.tpl delete mode 100644 mojotrollz/page/default_navbar/wizard_navbar.tpl create mode 100644 mojotrollz/page/wizard_toolbar/wizard_toolbar.php create mode 100644 mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl diff --git a/mojotrollz/page/default_navbar/default_navbar.php b/mojotrollz/page/default_navbar/default_navbar.php deleted file mode 100644 index 3bea8df..0000000 --- a/mojotrollz/page/default_navbar/default_navbar.php +++ /dev/null @@ -1,18 +0,0 @@ -js(); - $vars['css'] = $this->css(); - $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'default_navbar/img/'); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - return \SYSTEM\SECURITY\Security::isLoggedIn() ? - SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_navbar/user_navbar.tpl'), $vars) : - SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_navbar/wizard_navbar.tpl'), $vars); - } -} \ No newline at end of file diff --git a/mojotrollz/page/default_navbar/user_navbar.tpl b/mojotrollz/page/default_navbar/user_navbar.tpl deleted file mode 100644 index b7527b9..0000000 --- a/mojotrollz/page/default_navbar/user_navbar.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
  • news
    • -
  • guild
    • -
  • bank
    • -
  • economy
    • -
  • character
    • -
  • Logout
    • diff --git a/mojotrollz/page/default_navbar/wizard_navbar.tpl b/mojotrollz/page/default_navbar/wizard_navbar.tpl deleted file mode 100644 index 490f0b8..0000000 --- a/mojotrollz/page/default_navbar/wizard_navbar.tpl +++ /dev/null @@ -1,8 +0,0 @@ -Welcome -
  • Details
    • -
  • Visuals
    • -
  • Mates n'Guilds
    • -
  • Skills
    • -
  • Spawn
    • -
  • Summary
    • -
  • Registration
    • \ No newline at end of file diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index a1c3f3e..04b4ec1 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -31,13 +31,13 @@ body { } .fadein { - opacity: 0.9; + opacity: 0.8; -webkit-filter: brightness(80%); } .selected { opacity: 1.0; - -webkit-filter: sepia(0%); + -webkit-filter: sepia(20%); -webkit-filter: brightness(160%); -webkit-filter: contrast(120%); } diff --git a/mojotrollz/page/default_page/js/wizard.js b/mojotrollz/page/default_page/js/wizard.js index 6cf80b9..d5b6602 100644 --- a/mojotrollz/page/default_page/js/wizard.js +++ b/mojotrollz/page/default_page/js/wizard.js @@ -1,19 +1,4 @@ -var WizardStates = [ - //statename, backbut, nextbut, startbut, regbut, backname, nextname - ['',false, false, true, false,'','wizard_details'], - ['wizard_details',true,true, false, false,'','wizard_visuals'], - ['wizard_visuals',true,true, false, false,'wizard_details','wizard_friend'], - ['wizard_friend',true,true, false, false,'wizard_visuals','wizard_skills'], - ['wizard_skills',true,true, false, false,'wizard_friend','wizard_spawn'], - ['wizard_spawn',true,true, false, false,'wizard_skills','wizard_summ'], - ['wizard_summ',true,true, false,false,'wizard_spawn','wizard_reg'], - ['wizard_reg',true,false, false, true,'wizard_summ',''] -] - -var wizard_state = ''; - $(document).ready(function() { - $("#login_form input").not("[type=submit]").jqBootstrapValidation({ preventSubmit: true, submitError: function($form, event, errors) {}, @@ -33,79 +18,19 @@ $(document).ready(function() { event.preventDefault(); } }); - - register_menu (); - - $('#back a').click(function() { - back(wizard_state);}); - - $('#next a').click(function() { - next(wizard_state);}); $('#start a').click(function() { - start ();}); + load_wizard_details();}); }); -function register_menu (){ - $('#wizard_navbar a').click(function () { - $('#wizard_navbar li').each(function(){ - $(this).removeClass('active');}); - $(this).parent().addClass('active'); - load_wizard_page ($(this).attr("state")); +function load_wizard_details(){ + $('#frame_content').load('?action=wizard_details', function (){ + wizard_details(); }); -} - -function load_wizard_page (state){ - wizard_state = state; - - if(state == ''){ - window.location.reload();} - - $('#content').hide(); - $('#content').load('?action='+state, function (){ - $('#content').show(750); - - for(var i=0; i
    -
    @@ -44,3 +43,5 @@

      Info

    ${infotext_human} +
    +
    ${default_page_toolbar}
    diff --git a/mojotrollz/page/wizard_details/js/wizard_details.js b/mojotrollz/page/wizard_details/js/wizard_details.js index 188d795..5363d5e 100644 --- a/mojotrollz/page/wizard_details/js/wizard_details.js +++ b/mojotrollz/page/wizard_details/js/wizard_details.js @@ -70,6 +70,8 @@ function wizard_details (){ $('#details_race .troll').click(function (){ wowrace('troll'); }); + + load_toolbar(); } function male (){ diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php index 1402914..386cc4d 100644 --- a/mojotrollz/page/wizard_details/wizard_details.php +++ b/mojotrollz/page/wizard_details/wizard_details.php @@ -1,21 +1,18 @@ '. - ''; + private function js(){ + return ''; } - private function css (){ + private function css (){ return ''; - } + } public function html(){ $vars = array(); $vars['js'] = $this->js(); $vars['css'] = $this->css(); - $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id='; + $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT_RACES)); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/details.tpl'), $vars); diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php new file mode 100644 index 0000000..c229fa2 --- /dev/null +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php @@ -0,0 +1,17 @@ +js(); + $vars['css'] = $this->css(); + $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; + //$vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'wizard_toolbar/img/'); + //$vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/wizard_toolbar.tpl'), $vars); + } +} \ No newline at end of file diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl b/mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl new file mode 100644 index 0000000..1a6b9bf --- /dev/null +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl @@ -0,0 +1,10 @@ + +Mein Charname + + + + + + + + \ No newline at end of file