From 6a00477b53c0da82f811b01e750b6e9b3004b59c Mon Sep 17 00:00:00 2001
From: Cui Xin <killturing@vip.qq.com>
Date: Thu, 28 Aug 2014 02:29:39 +0000
Subject: [PATCH] =?UTF-8?q?#626=20=E5=90=8E=E5=8F=B0=EF=BC=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8D=E7=89=88=E6=9C=AC=EF=BC=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E5=8F=91=E5=B8=83=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/views/scripts/data/version.phtml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/admin/views/scripts/data/version.phtml b/application/admin/views/scripts/data/version.phtml
index efddbb91..153e694f 100644
--- a/application/admin/views/scripts/data/version.phtml
+++ b/application/admin/views/scripts/data/version.phtml
@@ -4,9 +4,9 @@
 	$this->headTitle()->setSeparator(' - ');
 	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
 	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
 	$this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/css/colorbox.css');
+	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
 	$this->breadcrumb('数据版本管理');
@@ -26,7 +26,6 @@
 				<li class=""><a href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
 			</ul>
 		</div>
-		<div id="datalistZ">
 			<?php
 			if (count($this->paginator)): 
 			if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
@@ -53,7 +52,7 @@
 						<a class="label label-primary" class="label label-danger" onclick="return confirm('是否确定将这个版本恢复到geonetwork？');" href="javascript:action('restore','<?php echo $item['id'];?>');" class="more">恢复到geonetwork</a>
 						<a class="label label-primary" href="/admin/data/version/ac/diff/id/<?php echo $item['id'];?>" class="more">与前一版对比</a>
 						<a class="label label-primary" href="/admin/data/version/ac/diff1/id/<?php echo $item['id'];?>" class="more">与前一发布或提交版对比</a>
-						<a class="label label-primary" onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline">提交评审发布</a>
+						<a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline label label-primary">提交评审发布</a>
 					</h5>
 					<?php if ($item['changelog']) : ?>                
 					<p><?php echo $item['changelog']; ?></p>
@@ -63,7 +62,6 @@
 			echo "</ul>";
 			endif; ?>
 			<div class="pagenavi"><?= $this->paginator; ?></div>
-		</div>
 	</div>
 </div>
 <!-- //页面内容 -->
@@ -94,7 +92,7 @@ function action(ac,id){
 	   }
   });
 }
-$(".inline").colorbox({inline:true, width:"50%"});
+$(".inline").colorbox({inline:true, width:"50%", height:"50%"});
 function commit(id){
 	action('commit&changelog='+$('#changelog').val(),id);
 }
@@ -104,10 +102,10 @@ function commit(id){
     <form>
         <p>
         <label>版本改动:</label><br />
-        <textarea class="full" style="resize:none;height:200px;" id="changelog"></textarea>
+        <textarea rows="12" class="full" style="width:100%;" id="changelog"></textarea>
         <br /><small>请输入此版本与之前版本的差别</small>
         </p>
-        <input type="button" onclick="" id="commit_submit" class="btn btn-green big" value="提交"/>
+        <input type="button" onclick="" id="commit_submit" class="btn btn-success pull-right" value="提交"/>
     </form>
 	</div>
 	<div class="error"><img src="/images/alert_big_error.png" /><span></span></div>