From 7d9c47def3c645bbcd95607b6a5c0c2ce448720e Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Thu, 27 Dec 2012 09:14:41 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E6=96=87=E7=8C=AE=E5=92=8C=E8=81=94=E7=B3=BB=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E7=9A=84=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/scripts/author/metadata-new.phtml   | 43 +++++++++++++++----
 .../views/scripts/author/metadata.phtml       |  2 -
 application/models/MetaData.php               |  2 +-
 application/models/Theme.php                  |  7 +++
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/application/default/views/scripts/author/metadata-new.phtml b/application/default/views/scripts/author/metadata-new.phtml
index 54294083..1c66fbe6 100644
--- a/application/default/views/scripts/author/metadata-new.phtml
+++ b/application/default/views/scripts/author/metadata-new.phtml
@@ -154,23 +154,35 @@ $this->breadcrumb()->setSeparator(' > ');
             
             <fieldset>
                 <p class="f_legend">参考文献</p>
-                <div class="control-group control-group-reference" id="reference_1st">
-                    <div class="controls">
+                
                     	<?php $F['reference'] = $this->Field['reference']['FieldName_temp']; ?>
                         <?php if(isset($this->data->$F['reference']) && count($this->data->$F['reference'])>0)
 						{
+							$index = 0;
 							foreach($this->data->$F['reference'] as $k=>$v)
-							{?>
+							{
+							$index ++ ;
+							?>
+                            <div class="control-group control-group-reference" id="reference_1st">
+                    			<div class="controls">
 								<input type="text" name="<?= $F['reference'] ?>[]" class="span8"
                          		value="<?= $v ?>" />
+                                <?php if($index > 1) {?>
+                                <a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>
+                                <?php } ?>
+                            	</div>
+                			</div>
 							<?php }
 						}else{?>
-							<input type="text" name="<?= $F['reference'] ?>[]" class="span8"
+                        	<div class="control-group control-group-reference" id="reference_1st">
+                    			<div class="controls">
+								<input type="text" name="<?= $F['reference'] ?>[]" class="span8"
                          		value="" />
+                           		</div>
+                			</div>
 						<?php }
 						?>
-                    </div>
-                </div>
+                    
                 <div class="control-group">
                     <a href="javascript:void(0);" onclick="AddInput('reference')">+ 再添加一条</a>
                 </div>
@@ -179,7 +191,7 @@ $this->breadcrumb()->setSeparator(' > ');
             <fieldset>
                 <p class="f_legend">联系人</p>
                 <?php $F['contact'] = $this->Field['contact']['FieldName_temp']; ?>
-                <?php if(isset($this->data->$F['reference']) && count($this->data->$F['reference'])>0)
+                <?php if(isset($this->data->$F['contact']) && count($this->data->$F['contact'])>0)
 				{
 					$index = 0;
 				foreach($this->data->$F['contact'] as $k=>$v)
@@ -188,6 +200,7 @@ $this->breadcrumb()->setSeparator(' > ');
                 <div class="control-group control-group-contact" id="contact_1st">
                     <div class="controls">
 					<input type="text" name="<?= $F['contact'] ?>[<?= $index ?>][name]" class="span3 contact_name" value="<?= $v->name ?>" />
+                    <input type="text" name="<?= $F['contact'] ?>[<?= $index ?>][unit]" class="span3 contact_unit" value="<?= $v->unit ?>" />
                     <input type="text" name="<?= $F['contact'] ?>[<?= $index ?>][email]" class="span3 contact_email" value="<?= $v->email ?>" />
                     <select type="text" name="<?= $F['contact'] ?>[<?= $index ?>][type]" class="span3">
                         <option value="0">请选择联系人职能</option>
@@ -203,6 +216,9 @@ $this->breadcrumb()->setSeparator(' > ');
                         }
                         ?>
                     </select>
+                    <?php if($index > 1) {?>
+					<a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>
+					<?php } ?>
                 	</div>
 				</div>
 				<?php }
@@ -210,6 +226,7 @@ $this->breadcrumb()->setSeparator(' > ');
 				<div class="control-group control-group-contact" id="contact_1st">
                     <div class="controls">
                     	<input type="text" name="<?= $F['contact'] ?>[1][name]" class="span3 contact_name"  />
+                        <input type="text" name="<?= $F['contact'] ?>[1][unit]" class="span3 contact_unit" />
                         <input type="text" name="<?= $F['contact'] ?>[1][email]" class="span3 contact_email" />
                         <select type="text" name="<?= $F['contact'] ?>[1][type]" class="span3">
                             <option value="0">请选择联系人职能</option>
@@ -384,7 +401,7 @@ function AutoCompleteInit(data,input)
 	var html = AutoCompleteElement(data);
 	$(input).parent('div').append(html);
 	var f_left = $(input).position().left;
-	console.log($(input).position().top);
+	
 	if($(input).position().top < $('body').height())
 	{
 		var f_top = $(input).position().top + $(input).height() + 5;
@@ -442,6 +459,7 @@ function SelectInputTemplate(name){
 		html = ' <div class="control-group control-group-reference">'
                +'     <div class="controls">'
                +'         <input type="text" name="<?= $this->Field['reference']['FieldName_temp']?>[]" class="span8" />'
+			   +' 			<a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>'
                +'     </div>'
                +' </div>';
 		return html;
@@ -454,6 +472,7 @@ function SelectInputTemplate(name){
 		html = '<div class="control-group control-group-contact">'
                +     '<div class="controls">'
                +         '<input type="text" name="contact[' + index + '][name]" class="span3 contact_name" /> '
+			   +		 '<input type="text" name="contact[' + index + '][unit]" class="span3 contact_unit" /> '
                +         '<input type="text" name="contact[' + index + '][email]" class="span3 contact_email" /> '
                +         '<select type="text" name="contact[' + index + '][type]" class="span3">'
 			   +         '<option value="0">请选择联系人职能</option>'
@@ -464,6 +483,7 @@ function SelectInputTemplate(name){
 							}
 							?>
                +         '</select>'
+			   +		 '<a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>'
                +     '</div>'
                + '</div>';
 		now_index = null;
@@ -473,9 +493,14 @@ function SelectInputTemplate(name){
 	}
 }
 
+function RmInput(e){
+	$e = $(e);
+	$e.parent('div').parent('div').remove();
+}
+
 function InputTextSet(){
-	console.log($('.contact_name').length);
 	$('.contact_name').inputbg({'val':'姓名'});
+	$('.contact_unit').inputbg({'val':'单位'});
 	$('.contact_email').inputbg({'val':'Email'});
 	$('.contact_name').each(function(index, element) {
         $(this).bind('change',function(){
diff --git a/application/default/views/scripts/author/metadata.phtml b/application/default/views/scripts/author/metadata.phtml
index 3b3d03b7..5d2eb203 100644
--- a/application/default/views/scripts/author/metadata.phtml
+++ b/application/default/views/scripts/author/metadata.phtml
@@ -4,8 +4,6 @@ $this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
 $this->theme->AppendPlus($this,'jquery');
 $this->theme->AppendPlus($this,'jquery_ui');
-$this->theme->AppendPlus($this,'google_map_v3');
-$this->theme->AppendPlus($this,'google_map_keydragzone');
 $this->theme->AppendPlus($this,'colorbox');
 $this->headLink()->appendStylesheet('/css/author.css');
 $this->headLink()->appendStylesheet('/css/author-metadata.css');
diff --git a/application/models/MetaData.php b/application/models/MetaData.php
index c55edaa0..5885ba6a 100755
--- a/application/models/MetaData.php
+++ b/application/models/MetaData.php
@@ -46,7 +46,7 @@ class Metadata
 				'FieldName_temp' => 'title_en',
 				'Type' => 'varchar',
 				'MaxLength' => 200,
-				'Required' => true
+				'Required' => false
 			),
 			
 			//摘要
diff --git a/application/models/Theme.php b/application/models/Theme.php
index 07d2b144..bc581e99 100644
--- a/application/models/Theme.php
+++ b/application/models/Theme.php
@@ -67,6 +67,13 @@ class Theme
 				)
 			),
 			
+			//loadinglayer
+			'slides' => array(
+				$this->ScriptKey => array(
+					'/js/lib/slides.min.jquery.js'
+				)
+			),
+			
 
 			/*********谷歌地图*********/