From 13e689e7fcaba3f21f8f1daa1364964543cff116 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 16 Sep 2015 02:35:29 +0200 Subject: [PATCH] default_login page, redesign of tpl's where what 2 load --- mojotrollz/page/autoload.inc | 3 +- mojotrollz/page/default_login/autoload.inc | 2 + .../page/default_login/default_login.php | 6 +++ mojotrollz/page/default_login/tpl/login.tpl | 34 +++++++++++++++++ mojotrollz/page/default_page/default_page.php | 1 + .../page/default_page/js/default_page.js | 28 +++----------- .../tpl/content_more.tpl | 4 +- .../page/default_page/tpl/default_page.tpl | 38 ++++++++++++++++++- .../page/default_start/default_start.php | 1 - .../page/default_start/js/default_start.js | 6 --- .../page/default_start/tpl/content_client.tpl | 7 ---- .../page/default_start/tpl/default_start.tpl | 33 ++-------------- mojotrollz/page/page_mojotrollz.php | 3 ++ 13 files changed, 97 insertions(+), 69 deletions(-) create mode 100644 mojotrollz/page/default_login/autoload.inc create mode 100644 mojotrollz/page/default_login/default_login.php create mode 100644 mojotrollz/page/default_login/tpl/login.tpl rename mojotrollz/page/{default_start => default_page}/tpl/content_more.tpl (100%) diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index 03297b9..b9352c8 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -2,4 +2,5 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__),''); require_once dirname(__FILE__).'/default_page/autoload.inc'; require_once dirname(__FILE__).'/default_start/autoload.inc'; -require_once dirname(__FILE__).'/default_impressum/autoload.inc'; \ No newline at end of file +require_once dirname(__FILE__).'/default_impressum/autoload.inc'; +require_once dirname(__FILE__).'/default_login/autoload.inc'; \ No newline at end of file diff --git a/mojotrollz/page/default_login/autoload.inc b/mojotrollz/page/default_login/autoload.inc new file mode 100644 index 0000000..8fd92c5 --- /dev/null +++ b/mojotrollz/page/default_login/autoload.inc @@ -0,0 +1,2 @@ + +
+

${basic_login} / ${basic_register}

+

${sai_mod_login_text}

+
+
+
+
+ +
+
+ +
+
+ + +
+
+ ${basic_text_register}
+ \ 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 71e5a01..606b95a 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -28,6 +28,7 @@ class default_page extends \SYSTEM\PAGE\Page { if(!$_escaped_fragment_){ $vars['js'] = $this->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')); 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 4590b10..9686d86 100644 --- a/mojotrollz/page/default_page/js/default_page.js +++ b/mojotrollz/page/default_page/js/default_page.js @@ -1,25 +1,9 @@ $(document).ready(function() { new SYSTEM('./api.php',1,'start'); - tabs(); - search(); -}); - -function search(){ - $("#nav_search_btn").click(function(){ - system.load('search;param.'+$('#nav_search').val()); + $('.flexslider').flexslider({ + animation: "slide", + controlNav: false, + slideshow: true, + animationLoop: true, }); - $(document).keypress(function(e) { - var hasFocus = $('#nav_search').is(':focus'); - if(e.which === 13 && hasFocus) { - system.load('search;param.'+$('#nav_search').val()); - } - }); -} - -function tabs(){ - $("#tabs_user_list a").click(function(){ - $('#tabs_user_list li').each(function(){ - $(this).removeClass('active');}); - $(this).parent().addClass('active'); - }); -} \ No newline at end of file +}); \ No newline at end of file diff --git a/mojotrollz/page/default_start/tpl/content_more.tpl b/mojotrollz/page/default_page/tpl/content_more.tpl similarity index 100% rename from mojotrollz/page/default_start/tpl/content_more.tpl rename to mojotrollz/page/default_page/tpl/content_more.tpl index 53c5ae1..f8420b1 100644 --- a/mojotrollz/page/default_start/tpl/content_more.tpl +++ b/mojotrollz/page/default_page/tpl/content_more.tpl @@ -11,13 +11,13 @@ +    +
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 50b5c48..f6171c8 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -15,6 +15,42 @@ -
+
+ +
+
+
+
    +
  • slider_image_01.jpg
    • +
  • slider_image_02.jpg
    • +
  • slider_image_03.jpg
    • +
+
+
+
+
+ ${content_more} +
\ 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 5dca097..4aa395f 100644 --- a/mojotrollz/page/default_start/default_start.php +++ b/mojotrollz/page/default_start/default_start.php @@ -10,7 +10,6 @@ class default_start extends \SYSTEM\PAGE\Page { $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['content_more'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_more.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'; diff --git a/mojotrollz/page/default_start/js/default_start.js b/mojotrollz/page/default_start/js/default_start.js index fb861d2..6e2dc48 100644 --- a/mojotrollz/page/default_start/js/default_start.js +++ b/mojotrollz/page/default_start/js/default_start.js @@ -1,10 +1,4 @@ function init_start(){ - $('.flexslider').flexslider({ - animation: "slide", - controlNav: false, - slideshow: true, - animationLoop: true, - }); $("#mojotrollz_nav a").click(function(){ $('#mojotrollz_nav li').each(function(){ $(this).removeClass('active');}); diff --git a/mojotrollz/page/default_start/tpl/content_client.tpl b/mojotrollz/page/default_start/tpl/content_client.tpl index ed05321..415104a 100644 --- a/mojotrollz/page/default_start/tpl/content_client.tpl +++ b/mojotrollz/page/default_start/tpl/content_client.tpl @@ -1,12 +1,5 @@
-
-
    -
  • slider_image_01.jpg
    • -
  • slider_image_02.jpg
    • -
  • slider_image_03.jpg
    • -
-
diff --git a/mojotrollz/page/default_start/tpl/default_start.tpl b/mojotrollz/page/default_start/tpl/default_start.tpl index a1f9c09..e7eaef5 100644 --- a/mojotrollz/page/default_start/tpl/default_start.tpl +++ b/mojotrollz/page/default_start/tpl/default_start.tpl @@ -1,29 +1,4 @@ - -
- ${content_client} - ${content_server} - ${content_tshirt} - ${content_addons} -
-${content_more} \ No newline at end of file +${content_client} +${content_server} +${content_tshirt} +${content_addons} \ No newline at end of file diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php index abbe746..0c5dec3 100644 --- a/mojotrollz/page/page_mojotrollz.php +++ b/mojotrollz/page/page_mojotrollz.php @@ -13,4 +13,7 @@ class page_mojotrollz extends \SYSTEM\API\api_default { public static function page_start(){ return (new default_start())->html();} + + public static function page_login(){ + return (new default_login())->html();} } \ No newline at end of file