diff --git a/mojotrollz/page/default_navbar/default_navbar.php b/mojotrollz/page/default_navbar/default_navbar.php index c3e953d..3bea8df 100644 --- a/mojotrollz/page/default_navbar/default_navbar.php +++ b/mojotrollz/page/default_navbar/default_navbar.php @@ -2,15 +2,8 @@ class default_navbar extends SYSTEM\PAGE\Page { - private function js(){ - return ''; - - - } - - private function css (){ - return ''; - } + private function js(){return '';} + private function css (){return '';} public function html(){ $vars = array(); @@ -18,7 +11,8 @@ class default_navbar extends SYSTEM\PAGE\Page { $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\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_navbar/wizard_navbar.tpl'), $vars); - + 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 new file mode 100644 index 0000000..e2bd204 --- /dev/null +++ b/mojotrollz/page/default_navbar/user_navbar.tpl @@ -0,0 +1,2 @@ +Welcome +
  • Character
  • \ No newline at end of file diff --git a/mojotrollz/page/default_page/js/wizard.js b/mojotrollz/page/default_page/js/wizard.js index 24b3a6a..530212b 100644 --- a/mojotrollz/page/default_page/js/wizard.js +++ b/mojotrollz/page/default_page/js/wizard.js @@ -36,11 +36,12 @@ function register_menu (){ }); } -function load_wizard_page (state){ +function load_wizard_page (state){ + wizard_state = state; + if(state == ''){ window.location.reload();} - wizard_state = state; $('#content').hide(); $('#content').load('?action='+state, function (){ $('#content').show(750); @@ -53,24 +54,14 @@ function load_wizard_page (state){ WizardStates[i][4] ? $('#register').fadeIn(500) : $('#register').hide(); break; } - } - - window[state](); - + } + if(window[state]){ + window[state]();} }); }; function back(state){ - for(var i=0; i