From 72ad2aef895aba4bc8edb6a13dfa43501a9209dd Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 17 Nov 2014 15:29:17 +0100 Subject: [PATCH 1/3] finished wizard templates - proto --- mojotrollz/page/autoload.inc | 5 ++-- .../page/default_page/tpl/default_page.tpl | 2 +- mojotrollz/page/page_mojotrollz.php | 11 +++++--- .../page/wizard_details/js/wizard_details.js | 3 --- .../page/wizard_guild/js/wizard_guild.js | 2 ++ mojotrollz/page/wizard_guild/tpl/guild.tpl | 2 ++ mojotrollz/page/wizard_guild/wizard_guild.php | 13 ++++++++++ mojotrollz/page/wizard_reg/wizard_reg.php | 25 ------------------- .../tpl/register.tpl} | 15 ++++++++--- .../page/wizard_register/wizard_register.php | 12 +++++++++ .../page/wizard_skills/js/wizard_skills.js | 3 --- .../page/wizard_spawn/js/wizard_spawn.js | 2 +- .../page/wizard_spawn/{ => tpl}/spawn.tpl | 7 +++--- mojotrollz/page/wizard_spawn/wizard_spawn.php | 25 ++++++++----------- mojotrollz/page/wizard_summ/wizard_summ.php | 19 -------------- .../page/wizard_summary/tpl/summary.tpl | 2 ++ .../page/wizard_summary/wizard_summary.php | 8 ++++++ .../page/wizard_toolbar/js/wizard_toolbar.js | 2 +- .../wizard_toolbar/tpl/wizard_toolbar.tpl | 6 ++--- .../page/wizard_visuals/js/wizard_visuals.js | 3 --- 20 files changed, 80 insertions(+), 87 deletions(-) create mode 100644 mojotrollz/page/wizard_guild/js/wizard_guild.js create mode 100644 mojotrollz/page/wizard_guild/tpl/guild.tpl create mode 100644 mojotrollz/page/wizard_guild/wizard_guild.php delete mode 100644 mojotrollz/page/wizard_reg/wizard_reg.php rename mojotrollz/page/{wizard_reg/reg.tpl => wizard_register/tpl/register.tpl} (78%) create mode 100644 mojotrollz/page/wizard_register/wizard_register.php rename mojotrollz/page/wizard_spawn/{ => tpl}/spawn.tpl (91%) delete mode 100644 mojotrollz/page/wizard_summ/wizard_summ.php create mode 100644 mojotrollz/page/wizard_summary/tpl/summary.tpl create mode 100644 mojotrollz/page/wizard_summary/wizard_summary.php diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index e9d7ba9..330d093 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -8,9 +8,10 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_visuals',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_friend',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_skills',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_guild',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_spawn',''); -\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_summ',''); -\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_reg',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_summary',''); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_register',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_toolbar',''); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_default',''); diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index c60e7a2..7d6a31e 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -18,7 +18,7 @@
-
+
- + +
+ +
-
+
\ No newline at end of file diff --git a/mojotrollz/page/wizard_register/wizard_register.php b/mojotrollz/page/wizard_register/wizard_register.php new file mode 100644 index 0000000..c3f7a63 --- /dev/null +++ b/mojotrollz/page/wizard_register/wizard_register.php @@ -0,0 +1,12 @@ + -
-   -
+
 
- \ No newline at end of file +
+
\ No newline at end of file diff --git a/mojotrollz/page/wizard_spawn/wizard_spawn.php b/mojotrollz/page/wizard_spawn/wizard_spawn.php index b189927..224e3ea 100644 --- a/mojotrollz/page/wizard_spawn/wizard_spawn.php +++ b/mojotrollz/page/wizard_spawn/wizard_spawn.php @@ -1,25 +1,20 @@ js(); - $vars['css'] = $this->css(); + $vars = array(); $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_spawn/img/'); - $vars['CITYICONS'] = \SYSTEM\IMG\img::getURL('wow_city_icons'); - $vars['BG'] = \SYSTEM\IMG\img::getURL('backgrounds'); + $vars['CITYICONS'] = \SYSTEM\FILES\files::getURL('wow_city_icons'); + $vars['BG'] = \SYSTEM\FILES\files::getURL('backgrounds'); $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_HELP)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_spawn/spawn.tpl'), $vars); + $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_spawn/tpl/spawn.tpl'), $vars); } } diff --git a/mojotrollz/page/wizard_summ/wizard_summ.php b/mojotrollz/page/wizard_summ/wizard_summ.php deleted file mode 100644 index ffd43ba..0000000 --- a/mojotrollz/page/wizard_summ/wizard_summ.php +++ /dev/null @@ -1,19 +0,0 @@ -js(); - $vars['css'] = $this->css(); - return 'not implemented'; - } -} \ No newline at end of file diff --git a/mojotrollz/page/wizard_summary/tpl/summary.tpl b/mojotrollz/page/wizard_summary/tpl/summary.tpl new file mode 100644 index 0000000..e6f66c3 --- /dev/null +++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl @@ -0,0 +1,2 @@ +Not implemented +
\ No newline at end of file diff --git a/mojotrollz/page/wizard_summary/wizard_summary.php b/mojotrollz/page/wizard_summary/wizard_summary.php new file mode 100644 index 0000000..a4192a5 --- /dev/null +++ b/mojotrollz/page/wizard_summary/wizard_summary.php @@ -0,0 +1,8 @@ + - - - + + + \ No newline at end of file diff --git a/mojotrollz/page/wizard_visuals/js/wizard_visuals.js b/mojotrollz/page/wizard_visuals/js/wizard_visuals.js index b3a47cc..2fdebe5 100644 --- a/mojotrollz/page/wizard_visuals/js/wizard_visuals.js +++ b/mojotrollz/page/wizard_visuals/js/wizard_visuals.js @@ -1,6 +1,3 @@ -function init_wizard_visuals_toolbar(){ - wizard_toolbar();} - function init_wizard_visuals (){ $('#sel_0').change(function(){ sendInfo('{"char_skin_color" : "'+$(this).val()+'"}','wizard_visuals');}); From 451ac47ce88f2bd185e629e17ed0ade227f41897 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 17 Nov 2014 16:22:18 +0100 Subject: [PATCH 2/3] register & summary update --- mojotrollz/page/wizard_guild/tpl/guild.tpl | 2 +- .../wizard_register/js/wizard_register.js | 3 + .../page/wizard_register/tpl/register.tpl | 6 +- .../page/wizard_register/wizard_register.php | 6 ++ mojotrollz/page/wizard_spawn/tpl/spawn.tpl | 34 +++++----- .../page/wizard_summary/tpl/summary.tpl | 62 ++++++++++++++++++- .../page/wizard_summary/wizard_summary.php | 2 +- 7 files changed, 90 insertions(+), 25 deletions(-) create mode 100644 mojotrollz/page/wizard_register/js/wizard_register.js diff --git a/mojotrollz/page/wizard_guild/tpl/guild.tpl b/mojotrollz/page/wizard_guild/tpl/guild.tpl index b970f67..87b8bfe 100644 --- a/mojotrollz/page/wizard_guild/tpl/guild.tpl +++ b/mojotrollz/page/wizard_guild/tpl/guild.tpl @@ -1,2 +1,2 @@ guild -
\ No newline at end of file +
\ No newline at end of file diff --git a/mojotrollz/page/wizard_register/js/wizard_register.js b/mojotrollz/page/wizard_register/js/wizard_register.js new file mode 100644 index 0000000..50f7bc0 --- /dev/null +++ b/mojotrollz/page/wizard_register/js/wizard_register.js @@ -0,0 +1,3 @@ +function init_wizard_register(){ + $('#back_link').click(function(){system.load($(this).attr('sysload'));}); +} \ No newline at end of file diff --git a/mojotrollz/page/wizard_register/tpl/register.tpl b/mojotrollz/page/wizard_register/tpl/register.tpl index b2447ee..310afe8 100644 --- a/mojotrollz/page/wizard_register/tpl/register.tpl +++ b/mojotrollz/page/wizard_register/tpl/register.tpl @@ -53,7 +53,9 @@ maxlength="16" data-validation-maxlength-message="${register_beta_code_too_long}" required data-validation-required-message="${register_beta_code_required}"/> +
+ -
- \ No newline at end of file + +
\ No newline at end of file diff --git a/mojotrollz/page/wizard_register/wizard_register.php b/mojotrollz/page/wizard_register/wizard_register.php index c3f7a63..77012fe 100644 --- a/mojotrollz/page/wizard_register/wizard_register.php +++ b/mojotrollz/page/wizard_register/wizard_register.php @@ -1,5 +1,11 @@ -
+
- -
-
- +
+
+
-
- +
+
-
- +
+
-