diff --git a/mojotrollz/files/wowicons/Damage.png b/mojotrollz/files/wowicons/Damage.png new file mode 100644 index 0000000..7f968ac Binary files /dev/null and b/mojotrollz/files/wowicons/Damage.png differ diff --git a/mojotrollz/files/wowicons/Healer.png b/mojotrollz/files/wowicons/Healer.png new file mode 100644 index 0000000..674b57c Binary files /dev/null and b/mojotrollz/files/wowicons/Healer.png differ diff --git a/mojotrollz/files/wowicons/Tank.png b/mojotrollz/files/wowicons/Tank.png new file mode 100644 index 0000000..484e313 Binary files /dev/null and b/mojotrollz/files/wowicons/Tank.png differ diff --git a/mojotrollz/files/wowicons/m.png b/mojotrollz/files/wowicons/m.png new file mode 100644 index 0000000..cb7cac1 Binary files /dev/null and b/mojotrollz/files/wowicons/m.png differ diff --git a/mojotrollz/files/wowicons/mojologo.psd b/mojotrollz/files/wowicons/mojologo.psd new file mode 100644 index 0000000..d4bb0be Binary files /dev/null and b/mojotrollz/files/wowicons/mojologo.psd differ diff --git a/mojotrollz/files/wowicons/warcraft_volume_1_full.png b/mojotrollz/files/wowicons/warcraft_volume_1_full.png new file mode 100644 index 0000000..8962ae6 Binary files /dev/null and b/mojotrollz/files/wowicons/warcraft_volume_1_full.png differ diff --git a/mojotrollz/files/wowicons/5guildbankupgrades.png b/mojotrollz/files/wowicons/webquest.png similarity index 100% rename from mojotrollz/files/wowicons/5guildbankupgrades.png rename to mojotrollz/files/wowicons/webquest.png diff --git a/mojotrollz/files/wowicons/wow.png b/mojotrollz/files/wowicons/wow.png new file mode 100644 index 0000000..d1e43ea Binary files /dev/null and b/mojotrollz/files/wowicons/wow.png differ diff --git a/mojotrollz/files/wowicons/wow__s_classes_icon_by_qfzpjm159-d41wg9i.png.jpg b/mojotrollz/files/wowicons/wow__s_classes_icon_by_qfzpjm159-d41wg9i.png.jpg new file mode 100644 index 0000000..25d660a Binary files /dev/null and b/mojotrollz/files/wowicons/wow__s_classes_icon_by_qfzpjm159-d41wg9i.png.jpg differ diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index b80f44a..b7f4340 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -49,7 +49,7 @@ body { #frame_main { //width: 1000px; position: absolute; - width: 1000px; + width: 1015px; top: 20%; left: 20%; //-webkit-box-shadow: 3px 3px 4px 2px rgba(0, 0, 0, 1); @@ -91,6 +91,10 @@ body { margin-left: 320px; } +#frame_content_wrapper{ + height: 550px; +} + #frame_content_right { float: right; width: 280px; @@ -102,4 +106,16 @@ body { width: 100%; position: relative; height: 26px; +} + +.table_summ{ + color: black; padding: 10px; margin-left: 20px; margin-top: 20px; width: 100%; +} + +.table_summ tr{ + border-bottom: 2px black solid; + width: 100%; +} +.table_summ td{ + padding: 5px; } \ No newline at end of file diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index 7d6a31e..f5e1551 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -8,7 +8,6 @@ ${js} -
diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/default_start/default_start.php index ecbe2d3..35f8963 100644 --- a/mojotrollz/page/default_start/default_start.php +++ b/mojotrollz/page/default_start/default_start.php @@ -7,8 +7,8 @@ class default_start extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); - $vars['default_page_welcome'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_welcome.tpl'), array()); - $vars['default_page_serverinfo'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_serverinfo.tpl'), array()); + $vars['default_page_new_char'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_new_char.tpl'), array()); + $vars['default_page_welcome'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_welcome.tpl'), array()); $vars['default_page_login'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_login.tpl'), array()); $vars['PICPATH'] = \SYSTEM\FILES\files::getURL('default_start'); diff --git a/mojotrollz/page/default_start/tpl/default_page_new_char.tpl b/mojotrollz/page/default_start/tpl/default_page_new_char.tpl new file mode 100644 index 0000000..9119e1b --- /dev/null +++ b/mojotrollz/page/default_start/tpl/default_page_new_char.tpl @@ -0,0 +1,11 @@ +
+

+ This site is under construction. +
+ Feel free to snoop around. +

+
+
+ +
+
diff --git a/mojotrollz/page/default_start/tpl/default_page_welcome.tpl b/mojotrollz/page/default_start/tpl/default_page_welcome.tpl index 820db93..fdf6321 100644 --- a/mojotrollz/page/default_start/tpl/default_page_welcome.tpl +++ b/mojotrollz/page/default_start/tpl/default_page_welcome.tpl @@ -1,11 +1,4 @@ -

Welcome Traveler

-

Welcome to WoW Hardmode. -
- This site is under construction. -
- Feel free to snoop around. -

-
-
- +
+ +

Soon to come...

\ No newline at end of file diff --git a/mojotrollz/page/default_start/tpl/default_start.tpl b/mojotrollz/page/default_start/tpl/default_start.tpl index 767ad66..9b890be 100644 --- a/mojotrollz/page/default_start/tpl/default_start.tpl +++ b/mojotrollz/page/default_start/tpl/default_start.tpl @@ -8,7 +8,7 @@
-
${default_page_login}
+
${default_page_login}
@@ -27,7 +27,7 @@
-
${default_page_serverinfo}
+
${default_page_new_char}
diff --git a/mojotrollz/page/user_menu/user_menu.tpl b/mojotrollz/page/user_menu/user_menu.tpl index 48ab925..e6342c9 100644 --- a/mojotrollz/page/user_menu/user_menu.tpl +++ b/mojotrollz/page/user_menu/user_menu.tpl @@ -1,5 +1,5 @@
-
  • News
    •  +
  • Overview
    •
  • Compendium
    •
  • Inventory
    •
  • Armory
    •  diff --git a/mojotrollz/page/user_start/tpl/role_balance.tpl b/mojotrollz/page/user_start/tpl/role_balance.tpl new file mode 100644 index 0000000..ba48b3d --- /dev/null +++ b/mojotrollz/page/user_start/tpl/role_balance.tpl @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + +
    +

    Keep your Role...
    updated via Character Profile

    +
    +

    Tanks
    + count +

    +
    +

    physical DDs
    + count +

    +
    +

    magical DDs
    + count +

    +
    +

    Healers
    + count +

    +
    \ No newline at end of file diff --git a/mojotrollz/page/user_start/tpl/user_start.tpl b/mojotrollz/page/user_start/tpl/user_start.tpl index 803f6a6..3954810 100644 --- a/mojotrollz/page/user_start/tpl/user_start.tpl +++ b/mojotrollz/page/user_start/tpl/user_start.tpl @@ -4,6 +4,8 @@

    Welcome to Mojo WoW

    Site is currently
    under construction.
    Be gone. Shush!

    +
    +
    @@ -23,28 +25,47 @@

    Realm Server: ${realm_status}

    World Server: ${world_status}

    Players Online: ${player_online}

    -
    +
    +
    +
    +
    +

    Daily Web Quests

    + + + + + + +
    +
    +
    + + +
    - -
    -
    -

    Racial Pluralism

    - ${char_stats}
    -
    -

    ${factionbalance}

    +
    +
    +
    +

    Racial Pluralism

    + ${char_stats}
    +
    +

    ${factionbalance}

    +
    +
    +

    Class Diffusion

    + ${class_stats}
    +
    +
    +

    Role Balance

    + ${role_balance} + Guilds overallcount:${guildcount} +
    +
    +
    -
    -

    Class Diffusion

    - ${class_stats}
    -
    -
    - Guilds overallcount:${guildcount} -
    -
    -
    \ No newline at end of file diff --git a/mojotrollz/page/user_start/user_start.php b/mojotrollz/page/user_start/user_start.php index b66595e..65b80da 100644 --- a/mojotrollz/page/user_start/user_start.php +++ b/mojotrollz/page/user_start/user_start.php @@ -5,32 +5,7 @@ class user_start extends SYSTEM\PAGE\Page { public static function css (){ return array();} - - - - private function switch_order($race){ - switch($race){ - case 1: - return '1'; - case 2: - return '3'; - case 3: - return '7'; - case 4: - return '4'; - case 5: - return '2'; - case 6: - return '8'; - case 7: - return '6'; - case 8: - return '5'; - default: - return ''; - } - } - + public function get_char_statistics(){ @@ -64,7 +39,10 @@ class user_start extends SYSTEM\PAGE\Page { $balance = \DBD\FACTION_BALANCE::Q1(); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/faction_balance.tpl'), $balance); } - + public function get_role_balance(){ + $balance = \DBD\FACTION_BALANCE::Q1(); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_start/tpl/role_balance.tpl'), $balance); + } public function html(){ @@ -76,6 +54,7 @@ class user_start extends SYSTEM\PAGE\Page { $vars['world_status'] = world::status(); $vars['player_online'] = database::player_online(); $vars['factionbalance'] = $this->get_faction_balance(); + $vars['role_balance'] =$this->get_role_balance(); $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id='; $vars['PIC'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id='; $vars['PI'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id='; diff --git a/mojotrollz/page/wizard_summary/tpl/summary.tpl b/mojotrollz/page/wizard_summary/tpl/summary.tpl index bfb6c83..5726e38 100644 --- a/mojotrollz/page/wizard_summary/tpl/summary.tpl +++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl @@ -1,27 +1,30 @@ -

    Summary

    - - +
    +

    Summary

    +
    + +
    + - + - + - + - + @@ -61,12 +64,12 @@ - + - +
    NameName ${char_name} ${char_name_ok}
    GenderGender ${char_gender_ok}
    RaceRace ${char_race_ok}
    ClassClass ${char_class_ok}
    ${char_skill_tree_ok}
    GuildGuild ${char_guild} ${char_guild_ok}
    SpawnSpawn ${char_spawn_ok}