From 1de731915079d2b89a598cb8d41a17d74652daa8 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 17 May 2013 00:41:46 +0000 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=9F=E4=B8=80=E5=88=87?= =?UTF-8?q?=E6=8D=A2layout,=E6=96=87=E7=8C=AE=E9=83=A8=E5=88=86=E7=AE=80?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controllers/DataController.php | 4 ++-- application/admin/controllers/DownController.php | 1 + application/admin/controllers/IndexController.php | 1 + application/admin/controllers/NewsController.php | 1 + application/admin/controllers/StatController.php | 1 + application/admin/controllers/SysController.php | 2 +- application/admin/controllers/TestController.php | 1 + application/admin/controllers/UserController.php | 1 + application/admin/controllers/WatermdController.php | 1 + application/admin/views/scripts/data/project.phtml | 2 +- application/admin/views/scripts/data/reference.phtml | 12 +++++------- 11 files changed, 16 insertions(+), 11 deletions(-) diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index ed9cdb24..6728f8e7 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -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'); diff --git a/application/admin/controllers/DownController.php b/application/admin/controllers/DownController.php index bb5d952c..19c05140 100644 --- a/application/admin/controllers/DownController.php +++ b/application/admin/controllers/DownController.php @@ -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() { diff --git a/application/admin/controllers/IndexController.php b/application/admin/controllers/IndexController.php index 76c32cc5..a63df4c5 100644 --- a/application/admin/controllers/IndexController.php +++ b/application/admin/controllers/IndexController.php @@ -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() diff --git a/application/admin/controllers/NewsController.php b/application/admin/controllers/NewsController.php index 6957c649..5d1770d1 100644 --- a/application/admin/controllers/NewsController.php +++ b/application/admin/controllers/NewsController.php @@ -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() { diff --git a/application/admin/controllers/StatController.php b/application/admin/controllers/StatController.php index 04f2fb3f..42a70a78 100644 --- a/application/admin/controllers/StatController.php +++ b/application/admin/controllers/StatController.php @@ -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() { diff --git a/application/admin/controllers/SysController.php b/application/admin/controllers/SysController.php index d38d09d9..f5f5d46e 100644 --- a/application/admin/controllers/SysController.php +++ b/application/admin/controllers/SysController.php @@ -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() diff --git a/application/admin/controllers/TestController.php b/application/admin/controllers/TestController.php index c6bc40c1..f47212ab 100644 --- a/application/admin/controllers/TestController.php +++ b/application/admin/controllers/TestController.php @@ -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() diff --git a/application/admin/controllers/UserController.php b/application/admin/controllers/UserController.php index dbb63ac7..9106f7c7 100755 --- a/application/admin/controllers/UserController.php +++ b/application/admin/controllers/UserController.php @@ -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() { diff --git a/application/admin/controllers/WatermdController.php b/application/admin/controllers/WatermdController.php index 126d8bdd..d8b98e39 100644 --- a/application/admin/controllers/WatermdController.php +++ b/application/admin/controllers/WatermdController.php @@ -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); } diff --git a/application/admin/views/scripts/data/project.phtml b/application/admin/views/scripts/data/project.phtml index f53b99b5..d6c0a2d4 100644 --- a/application/admin/views/scripts/data/project.phtml +++ b/application/admin/views/scripts/data/project.phtml @@ -37,7 +37,7 @@ ?>

  • -

    编号： | 负责人： | 开始时间：　| +

    编号： | 负责人： | 开始时间：　| 　状态：

    邀请跟踪专家　|　 diff --git a/application/admin/views/scripts/data/reference.phtml b/application/admin/views/scripts/data/reference.phtml index fa23e1f5..5e426ae5 100644 --- a/application/admin/views/scripts/data/reference.phtml +++ b/application/admin/views/scripts/data/reference.phtml @@ -31,8 +31,8 @@

      -
      • -
      • +
      • +
    @@ -45,7 +45,6 @@ paginator)): ?> -
    paginator as $item): if ($u==$item['uuid']) : $i+=1; else : - if (!empty($u)) echo ''; + if (!empty($u)) echo '
    '; $i=0; $u=$item['uuid']; endif; - if ($i==0) echo ''; ?> - paginator; ?> \ No newline at end of file