From 800ac64f4fb635acaa3ac035713f426f16a43a79 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Wed, 5 Mar 2014 01:49:56 +0000
Subject: [PATCH] =?UTF-8?q?=09=E5=85=83=E6=95=B0=E6=8D=AE=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E7=89=88=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/metadata/index/datalist.phtml        |  6 ++-
 .../Metadata/view/metadata/index/index.phtml  | 37 +++++++++----------
 .../view/metadata/index/tag-list.phtml        | 15 +++++---
 .../Metadata/view/metadata/index/view.phtml   | 13 ++++---
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/module/Metadata/view/metadata/index/datalist.phtml b/module/Metadata/view/metadata/index/datalist.phtml
index 6e7138ac..0d9e72c3 100644
--- a/module/Metadata/view/metadata/index/datalist.phtml
+++ b/module/Metadata/view/metadata/index/datalist.phtml
@@ -15,11 +15,13 @@ $theme->AppendPlus($this,'colorbox');
     <div class="mditem">
         <div class="thumb pull-left">
             <a href="/service/thumb/id/<?php echo $md['id'];?>" class="colorbox">
-                <img src="/service/thumb/id/<?php echo $md['id'];?>" />
+                <img src="/service/thumb/id/<?php echo $md['id'];?>"  class="img-polaroid img-rounded" />
             </a>
-        </div>    
+        </div>
+        <div style="padding-left:10px">    
         <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $md['title'];?></a></h2>
         <span><?php echo mb_strlen($md['description'])>400? mb_substr($md['description'],0,400,'UTF-8').'...':$md['description'];?></span>
+        </div>
     </div>
     <?php endforeach; ?>
     <?php echo $this->paginator; ?>
diff --git a/module/Metadata/view/metadata/index/index.phtml b/module/Metadata/view/metadata/index/index.phtml
index 95717e93..d3a34b32 100644
--- a/module/Metadata/view/metadata/index/index.phtml
+++ b/module/Metadata/view/metadata/index/index.phtml
@@ -1,11 +1,10 @@
 
 <div class="row">
-	<div class="span12">
+	<div class="span12" style="border:1px dashed #E0E0E0">
         <form method="get" action="/search" id="search"  class="form-search">
             <a class="btn"  href="/data/browse"><i class="icon-reorder"></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/unit"><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>
@@ -19,22 +18,22 @@
 	<?php 
         $type='theme';
     ?>
-    <div class="span6">
-    <h4><a href="/data/tag/keytype/theme"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="unstyled inline">
+    <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"</img><?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']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
+        <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="span6">
-    <h4><a href="/data/tag/keytype/discipline"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="unstyled inline">
+    <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"</img><?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']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
+        <li><a href='/data/tag/<?php echo $cg['keyword']; ?>'><?php echo $cg['keyword']."( ". $cg['count'].")"; ?></a></li>
         <?php endforeach; ?>
         </ul>
     </div>
@@ -43,29 +42,29 @@
 	<?php 
         $type='place';
     ?>
-    <div class="span6">
-    <h4><a href="/data/tag/keytype/place"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="unstyled inline">
+    <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"</img><?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']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
+        <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="span6">
-    <h4><a href="/data/tag/keytype/temporal"><i class="icon-tags"></i><?php echo $keytypezh[$type]; ?></a></h4>
-        <ul class="unstyled inline">
+    <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"</img><?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']; ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
+        <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="span6">
+    <div class="span12" style="border-bottom:1px dashed #E0E0E0">
     	<h4>最近更新</h4>
     	<?php if(!empty($this->metadata_latest)) { ?>
         <ul class="unstyled">
diff --git a/module/Metadata/view/metadata/index/tag-list.phtml b/module/Metadata/view/metadata/index/tag-list.phtml
index 0c12707f..204fc712 100644
--- a/module/Metadata/view/metadata/index/tag-list.phtml
+++ b/module/Metadata/view/metadata/index/tag-list.phtml
@@ -17,14 +17,17 @@ $theme->AppendPlus($this,'colorbox');
     <?php echo $this->paginator; ?>
     <hr />
 	<?php foreach($this->paginator as $md) : ?>
-    <div class="mditem">
-        <div class="thumb">
+    <div class="mditem" style="border-bottom:1px dashed #DFDFDF">
+        <div class="thumb" >
             <a href="/service/thumb/id/<?php echo $md['id'];?>" class="colorbox pull-left">
-                <img src="/service/thumb/id/<?php echo $md['id'];?>" />
+                <img src="/service/thumb/id/<?php echo $md['id'];?>" style="padding-right:20px" />
             </a>
-        </div>    
-        <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $md['title'];?></a></h2>
-        <span><?php echo mb_strlen($md['description'])>400? mb_substr($md['description'],0,400,'UTF-8').'...':$md['description'];?></span>
+        </div>
+        
+        <div >    
+        	<h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $md['title'];?></a></h2>
+        	<p><?php echo mb_strlen($md['description'])>400? mb_substr($md['description'],0,400,'UTF-8').'...':$md['description'];?></p>
+        </div>
     </div>
     <?php endforeach; ?>
     <?php echo $this->paginator; ?>
diff --git a/module/Metadata/view/metadata/index/view.phtml b/module/Metadata/view/metadata/index/view.phtml
index eed8d4fa..af8954b4 100644
--- a/module/Metadata/view/metadata/index/view.phtml
+++ b/module/Metadata/view/metadata/index/view.phtml
@@ -11,11 +11,14 @@
            
                 <div class="row">
                 	 <div class="span8">
-                    	<h4>摘要信息</h4>
-                        <p class="lead">
-                        <img src="/service/thumb/id/<?php echo $md['id'];?>" class="pull-left img-polaroid" />
-                    	<?= $this->data['description'] ?>
-                        </p>
+                    	<h4>摘要信息</h4>         
+                        <div>
+                        	
+                            <p class="lead" >
+                            <img src="/service/thumb/id/<?php echo $md['id'];?>" class="pull-left img-polaroid" style="margin-right:20px"/>
+                            <?= $this->data['description'] ?>
+                            </p>
+                        </div>
                     	<hr />
                     </div>
                 </div>