diff --git a/lib/system b/lib/system index 749e079..41e82fa 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 749e079645be60dc0711817ca6d262a8a35f3ddf +Subproject commit 41e82faa64d8fc8932737b3615bfa762f3d796aa diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php index f4e9e91..461280a 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -1,22 +1,22 @@ WEBPATH()). - \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()). - \SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::url(array(\LIB\lib_jqbootstrapvalidation::js()))). - \SYSTEM\HTML\html::script(\LIB\lib_flexslider::js()->WEBPATH()). - \SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::url( - array( \LIB\lib_system::js(), + return \SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::minify( + array( \LIB\lib_jquery::js(), + \LIB\lib_bootstrap::js(), + \LIB\lib_jqbootstrapvalidation::js(), + \LIB\lib_flexslider::js(), + \LIB\lib_system::js(), new PPAGE('default_page/js/default_page.js')))); } public static function css(){ return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)). \SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()->WEBPATH(false)). - \SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()). - \SYSTEM\HTML\html::link(\LIB\lib_flexslider::css()->WEBPATH(false)). - \SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::url( - array( \LIB\lib_system::css(), + \SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::minify( + array( \LIB\lib_flexslider::css(), + \LIB\lib_animate::css(), + \LIB\lib_system::css(), new PPAGE('default_page/css/default_page.css'), new PPAGE('default_page/css/btn-success.css'), new PPAGE('default_page/css/btn-primary.css'), diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index 6885fc5..ddb4982 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -30,8 +30,6 @@ padding-right: 15px; } - ${css} - ${js}

${mojotrollz_heading}

@@ -112,4 +110,6 @@ + ${css} + ${js} \ No newline at end of file