工具调整，显示优化

application/default/views/scripts/data/advancesearch.phtml

@@ -16,10 +16,12 @@ $this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$
 <div id='tools'>
 <?= $this->partial('data/tools.phtml'); ?>
 </div>
-<?php if (!empty($this->metadata)) : ?>
+<?php if (!empty($this->metadata)) : 
-<?php echo $this->page->getNavigation(); 
+ echo $this->page->getNavigation();?>
-foreach($this->metadata as $md) : ?>
 <hr />
+
+<?php
+foreach($this->metadata as $md) : ?>
 <div class="mditem">
 <div class="thumb"><img src="/data/thumb/id/<?php echo $md['id'];?>" /></div>    
     <h2><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a>
@@ -27,20 +29,19 @@ foreach($this->metadata as $md) : ?>
     <span><?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?></span>
 </div>
 <?php endforeach; ?>
-<hr />
 <?php echo $this->page->getNavigation();?>
 <?php else: ?>
 <script src="/js/dragzoom.js" type="text/javascript"></script>
     <div id="map"></div>    
     <div id="spatial">
 <form id="search" enctype="application/x-www-form-urlencoded" action="/data/advancesearch" method="post">
-    <!--<fieldset><legend>时间范围</legend><ul>
+    <fieldset><legend>时间范围</legend><ul>
     <li><span>开始时间：</span>
     <input name="start" type="text" id="start" />
     </li>
     <li><span>结束时间：</span>
     <input name="end" type="text" id="end" />&nbsp;
-</li></ul></fieldset>-->
+</li></ul></fieldset>
 <fieldset><legend>空间范围</legend><ul>
     <li><span>东：</span>&nbsp;
 

application/default/views/scripts/data/browse.phtml

@@ -13,16 +13,13 @@ $this->breadcrumb()->setSeparator(' > ');
 <?= $this->partial('data/tools.phtml'); ?>
 </div>
 <?php echo $this->page->getNavigation(); ?>
-<?php foreach($this->metadata as $md) : ?>
 <hr />
+<?php foreach($this->metadata as $md) : ?>
 <div class="mditem">
 <div class="thumb"><img src="/data/thumb/id/<?php echo $md['id'];?>" /></div>    
     <h2><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a>
-    <a href="/data/xml/id/<?php echo $md['id'];?>" title="XML模式查看"><img src="/images/xml.gif" /></a>
-    <a href="/data/map/id/<?php echo $md['id']; ?>" title="查看数据空间范围"><img src="/images/map.gif" /></a>    
             </h2>
     <div class="summary"><?php echo str_replace(array("\r\n", "\n", "\r"),'<br />',mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']));?></div>
 </div>
 <?php endforeach; ?>
-<hr />
 <?php echo $this->page->getNavigation(); ?>

application/default/views/scripts/data/category.phtml

@@ -23,9 +23,9 @@ $this->breadcrumb()->setSeparator(' > ');
 <?php endforeach; ?>
 </ul></fieldset>
 </div>
-<div id='metacontent'>
-
 <?php if (count($this->paginator)): ?>
+<div id='metacontent'>
+<hr />
 <?php
 $i=0;
 foreach ($this->paginator as $item):
@@ -44,8 +44,6 @@ foreach ($this->paginator as $item):
 </div>';
 endforeach;
 ?>
-<?php endif; ?>
-
-<?= $this->paginator; ?>
-
 </div>
+<?= $this->paginator; ?>
+<?php endif; ?>

application/default/views/scripts/data/index.phtml

@@ -13,7 +13,7 @@ $this->breadcrumb()->setSeparator(' > ');
     <h3>  
    <?php echo $this->searchform; ?> 
 <a href="/data/advancesearch">高级搜索</a></h3>
-<h3><a href="/water">黑河综合遥感联合试验</a> <a href="/data/datasetcd">特色数据集光盘</a> </h3>
+<h3><a href="/heihe/">数字黑河</a> <a href="/water">黑河综合遥感联合试验</a> <a href="/data/datasetcd">特色数据集光盘</a> </h3>
 <h3> 分类浏览</h3>
 
 <div id='category'>

application/default/views/scripts/data/map.phtml

@@ -11,8 +11,8 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('/js/OpenLayers.js');
 	$this->headLink()->appendStylesheet('/js/theme/default/style.css');
+	$this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$this->config->google->maps->api);
 ?>
-<script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhRBSKpgcP88GYi6r2Of16IkMX_4YhSBQsywCi4J2_fh4nBuWmK7gyRjLg'></script>
 <div id='tools'>
 <?= $this->partial('data/tools.phtml'); ?>
 </div>

application/default/views/scripts/data/search.phtml

@@ -12,9 +12,9 @@ $this->breadcrumb('快速搜索');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
 <div id='tools'>
-<?= $this->partial('data/tools.phtml'); ?>
+<?= $this->partial('data/tools.phtml',array('key'=>$this->key)); ?>
 </div>
-<?php echo $this->form; ?>
+
 <?php if (!empty($this->metadata)) : ?>
 <?php echo $this->page->getNavigation(); 
 foreach($this->metadata as $md) : ?>

application/default/views/scripts/data/series.phtml

@@ -34,10 +34,9 @@ $this->breadcrumb()->setSeparator(' > ');
 <?php if (!empty($this->metadata)) : ?>
 <div id='metacontent'>
 <h1>当前浏览数据集序列：<?php echo $this->codename; ?></h1>
-<?php if ($this->showtools) echo $this->form; ?>
 <?php echo $this->page->getNavigation(); ?>
-<?php foreach($this->metadata as $md) : ?>
 <hr />
+<?php foreach($this->metadata as $md) : ?>
 <div class="mditem">
 <div class="thumb"><img src="/data/thumb/id/<?php echo $md['id'];?>" /></div>    
     <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a>

application/default/views/scripts/data/tag.phtml

@@ -17,15 +17,16 @@ $this->breadcrumb()->setSeparator(' > ');
 <div id='metacontent'>
 <h1>当前浏览：<?php echo $this->codename; ?></h1>
 <?php echo $this->page->getNavigation(); ?>
-<?php foreach($this->metadata as $md) : ?>
 <hr />
-<div class="thumb"><img src="/data/thumb/id/<?php echo $md['id'];?>" /></div>    
+<?php foreach($this->metadata as $md) : ?>
 <div class="mditem">
+<div class="thumb"><img src="/data/thumb/id/<?php echo $md['id'];?>" /></div>    
     <h2><a href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']);?></a> 
             
             </h2>
     <span><?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?></span>
 </div>
+<?php echo $this->page->getNavigation(); ?>
 <?php endforeach; ?>
 </div>
 <?php else : ?>

application/default/views/scripts/data/timemap.phtml

@@ -8,7 +8,7 @@ $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
 $this->breadcrumb('<a href="/data/timeline">时空导航</a>');
 $this->breadcrumb()->setSeparator(' > ');
-$this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=2&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhRBSKpgcP88GYi6r2Of16IkMX_4YhSBQsywCi4J2_fh4nBuWmK7gyRjLg');
+$this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$this->config->google->maps->api);
 $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
 $this->headScript()->appendFile('/js/timemap/timemap.js');

application/default/views/scripts/data/tools.phtml

@@ -1,11 +1,28 @@
 <ul>
-<li><a href="/data/tag">数据集关键词浏览</a></li>
+<li><a href="/data/tag">关键词浏览</a></li>
-<li><a href="/data/series">数据集序列浏览</a></li>
+<li><a href="/data/series">序列浏览</a></li>
-<li><a href="/data/category">数据集分类浏览</a></li>
+<li><a href="/data/category">分类浏览</a></li>
 <li><a href="/data/timeline">时间轴浏览</a></li>
 <li><a href="/data/map">空间浏览</a></li>
 <li><a href="/data/timemap">时空浏览</a></li>
-<li><a href="/data/browse">浏览所有元数据</a></li>
+<li><a href="/data/browse">全部浏览</a></li>
-<li><a href="/data/search">快速搜索</a></li>
 <li><a href="/data/advancesearch">高级搜索</a></li>
+<form  id="search" enctype="application/x-www-form-urlencoded" action="/data/search" method="post">
+<li>
+<input type="text" name="q" id="q" value="<?php echo (empty($this->key))?'回车搜索标题和摘要':$this->key; ?>" onfocus="myfocus(this);" onblur="myblur(this);">
+<input type="hidden" name="submit" value="submit">
+</form>
+<script>
+  function myfocus(element) {
+     if (element.value == '回车搜索标题和摘要') {
+       element.value = '';
+     }
+   }
+   function myblur(element) {
+     if (element.value == '') {
+       element.value = '回车搜索标题和摘要';
+     }
+   }
+</script>
+</li>
 </ul>