merge sanjiangyuan-sub r4767 - r4777 into sjy-water

application/default/controllers/IndexController.php

@@ -66,7 +66,7 @@ class IndexController extends Zend_Controller_Action
 		//$time = date("Y-m-d H:i:s",time());
 		$sql = "SELECT * FROM archive WHERE is_pub=true and sub='$this->subnews' AND ts_published<now()
 			and id in (select ar_catalog.aid from ar_catalog left join ar_category on ar_catalog.cid=ar_category.id where ar_category.ptype='news')
-			order by ts_published desc LIMIT 12 ";
+			order by ts_published desc LIMIT 5 ";
 		$sth = $this->db->query($sql);
 		$rows = $sth->fetchAll(PDO::FETCH_BOTH);
 		

application/default/views/scripts/about/contact.phtml

@@ -16,18 +16,18 @@ $this->breadcrumb()->setSeparator(' > ');
     	<div id="content">
         	<h2>联系我们</h2>
             <div id="offline" class="span4">
-    
+                                    <p>
-              <br />
+                                    	<br />
-              青海省水文水资源局<br />
+                                        青海省水文水资源局<br />
-              西宁市昆仑路20-2号<br />
+                                        西宁市昆仑路20-2号<br />
-              邮编：810001<br />
+                                        邮编：810001<br />
-              电话: +86-0971-6161320<br />
+                                        电话: +86-0971-6161320<br />
-              <br />
+                                        <br />
             </div> 
                                   
             <div id="online" class="span5">
-
+             <p class="title">在线联系</p>
-             <p class="note">填写以下信息在线联系我们。</p>
+             <p class="note">请填写以下表单，系统会自动发送到我们的邮箱</p>
              <?php echo $this->form; ?>
             
              <?php if (!empty($this->messages)) : ?>

application/default/views/scripts/data/view.phtml

@@ -55,7 +55,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			<?php endif; ?>				
 			<?php if ($md->citation) : ?>
             <hr />
-            <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
+            <h4><i class="icon-quote-left muted"></i>本数据引用方式</h4>
 			<p><?php  if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
 			<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?>            
 			(下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)
@@ -134,11 +134,6 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			echo '<p>'.str_replace(array("\r\n", "\n", "\r"),'</p><p>',$this->escape($uselimit->uselimit)).'</p>';
 			endforeach;
 			?>
-			<?php else : ?>
-				<p>为尊重知识产权、保障数据作者的权益、扩展数据中心的服务、评估数据的应用潜力，请数据使用者在使用数据所产生的研究成果中（包括公开发表的论文、论著、数据产品和未公开发表的研究报告、数据产品等成果），明确注明数据来源和数据作者。对于转载（二次或多次发布）的数据，作者还须注明原始数据来源。</p>
-				<p>中文发表的成果参考以下规范注明：	数据来源于黑河计划数据管理中心、寒区旱区科学数据中心(http://westdc.westgis.ac.cn)</p>
-				<p>英文发表的成果依据以下规范注明： The data set is provided by Cold and Arid Regions Sciences Data Center at Lanzhou (http://westdc.westgis.ac.cn)</p>
-				</p>
 			<?php endif; ?>
             <?php if($this->data_archives){ ?>
                 <h4>数据相关新闻</h4>
@@ -192,28 +187,12 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
             <div class="tabbable"> <!-- Only required for left/right tabs -->
                 <ul class="nav nav-tabs">
                 	<li class="active"><a href="#related" data-toggle="tab" id="related_t">相关数据</a></li>
-                	<li><a href="#literature" data-toggle="tab" id="literature_t">相关文献</a></li>
-                    <li><a href="#gsearch" data-toggle="tab" id="gsearch_t">相关搜索</a></li>
                     <li><a href="#service" data-toggle="tab">服务记录</a></li>
                     <li><a href="#recommend" data-toggle="tab" id="recommend_t">给我推荐</a></li>
                 </ul>
                 <div class="tab-content">
                 	<div id="related" class="tab-pane active">
 					</div>
-                    <div id="literature" class="tab-pane">
-                    	<div class="">
-                        	<ul class="nav nav-pills lit-nav">
-                            	<li><a href="javascript:;" class="literatures lit-nav-btn">西部计划知识库</a></li>
-                            	<li><a href="javascript:;" class="scholar lit-nav-btn">Google学术搜索</a></li>
-                        		<li><a href="javascript:;" class="cnkiSearch lit-nav-btn">CNKI学术搜索</a></li>
-                            </ul>
-                        </div>
-                        <div id="literature-list">
-                        </div>
-					</div>
-                    <div id="gsearch" class="tab-pane">
-                        <ul id="searchlist" class="unstyled well well-small"></ul>
-					</div>
                     <div id="service" class="tab-pane">
                     <?php if ($this->downhistory) : ?>
                     <p>最近10条服务记录如下：</p>
@@ -501,10 +480,6 @@ endforeach;
 <script type="text/javascript" charset="utf-8">
 $(function() {
 	$(".colorbox").colorbox({photo:"true"});
-	$('.googlesearch').click(function(){googleSearch('<?php echo $ev;?>');});
-	$('.bingsearch').click(function(){bingSearch('<?php echo $ev;?>');});
-	$('.cnkiSearch').click(function(){cnkiSearch('<?php echo $ev;?>');});
-	$('.scholar').click(function(){scholarSearch('<?php echo $ev;?>');});
 	$('#related_t').click(function(){related(1);});
 	$('#recommend_t').click(function(){recommend(0);});
 	$('#literature_t').click(function(){literature(1);$('.literatures').parent('li').addClass('active')});
@@ -519,12 +494,6 @@ $(function() {
 			$(this).parent('li').addClass('active');
 		});
     });
-	$('#gsearch_t').click(function(){
-		if($('#searchlist').children('li').length<1)
-		{
-			googleSearch('<?php echo $ev;?>');
-		}
-	});
 	$('#show-list').click(function(e) {
         method.filelist.get($(this).attr('rel'));
     });
@@ -584,18 +553,6 @@ function ajaxpage(page){
 	control=new TNavigationControl(config); 
 	//添加缩放平移控件 
 	map.addControl(control);  
-
-function addfavorite(url,title){
-	var fav_url = url;
-	var fav_title = title;
-	if (document.all && window.external){
-		window.external.AddFavorite(fav_url,fav_title);
-	}else if (window.sidebar){
-		window.sidebar.addPanel(fav_title,fav_url,"");
-	}else{
-		alert("浏览器不支持，请手动CTRL+D加入收藏夹");
-	}
-} 
 </script>
 <?php else: ?>
 	<p>Cannot find the metadata.</p>

application/default/views/scripts/index/index.phtml

@@ -54,7 +54,7 @@
           <ul>
    <?php foreach($this->list_news as $k=>$v){ ?>
     	<li>
-            <a href="<?= $v['url'] ?>" title="<?= $v['title'] ?>"><i class=" icon-ok-sign"> </i><?= $v['title'] ?></a>
+            [<?= date('Y-m-d',strtotime($v['ts_created'])) ?>]<a href="<?= $v['url'] ?>" title="<?= $v['title'] ?>"><i class=" icon-ok-sign"> </i><?= $v['title'] ?></a>
         </li>
 	<?php } ?>
             <span class="pull-right"><a href="/archives/" target="_blank" class="more">更多>></a></span>