From 90d11af44e1508b9895f0584d24cba4a185413b4 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Sat, 31 Jan 2015 10:17:42 +0000
Subject: [PATCH] merge sanjiangyuan-sub r5227, r5228 into sjy-erq

---
 application/default/views/scripts/data/tools.phtml  | 1 -
 application/default/views/scripts/data/visual.phtml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/default/views/scripts/data/tools.phtml b/application/default/views/scripts/data/tools.phtml
index 2798b235..ef4a4f96 100755
--- a/application/default/views/scripts/data/tools.phtml
+++ b/application/default/views/scripts/data/tools.phtml
@@ -1,7 +1,6 @@
 <ul class="nav nav-pills">
 <li class="nav-header">特色导航方式</li>
 <li><a href="/data/tag"><i class="icon-tags"></i>关键词浏览</a></li>
-<li><a href="/data/series"><i class="icon-th-list"></i>序列浏览</a></li>
 <li><a href="/data/category"><i class="icon-th"></i>分类浏览</a></li>
 <li><a href="/data/timeline"><i class="icon-tasks"></i>时间轴浏览</a></li>
 <li><a href="/data/map"><i class="icon-globe"></i>空间浏览</a></li>
diff --git a/application/default/views/scripts/data/visual.phtml b/application/default/views/scripts/data/visual.phtml
index 856b7d57..f55f7ec7 100644
--- a/application/default/views/scripts/data/visual.phtml
+++ b/application/default/views/scripts/data/visual.phtml
@@ -20,6 +20,7 @@ $this->theme->AppendPlus($this,'colorbox');
     </div>    
     <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a></h2>
     <span><?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?></span>
+    <p class="text-right"><a href="/visual/view/uuid/<?= $md['uuid'] ?>" class="btn btn-info pull-right" style=" text-indent:0"><i class="icon-signal"></i>可视化查看</a></p>
 </div>
 <?php endforeach; ?>
 <?php echo $this->paginator; ?>