From b1eccdd196128a8974ec6b8ff0321b8a3c0b4d64 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Fri, 24 May 2013 01:40:14 +0000
Subject: [PATCH] =?UTF-8?q?#494,=20=E5=AE=9E=E7=8E=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E8=80=83=E6=96=87=E7=8C=AE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controllers/DataController.php      |  2 +-
 .../views/scripts/data/referenceadd.phtml     |  5 +-
 .../views/scripts/data/referenceadd.phtml~    | 75 ++++++++++++-------
 application/models/ReferenceForm.php          |  2 +-
 4 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index ea300a16..ff4e9645 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -949,7 +949,7 @@ class Admin_DataController extends Zend_Controller_Action
 		} //添加 
 		
 		else if($show){
-			$sql = "select mr.id as mdid,mr.refid,r.reference,md.title,md.uuid FROM mdref mr
+			$sql = "select mr.id as mdid,mr.refid,r.reference,md.title,md.uuid,mr.place FROM mdref mr
 					left join metadata md on md.uuid=mr.uuid
 					left join reference r on r.id=mr.refid
 					where mr.uuid='$show';
diff --git a/application/admin/views/scripts/data/referenceadd.phtml b/application/admin/views/scripts/data/referenceadd.phtml
index 163ad3ca..084be6f3 100644
--- a/application/admin/views/scripts/data/referenceadd.phtml
+++ b/application/admin/views/scripts/data/referenceadd.phtml
@@ -39,7 +39,10 @@ if($this->type == 'dc')
 <input type="text" name="link" id="link" value=""></dd>
 <dt id="reftype-label"><label class="required">文献类型</label></dt>
 <dd id="reftype-element">
-<label for="reftype-0"><input type="radio" name="reftype" id="reftype-0" value="0" checked="checked">作者文献</label><br /><label for="reftype-1"><input type="radio" name="reftype" id="reftype-1" value="1">用户文献</label></dd>
+<label for="reftype-0"><input type="radio" name="reftype" id="reftype-0" value="0" checked="checked">作者文献</label>
+<label for="reftype-1"><input type="radio" name="reftype" id="reftype-1" value="1">用户文献</label>
+<label for="reftype-2"><input type="radio" name="reftype" id="reftype-2" value="2">数据的参考文献</label>
+</dd>
 <dt id="submit-label">&#160;</dt><dd id="submit-element">
 <input type="submit" name="submit" id="submitbutton" value="发送"></dd></dl></form>
 <?php }
diff --git a/application/admin/views/scripts/data/referenceadd.phtml~ b/application/admin/views/scripts/data/referenceadd.phtml~
index bffea142..aa297424 100644
--- a/application/admin/views/scripts/data/referenceadd.phtml~
+++ b/application/admin/views/scripts/data/referenceadd.phtml~
@@ -1,27 +1,50 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin">后台首页</a>');
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('特色推荐管理</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div id="leftPanel">
-<?= $this->partial('data/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-<a href="/admin/data/reference/add/1">添加新的数据文献</a>
-<?= $this->form; ?>
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->headLink()->appendStylesheet('/css/admin.css');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
+	$this->breadcrumb('数据文献管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div id="leftPanel">
+<?= $this->partial('data/left.phtml'); ?>
+</div>
+<div id="rightPanel">
+<?php if ($this->msg or $this->messages) :?>
+<div id="message">
+<?php if ($this->msg) : ?>
+	<p><?php echo $this->msg; ?></p>
+<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+	<p><?php echo $msg; ?></p>
+<?php endforeach;endif; ?>
+</div>
+<?php endif; ?>
+<a href="/admin/data/reference/add/1">添加新的数据文献</a>
+ | <a href="/admin/data/reference/add/1/type/dc">添加数据中心文献</a>
+ | <a href="/admin/data/reference/import/1">导入数据文献文件</a>
+ | <a href="/admin/data/reference/show/e31f5ea7-a4af-4ae3-9ac1-1a84132c4338">查看数据中心文献</a>
+<?php
+if($this->type == 'dc')
+{?>
+<form id="Reference" enctype="application/x-www-form-urlencoded" action="/admin/data/reference/add/1/" method="post"><dl class="zend_form">
+<input type="hidden" name="uuid" id="uuid" value="e31f5ea7-a4af-4ae3-9ac1-1a84132c4338" readonly="readonly">
+<dt id="reference-label"><label for="reference" class="required">文献</label></dt>
+<dd id="reference-element">
+<input type="text" name="reference" id="reference" value=""></dd>
+<dt id="link-label"><label for="link" class="optional">URL(optional)</label></dt>
+<dd id="link-element">
+<input type="text" name="link" id="link" value=""></dd>
+<dt id="reftype-label"><label class="required">文献类型</label></dt>
+<dd id="reftype-element">
+<label for="reftype-0"><input type="radio" name="reftype" id="reftype-0" value="0" checked="checked">作者文献</label><br />
+<label for="reftype-1"><input type="radio" name="reftype" id="reftype-1" value="1">用户文献</label>
+<label for="reftype-2"><input type="radio" name="reftype" id="reftype-2" value="2">数据的参考文献</label>
+</dd>
+<dt id="submit-label">&#160;</dt><dd id="submit-element">
+<input type="submit" name="submit" id="submitbutton" value="发送"></dd></dl></form>
+<?php }
+else ?><?= $this->form; ?>
 </div>
\ No newline at end of file
diff --git a/application/models/ReferenceForm.php b/application/models/ReferenceForm.php
index efa66ce9..cb776311 100644
--- a/application/models/ReferenceForm.php
+++ b/application/models/ReferenceForm.php
@@ -22,7 +22,7 @@ class ReferenceForm extends Zend_Form
         $link->setLabel('URL(optional)')
         			->addFilter('StringTrim');
         $reftype=new Zend_Form_Element_Radio('reftype');
-        $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献'))->setValue(0);
+        $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献','2'=>'数据的参考文献'))->setValue(0);
 		  
         $submit = new Zend_Form_Element_Submit('submit');
         $submit->setAttrib('id', 'submitbutton')->setLabel('发送');