From 6168aaafa450bd016688a8737990f6470cbd6f84 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Tue, 18 Jun 2013 03:05:05 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=91=E6=B2=B3logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/HeiheController.php   |  1 +
 .../default/controllers/HiwaterController.php |  3 +-
 .../default/views/scripts/heihe_header.phtml  | 81 +++++++++++--------
 application/layouts/heihe.phtml               | 80 +++++++++---------
 4 files changed, 93 insertions(+), 72 deletions(-)

diff --git a/application/default/controllers/HeiheController.php b/application/default/controllers/HeiheController.php
index 78288c5e..78def0b4 100644
--- a/application/default/controllers/HeiheController.php
+++ b/application/default/controllers/HeiheController.php
@@ -9,6 +9,7 @@ class HeiheController extends DataController
 		$this->debug = 1;
 		$this->view->pageID = "heihe-".$this->_request->getActionName();
 		$this->view->nav[] = array('link'=>"/heihe",'title'=>'黑河计划数据管理中心');
+		$this->_helper->layout->setLayout('heihe');
 	}
 		
 	function indexAction()
diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php
index 3743b753..905e6ee7 100644
--- a/application/default/controllers/HiwaterController.php
+++ b/application/default/controllers/HiwaterController.php
@@ -45,7 +45,8 @@ class HiwaterController extends DataController
 		{
 			$this->view->pageIn = "collapse9";
 		}
-		$this->view->pageID = "hiwater-".$acName;
+		$this->view->pageID = "hiwater-".$acName;
+		$this->_helper->layout->setLayout('heihe');
 	}
 		
 	function indexAction()
diff --git a/application/default/views/scripts/heihe_header.phtml b/application/default/views/scripts/heihe_header.phtml
index c20fe335..ebf49bf0 100644
--- a/application/default/views/scripts/heihe_header.phtml
+++ b/application/default/views/scripts/heihe_header.phtml
@@ -1,34 +1,49 @@
-<div id="divHeader">
-    <div id="heiheLogo">
-        <a href="/heihe"><img src="/images/heihe-logo.png" alt="Heihe Logo" /></a>
+<div class="masthead">
+  <div class="row">
+  <div class="span5"><a href="/"><img src="/images/heihe-logo.png" alt="Westdc Logo" /></a></div>
+  <div class="span5">
+  	<form method="get" action="/search" id="search" style="padding-top:17px;">
+            	<div class="input-append">
+                	<input type="text" value="" id="q" name="q" class="span4" placeholder="全文搜索">
+                	<button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
+              	</div></form>
+              	</div>
+  </div>
+  <div class="navbar">
+    <div class="navbar-inner">
+      <div class="container">
+         <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="brand" href="/">WestDC</a>
+          <div class="nav-collapse collapse">
+        <ul class="nav" id="mainmenu">
+          <li id="main-nav-index"><a href="/"><span>首页</span></a></li>
+          <li id="main-nav-data"><a href="/data"><span>数据产品</span></a></li>
+          <li id="main-nav-review"><a href="/review"><span>数据评审</span></a></li>
+          <li id="main-nav-author"><a href="/author"><span>数据作者</span></a></li>
+          <li id="main-nav-knowledge"><a href="/knowledge"><span>知识积累</span></a></li>
+          <li><a href="/archives"><span>新闻动态</span></a></li>
+          <li><a href="/about"><span>关于本站</span></a></li>
+        </ul>
+        
+        <p class="navbar-text pull-right">
+          	<?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=="administrator") echo '<a href="/admin"><i class="icon-cog"></i>后台</a> ';
+                        echo '<a href="/data/order"><i class="icon-shopping-cart"></i>数据篮</a> <a href="/account/logout">注销</a>'; 
+             } else { 
+                  echo '<a href="/account/login"><i class="icon-user"></i>登录</a> <a href="/account/register">注册</a>';
+             } ?>
+            </p>
+            </div>
+      </div>
     </div>
-    <div class="nav">
-    <div id="divNavi">
-        <ul>
-        <!-- CSS Tabs -->
-        <li><a href="/"><span>首页</span></a></li>
-       <!-- <li><a href="/news"><span>新闻动态</span></a></li> -->
-        <li><a href="/data"><span>数据产品与服务</span></a></li>
-        <li><a href="/review"><span>数据评审</span></a></li>
-        <li><a href="/author"><span>数据作者</span></a></li>
-        <li><a href="/knowledge"><span>知识积累</span></a></li>
-        <li><a href="/community"><span>合作与交流</span></a></li>
-        <li><a href="/about"><span>关于本站</span></a></li>    
-    </ul>
-    </div>
-    <div id="userNavi">
-        <?php
-                $auth = Zend_Auth::getInstance();
-                if($auth->hasIdentity())
-                {
-                    $user = $auth->getIdentity();
-                    echo '<a href="/account/edit">'.$user->username.'</a> ';
-                    if ($user->usertype=="administrator") echo '<a href="/admin">后台管理</a> ';
-                    echo '<a href="/data/order">数据篮</a> <a href="/account/logout">注销</a>'; 
-                } else {
-                    echo '<a href="/account/login">登录</a> <a href="/account/register">注册</a>';
-                }
-        ?>
-        </div>
-    </div>
-</div>
+  </div><!-- /.navbar -->
+</div>
\ No newline at end of file
diff --git a/application/layouts/heihe.phtml b/application/layouts/heihe.phtml
index c273931f..b7329b34 100644
--- a/application/layouts/heihe.phtml
+++ b/application/layouts/heihe.phtml
@@ -1,39 +1,43 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
-<head>
+<!DOCTYPE html>
+<html>
+  <head>
+    <?= $this->headTitle() ?>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <link rel="stylesheet" type="text/css" media="screen"
-             href="/css/default.css" />  
-    <link rel="stylesheet" type="text/css" media="screen"
-             href="/css/heihe.css" />  
-    <script src='/js/navi.js' type="text/javascript"></script>
-	<link rel="alternate" type="application/rss+xml" title="WestDC RSS Feed" href="/data/feed" />
-	<link rel="pingback" href="http://westdc.westgis.ac.cn/data/pingback" />
-    <?= $this->headTitle() ?>
-    <?= $this->headScript() ?>
-	<?= $this->headLink() ?>
-    <?= $this->headStyle() ?>           
-</head>
-<body>
-    <?= $this->render('heihe_header.phtml') ?>
-<div class="clearLine"/>
-<div id="divBreadCrumb"><?= $this->breadcrumb() ?> </div>
-<div id="divContent"><?= $this->layout()->content ?></div>
-<div class="clearLine"/>
-    <?= $this->render('footer.phtml') ?>
-<script type="text/javascript">setPage();</script>
-<!-- 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>
-<!-- End Piwik Tracking Code -->
-</body>
-</html>
+    <link href="/js/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link rel="stylesheet" href="/js/lib/bootstrap/css/font-awesome.min.css">
+    <!--[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">    
+    <script src="/js/lib/jquery.lasted.js"></script>
+    <script src="/js/lib/bootstrap/js/bootstrap.min.js"></script>
+    <script src="/js/navi.js"></script>
+	<?= $this->headScript() ?>
+	<?= $this->headLink() ?>
+    <?= $this->headStyle() ?>
+    <link rel="shortcut icon" href="/favicon_64.png" />
+	<link rel="alternate" type="application/rss+xml" title="WestDC RSS Feed" href="/data/feed" />
+	<link rel="pingback" href="http://westdc.westgis.ac.cn/data/pingback" />
+  </head>
+  <body>
+  <div class="container">
+	<?= $this->render('heihe_header.phtml') ?>
+	  	<!--<div class="breadcrumb"><?= $this->breadcrumb() ?> </div>-->
+    <?= $this->layout()->content ?>
+    <?= $this->render('footer.phtml') ?>
+  </div>
+  </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