From ce6adec13200d5e694a4f67a799f921b655b5a3c Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Mon, 17 Mar 2014 04:12:44 +0000
Subject: [PATCH] =?UTF-8?q?=09=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Metadata/Controller/IndexController.php   |  2 +-
 .../view/metadata/index/tag-list.phtml        | 59 ++++++++++---------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/module/Metadata/src/Metadata/Controller/IndexController.php b/module/Metadata/src/Metadata/Controller/IndexController.php
index 04669384..ed4800b1 100644
--- a/module/Metadata/src/Metadata/Controller/IndexController.php
+++ b/module/Metadata/src/Metadata/Controller/IndexController.php
@@ -128,7 +128,7 @@ class IndexController extends AbstractActionController
 		
 		if(!empty($source))
 		{
-			$source = iconv("GB2312","UTF-8",$source);
+		#	$source = iconv("GB2312","UTF-8",$source);
 			if($source == "青海湖")
 				$metadata->opt->where = array(" ol.host='http://deep.qherc.org' ");
 			if($source == "三江源")
diff --git a/module/Metadata/view/metadata/index/tag-list.phtml b/module/Metadata/view/metadata/index/tag-list.phtml
index b24f547e..e1113eb9 100644
--- a/module/Metadata/view/metadata/index/tag-list.phtml
+++ b/module/Metadata/view/metadata/index/tag-list.phtml
@@ -3,40 +3,43 @@ if (!empty($this->codename)) $this->headTitle($this->codename);
 $theme = new \Sookon\Helpers\Theme;
 $theme->AppendPlus($this,'colorbox');
 ?>
-<div class="row">
-	<div class="span12">
 
-	<div class="row">
-    	<div class="span12">
-	<?= $this->partial('layout/metadata/subnav'); ?>
-    	</div>
-	</div>
+<div class="container">
+<div id="row">
+<?= $this->partial('layout/metadata/subnav'); ?>
+</div>
+<?php if(!empty($this->unit)) { ?>
+    <h3>单位：<?= $this->unit ?> <small><?= !empty($this->count) ? $this->count."条数据":"" ?></small></h3>
+<?php } ?>
 <?php if (!empty($this->paginator)) : ?>
     <div id='metacontent'>
-    <h1>当前浏览：<?php echo $this->codename; ?></h1>
     <?php echo $this->paginator; ?>
-    <hr />
-	<?php foreach($this->paginator as $md) : ?>
-    <div class="mditem" style="border-bottom:1px dashed #DFDFDF; overflow:hidden">
-        <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'];?>" style="padding-right:20px" />
-            </a>
-        </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; ?>
-	</div><!--row-->
-	</div>  <!--/span12-->
-</div>  <!--/row-->
+    <div class="box">
+                                
+		<?php foreach($this->paginator as $md) : ?>
 
+        <div class="clearfix" style="border-bottom:1px dashed #DFDFDF; overflow:hidden">
+        	
+            <div class="pull-left">
+                <a href="/service/thumb/id/<?php echo $md['id'];?>" class="colorbox">
+                    <img class="img-rounded img-polaroid" src="/service/thumb/id/<?php echo $md['id'];?>" style="margin:20px 20px" width="140" height="80" />
+                </a>
+            </div>
+            
+            <div style="display:block; padding-left:180px;">    
+                <h3><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $md['title'];?></a></h3>
+                <p class=""><?php echo mb_strlen($md['description'])>400? mb_substr($md['description'],0,400,'UTF-8').'...':$md['description'];?></p>
+                <p class="text-right"><strong>UUID: </strong><small><?=  $md['uuid'] ?></small> , <small><?= $md['filesize']."MB" ?></small></p>
+                <p class="pull-right"><strong class="badge badge-info ">查阅数: <?= $md['viewed'] ?></strong> , <small><?= date("Y-m-d H:i",strtotime($md['ts_created'])) ?></small></p>
     
-<?php endif ?>
+            </div>
+        </div>
+        <?php endforeach; ?>
+      </div>
+    </div>
+    <?php echo $this->paginator; ?>
+    <?php endif ?>
+</div>
 <script>
 $(document).ready(function(){
 	$(".colorbox").colorbox({rel:"colorbox",photo:"true",transition:"fade"});