diff --git a/sites/all/themes/gui/materiobasetheme/js/script.js b/sites/all/themes/gui/materiobasetheme/js/script.js index abcff3a9..006f1056 100644 --- a/sites/all/themes/gui/materiobasetheme/js/script.js +++ b/sites/all/themes/gui/materiobasetheme/js/script.js @@ -73,10 +73,11 @@ var v1, v2, v3, v4, v5; // generic variable used in many cases to avoid to create new memory block with new vars function init(){ - // trace('init MaterioBaseTheme'); + trace('init MaterioBaseTheme'); checkIE(); initHistoryNav(); + if(_isFrontNotLogged) initHome(); @@ -118,6 +119,7 @@ * history navigation */ function initHistoryNav(){ + trace("initHistoryNav _History", _History); var state = _History.getState(); // _History.log('initial:', state.data, state.title, state.url); _History.Adapter.bind(window,'statechange',onHistoryStateChange); @@ -125,7 +127,7 @@ }; function onNewHistoryPage(event){ - //trace('theme :: onNewHistoryPage', event); + trace('theme :: onNewHistoryPage', event); var title = event.title.replace(/<(?:.|\n)*?>/gm, '') + ' | ' + _strings.site_name; // trace('MaterioBaseTheme :: onNewHistoryPage : title', title); @@ -136,9 +138,9 @@ }; function onHistoryStateChange(event){ - // trace('theme :: onHistoryStateChange', event); + trace('theme :: onHistoryStateChange', event); var state = _History.getState(); - // _History.log('statechange:', state.data, state.title, state.url); + _History.log('statechange:', state.data, state.title, state.url); // google analytics $.event.trigger({ diff --git a/sites/all/themes/gui/materiobasetheme/materiobasetheme.info b/sites/all/themes/gui/materiobasetheme/materiobasetheme.info index aa748560..2d32c9ae 100644 --- a/sites/all/themes/gui/materiobasetheme/materiobasetheme.info +++ b/sites/all/themes/gui/materiobasetheme/materiobasetheme.info @@ -21,11 +21,11 @@ stylesheets[all][] = "css/nonsemantic.css" ;----------// Scripts -scripts[] = "bower_components/history.js/compressed/history.js" +scripts[] = "bower_components/history.js/scripts/bundled/html4+html5/jquery.history.js" scripts[] = "bower_components/jquery.hotkeys/jquery.hotkeys.js" scripts[] = "bower_components/jquery.columnizer/src/jquery.columnizer.min.js" -scripts[] = "bower_components/jquery.lazyload/jquery.lazyload.min.js" -scripts[] = "js/script.min.js" +scripts[] = "bower_components/jquery.lazyload/jquery.lazyload.js" +scripts[] = "js/script.js" diff --git a/sites/all/themes/gui/materiobasetheme/templates/html.tpl.php b/sites/all/themes/gui/materiobasetheme/templates/html.tpl.php index 96e9c2e5..19fc5769 100644 --- a/sites/all/themes/gui/materiobasetheme/templates/html.tpl.php +++ b/sites/all/themes/gui/materiobasetheme/templates/html.tpl.php @@ -1,4 +1,4 @@ -> - - - + <?php print $head_title; ?> - + - + - + >
-
- +
+ - -
+ +
@@ -92,7 +92,7 @@ - + @@ -102,5 +102,5 @@ - + \ No newline at end of file