diff --git a/application/default/controllers/VisualController.php b/application/default/controllers/VisualController.php index 608d852b..eea08e08 100644 --- a/application/default/controllers/VisualController.php +++ b/application/default/controllers/VisualController.php @@ -10,6 +10,10 @@ class VisualController extends Zend_Controller_Action { $this->view->config = Zend_Registry::get('config'); $this->db=Zend_Registry::get('db'); + $this->view->nav = array( + array('link'=>'/','title'=>''), + array('link'=>'/data','title'=>$this->view->config->title->data), + ); $auth = Zend_Auth::getInstance(); if($auth->hasIdentity()) diff --git a/application/default/views/scripts/archives/list.phtml b/application/default/views/scripts/archives/list.phtml index 66661053..9fb7f1c4 100644 --- a/application/default/views/scripts/archives/list.phtml +++ b/application/default/views/scripts/archives/list.phtml @@ -56,7 +56,7 @@ $this->breadcrumb()->setSeparator(' > '); $description = $v['description']; } ?> -
  • []
  • +
  • []
  • theme->AppendPlus($this,'colorbox');
    - +

    escape($md['title']);?>

    diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml index b8b112b3..246c379c 100755 --- a/application/default/views/scripts/header.phtml +++ b/application/default/views/scripts/header.phtml @@ -7,7 +7,7 @@
    - +

    diff --git a/application/default/views/scripts/visual/view.phtml b/application/default/views/scripts/visual/view.phtml index 0ea4c5ea..d8a04728 100644 --- a/application/default/views/scripts/visual/view.phtml +++ b/application/default/views/scripts/visual/view.phtml @@ -8,6 +8,7 @@ $this->breadcrumb('首页'); $this->breadcrumb('数据与服务'); $this->breadcrumb('数据可视化'); $this->breadcrumb()->setSeparator(' > '); +$this->nav[] = array('link'=>"/data/visual",'title'=>'可视化数据列表'); ?>

    diff --git a/htdocs/js/navi.js b/htdocs/js/navi.js index 9b6325e9..f8988b74 100755 --- a/htdocs/js/navi.js +++ b/htdocs/js/navi.js @@ -2,7 +2,7 @@ function extractPageName(hrefString) { var arr = hrefString.split('/'); var result=(arr.length<3) ? hrefString : arr[3].toLowerCase(); - if (result=='water' || result=='heihe' || result=='glacier' || result=='yrnmr' || result=='hiwater') result='data'; + if (result=='visual' || result=='heihe') result='data'; if (result=='admin' && arr.length>=4) result+="/"+arr[4]; return result; }