10 年之前 · e4b76f4756
--- 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({
			
--- 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"
			
 
				 
			
 
				 
			
 
				 
			
--- 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 

			
 
				+<?php

			
 
				 /**

			
 
				  * @file

			
 
				  * Default theme implementation to display the basic html structure of a single

			
@@ -54,37 +54,37 @@
 
				 	<head<?php print $rdf_profile; ?>>

			
 
				 		<!-- remove the no-js as fast as possible -->

			
 
				 		<script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>

			
 
				-		

			
 
				-		<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame 

			
 
				+

			
 
				+		<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame

			
 
				 		     Remove this if you use the .htaccess -->

			
 
				 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

			
 
				 

			
 
				 

			
 
				 		<?php print $head; ?>

			
 
				-		

			
 
				+

			
 
				 		<title><?php print $head_title; ?></title>

			
 
				 		<?php print $styles; ?>

			
 
				 

			
 
				-	  

			
 
				+

			
 
				 	  <!-- All JavaScript at the bottom, except for Modernizr / Respond.

			
 
				 	       Modernizr enables HTML5 elements & feature detects; Respond is a polyfill for min/max-width CSS3 Media Queries

			
 
				 	       For optimal performance, use a custom Modernizr build: www.modernizr.com/download/ -->

			
 
				-	  <script src="<?php print $theme_path ?>/js/libs/modernizr-2.6.1.min.js" type="text/javascript"></script>

			
 
				+	  <script src="<?php print $theme_path ?>bower_components/modernizr/modernizr.js" type="text/javascript"></script>

			
 
				 

			
 
				 

			
 
				 		<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->

			
 
				 	</head>

			
 
				-	

			
 
				+

			
 
				 	<body class="<?php print $classes; ?>"<?php print $attributes; ?>>

			
 
				 	  <div id="root">

			
 
				 

			
 
				-	    <div id="container">		 		

			
 
				-		

			
 
				+	    <div id="container">

			
 
				+

			
 
				 			  <?php print $page_top; ?>

			
 
				 			  <?php print $page; ?>

			
 
				 			  <?php print $page_bottom; ?>

			
 
				-		

			
 
				-	    </div> 

			
 
				+

			
 
				+	    </div>

			
 
				 	    <!-- /container -->

			
 
				 

			
 
				     </div>

			
@@ -92,7 +92,7 @@
 
				 

			
 
				 		<!-- Javascript at the bottom for fast page loading -->

			
 
				 		<?php print $scripts; ?>

			
 
				-		

			
 
				+

			
 
				 

			
 
				 	  <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.

			
 
				 	       chromium.org/developers/how-tos/chrome-frame-getting-started -->

			
@@ -102,5 +102,5 @@
 
				 	  <![endif]-->

			
 
				 

			
 
				 	</body>

			
 
				-	

			
 
				+

			
 
				 </html>