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] 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;  	                      
 	}