bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

后台统一切换layout,文献部分简单修改

This commit is contained in:
wlx 2013-05-17 00:41:46 +00:00
parent 48f2358599
commit 1de7319150
11 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controllers/DataController.php
View File

@ -10,6 +10,7 @@ class Admin_DataController extends Zend_Controller_Action
$this->debug = 0; //1:debug, 0:release
$this->debug_email='wangliangxu@lzb.ac.cn';
$this->view->theme = new Theme();
$this->_helper->layout->setLayout('administry');
}
function postDispatch()
{
@ -1090,7 +1091,7 @@ class Admin_DataController extends Zend_Controller_Action
$select->from('mdref',array('id as mdid','refid','place'))
->join('metadata','metadata.uuid=mdref.uuid')
->join('reference','reference.id=mdref.refid')
->order('metadata.title')
->order('metadata.ts_created desc')
->order('mdref.place');
$paginator = Zend_Paginator::factory($select);
$paginator->setCurrentPageNumber($this->_getParam('page'));
@ -3592,7 +3593,6 @@ class Admin_DataController extends Zend_Controller_Action
public function doiAction()
{
$this->_helper->layout->setLayout('administry');
$ac = $this->_getParam('ac');
$submit = $this->_getParam('submit');
$uuid = $this->_getParam('uuid');

1
application/admin/controllers/DownController.php
View File

@ -7,6 +7,7 @@ class Admin_DownController extends Zend_Controller_Action
$this->view->config = Zend_Registry::get('config');
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->_helper->layout->setLayout('administry');
}
function postDispatch()
{

1
application/admin/controllers/IndexController.php
View File

@ -11,6 +11,7 @@ class Admin_IndexController extends Zend_Controller_Action
{
$this->view->config = Zend_Registry::get('config');
$this->db=Zend_Registry::get('db');
$this->_helper->layout->setLayout('administry');
}
function importAction()

1
application/admin/controllers/NewsController.php
View File

@ -7,6 +7,7 @@ class Admin_NewsController extends Zend_Controller_Action
$this->view->config = Zend_Registry::get('config');
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->_helper->layout->setLayout('administry');
}
function postDispatch()
{

1
application/admin/controllers/StatController.php
View File

@ -8,6 +8,7 @@ class Admin_StatController extends Zend_Controller_Action
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->view->theme = new Theme();
$this->_helper->layout->setLayout('administry');
}
function postDispatch()
{

2
application/admin/controllers/SysController.php
View File

@ -7,7 +7,7 @@ class Admin_SysController extends Zend_Controller_Action
$this->view->config = Zend_Registry::get('config');
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
//$this->_helper->layout->setLayout('administry');//新UI
$this->_helper->layout->setLayout('administry');//新UI
}
function postDispatch()

1
application/admin/controllers/TestController.php
View File

@ -7,6 +7,7 @@ class Admin_TestController extends Zend_Controller_Action
$this->view->config = Zend_Registry::get('config');
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->_helper->layout->setLayout('administry');
$this->wdb=Zend_Db::factory('Pdo_Pgsql', array('host'=> '210.77.68.252','username' => 'wlz','password' => 'glacier','dbname'=> 'new_geonetwork'));
}
function postDispatch()

1
application/admin/controllers/UserController.php
View File

@ -8,6 +8,7 @@ class Admin_UserController extends Zend_Controller_Action
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->view->theme = new Theme();
$this->_helper->layout->setLayout('administry');
}
function postDispatch()
{

1
application/admin/controllers/WatermdController.php
View File

@ -7,6 +7,7 @@ class Admin_WatermdController extends Zend_Controller_Action
$this->view->config = Zend_Registry::get('config');
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->_helper->layout->setLayout('administry');
$this->wdb=Zend_Db::factory($this->view->config->geonetwork);
set_time_limit(0);
}

2
application/admin/views/scripts/data/project.phtml
View File

@ -37,7 +37,7 @@
?>
<li>
<p><span class="title"><?php echo $item['title'];?></span></p>
<p>编号：<label><?= $item['code'];?></label> | 负责人：<?= $item['name'];?> | 开始时间：<?= $item['pstart'];?>　|
<p>编号：<?= $item['code'];?> | 负责人：<?= $item['name'];?> | 开始时间：<?= $item['pstart'];?>　|
　状态：<span id="status_alias_<?= $item['id']?>"><?= $item['status_alias'];?></span></p>
<p>
<a href="javascript:void(0);" onclick="$('#inviteFrom_<?= $item['id'];?>').toggle();">邀请跟踪专家</a>　|　

12
application/admin/views/scripts/data/reference.phtml
View File

@ -31,8 +31,8 @@
<form action="" method="get">
<input type="hidden" name="search" value='1' />
<ul>
<li><label>搜索关键字</label><input type="text" name="keyword" value="<?php echo $this->keyword; ?>" /></li>
<li><input type="submit" class="searchbtn" value="搜索" /></li>
<li><input type="text" name="keyword" value="<?php echo $this->keyword; ?>" /></li>
<li><input type="submit" class="btn" value="搜索" /></li>
</ul>
</form>
</div><!-- search DIV -->
@ -45,7 +45,6 @@
</div>
<?php if (count($this->paginator)): ?>
<div id="datasetcd">
<?php
$u='';
$i=0;
@ -53,16 +52,15 @@ foreach ($this->paginator as $item):
if ($u==$item['uuid']) :
$i+=1;
else :
if (!empty($u)) echo '</ul>';
if (!empty($u)) echo '</ol></div>';
$i=0;
$u=$item['uuid'];
endif;
if ($i==0) echo '<ul><li>元数据：<a href="/data/'.$item['uuid'].'">'.$item['title'].'</a>（<a href="/admin/data/reference/add/1/uuid/'.$item['uuid'].'">添加</a>）</li>';
echo '<li>文献（<a href="/admin/data/reference/edit/'.$item['mdid'].'">编辑</a> <a href="/admin/data/reference/delete/'.$item['mdid'].'">删除</a> <a href="javascript:void(0);" class="order" rel="'.$item['mdid'].'" rev="'.$item['place'].'">排序</a>）：'.$item['reference'].'</li>';
if ($i==0) echo '<div class="well"><h4>元数据：<a href="/data/'.$item['uuid'].'">'.$item['title'].'</a>（<a href="/admin/data/reference/add/1/uuid/'.$item['uuid'].'">添加</a>）</h4><ol>';
echo '<li>文献（<a href="/admin/data/reference/edit/'.$item['mdid'].'">编辑</a> <a href="/admin/data/reference/delete/'.$item['mdid'].'">删除</a> <a href="javascript:void(0);" class="order" rel="'.$item['mdid'].'" rev="'.$item['place'].'">排序</a>）：'.$item['place'].'. '.$item['reference'].'</li>';
endforeach;
echo '</ul>';
?>
</div>
<?php endif; ?>
<?= $this->paginator; ?>
</div>