diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php
index 2f98b510..5f298323 100644
--- a/application/default/controllers/AuthorController.php
+++ b/application/default/controllers/AuthorController.php
@@ -3496,13 +3496,82 @@ class AuthorController extends Zend_Controller_Action
 		}
 
 		$ac = $this->_getParam('ac');
-	   
-		if(empty($ac) || $ac=="index")
+		
+		if(empty($ac))
 		{
+			
 			include_once("MetaData.php");
 			$md = new Metadata($this->db);
 			$this->view->Field = $md->MetadataFields;
+			
+			$MDList = $md->getRecord($uid);
+			
+			if(!empty($MDList))
+			{
+				foreach($MDList as $k=>$v)
+				{
+					$MDList[$k]['content'] = json_decode($v['content']);
+				}
+				$this->view->MDList = $MDList;
+			}
+		}	
+	   
+		if($ac=="new")
+		{
+			$this->_helper->viewRenderer('metadata-new');
+			
+			include_once("MetaData.php");
+			$md = new Metadata($this->db);
+			$this->view->Field = $md->MetadataFields;
+			
+			$uuid = $this->_getParam('uuid');
+			
+			if(!empty($uuid) && !preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid))
+			{
+				$this->view->error = "参数错误";
+				return true;
+			}
+			
+			else{
+				$this->view->uuid = $uuid;
+				$datas = $md->getRecord($uid,$uuid);
+				$data = json_decode($datas['content']);
+				$this->view->data = $data;
+				return true;
+			}
+
 		}//创建元数据页面
+		
+		if($ac == "del")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$uuid = $this->_getParam('uuid');
+			
+			if(!preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid))
+			{
+				$this->jsonexit(array('error'=>"参数错误"));
+				return true;
+			}
+			
+			$sql = "DELETE FROM metadata_temp WHERE userid=? AND uuid=?";
+			
+			$sth = $this->db->prepare($sql);
+			$rs = $sth->execute(array($uid,$uuid));
+			
+			if($rs>0)
+			{
+				$this->jsonexit(array('msg'=>"删除成功",'deleted'=>1));
+				return true;
+			}else{
+				$this->jsonexit(array('error'=>"删除失败，请刷新页面后查看"));
+				return true;
+			}
+			
+			return true;
+			
+		}//删除
 	   
 		if($ac == "save")
 		{
@@ -3513,13 +3582,77 @@ class AuthorController extends Zend_Controller_Action
 			$md = new Metadata($this->db);
 			
 			$uuid = $this->_getParam('uuid');
+			$commit = $this->_getParam('commit');
 		   
 			$data = array();
 		   
 			foreach($md->MetadataFields as $k=>$v)
 			{
 				$data[$v['FieldName_temp']] = $this->_getParam($v['FieldName']);
-			}
+				
+				if(!empty($commit))
+				{
+					if(isset($v['Required']) && $v['Required'] == true)
+					{
+						if($v['Type'] == 'varchar')
+						{
+							if(empty($data[$v['FieldName_temp']]))
+							{
+								$this->jsonexit(array("error"=>$v['Title']." 必须填写"));
+								return true;
+							}
+						} // 文本数据
+						
+						if($v['Type'] == 'array')
+						{
+							if(!is_array($data[$v['FieldName_temp']]) || count($data[$v['FieldName_temp']]) < 1 )
+							{
+								$this->jsonexit(array("error"=>$v['Title']." 信息不完整"));
+								return true;
+							}//数组没有值
+							
+							foreach($data[$v['FieldName_temp']] as $sk=>$sv)
+							{
+								if(empty($sv))
+								{
+									unset($data[$v['FieldName_temp']][$sk]);
+								}
+								
+								if(is_array($sv))
+								{
+									$error_cu = 0;
+									foreach($sv as $sub_val)
+									{
+										if(empty($sub_val))
+										{
+											$error_cu ++ ;
+										}
+									}
+									
+									if($error_cu >= count($sv))
+									{
+										unset($data[$v['FieldName_temp']][$sk]);
+										$error_cu = 0;
+									}
+									
+									if($error_cu > 0 && $error_cu < count($sv)){
+										$this->jsonexit(array("error"=>$v['Title']." 信息不完整"));
+										return true;
+									}
+								}
+							}
+							
+							if(count($data[$v['FieldName_temp']]) < 1)
+							{
+								$this->jsonexit(array("error"=>$v['Title']." 必须填写"));
+								return true;
+							}
+							
+						} // 数组数据
+						
+					} // 是否必填
+				}// empty($commit)
+			}// end foreach
 			
 			if(empty($data['title']))
 			{
@@ -3527,11 +3660,18 @@ class AuthorController extends Zend_Controller_Action
 				return true;
 			}
 			
+			if(!empty($commit))
+			{
+				$status = 1;
+			}else{
+				$status = 0;
+			}
+
 			if(!empty($uuid))
 			{
-				$rs = $md->Record($uid,$data,$uuid);
+				$rs = $md->Record($uid,$data,$status,$uuid);
 			}else{
-				$rs = $md->Record($uid,$data);
+				$rs = $md->Record($uid,$data,$status);
 			}
 			
 			if($rs !== false)
@@ -3542,7 +3682,7 @@ class AuthorController extends Zend_Controller_Action
 				$this->jsonexit(array("error"=>'保存失败'));
 				return false;
 			}
-		}
+		}// 新元数据保存
 		
 		if($ac == "process")
 		{
@@ -3564,7 +3704,7 @@ class AuthorController extends Zend_Controller_Action
 			echo "</pre>";
 			
 			return true;
-		}
+		}// 元数据处理
 
    }//metadata()
    
diff --git a/application/default/views/scripts/author/metadata-new.phtml b/application/default/views/scripts/author/metadata-new.phtml
new file mode 100644
index 00000000..a51dc9be
--- /dev/null
+++ b/application/default/views/scripts/author/metadata-new.phtml
@@ -0,0 +1,451 @@
+<?php
+$this->headTitle($this->config->title->site);
+$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');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/author">'.$this->config->title->author.'</a>');
+$this->breadcrumb('新建数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<!-- 左侧导航 -->
+<div id='sidebar'>
+    <div id='leftnavi'>
+    <?= $this->partial('author/navi.phtml'); ?>
+    </div>
+</div>
+<!-- //左侧导航 -->
+
+<!-- 页面内容 -->
+<div id="wapper">
+    <div id="tabs-controller">
+        <ul>
+            <li class="box-shadow"><a class="text-shadow" href="/author/newdata">未提交数据列表</a></li>
+            <li class="box-shadow"><a class="text-shadow iframe" href="/service/geonetwork?url=metadata.xmlinsert.form">导入元数据</a></li> 
+            <li class="box-shadow"><a class="text-shadow" href="/author/newdata/ac/add-by-template">根据模板新建元数据</a></li>
+            <li class="box-shadow"><a class="text-shadow" href="/author/newdata/ac/add-by-data">根据已有数据新建元数据</a></li>
+            <li class="box-shadow active"><a class="text-shadow" href="/author/metadata">新建元数据</a></li>
+        </ul>
+    </div>
+    <div class="">
+       	<?php if(empty($this->error)) { ?>
+        <?php if(!empty($this->uuid)) {
+			$F = array();
+		}?>
+        <form class="form-horizontal well"  id="metadata_temp_value" action="/author/metadata/ac/save" method="post">
+        	
+        	<input type="hidden" id="temp_uuid" name="uuid" value="<?= empty($this->uuid) ? "":$this->uuid ?>" />
+            <fieldset>
+                <p class="f_legend">元数据基本信息</p>
+                <div class="control-group">
+                    <label class="control-label">元数据标题</label>
+                    <div class="controls">
+                    	<?php $F['title'] = $this->Field['title']['FieldName_temp']; ?>
+                        <input type="text" name="<?= $F['title']?>"
+                         value="<?= empty($this->data->$F['title']) ? "":$this->data->$F['title'] ?>" />
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label">元数据英文标题</label>
+                    <div class="controls">
+                    	<?php $F['title_en'] = $this->Field['title_en']['FieldName_temp']; ?>
+                        <input type="text" name="<?= $F['title_en']?>" 
+                        value="<?= empty($this->data->$F['title_en']) ? "":$this->data->$F['title_en'] ?>" />
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label">元数据简介</label>
+                    <div class="controls">
+                    	<?php $F['description'] = $this->Field['description']['FieldName_temp']; ?>
+                        <textarea name="<?= $F['description']?>"><?= empty($this->data->$F['description']) ? "":$this->data->$F['description'] ?></textarea>
+                        <span class="help-block">概括元数据内容</span>
+                    </div>
+                </div>
+                <?php if(empty($this->uuid)) { ?>
+                <div class="control-group" id="next_step_button" >
+                    <div class="controls">
+                        <button type="button" onclick="save()" class="btn btn-green">下一步</button>
+                    </div>
+                </div>
+                <?php } ?>
+            </fieldset>
+            
+            <div id="form_part_b" <?= empty($this->uuid) ?  'style="display:none;"':"" ?>>
+            <fieldset>
+                <p class="f_legend">时间范围</p>
+                <div class="control-group">
+                    <label class="control-label">开始时间</label>
+                    <div class="controls">
+                    	<?php $F['timebegin'] = $this->Field['timebegin']['FieldName_temp']; ?>
+                        <input type="text" id="timebegin" name="<?= $F['timebegin']?>" value="<?= empty($this->data->$F['timebegin']) ? "":$this->data->$F['timebegin'] ?>" />
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label">结束时间</label>
+                    <div class="controls">
+                    	<?php $F['timeend'] = $this->Field['timeend']['FieldName_temp']; ?>
+                        <input type="text" id="timeend" name="<?= $F['timeend'] ?>" value="<?= empty($this->data->$F['timeend']) ? "":$this->data->$F['timeend'] ?>" />
+                    </div>
+                </div>
+            </fieldset>
+            
+            <fieldset>
+                <p class="f_legend">空间范围</p>
+                <div class="map_input_part">
+                    <div class="control-group">
+                        <label class="control-label">东</label>
+                        <div class="controls">
+                        	<?php $F['east'] = $this->Field['east']['FieldName_temp']; ?>
+                            <input type="text" id="map_east" name="<?= $F['east'] ?>" class="span2" 
+                            value="<?= empty($this->data->$F['east']) ? "":$this->data->$F['east'] ?>" />
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">南</label>
+                        <div class="controls">
+                        	<?php $F['south'] = $this->Field['south']['FieldName_temp']; ?>
+                            <input type="text" id="map_south" name="<?= $F['south'] ?>" class="span2" 
+                            value="<?= empty($this->data->$F['south']) ? "":$this->data->$F['south'] ?>" />
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">西</label>
+                        <div class="controls">
+                        	<?php $F['west'] = $this->Field['west']['FieldName_temp']; ?>
+                            <input type="text" id="map_west" name="<?= $F['west'] ?>" class="span2" 
+                            value="<?= empty($this->data->$F['west']) ? "":$this->data->$F['west'] ?>" />
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">北</label>
+                        <div class="controls">
+                        	<?php $F['north'] = $this->Field['north']['FieldName_temp']; ?>
+                            <input type="text" id="map_north" name="<?= $F['north'] ?>" class="span2" 
+                            value="<?= empty($this->data->$F['north']) ? "":$this->data->$F['north'] ?>" />
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        按住键盘上“Shift”键可以直接在地图上用鼠标拖动选取
+                    </div>
+                </div>
+                <div class="map_display_part" id="map_canvas">
+                	
+                </div>
+            </fieldset>
+            
+            <fieldset>
+                <p class="f_legend">数据引用方式</p>
+                <div class="control-group">
+                    <div class="controls">
+                    	<?php $F['citation'] = $this->Field['citation']['FieldName_temp']; ?>
+                        <input type="text" name="<?= $F['citation'] ?>" class="span8" 
+                        value="<?= empty($this->data->$F['citation']) ? "":$this->data->$F['citation'] ?>" />
+                    </div>
+                </div>
+            </fieldset>
+            
+            <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(count($this->data->$F['reference'])>0)
+						{
+							foreach($this->data->$F['reference'] as $k=>$v)
+							{?>
+								<input type="text" name="<?= $F['reference'] ?>[]" class="span8"
+                         		value="<?= $v ?>" />
+							<?php }
+						}
+						?>
+                    </div>
+                </div>
+                <div class="control-group">
+                    <a href="javascript:void(0);" onclick="AddInput('reference')">+ 再添加一条</a>
+                </div>
+            </fieldset>
+            
+            <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)
+				{
+					$index = 0;
+				foreach($this->data->$F['contact'] as $k=>$v)
+				{
+					$index++ ;?>
+                <div class="control-group control-group-contact" id="contact_1st">
+                    <div class="controls">
+					<input type="text" name="<?= $F['contact'] ?>[<?= $index ?>][name]" class="span3" value="<?= $v->name ?>" />
+                    <input type="text" name="<?= $F['contact'] ?>[<?= $index ?>][email]" class="span3" value="<?= $v->email ?>" />
+                    <select type="text" name="<?= $F['contact'] ?>[<?= $index ?>][type]" class="span3">
+                        <option value="0">请选择联系人职能</option>
+                        <?php 
+                        foreach($this->Field['contact']['options'] as $va)
+                        {
+                            if($v->type == $va)
+                            {
+                                echo '<option value="'.$va.'" selected="selected">'.$va.'</option>'."\r\n";
+                            }else{
+                                echo '<option value="'.$va.'">'.$va.'</option>'."\r\n";
+                            }
+                        }
+                        ?>
+                    </select>
+                	</div>
+				</div>
+				<?php }
+				}else{ ?>
+				<div class="control-group control-group-contact" id="contact_1st">
+                    <div class="controls">
+                    	<input type="text" name="<?= $F['contact'] ?>[1][name]" class="span3" value="" />
+                        <input type="text" name="<?= $F['contact'] ?>[1][email]" class="span3" value="" />
+                        <select type="text" name="<?= $F['contact'] ?>[1][type]" class="span3">
+                            <option value="0">请选择联系人职能</option>
+                            <?php 
+                            foreach($this->Field['contact']['options'] as $va)
+                            {
+                                echo '<option value="'.$va.'">'.$va.'</option>'."\r\n";
+                            }
+                            ?>
+                        </select>
+                    </div>
+				</div>
+				<?php } ?>
+                <div class="control-group">
+                    <a href="javascript:void(0);" onclick="AddInput('contact')">+ 再添加一条</a>
+                </div>
+            </fieldset>
+            
+            <div class="control-group">
+            	<div class="controls">
+					<button type="button" onclick="save(0)" class="btn btn-green">保存草稿</button> 
+                    <button type="button" onclick="save(1)" class="btn btn-green">提交元数据</button> 
+				</div>
+            </div>
+            
+            </div>
+            
+        </form>
+        <?php } else { ?>
+        <?= $this->error;?>
+        <?php } ?>
+    </div>
+</div>
+<!-- //页面内容 -->
+<script>
+$('#wapper').width($('body').width()-300);
+
+$(function() {
+	//Google map (不启用预先加载)
+	google.maps.event.addDomListener(window, 'load', initialize);
+	
+	//jquery ui datepicker
+	$("#timebegin").datepicker({dateFormat:"yy-mm-dd"});
+	$("#timeend").datepicker({dateFormat:"yy-mm-dd"});
+	
+	//jquery colorbox
+	$(".inline").colorbox({inline:true, width:"50%"});
+	$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"}); 
+});
+
+// Metadata Commit Part
+
+function getValue(){
+	return $('#metadata_temp_value').serialize();
+}
+
+function save(s){
+	var postdata = "";
+	if(s>0)
+	{
+		postdata = 'ac=save&commit=1&' + getValue();
+	}else{
+		postdata = 'ac=save&' + getValue();
+	}
+	$.ajax({
+		'type':"POST",
+		'url':'/author/metadata/',
+		'data': postdata,
+		'success':function(data){
+			if (typeof(data)=='object')
+			{
+			  if(typeof(data.error)!='undefined')
+			  {Alert(data.error);}
+			  if(typeof(data.deleted)!='undefined')
+			  {$('#list_'+data.deleted).fadeOut("slow",function(){$(this).remove();});}
+			  if(typeof(data.uuid)!='undefined')
+			  {$('#temp_uuid').val(data.uuid);$('#form_part_b').css('display','block');$('#next_step_button').hide();initialize()}
+			}
+			else{ 
+			  $.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_warning.png" /><h4>出现错误，请稍候再试</h4>'});
+			}
+		},
+		'timeout': 30000,
+		'error': function(){
+			$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
+		 }
+	});
+  	postdata = null;
+}
+
+// Metadata Commit Part --End
+
+//Form element
+function AddInput(name){
+	$('.control-group-' + name).last().after(SelectInputTemplate(name));
+}
+
+function SelectInputTemplate(name){
+	
+	if(name == 'reference')
+	{
+		html = ' <div class="control-group control-group-reference">'
+               +'     <div class="controls">'
+               +'         <input type="text" name="<?= $this->Field['reference']['FieldName_temp']?>[]" class="span8" />'
+               +'     </div>'
+               +' </div>';
+		return html;
+	}
+	
+	if(name == 'contact')
+	{
+		var now_index = $('.control-group-contact').length;
+		var index = now_index + 1;
+		html = '<div class="control-group control-group-contact">'
+               +     '<div class="controls">'
+               +         '<input type="text" name="contact[' + index + '][name]" class="span3" /> '
+               +         '<input type="text" name="contact[' + index + '][email]" class="span3" /> '
+               +         '<select type="text" name="contact[' + index + '][type]" class="span3">'
+			   +         '<option value="0">请选择联系人职能</option>'
+                        	<?php 
+							foreach($this->Field['contact']['options'] as $v)
+							{
+								echo '+ \'<option value="'.$v.'">'.$v.'</option>\'';
+							}
+							?>
+               +         '</select>'
+               +     '</div>'
+               + '</div>';
+		now_index = null;
+		index = null;
+		return html;
+	}
+}
+
+// Google Map Part
+var map = null;
+var mapElementID = "map_canvas";
+var bounds = null;
+var rectangle = null;
+var input = {east:'#map_east',west:'#map_west',north:'#map_north',south:'#map_south'};
+
+function initialize() {
+	//加载地图
+	var myLatlng = new google.maps.LatLng(35.656456,105.819946);
+	var myOptions = {
+		zoom: 3,
+		center: myLatlng,
+		mapTypeId: google.maps.MapTypeId.ROADMAP
+	}
+	map = new google.maps.Map(document.getElementById(mapElementID), myOptions);
+	
+	//Keydragzone
+	map.enableKeyDragZoom({
+	  key: "shift", 
+	  boxStyle: {
+		border: "1px dashed black",
+		backgroundColor: "transparent",
+		opacity: 1.0
+	  },
+	  veilStyle: {
+		backgroundColor: "white",
+		opacity: 0.35,
+		cursor: "crosshair"
+	  }
+	});
+	
+	var dz = map.getDragZoomObject();
+	google.maps.event.addListener(dz, 'dragstart', function (latlng) {
+		RemoveRectangle();
+		//console.dir(latlng);
+	});
+	google.maps.event.addListener(dz, 'dragend', function (latlng) {
+		MapValueChange(latlng.ca.d,latlng.Z.d,latlng.ca.b,latlng.Z.b);
+		setRectangle(latlng.ca.d,latlng.ca.b,latlng.Z.b,latlng.Z.d);
+		//console.dir(latlng);
+	});
+
+}
+
+function setRectangle(east,west,south,north){
+	
+	bounds = new google.maps.LatLngBounds(
+	  new google.maps.LatLng(south,west),
+	  new google.maps.LatLng(north,east)
+	);
+
+	rectangle = new google.maps.Rectangle({
+	  bounds: bounds,
+	  editable: true
+	});
+	
+	rectangle.setMap(map);
+	
+	google.maps.event.addListener(rectangle, 'bounds_changed', function () {
+		var latlng = rectangle.getBounds();
+		MapValueChange(latlng.ca.d,latlng.Z.d,latlng.ca.b,latlng.Z.b);
+		//console.dir(latlng);
+	});
+	
+}
+
+function RemoveRectangle(){
+	if(rectangle != null)
+	{
+		rectangle.setMap(null);
+		rectangle = null;
+	}
+}
+
+function MapValueChange(east,north,west,south){
+	$(input.east).val(east);
+	$(input.north).val(north);
+	$(input.west).val(west);
+	$(input.south).val(south);
+}
+
+function InputValueChange(){
+	if($(input.east).val() != "" && $(input.west).val() != "" && $(input.north).val() != "" && $(input.south).val() != "")
+	{
+		if(rectangle == null)
+		{
+			setRectangle($(input.east).val(),$(input.west).val(),$(input.south).val(),$(input.north).val());
+		}else{
+			var reSetBounds = new google.maps.LatLngBounds(
+				new google.maps.LatLng($(input.south).val(),$(input.west).val()),
+				new google.maps.LatLng($(input.north).val(),$(input.east).val())
+			);
+			rectangle.setBounds(reSetBounds);
+		}
+	}
+}
+
+$(input.east).bind('blur',InputValueChange);
+$(input.west).bind('blur',InputValueChange);
+$(input.north).bind('blur',InputValueChange);
+$(input.south).bind('blur',InputValueChange);
+
+// Google map Part --End
+
+
+function Alert(content){
+	$.colorbox({innerWidth:'40%',html:'<div style="line-height:30px;font-size:16px;">'+ content +'</div>'});
+}
+</script>
\ No newline at end of file
diff --git a/application/default/views/scripts/author/metadata.phtml b/application/default/views/scripts/author/metadata.phtml
index 34bddc97..3b3d03b7 100644
--- a/application/default/views/scripts/author/metadata.phtml
+++ b/application/default/views/scripts/author/metadata.phtml
@@ -33,343 +33,49 @@ $this->breadcrumb()->setSeparator(' > ');
             <li class="box-shadow active"><a class="text-shadow" href="/author/metadata">新建元数据</a></li>
         </ul>
     </div>
-    <div class="">
-                             
-        <form class="form-horizontal well"  id="metadata_temp_value" action="/author/metadata/ac/save" method="post">
-        	
-        	<input type="hidden" id="temp_uuid" name="uuid" value="" />
-            <fieldset>
-                <p class="f_legend">元数据基本信息</p>
-                <div class="control-group">
-                    <label class="control-label">元数据标题</label>
-                    <div class="controls">
-                        <input type="text" name="<?= $this->Field['title']['FieldName_temp']?>" />
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label">元数据英文标题</label>
-                    <div class="controls">
-                        <input type="text" name="<?= $this->Field['title_en']['FieldName_temp']?>" />
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label">元数据简介</label>
-                    <div class="controls">
-                        <textarea name="<?= $this->Field['description']['FieldName_temp']?>"></textarea>
-                        <span class="help-block">概括元数据内容</span>
-                    </div>
-                </div>
-                <div class="control-group" id="next_step_button">
-                    <div class="controls">
-                        <button type="button" onclick="save()" class="btn btn-green">下一步</button>
-                    </div>
-                </div>
-            </fieldset>
-            
-            <div id="form_part_b">
-            <fieldset>
-                <p class="f_legend">时间范围</p>
-                <div class="control-group">
-                    <label class="control-label">开始时间</label>
-                    <div class="controls">
-                        <input type="text" id="timebegin" name="<?= $this->Field['timebegin']['FieldName_temp']?>" />
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label">结束时间</label>
-                    <div class="controls">
-                        <input type="text" id="timeend" name="<?= $this->Field['timeend']['FieldName_temp']?>" />
-                    </div>
-                </div>
-            </fieldset>
-            
-            <fieldset>
-                <p class="f_legend">空间范围</p>
-                <div class="map_input_part">
-                    <div class="control-group">
-                        <label class="control-label">东</label>
-                        <div class="controls">
-                            <input type="text" id="map_east" name="<?= $this->Field['east']['FieldName_temp']?>" class="span2" />
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label">南</label>
-                        <div class="controls">
-                             <input type="text" id="map_south" name="<?= $this->Field['south']['FieldName_temp']?>" class="span2" />
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label">西</label>
-                        <div class="controls">
-                             <input type="text" id="map_west" name="<?= $this->Field['west']['FieldName_temp']?>" class="span2" />
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label">北</label>
-                        <div class="controls">
-                             <input type="text" id="map_north" name="<?= $this->Field['north']['FieldName_temp']?>" class="span2" />
-                        </div>
-                    </div>
-                    <div class="control-group">
-                        按住键盘上“Shift”键可以直接在地图上用鼠标拖动选取
-                    </div>
-                </div>
-                <div class="map_display_part" id="map_canvas">
-                	
-                </div>
-            </fieldset>
-            
-            <fieldset>
-                <p class="f_legend">数据引用方式</p>
-                <div class="control-group">
-                    <div class="controls">
-                        <input type="text" name="<?= $this->Field['citation']['FieldName_temp']?>" class="span8" />
-                    </div>
-                </div>
-            </fieldset>
-            
-            <fieldset>
-                <p class="f_legend">参考文献</p>
-                <div class="control-group control-group-reference" id="reference_1st">
-                    <div class="controls">
-                        <input type="text" name="<?= $this->Field['reference']['FieldName_temp']?>[]" class="span8" />
-                    </div>
-                </div>
-                <div class="control-group">
-                    <a href="javascript:void(0);" onclick="AddInput('reference')">+ 再添加一条</a>
-                </div>
-            </fieldset>
-            
-            <fieldset>
-                <p class="f_legend">联系人</p>
-                <div class="control-group control-group-contact" id="contact_1st">
-                    <div class="controls">
-                        <input type="text" name="contact[1][name]" class="span3" />
-                        <input type="text" name="contact[1][email]" class="span3" />
-                        <select type="text" name="contact[1][type]" class="span3">
-                        	<?php 
-							foreach($this->Field['contact']['options'] as $v)
-							{
-								echo '<option value="'.$v.'">'.$v.'</option>'."\r\n";
-							}
-							?>
-                        </select>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <a href="javascript:void(0);" onclick="AddInput('contact')">+ 再添加一条</a>
-                </div>
-            </fieldset>
-            
-            <div class="control-group">
-            	<div class="controls">
-					<button type="button" onclick="save()" class="btn btn-green">保存草稿</button> 
-                    <button type="button" onclick="save()" class="btn btn-green">提交元数据</button> 
-				</div>
-            </div>
-            
-            </div>
-            
-        </form>
+    <div id="datalist">
+    	<ul>
+		<?php if(!empty($this->MDList)) { ?>
+			<?php foreach($this->MDList as $k=>$v) { ?>
+				<li id="item_<?= $v['id'] ?>"><p><a href="/author/metadata/ac/new/uuid/<?= $v['uuid']?>"><?= $v['content']->title ?></a></p>
+                <p>[ 状态：<?= $v['status']==0 ? "草稿":"已提审"?> | <a href="/author/metadata/ac/new/uuid/<?= $v['uuid']?>">修改</a> | 
+                <a href="javascript:void(0);" onclick="del(<?= $v['id'] ?>,'<?= $v['uuid']?>')" id="delBtn_<?= $v['id'] ?>">删除</a> ]</p></li>
+			<?php }?>
+            <li><p><a href="/author/metadata/ac/new"> + 添加新元数据</a></p></li>
+		<?php }else{ ?>
+        	<li><p>您还没有新元数据，<a href="/author/metadata/ac/new">点击这里添加</a></p></li>
+        <?php } ?>
+        </ul>
     </div>
 </div>
 <!-- //页面内容 -->
 <script>
 $('#wapper').width($('body').width()-300);
-
-$(function() {
-	//Google map (不启用预先加载)
-	google.maps.event.addDomListener(window, 'load', initialize);
-	
-	//jquery ui datepicker
-	$("#timebegin").datepicker({dateFormat:"yy-mm-dd"});
-	$("#timeend").datepicker({dateFormat:"yy-mm-dd"});
-	
-	//jquery colorbox
-	$(".inline").colorbox({inline:true, width:"50%"});
-	$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"}); 
-});
-
-// Metadata Commit Part
-
-function getValue(){
-	return $('#metadata_temp_value').serialize();
-}
-function save(){
+function del(id,uuid){
+	var dom = "#delBtn_"+id;
+	var html = $(dom).html();
 	$.ajax({
-	  'type':"POST",
-	  'url':'/author/metadata/',
-	  'data':'ac=save&' + getValue(),
-	  'success':function(data){
-		  if (typeof(data)=='object')
-		  {
-			if(typeof(data.error)!='undefined')
-			{Alert(data.error);}
-			if(typeof(data.deleted)!='undefined')
-			{$('#list_'+data.deleted).fadeOut("slow",function(){$(this).remove();});}
-			if(typeof(data.uuid)!='undefined')
-			{$('#temp_uuid').val(data.uuid);$('#form_part_b').css('display','block');$('#next_step_button').hide();initialize()}
-		  }
-		  else{ 
-		  	$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_warning.png" /><h4>出现错误，请稍候再试</h4>'});
-		  }
-	  },
-	  'timeout': 30000,
-	  'error': function(){
-		  $.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
-	   }
+		'type':"POST",
+		'url':'/author/metadata/ac/del/uuid/'+uuid,
+		'data':'aid='+id,
+		'success':function(data){
+			if (typeof(data)=='object')
+			{
+			  if(typeof(data.error)!='undefined')
+			  {Alert(data.error);return false;}
+			  if(typeof(data.deleted)!='undefined')
+			  {$('#item_'+id).fadeOut(function(){$(this).remove();});}
+			}
+			else{ 
+			  Alert('出现错误，请稍后再试');
+			}
+		},
+		'timeout': 30000,
+		'error': function(){Alert('处理中出现错误，请刷新页面后重试');},
+		'beforeSend':function(){$(dom).html('<img src="/images/ajax-load-small.gif" />');$(dom).attr("disabled","disabled")},
+		'complete':function(){$(dom).html(html);$(dom).removeAttr("disabled");dom = null;}
   });
 }
-
-// Metadata Commit Part --End
-
-//Form element
-function AddInput(name){
-	$('.control-group-' + name).last().after(SelectInputTemplate(name));
-}
-
-function SelectInputTemplate(name){
-	
-	if(name == 'reference')
-	{
-		html = ' <div class="control-group control-group-reference">'
-               +'     <div class="controls">'
-               +'         <input type="text" name="<?= $this->Field['reference']['FieldName_temp']?>[]" class="span8" />'
-               +'     </div>'
-               +' </div>';
-		return html;
-	}
-	
-	if(name == 'contact')
-	{
-		var now_index = $('.control-group-contact').length;
-		var index = now_index + 1;
-		html = '<div class="control-group control-group-contact">'
-               +     '<div class="controls">'
-               +         '<input type="text" name="contact[' + index + '][name]" class="span3" /> '
-               +         '<input type="text" name="contact[' + index + '][email]" class="span3" /> '
-               +         '<select type="text" name="contact[' + index + '][type]" class="span3">'
-                        	<?php 
-							foreach($this->Field['contact']['options'] as $v)
-							{
-								echo '+ \'<option value="'.$v.'">'.$v.'</option>\'';
-							}
-							?>
-               +         '</select>'
-               +     '</div>'
-               + '</div>';
-		now_index = null;
-		index = null;
-		return html;
-	}
-}
-
-// Google Map Part
-var map = null;
-var mapElementID = "map_canvas";
-var bounds = null;
-var rectangle = null;
-var input = {east:'#map_east',west:'#map_west',north:'#map_north',south:'#map_south'};
-
-function initialize() {
-	//加载地图
-	var myLatlng = new google.maps.LatLng(35.656456,105.819946);
-	var myOptions = {
-		zoom: 3,
-		center: myLatlng,
-		mapTypeId: google.maps.MapTypeId.ROADMAP
-	}
-	map = new google.maps.Map(document.getElementById(mapElementID), myOptions);
-	
-	//Keydragzone
-	map.enableKeyDragZoom({
-	  key: "shift", 
-	  boxStyle: {
-		border: "1px dashed black",
-		backgroundColor: "transparent",
-		opacity: 1.0
-	  },
-	  veilStyle: {
-		backgroundColor: "white",
-		opacity: 0.35,
-		cursor: "crosshair"
-	  }
-	});
-	
-	var dz = map.getDragZoomObject();
-	google.maps.event.addListener(dz, 'dragstart', function (latlng) {
-		RemoveRectangle();
-		//console.dir(latlng);
-	});
-	google.maps.event.addListener(dz, 'dragend', function (latlng) {
-		MapValueChange(latlng.ca.d,latlng.Z.d,latlng.ca.b,latlng.Z.b);
-		setRectangle(latlng.ca.d,latlng.ca.b,latlng.Z.b,latlng.Z.d);
-		//console.dir(latlng);
-	});
-
-}
-
-function setRectangle(east,west,south,north){
-	
-	bounds = new google.maps.LatLngBounds(
-	  new google.maps.LatLng(south,west),
-	  new google.maps.LatLng(north,east)
-	);
-
-	rectangle = new google.maps.Rectangle({
-	  bounds: bounds,
-	  editable: true
-	});
-	
-	rectangle.setMap(map);
-	
-	google.maps.event.addListener(rectangle, 'bounds_changed', function () {
-		var latlng = rectangle.getBounds();
-		MapValueChange(latlng.ca.d,latlng.Z.d,latlng.ca.b,latlng.Z.b);
-		//console.dir(latlng);
-	});
-	
-}
-
-function RemoveRectangle(){
-	if(rectangle != null)
-	{
-		rectangle.setMap(null);
-		rectangle = null;
-	}
-}
-
-function MapValueChange(east,north,west,south){
-	$(input.east).val(east);
-	$(input.north).val(north);
-	$(input.west).val(west);
-	$(input.south).val(south);
-}
-
-function InputValueChange(){
-	if($(input.east).val() != "" && $(input.west).val() != "" && $(input.north).val() != "" && $(input.south).val() != "")
-	{
-		if(rectangle == null)
-		{
-			setRectangle($(input.east).val(),$(input.west).val(),$(input.south).val(),$(input.north).val());
-		}else{
-			var reSetBounds = new google.maps.LatLngBounds(
-				new google.maps.LatLng($(input.south).val(),$(input.west).val()),
-				new google.maps.LatLng($(input.north).val(),$(input.east).val())
-			);
-			rectangle.setBounds(reSetBounds);
-		}
-	}
-}
-
-$(input.east).bind('blur',InputValueChange);
-$(input.west).bind('blur',InputValueChange);
-$(input.north).bind('blur',InputValueChange);
-$(input.south).bind('blur',InputValueChange);
-
-// Google map Part --End
-
-
 function Alert(content){
 	$.colorbox({innerWidth:'40%',html:'<div style="line-height:30px;font-size:16px;">'+ content +'</div>'});
 }
diff --git a/application/models/MetaData.php b/application/models/MetaData.php
index 04931178..c55edaa0 100755
--- a/application/models/MetaData.php
+++ b/application/models/MetaData.php
@@ -81,7 +81,7 @@ class Metadata
 			
 			//空间范围-东
 			'east' => array(
-				'Title' => '东',
+				'Title' => '空间范围<b>东</b>',
 				'FieldName' => 'east',
 				'FieldName_temp' => 'east',
 				'Type' => 'varchar',
@@ -91,7 +91,7 @@ class Metadata
 			
 			//空间范围-南
 			'south' => array(
-				'Title' => '南',
+				'Title' => '空间范围<b>南</b>',
 				'FieldName' => 'south',
 				'FieldName_temp' => 'south',
 				'Type' => 'varchar',
@@ -101,7 +101,7 @@ class Metadata
 			
 			//空间范围-西
 			'west' => array(
-				'Title' => '西',
+				'Title' => '空间范围<b>西</b>',
 				'FieldName' => 'west',
 				'FieldName_temp' => 'west',
 				'Type' => 'varchar',
@@ -111,7 +111,7 @@ class Metadata
 			
 			//空间范围-北
 			'north' => array(
-				'Title' => '北',
+				'Title' => '空间范围<b>北</b>',
 				'FieldName' => 'north',
 				'FieldName_temp' => 'north',
 				'Type' => 'varchar',
@@ -136,7 +136,7 @@ class Metadata
 				'FieldName_temp' => 'reference',
 				'Type' => 'array',
 				'MaxLength' => 200,
-				'Required' => true
+				'Required' => false
 			),
 			
 			//联系人
@@ -159,7 +159,7 @@ class Metadata
 	}//_init_Fields()
 	
 	//记录
-	function Record($uid,$data,$uuid=''){
+	function Record($uid,$data,$status,$uuid=''){
 		
 		if(!is_array($data) || count($data)<1)
 		{
@@ -206,6 +206,7 @@ class Metadata
 				"uuid" => $uuid,
 				"userid" => $uid,
 				"content" => $content,
+				"status"=>$status
 			);
 			
 			if($this->db->insert($this->tbl_Metadata_temp,$temp))
@@ -222,7 +223,8 @@ class Metadata
 			
 			$temp = array(
 				"content" => $content,
-				"ts_update" => 'now()'
+				"ts_update" => 'now()',
+				"status" => $status
 			);
 			
 			$whereSql = "userid=$uid AND uuid='$uuid'";
@@ -267,10 +269,36 @@ class Metadata
 	function RecordJSON($data)
 	{
 		
-		$content = json_encode($data);
+		$content = json_encode($data,JSON_NUMERIC_CHECK);
 		
 		return $content;
 		
 	}//RecordJSON
+	
+	//获得某个用户的元数据草稿
+	//或者根据某个用户的uid和uuid获得某一条草稿的数据
+	function getRecord($uid,$uuid=''){
+		
+		if(empty($uid) || !is_numeric($uid))
+		{
+			return false;
+		}
+		
+		if(empty($uuid))
+		{
+			$sql = "SELECT * FROM ".$this->tbl_Metadata_temp." WHERE userid=$uid ORDER BY ts_created DESC";
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			return $rows;
+		}
+		
+		else{
+			$sql = "SELECT * FROM ".$this->tbl_Metadata_temp." WHERE userid=$uid AND uuid='$uuid'";
+			$sth = $this->db->query($sql);
+			$row = $sth->fetch();
+			return $row;
+		}
+		
+	}//getRecord()
 
 }