From 3b0912dd39323259e91a004b8bd211b280a9ced0 Mon Sep 17 00:00:00 2001
From: jack <la5c@qq.com>
Date: Wed, 16 May 2018 10:19:36 +0800
Subject: [PATCH] update about page

---
 .../admin/views/scripts/stat/index.phtml      |  63 ++++----
 .../admin/views/scripts/stat/left.phtml       |   6 -
 .../admin/views/scripts/stat/unit.phtml       | 146 +++++++++---------
 .../default/views/scripts/about/index.phtml   |  24 +--
 4 files changed, 105 insertions(+), 134 deletions(-)

diff --git a/application/admin/views/scripts/stat/index.phtml b/application/admin/views/scripts/stat/index.phtml
index 6aceded6..b76b8904 100644
--- a/application/admin/views/scripts/stat/index.phtml
+++ b/application/admin/views/scripts/stat/index.phtml
@@ -10,40 +10,39 @@
 	$this->headScript()->appendFile('/js/jquery.masonry.min.js');
 ?>
 <div class="hidden-sm hidden-xs col-md-2">
-<?= $this->partial('stat/left.phtml'); ?>
-<ul>
-<li class="title">概况</li>
-<li>用户总数：<?php echo $this->stat['alluser']; ?>人</li>
-<li>元数据条数：<?php echo $this->stat['alldata']; ?>条</li>
-<li>在线数据下载数：<?php echo $this->stat['onlinedown']; ?>条</li>
-<li>离线数据下载数：<?php echo $this->stat['offlinedown']; ?>条</li>
-<li>已通过的离线申请：<?php echo $this->stat['offlinepass']; ?>次</li>
-<li>未完成的离线申请：<?php echo $this->stat['offlineunfinished']; ?>次</li>
-<li>被拒绝的离线数据：<?php echo $this->stat['offlinedenied']; ?>条</li>
-<li>有记录的在线下载数：<?php echo $this->stat['onlineapp']; ?>次</li>
-</ul>
+    <?= $this->partial('stat/left.phtml'); ?>
 </div>
 <div class="col-md-10 col-sm-12">
-    <div class="tables">
-    <div class="stitle">数据下载量概况</div>
-    <table>
-    <thead>
-    	<tr><td width="200"></td><td width="100">单位:GB</td></tr>
-    </thead>
-    <tr>
-    	<td>总下载数据量（估计量，偏大）</td>
-        <td><?php echo round($this->allsize['num'],2);?></td>
-    </tr>
-    <tr>
-    	<td>离线下载数据量（从09年4月）</td>
-        <td><?php echo round($this->offlinesize['num'],2);?></td>
-    </tr>
-    <tr>
-    	<td>在线下载数据量（估计量，偏大）</td>
-        <td><?php echo round($this->onlinesize['num'],2);?></td>
-    </tr>
+    <ul>
+        <li class="title">概况</li>
+        <li>用户总数：<?php echo $this->stat['alluser']; ?>人</li>
+        <li>元数据条数：<?php echo $this->stat['alldata']; ?>条</li>
+        <li>在线数据下载数：<?php echo $this->stat['onlinedown']; ?>条</li>
+        <li>离线数据下载数：<?php echo $this->stat['offlinedown']; ?>条</li>
+        <li>已通过的离线申请：<?php echo $this->stat['offlinepass']; ?>次</li>
+        <li>未完成的离线申请：<?php echo $this->stat['offlineunfinished']; ?>次</li>
+        <li>被拒绝的离线数据：<?php echo $this->stat['offlinedenied']; ?>条</li>
+        <li>有记录的在线下载数：<?php echo $this->stat['onlineapp']; ?>次</li>
+    </ul>
 
-    </table>
+    <div class="tables">
+        <div class="stitle">数据下载量概况</div>
+        <table class="table table-bordered">
+            <thead>
+                <tr><td width="200"></td><td width="100">单位:GB</td></tr>
+            </thead>
+            <tr>
+                <td>总下载数据量</td>
+                <td><?php echo round($this->allsize['num'],2);?></td>
+            </tr>
+            <tr>
+                <td>离线下载数据量</td>
+                <td><?php echo round($this->offlinesize['num'],2);?></td>
+            </tr>
+            <tr>
+                <td>在线下载数据量</td>
+                <td><?php echo round($this->onlinesize['num'],2);?></td>
+            </tr>
+        </table>
     </div>
-    
 </div>
diff --git a/application/admin/views/scripts/stat/left.phtml b/application/admin/views/scripts/stat/left.phtml
index bd01d2b7..34dd91d7 100644
--- a/application/admin/views/scripts/stat/left.phtml
+++ b/application/admin/views/scripts/stat/left.phtml
@@ -6,11 +6,5 @@
 		<li id="Nav-stat-unit"><a href="/admin/stat/unit">分单位统计</a></li>
 		<li id="Nav-stat-month"><a href="/admin/stat/month">分月统计</a></li>
 		<li id="Nav-stat-user"><a href="/admin/stat/user">按用户统计</a></li>
-		<li id="Nav-stat-awstatsweb"><a href="/admin/stat/awstatsweb">awstats westdc统计</a></li>
-		<li id="Nav-stat-awstatsweb2"><a href="/admin/stat/awstatsweb2">awstats geodata统计</a></li>
-		<li id="Nav-stat-awstatsftp"><a href="/admin/stat/awstatsftp">awstats ftp1统计</a></li>
-		<li id="Nav-stat-awstatsftp2"><a href="/admin/stat/awstatsftp2">awstats ftp2统计</a></li>
-		<li id="Nav-stat-webalizer"><a href="/admin/stat/webalizer">webalizer统计</a></li>
-		<li id="Nav-stat-water"><a href="/admin/stat/water">WATER项目</a></li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/stat/unit.phtml b/application/admin/views/scripts/stat/unit.phtml
index e23730b8..b4153997 100644
--- a/application/admin/views/scripts/stat/unit.phtml
+++ b/application/admin/views/scripts/stat/unit.phtml
@@ -10,83 +10,79 @@
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<style>
-.charts{margin:30px 0px;}
-.charts .title{color:#003366;}
-.cp {line-height:24px;}
-.cp ul li{float:left;margin:0px 0px;}
-.cp a{color:#4bb2c5;line-height:24px;padding:5px;}
-.cp a.active,.cp a:hover{color:#FFF;background:#4bb2c5;}
-</style>
-<div class="hidden-sm hidden-xs col-md-2">
-<?= $this->partial('stat/left.phtml'); ?>
-</div>
-<div class="col-md-10 col-sm-12">
 
-<div class="cp">
-        <span>按年查看：</span>
-        <ul>
-        <?php $active=""; if(empty($this->y)) { $active = "active"; }?>
-        <li><a href="/admin/stat/unit/" class="<?= $active?>">总体查看（默认）</a></li>
-        <?php
-		$active="";
-        for($i=2004; $i<=date("Y",time()); $i++)
-        {
-			if(!empty($this->y))
-			{
-				if($this->y == $i)
-				{
-					$active = "active";
-				}else{
-					$active="";
-				}
-			}
-            echo '<li><a href="/admin/stat/unit/y/'.$i.'" class="'.$active.'">'.$i.'</a></li>';
-        }
-        ?>
-        </ul>
-	<ul>
-    	<?php 
-		$url_param = "";
-		if(!empty($this->y)) {
-			$url_param = "?y=".$this->y;
-		}
-		?>
-    	<li><a href="/admin/stat/unit/ac/out<?= $url_param ?>">导出csv格式</a></li>
-        <li><a href="/admin/stat/unit/type/json/ac/out<?= $url_param ?>">导出json格式</a></li>
-	</ul>
-</div>
-<div id="unitdata">
-<b>点击列名进行排序</b>
-</div>
-<div class="dataTables_wrapper">
-    <table id="datatable" class="table table-bordered table-striped table_vam dataTable">
-        <thead>
-            <tr>
-                <th>ID</th>
-                <th>单位名称</th>
-                <th>离线申请次数</th>
-                <th>在线申请次数</th>
-                <th>总申请次数</th>
-            </tr>
-        </thead>
-        <tbody>
-        <?php
-        foreach ($this->units as $k=>$v)
-        {
-            echo "<tr>";
-            echo "<td>{$v['index']}</td>";
-            echo "<td>$k</td>";
-            echo "<td>{$v['offline']}</td>";
-            echo "<td>{$v['online']}</td>";
-            echo "<td>{$v['total']}</td>";
-            echo "</tr>";
-        }
-        ?>
-        </tbody>
-    </table>
-</div>
+<div class="row">
+    <div class="hidden-sm hidden-xs col-md-2">
+        <?= $this->partial('stat/left.phtml'); ?>
+    </div>
 
+    <div class="col-md-10 col-sm-12">
+        <div class="cp">
+            <span>按年查看：</span>
+            <ul class="nav nav-pills">
+                <?php $active=""; if(empty($this->y)) { $active = "active"; }?>
+                <li class="<?= $active?>"><a href="/admin/stat/unit/">总体查看（默认）</a></li>
+                <?php
+                $active="";
+                for($i=2004; $i<=date("Y",time()); $i++)
+                {
+                    if(!empty($this->y))
+                    {
+                        if($this->y == $i)
+                        {
+                            $active = "active";
+                        }else{
+                            $active="";
+                        }
+                    }
+                    echo '<li><a href="/admin/stat/unit/y/'.$i.'" class="'.$active.'">'.$i.'</a></li>';
+                }
+                ?>
+            </ul>
+            <ul class="nav nav-pills">
+                <?php
+                $url_param = "";
+                if(!empty($this->y)) {
+                    $url_param = "?y=".$this->y;
+                }
+                ?>
+                <li><a href="/admin/stat/unit/ac/out<?= $url_param ?>">导出csv格式</a></li>
+                <li><a href="/admin/stat/unit/type/json/ac/out<?= $url_param ?>">导出json格式</a></li>
+            </ul>
+        </div>
+
+        <div id="unitdata">
+            <b>点击列名进行排序</b>
+        </div>
+
+        <div class="dataTables_wrapper">
+            <table id="datatable" class="table table-bordered table-striped table_vam dataTable">
+                <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>单位名称</th>
+                        <th>离线申请次数</th>
+                        <th>在线申请次数</th>
+                        <th>总申请次数</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <?php
+                foreach ($this->units as $k=>$v)
+                {
+                    echo "<tr>";
+                    echo "<td>{$v['index']}</td>";
+                    echo "<td>$k</td>";
+                    echo "<td>{$v['offline']}</td>";
+                    echo "<td>{$v['online']}</td>";
+                    echo "<td>{$v['total']}</td>";
+                    echo "</tr>";
+                }
+                ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>
 <script>
 $(document).ready(function() {
diff --git a/application/default/views/scripts/about/index.phtml b/application/default/views/scripts/about/index.phtml
index 48fbb268..d0333af4 100755
--- a/application/default/views/scripts/about/index.phtml
+++ b/application/default/views/scripts/about/index.phtml
@@ -382,20 +382,11 @@ $this->breadcrumb()->setSeparator(' > ');
         </div>
         <!--友情链接-->
         <div class="box1 box3">
-            <h4><i></i>我们维护的科学数据中心</h4>
-            <ul>
-                <li>
-                    <a href="http://westdc.westgis.ac.cn" target="_blank" style="line-height:1.5;">寒区旱区科学数据中心</a><span style="line-height:1.5;">，原中国西部环境与生态科学数据中心</span>
-                </li>
-                <li>
-                    <a href="http://www.heihedata.org" target="_blank" style="line-height:1.5;">黑河计划数据管理中心</a><span style="line-height:1.5;"> 负责黑河流域生态水文集成研究重大研究计划科学数据的收集、整理、发布、共享</span>
-                </li>
-                <li>
-                    <a href="http://card.westgis.ac.cn/" target="_blank" style="line-height:1.5;">Cold and Arid Regions Science Data Center at Lanzhou</a><span style="line-height:1.5;"> (CARD)</span><span style="line-height:1.5;">, a member of World Data System (WDS)</span>
-                </li>
-            </ul>
             <h4><i></i>科学数据友站</h4>
             <ul>
+                <li>
+                    <a href="http://westdc.westgis.ac.cn/" target="_blank">寒区旱区科学数据中心</a>
+                </li>
                 <li>
                     <a href="http://www.geodata.cn" target="_blank">国家地球系统科学数据平台</a>
                 </li>
@@ -403,15 +394,6 @@ $this->breadcrumb()->setSeparator(' > ');
                     <a href="http://www.chinare.org.cn/" target="_blank">极地科学数据共享平台</a>
                 </li>
             </ul>
-            <h4><i></i>其他相关网站</h4>
-            <ul>
-                <li>
-                    <a href="http://heihe.westgis.ac.cn" target="_blank" style="line-height:1.5;">数字黑河</a>
-                </li>
-                <li>
-                    <a href="http://www.westgis.ac.cn" target="_blank" style="line-height:1.5;">遥感室</a>
-                </li>
-            </ul>
             <h4><i></i>科学数据出版</h4>
             <ul>
                 <li>