From af87e9a011a3b2c7feb5bc94cc150a057619691f Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Sun, 7 Apr 2013 09:10:51 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=B5=8F=E8=A7=88=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/account/index.phtml |  2 +-
 .../default/views/scripts/data/category.phtml | 58 ++++++++++---------
 .../default/views/scripts/data/tools.phtml    | 54 ++++++++---------
 3 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/application/default/views/scripts/account/index.phtml b/application/default/views/scripts/account/index.phtml
index 5c927e3f..7a98dab7 100644
--- a/application/default/views/scripts/account/index.phtml
+++ b/application/default/views/scripts/account/index.phtml
@@ -3,7 +3,7 @@
 	$this->headTitle('我的账户');
 	$this->headTitle()->setSeparator(' - ');
 ?>
-  <div class="row">
+<div class="row">
     <div class="span3">
       <div class="well sidebar-nav">
         <?= $this->partial('account/left.phtml'); ?>
diff --git a/application/default/views/scripts/data/category.phtml b/application/default/views/scripts/data/category.phtml
index fe96d9a9..a70ad720 100755
--- a/application/default/views/scripts/data/category.phtml
+++ b/application/default/views/scripts/data/category.phtml
@@ -4,39 +4,41 @@
 $this->headTitle('分类浏览');
 if (!empty($this->codename)) $this->headTitle($this->codename);
 $this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/metadata.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
 $this->breadcrumb('<a href="/data/category">分类浏览</a>');
 if (!empty($this->codename)) $this->breadcrumb($this->codename);
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div id='tools'>
-<?= $this->partial('data/tools.phtml'); ?>
+<div class="row-fluid">
+	<?= $this->partial('data/tools.phtml'); ?>
 </div>
-
-<div id='leftnav'>
-<fieldset><legend>数据集类别</legend>
-<ul>
-<?php foreach($this->category as $cg) : ?>
-<li><a href='/data/category/code/<?php echo $cg['code']; ?>'><?php (empty($cg['name_zh']))?print($cg['name']):print($cg['name_zh']); ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
-<?php endforeach; ?>
-</ul></fieldset>
+<div class="row-fluid">
+	<h4>数据集类别</h4>
+	<ul class="nav nav-pills">
+	<?php foreach($this->category as $cg) : ?>
+    <li <?php if (!empty($this->metadata)) : if($cg['name'] == $this->codename || $cg['name_zh'] == $this->codename ){?> class="active"  <?php } endif; ?>>
+    <a href='/data/category/code/<?php echo $cg['code']; ?>'><?php (empty($cg['name_zh']))?print($cg['name']):print($cg['name_zh']); ?>
+   	<span class="note">(<?php echo $cg['count']; ?>)</span></a></li>
+    <?php endforeach; ?>
+    </ul>
 </div>
-<?php if (!empty($this->metadata)) : ?>
-<div id='metacontent'>
-<h1>当前浏览：<?php echo $this->codename; ?></h1>
-<?php echo $this->page->getNavigation(); ?>
-<hr />
-<?php foreach($this->metadata as $md) : ?>
-<div class="mditem">
-<div class="thumb"><img src="/service/thumb/id/<?php echo $md['id'];?>" /></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>
-</div>
-<?php endforeach; ?>
-<?php echo $this->page->getNavigation(); ?>
-</div>
-<?php endif; ?>
+<div class="row-fluid">
+	<?php if (!empty($this->metadata)) : ?>
+    <div id='metacontent'>
+    <h4>当前浏览：<?php echo $this->codename; ?></h4>
+    <?php echo $this->page->getNavigation(); ?>
+    <hr />
+    <ul class="unstyled">
+    <?php foreach($this->metadata as $md) : ?>
+    <li class="well well-small" style="overflow:hidden;">
+    	<img src="/service/thumb/id/<?php echo $md['id'];?>" class="pull-left img-polaroid img-rounded" style="margin-right:5px" />
+        <h3><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a></h3>
+        <p><?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?></p>
+    </li>
+    <?php endforeach; ?>
+    </ul>
+    <?php echo $this->page->getNavigation(); ?>
+    </div>
+    <?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/application/default/views/scripts/data/tools.phtml b/application/default/views/scripts/data/tools.phtml
index 31c56fe4..9cebd674 100755
--- a/application/default/views/scripts/data/tools.phtml
+++ b/application/default/views/scripts/data/tools.phtml
@@ -1,28 +1,28 @@
-<ul>
-<li><a href="/data/tag">关键词浏览</a></li>
-<li><a href="/data/series">序列浏览</a></li>
-<li><a href="/data/category">分类浏览</a></li>
-<li><a href="/data/timeline">时间轴浏览</a></li>
-<li><a href="/data/map">空间浏览</a></li>
-<li><a href="/data/timemap">时空浏览</a></li>
-<li><a href="/data/browse">全部浏览</a></li>
-<li><a href="/data/advancesearch">高级搜索</a></li>
-<form  id="search" enctype="application/x-www-form-urlencoded" action="/data/search" method="post">
-<li>
-<input type="text" name="q" id="q" value="<?php echo (empty($this->key))?'回车搜索标题和摘要':$this->key; ?>" onfocus="myfocus(this);" onblur="myblur(this);">
-<input type="hidden" name="submit" value="submit">
-</form>
-<script>
-  function myfocus(element) {
-     if (element.value == '回车搜索标题和摘要') {
-       element.value = '';
-     }
-   }
-   function myblur(element) {
-     if (element.value == '') {
-       element.value = '回车搜索标题和摘要';
-     }
-   }
-</script>
-</li>
+<ul class="nav nav-pills">
+<li><a href="/data/tag">关键词浏览</a></li>
+<li><a href="/data/series">序列浏览</a></li>
+<li><a href="/data/category">分类浏览</a></li>
+<li><a href="/data/timeline">时间轴浏览</a></li>
+<li><a href="/data/map">空间浏览</a></li>
+<li><a href="/data/timemap">时空浏览</a></li>
+<li><a href="/data/browse">全部浏览</a></li>
+<li><a href="/data/advancesearch">高级搜索</a></li>
+<form  id="search" enctype="application/x-www-form-urlencoded" action="/data/search" method="post">
+<li>
+<input type="text" name="q" id="q" value="<?php echo (empty($this->key))?'回车搜索标题和摘要':$this->key; ?>" onfocus="myfocus(this);" onblur="myblur(this);">
+<input type="hidden" name="submit" value="submit">
+</form>
+<script>
+  function myfocus(element) {
+     if (element.value == '回车搜索标题和摘要') {
+       element.value = '';
+     }
+   }
+   function myblur(element) {
+     if (element.value == '') {
+       element.value = '回车搜索标题和摘要';
+     }
+   }
+</script>
+</li>
 </ul>
\ No newline at end of file