From 29e28b0be78fd7ba4d476d3525ebf54b8427441e Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Mon, 16 Jun 2014 11:55:36 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0LOGO=E8=B6=85=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/header.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index b8b112b3..246c379c 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -7,7 +7,7 @@
     <div class="row-fluid">
       <div class="span12">
         <div class="span3">
-          <img src="/sjyportal/img/logo.png" />
+          <a href="/"><img src="/sjyportal/img/logo.png" /></a>
         </div>
         <div class="span9">
         <p class="pull-right" style="font-size:9px; position:relative; top:-8px;">

From 4e59336d253f555fc0081eb85e18b77fc53f3a61 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Tue, 17 Jun 2014 00:07:35 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=96=B0=E9=97=BB=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8E=E6=97=B6=E9=97=B4=E6=A0=87=E8=AE=B0=E8=B7=9D=E7=A6=BB?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/archives/list.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/default/views/scripts/archives/list.phtml b/application/default/views/scripts/archives/list.phtml
index 66661053..9fb7f1c4 100644
--- a/application/default/views/scripts/archives/list.phtml
+++ b/application/default/views/scripts/archives/list.phtml
@@ -56,7 +56,7 @@ $this->breadcrumb()->setSeparator(' > ');
 					$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>
+          <li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a> <small class="pull-right">[<?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?>]</small></li>
           <?php
 			}
 		}

From 3e9b76836324c924e546a329cd3eb1b1138006cc Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Tue, 17 Jun 2014 08:49:10 +0000
Subject: [PATCH 3/3] fix errors

---
 application/default/controllers/VisualController.php | 4 ++++
 application/default/views/scripts/data/visual.phtml  | 2 +-
 application/default/views/scripts/visual/view.phtml  | 1 +
 htdocs/js/navi.js                                    | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/default/controllers/VisualController.php b/application/default/controllers/VisualController.php
index 608d852b..eea08e08 100644
--- a/application/default/controllers/VisualController.php
+++ b/application/default/controllers/VisualController.php
@@ -10,6 +10,10 @@ class VisualController extends Zend_Controller_Action
     {
     	$this->view->config = Zend_Registry::get('config');
     	$this->db=Zend_Registry::get('db');
+	$this->view->nav = array(
+			array('link'=>'/','title'=>'<i class="icon-home"></i>'),
+			array('link'=>'/data','title'=>$this->view->config->title->data),
+		);
 
 		$auth = Zend_Auth::getInstance();
 		if($auth->hasIdentity())
diff --git a/application/default/views/scripts/data/visual.phtml b/application/default/views/scripts/data/visual.phtml
index 560bef06..856b7d57 100644
--- a/application/default/views/scripts/data/visual.phtml
+++ b/application/default/views/scripts/data/visual.phtml
@@ -15,7 +15,7 @@ $this->theme->AppendPlus($this,'colorbox');
 <div class="mditem">
 	<div class="thumb">
 	<a href="/service/bigthumb/uuid/<?= $md['uuid'] ?>" class="colorbox">
-		<img src="/service/thumb/id/<?php echo $md['id'];?>" />
+		<img src="/service/thumb/uuid/<?php echo $md['uuid'];?>" />
     </a>
     </div>    
     <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a></h2>
diff --git a/application/default/views/scripts/visual/view.phtml b/application/default/views/scripts/visual/view.phtml
index 0ea4c5ea..d8a04728 100644
--- a/application/default/views/scripts/visual/view.phtml
+++ b/application/default/views/scripts/visual/view.phtml
@@ -8,6 +8,7 @@ $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">数据与服务</a>');
 $this->breadcrumb('数据可视化');
 $this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/visual",'title'=>'可视化数据列表');
 ?>
 <div class="row">
     <div class="span12">
diff --git a/htdocs/js/navi.js b/htdocs/js/navi.js
index 9b6325e9..f8988b74 100755
--- a/htdocs/js/navi.js
+++ b/htdocs/js/navi.js
@@ -2,7 +2,7 @@ function extractPageName(hrefString)
 	{
 	        var arr = hrefString.split('/');
 	        var result=(arr.length<3) ? hrefString : arr[3].toLowerCase();
-	        if (result=='water' || result=='heihe' || result=='glacier' || result=='yrnmr' || result=='hiwater') result='data';
+	        if (result=='visual' || result=='heihe') result='data';
 	        if (result=='admin' && arr.length>=4) result+="/"+arr[4];
 	        return result;  	                      
 	}