修改了数据浏览页面的模板

application/default/controllers/DataController.php

@@ -556,7 +556,12 @@ class DataController extends Zend_Controller_Action
     		$rs=$this->db->fetchRow($sql,array((int)$row->projection));
     		if ($rs) $this->view->projection=$rs->proj4text;
     	}
-    	$this->view->keys=$this->db->fetchAll("select * from keyword where id=? order by keytype,ts_created",array($id));
+		
+		$sql = "select * from keyword where id=? order by keytype,ts_created";
+		$sth = $this->db->prepare($sql);
+		$rs = $sth->execute(array($id));
+		$this->view->keys = $sth->fetchAll(PDO::FETCH_BOTH);
+		
     	$sql='select c.code,cc.name,cc.name_zh from category c,categorycode cc where c.code=cc.code and c.id= ?';
     	$state=$this->db->query($sql,array($id));
     	$this->view->category=$state->fetchAll();
@@ -604,9 +609,9 @@ class DataController extends Zend_Controller_Action
         $sql="select a.*,array_to_string(array(select author from knl_author t where t.item_id=a.item_id order by place asc),'; ') as author from knl_article a where (";  	 	 
         foreach($this->view->keys as $k)  	 	 
 		{  	 	 
-			if ($k->keytype=='theme')   	 	 
+			if ($k['keytype']=='theme')   	 	 
 			{  	 	 
-				$sql.=" a.title like '%".$k->keyword."%' or ";  	 	 
+				$sql.=" a.title like '%".$k['keyword']."%' or ";  	 	 
 			}  	 	 
         }  	 	 
        	$sql.=" 1<>1) order by a.ts_created desc limit 10";  	 	 
@@ -915,15 +920,24 @@ class DataController extends Zend_Controller_Action
 						{
 							$color = 'background:'.$color.';color:#FFFFFF;';
 						}
-						$replyhtml .= "
+						$img = $avatar->Get($v['email'],48);
-						<div class='comment-content' style='width:90%;margin:5px auto;'><span class='title' style='$color'>".
+						$replyhtml .='
-						$v['username']."$usertype 回复于".date('Y-m-d H:i:s',strtotime($v['ts_created']))."</span>
+							<div class="media" style="background:#cecece;border-radius:6px 6px 6px 6px;">
-						<p>".($v['body'])."</p>
+							<a class="pull-left" href="javascript:void(0);">
-						</div>";
+								<img class="media-object img-rounded" src="'.$img.'">
+							</a>
+						<div class="media-body">
+							<span class="pull-right">回复于'.date('Y-m-d H:i:s',strtotime($v['ts_created'])).'</span>
+							<h5 class="media-heading">'.$v['username'].' '.$usertype.'</h5>
+							'.$v['body'].'
+							</div>
+						</div>
+						';
+
 					}
 				}
 				
-				$img = $avatar->Get($c['email'],30);
+				$img = $avatar->Get($c['email'],64);
 				//$img = '<img src="'.$img.'" />';
 
 				$author = $c['author'];
@@ -931,10 +945,8 @@ class DataController extends Zend_Controller_Action
 				$author = ''.$author."";
 				$time = '发表于'.date('Y-m-d H:i:s',strtotime($c['ts_created'])).'';
 				print '
-				    <div class="media" style="background:#cecece;border-radius:6px 6px 6px 6px;">
+				    <div class="media" style="background:#eee;border-radius:6px 6px 6px 6px;">
-						<a class="pull-left" href="javascript:void(0);">
+						<img class="media-object img-rounded pull-left" src="'.$img.'">
-							<img class="media-object" src="'.$img.'">
-						</a>
 					<div class="media-body">
 						<span class="pull-right">'.$time.'</span>
 						<h4 class="media-heading">'.$c['author'].'</h4>

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

@@ -1,26 +1,28 @@
 <?php if ($this->pageCount): ?> 
-<div class="paginationControl">
+<div class="pagination">
+<ul>
 <!-- Previous page link --> 
 <?php if (isset($this->previous)): ?>
-   <a href="javascript:void(0);" onclick="ajaxpage(<?php echo $this->previous;?>)">&lt; Previous</a>
+	<li><a href="javascript:void(0);" onclick="ajaxpage(<?php echo $this->previous;?>)">&laquo;</a></li>
 <?php else: ?> 
-   <span class="disabled">&lt; Previous</span>
+   <li class="disabled"><a href="javascript:;">&laquo;</a></li>
 <?php endif; ?> 
-
 <!-- Numbered page links -->
 <?php foreach ($this->pagesInRange as $page): ?> 
   <?php if ($page != $this->current): ?>
-    <a href="javascript:void(0);" onclick="ajaxpage(<?php echo $page;?>)"><?= $page; ?></a>
+  	<li><a href="javascript:void(0);" onclick="ajaxpage(<?php echo $page;?>)"><?= $page; ?></a></li>
   <?php else: ?>
-    <span class="current"><?= $page; ?></span>
+  	<li class="active"><a  href="javascript:void(0);"><?= $page; ?></a></li>
   <?php endif; ?>
 <?php endforeach; ?>
 
 <!-- Next page link --> 
 <?php if (isset($this->next)): ?> 
-   <a href="javascript:void(0);" onclick="ajaxpage(<?php echo $this->next;?>)">Next &gt;</a>
+   <li><a href="javascript:void(0);" onclick="ajaxpage(<?php echo $this->next;?>)">&raquo;</a></li>
 <?php else: ?> 
-   <span class="disabled">Next &gt;</span>
+   <li class="disabled"><a href="javascript:;">&raquo;</a></li>
 <?php endif; ?> 
+</ul>
 </div>
 <?php endif; ?>
+  

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

@@ -3,7 +3,6 @@
 	$this->headTitle($this->config->title->data);
 	$this->headTitle($this->metadata->title);
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/watermdview.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
 	$this->breadcrumb('查看元数据');
@@ -11,8 +10,6 @@
 	$this->theme->AppendPlus($this,'google_map_v3');
 	$this->theme->AppendPlus($this,'jquery');
 	$this->theme->AppendPlus($this,'colorbox');
-	$this->headLink()->appendStylesheet('/js/theme/default/style.css');
-	$this->headScript()->appendFile('/js/jquery.idTabs.min.js');
 ?>
 
 <?php $md=$this->metadata;if ($md):?>
@@ -41,9 +38,9 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
             <ol>
             <?php foreach($this->ref as $ref) :
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+                echo '<li style="white-space:normal; word-break:break-all;overflow:hidden;">'.$ref->reference.'</li>';
             else
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'">下载</a></li>';
+                echo '<li style="white-space:normal; word-break:break-all;overflow:hidden;">'.$ref->reference.' <a href="'.$ref->link.'">下载</a></li>';
             endforeach;
             ?>
             </ol>
@@ -77,20 +74,21 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			<?php endif; ?>
             <?php if($this->data_archives){ ?>
                 <h5>相关数据新闻</h5>
-                <hr />
+                <ul>
                 <?php 
                 foreach($this->data_archives as $v){?>
-                <p><a href="<?= $v['url']['archive_url']?>"><?= $v['title']?></a></p>
+                <li><a href="<?= $v['url']['archive_url']?>"><?= $v['title']?></a></li>
                 <?php } ?>
+                </ul>
+                <hr />
             <?php }?>
             <?php if ($md->suppinfo) : ?>
                 <h5>项目支持信息</h5>
-                <hr />
                 <?php echo '<p>'.str_replace(array("\r\n", "\n", "\r"),'</p><p>',$this->escape($md->suppinfo)).'</p>';?>
+                <hr />
             <?php endif; ?>
 			<?php if ($this->resources) : ?>
                 <h5>其他在线资源</h5>
-                <hr />
                 <ul><?php foreach($this->resources as $link) : ?>
                 <li><a href="<?php echo $link->linkage; ?>" title="<?php echo $link->description; ?>">
                 <?php
@@ -103,14 +101,15 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                     ?></a></li>
                 <?php endforeach; ?>
                 </ul>
+                <hr />
             <?php endif; ?>
         </div>
         <div>
         	<?php
 				$keywords = array();
 				foreach($this->keys as $cg){
-					if($cg->keytype=="theme")
+					if($cg['keytype']=="theme")
-					$keywords[]=$cg->keyword;
+					$keywords[]=$cg['keyword'];
 				}
 				$ev = join(" ",$keywords);
 			?>
@@ -166,7 +165,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			<?php if ($md->status>0 and $md->status<5) : ?>
 			<p class="strong">此数据还在评审过程中，我们真切地邀请您参加此数据的评审，以便我们能尽快发布此数据！<a href="/review/review/uuid/<?php echo $md->uuid; ?>"><img src="/images/review.png" title="此数据正在评审中，我们邀请您对此数据进行评审，以便其能尽快发布！" /></a></p>
 			<?php else : ?>
-			<h2>数据评论</h2>
+			<h4>数据评论</h4>
 			<div id="allcomments">
 			<div id="loading"><img src="/images/loading.gif" />评论加载中</div>
 			</div>
@@ -183,205 +182,227 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 				$email = "";
 			}
 			?>
-			<form id="postcommentform">
+            <form class="form-horizontal"  id="postcommentform">
-				<p>
+            <div class="control-group">
-				<label class="required" style="background:none;">姓名</label>
+            <label class="control-label">姓名</label>
-				<input type="text" name="author" value="<?php echo $name;?>" />
+            <div class="controls">
-				</p>
+            <input type="text" name="author" value="<?php echo $name;?>" />
-				<p>
+            </div>
-				<label class="required" style="background:none;">EMAIL</label>
+            </div>
-				<input type="text" name="email" value="<?php echo $email;?>" />
+            <div class="control-group">
-				</p>
+            <label class="control-label">Email</label>
-				<p>
+            <div class="controls">
-				<label>WEBSITE</label>
+            <input type="text" name="email" value="<?php echo $email;?>" />
-				<input type="text" name="url" value="" /> <small>e.g. http://westdc.westgis.ac.cn/</small>
+            </div>
-				</p>
+            </div>
-				<p>
+            <div class="control-group">
-				<label class="required" style="background:none;">内容</label>
+            <label class="control-label">Website</label>
-				<textarea name="content" class="medium half"></textarea>
+            <div class="controls">
-				</p>
+            <input type="text" name="url" value="" /> <span class="help-block">e.g. http://westdc.westgis.ac.cn/</span>
-				<p>
+            </div>
-				<label class="required">验证码</label>
+            </div>
-				<img id="imgcode" style="margin-bottom:-10px;cursor:pointer;border:0px;" src="/service/imgcode/" onClick="this.src=this.src+'?'"><input type="text" name="vdcode" id="vdcode" maxlength="4" value="" />
+            <div class="control-group">
-				</p>
+            <label class="control-label">内容</label>
-				<p>
+            <div class="controls">
-				<label>　</label>
+            <textarea name="content" class="span5"></textarea>
-				<input type="hidden" name="mdtitle" value="<?php echo $md->title;?>" />
+            </div>
-				<input type="hidden" name="uuid" value="<?php echo $md->uuid;?>" />
+            </div>
-				<a class="btn btn-green" id="postcomment" href="javascript:;" onclick="postcomment();">提交</a><button type="reset" id="reset" class="btn">重置</button><span id="returninfo"></span>
+            <div class="control-group">
-				</p>
+            <label class="control-label">验证码</label>
-			</form>
+            <div class="controls">
+            <img id="imgcode" style="margin-bottom:-10px;cursor:pointer;border:0px;" src="/service/imgcode/" onClick="this.src=this.src+'?'"><input type="text" name="vdcode" id="vdcode" maxlength="4" value="" />
+            </div>
+            </div>
+            <div class="control-group">
+            <div class="controls">
+            <input type="hidden" name="mdtitle" value="<?php echo $md->title;?>" />
+			<input type="hidden" name="uuid" value="<?php echo $md->uuid;?>" />
+			<a class="btn btn-primary" id="postcomment" href="javascript:;" onclick="postcomment();">提交</a><button type="reset" id="reset" class="btn">重置</button><span id="returninfo"></span>
+            </div>
+            </div>
+            </form>
 			<div id="infobox"></div>
 			<?php endif; ?>
         </div>
     </div>
-    <div class="span2">
+    </div>
+    <div class="span4">
+    	<div>
+        <table class="table table-striped">
+        <thead>
+        </thead>
+        <tbody>
+        <tr>
+        	<td>类别</td>
+        	<td>
+			<ul class="nav nav-pills inline unstyled">
+			<?php foreach($this->category as $cat): ?>
+            <li><a href="/data/category/code/<?php echo $cat->code;?>"><?php echo $this->escape($cat->name_zh);?></a></li>
+            <?php endforeach; ?>
+            </ul>
+            </td>
+        </tr>        
+        <?php
+        foreach($this->keys as $k=>$v)
+        {
+            if($v['keytype'] == "category"){	$title = "类别";
+            }else if($v['keytype'] == "discipline"){$title = "学科";
+            }else if($v['keytype'] == "place"){$title = "地点";
+            }else if($v['keytype'] == "theme"){ $title = "主题";
+            }
+            $keys[$title][] = $v['keyword'];
+        }
+        ?>
+        <?php foreach($keys as $k=>$v)	{ ?>
+        <tr>
+        	<td><?= $k ?></td>
+        	<td>
+			<ul class="nav nav-pills inline unstyled">
+			<?php foreach($v as $keys) { ?>
+            <li><a href="/data/tag/key/"><?= $keys ?></a></li>
+            <?php } ?>
+            </ul>
+            </td>
+        </tr>
+        <?php }	?>
+        </tbody>
+        </table>
+        </div>
+    <!--
+        <?php if ($this->series): ?>
+        <div id="series">
+        <ul><?php foreach($this->series as $serie): ?>
+        <li><a href="/data/series/id/<?php echo $serie->id; ?>"> <?php echo $this->escape($serie->name);?></a></li>
+        <?php endforeach; ?>
+        </ul>
+        </div>
+        <?php endif; ?>
+    -->
+    <div>
+    <hr />
+    <h4>数据信息</h4>
+    <ul class="unstyled">
+    <?php if ($md->fileformat) : ?>	
+    <li id="fileformat">格式：<?php echo $md->fileformat; ?></li>
+    <?php endif; ?>
+        <li id="filesize">大小：<?php echo $md->filesize; ?>MB</li>
+        <?php if ($this->downloaded>9) :?>
+        <li id="downtimes">下载：<?php echo $this->downloaded; ?>次</li>
+        <?php endif; ?>
+        <li id="viewtimes">浏览：<?php echo $this->viewed; ?>次</li>
+    <!--
+    <?php if ($md->projection) : ?>	
+        <li id="projection" title="<?= $this->projection; ?>">数据投影：
+    <?php
+    $p=explode(" ",$this->projection);
+    $p=explode("=",$p[0]);
+    if (!empty($p[1]))
+      echo $p[1];
+    else
+    {
+     if (is_numeric($md->projection)) echo 'EPSG_CODE_';
+     echo $md->projection; 
+    }
+    ?></li>
+    <?php endif; ?>
+    -->
+        <?php if (!empty($md->timebegin)) : ?>
+        <li id="datatimes">数据时间范围：<?php echo date('Y-m-d',strtotime($md->timebegin));if (!empty($md->timeend)) echo " 至 ".date('Y-m-d',strtotime($md->timeend)); ?></li>
+        <?php endif; ?>
+        <?php if (!empty($this->doc)) : ?>
+        <li id="datadoc"><a href="<?php $wikiTitle = $this->doc;
+            if(strpos($wikiTitle,'http://wiki.westgis.ac.cn/index.php/')!==false){
+            $title=str_replace('http://wiki.westgis.ac.cn/index.php/','',$wikiTitle);
+            echo "/data/wiki/$title";
+            }else{
+            echo $this->doc;
+            }?>">数据说明文档</a></li>
+        <?php endif; ?>
+        <?php if ($this->attachments) : ?>
+        <li id="attach"><span>相关文档：</span>
+        <?php foreach ($this->attachments as $k=>$a) : ?>
+        <a href="/service/attach/id/<?php echo $a->id; ?>" title="<?php echo $a->realname; ?>"><img src="/images/document.png"></a> 
+        <?php endforeach; ?>
+        <a href="/service/attach/zip/<?php echo $md->uuid; ?>"><img src="/images/zip_icon.gif" title="打包下载"/></a>
+        </li>
+        <?php endif; ?>
+        <li id="datatype">数据共享方式：<?php if ($md->datatype) print "离线"; else print "在线（可直接下载）";?> <a href="javascript:void(0);" id="show-list" onclick="getFileList()" title="">文件列表</a></li>
+    </ul>
+    <div id="linkurl">
+    <?php if ($md->status>0 and $md->status<5) : ?>
+    <a href="/review/review/uuid/<?php echo $md->uuid; ?>"><img src="/images/review.png" title="此数据正在评审中，我们邀请您对此数据进行评审，以便其能尽快发布！" /></a> 
+    <?php else : if (!$md->datatype) : ?>
+    <a href="/data/todownload/?uuid=<?= $md->uuid?>"><img src="/images/download.png" title="直接下载" /></a>
+    <?php else: ?>
+    <a href="/data/order/uuid/<?php echo $md->uuid; ?>"><img src="/images/order.png" title="免费！离线申请此数据（在线数据和离线数据都可申请）"/></a>
+    <?php endif;endif; ?>
+    </div>
     
     </div>
+    <hr />
+    <h4>空间位置</h4>
+    <div id='watermap' style="width:100%;height:300px;"></div>
+    <hr />
+    <h4>联系信息</h4>
+    <div id="authors">
+    <ul class="unstyled">
+    <?php
+    $party_zh=array('resourceProvider'=>'资源提供者','custodian'=>'维护者','owner'=>'拥有者','user'=>'用户','distributor'=>'数据服务联系人','originator'=>'创建者','pointOfContact'=>'联系人','principalInvestigator'=>'数据调查与处理者','processor'=>'处理者','publisher'=>'元数据发布者','author'=>'元数据作者');
+    $r='';
+    $i=0;
+    foreach($this->authors as $k=>$author) :
+    if ($author->role!=$r)
+    {
+        $r=$author->role;
+        $i=0;
+        if ($k>0) echo '</li>'; 
+        echo '<li>'.$party_zh[$author->role].'：';	 
+    } 
+        if ($i>0) echo '，';
+        $i+=1;
+        if (!empty($author->email) && $r!='principalInvestigator')
+            echo '<a href="mailto:'.$author->email.'">';
+        echo '<strong title="'.$author->organisation.'">';
+        if (!empty($author->individual))
+            echo $author->individual;
+        else
+            echo $author->organisation;
+        echo '</strong>';
+        if (!empty($author->email)) echo '</a>';
+    if ($k+1==count($this->authors)) echo '</li>';
+    endforeach;
+    ?>	
+    </ul>
+    <hr />
+    <ul class="unstyled">
+        <li>元数据更新时间：<?php print date('Y-m-d',strtotime($md->ts_created)); ?> <a href="/service/xml/uuid/<?php echo $md->uuid;?>"><img src="/images/xml.gif" alt="查看XML源文件"></a><a href="/service/doc/uuid/<?php echo $md->uuid; ?>"><img src="/images/doc-icon.png" alt="Word doc格式"></a></li>
+        <!--<li><a href="/data/detail/id/<?php echo $md->id;?>">详细元数据</a></li>-->
+        <?php if($this->version->c>0):?>
+        <li id="dataversion">版本历史：<a href="javascript:void(0);" onclick="dataVersion()" title=""><?= $this->version->c ?> 个 <img src="/images/list_extensions.gif" style="vertical-align:middle" /></a></li>
+        <?php endif;?>
+        </ul>
+    </div>
+    <hr />
+    <div class="pull-left">分享到</div>
+        <!-- JiaThis Button BEGIN -->
+        <div class="jiathis_style" style="margin-left:10px;">
+            <a class="jiathis_button_tsina"></a>
+            <a class="jiathis_button_linkedin"></a>
+            <a class="jiathis_button_googleplus"></a>
+            <a class="jiathis_button_qzone"></a>
+            <a class="jiathis_button_tqq"></a>
+            <a class="jiathis_button_renren"></a>
+            <a class="jiathis_button_douban"></a>
+            <a class="jiathis_button_tsohu"></a>
+            <a class="jiathis_button_t163"></a>
+            <a href="http://www.jiathis.com/share" class="jiathis jiathis_txt jtico jtico_jiathis" target="_blank"></a>
+            <a class="jiathis_counter_style"></a>
+        </div>
+        <!-- JiaThis Button END -->
+        </div>
+    </div>
 </div>
 
-
-<div id="right">
-<div id="ItemSummary">
-	<div id="category">
-	<ul><?php foreach($this->category as $cat): ?>
-	<li><a href="/data/category/code/<?php echo $cat->code;?>"><?php echo $this->escape($cat->name_zh);?></a></li>
-	<?php endforeach; ?>
-	</ul>
-	</div>
-<?php
-$kt='';
-$i=0;
-foreach($this->keys as $cg) :
-	if ($kt==$cg->keytype) :		
-		$i+=1;
-	else :
-		if (!empty($kt)) echo '</ul></div>';
-		$kt=$cg->keytype;
-		$i=0;
-	endif;
-	if ($i==0) echo '<div id="'.$cg->keytype.'"><ul>';
-	echo '<li><a href="/data/tag/key/'.urlencode($cg->keyword).'">'.$cg->keyword.'</a></li>';
-endforeach;
-echo '</ul></div>';
-?>
-
-<!--
-	<?php if ($this->series): ?>
-	<div id="series">
-	<ul><?php foreach($this->series as $serie): ?>
-	<li><a href="/data/series/id/<?php echo $serie->id; ?>"> <?php echo $this->escape($serie->name);?></a></li>
-	<?php endforeach; ?>
-	</ul>
-	</div>
-	<?php endif; ?>
--->
-<ul id=OtherInfo>
-<?php if ($md->fileformat) : ?>	
-<li id="fileformat">格式：<?php echo $md->fileformat; ?></li>
-<?php endif; ?>
-	<li id="filesize">大小：<?php echo $md->filesize; ?>MB</li>
-	<?php if ($this->downloaded>9) :?>
-	<li id="downtimes">下载：<?php echo $this->downloaded; ?>次</li>
-	<?php endif; ?>
-	<li id="viewtimes">浏览：<?php echo $this->viewed; ?>次</li>
-<!--
-<?php if ($md->projection) : ?>	
-	<li id="projection" title="<?= $this->projection; ?>">数据投影：
-<?php
-$p=explode(" ",$this->projection);
-$p=explode("=",$p[0]);
-if (!empty($p[1]))
-  echo $p[1];
-else
-{
- if (is_numeric($md->projection)) echo 'EPSG_CODE_';
- echo $md->projection; 
-}
-?></li>
-<?php endif; ?>
--->
-	<?php if (!empty($md->timebegin)) : ?>
-	<li id="datatimes">数据时间范围：<?php echo date('Y-m-d',strtotime($md->timebegin));if (!empty($md->timeend)) echo " 至 ".date('Y-m-d',strtotime($md->timeend)); ?></li>
-	<?php endif; ?>
-	<?php if (!empty($this->doc)) : ?>
-	<li id="datadoc"><a href="<?php $wikiTitle = $this->doc;
-        if(strpos($wikiTitle,'http://wiki.westgis.ac.cn/index.php/')!==false){
-        $title=str_replace('http://wiki.westgis.ac.cn/index.php/','',$wikiTitle);
-        echo "/data/wiki/$title";
-        }else{
-        echo $this->doc;
-        }?>">数据说明文档</a></li>
-	<?php endif; ?>
-    <?php if ($this->attachments) : ?>
-	<li id="attach"><span>相关文档：</span>
-	<?php foreach ($this->attachments as $k=>$a) : ?>
-	<a href="/service/attach/id/<?php echo $a->id; ?>" title="<?php echo $a->realname; ?>"><img src="/images/document.png"></a> 
-	<?php endforeach; ?>
-	<a href="/service/attach/zip/<?php echo $md->uuid; ?>"><img src="/images/zip_icon.gif" title="打包下载"/></a>
-	</li>
-	<?php endif; ?>
-	<li id="datatype">数据共享方式：<?php if ($md->datatype) print "离线"; else print "在线（可直接下载）";?> <a href="javascript:void(0);" id="show-list" onclick="getFileList()" title="">文件列表</a></li>
-</ul>
-<div id="linkurl">
-<?php if ($md->status>0 and $md->status<5) : ?>
-<a href="/review/review/uuid/<?php echo $md->uuid; ?>"><img src="/images/review.png" title="此数据正在评审中，我们邀请您对此数据进行评审，以便其能尽快发布！" /></a> 
-<?php else : if (!$md->datatype) : ?>
-<a href="/data/todownload/?uuid=<?= $md->uuid?>"><img src="/images/download.png" title="直接下载" /></a>
-<?php else: ?>
-<a href="/data/order/uuid/<?php echo $md->uuid; ?>"><img src="/images/order.png" title="免费！离线申请此数据（在线数据和离线数据都可申请）"/></a>
-<?php endif;endif; ?>
-</div>
-
-</div>
-<hr />
-<h2>空间位置</h2>
-<div id='watermap'></div>
-<hr />
-	<h2>联系信息</h2>
-<div id="authors">
-	<ul>
-<?php
-$party_zh=array('resourceProvider'=>'资源提供者','custodian'=>'维护者','owner'=>'拥有者','user'=>'用户','distributor'=>'数据服务联系人','originator'=>'创建者','pointOfContact'=>'联系人','principalInvestigator'=>'数据调查与处理者','processor'=>'处理者','publisher'=>'元数据发布者','author'=>'元数据作者');
-$r='';
-$i=0;
-foreach($this->authors as $k=>$author) :
-if ($author->role!=$r)
-{
-	$r=$author->role;
-	$i=0;
-	if ($k>0) echo '</li>'; 
-	echo '<li>'.$party_zh[$author->role].'：';	 
-} 
-	if ($i>0) echo '，';
-	$i+=1;
-	if (!empty($author->email) && $r!='principalInvestigator')
-		echo '<a href="mailto:'.$author->email.'">';
-	echo '<strong title="'.$author->organisation.'">';
-	if (!empty($author->individual))
-		echo $author->individual;
-	else
-		echo $author->organisation;
-	echo '</strong>';
-	if (!empty($author->email)) echo '</a>';
-if ($k+1==count($this->authors)) echo '</li>';
-endforeach;
-?>	
-</ul>
-<hr />
-<ul>
-	<li>元数据更新时间：<?php print date('Y-m-d',strtotime($md->ts_created)); ?> <a href="/service/xml/uuid/<?php echo $md->uuid;?>"><img src="/images/xml.gif" alt="查看XML源文件"></a><a href="/service/doc/uuid/<?php echo $md->uuid; ?>"><img src="/images/doc-icon.png" alt="Word doc格式"></a></li>
-	<!--<li><a href="/data/detail/id/<?php echo $md->id;?>">详细元数据</a></li>-->
-    <?php if($this->version->c>0):?>
-    <li id="dataversion">版本历史：<a href="javascript:void(0);" onclick="dataVersion()" title=""><?= $this->version->c ?> 个 <img src="/images/list_extensions.gif" style="vertical-align:middle" /></a></li>
-    <?php endif;?>
-	</ul>
-</div>
-	<!-- JiaThis Button BEGIN -->
-    <div class="jiathis_style" style="padding-left:12px;">
-        <a class="jiathis_button_tsina"></a>
-        <a class="jiathis_button_linkedin"></a>
-        <a class="jiathis_button_googleplus"></a>
-        <a class="jiathis_button_qzone"></a>
-        <a class="jiathis_button_tqq"></a>
-        <a class="jiathis_button_renren"></a>
-        <a class="jiathis_button_douban"></a>
-        <a class="jiathis_button_tsohu"></a>
-        <a class="jiathis_button_t163"></a>
-        <a href="http://www.jiathis.com/share" class="jiathis jiathis_txt jtico jtico_jiathis" target="_blank"></a>
-        <a class="jiathis_counter_style"></a>
-    </div>
-	<!-- JiaThis Button END -->
-</div>
-<div id="left">
-
-<hr />
-
-
-</div>
-</div>
-<div>
-</div>
 <div id="window-outter" style="display:none;">
     <div id="window-inner">
         <div id="window-content-container">

application/models/Theme.php

@@ -78,6 +78,12 @@ class Theme
 				)
 			),
 			
+			'jplayer' => array(
+				$this->ScriptKey => array(
+					'/js/lib/jplayer/jquery.jplayer.min.js'
+				)
+			),
+			
 			//loadinglayer
 			'slides' => array(
 				$this->ScriptKey => array(