diff --git a/mojotrollz/autoload.inc.php b/mojotrollz/autoload.inc.php index e45cd07..c731cd8 100644 --- a/mojotrollz/autoload.inc.php +++ b/mojotrollz/autoload.inc.php @@ -5,4 +5,5 @@ require_once dirname(__FILE__).'/path/register_path_classes.php'; require_once dirname(__FILE__).'/page/register_page_classes.php'; require_once dirname(__FILE__).'/dbd/autoload.inc.php'; require_once dirname(__FILE__).'/api/autoload.inc.php'; -require_once dirname(__FILE__).'/docu/autoload.inc.php'; \ No newline at end of file +require_once dirname(__FILE__).'/docu/autoload.inc.php'; +require_once dirname(__FILE__).'/img/autoload.inc.php'; \ No newline at end of file diff --git a/mojotrollz/img/autoload.inc.php b/mojotrollz/img/autoload.inc.php new file mode 100644 index 0000000..e137e6a --- /dev/null +++ b/mojotrollz/img/autoload.inc.php @@ -0,0 +1,3 @@ +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/default_page.php b/mojotrollz/page/default_page/default_page.php index d339e65..6e42c51 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -9,23 +9,21 @@ class default_page extends SYSTEM\PAGE\Page { ''. ''. ''; - - } - private function css (){ - return ''. - ''. - ''; - } + 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['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'default_page/img/'); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars); - + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/default_page/default_page.tpl b/mojotrollz/page/default_page/default_page.tpl index abad412..7998381 100644 --- a/mojotrollz/page/default_page/default_page.tpl +++ b/mojotrollz/page/default_page/default_page.tpl @@ -37,15 +37,41 @@

    Login

    -
    -
    - +
    +
    +
    + +
    +
    + +
    +
    + + +
    +
    - +
    - +
    diff --git a/mojotrollz/page/default_page/js/wizard.js b/mojotrollz/page/default_page/js/wizard.js index 24b3a6a..88fdccc 100644 --- a/mojotrollz/page/default_page/js/wizard.js +++ b/mojotrollz/page/default_page/js/wizard.js @@ -13,6 +13,22 @@ var WizardStates = [ var wizard_state = ''; $(document).ready(function() { + + $("#login_form input").not("[type=submit]").jqBootstrapValidation({ + preventSubmit: true, + submitError: function($form, event, errors) {}, + submitSuccess: function($form, event){ + $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) { + if(data == 1){ + $('.help-block').html("Login successfull.
    "); + location.reload(true); + } else { + $('.help-block').html("Login not successfull.
    User & Password combination wrong.") + } + }); + event.preventDefault(); + } + }); register_menu (); @@ -36,11 +52,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 +70,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

    - - + +
    - - - - + + + +
    - - - - + + + +
    - - - - + + + +
    - - - - + + + +
    - - + +
    - - + +
    - - + +
    - - + +
    diff --git a/mojotrollz/page/wizard_details/img/help_questionmark.png b/mojotrollz/page/wizard_details/img/help_questionmark.png deleted file mode 100644 index 386888f..0000000 Binary files a/mojotrollz/page/wizard_details/img/help_questionmark.png and /dev/null differ diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php index a7f28e7..82c7879 100644 --- a/mojotrollz/page/wizard_details/wizard_details.php +++ b/mojotrollz/page/wizard_details/wizard_details.php @@ -16,6 +16,7 @@ class wizard_details extends SYSTEM\PAGE\Page { $vars['js'] = $this->js(); $vars['css'] = $this->css(); $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_details/img/'); + $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&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_friend/friend.tpl b/mojotrollz/page/wizard_friend/friend.tpl index 27d1833..f31b632 100644 --- a/mojotrollz/page/wizard_friend/friend.tpl +++ b/mojotrollz/page/wizard_friend/friend.tpl @@ -6,8 +6,8 @@
    Molanor
    - - + +
    diff --git a/mojotrollz/page/wizard_friend/img/ork_male.png b/mojotrollz/page/wizard_friend/img/ork_male.png deleted file mode 100644 index d74fb3e..0000000 Binary files a/mojotrollz/page/wizard_friend/img/ork_male.png and /dev/null differ diff --git a/mojotrollz/page/wizard_friend/img/warrior.png b/mojotrollz/page/wizard_friend/img/warrior.png deleted file mode 100644 index 7051fab..0000000 Binary files a/mojotrollz/page/wizard_friend/img/warrior.png and /dev/null differ diff --git a/mojotrollz/page/wizard_friend/wizard_friend.php b/mojotrollz/page/wizard_friend/wizard_friend.php index 7696c69..5412cb3 100644 --- a/mojotrollz/page/wizard_friend/wizard_friend.php +++ b/mojotrollz/page/wizard_friend/wizard_friend.php @@ -34,6 +34,7 @@ class wizard_friend extends SYSTEM\PAGE\Page { $vars['js'] = $this->js(); $vars['css'] = $this->css(); $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_friend/img/'); + $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id='; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_friend/friend.tpl'), $vars);