From af7cf44634bb49d26c47cb5af4a64c41e52cc8f8 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Wed, 28 May 2014 14:56:21 +0000
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E8=88=AA=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/AboutController.php   |  4 +++
 .../controllers/ArchivesController.php        |  6 +++-
 .../default/views/scripts/data/category.phtml |  1 -
 .../default/views/scripts/header.phtml        | 30 ++-----------------
 4 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/application/default/controllers/AboutController.php b/application/default/controllers/AboutController.php
index 647115d9..10ff59be 100755
--- a/application/default/controllers/AboutController.php
+++ b/application/default/controllers/AboutController.php
@@ -12,6 +12,10 @@ class AboutController extends Zend_Controller_Action
     	$this->view->messages = $this->messenger->getMessages();
     	$this->db=Zend_Registry::get('db');
 		$this->view->pageID = "about-".$this->_request->getActionName();
+		$this->view->nav = array(
+			array('link'=>'/','title'=>'<i class="icon-home"></i>'),
+			array('link'=>'/about','title'=>'关于'),
+		);
     }    
     function contactAction()
     {
diff --git a/application/default/controllers/ArchivesController.php b/application/default/controllers/ArchivesController.php
index 65b8d5ce..86bb3cf1 100644
--- a/application/default/controllers/ArchivesController.php
+++ b/application/default/controllers/ArchivesController.php
@@ -8,7 +8,11 @@ class ArchivesController extends Zend_Controller_Action
 	{
 		$this->view->config = Zend_Registry::get('config');
 		$this->db=Zend_Registry::get('db');
-		$this->view->theme = new Theme();
+		$this->view->theme = new Theme();
+		$this->view->nav = array(
+			array('link'=>'/','title'=>'<i class="icon-home"></i>'),
+			array('link'=>'/archives','title'=>'新闻'),
+		);
 	}
 	
 	function testAction()
diff --git a/application/default/views/scripts/data/category.phtml b/application/default/views/scripts/data/category.phtml
index f84f0b4d..ac469aff 100755
--- a/application/default/views/scripts/data/category.phtml
+++ b/application/default/views/scripts/data/category.phtml
@@ -7,7 +7,6 @@ $this->headTitle()->setSeparator(' - ');
 $this->nav[] = array('link'=>"/data/category",'title'=>'分类浏览');
 ?>
 <div class="row-fluid">
-	<?= $this->render('breadcrumbs.phtml'); ?>
 	<?= $this->partial('data/tools.phtml'); ?>
 </div>
 <div class="row-fluid">
diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index 97008942..b292c8dd 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -1,5 +1,5 @@
 <!--  header    -->
-<link href="../../../../htdocs/sjyportal/css/style.css" rel="stylesheet" type="text/css" />
+<link href="/sjyportal/css/style.css" rel="stylesheet" type="text/css" />
  
  
 <header>
@@ -38,29 +38,5 @@
   </div>
 </header>
 
-<!-- Carousel
-    ================================================== -->
-<div class="container-fluid1 ">
-  <div id="myCarousel" class="carousel slide">
-    <div class="carousel-inner">
-      <div class="item active"> <img src="/sjyportal/img/slide-00.jpg" alt="" class="">
-        <div class="container">
-          <div class="carousel-caption">
-            <h2>青海54.6%国土被纳入三江源国家生态保护试验区</h2>
-          </div>
-        </div>
-      </div>
-      <div class="item"> <img src="/sjyportal/img/slide-01.jpg" alt="" class="">
-        <div class="container">
-          <div class="carousel-caption">
-            <h2>青海54.6%国土被纳入三江源国家生态保护试验区</h2>
-          </div>
-        </div>
-      </div>
-      
-    </div>
-    <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> </div>
-</div>
-<!-- /.carousel --> 
-
-<div class="container">
\ No newline at end of file
+<div class="container">
+  	<?= $this->render('breadcrumbs.phtml'); ?>