From d77d38d2e504ded0d1feae4ec3056cc4c9af0a6a Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Tue, 19 Jun 2012 03:17:13 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E8=AF=8D=E6=B5=8F=E8=A7=88=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=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/data/browse.phtml   | 55 ++++++++++---------
 htdocs/css/metadata.css                       |  9 ++-
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/application/default/views/scripts/data/browse.phtml b/application/default/views/scripts/data/browse.phtml
index 7892ffdf..f6066070 100755
--- a/application/default/views/scripts/data/browse.phtml
+++ b/application/default/views/scripts/data/browse.phtml
@@ -1,25 +1,30 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle($this->config->title->data);
-	$this->headTitle('全部浏览');
-$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('浏览');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div id='tools'>
-<?= $this->partial('data/tools.phtml'); ?>
-</div>
-<?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>
-    <div class="summary"><?php echo str_replace(array("\r\n", "\n", "\r"),'<br />',mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']));?></div>
-</div>
-<?php endforeach; ?>
-<?php echo $this->page->getNavigation(); ?>
\ No newline at end of file
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle($this->config->title->data);
+	$this->headTitle('全部浏览');
+$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('浏览');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div id='tools'>
+<?= $this->partial('data/tools.phtml'); ?>
+</div>
+<div class="datalist clear mt12">
+        	<ul id="datalist">
+            	<?php if($this->metadata) : foreach($this->metadata as $md) : ?>
+                <li id="data_<?php echo $md['uuid']; ?>" class="databox box-shadow">
+                	<div class="subject text-shadow"><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a><div class="more"><a href="/data/<?php echo $md['uuid']; ?>">查看详细</a></div></div>
+                    <div class="data_content clear">
+                    	<div class="thumb box-shadow"><img src="/service/thumb/id/<?php echo $md['id'];?>" /></div>
+                    	<div class="description"><?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?></div>
+                    </div>
+                </li>
+                <?php endforeach;endif; ?>
+            </ul>
+</div>
+<div class="PageNavigation">
+<?php echo $this->page->getNavigation(); ?>
+</div>
\ No newline at end of file
diff --git a/htdocs/css/metadata.css b/htdocs/css/metadata.css
index 8bf57a57..878daed0 100755
--- a/htdocs/css/metadata.css
+++ b/htdocs/css/metadata.css
@@ -2,10 +2,17 @@
 #tools ul li{float:left;padding-left:5px;margin-right:5px;}
 #tools ul li a:hover{background:#329ECC;color:#FFF;}
 
+#leftnav{width:100%;overflow:hidden;}
+#leftnav fieldset ul{width:100%;overflow:hidden;}
+#leftnav fieldset ul li{float:left;margin:0 3px;}
+#leftnav fieldset ul li a{display:block;float:left;padding:3px;}
+#leftnav fieldset ul li span.note{display:block;float:left;padding:3px 0;}
+#leftnav fieldset ul li a:hover{background:#329ECC;color:#FFF;}
+
 /* 
  *  paginationControl
  */
-.PageNavigation{float:left;margin-left:200px;padding-left:30px;}
+.PageNavigation{}
 .paginationControl{float:right;padding-left:30px;margin:10px auto;}
 .paginationControl A {border:#9aafe5 1px solid;padding:2px 5px;color:#2e6ab1;margin-right:2px;TEXT-DECORATION:none}
 .paginationControl A:hover {border:#2b66a5 1px solid;COLOR: #000;BACKGROUND-COLOR:lightyellow}