From 91c5223eefb857402d3c2826224ed766816c03c0 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Mon, 27 May 2013 02:35:41 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=83=BD=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E4=BF=AE=E6=94=B9doi=E4=B8=AD?=
 =?UTF-8?q?=E4=BD=9C=E8=80=85=E4=BF=A1=E6=81=AF=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/AuthorController.php  |  9 +--
 .../views/scripts/author/doi-add.phtml        | 79 +++++++++++++++----
 2 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php
index 0b9d6f0e..bdaf05b6 100644
--- a/application/default/controllers/AuthorController.php
+++ b/application/default/controllers/AuthorController.php
@@ -1,6 +1,5 @@
 <?php
 /* 
-
 	@version    $Id: AuthorController.php 2012-2-29 15:01 Z
 	@package	author
 	@copyright  Copyright (c) 2012, CAREERI.
@@ -2484,8 +2483,8 @@ class AuthorController extends Zend_Controller_Action
 			
 			//ftp路径
 			$homedir = "/disk1/WestDC/upload/".$uuid."/";
-			//ftp用户表
-			$ftptable=' pureftp ';//ftp2.westgis.ac.cn
+			//ftp用户表
+			$ftptable=' pureftp ';//ftp2.westgis.ac.cn
 			$uid = 1002;
 			$gid = 1002;
 			
@@ -3820,7 +3819,7 @@ class AuthorController extends Zend_Controller_Action
 			$uuid = $this->_getParam('uuid');
 			if(empty($uuid))
 			{
-				$rows = $fund->fetch(0,true,$uid);
+				$rows = $fund->fetch("",true);
 				view::addPaginator($rows,$this->view,$this->_request);
 			}else{
 				include('data/Metadata.php');
@@ -3846,7 +3845,7 @@ class AuthorController extends Zend_Controller_Action
 			$this->view->q = $q = $this->_getParam('q');
 			$id = $this->_getParam('id');
 			$this->view->fund = $fund->view($id);
-			$rows = $fund->fetchFormData($id,$uid,$q);
+			$rows = $fund->fetchFormData($id,$q);
 			view::addPaginator($rows,$this->view,$this->_request);
 			return true;
 		}
diff --git a/application/default/views/scripts/author/doi-add.phtml b/application/default/views/scripts/author/doi-add.phtml
index 0c5488d7..1e5a7db3 100644
--- a/application/default/views/scripts/author/doi-add.phtml
+++ b/application/default/views/scripts/author/doi-add.phtml
@@ -74,13 +74,28 @@ $this->headLink()->appendStylesheet('/css/author.css');
               </div>
               <?php if(empty($this->data['info']) || !is_array($this->data['info'])) {?>
               <div class="control-group infocontrol" id="info1">
-                <label class="control-label" for="">info</label>
+                <label class="control-label" for="">数据作者信息</label>
                 <div class="controls">
-					<input type="text" name="info[1][author]" value="" placeholder="作者" />
-                    <input type="text" name="info[1][organization]" value="" placeholder="单位" />
-                    <input type="text" name="info[1][author_en]" value="" placeholder="作者英文" />
-                    <input type="text" name="info[1][organization_en]" value="" placeholder="单位英文" />
-                    <input type="text" name="info[1][order]" value="" placeholder="排序" />
+                	<div class="input-prepend">
+                    	<span class="add-on">作者</span>
+                    	<input type="text" name="info[1][author]" value="" placeholder="作者" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">单位</span>
+                    	<input type="text" name="info[1][organization]" value="" placeholder="单位" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">作者英文</span>
+                    	<input type="text" name="info[1][author_en]" value="" placeholder="作者英文" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">单位英文</span>
+                    	<input type="text" name="info[1][organization_en]" value="" placeholder="单位英文" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">排序</span>
+                    	<input type="text" name="info[1][order]" value="" placeholder="排序" />
+                    </div>
                 </div>
               </div>
               <?php }else{ ?>
@@ -90,13 +105,28 @@ $this->headLink()->appendStylesheet('/css/author.css');
 			  $index ++;
 			  ?>
               <div class="control-group infocontrol">
-                <label class="control-label">info</label>
+                <label class="control-label">数据作者信息</label>
                 <div class="controls">
-					<input type="text" name="info[<?= $k ?>][author]" value="<?= $v['author'] ?>" placeholder="作者" />
-                    <input type="text" name="info[<?= $k ?>][organization]" value="<?= $v['organization'] ?>" placeholder="单位" />
-                    <input type="text" name="info[<?= $k ?>][author_en]" value="<?= $v['author_en'] ?>" placeholder="作者英文" />
-                    <input type="text" name="info[<?= $k ?>][organization_en]" value="<?= $v['organization_en'] ?>" placeholder="单位英文" />
-                    <input type="text" name="info[<?= $k ?>][order]" value="<?= $v['order'] ?>" placeholder="排序" />
+                	<div class="input-prepend">
+                    	<span class="add-on">作者</span>
+                    	<input type="text" name="info[<?= $k ?>][author]" value="<?= $v['author'] ?>" placeholder="作者" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">单位</span>
+                    	<input type="text" name="info[<?= $k ?>][organization]" value="<?= $v['organization'] ?>" placeholder="单位" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">作者英文</span>
+                    	<input type="text" name="info[<?= $k ?>][author_en]" value="<?= $v['author_en'] ?>" placeholder="作者英文" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">单位英文</span>
+                    	<input type="text" name="info[<?= $k ?>][organization_en]" value="<?= $v['organization_en'] ?>" placeholder="单位英文" />
+                    </div>
+                    <div class="input-prepend">
+                    	<span class="add-on">排序</span>
+                    	<input type="text" name="info[<?= $k ?>][order]" value="<?= $v['order'] ?>" placeholder="排序" class="span3" />
+                    </div>
                     <?php if($index>1){ ?>
                     <a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>
 					<?php }?>
@@ -131,11 +161,26 @@ function addinput(){
 	var now_index = $('.infocontrol').length;
 	var index = now_index + 1;
 	html = '<div class="control-group infocontrol"><div class="controls">'
-			 +	'<input type="text" name="info[' + index + '][author]" placeholder="作者" /> '
-			 +	'<input type="text" name="info[' + index + '][organization]" placeholder="单位" /> '
-			 +	'<input type="text" name="info[' + index + '][author_en]" placeholder="作者英文" /> '
-			 +	'<input type="text" name="info[' + index + '][organization_en]" placeholder="单位英文" /> '
-			 +  '<input type="text" name="info[' + index + '][order]" placeholder="排序" /> '
+			+	'<div class="input-prepend">'
+			+	'	<span class="add-on">作者</span>'
+			+   '	<input type="text" name="info[' + index + '][author]" value="" placeholder="作者" />'
+			+	'</div>'
+			+	'<div class="input-prepend">'
+			+	'	<span class="add-on">单位</span>'
+			+	'	<input type="text" name="info[' + index + '][organization]" value="" placeholder="单位" />'
+			+	'</div>'
+			+	'<div class="input-prepend">'
+			+	'	<span class="add-on">作者英文</span>'
+			+	'	<input type="text" name="info[' + index + '][author_en]" value="" placeholder="作者英文" />'
+			+	'</div>'
+			+	'<div class="input-prepend">'
+			+	'	<span class="add-on">单位英文</span>'
+			+	'	<input type="text" name="info[' + index + '][organization_en]" value="" placeholder="单位英文" />'
+			+	'</div>'
+			+	'<div class="input-prepend">'
+			+	'	<span class="add-on">排序</span>'
+			+	'	<input type="text" name="info[' + index + '][order]" value="" placeholder="排序" />'
+			+	'</div>'
 			 +  '<a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>'
 			 + '</div></div>';
 	now_index = null;