From 51cbbdd51b1085a855efc3d5e1ad76080dd90dd9 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Thu, 12 Jun 2014 08:59:00 +0000
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/about/index.phtml   |   2 +-
 .../views/scripts/archives/index.phtml        |  28 ++--
 .../default/views/scripts/archives/list.phtml |   1 -
 .../default/views/scripts/data/index.phtml    | 132 +++++++++---------
 .../default/views/scripts/footer.phtml        |   3 +-
 .../default/views/scripts/header.phtml        | 101 +++++++-------
 6 files changed, 134 insertions(+), 133 deletions(-)

diff --git a/application/default/views/scripts/about/index.phtml b/application/default/views/scripts/about/index.phtml
index a22e30ff..bc6cd0a4 100755
--- a/application/default/views/scripts/about/index.phtml
+++ b/application/default/views/scripts/about/index.phtml
@@ -7,7 +7,7 @@ $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('关于我们');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
+<div class="row-fluid">
 	<div class="span3">
         <?= $this->partial('about/navi.phtml'); ?>
     </div>
diff --git a/application/default/views/scripts/archives/index.phtml b/application/default/views/scripts/archives/index.phtml
index 8fda5425..75ef2954 100644
--- a/application/default/views/scripts/archives/index.phtml
+++ b/application/default/views/scripts/archives/index.phtml
@@ -28,27 +28,29 @@ $this->theme->AppendPlus($this,'masonry');
         </ul>
         </div>
     </div>
+    
     <div class="span9">
-    	<div class="row" id="container">
+      <div class="Lbox">
+        <h4 class="box-title">新闻列表</h4>
+        <ol >
     	<?php
 		 foreach($this->lists as $v)
 		 {?>
          <?php if(count($v['list'])>0) {?>
-			<div class="span4 items">
-        		<h3><a href="<?= $v['url'] ?>"><?= $v['title'] ?></a></h3>
-                <div class="list-content">
-                	<ul class="unstyled">
+
                     	<?php foreach($v['list'] as $arc){?>
-                    	<li><small>[<?php echo date("Y-m-d",strtotime( $arc['ts_published'] )); ?>]</small>
-                    	<a href="<?= $arc['url']?>"><?= $arc['title'] ?></a></li>
+                    	<li><a href="<?= $arc['url']?>"><?= $arc['title'] ?></a><small>[<?php echo date("Y-m-d",strtotime( $arc['ts_published'] )); ?>]</small></li>
                         <?php }?>
-                    </ul>
-                </div>
-			</div>
-		 <?php } }
-		?>
-        </div>
+
+		 <?php } }?>
+        </ol>
+      </div>
+      <div class="pagenavi">
+        <?= $this->paginator; ?>
+      </div>
     </div>
+    <!-- /.span9 --> 
+    
 </div>
 <script>
 $('#container').masonry({
diff --git a/application/default/views/scripts/archives/list.phtml b/application/default/views/scripts/archives/list.phtml
index 04c63f11..66661053 100644
--- a/application/default/views/scripts/archives/list.phtml
+++ b/application/default/views/scripts/archives/list.phtml
@@ -44,7 +44,6 @@ $this->breadcrumb()->setSeparator(' > ');
         <h4 class="box-title">新闻列表</h4>
         <ol >
           <?php
-		#  print_r($this->paginator);
 		if(count($this->paginator))
 		{  
 			foreach ($this->paginator as $v)
diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index 8b23c063..6df2a69b 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -1,66 +1,66 @@
-
-<div class="row">
-	<div class="span12" style=" border-bottom:1px dashed #E0E0E0">
-        <form method="get" action="/search" id="search"  class="form-search">
-            <a class="btn"  href="/data/browse"><i class="icon-align-justify"></i>数据列表浏览</a>
-            <a class="btn"  href="/data/onlinelist"><i class="icon-th"></i>在线数据清单</a>
-            <a class="btn"  href="/data/offlinelist"><i class="icon-th"></i>离线数据清单</a>
-            <a class="btn"  href="/data/visual"><i class="icon-th"></i>可视化数据</a>
-                    <li class="input-append">
-                <input type="text" value="" id="q" name="q" class="span2 search-query " placeholder="全文搜索">
-                <button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
-            </li>
-        </form>
-    </div>
-</div>
-
-<?php $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词'); ?>
-<div class="row">
-	<?php 
-        $type='theme';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/theme"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-    <?php 
-        $type='discipline';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/discipline"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-</div>
-<div class="row">
-	<?php 
-        $type='place';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/place"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-    <?php 
-        $type='temporal';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/temporal"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-</div>
-
+
+<div class="row">
+	<div class="span12" style=" border-bottom:1px dashed #E0E0E0">
+        <form method="get" action="/search" id="search"  class="form-search">
+            <a class="btn"  href="/data/browse"><i class="icon-align-justify"></i>数据列表浏览</a>
+            <a class="btn"  href="/data/onlinelist"><i class="icon-th"></i>在线数据清单</a>
+            <a class="btn"  href="/data/offlinelist"><i class="icon-th"></i>离线数据清单</a>
+            <a class="btn"  href="/data/visual"><i class="icon-th"></i>可视化数据</a>
+                    <li class="input-append">
+                <input type="text" value="" id="q" name="q" class="span2 search-query " placeholder="全文搜索">
+                <button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
+            </li>
+        </form>
+    </div>
+</div>
+
+<?php $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词'); ?>
+<div class="row">
+	<?php 
+        $type='theme';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/theme"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+    <?php 
+        $type='discipline';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/discipline"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+</div>
+<div class="row">
+	<?php 
+        $type='place';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/place"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+    <?php 
+        $type='temporal';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/temporal"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+</div>
+
diff --git a/application/default/views/scripts/footer.phtml b/application/default/views/scripts/footer.phtml
index 2c6717b3..e95227ed 100755
--- a/application/default/views/scripts/footer.phtml
+++ b/application/default/views/scripts/footer.phtml
@@ -14,4 +14,5 @@
           $('#myCarousel').carousel()
         })
       }(window.jQuery)
-</script> 
\ No newline at end of file
+</script>
+<script>setPage();</script>
\ No newline at end of file
diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index 82103ed8..83c1cf81 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -1,51 +1,50 @@
-<!--  header    -->
-<link href="/sjyportal/css/style.css" rel="stylesheet" type="text/css" />
- 
- 
-<header>
-  <div class="container">
-    <div class="row-fluid">
-      <div class="span12">
-        <div class="span4">
-          <img src="/sjyportal/img/logo.png" />
-        </div>
-        <div class="span8 inline">
-        <p class="pull-right" style="color:#000000; font-size:9px;">
-             <?php
-             $auth = Zend_Auth::getInstance();
-             if($auth->hasIdentity())
-             {
-				  $user = $auth->getIdentity(); 
-				  echo '<a href="/account"><i class="icon-user"></i> '.$user->username.'</a> ';
-				  if ($user->usertype == $this->config->auth->identifier) 
-				  {
-					  echo '<a href="/admin"><i class="icon-cog"></i> 后台 </a>';
-				  }
-				  echo '<a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮 </a>';
-				  echo '<a href="/account/logout">退出</a>';
-             } else { 
-                  echo '<a href="/account/login">登 录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/account/register">注 册</a>';
-             } ?> 
-
-        </p>
-        <?php $current_url =$_SERVER["REQUEST_URI"]?>
-        <p>
-          <ul class="nav nav-pills pull-right" id="mainmenu">
-            <li style="padding-right:20px"><a href="/">首 页</a></li>
-            <li style="padding-right:20px"><a href="/archives/">新 闻</a></li>
-            <li style="padding-right:20px"><a href="/data">数 据</a></li>
-            <li style="padding-right:20px"><a href="/about">关于我们</a></li>
-            <li style="padding-right:20px" class="input-append ">
-            <form action="/search" method="get"><input class="input-medium"  placeholder="关键字" type="text" name="q"><button class="btn" type="submit">搜索</button></form>
-            </li>
-          	
-          </ul>
-         </p>
-        </div>
-      </div>
-    </div>
-  </div>
-</header>
-
-<div class="container">
-  	<?= $this->render('breadcrumbs.phtml'); ?>
+<!--  header    -->
+<link href="/sjyportal/css/style.css" rel="stylesheet" type="text/css" />
+ 
+ 
+<header>
+  <div class="container">
+    <div class="row-fluid">
+      <div class="span12">
+        <div class="span4">
+          <img src="/sjyportal/img/logo.png" />
+        </div>
+        <div class="span8 inline">
+        <p class="pull-right" style="color:#000000; font-size:9px;">
+             <?php
+             $auth = Zend_Auth::getInstance();
+             if($auth->hasIdentity())
+             {
+				  $user = $auth->getIdentity(); 
+				  echo '<a href="/account"><i class="icon-user"></i> '.$user->username.'</a> ';
+				  if ($user->usertype == $this->config->auth->identifier) 
+				  {
+					  echo '<a href="/admin"><i class="icon-cog"></i> 后台 </a>';
+				  }
+				  echo '<a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮 </a>';
+				  echo '<a href="/account/logout">退出</a>';
+             } else { 
+                  echo '<a href="/account/login">登 录</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/account/register">注 册</a>';
+             } ?> 
+        </p>
+        <?php $current_url =$_SERVER["REQUEST_URI"]?>
+        <p >
+          <ul class="nav nav-pills pull-right" id="mainmenu">
+            <li style="padding-right:20px"<?php if($current_url=='/') echo " class='active'";?> ><a href="/">首 页</a></li>
+            <li style="padding-right:20px"><a href="/archives/">新 闻</a></li>
+            <li style="padding-right:20px"><a href="/data">数 据</a></li>
+            <li style="padding-right:20px"><a href="/about">关于我们</a></li>
+            <li style="padding-right:20px" class="input-append ">
+            <form action="/search" method="get"><input class="input-medium"  placeholder="关键字" type="text" name="q"><button class="btn" type="submit">搜索</button></form>
+            </li>
+          	
+          </ul>
+         </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</header>
+
+<div class="container">
+  	<?= $this->render('breadcrumbs.phtml'); ?>