diff --git a/lib/system b/lib/system index 82e4cca..924162d 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 82e4cca8a2f5732fd0730a6971824d4eebcb4334 +Subproject commit 924162dc5f4ed924fdf58f1e197ae11e757d8dfe diff --git a/mojotrollz/files/content/footer.jpg b/mojotrollz/files/content/footer.jpg new file mode 100644 index 0000000..da8682d Binary files /dev/null and b/mojotrollz/files/content/footer.jpg differ diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index fceea73..b07c716 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -10,4 +10,12 @@ html, body { } #home_content { margin-top: 50px; -} \ No newline at end of file +} + +#mojotrollz_client{ + background: url(http://www.mojotrollz.eu/web/test/webcraft/api.php?call=files&cat=content&id=tapete.gif); + padding: 0; + margin-left: 0px; + margin-right: 0px; + +} diff --git a/mojotrollz/page/default_page/css/navbar.css b/mojotrollz/page/default_page/css/navbar.css index c3546ca..8c49349 100644 --- a/mojotrollz/page/default_page/css/navbar.css +++ b/mojotrollz/page/default_page/css/navbar.css @@ -54,20 +54,4 @@ nav.shrink .navbar-toggle { padding: 4px 5px; margin: 8px 15px 8px 0; transition: all 0.4s ease; -} - -.mojotrollz_scroll { - text-align: center; - border-right: 1px solid slategray; - font-weight: bold; - color: white !important; - font-size: 110% !important; - min-width: 12vw; -} -.mojotrollz_scroll_last{ - text-align: center; - font-weight: bold; - color: white !important; - font-size: 110% !important; - min-width: 12vw; } \ 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 cbd0202..11c49fa 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -22,6 +22,10 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['css'] = $this->css(); $vars['content_navbar'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_navbar.tpl')); $vars['content_client'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_client.tpl')); + $vars['content_server'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_server.tpl')); + $vars['content_tshirt'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_tshirt.tpl')); + $vars['content_addons'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_addons.tpl')); + $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')); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars); } diff --git a/mojotrollz/page/default_page/tpl/content_addons.tpl b/mojotrollz/page/default_page/tpl/content_addons.tpl new file mode 100644 index 0000000..56cbca7 --- /dev/null +++ b/mojotrollz/page/default_page/tpl/content_addons.tpl @@ -0,0 +1,4 @@ +