From 0628745e697b74de880ccad0d01f52d69923cfbb Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Fri, 18 May 2012 13:14:52 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=9B=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/AuthorController.php  |  4 ++--
 .../scripts/author/literature-viewdata.phtml  | 19 ++++++-------------
 application/models/files.php                  |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php
index d40f67b0..c834271b 100644
--- a/application/default/controllers/AuthorController.php
+++ b/application/default/controllers/AuthorController.php
@@ -2543,7 +2543,7 @@ class AuthorController extends Zend_Controller_Action
 				try{
 					
 					$files=new files();
-					$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],'liteature');
+					$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],'literature');
 					
 					if(empty($msg['error']))
 					{
@@ -2729,7 +2729,7 @@ class AuthorController extends Zend_Controller_Action
 				try{
 					
 					$files=new files();
-					$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],'md');
+					$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],'document');
 					
 					if(empty($msg['error']))
 					{
diff --git a/application/default/views/scripts/author/literature-viewdata.phtml b/application/default/views/scripts/author/literature-viewdata.phtml
index c509f689..f189d0c7 100644
--- a/application/default/views/scripts/author/literature-viewdata.phtml
+++ b/application/default/views/scripts/author/literature-viewdata.phtml
@@ -5,7 +5,10 @@ $this->headTitle()->setSeparator(' - ');
 $this->headScript()->appendFile('/js/jquery-1.7.min.js');
 $this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/author.css');
-$this->headLink()->appendStylesheet('/css/colorbox.css');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
+$this->headScript()->appendFile('/static/js/uploadify/swfobject.js');
+$this->headScript()->appendFile('/static/js/uploadify/jquery.uploadify.v2.1.4.min.js');
+$this->headLink()->appendStylesheet('/static/js/uploadify/uploadify.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/author">数据作者</a>');
 $this->breadcrumb('数据文献管理');
@@ -42,7 +45,7 @@ $this->breadcrumb()->setSeparator(' > ');
                <p><?php echo $item['reference'];?> 
                【 <a href="/author/literature/id/<?php echo $item['id'];?>">查看详细</a> 
                | <a onclick="return confirm('是否确定删除该版本？');" href="javascript:action('delete&id=<?php echo $item['id'];?>','<?php echo $item['uuid'];?>');" class="more">删除</a> 
-               | <a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['uuid'];?>\');');" href="#addform" class="more inline">添加文献</a>
+               | <a href="/author/literature/ac/add/uuid/<?php echo $item['uuid'];?>" class="more iframe">添加文献</a>
                】</p>
             </li>
 		<?php endforeach; 
@@ -79,23 +82,13 @@ function action(ac,uuid){
 	   }
   });
 }
+$(".iframe").colorbox({iframe:true, width:"60%", height:"80%"}); 
 $(".inline").colorbox({inline:true, width:"50%"});
 function commit(id){
 	action('add&ref='+$('#ref').val()+'&reftype='+$('#reftype').val(),id);
 }
 </script>
 <div class="colorbox" style="display:none;">
-	<div id="addform">
-    <form>
-        <p>
-        <label>文献引用信息:</label><br />
-        <textarea class="full" style="height:40px;" id="ref"></textarea>
-        <input type="radio" id="reftype" name="reftype" value="0" checked />数据作者的文献
-        <input type="radio" id="reftype" name="reftype" value="1" />数据用户的文献
-        </p>
-        <input type="button" onclick="" id="commit_submit" class="btn btn-green big" value="提交"/>
-    </form>
-	</div>
 	<div class="error"><img src="/images/alert_big_error.png" /><span></span></div>
     <div class="ok"><img src="/images/alert_big_ok.png" /><span></span></div>
     <div class="warning"><img src="/images/alert_big_warning.png" /><span></span></div>
diff --git a/application/models/files.php b/application/models/files.php
index e5986cc8..6922ba60 100644
--- a/application/models/files.php
+++ b/application/models/files.php
@@ -28,7 +28,7 @@ class files{
 			'file' => array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2'),
 			'reviewatt'=>array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2','gif', 'jpg', 'jpeg', 'png', 'bmp','pdf','odt'),
 			'md'=>array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2','gif', 'jpg', 'jpeg', 'png', 'bmp','pdf','odt'),
-			'liteature'=>array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2','gif', 'jpg', 'jpeg', 'png', 'bmp','pdf','odt'),
+			'literature'=>array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2','gif', 'jpg', 'jpeg', 'png', 'bmp','pdf','odt'),
 			'document'=>array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2','gif', 'jpg', 'jpeg', 'png', 'bmp','pdf','odt'),
 		);
 		//最大文件大小