From 643ccaad7aad222203728bfa3c4c034eb510dc26 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Wed, 28 Aug 2013 02:49:07 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8data/view=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86dataservice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/data/view.phtml  | 11 ++++++++---
 application/default/views/scripts/heihe/view.phtml |  4 ++--
 application/default/views/scripts/water/view.phtml | 13 +++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml
index 755772e4..b193aa7d 100755
--- a/application/default/views/scripts/data/view.phtml
+++ b/application/default/views/scripts/data/view.phtml
@@ -9,6 +9,9 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->theme->AppendPlus($this,'google_map_v3');
 	$this->theme->AppendPlus($this,'colorbox');
+	if(!empty($this->dataService)) {
+    	$this->theme->AppendModel($this,"dataservice");
+	}
 ?>
 <style>
 h3.gs_rt{font-size:110%;}
@@ -336,12 +339,14 @@ endforeach;
     	在线下载
     </a>
     <?php else: ?>
-    	<?php if(!empty($this->dataService)) { ?>
-        <a href="javascript:void(0);" class="btn btn-primary btn-large btn-block" title="此数据需要选择要下载的子集" onclick="westdc.dataservice.choiceData('<?= $md->uuid ?>');">
+    	<?php
+		 if(!empty($this->dataService)) { ?>
+         <?php  $this->theme->AppendPlus($this,'datepicker'); ?>
+        <a href="javascript:void(0);" class="btn btn-primary btn-large btn-block" title="此数据需要选择要下载的子集" onclick="westdc.dataservice.choiceData('<?= $md->uuid ?>',this);">
         <?php }else{ ?>
         <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
         <?php } ?>
-    		放入数据篮
+    	放入数据篮
     	</a>
     <?php endif;endif; ?>
     <a href="javascript:void(0);" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml
index 5974cf06..07d8a47c 100755
--- a/application/default/views/scripts/heihe/view.phtml
+++ b/application/default/views/scripts/heihe/view.phtml
@@ -12,7 +12,7 @@
 	$this->theme->AppendPlus($this,'google_map_v3');
 	$this->theme->AppendPlus($this,'colorbox');
 	if(!empty($this->dataService)) {
-    $this->theme->AppendModel($this,"dataservice");
+    	$this->theme->AppendModel($this,"dataservice");
 	}
 ?>
 <?= $this->render('breadcrumbs.phtml') ?>
@@ -371,7 +371,7 @@ endforeach;
         <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
         <?php } ?>
     	放入数据篮
-    </a>
+    	</a>
     <?php endif;endif; ?>
     <a href="javascript:void(0);" onclick="method.like('<?php echo $md->uuid; ?>',this)" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
     	收藏此数据
diff --git a/application/default/views/scripts/water/view.phtml b/application/default/views/scripts/water/view.phtml
index 237235ba..b05aaf16 100755
--- a/application/default/views/scripts/water/view.phtml
+++ b/application/default/views/scripts/water/view.phtml
@@ -11,6 +11,9 @@
 	$this->theme->AppendPlus($this,'google_map_v3');
 	$this->theme->AppendPlus($this,'colorbox');
 	$this->nav[] = array('link'=>"/water",'title'=>'黑河综合遥感联合试验');
+	if(!empty($this->dataService)) {
+    	$this->theme->AppendModel($this,"dataservice");
+	}
 ?>
 <style>
 h3.gs_rt{font-size:110%;}
@@ -336,9 +339,15 @@ endforeach;
     	在线下载
     </a>
     <?php else: ?>
-    <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
+    	<?php
+		 if(!empty($this->dataService)) { ?>
+         <?php  $this->theme->AppendPlus($this,'datepicker'); ?>
+        <a href="javascript:void(0);" class="btn btn-primary btn-large btn-block" title="此数据需要选择要下载的子集" onclick="westdc.dataservice.choiceData('<?= $md->uuid ?>',this);">
+        <?php }else{ ?>
+        <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
+        <?php } ?>
     	放入数据篮
-    </a>
+    	</a>
     <?php endif;endif; ?>
     </div>