From dac5f6c79103947cfff8dbfccf0529286aed9a87 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Wed, 11 Jun 2014 12:06:09 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/data/index.phtml    | 131 +++++++++---------
 .../default/views/scripts/data/visual.phtml   |   4 -
 2 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index 766383e6..8b23c063 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -1,65 +1,66 @@
-
-<div class="row">
-	<div class="span12" style=" border-bottom:1px dashed #E0E0E0">
-        <form method="get" action="/search" id="search"  class="form-search">
-            <a class="btn"  href="/data/browse"><i class="icon-align-justify"></i>数据列表浏览</a>
-            <a class="btn"  href="/data/onlinelist"><i class="icon-th"></i>在线数据清单</a>
-            <a class="btn"  href="/data/offlinelist"><i class="icon-th"></i>离线数据清单</a>
-                    <li class="input-append">
-                <input type="text" value="" id="q" name="q" class="span2 search-query " placeholder="全文搜索">
-                <button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
-            </li>
-        </form>
-    </div>
-</div>
-
-<?php $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词'); ?>
-<div class="row">
-	<?php 
-        $type='theme';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/theme"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-    <?php 
-        $type='discipline';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/discipline"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-</div>
-<div class="row">
-	<?php 
-        $type='place';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/place"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-    <?php 
-        $type='temporal';
-    ?>
-    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
-    <h4><a href="/data/tag/keytype/temporal"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="nav nav-pills">
-		<?php foreach($this->keywords[$type] as $cg) : ?> 
-        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
-        <?php endforeach; ?>
-        </ul>
-    </div>
-</div>
-
+
+<div class="row">
+	<div class="span12" style=" border-bottom:1px dashed #E0E0E0">
+        <form method="get" action="/search" id="search"  class="form-search">
+            <a class="btn"  href="/data/browse"><i class="icon-align-justify"></i>数据列表浏览</a>
+            <a class="btn"  href="/data/onlinelist"><i class="icon-th"></i>在线数据清单</a>
+            <a class="btn"  href="/data/offlinelist"><i class="icon-th"></i>离线数据清单</a>
+            <a class="btn"  href="/data/visual"><i class="icon-th"></i>可视化数据</a>
+                    <li class="input-append">
+                <input type="text" value="" id="q" name="q" class="span2 search-query " placeholder="全文搜索">
+                <button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
+            </li>
+        </form>
+    </div>
+</div>
+
+<?php $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词'); ?>
+<div class="row">
+	<?php 
+        $type='theme';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/theme"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+    <?php 
+        $type='discipline';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/discipline"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+</div>
+<div class="row">
+	<?php 
+        $type='place';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/place"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+    <?php 
+        $type='temporal';
+    ?>
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
+    <h4><a href="/data/tag/keytype/temporal"><img src="/sjyportal/img/keyword.png" width="16" height="16" />&nbsp;<?php echo $keytypezh[$type]; ?></a></h4>
+        <ul class="nav nav-pills">
+		<?php foreach($this->keywords[$type] as $cg) : ?> 
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </div>
+</div>
+
diff --git a/application/default/views/scripts/data/visual.phtml b/application/default/views/scripts/data/visual.phtml
index b7ae86f0..560bef06 100644
--- a/application/default/views/scripts/data/visual.phtml
+++ b/application/default/views/scripts/data/visual.phtml
@@ -7,10 +7,6 @@ $this->headLink()->appendStylesheet('/css/metadata.css');
 $this->nav[] = array('link'=>"/data/visual",'title'=>'可视化数据列表');
 $this->theme->AppendPlus($this,'colorbox');
 ?>
-<div class="row-fluid">
-	<?= $this->render('breadcrumbs.phtml') ?>
-	<?= $this->partial('data/tools.phtml'); ?>
-</div>
 <?php if (!empty($this->paginator)) : ?>
 <div id='metacontent'>
 <?php echo $this->paginator; ?>