From ef5828b6d07b820457b81d71b72240ea5278cc8c Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Tue, 27 May 2014 09:57:11 +0000
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/layouts/layout.phtml | 53 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/application/layouts/layout.phtml b/application/layouts/layout.phtml
index 825bbf07..dc5044ce 100755
--- a/application/layouts/layout.phtml
+++ b/application/layouts/layout.phtml
@@ -5,12 +5,22 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <link href="/js/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link href="/js/lib/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
     <link rel="stylesheet" href="/js/lib/bootstrap/css/font-awesome.min.css">
+    <link href="/sjyportal/css/style.css" rel="stylesheet" media="screen">
+
     <!--[if IE 7]>
 <link rel="stylesheet" href="/js/lib/bootstrap/css/font-awesome-ie7.min.css">
-<![endif]-->    
-    <link href="/js/lib/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
-    <link href="/css/style.css" rel="stylesheet" media="screen">
+<![endif]-->  
+
+<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+<!--[if lt IE 9]>
+      <script src="/sjyprotal/js/html5shiv.js"></script>
+    <![endif]-->
+
+<!-- Fav and touch icons -->
+  
+        
     <script src="/js/lib/jquery.lasted.js"></script>
     <script src="/js/lib/bootstrap/js/bootstrap.min.js"></script>
     <script src="/js/navi.js"></script>
@@ -22,26 +32,23 @@
 	<link rel="pingback" href="http://westdc.westgis.ac.cn/data/pingback" />
   </head>
   <body>
-  <?= $this->render('header.phtml') ?>
-  <div class="container">
-  	<?= $this->layout()->content ?>
-  </div>
-  <?= $this->render('footer.phtml') ?>
-  </body>
- <!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
 
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.westgis.ac.cn/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "11"]);
-    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Piwik Code -->
+	<?= $this->render('header.phtml') ?>
+	  	<!--<div class="breadcrumb"><?= $this->breadcrumb() ?> </div>-->
+    <?= $this->layout()->content ?>
+    <?= $this->render('footer.phtml') ?>
+
+  </body>
+    <!-- Piwik -->
+    <script type="text/javascript">
+    var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.westgis.ac.cn/" : "http://piwik.westgis.ac.cn/");
+    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+    </script><script type="text/javascript">
+    try {
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+    piwikTracker.trackPageView();
+    piwikTracker.enableLinkTracking();
+    } catch( err ) {}
+    </script><noscript><p><img src="http://piwik.westgis.ac.cn/piwik.php?idsite=5" style="border:0" alt="" /></p></noscript>
     <script>setPage();</script>
 </html>
\ No newline at end of file
