diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 5b8ef671..a0902fe9 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -6,7 +6,7 @@ class HiwaterController extends DataController function preDispatch() { parent::preDispatch(); - //$this->_helper->layout->setLayout('hiwater'); + $this->debug = 0; $acName = $this->_request->getActionName(); if(in_array($acName,array("aviation","radiometer","lidar","ccdlidar","widas",'ccdwidas',"nearvis","thermal"))) @@ -46,7 +46,7 @@ class HiwaterController extends DataController $this->view->pageIn = "collapse9"; } $this->view->pageID = "hiwater-".$acName; - $this->_helper->layout->setLayout('heihe'); + //$this->_helper->layout->setLayout('heihe'); } function indexAction() diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml index 87769a0a..d7e3311c 100755 --- a/application/default/views/scripts/data/index.phtml +++ b/application/default/views/scripts/data/index.phtml @@ -12,7 +12,8 @@ $this->headTitle()->setSeparator(' - ');

Data Collection

-WATER +WATER +HiWATER

Datasets Navigator

diff --git a/application/default/views/scripts/hiwater/index.phtml b/application/default/views/scripts/hiwater/index.phtml index 5b1df0cf..21b42586 100644 --- a/application/default/views/scripts/hiwater/index.phtml +++ b/application/default/views/scripts/hiwater/index.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); -$this->nav[] = array('link'=>"/water",'title'=>'黑河生态水文遥感试验'); +$this->nav[] = array('link'=>"/hiwater",'title'=>'HiWATER'); ?> render('breadcrumbs.phtml'); ?>
diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index 429e2c8d..19931892 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -2,7 +2,7 @@
  • @@ -61,9 +61,9 @@ 2013
    • @@ -111,14 +111,14 @@