From 020a9d7a0ed0e5895b64e8daf1862a9dd9b8c80a Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Sat, 25 Jan 2014 14:21:59 +0000
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=9D=97=E6=AF=94=E4=BE=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/archives/list.phtml | 101 +++++++++++-------
 .../default/views/scripts/index/index.phtml   |   2 +-
 2 files changed, 61 insertions(+), 42 deletions(-)

diff --git a/application/default/views/scripts/archives/list.phtml b/application/default/views/scripts/archives/list.phtml
index 10af8532..0601f822 100644
--- a/application/default/views/scripts/archives/list.phtml
+++ b/application/default/views/scripts/archives/list.phtml
@@ -9,44 +9,32 @@ $this->breadcrumb()->setSeparator(' > ');
 ?>
 
 <!-- Marketing messaging and featurettes
-    ================================================== --> 
+    ================================================== -->
 <!-- Wrap the rest of the page in another container to center all the content. -->
 
 <div class="container marketing"> 
   
   <!-- Three columns of text below the carousel -->
   <div class="row-fluid">
-    <div class="span9">
-      <div class="Lbox">
-        <h4 class="box-title">新闻动态</h4>
-        <ol >
-		<?php
-		if(count($this->paginator))
-		{  
-			foreach ($this->paginator as $v)
-			{
-				$description = "";
-				if (mb_strlen($v['description'])>160)
-				{
-					$description = mb_substr($v['description'],0,160,'utf-8').'...<a href="'.$v['url'].'" class="more">(more)</a>';
-				}else{
-					$description = $v['description'];
-				}
-				?>
-				<li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a><small>[<?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?>]</small></li>
-				<?php
-			}
-		}
-		else
-		{
-			echo '暂无数据';
-		}
-		?>
-        </ol>
-      </div>
-    </div>
-    <!-- /.span9 -->
     <div class="span3">
+      <div class="bs-docs-sidebar">
+        <ul class="nav nav-list bs-docs-sidenav">
+          <li><a href="/archives"><i class="icon-chevron-right"></i>新闻中心</a></li>
+          <?php
+				if(count($this->types))
+				{
+					foreach($this->types as $k=>$v)
+					{
+						$haed = "";
+						if(!empty($v[$this->deepField])) {$haed = str_repeat('　',$v[$this->deepField]);}
+						echo '<li'.($v['code']==$this->type?' class="active"':'').'><a href="'.$v['url'].'"><i class="icon-chevron-right"></i>'.$haed.$v['title'].'</a></li>';
+						$haed = "";
+					}
+				}
+			?>
+        </ul>
+      </div>
+      <!-- /.bs-docs-sidebar -->
       <div class="Lbox">
         <h4 class="box-title">热门排行</h4>
         <ol >
@@ -71,19 +59,50 @@ $this->breadcrumb()->setSeparator(' > ');
         </ol>
       </div>
     </div>
-    <!-- /.span4 --> 
+    <!-- /.span3 -->
+    
+    <div class="span9">
+      <div class="Lbox">
+        <h4 class="box-title">新闻动态</h4>
+        <ol >
+          <?php
+		if(count($this->paginator))
+		{  
+			foreach ($this->paginator as $v)
+			{
+				$description = "";
+				if (mb_strlen($v['description'])>160)
+				{
+					$description = mb_substr($v['description'],0,160,'utf-8').'...<a href="'.$v['url'].'" class="more">(more)</a>';
+				}else{
+					$description = $v['description'];
+				}
+				?>
+          <li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a><small>[<?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?>]</small></li>
+          <?php
+			}
+		}
+		else
+		{
+			echo '暂无数据';
+		}
+		?>
+        </ol>
+      </div>
+    </div>
+    <!-- /.span9 --> 
     
   </div>
-  <!-- /.row --> 
+  <!-- /.row -->
   <div class="pagination">
-  <ul>
-    <li class="disabled"><a href="#">&laquo;</a></li>
-    <li class="active"><a href="#">1</a></li>
-    <li ><a href="#">2</a></li>
-    <li ><a href="#">3</a></li>
-    <li class="disabled"><a href="#">&raquo;</a></li>
-  </ul>
+    <ul>
+      <li class="disabled"><a href="#">&laquo;</a></li>
+      <li class="active"><a href="#">1</a></li>
+      <li ><a href="#">2</a></li>
+      <li ><a href="#">3</a></li>
+      <li class="disabled"><a href="#">&raquo;</a></li>
+    </ul>
   </div>
-</div>  
+</div>
 </div>
 <!-- /.container -->
\ No newline at end of file
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index c3cd67b7..b7a3e25b 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -14,7 +14,7 @@
     <div class="span12"> 
       <div class="span4">
         <div class="box">
-          <h4 class="box-title">数据中心新闻</h4>
+          <h4 class="box-title">省监测中心新闻</h4>
           <ul>          
              <?php foreach($this->list_news as $k=>$v){ ?>
     			<li><a href="<?= $v['url'] ?>"><?= $v['title'] ?></a></li>