diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index 4d154715..4764d71e 100755 --- a/application/default/controllers/DataController.php +++ b/application/default/controllers/DataController.php @@ -50,7 +50,7 @@ class DataController extends Zend_Controller_Action $k5=$state->fetchAll(); $this->view->keywords=array('place'=>$k1,'theme'=>$k2,'discipline'=>$k3,'stratum'=>$k4,'temporal'=>$k5); //最新10个入库数据 - $state=$this->db->query('select id,uuid,title,ts_published from normalmetadata order by id desc limit 10'); + $state=$this->db->query('select id,uuid,title,ts_published,description from normalmetadata order by id desc limit 8'); $this->view->metadata = $state->fetchAll(); //特色数据 diff --git a/application/default/views/scripts/data/index-bak.phtml b/application/default/views/scripts/data/index-bak.phtml new file mode 100755 index 00000000..9e9deeac --- /dev/null +++ b/application/default/views/scripts/data/index-bak.phtml @@ -0,0 +1,230 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->data); +$this->headTitle()->setSeparator(' - '); +$this->headLink()->appendStylesheet('/static-sanji/css/data-index.css'); +?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +'.$name.''; +// }else{ +// $content .= ''.$cg['name'].''; +// } +// +// } +// return '
'. $content . '
'; +// } +// ?> + + +category as $cg) : ?> + 4) { +// echo genDataSetCol('category', $arr); +// $index = 1; +// } +// ?> + + + + + +serie as $cg) : ?> + 4) { +// echo genDataSetCol('series', $arr); +// $index = 1; +// } +// ?> + + + +
+
特色导航
+
+ + + + + + + + + +

+ ' . $keyword[0] . ''; + } + return '
'. $content . '
'; + } + + $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','temporal'=>'时间关键词'); + $type='theme'; + ?> +
+ + keywords[$type] as $cg) : ?> + 4) { + echo genCol($arr); + $index = 1; + } + ?> + +
+
+ +
+ + keywords[$type] as $cg) : ?> + 4) { + echo genCol($arr); + $index = 1; + } + ?> + +
+
+ +
+ + keywords[$type] as $cg) : ?> + 4) { + echo genCol($arr); + $index = 1; + } + ?> + +
+
+ +
+ + keywords[$type] as $cg) : ?> + 4) { + echo genCol($arr); + $index = 1; + } + ?> + +
+
+
+
数据最近更新
+ +
+
+ +
+
\ No newline at end of file diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml index 9e9deeac..48edc06a 100755 --- a/application/default/views/scripts/data/index.phtml +++ b/application/default/views/scripts/data/index.phtml @@ -2,229 +2,159 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/static-sanji/css/data-index.css'); +$this->headLink()->appendStylesheet('/static-sanji-v2/css/dataProduct.css'); +$this->headLink()->appendStylesheet('/static-sanji-v2/css/header-position.css'); ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -'.$name.''; -// }else{ -// $content .= ''.$cg['name'].''; -// } -// -// } -// return '
'. $content . '
'; -// } -// ?> - - -category as $cg) : ?> - 4) { -// echo genDataSetCol('category', $arr); -// $index = 1; -// } -// ?> - - - - - -serie as $cg) : ?> - 4) { -// echo genDataSetCol('series', $arr); -// $index = 1; -// } -// ?> - - - -
-
特色导航
-
- - - - - - - - -
- 高级搜索 - 数据列表浏览 - 在线数据清单 - 离线数据清单 - 缩略图浏览 - 时间轴浏览 - 空间浏览 - 单位浏览 - 项目浏览 - 作者浏览 - + + + + + + - $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','temporal'=>'时间关键词'); - $type='theme'; - ?> -
- + +
+
+

最近更新数据

+ 查看更多 +
+
+ + + +
+
+

数据资源查找

+
+
+
+ +
+
+ keywords[$type] as $cg) : ?> - 4) { - echo genCol($arr); - $index = 1; - } - ?> +
-
+
-
- keywords[$type] as $cg) : ?> - 4) { - echo genCol($arr); - $index = 1; - } - ?> +
-
+
-
- keywords[$type] as $cg) : ?> - 4) { - echo genCol($arr); - $index = 1; - } - ?> +
-
+
-
- keywords[$type] as $cg) : ?> - 4) { - echo genCol($arr); - $index = 1; - } - ?> + + +
-
-
数据最近更新
- +
+ + +
+
+

数据服务

- + + \ No newline at end of file diff --git a/htdocs/static-sanji-v2/css/header-position.css b/htdocs/static-sanji-v2/css/header-position.css new file mode 100644 index 00000000..3c6e1f07 --- /dev/null +++ b/htdocs/static-sanji-v2/css/header-position.css @@ -0,0 +1,3 @@ +.header{ + position: relative; +} \ No newline at end of file