From 40ede9ed1f61fc98168ccf5713c7481c0eb33438 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 18 Jan 2016 05:29:50 +0100 Subject: [PATCH] removed item test page, included dummy item in article --- lib/system | 2 +- mojotrollz/page/autoload.inc | 3 +- .../css/default_item.scss | 1 + .../page/default_article/default_article.php | 7 +- .../js/default_article.js} | 7 +- .../js/handlebars-v4.0.5.js | 0 .../page/default_article/tpl/article.tpl | 107 ++++++++++- mojotrollz/page/default_item/autoload.inc | 2 - mojotrollz/page/default_item/default_item.php | 15 -- .../page/default_item/tpl/default_item.tpl | 180 ------------------ mojotrollz/page/page_mojotrollz.php | 3 - 11 files changed, 119 insertions(+), 208 deletions(-) rename mojotrollz/page/{default_item => default_article}/css/default_item.scss (99%) rename mojotrollz/page/{default_item/js/default_item.js => default_article/js/default_article.js} (99%) rename mojotrollz/page/{default_item => default_article}/js/handlebars-v4.0.5.js (100%) delete mode 100644 mojotrollz/page/default_item/autoload.inc delete mode 100644 mojotrollz/page/default_item/default_item.php delete mode 100644 mojotrollz/page/default_item/tpl/default_item.tpl diff --git a/lib/system b/lib/system index b7d8a48..5bc1c6c 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit b7d8a48710fa4211dff705166a28b809261bda75 +Subproject commit 5bc1c6cd11273562427f3f097d300b6cad32a453 diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index e341322..055f428 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -6,5 +6,4 @@ require_once dirname(__FILE__).'/default_impressum/autoload.inc'; require_once dirname(__FILE__).'/default_login/autoload.inc'; require_once dirname(__FILE__).'/default_serverlist/autoload.inc'; require_once dirname(__FILE__).'/default_beta/autoload.inc'; -require_once dirname(__FILE__).'/default_article/autoload.inc'; -require_once dirname(__FILE__).'/default_item/autoload.inc'; \ No newline at end of file +require_once dirname(__FILE__).'/default_article/autoload.inc'; \ No newline at end of file diff --git a/mojotrollz/page/default_item/css/default_item.scss b/mojotrollz/page/default_article/css/default_item.scss similarity index 99% rename from mojotrollz/page/default_item/css/default_item.scss rename to mojotrollz/page/default_article/css/default_item.scss index 7d72ca7..d601465 100644 --- a/mojotrollz/page/default_item/css/default_item.scss +++ b/mojotrollz/page/default_article/css/default_item.scss @@ -40,6 +40,7 @@ $flavour: #FFD100; position: relative; margin: 2px 2px; + box-sizing: content-box; box-shadow: -1px -1px 1px $shadow, -1px 1px 1px $shadow, diff --git a/mojotrollz/page/default_article/default_article.php b/mojotrollz/page/default_article/default_article.php index 4a06f7f..7fdc547 100644 --- a/mojotrollz/page/default_article/default_article.php +++ b/mojotrollz/page/default_article/default_article.php @@ -3,7 +3,12 @@ class default_article extends \SYSTEM\PAGE\Page { var $id = null; public function __construct($id) { $this->id = $id;} - + public static function js(){ + return array( \SYSTEM\WEBPATH(new PPAGE(),'default_article/js/handlebars-v4.0.5.js'), + \SYSTEM\WEBPATH(new PPAGE(),'default_article/js/default_article.js'));} + public static function scss(){ + return array( \SYSTEM\SERVERPATH(new PPAGE(),'default_article/css/default_item.scss'));} + public function html(){ $element = array('text' => \SYSTEM\PAGE\text::get($this->id)); $element = array_merge($element,\SYSTEM\PAGE\text::tag('time')); diff --git a/mojotrollz/page/default_item/js/default_item.js b/mojotrollz/page/default_article/js/default_article.js similarity index 99% rename from mojotrollz/page/default_item/js/default_item.js rename to mojotrollz/page/default_article/js/default_article.js index 73f3bcd..a8ed772 100644 --- a/mojotrollz/page/default_item/js/default_item.js +++ b/mojotrollz/page/default_article/js/default_article.js @@ -1,5 +1,5 @@ - -var items = { +function init_article(){ + var items = { "hearthstone": { @@ -498,4 +498,5 @@ $body.on("mouseout.wow", ".wow-item" , function(e) { } -};*/ \ No newline at end of file +};*/ +} \ No newline at end of file diff --git a/mojotrollz/page/default_item/js/handlebars-v4.0.5.js b/mojotrollz/page/default_article/js/handlebars-v4.0.5.js similarity index 100% rename from mojotrollz/page/default_item/js/handlebars-v4.0.5.js rename to mojotrollz/page/default_article/js/handlebars-v4.0.5.js diff --git a/mojotrollz/page/default_article/tpl/article.tpl b/mojotrollz/page/default_article/tpl/article.tpl index 31c232e..0ac91a0 100644 --- a/mojotrollz/page/default_article/tpl/article.tpl +++ b/mojotrollz/page/default_article/tpl/article.tpl @@ -5,4 +5,109 @@

- \ No newline at end of file + + + + \ No newline at end of file diff --git a/mojotrollz/page/default_item/autoload.inc b/mojotrollz/page/default_item/autoload.inc deleted file mode 100644 index e2c9da4..0000000 --- a/mojotrollz/page/default_item/autoload.inc +++ /dev/null @@ -1,2 +0,0 @@ - - ${css} - - -
-

Warcraft Tooltips

-

with css, handlebars and some jQuery

-
- -
- -
Backpack
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -${js} - \ No newline at end of file diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php index 31011b6..be57ce3 100644 --- a/mojotrollz/page/page_mojotrollz.php +++ b/mojotrollz/page/page_mojotrollz.php @@ -27,7 +27,4 @@ class page_mojotrollz extends \SYSTEM\API\api_default { public static function page_article($id){ return (new default_article($id))->html();} - - public static function page_item(){ - return (new default_item())->html();} } \ No newline at end of file