diff --git a/lib/system b/lib/system index f424846..9e8b4a0 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit f4248464364cbb1bca66ac37d2e5a755371bdc64 +Subproject commit 9e8b4a04480f882bc09316d1de6244e260199e92 diff --git a/mojotrollz/files/content/footer.jpg b/mojotrollz/files/content/footer.jpg deleted file mode 100644 index da8682d..0000000 Binary files a/mojotrollz/files/content/footer.jpg and /dev/null differ diff --git a/mojotrollz/files/content/icon_win.png b/mojotrollz/files/content/icon_win.png deleted file mode 100644 index 8a5960b..0000000 Binary files a/mojotrollz/files/content/icon_win.png and /dev/null differ diff --git a/mojotrollz/files/content/wow_1.12.1.png b/mojotrollz/files/content/wow_1_12_1.png similarity index 100% rename from mojotrollz/files/content/wow_1.12.1.png rename to mojotrollz/files/content/wow_1_12_1.png diff --git a/mojotrollz/files/content/wow_2.4.3.png b/mojotrollz/files/content/wow_2_4_3.png similarity index 100% rename from mojotrollz/files/content/wow_2.4.3.png rename to mojotrollz/files/content/wow_2_4_3.png diff --git a/mojotrollz/files/content/wow_3.3.5a.png b/mojotrollz/files/content/wow_3_3_5a.png similarity index 100% rename from mojotrollz/files/content/wow_3.3.5a.png rename to mojotrollz/files/content/wow_3_3_5a.png diff --git a/mojotrollz/page/default_page/autoload.inc b/mojotrollz/page/default_page/autoload.inc index 8fd92c5..e2c9da4 100644 --- a/mojotrollz/page/default_page/autoload.inc +++ b/mojotrollz/page/default_page/autoload.inc @@ -1,2 +1,2 @@ js();} $vars['css'] = $this->css(); - $vars['content_more'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_more.tpl')); - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('meta')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz')); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars); } } diff --git a/mojotrollz/page/default_page/js/default_page.js b/mojotrollz/page/default_page/js/default_page.js index 9686d86..4e2345b 100644 --- a/mojotrollz/page/default_page/js/default_page.js +++ b/mojotrollz/page/default_page/js/default_page.js @@ -1,5 +1,6 @@ $(document).ready(function() { new SYSTEM('./api.php',1,'start'); + $('.flexslider').flexslider({ animation: "slide", controlNav: false, diff --git a/mojotrollz/page/default_page/tpl/content_more.tpl b/mojotrollz/page/default_page/tpl/content_more.tpl deleted file mode 100644 index f8420b1..0000000 --- a/mojotrollz/page/default_page/tpl/content_more.tpl +++ /dev/null @@ -1,23 +0,0 @@ -
-
-
- MOJOTROLLZ

- SERVERS

- T-SHIRTS

- ADDONS

-
-
- LOGIN

- -    - -
-
- IMPRESSUM

- WEBCRAFT-MEDIA

- SLINGIT

-
-
-
\ 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 3326252..44cb978 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -5,20 +5,38 @@ + ${meta_title} - ${css} - ${js} + ${css} + ${js} - +
- -
-
-

MOJOTROLLZ.EU

-
+ +
+
+

${mojotrollz_heading}

+
  • slider_image_01.jpg
  • slider_image_02.jpg
    • @@ -51,8 +70,32 @@
-
- ${content_more} + +
+ +
+
+
+ ${mojotrollz_mojotrollz}

+ ${mojotrollz_servers}

+ ${mojotrollz_tshirts}

+ +
+
+ ${mojotrollz_login}

+ +    + +
+
+ ${mojotrollz_impressum}

+ ${mojotrollz_webcraft}

+ ${mojotrollz_slingit}

+
+
+
\ No newline at end of file diff --git a/mojotrollz/page/default_serverlist/default_serverlist.php b/mojotrollz/page/default_serverlist/default_serverlist.php index 21076c0..34e73b3 100644 --- a/mojotrollz/page/default_serverlist/default_serverlist.php +++ b/mojotrollz/page/default_serverlist/default_serverlist.php @@ -11,6 +11,7 @@ class default_serverlist extends \SYSTEM\PAGE\Page { $res = \SQL\MOJOTROLLZ_SERVER_LIST::QQ(); while($row = $res->next()){ $row['version'] = self::version_icon($row['version']); + $row['version_url'] = \str_replace('.', '_', $row['version']); $row['btn_vote_color'] = 'btn-warning'; $row['glyphicon_vote'] = 'glyphicon-hand-up'; if(!$vote_server){ @@ -21,6 +22,7 @@ class default_serverlist extends \SYSTEM\PAGE\Page { } $row['score'] += $row['votes']; $vars['server_list'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_serverlist/tpl/serverlist_tr.tpl'),$row);} + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz')); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_serverlist/tpl/serverlist.tpl'), $vars); } diff --git a/mojotrollz/page/default_serverlist/js/default_serverlist.js b/mojotrollz/page/default_serverlist/js/default_serverlist.js index 97596ee..a54e686 100644 --- a/mojotrollz/page/default_serverlist/js/default_serverlist.js +++ b/mojotrollz/page/default_serverlist/js/default_serverlist.js @@ -1,10 +1,4 @@ function init_serverlist(){ - $("#mojotrollz_nav a").click(function(){ - $('#mojotrollz_nav li').each(function(){ - $(this).removeClass('active');}); - $(this).parent().addClass('active'); - }); - $("#newserver_form input").not("[type=submit]").jqBootstrapValidation({ autoAdd: {helpBlocks: false}, preventSubmit: true, diff --git a/mojotrollz/page/default_serverlist/tpl/serverlist.tpl b/mojotrollz/page/default_serverlist/tpl/serverlist.tpl index d7c9ab9..a8c696a 100644 --- a/mojotrollz/page/default_serverlist/tpl/serverlist.tpl +++ b/mojotrollz/page/default_serverlist/tpl/serverlist.tpl @@ -1,12 +1,12 @@
-

SERVERS

- +

${mojotrollz_servers}

+
- - - - - + + + + + @@ -14,16 +14,16 @@
NameVersionDescriptionScoreVote${basic_name}${basic_version}${basic_description}${basic_score}${basic_vote}

- Submit the Server's address you are playing on here! + ${mojotrollz_submit_server}
+ required data-validation-required-message="ยง{mojotrollz_please_address_server}">
diff --git a/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl b/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl index 54dc22c..686461f 100644 --- a/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl +++ b/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl @@ -1,8 +1,8 @@ ${name} - - WoW + + WoW   ${version} @@ -11,19 +11,19 @@ - \ No newline at end of file diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/default_start/default_start.php index 1c5d78c..9b8e2c4 100644 --- a/mojotrollz/page/default_start/default_start.php +++ b/mojotrollz/page/default_start/default_start.php @@ -9,23 +9,19 @@ class default_start extends \SYSTEM\PAGE\Page { $vars['content_client'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_client.tpl')); $vars['content_server'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_server.tpl')); $vars['content_tshirt'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_tshirt.tpl')); - $vars['content_addons'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_addons.tpl')); - - $vars['magnet_classic'] = 'magnet:?xt=urn:btih:m5dkc7lnrryhleqpugzspoyurwsaykyg&dn=WoW%201.12.1&xl=5387778663&fc=38'; - $vars['magnet_bc'] = 'magnet:?xt=urn:btih:akirevdngf3djcti35gnk4l2z6ffoyw2&dn=WoW%202.4.3&xl=9537364669&fc=305'; - $vars['magnet_wotlk'] = 'magnet:?xt=urn:btih:3u442mbojtl46ywlspou2d4ai5qo2i7r&dn=WoW%203.3.5a&xl=17897255192&fc=172'; + $vars['content_addons'] = '';//\SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_addons.tpl')); \LIB\lib_ts3::php(); $ts3 = TeamSpeak3::factory("serverquery://mojotrollztsquery:9aYllYkG@127.0.0.1:10011/"); $vars['ts_players'] = $ts3->serverGetByPort(9987)->clientCount(); - $vars['addon_list'] = ''; + /*$vars['addon_list'] = ''; $res = \SQL\MOJOTROLLZ_ADDON_LIST::QQ(); while($row = $res->next()){ $row['download_1_12_1'] = $row['link_1_12_1'] ? \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/addonlist_download.tpl'),array('version' => '1.12.1', 'link' => $row['link_1_12_1'])) : ''; $row['download_2_4_3'] = $row['link_2_4_3'] ? \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/addonlist_download.tpl'),array('version' => '2.4.3', 'link' => $row['link_2_4_3'])) : ''; $row['download_3_3_5a'] = $row['link_3_3_5a'] ? \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/addonlist_download.tpl'),array('version' => '3.3.5a', 'link' => $row['link_3_3_5a'])) : ''; - $vars['addon_list'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/addonlist_tr.tpl'),$row);} + $vars['addon_list'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/addonlist_tr.tpl'),$row);}*/ $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz')); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars); diff --git a/mojotrollz/page/default_start/js/default_start.js b/mojotrollz/page/default_start/js/default_start.js index 3e8656c..512b572 100644 --- a/mojotrollz/page/default_start/js/default_start.js +++ b/mojotrollz/page/default_start/js/default_start.js @@ -1,6 +1,6 @@ function init_start(){ - $("#mojotrollz_nav a").click(function(){ - $('#mojotrollz_nav li').each(function(){ + $(".mojotrollz_nav a").click(function(){ + $('.mojotrollz_nav li').each(function(){ $(this).removeClass('active');}); $(this).parent().addClass('active'); }); diff --git a/mojotrollz/page/default_start/tpl/addonlist_download.tpl b/mojotrollz/page/default_start/tpl/addonlist_download.tpl index cb4f41d..8a4cfef 100644 --- a/mojotrollz/page/default_start/tpl/addonlist_download.tpl +++ b/mojotrollz/page/default_start/tpl/addonlist_download.tpl @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/mojotrollz/page/default_start/tpl/content_addons.tpl b/mojotrollz/page/default_start/tpl/content_addons.tpl index 9ba1dce..0fa7a91 100644 --- a/mojotrollz/page/default_start/tpl/content_addons.tpl +++ b/mojotrollz/page/default_start/tpl/content_addons.tpl @@ -1,7 +1,7 @@ -
-
+
+
-

ADDONS

+

${mojotrollz_addons}

diff --git a/mojotrollz/page/default_start/tpl/content_client.tpl b/mojotrollz/page/default_start/tpl/content_client.tpl index 79830bd..b32ea24 100644 --- a/mojotrollz/page/default_start/tpl/content_client.tpl +++ b/mojotrollz/page/default_start/tpl/content_client.tpl @@ -1,49 +1,50 @@ -
-
-
-
- -
- Windows - -
Download this file with qBittorrent
+
+
+
+ +
+ Windows + +
${mojotrollz_download_qbittorrent}
- -
-
- -
- Windows - -
Download this file with qBittorrent
-
- -
-
- -
- Windows - -
Download this file with qBittorrent
-
- -
- -

- Players online: ${ts_players}

- -

+ +
+
+ +
+ Windows + +
${mojotrollz_download_qbittorrent}
+
+ +
+
+ +
+ Windows + +
${mojotrollz_download_qbittorrent}
+
+ +
+
+ +
+ Windows + +
${mojotrollz_connect_ts}
+
+
+
+

+ ${mojotrollz_players_online} ${ts_players} +

+ +

+
\ No newline at end of file diff --git a/mojotrollz/page/default_start/tpl/content_server.tpl b/mojotrollz/page/default_start/tpl/content_server.tpl index 61c9cc6..c2922a3 100644 --- a/mojotrollz/page/default_start/tpl/content_server.tpl +++ b/mojotrollz/page/default_start/tpl/content_server.tpl @@ -1,3 +1,3 @@ -
-
+
+
\ No newline at end of file diff --git a/mojotrollz/page/default_start/tpl/content_tshirt.tpl b/mojotrollz/page/default_start/tpl/content_tshirt.tpl index 63b251b..15b36fc 100644 --- a/mojotrollz/page/default_start/tpl/content_tshirt.tpl +++ b/mojotrollz/page/default_start/tpl/content_tshirt.tpl @@ -1,6 +1,6 @@ -
-
+
+
-

T-SHIRTS

+

${mojotrollz_tshirts}

\ No newline at end of file diff --git a/mojotrollz/sql/mysql/system_page.sql b/mojotrollz/sql/mysql/system_page.sql index a99fb2c..9c03591 100644 --- a/mojotrollz/sql/mysql/system_page.sql +++ b/mojotrollz/sql/mysql/system_page.sql @@ -1,5 +1,5 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (10, 1, 'start', 'start', -1, 0, 0, '#content', './?page=start', 'init_start', 'default_start'); -INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'serverlist', 'start', 10, 0, 0, '#content_serverlist', './?page=serverlist', 'init_serverlist', 'default_serverlist'); +INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'serverlist', 'start', 10, 0, 0, '#content_servers', './?page=serverlist', 'init_serverlist', 'default_serverlist'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');
Name