merge from trunk

This commit is contained in:
wlx 2012-04-12 09:05:20 +00:00
parent 72f6bbbce7
commit 28d21acd40
6 changed files with 138 additions and 16 deletions

View File

@ -32,17 +32,26 @@ $this->breadcrumb()->setSeparator(' > ');
foreach ($this->paginator as $item): foreach ($this->paginator as $item):
$autoindex++;?> $autoindex++;?>
<li> <li>
<a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> <a href="/data/<?php echo $item['uuid'];?>" target="_blank" class="title"><?php echo $item['title'];?></a>
<p><?php echo $item['description'] ?></p> <?php if($item['status']==1) : ?>
<span class="dtctrlplan">【操作:
<a href="/author/inauthor/ac/datalist/uuid/<?php echo $item['uuid']; ?>">申请管理</a> |
<a href="/author/comment/ac/view/uuid/<?php echo $item['uuid']; ?>">反馈</a> |
<a href="/author/document/uuid/<?php echo $item['uuid']; ?>">文档</a> |
<a href="/author/literature/uuid/<?php echo $item['uuid']; ?>">文献</a> |
<a href="/service/geonetwork?url=metadata.edit?id=<?php echo $item['gid']; ?>">修改元数据</a> |
<a href="/author/version/uuid/<?php echo $item['uuid']; ?>">版本</a> |
<a href="/author/qa/uuid/<?php echo $item['uuid']; ?>">QA</a> |
<a href="/author/news/uuid/<?php echo $item['uuid']; ?>">新闻</a> |
<a href="/author/viewauthors/uuid/<?php echo $item['uuid']; ?>">所有作者</a></span>
<?php endif; ?>
<p><?php echo mb_strlen($item['description'])>400?$this->escape(mb_substr($item['description'],0,400,'UTF-8').'...'):$this->escape($item['description']); ?></p>
<p> <p>
<?php <?php
if($item['status']==1)
{
echo '';
}//已经是自己的数据
if ($item['status']==0) if ($item['status']==0)
{ {
echo '<img src="/images/list_extensions.gif" />您已经申请该数据,请到邮箱查看激活邮件(如果没有收到请 <a href="javascript:;" onclick="apply(\''.$item['uuid'].'\')">点击这里</a>)'; echo '<img src="/images/list_extensions.gif" />您已经申请该数据(如果长时间没有收到回应请联系数据中心)';
} }
?> ?>
<span id="data_<?php echo $item['uuid'];?>"></span> <span id="data_<?php echo $item['uuid'];?>"></span>
@ -75,7 +84,7 @@ function apply(uuid){
'beforeSend':function(){ 'beforeSend':function(){
$('#data_'+uuid).html('<img src="/images/ajax-load-small.gif" />正在处理...'); $('#data_'+uuid).html('<img src="/images/ajax-load-small.gif" />正在处理...');
}, },
'timeout': 20000, 'timeout': 30000,
'error': function(){ 'error': function(){
alert('处理中出现问题,请重试'); alert('处理中出现问题,请重试');
$('#data_'+uuid).html(''); $('#data_'+uuid).html('');

View File

@ -49,7 +49,7 @@ function doSearch(){
if(data[i].status==1) var ct='<img src="/images/list_links.gif" />您是此元数据的作者'; if(data[i].status==1) var ct='<img src="/images/list_links.gif" />您是此元数据的作者';
else if (data[i].status==0) var ct='<img src="/images/list_extensions.gif" />您已经申请成为该元数据作者,请前往 <a href="/author/accept">我的数据</a> 查看<span id="data_'+data[i].uuid+'"></span>'; else if (data[i].status==0) var ct='<img src="/images/list_extensions.gif" />您已经申请成为该元数据作者,请前往 <a href="/author/accept">我的数据</a> 查看<span id="data_'+data[i].uuid+'"></span>';
else var ct='<a href="javascript:;" onclick="apply(\'' +data[i].uuid+ '\')"><img src="/images/list_keys.gif" />申请成为此数据的作者</a><span id="data_'+data[i].uuid+'"></span>'; else var ct='<a href="javascript:;" onclick="apply(\'' +data[i].uuid+ '\')"><img src="/images/list_keys.gif" />申请成为此数据的作者</a><span id="data_'+data[i].uuid+'"></span>';
result.push('<li><a href="/data/'+data[i].uuid+'" target="_blank">'+data[i].title+'</a><p>'+data[i].description+'</p><p>'+ct+'</p></li>'); result.push('<li><a href="/data/'+data[i].uuid+'" target="_blank" class="title">'+data[i].title+'</a><p>'+data[i].description+'</p><p>'+ct+'</p></li>');
} }
$('#datalist').html('<ul id="datas">'+result.join('')+'</ul>'); $('#datalist').html('<ul id="datas">'+result.join('')+'</ul>');
} }
@ -88,7 +88,7 @@ function apply(uuid){
'beforeSend':function(){ 'beforeSend':function(){
$('#data_'+uuid).html('<img src="/images/ajax-load-small.gif" />正在处理...'); $('#data_'+uuid).html('<img src="/images/ajax-load-small.gif" />正在处理...');
}, },
'timeout': 20000, 'timeout': 30000,
'error': function(){ 'error': function(){
alert('处理中出现问题,请重试'); alert('处理中出现问题,请重试');
$('#data_'+uuid).html(''); $('#data_'+uuid).html('');
@ -96,4 +96,12 @@ function apply(uuid){
}); });
} }
function isObject(obj){if(typeof(obj)=='object'){return true;}else if(typeof(obj)!='object'){return false;}else{return false;}} function isObject(obj){if(typeof(obj)=='object'){return true;}else if(typeof(obj)!='object'){return false;}else{return false;}}
$('#datasearch').bind('submit',function(){
return false;
});
$("#keyword").die().live("keydown",function(event){
if(event.keyCode==13){
$('#search_btn').click();
}
});
</script> </script>

View File

@ -0,0 +1,48 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->author);
$this->headTitle()->setSeparator(' - ');
$this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->headLink()->appendStylesheet('/css/author.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/author">数据作者</a>');
$this->breadcrumb('数据反馈管理');
$this->breadcrumb()->setSeparator(' > ');
?>
<!-- 左侧导航 -->
<div id='sidebar'>
<div id='leftnavi'>
<?= $this->partial('author/navi.phtml'); ?>
</div>
</div>
<!-- //左侧导航 -->
<!-- 页面内容 -->
<div id="wapper">
<div id="tabs-controller">
<ul>
<li class="box-shadow active"><a class="text-shadow" href="/author/comment">元数据反馈概况</a></li>
<li class="box-shadow"><a class="text-shadow" href="/author/comment/ac/listall">所有元数据反馈</a></li>
</ul>
</div>
<div id="datalist">
<?php
if (count($this->paginator)):
echo "<ul>";
$autoindex=0;
foreach ($this->paginator as $item):
$autoindex++;?>
<li>
<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a></p>
<p>反馈数: <a href="/author/comment/ac/view/uuid/<?php echo $item['uuid'];?>"><?php echo $item['c'];?></a> <a href="/author/comment/ac/view/uuid/<?php echo $item['uuid'];?>" class="more">查看详细</a></p>
</li>
<?php endforeach;
echo "</ul>";
endif; ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
</div>
</div>
<!-- //页面内容 -->
<script>
$('#wapper').width($('body').width()-300);
</script>

View File

@ -0,0 +1,54 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->author);
$this->headTitle()->setSeparator(' - ');
$this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->headLink()->appendStylesheet('/css/author.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/author">数据作者</a>');
$this->breadcrumb('数据申请管理');
$this->breadcrumb()->setSeparator(' > ');
?>
<!-- 左侧导航 -->
<div id='sidebar'>
<div id='leftnavi'>
<?= $this->partial('author/navi.phtml'); ?>
</div>
</div>
<!-- //左侧导航 -->
<!-- 页面内容 -->
<div id="wapper">
<div id="tabs-controller">
<ul>
<li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/online">在线下载记录</a></li>
<li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/offline">离线申请记录</a></li>
<li class="box-shadow active"><a class="text-shadow" href="/author/inauthor/ac/datalist">按数据查看</a></li>
</ul>
</div>
<p>请输入元数据标题关键字进行搜索</p>
<form id="datasearch" class="search_form" action="/author/inauthor/ac/searchdata">
<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
<button type="submit" class="btn" id="search_btn">搜索</button>
</form>
<div id="datalist">
<?php
if (count($this->paginator)):
echo "<ul>";
$autoindex=0;
foreach ($this->paginator as $item):
$autoindex++;?>
<li>
<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a></p>
<p>申请次数:<?php echo $item['c'];?> (<a href="/author/inauthor/ac/datalist/uuid/<?php echo $item['uuid'];?>">查看详细</a>)</p>
</li>
<?php endforeach;
echo "</ul>";
endif; ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
</div>
</div>
<!-- //页面内容 -->
<script>
$('#wapper').width($('body').width()-300);
</script>

View File

@ -23,6 +23,7 @@ $this->breadcrumb()->setSeparator(' > ');
<ul> <ul>
<li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/online">在线下载记录</a></li> <li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/online">在线下载记录</a></li>
<li class="box-shadow active"><a class="text-shadow" href="/author/inauthor/ac/offline">离线申请记录</a></li> <li class="box-shadow active"><a class="text-shadow" href="/author/inauthor/ac/offline">离线申请记录</a></li>
<li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/datalist">按数据查看</a></li>
</ul> </ul>
</div> </div>
<div class="box box-info" id="head_tip" onclick="$('#head_tip').hide();" title="点击关闭提示">离线数据申请默认为同意下载</div> <div class="box box-info" id="head_tip" onclick="$('#head_tip').hide();" title="点击关闭提示">离线数据申请默认为同意下载</div>
@ -39,13 +40,14 @@ $this->breadcrumb()->setSeparator(' > ');
foreach ($this->paginator as $item): foreach ($this->paginator as $item):
$autoindex++;?> $autoindex++;?>
<li> <li>
<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a></p> <p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a>
<a href="/author/inauthor/ac/offline/pdf/<?php echo $item['doid']; ?>">查看用户申请表</a></p>
<p>用户:<?php echo $item['username'];?>  <p>用户:<?php echo $item['username'];?> 
单位:<?php echo $item['unit'];?>  单位:<?php echo $item['unit'];?> 
申请时间:<?php echo date("Y-m-d H:i:s",strtotime($item['ts_created']));?></p> 申请时间:<?php echo date("Y-m-d H:i:s",strtotime($item['ts_created']));?></p>
<p>项目:<?php echo $item['project'];?></p> <p>项目:<?php echo $item['project'];?></p>
<p><span id="ct_<?php echo $item['id'];?>"> <p><span id="ct_<?php echo $item['doid'];?>">
<?php echo $item['btns'];?> </span><span id="data_<?php echo $item['id'];?>"></span></p> <?php echo $item['btns'];?> </span><span id="data_<?php echo $item['doid'];?>"></span></p>
</li> </li>
<?php endforeach; <?php endforeach;
echo "</ul>"; echo "</ul>";
@ -55,8 +57,8 @@ $this->breadcrumb()->setSeparator(' > ');
</div> </div>
<!-- //页面内容 --> <!-- //页面内容 -->
<script> <script>
function confrim(uuid,oid){ function confirm(uuid,oid){
doPD(uuid,"confrim",oid); doPD(uuid,"confirm",oid);
} }
function objection(uuid,oid){ function objection(uuid,oid){
doPD(uuid,"objection",oid); doPD(uuid,"objection",oid);

View File

@ -24,9 +24,10 @@ $this->breadcrumb()->setSeparator(' > ');
<ul> <ul>
<li class="box-shadow active"><a class="text-shadow" href="/author/inauthor/ac/online">在线下载记录</a></li> <li class="box-shadow active"><a class="text-shadow" href="/author/inauthor/ac/online">在线下载记录</a></li>
<li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/offline">离线申请记录</a></li> <li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/offline">离线申请记录</a></li>
<li class="box-shadow"><a class="text-shadow" href="/author/inauthor/ac/datalist">按数据查看</a></li>
</ul> </ul>
</div> </div>
<div class="box box-info" id="head_tip" onclick="$('#head_tip').hide();" title="点击关闭提示">这里仅显示您的数据的离线及在线数据申请</div> <div class="box box-info" id="head_tip" onclick="$('#head_tip').hide();" title="点击关闭提示">这里仅显示您的数据的在线数据记录</div>
<p>请输入元数据标题关键字进行搜索</p> <p>请输入元数据标题关键字进行搜索</p>
<form id="datasearch" class="search_form" action="/author/inauthor/ac/searchonline"> <form id="datasearch" class="search_form" action="/author/inauthor/ac/searchonline">
<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" /> <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />