From c309c9561dbc4c8a584ad65c94f5f5085f909b3c Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Fri, 30 Jan 2015 16:11:17 +0000
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/IndexController.php   |  5 ++
 .../default/views/scripts/index/index.phtml   | 57 ++-----------------
 2 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/application/default/controllers/IndexController.php b/application/default/controllers/IndexController.php
index fa853602..378a12b4 100755
--- a/application/default/controllers/IndexController.php
+++ b/application/default/controllers/IndexController.php
@@ -86,6 +86,11 @@ class IndexController extends Zend_Controller_Action
 		$sql="select * from $this->submd where uuid in (select uuid from datavisual) order by ts_created desc limit 5";
 		$sth=$this->db->query($sql);
 		$this->view->visualdata = $sth->fetchAll(PDO::FETCH_BOTH);
+
+		$sql="select * from $this->submd order by ts_created desc limit 5";
+		$sth=$this->db->query($sql);
+		$this->view->newdata = $sth->fetchAll(PDO::FETCH_BOTH);
+
     }
 
 }
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index a541d392..ee0850e4 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -53,11 +53,11 @@
     <div class="row-fluid">
         <div class="span6">
             <div class="box" >
-                <p class="box-title">最新可视化数据</p>
+                <p class="box-title">最新发布数据</p>
                 <ul >
-                    <?php foreach($this->visualdata as $k=>$v){ ?>
+                    <?php foreach($this->newdata as $k=>$v){ ?>
                         <li>
-                            <a href="/data/<?= $v['uuid'] ?>" title="<?= $v['title'] ?>"><i class=" icon-map-marker"> </i><?= $v['title'] ?></a>&nbsp;&nbsp;<span class="small"><?= date('Y-m-d',strtotime($v['ts_published'])) ?></span>
+                            <a href="/data/<?= $v['uuid'] ?>" title="<?= $v['title'] ?>"><i class=" icon-map-marker"> </i><?= $v['title'] ?></a>&nbsp;&nbsp;<span class="small"><?= date('Y-m-d',strtotime($v['ts_created'])) ?></span>
                         </li>
                     <?php } ?>
                     <span class="pull-right"><a href="/data/visual" target="_blank" class="more">更多>></a></span>
@@ -69,7 +69,7 @@
         <div class="span3">
             <div class="box">
                 <p class="box-title">可视化数据</p>
-                <div class="count"><span>208</span> 条</div>
+                <div class="count"><span><?= $this->visualnum ?></span> 条</div>
             </div>
         </div>
         <div class="span3">
@@ -83,55 +83,6 @@
 
     </div><!-- /.part1 -->
 
-  <!-- Three columns of text below the carousel -->
-    <div class="row-fluid">
-    <div class="span12">
-      <div class="span4">
-        <div class="box">
-          <p class="box-title">最新发布数据</p>
-            <ul>
-                <?php foreach($this->offlinemdtop as $k=>$v){ ?>
-                    <li>
-                        <a href="/data/<?= $v['uuid'] ?>" title="<?= $v['title'] ?>"><i class=" icon-map-marker"> </i><?= $v['title'] ?></a>
-                    </li>
-                <?php } ?>
-                <span class="pull-right"><a href="/archives/" target="_blank" class="more">更多>></a></span>
-            </ul>
-        </div>
-      </div>
-      <!-- /.span4 -->
-      <div class="span4">
-        <div class="box">
-          <p class="box-title">热门数据排行</p>
-          <ul>
-              <?php foreach($this->offlinemdtop as $k=>$v){ ?>
-                  <li>
-                      <a href="/data/<?= $v['uuid'] ?>" title="<?= $v['title'] ?>"><i class=" icon-map-marker"> </i><?= $v['title'] ?></a>
-                  </li>
-              <?php } ?>
-            <span class="pull-right"><a href="/archives/" target="_blank" class="more">更多>></a></span>
-          </ul>
-        </div>
-      </div>
-      <!-- /.span4 -->
-
-        <div class="span4">
-            <div class="box">
-                <p class="box-title">热门数据排行</p>
-                <ul>
-                    <?php foreach($this->offlinemdtop as $k=>$v){ ?>
-                        <li>
-                            <a href="/data/<?= $v['uuid'] ?>" title="<?= $v['title'] ?>"><i class=" icon-map-marker"> </i><?= $v['title'] ?></a>
-                        </li>
-                    <?php } ?>
-                    <span class="pull-right"><a href="/archives/" target="_blank" class="more">更多>></a></span>
-                </ul>
-            </div>
-        </div>
-        <!-- /.span4 -->
-
-    </div>
-    <!-- /.row -->
     <div style="margin-bottom:20px;"><img src="/sjyportal/img/protect.jpg" class="img-rounded" /></div>
     
     <!-- Three columns of text below the carousel -->