* update tianditu API

2.header样式；

application/admin/controllers/DownController.php

@@ -28,155 +28,6 @@ class Admin_DownController extends Zend_Controller_Action
         //其他连接
     }
 	 
-	//新离线数据申请管理
-	function offlineappsAction()
-	{
-		$this->view->navIn = $ac = $this->_getParam('ac');
-		$this->view->offlineAppId = $offlineappid = $this->_getParam('offlineappid');
-		$submit = $this->_getParam('submit');
-		$search = $this->_getParam('search');
-		
-		if(empty($ac))
-		{
-			$this->view->navIn = $ac = "notreceived";
-		}
-		
-		if($ac == "view")
-		{
-			if(empty($offlineappid))
-			{
-				view::Post($this,"参数错误",-1);
-				return true;
-			}
-			
-			$offlineapp = new Offlineapp();
-			
-			if(view::isXmlHttpRequest() !== true)
-			{
-				$this->_helper->viewRenderer('offlineapps-view');
-				$this->view->data = $offlineapp->getOneAppInfo($offlineappid);
-			}else{
-				$this->_helper->layout->disableLayout();
-				$this->_helper->viewRenderer->setNoRender();
-				$this->jsonexit($offlineapp->getOneAppInfo($offlineappid));
-			}
-			return true;
-		}
-		
-		if($ac == "notreceived")
-		{
-			$this->_helper->viewRenderer('offlineapps-notreceived');
-			$offlineapp = new Offlineapp();
-			$data = $offlineapp->fetchNotReceived();
-			view::addPaginator($data,$this,20);
-			return true;
-		}//未接收的
-		
-		if($ac == "notsubmitted")
-		{
-			$this->_helper->viewRenderer('offlineapps-notreceived');
-			$offlineapp = new Offlineapp();
-			$data = $offlineapp->fetchNotSubmitted();
-			view::addPaginator($data,$this,20);
-			return true;
-		}//未接收的
-
-		if($ac == "nopdf")
-		{
-			$this->_helper->viewRenderer('offlineapps-nopdf');
-			$offlineapp = new Offlineapp();
-			$data = $offlineapp->fetchNoPdf();
-			view::addPaginator($data,$this,20);
-			return true;
-		}//没有上传申请表的
-		
-		if($ac == "notpassed")
-		{
-			$this->_helper->viewRenderer('offlineapps-notpassed');
-			$offlineapp = new Offlineapp();
-			$data = $offlineapp->fetchNotApprove();
-			view::addPaginator($data,$this,20);
-			return true;
-		}
-		
-		//接收
-		if($ac == "receive")
-		{
-			$offlineapp = new Offlineapp();
-			$statue = $offlineapp->receive($offlineappid);
-			if($statue !== true)
-			{
-				view::Post($this,$statue);
-			}else{
-				view::Post($this,"接收成功",-1);
-			}
-			return true;
-		}
-		
-		//发送给作者
-		if($ac == "toauthor")
-		{
-			$this->_helper->viewRenderer('offlineapps-toauthor');
-			if(empty($submit))
-			{
-				
-			}else{
-				$offlineapp = new Offlineapp();
-			}
-			return true;
-		}
-		
-		//拒绝
-		if($ac == "deny")
-		{
-			$this->_helper->viewRenderer('offlineapps-deny');
-			
-			if(empty($offlineappid))
-			{
-				view::Post($this,"参数错误",-1);
-				return true;
-			}
-			
-			if(empty($submit))
-			{
-				$offlineapp = new Offlineapp();
-				$this->view->data = $offlineapp->getOneAppInfo($offlineappid);
-				$mail = new Mail();
-				$data = array(
-					'user' => $this->view->data[0]['username'],
-					'datalist' => $this->view->data[0]['datalist'],
-				);
-				$mail->loadTemplate("offline-deny",$data);
-				$this->view->mail_body = $mail->body;
-				$this->view->mail_subject = $mail->subject;
-			}
-			
-			return;
-		}
-		
-		//重置申请表
-		if($ac == "resetappform")
-		{
-			if(empty($offlineappid))
-			{
-				view::Post($this,"参数错误",-1);
-				return true;
-			}
-			
-			$offlineapp = new Offlineapp();
-			$statue = $offlineapp->resetAppForm($offlineappid);
-			if($statue !== true)
-			{
-				view::Post($this,$statue);
-			}else{
-				view::Post($this,"重置成功",-1);
-			}
-			
-			return true;
-		}
-		
-	}
-    
 	//离线数据申请管理	
 	function offlineappAction()
 	{
@@ -194,6 +45,7 @@ class Admin_DownController extends Zend_Controller_Action
 		$status  =(int)$this->_getParam('status');
 		$ac = $this->_getParam('ac');
 		$q		= $this->_getParam('q');
+		$submd=$this->view->config->sub->metadata;
 		
 		if($ac == "pending")
 		{
@@ -236,7 +88,7 @@ class Admin_DownController extends Zend_Controller_Action
 			$mail->setBodyText($mailtp->getBody());
 			$mail->setSubject($mailtp->getSubject());
 			$mail->addTo($row['email']);
-			$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); 
+			$mail->setFrom($this->view->config->service->email,'数据服务组'); 
 			$mail->send();
 			
 			//如果是wsn数据则生成数据
@@ -274,12 +126,12 @@ class Admin_DownController extends Zend_Controller_Action
 						unset($mail);
 						$mail = new WestdcMailer($this->view->config->smtp);
 						$mailtp=new EmailText($this->db,'offline-start-subject',array('user'=>$username,'datalist'=>$data,'source'=>$source));
-						$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+						$mail->setFrom($this->view->config->service->email,'数据服务组');
 						$mail->setBodyText($mailtp->getBody());
 						$mail->setSubject($mailtp->getSubject());
 						$mail_addrs=explode(",",substr($tmp_email,1,-1));
 						$mail->addTo($mail_addrs);
-						$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+						$mail->addCc($this->view->config->service->email,'数据服务组');
 						$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 						$mail->send();
 						$data="";
@@ -298,12 +150,12 @@ class Admin_DownController extends Zend_Controller_Action
 				unset($mail);
 				$mail = new WestdcMailer($this->view->config->smtp);
 				$mailtp=new EmailText($this->db,'offline-start-author',array('user'=>$username,'datalist'=>$data,'source'=>$source));
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mail->setFrom($this->view->config->service->email,'数据服务组');
 				$mail->setBodyText($mailtp->getBody());
 				$mail->setSubject($mailtp->getSubject());
 				$mail_addrs=explode(",",substr($tmp_email,1,-1));
 				$mail->addTo($mail_addrs);
-				$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+				$mail->addCc($this->view->config->service->email,'数据服务组');
 				$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 				$mail->send();
 			}
@@ -327,11 +179,11 @@ class Admin_DownController extends Zend_Controller_Action
 						unset($mail);
 						$mail = new WestdcMailer($this->view->config->smtp);
 						$mailtp=new EmailText($this->db,'offline-start-author',array('user'=>$username,'datalist'=>$data));
-						$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+						$mail->setFrom($this->view->config->service->email,'数据服务组');
 						$mail->setBodyText($mailtp->getBody());
 						$mail->setSubject($mailtp->getSubject());
 						$mail->addTo($tmp_email);
-						$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+						$mail->addCc($this->view->config->service->email,'数据服务组');
 						$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 						$mail->send();
 						$data="";
@@ -351,11 +203,11 @@ class Admin_DownController extends Zend_Controller_Action
 				unset($mail);
 				$mail = new WestdcMailer($this->view->config->smtp);
 				$mailtp=new EmailText($this->db,'offline-start-author',array('user'=>$username,'datalist'=>$data));
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mail->setFrom($this->view->config->service->email,'数据服务组');
 				$mail->setBodyText($mailtp->getBody());
 				$mail->setSubject($mailtp->getSubject());
 				$mail->addTo($tmp_email);
-				$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+				$mail->addCc($this->view->config->service->email,'数据服务组');
 				$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 				$mail->send();
 			}
@@ -379,7 +231,7 @@ class Admin_DownController extends Zend_Controller_Action
 				unset($mail);
 				$mail = new WestdcMailer($this->view->config->smtp);
 				$mailtp=new EmailText($this->db,'offline-start-dcadmin',array('user'=>$username,'datalist'=>$data));
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mail->setFrom($this->view->config->service->email,'数据服务组');
 				$mail->setBodyText($mailtp->getBody());
 				$mail->setSubject($mailtp->getSubject());
 				$addrs=array();
@@ -387,7 +239,7 @@ class Admin_DownController extends Zend_Controller_Action
 				$addrs[] = 'wangliangxu@lzb.ac.cn';
 				$addrs[] = 'wulizong@lzb.ac.cn';			
 				$mail->addTo($addrs);
-				$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+				$mail->addCc($this->view->config->service->email,'数据服务组');
 				$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 				$mail->send();
 			}
@@ -509,11 +361,11 @@ class Admin_DownController extends Zend_Controller_Action
 						unset($mail);
 						$mail = new WestdcMailer($this->view->config->smtp);
 						$mailtp=new EmailText($this->db,'offline-start-mdadmin',array('user'=>$username,'datalist'=>$data));
-						$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+						$mail->setFrom($this->view->config->service->email,'数据服务组');
 						$mail->setBodyText($mailtp->getBody());
 						$mail->setSubject($mailtp->getSubject());
 						$mail->addTo($tmp_email);
-						$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+						$mail->addCc($this->view->config->service->email,'数据服务组');
 						$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 						$mail->send();
 						$data='';
@@ -530,11 +382,11 @@ class Admin_DownController extends Zend_Controller_Action
 				unset($mail);
 				$mail = new WestdcMailer($this->view->config->smtp);
 				$mailtp=new EmailText($this->db,'offline-start-mdadmin',array('user'=>$username,'datalist'=>$data));
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mail->setFrom($this->view->config->service->email,'数据服务组');
 				$mail->setBodyText($mailtp->getBody());
 				$mail->setSubject($mailtp->getSubject());
 				$mail->addTo($tmp_email);
-				$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+				$mail->addCc($this->view->config->service->email,'数据服务组');
 				$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
 				$mail->send();
 			}
@@ -591,7 +443,7 @@ class Admin_DownController extends Zend_Controller_Action
 				foreach($rs as $data) {
 					if ($data['host']=='ftp1.westgis.ac.cn')
 						$has_ftp1=true;
-					if ($data['host']=='ftp2.westgis.ac.cn')
+					if ($data['host']=='ftp.sanjiangyuan.org.cn')
 						$has_ftp2=true;
 					
 					// deal with ftp.westgis.ac.cn, use g6 to add path
@@ -604,7 +456,7 @@ class Admin_DownController extends Zend_Controller_Action
 					if ($has_ftp1)
 					{
 						$user=(object)array("id"=>$row['userid'],
-    									"username"=>"westdc_".$row['userid'],
+    									"username"=>"sjy_".$row['userid'],
     									"password"=>$password,
     									"time"=>date('Y-m-d H:i:s', strtotime('+2 week')),    									
     									//"path"=>$path,
@@ -631,12 +483,12 @@ class Admin_DownController extends Zend_Controller_Action
 					if ($has_ftp2)
 					{
 						$user=(object)array("id"=>$row['userid'],
-    									"username"=>"westdc_".$row['userid'],
+    									"username"=>"sjy_".$row['userid'],
     									"password"=>$password,
     									"time"=>date('Y-m-d H:i:s', strtotime('+2 week')),    									
     									//"path"=>$path,
     									"param"=>"offlineappid=".$finish,
-    									"host"=>'ftp2.westgis.ac.cn',
+    									"host"=>'ftp.sanjiangyuan.org.cn',
     									"maxdata"=>$this->view->config->download->max,
     									"datacount"=>1 //represent one offline application
     									);
@@ -659,10 +511,10 @@ class Admin_DownController extends Zend_Controller_Action
 						$ftphost='ftp://ftp1.westgis.ac.cn';
 					} else if (!$has_ftp1 && $has_ftp2)
 					{
-						$ftphost='ftp://ftp2.westgis.ac.cn';
+						$ftphost='ftp://ftp.sanjiangyuan.org.cn';
 					} else if ($has_ftp1 && $has_ftp2)
 					{
-						$ftphost='ftp://ftp1.westgis.ac.cn 以及 ftp://ftp2.westgis.ac.cn';
+						$ftphost='ftp://ftp1.westgis.ac.cn 以及 ftp://ftp.sanjiangyuan.org.cn';
 					} 
 					//发送用户邮件进行信息提示和说明
 					$mail = new WestdcMailer($this->view->config->smtp);
@@ -671,9 +523,9 @@ class Admin_DownController extends Zend_Controller_Action
 						array('user'=>$row['username'],'datalist'=>str_replace(";","\n",$row['datalist']),
 						'ftpuser'=>$user->username,'ftppwd'=>$proftp->pwd,'ftptime'=>$proftp->time,'ftphost'=>$ftphost));
 					$mail->setBodyText($mailtp->getBody());
-					$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+					$mail->setFrom($this->view->config->service->email,'数据服务组');
 					$mail->addTo($row['email']);
-					$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
+					$mail->addCc($this->view->config->service->email,'数据服务组');
 					$mail->setSubject($mailtp->getSubject());
 					$mail->send();
 				} //offline deal
@@ -875,6 +727,7 @@ class Admin_DownController extends Zend_Controller_Action
 		$undelete=$this->_getParam('undelete');
 		$emaillist=$this->_getParam('emaillist');
 		$monthreport=$this->_getParam('monthreport');
+		$submd=$this->view->config->sub->metadata;
 		
 		if ($add) {
 			$form=new OfflinelogForm();
@@ -1015,9 +868,9 @@ class Admin_DownController extends Zend_Controller_Action
 		{
 			$sql = "select distinct(t.*)  from 
 					(
-					select u.email from dataorder d left join users u on d.userid=u.id where (d.status=0 or d.status=5)
+					select u.email from dataorder d left join users u on d.userid=u.id where (d.status=0 or d.status=5) and d.uuid in (select uuid from $submd)
 					union 
-					select o.email from offlineapp o where o.userid is null and o.email is not null
+					select o.email from offlineapp o where o.userid is null and o.email is not null and o.id in (select offlineappid from dataorder where uuid in (select uuid from $submd))
 					) as t";
 			$re = $this->db->query($sql);
 			$rows = $re->fetchAll();
@@ -1173,12 +1026,13 @@ class Admin_DownController extends Zend_Controller_Action
 	{
 		$show=(int)$this->_getParam('show');
 		$delete=(int)$this->_getParam('delete');
+		$submd=$this->view->config->sub->metadata;
 
 		if(empty($show) && empty($delete))
 		{
 		   	$select=$this->db->select();
 			$select->from('onlineapp as o',array('id','userid','unit','username','ts_created','project','project_id','project_type','project_title'))
-					->join('metadata as m', 'o.uuid = m.uuid', array('title','uuid'))
+					->join($submd.' as m', 'o.uuid = m.uuid', array('title','uuid'))
 					->where('o.id in (select distinct(onlineappid) from dataorder)')
 					->order('o.id desc');
 			$paginator = Zend_Paginator::factory($select);
@@ -1211,7 +1065,7 @@ class Admin_DownController extends Zend_Controller_Action
 			$sql	="select o.*,u.username as uname,u.id as uid,m.title,m.uuid 
 						from onlineapp as o 
 						left join users as u on u.id = o.userid 
-						left join metadata as m on o.uuid = m.uuid
+						left join $submd as m on o.uuid = m.uuid
 						where o.id=?";
 			$result	=$this->db->query($sql,$show);
 			$rows 	= $result->fetch();
@@ -1226,6 +1080,7 @@ class Admin_DownController extends Zend_Controller_Action
 		$show	 =(int)$this->_getParam('show');
 		$search  = $this->_getParam('search');
 		$keyword = $this->view->keyword = $this->_getParam('keyword');
+		$submd=$this->view->config->sub->metadata;
 		
 		if(empty($show))
 		{
@@ -1233,6 +1088,7 @@ class Admin_DownController extends Zend_Controller_Action
 			$select->from('dataorder as o','count(o.id) as num')
 					->join('users as u', 'u.id = o.userid', array('realname','id as uid','unit'))
 					->where('o.status=0 or o.status=5')
+					->where("o.uuid in (select uuid from $submd)")
 					->where('o.userid = u.id');
 			if(!empty($search) && !empty($keyword))
 			{
@@ -1258,7 +1114,7 @@ class Admin_DownController extends Zend_Controller_Action
 		{
 			$select=$this->db->select();
 			$select->from('dataorder as o',array('id','ts_created','userid','offlineappid','onlineappid'))
-					->joinLeft('metadata as m', 'o.uuid = m.uuid', array('title','uuid','filesize'))
+					->joinLeft($submd.' as m', 'o.uuid = m.uuid', array('title','uuid','filesize'))
 					->joinLeft('users as u','u.id=o.userid',array('realname as username'))
 					->where('o.userid = ?', $show)
 					->where('o.status=0 or o.status=5')
@@ -1285,12 +1141,13 @@ class Admin_DownController extends Zend_Controller_Action
 		$show    = $this->_getParam('show');
 		$search  = $this->_getParam('search');
 		$keyword = $this->view->keyword = $this->_getParam('keyword');
+		$submd=$this->view->config->sub->metadata;
 		
 		if(empty($show))
 		{
 	    	$select=$this->db->select();
 			$select->from('dataorder as o','count(o.id) as num')
-					->join('metadata as m', 'o.uuid = m.uuid', array('title','uuid'))
+					->join($submd.' as m', 'o.uuid = m.uuid', array('title','uuid'))
 					->where('o.uuid = m.uuid and (o.status=0 or o.status=5)');
 			if(!empty($search) && !empty($keyword))
 			{
@@ -1316,7 +1173,7 @@ class Admin_DownController extends Zend_Controller_Action
 		{
 			$select=$this->db->select();
 			$select->from('dataorder as o',array('ts_created','ts_created','offlineappid','onlineappid'))
-					->join('metadata as m', 'o.uuid = m.uuid', array('title','uuid'))
+					->join($submd.' as m', 'o.uuid = m.uuid', array('title','uuid'))
 					->join('users as u', 'o.userid=u.id',array('id as userid','username','realname'))
 					->where('m.uuid = ? and (o.status=0 or o.status=5)', $show)
 					->order('o.id desc');
@@ -1327,7 +1184,7 @@ class Admin_DownController extends Zend_Controller_Action
 			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
 			$this->view->paginator=$paginator;
 			
-			$sql="select title,uuid from metadata where uuid='$show'";
+			$sql="select title,uuid from $submd where uuid='$show'";
 			$re=$this->db->query($sql);
 			$t=$re->fetch();
 			$this->view->infos=$t;
@@ -1405,7 +1262,7 @@ class Admin_DownController extends Zend_Controller_Action
 			foreach($mails as $k=>$v)
 			{
 				$mail=new WestdcMailer($this->view->config->smtp);
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mail->setFrom($this->view->config->service->email,'数据服务组');
 				$mail->setBodyText($body);
 				$mail->setSubject($title);
 				$mail->addTo($v['email']);

application/admin/controllers/NewsController.php

@@ -42,7 +42,7 @@ class Admin_NewsController extends Zend_Controller_Action
 					left join ".$News->tbl_catalog." ct on ct.aid=n.id
 					left join ".$News->tbl_categorys." c on c.id = ct.cid
 					LEFT JOIN users u ON n.userid=u.id
-					WHERE c.id='$type' AND n.title IS NOT NULL order by n.ts_created desc";
+					WHERE c.id='$type' AND n.title IS NOT NULL and n.sub='".$this->view->config->sub->news."' order by n.ts_created desc";
 		}else
 		{
 			$sql = "select 
@@ -51,7 +51,7 @@ class Admin_NewsController extends Zend_Controller_Action
 			left join ".$News->tbl_catalog." ct on ct.aid=n.id
 			left join ".$News->tbl_categorys." c on c.id = ct.cid
 			LEFT JOIN users u ON n.userid=u.id
-			WHERE n.title IS NOT NULL
+			WHERE n.title IS NOT NULL and n.sub='".$this->view->config->sub->news."'
 			GROUP BY n.id
 			ORDER BY n.ts_created desc
 			";
@@ -85,188 +85,6 @@ class Admin_NewsController extends Zend_Controller_Action
 		$this->view->deepField = $category->DeepTitle;
 	}//newslistAction 新闻列表
 	
-	function catlogAction()
-    {
-       	$add    = $this->_request->getParam('add');
-		$submit = $this->_request->getParam('submit');
-		
-		$delete = $this->_request->getParam('delete');
-		
-		$edit   = $this->_request->getParam('edit');
-		
-		$News = new Archive($this->db);
-		
-		if($add)
-		{
-			$this->view->ptype = $News->ptype;
-			
-			$this->_helper->viewRenderer('category-add');
-			
-			$category = new ArchiveCategory($this->db);
-			$catlogs = $category->GetFullCategory();
-			$this->view->categories=$catlogs;
-			$this->view->deepField = $category->DeepTitle;
-
-			if(empty($submit)){
-				
-				//$this->_helper->viewRenderer('category-add');
-				
-			}else{
-				
-				$data = array();
-				
-				$data['title']    = $this->_request->getParam('ctitle');
-				$data['code']	  = $this->_request->getParam('code');
-				$data['fid']	 = $this->_request->getParam('fid');
-				$data['ptype']	 = $this->_request->getParam('ptype');
-				$data['title_en'] = $this->_request->getParam('title_en');
-				
-				$data['is_pub'] = 1;
-				
-				$this->view->info = $data;
-				
-				if(empty($data['title']))
-				{
-					$this->view->error = "请输入标题";
-					return true;
-				}
-				
-				if(empty($data['code']))
-				{
-					$this->view->error = "请输入栏目连接，如http://westdc.westgis.ac.cn/news/notice，则只需要输入notice";
-					return true;
-				}
-				
-				if(!preg_match("/^[a-z]+$/",$data['code']))
-				{
-					$this->view->error = "url格式不正确，仅允许26个小写字母";
-					return true;
-				}
-				
-				$LftRgt = $category->Insert($data['fid']);
-				$data['tid'] = $data['fid'];
-				$data['lft'] = $LftRgt['left'];
-				$data['rgt'] = $LftRgt['right'];
-				unset($data['fid']);
-				
-				if($this->db->insert($category->CategoryTable,$data))
-				{
-					$this->view->msg = '提示信息：栏目添加成功！';
-					$this->view->jump_url = '/admin/news/catlog';
-					return true;
-				}else{
-					$this->view->error = "添加失败，请重试";
-					return true;
-				}
-				
-			}
-			
-		}//栏目添加
-		if($delete>0)
-		{
-			$sql = "delete from ".$News->tbl_categorys." where id='$delete'";
-			if($this->db->exec($sql)>0)
-			{
-				$this->messenger->addMessage('提示信息：栏目删除成功！');
-				$this->_redirect('/admin/news/catlog');
-			}
-			
-		}//栏目删除
-		
-		if($edit>0)
-		{
-			$submit = $this->_getParam('submit');
-			$this->_helper->viewRenderer('category-edit');
-			
-			$this->view->ptype = $News->ptype;
-			$category = new ArchiveCategory($this->db);			
-			$this->view->info = $category->GetOne($edit);
-			$this->view->categories = $category->GetFullCategory();
-			$this->view->deepField = $category->DeepTitle;
-			
-			if(!empty($submit))
-			{
-				
-				$data = array();
-				
-				$data['title']    = $this->_request->getParam('ctitle');
-				$data['code']	  = $this->_request->getParam('code');
-				$data['fid']	 = $this->_request->getParam('fid');
-				$data['ptype']	 = $this->_request->getParam('ptype');
-				$data['is_pub'] = $this->_request->getParam('is_pub');
-				$data['title_en'] = $this->_request->getParam('title_en');
-				
-				$this->view->info = $data;
-				
-				if(empty($data['title']))
-				{
-					$this->view->error = "请输入标题";
-					return true;
-				}
-				
-				if(empty($data['code']))
-				{
-					$this->view->error = "请输入栏目连接，如http://westdc.westgis.ac.cn/news/notice，则只需要输入notice";
-					return true;
-				}
-				
-				if(!preg_match("/^[a-z]+$/",$data['code']))
-				{
-					$this->view->error = "url格式不正确，仅允许26个小写字母";
-					return true;
-				}
-				
-				$LftRgt = $category->Insert($data['fid']);
-				$data['tid'] = $data['fid'];
-				$data['lft'] = $LftRgt['left'];
-				$data['rgt'] = $LftRgt['right'];
-				unset($data['fid']);
-				
-				if($this->db->update($News->tbl_categorys,$data,"id=$edit"))
-				{
-					$this->view->msg = '提示信息：栏目添加成功！';
-					$this->view->jump_url = '/admin/news/catlog';
-					return true;
-				}else{
-					$this->view->error = "添加失败，请重试";
-					return true;
-				}
-				
-			}
-			
-		}//栏目编辑
-			
-		else
-		{
-			
-			$category = new ArchiveCategory($this->db);
-			$News = new Archive($this->db);
-			
-			$catlogs = $category->GetFullCategory();
-			$ptype = $News->ptype;
-			
-			foreach($catlogs as $k=>$v)
-			{
-				$url_parts = array(
-					"ptype"=>$v['ptype'],
-					"type_code"=>$v['code']
-				);
-				$catlogs[$k]['url'] = $News->makeCategoryUrl($url_parts);
-				
-				foreach($ptype as $kk=>$vv)
-				{
-					if($catlogs[$k]['ptype'] == $vv)
-					{
-						$catlogs[$k]['ptype'] = $kk;
-					}
-				}
-			}
-			$this->view->catlogs=$catlogs;
-			$this->view->deepField = $category->DeepTitle;
-		}//栏目列表
-		
-		
-    }//栏目管理
 		
 	function getSubCategory($fid)
 	{
@@ -382,8 +200,7 @@ class Admin_NewsController extends Zend_Controller_Action
 			'pubtimer',
 			'pubtime',
 			'description',
-			'keyword',
-			'language'
+			'keyword'
 		);
 		foreach($_POST as $k=>$v)
 		{
@@ -438,8 +255,7 @@ class Admin_NewsController extends Zend_Controller_Action
 			'source'	=> $source,
 			'ts_published' => $pubtime,
 			'is_pub'	=> $pub,
-			'body'		=> $body,
-			'language' 	=> $language
+			'body'		=> $body
 		);
 		
 		$update = $this->_getParam('update');

application/admin/controllers/ReviewController.php

@@ -8,6 +8,8 @@ class Admin_ReviewController extends Zend_Controller_Action
 		$this->view->theme = new Theme();
 		$this->_helper->layout->setLayout('administry');
 		$this->view->pageID = "review-".$this->_request->getActionName();
+		$this->submd=$this->view->config->sub->metadata;
+		$this->subsearch=$this->view->config->sub->search;
     }
 	
 	/*
@@ -17,7 +19,7 @@ class Admin_ReviewController extends Zend_Controller_Action
     function indexAction()
     {
         $sql = "select m.id,md.title,u.username,u.realname,m.status from mdstatus m
-					right join metadata md on md.uuid=m.uuid
+					right join $this->submd md on md.uuid=m.uuid
 					left join users u on u.id=m.userid
 					order by m.id desc limit 10 ";
 		$re = $this->db->query($sql);
@@ -39,7 +41,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 		}
 		
 		$sql = "select m.id,md.title,u.username,u.realname,m.status from mdstatus m
-				right join metadata md on md.uuid=m.uuid
+				right join $this->submd md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
 				where u.id='$userid'";
 				
@@ -188,7 +190,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 			if(!empty($keyword))
 			{
 				$sql = "select m.*,md.title,u.username,u.realname from mdstatus m
-					right join metadata md on md.uuid=m.uuid
+					right join $this->submd md on md.uuid=m.uuid
 					left join users u on u.id=m.userid
 					where m.status in (1,2,3,4)
 					and md.title like '%$keyword%'
@@ -207,7 +209,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 		else
 		{
 			$sql = "select m.*,md.title,u.username,u.realname from mdstatus m
-					right join metadata md on md.uuid=m.uuid
+					right join $this->submd md on md.uuid=m.uuid
 					left join users u on u.id=m.userid
 					where m.status in (1,2,3,4)
 					order by m.ts_created desc";
@@ -240,7 +242,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 		{
 			
 			$sql = "select m.*,md.*,u.realname from mdstatus m
-					right join metadata md on md.uuid=m.uuid
+					right join $this->submd md on md.uuid=m.uuid
 					left join users u on u.id=m.userid
 					where m.id=$show
 					";
@@ -296,7 +298,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 			}
 			
 			$sql = "select m.id,md.title,m.status,m.uuid,u.username,u.realname from mdstatus m
-					right join metadata md on md.uuid=m.uuid
+					right join $this->submd md on md.uuid=m.uuid
 					left join users u on u.id=m.userid
 					where m.status in (2,3,4) $searchjoin order by m.ts_accepted desc";
 			$rs = $this->db->query($sql);
@@ -504,7 +506,6 @@ class Admin_ReviewController extends Zend_Controller_Action
 			
 			$id = $this->_request->getParam('id');
 			$uid = $this->_request->getParam('uid');
-			$i = $this->_request->getParam('i');
 			if(empty($id))
 			{
 				$this->_redirect("/admin/review");
@@ -521,12 +522,6 @@ class Admin_ReviewController extends Zend_Controller_Action
 					view::Post($this,array("content"=>'修改成功','url'=>-1));
 					return true;
 				}
-			}
-    		else if($i == "1") {
-		        $this->_helper->layout->disableLayout();
-		        $this->_helper->viewRenderer('changeadmin-iframe');
-            }else{
-            	$this->_helper->viewRenderer('changeadmin');
 			}
 
 			$sql = "select u.* from users u 
@@ -756,7 +751,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 				//update search document
 				$search=new Search();
 				//create search view in xunsearch
-				$sql="select * from xunsearch where uuid in (select uuid from mdstatus where id in (".$ids."))";
+				$sql="select * from $this->subsearch where uuid in (select uuid from mdstatus where id in (".$ids."))";
 				$sth = $this->db->prepare($sql);
 				$sth->execute();
 				while ($data = $sth->fetch())
@@ -767,7 +762,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 				//仅对单条数据发送email信息
 				if (is_numeric($ids))
 				{
-					$sql="select distinct u.email,m.title,m.uuid from mdstatus s left join metadata m on s.uuid=m.uuid 
+					$sql="select distinct u.email,m.title,m.uuid from mdstatus s left join $this->submd m on s.uuid=m.uuid 
 						right join mdauthor a on s.uuid=a.uuid left join users u on a.userid=u.id where s.id=? order by u.email";
 					$rs=$this->db->query($sql,array($ids));
 					$rows=$rs->fetchAll();
@@ -813,10 +808,10 @@ class Admin_ReviewController extends Zend_Controller_Action
 		}
 		
 		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created,gn.id as gnid from mdstatus m
-				right join metadata md on md.uuid=m.uuid
+				right join $this->submd md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
 				left join geonetworkmetadata gn on m.uuid=gn.uuid
-				where m.status=0 $searchjoin order by m.ts_created desc";
+				where status=0 $searchjoin order by m.ts_created desc";
 				
 		$re = $this->db->query($sql);
 		$rows = $re->fetchAll();
@@ -875,9 +870,9 @@ class Admin_ReviewController extends Zend_Controller_Action
 		}
 		
 		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status from mdstatus m
-				right join metadata md on md.uuid=m.uuid
+				right join $this->submd md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
-				where m.status=-1 $searchjoin";
+				where status=-1 $searchjoin";
 				
 		$re = $this->db->query($sql);
 		$rows = $re->fetchAll();
@@ -915,9 +910,9 @@ class Admin_ReviewController extends Zend_Controller_Action
 		}
 		
 		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_finished from mdstatus m
-				right join metadata md on md.uuid=m.uuid
+				right join $this->submd md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
-				where m.status=5 $searchjoin order by m.ts_finished desc";
+				where status=5 $searchjoin order by m.ts_finished desc";
 				
 		$re = $this->db->query($sql);
 		$rows = $re->fetchAll();
@@ -1204,7 +1199,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 			}
 			
 			$sql = "select r.*,md.title,u.realname,u.id as uid from mdreview r
-					left join metadata md on md.uuid=r.uuid
+					left join $this->submd md on md.uuid=r.uuid
 					left join users u on u.id=r.userid
 					where r.id='$id'
 					";
@@ -1289,7 +1284,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 			}		
 		
 			$sql = "select md.title,md.uuid,u.realname,r.id,r.ts_created,r.is_expert from mdreview r
-					left join metadata md on md.uuid=r.uuid
+					left join $this->submd md on md.uuid=r.uuid
 					left join users u on u.id=r.userid
 					$wheresql
 					order by r.ts_created desc
@@ -1340,7 +1335,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 			}		
 		
 			$sql = "select u.id,u.realname as title,count(r.id) as c from mdreview r
-					left join metadata md on md.uuid=r.uuid
+					left join $this->submd md on md.uuid=r.uuid
 					left join users u on u.id=r.userid
 					$wheresql
 					GROUP BY u.id,u.realname
@@ -1470,7 +1465,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 			}		
 		
 			$sql = "select md.title,md.uuid,count(r.id) as c from mdreview r
-			left join metadata md on md.uuid=r.uuid
+			left join $this->submd md on md.uuid=r.uuid
 			$wheresql
 			GROUP BY md.title,md.uuid
 			";

application/admin/controllers/StatController.php

@@ -9,6 +9,7 @@ class Admin_StatController extends Zend_Controller_Action
     	$this->view->messages = $this->messenger->getMessages();
 		$this->view->theme = new Theme();
 		$this->_helper->layout->setLayout('administry');
+		$this->submd=$this->view->config->sub->metadata;
     }
     function postDispatch()
     {
@@ -17,37 +18,31 @@ class Admin_StatController extends Zend_Controller_Action
     function indexAction()
     {
       $sql="select (select count(id) from users) as alluser,
-      (select count(id) from normalmetadata) as alldata,
-      (select count(id) as num from dataorder where status=0) as onlinedown,
-      (select count(id) as num from dataorder where status=5) as offlinedown,
-      (select count(id) as num from offlineapp where ts_approved is not null) as offlinepass,
-      (select count(id) as num from offlineapp where ts_approved is null) as offlineunfinished,
-      (select count(id) as num from dataorder where offlineappid>0 and status=-1) as offlinedenied,
-      (select count(id) as num from onlineapp) as onlineapp";
+      (select count(id) from $this->submd) as alldata,
+      (select count(id) as num from dataorder where status=0 and uuid in (select uuid from $this->submd)) as onlinedown,
+      (select count(id) as num from dataorder where status=5 and uuid in (select uuid from $this->submd)) as offlinedown,
+      (select count(id) as num from offlineapp where ts_approved is not null and id in (select offlineappid from dataorder where uuid in (select uuid from $this->submd))) as offlinepass,
+      (select count(id) as num from offlineapp where ts_approved is null and id in (select offlineappid from dataorder where uuid in (select uuid from $this->submd))) as offlineunfinished,
+      (select count(id) as num from dataorder where offlineappid>0 and status=-1 and uuid in (select uuid from $this->submd)) as offlinedenied,
+      (select count(id) as num from onlineapp where id in (select onlineappid from dataorder where uuid in (select uuid from $this->submd))) as onlineapp";
       $this->view->stat=$this->db->fetchRow($sql);
 		
 		//下载量统计
-		$sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where (d.status=0 or d.status=5) and m.filesize>0 group by m.title,d.userid,m.filesize) as t";
+		$sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join $this->submd m on d.uuid=m.uuid where (d.status=0 or d.status=5) and m.filesize>0 group by m.title,d.userid,m.filesize) as t";
 		$res = $this->db->query($sql);
 		$allsize = $res->fetch();
 		$this->view->allsize = $allsize;
 		
-		$sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where d.status=5 and m.filesize>0 group by m.title,d.userid,m.filesize) as t";
+		$sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join $this->submd m on d.uuid=m.uuid where d.status=5 and m.filesize>0 group by m.title,d.userid,m.filesize) as t";
 		$res = $this->db->query($sql);
 		$offlinesize = $res->fetch();
 		$this->view->offlinesize = $offlinesize;
 		
-		$sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where d.status=0 and m.filesize>0 group by m.title,d.userid,m.filesize) as t";
+		$sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join $this->submd m on d.uuid=m.uuid where d.status=0 and m.filesize>0 group by m.title,d.userid,m.filesize) as t";
 		$res = $this->db->query($sql);
 		$onlinesize = $res->fetch();
 		$this->view->onlinesize = $onlinesize;		
 		
-		$sql="select sum(configvalue::real)/1024/1024/1024 as num from g6ftpusersettings where userid in (select id from g6ftpusers where name like 'westdc%' or name='newwestdc') and configname='StatsDownloaded'";
-		$res = $this->db->query($sql);
-		$onlinesize = $res->fetch();
-		$this->view->onlineg6size = $onlinesize;
-		
-		
     }//indexAction 首页
 
 	function unitAction()
@@ -71,7 +66,7 @@ class Admin_StatController extends Zend_Controller_Action
 				where d.offlineappid>0 and o.unit is not null and d.status>4";*/
 		//各单位下载情况，统计的离线申请数据次数
 		$sql = "select count(o.id) as num,o.unit from offlineapp o 
-				where o.unit is not null ";
+				where o.unit is not null and o.id in (select offlineappid from dataorder where uuid in (select uuid from $this->submd))";
 		if ($y)
 			$sql.=" and extract(year from o.ts_created)='$y'";
 		$sql.=" group by o.unit";
@@ -81,7 +76,8 @@ class Admin_StatController extends Zend_Controller_Action
 		//各单位在线下载情况
 		$sql = "select count(d.id) as num,o.unit from dataorder d
 				left join onlineapp o on o.id=d.onlineappid
-				where d.onlineappid>0 and o.unit is not null";
+				where d.onlineappid>0 and o.unit is not null
+				and d.uuid in (select uuid from $this->submd)";
 		if ($y)
 			$sql.=" and extract(year from o.ts_created)='$y'";
 		$sql.=" group by o.unit";

application/admin/controllers/SysController.php

@@ -1,4 +1,6 @@
 <?php
+use Helpers\View as view;
+
 class Admin_SysController extends Zend_Controller_Action 
 {
     function preDispatch()
@@ -86,6 +88,15 @@ class Admin_SysController extends Zend_Controller_Action
 			
 		}//模板编辑
 		
+		else if($ac=='del'&& !empty($id))
+		{
+			$sql="delete from emailtext where id='$id' ";
+			$rs = $this->db->query($sql);
+			view::Post($this,'模板已删除',-1);
+			return;
+			
+		}
+		
 		else if($ac=='test'&& !empty($id))
 		{
 			if(!empty($submit))
@@ -602,7 +613,7 @@ class Admin_SysController extends Zend_Controller_Action
 			$sql = "SELECT m.title,m.uuid,m.filesize,ds.host,ds.path from metadata m 
 					LEFT JOIN mdstatus s ON m.uuid=s.uuid
 					LEFT JOIN dataset ds ON m.uuid=ds.uuid
-					where s.status>4 and (ds.id not in (select distinct dsid from datafile) or ds.id in (select id from dataset where host='ftp2.westgis.ac.cn' and path like '/disk1/WATER%'))
+					where s.status>4 and ds.id not in (select distinct dsid from datafile)
 					group by m.title,m.uuid,ds.host,ds.path,m.filesize
 					ORDER BY m.title DESC;";
 			$sth = $this->db->prepare($sql);
@@ -687,7 +698,7 @@ where res.email is not null and role.role in ('resourceProvider','owner','pointO
 			$this->_helper->viewRenderer('problem-md');
 		} else if ($ac=='unmoved')
 		{
-			$sql = "SELECT distinct m.title,m.uuid,g.id as gid,m.filesize,ds.host,ds.path
+			$sql = "SELECT distinct m.title,m.uuid,g.id as gid
  from metadata m 
 LEFT JOIN mdstatus s ON m.uuid=s.uuid
 left join geonetworkmetadata g on m.uuid=g.uuid
@@ -704,57 +715,9 @@ left join dataset ds on ds.uuid=m.uuid
 			$paginator->setView($this->view);
 			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
 			$this->view->paginator=$paginator;
-			//$this->_helper->viewRenderer('problem-md');
+			$this->_helper->viewRenderer('problem-md');
 		}
 	$this->view->activeID="btn-".$ac;
 	} 
-
-	//GeoNetwork中元数据批量替换操作
-	function gnmetadataAction() 
-	{
-	    $this->wdb=Zend_Db::factory($this->view->config->geonetwork);
-	    set_time_limit(0);		
-		$ac=$this->_request->getParam('ac');
-		//use preg_replace to replace the string
-		$form=new ReplaceForm();
-		if ($this->_request->isPost()) {
-			$formdata=$this->_request->getPost();
-				$pattern=$formdata["pattern"];
-				$form->populate($formdata);
-				if (substr($pattern,0,1)!='/')
-				{
-					$pattern='/'.$pattern.'/m';
-				}
-				$replace=$formdata["replace"];
-				if (isset($formdata["test"]))
-				{
-					$this->view->test=preg_replace($pattern,$replace,$formdata["source"]);
-				} elseif (isset($formdata["submit"])) {
-					$sql="select uuid,data from metadata where istemplate = 'n'";
-					$rows=$this->wdb->fetchAll($sql);
-					$this->view->deal=array();
-					foreach($rows as $k=>$row)
-					{
-						//do the replace
-						$new_data=preg_replace($pattern,$replace,$row['data']);
-						//防止正则错误
-						if (!empty($new_data))
-						{			
-							$sql="update metadata set data=? where uuid='".$row['uuid']."'";
-							if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
-							{
-								$dom = new DOMDocument();
-								$dom->loadXML($row['data']);
-								$title=$dom->getElementsByTagName('resTitle')->item(0)->nodeValue;
-								$deal['uuid']=$row['uuid'];
-								$deal['title']=$title;
-								$this->view->deal[]=$deal;
-							}
-						}
-					}
-				}
-			}
-		$this->view->form=$form;		
-	} 
 }
 

application/admin/controllers/TestController.php

@@ -0,0 +1,80 @@
+<?php
+class Admin_TestController extends Zend_Controller_Action 
+{
+    function preDispatch()
+    {
+    	$this->db=Zend_Registry::get('db');
+    	$this->view->config = Zend_Registry::get('config');
+    	$this->messenger=$this->_helper->getHelper('FlashMessenger');
+    	$this->view->messages = $this->messenger->getMessages();
+		$this->_helper->layout->setLayout('administry');
+    	$this->wdb=Zend_Db::factory('Pdo_Pgsql', array('host'=> '210.77.68.252','username' => 'wlz','password' => 'glacier','dbname'=> 'new_geonetwork'));
+    }
+    function postDispatch()
+    {
+    	$this->view->messages = $this->messenger->getMessages();
+    }
+    function indexAction()
+    {
+        //其他连接
+    }
+
+
+	//测试文献的下载链接是否正确
+	function reftestAction()
+	{
+		$sql="select * from reference where link<>''";
+		$rows=$this->db->query($sql);
+		foreach($rows as $row)
+		{
+			if (substr($row['link'],0,1)=='/')
+			{
+				if (!file_exists("http://westdc.westgis.ac.cn".$row['link']))
+				{
+					$ref[]=$row;
+				}
+			} elseif (!file_exists($row['link'])) {
+				$ref[]=$row;
+			}				
+		}
+		$this->view->ref=$ref;
+	}
+	
+	//检查DOI是否有重复
+	function doiAction()
+	{
+		$sql="select doi,uuid,title from metadata where doi<>'' order by doi";
+		$rows=$this->db->fetchAll($sql);
+		$sql="select distinct(doi) from metadata where doi<>'' order by doi";
+		$drows=$this->db->fetchAll($sql);
+		$c=0;
+		if (count($rows)!=count($drows))
+		{
+			foreach($rows as $k=>$row)
+			{
+				if ($row['doi']!=$drows[$k-$c]['doi'])
+				{
+					$c++;
+					$doi[]=$rows[$k-1];
+					$doi[]=$row;
+				}
+			}
+			$this->view->doi=$doi;
+		}
+	}
+
+	//检查DOI是否有重复
+	function nodoiwaterAction()
+	{
+		$sql="select uuid,title from metadata where source='0595169a-279e-4b95-819f-129d0ba4280d' and doi='' order by title";
+		$this->view->rows=$this->db->fetchAll($sql);
+	}
+	
+	//检查source不符合要求
+	function sourceAction()
+	{
+		$sql="select uuid,title,source from metadata where title ilike '黑河综合遥感联合试验%' and source=''";
+		$this->view->rows=$this->db->fetchAll($sql);
+	}
+}
+

application/admin/controllers/UserController.php

@@ -1,5 +1,7 @@
 <?php
-use Helpers\View;
+use Helpers\View as view;
+use Helpers\PDO;
+use Users\Users;
 
 class Admin_UserController extends Zend_Controller_Action 
 {
@@ -22,7 +24,7 @@ class Admin_UserController extends Zend_Controller_Action
         $uq=$this->db->query($sql);
         $row=$uq->fetch();
         
-        $sqlt="select count(id) as total from users where usertype='administrator'";
+        $sqlt="select count(id) as total from users where usertype='{$this->view->config->auth->identifier}'";
         $uqt=$this->db->query($sqlt);
         $adminrow=$uqt->fetch();
         
@@ -46,7 +48,7 @@ class Admin_UserController extends Zend_Controller_Action
 		$paginator->setCurrentPageNumber($this->_getParam('page'));
 		$paginator->setItemCountPerPage(30);
 		$paginator->setView($this->view);
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
+		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
 		$this->view->paginator=$paginator;
     }//listAction
     
@@ -117,14 +119,48 @@ class Admin_UserController extends Zend_Controller_Action
     {
 		$select=$this->db->select();
 		$select->from('users')
-				->where('usertype = ?', 'administrator')
+				->where('usertype = ?', $this->view->config->auth->identifier)
 				->order('users.id desc');
+		
+		
 		$paginator = Zend_Paginator::factory($select);
 		$paginator->setCurrentPageNumber($this->_getParam('page'));
 		$paginator->setItemCountPerPage(30);
 		$paginator->setView($this->view);
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
+		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
 		$this->view->paginator=$paginator;
+		
+		$ac = $this->_getParam('ac');
+		
+		if($ac == 'sync')
+		{
+			$sql = "SELECT id FROM users WHERE usertype='administrator'";
+			$rs = $this->db->query($sql);
+			$ids = $rs->fetchAll();
+			
+			$data = array();
+			foreach($ids as $v)
+			{
+				$data[] = $v['id'];
+			}
+			unset($ids);
+			
+			$ids = join(",",$data);
+			
+			$gn_sql = "update users set  profile='Administrator' where id in ($ids)";
+			$gn_db = new PDO(array(
+				'host'=> $this->view->config->geonetwork->params->host,
+				'port' => 5432,
+				'user' => $this->view->config->geonetwork->params->username,
+				'pwd' => $this->view->config->geonetwork->params->password ,
+				'db' => $this->view->config->geonetwork->params->dbname
+			));
+			
+			$gn_db->exec("update users set profile='Editor' where id>1 and profile='Administrator'");
+			$gn_db->exec($gn_sql);
+			
+			view::Post($this,"同步成功！",-1);
+		}
     }
     
 	function showAction()
@@ -133,10 +169,10 @@ class Admin_UserController extends Zend_Controller_Action
 		if (isset($id)) 
 		{
 			try {
-				$sql="select * from users where id=?";
-				$result=$this->db->query($sql,$id);
-				$rows = $result->fetch();
-				$this->view->infos=$rows;
+				$user = new \Users\Users;
+				$this->view->infos=$user->getUser($id);
+				$this->view->usertypes = $user->getUserType();
+				
 			} catch (Exception $e) {
 				$this->messenger->addMessage($e->getMessage());
 			}
@@ -205,6 +241,7 @@ class Admin_UserController extends Zend_Controller_Action
     	$updates=array();
 		if (isset($id)) 
 		{
+			
 			if(!empty($newpwd)&&!empty($cfnewpwd))
 	    	{
 	    		if($newpwd==$cfnewpwd)
@@ -232,6 +269,7 @@ class Admin_UserController extends Zend_Controller_Action
 			} catch (Exception $e) {
 				$this->messenger->addMessage($e->getMessage());
 			}
+			
 			$this->_redirect("/admin/user/show/id/$id");
 		}
 		else {
@@ -1196,35 +1234,6 @@ class Admin_UserController extends Zend_Controller_Action
 		
 	}//sendemailAction()
 	
-    public function banAction()
-    {
-        $id = $this->_getParam('uid');
-        $users = new Users\Users();
-
-        $status = $users->ban($id);
-        if($status === TRUE)
-        {
-            view::Post($this,"操作成功",-1);
-        }else{
-            view::Post($this,"操作失败",-1);
-        }
-    }
-
-    public function unbanAction()
-    {
-        $id = $this->_getParam('uid');
-        $users = new Users\Users();
-
-        $status = $users->unban($id);
-        if($status === TRUE)
-        {
-            view::Post($this,"操作成功",-1);
-        }else{
-            view::Post($this,"操作失败",-1);
-        }
-
-    }
-
 	
 	
 	public function jsonexit($data){

application/admin/controllers/WatermdController.php

@@ -0,0 +1,441 @@
+<?php
+class Admin_WatermdController extends Zend_Controller_Action 
+{
+    function preDispatch()
+    {
+    	$this->db=Zend_Registry::get('db');
+    	$this->view->config = Zend_Registry::get('config');
+    	$this->messenger=$this->_helper->getHelper('FlashMessenger');
+    	$this->view->messages = $this->messenger->getMessages();
+		$this->_helper->layout->setLayout('administry');
+    	$this->wdb=Zend_Db::factory($this->view->config->geonetwork);
+    	set_time_limit(0);
+    }
+    function postDispatch()
+    {
+    	$this->view->messages = $this->messenger->getMessages();
+    }
+    function indexAction()
+    {
+        //其他连接
+    }
+
+	function replaceAction()
+	{
+		//use preg_replace to replace the string
+		$form=new ReplaceForm();
+		if ($this->_request->isPost()) {
+			$formdata=$this->_request->getPost();
+			$pattern=$formdata["pattern"];
+			$form->populate($formdata);
+			if (substr($pattern,0,1)!='/')
+			{
+				$pattern='/'.$pattern.'/m';
+			}
+			$replace=$formdata["replace"];
+			if (isset($formdata["test"]))
+			{
+				$this->view->test=preg_replace($pattern,$replace,$formdata["source"]);
+			} elseif (isset($formdata["submit"]))
+			{
+				$sql="select uuid,data from metadata where istemplate = 'n'";
+				$rows=$this->wdb->fetchAll($sql);
+				$this->view->deal=array();
+				foreach($rows as $k=>$row)
+				{
+					//do the replace
+					$new_data=preg_replace($pattern,$replace,$row['data']);
+					//防止正则错误
+					if (!empty($new_data))
+					{			
+						$sql="update metadata set data=? where uuid='".$row['uuid']."'";
+						if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
+						{
+						$dom = new DOMDocument();
+						$dom->loadXML($row['data']);
+						$title=$dom->getElementsByTagName('resTitle')->item(0)->nodeValue;
+						$deal['uuid']=$row['uuid'];
+						$deal['title']=$title;
+						$this->view->deal[]=$deal;
+						}
+					}
+				}
+			}
+		}
+		$this->view->form=$form;
+	}
+
+	//替换关键词	
+	function keywordAction()
+	{
+		//use preg_replace to replace the string
+		$form=new ReplaceForm();
+		$form->pattern->setLabel('原关键词');
+		$form->replace->setLabel('替换关键词');
+		if ($this->_request->isPost()) {
+			$formdata=$this->_request->getPost();
+			$pattern=$formdata["pattern"];
+			$form->populate($formdata);
+			//if (substr($pattern,0,1)!='/')
+			{
+				$pattern='/\<keyword\>'.$pattern.'\<\/keyword\>/m';
+			}
+			$replace='<keyword>'.$formdata["replace"].'</keyword>';
+			if (isset($formdata["test"]))
+			{
+				$this->view->test=preg_replace($pattern,$replace,$formdata["source"]);
+			} elseif (isset($formdata["submit"]))
+			{
+				$sql="select uuid,data from metadata where istemplate = 'n'";
+				$rows=$this->wdb->fetchAll($sql);
+				$this->view->deal=array();
+				foreach($rows as $k=>$row)
+				{
+					//do the replace
+					$new_data=preg_replace($pattern,$replace,$row['data']);
+					//防止正则错误
+					if (!empty($new_data))
+					{			
+						$sql="update metadata set data=? where uuid='".$row['uuid']."'";
+						if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
+						{
+						$dom = new DOMDocument();
+						$dom->loadXML($row['data']);
+						$title=$dom->getElementsByTagName('resTitle')->item(0)->nodeValue;
+						$deal['uuid']=$uuid;
+						$deal['title']=$title;
+						$this->view->deal[]=$deal;
+						}
+					}
+				}
+			}
+		}
+		$this->view->form=$form;
+	}
+	
+	//替换标题和英文标题到数据引用中，以标题为准
+	function citetitleAction()
+	{
+		$form=new ReplaceForm();
+		$form->setElements(array($form->source,$form->test,$form->submit));
+	
+		if ($this->_request->isPost()) {
+			$formdata=$this->_request->getPost();
+			$form->populate($formdata);
+			if (isset($formdata["test"]))
+			{
+					$dom = new DOMDocument();
+					$dom->loadXML($formdata['source']);
+					$root = $dom->getElementsByTagName('Metadata');
+					$xpath = new DOMXpath($dom);
+					$title_key=$xpath->query("//Metadata/dataIdInfo/idCitation/resTitle");
+					$title=$title_key->item(0)->nodeValue;
+					$title_en_path=$xpath->query("//Metadata/dataIdInfo/idCitation/resAltTitle");
+					$title_en=$title_en_path->item(0)->nodeValue;
+					$otherCitDet=$xpath->query("//Metadata/dataIdInfo/idCitation/otherCitDet");
+					$other=$otherCitDet->item(0)->nodeValue;
+					$other_cn=mb_strstr($other,'[',true);
+					$title_o=mb_strstr($other_cn,'.',false);
+					$title_ol=substr($title_o,1,-4);
+					$title_old=mb_strstr($title_ol,'.',true);
+					$other_eng=mb_strstr($other,'[',false);
+					$titlen_o=mb_strstr($other_eng,'.',false);
+					$titlen_ol=substr($titlen_o,1,-4);
+					$titlen_old=mb_strstr($titlen_ol,',',true);
+					$new_other=str_replace(array($title_old,$titlen_old),array($title,$title_en),$other);
+					$otherCitDet->item(0)->nodeValue=$new_other;
+					$this->view->test= $dom->saveXML($root->item(0));			
+			} elseif (isset($formdata["submit"]))
+			{
+				$sql="select uuid,data from metadata where istemplate = 'n'";
+				$rows=$this->wdb->fetchAll($sql);
+				$this->view->deal=array();
+				foreach($rows as $k=>$row)
+				{
+					//do the replace
+					$dom = new DOMDocument();
+					$dom->loadXML($row['data']);
+					$uuid = $row['uuid'];
+					$root = $dom->getElementsByTagName('Metadata');
+					$xpath = new DOMXpath($dom);
+					$title_key=$xpath->query("//Metadata/dataIdInfo/idCitation/resTitle");
+					$title=$title_key->item(0)->nodeValue;
+					$title_en_path=$xpath->query("//Metadata/dataIdInfo/idCitation/resAltTitle");
+					$title_en=$title_en_path->item(0)->nodeValue;
+					$otherCitDet=$xpath->query("//Metadata/dataIdInfo/idCitation/otherCitDet");
+					$other=$otherCitDet->item(0)->nodeValue;
+					$other_cn=mb_strstr($other,'[',true);
+					$title_o=mb_strstr($other_cn,'.',false);
+					$title_ol=substr($title_o,1,-4);
+					$title_old=mb_strstr($title_ol,'.',true);
+					$other_eng=mb_strstr($other,'[',false);
+					$titlen_o=mb_strstr($other_eng,'.',false);
+					$titlen_ol=substr($titlen_o,1,-4);
+					$titlen_old=mb_strstr($titlen_ol,',',true);
+					$new_other=str_replace(array($title_old,$titlen_old),array($title,$title_en),$other);
+					$otherCitDet->item(0)->nodeValue=$new_other;
+					$new_data = $dom->saveXML($root->item(0));
+					//防止错误
+					if (!empty($new_data))
+					{			
+						$sql="update metadata set data=? where uuid='".$row['uuid']."'";
+						if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
+						{
+						$dom = new DOMDocument();
+						$dom->loadXML($row['data']);
+						$deal['uuid']=$uuid;
+						$deal['title']=$title;
+						$this->view->deal[]=$deal;
+						}
+					}
+				}
+			}
+		}
+		$this->view->form=$form;	
+	}
+	
+	//文件大小处理
+	function filesizeAction()
+	{
+		$form=new ReplaceForm();
+		$form->pattern->setLabel('文件大小');
+		$form->setElements(array($form->pattern,$form->source,$form->test,$form->submit));
+	
+		if ($this->_request->isPost()) {
+			$formdata=$this->_request->getPost();
+			$form->populate($formdata);
+			if (isset($formdata["test"]))
+			{
+					$dom = new DOMDocument();
+					$dom->loadXML($formdata['source']);
+					$root = $dom->getElementsByTagName('Metadata');
+					$xpath = new DOMXpath($dom);
+					$title_key=$xpath->query("//Metadata/dataIdInfo/idCitation/resTitle");
+					$title=$title_key->item(0)->nodeValue;
+					$transize_path=$xpath->query("//Metadata/distInfo/distTranOps/transSize");
+					$transize_path->item(0)->nodeValue=$formdata['pattern'];
+					$this->view->test= $dom->saveXML($root->item(0));			
+			} elseif (isset($formdata["submit"]))
+			{
+				$sql="select uuid,data from metadata where istemplate = 'n'";
+				$rows=$this->wdb->fetchAll($sql);
+				$this->view->deal=array();
+				$sql="select update_filesize();";
+				$this->db->exec($sql);
+				foreach($rows as $k=>$row)
+				{
+					//do the replace
+					$dom = new DOMDocument();
+					$dom->loadXML($row['data']);
+					$root = $dom->getElementsByTagName('Metadata');
+					$uuid = $row['uuid'];
+					$xpath = new DOMXpath($dom);
+					$title_key=$xpath->query("//Metadata/dataIdInfo/idCitation/resTitle");
+					$title=$title_key->item(0)->nodeValue;
+					$transize_path=$xpath->query("//Metadata/distInfo/distTranOps/transSize");
+					$sql="select filesize from metadata where uuid = ?";
+					$this->db->setFetchMode(Zend_Db::FETCH_OBJ);
+					$row=$this->db->fetchRow($sql,array($uuid));
+					$transize_path->item(0)->nodeValue=$row->filesize;					
+					$new_data = $dom->saveXML();
+					//防止错误
+					if (!empty($new_data))
+					{			
+						$sql="update metadata set data=? where uuid='$uuid'";
+						if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
+						{
+						$deal['uuid']=$uuid;
+						$deal['title']=$title;
+						$this->view->deal[]=$deal;
+						}
+					}
+				}
+			}
+		}
+		$this->view->form=$form;		
+	}
+
+	//修改限制使用说明
+	//useLimit可以是多项的	
+	function uselimitAction()
+	{
+		$form=new ReplaceForm();
+		$form->pattern->setLabel('使用声明');
+		$form->setElements(array($form->pattern,$form->source,$form->test,$form->submit));
+	
+		if ($this->_request->isPost()) {
+			$formdata=$this->_request->getPost();
+			$form->populate($formdata);
+			$limit_text=$formdata['pattern'];
+			if (isset($formdata["test"]))
+			{
+					$dom = new DOMDocument();
+					$dom->loadXML($formdata['source']);
+					$root = $dom->getElementsByTagName('Metadata');
+					$xpath = new DOMXpath($dom);
+					$title_key=$xpath->query("//Metadata/dataIdInfo/idCitation/resTitle");
+					$title=$title_key->item(0)->nodeValue;
+					$uselimits=$xpath->query("//Metadata/dataIdInfo/resConst/Consts/useLimit");
+					$do_uselimit=1;
+					foreach($uselimits as $limit)
+					{
+						//已经有声明，则不需要处理
+						if ($limit->nodeValue==$limit_text || (strlen($limit->nodeValue)>3))
+							$do_uselimit=0;
+					}
+					if ($do_uselimit==1)
+					{
+						$new_uselimit=$dom->createElement('useLimit',$limit_text);
+						$new_resconst=$dom->createElement('resConst');
+						$new_const=$dom->createElement('Consts');
+						$new_const->appendChild($new_uselimit);
+						$new_resconst->appendChild($new_const);
+						$desckey=$xpath->query("//Metadata/dataIdInfo/descKeys")->item(0);
+						$resconst=$xpath->query("//Metadata/dataIdInfo/resConst")->item(0);
+						if ($resconst)
+							$resconst->parentNode->insertBefore($new_resconst,$resconst);
+						else				
+							$desckey->parentNode->insertBefore($new_resconst,$desckey);
+						$new_data=$dom->saveXML();
+					}						
+					$this->view->test= $new_data;			
+			} elseif (isset($formdata["submit"]))
+			{
+				$sql="select uuid,data from metadata where istemplate = 'n'";
+				$rows=$this->wdb->fetchAll($sql);
+				$this->view->deal=array();
+				foreach($rows as $k=>$row)
+				{
+					//do the replace
+					$dom = new DOMDocument();
+					$dom->loadXML($row['data']);
+					$root = $dom->getElementsByTagName('Metadata');
+					$uuid = $row['uuid'];
+					$xpath = new DOMXpath($dom);
+					$title_key=$xpath->query("//Metadata/dataIdInfo/idCitation/resTitle");
+					$title=$title_key->item(0)->nodeValue;
+					$uselimits=$xpath->query("//Metadata/dataIdInfo/resConst/Consts/useLimit");
+					$do_uselimit=1;
+					foreach($uselimits as $limit)
+					{
+						//已经有声明，则不需要处理
+						if ($limit->nodeValue==$limit_text || (strlen($limit->nodeValue)>3))
+							$do_uselimit=0;
+					}
+					if ($do_uselimit==1)
+					{
+						$new_uselimit=$dom->createElement('useLimit',$limit_text);
+						$new_resconst=$dom->createElement('resConst');
+						$new_const=$dom->createElement('Consts');
+						$new_const->appendChild($new_uselimit);
+						$new_resconst->appendChild($new_const);
+						$desckey=$xpath->query("//Metadata/dataIdInfo/descKeys")->item(0);
+						$resconst=$xpath->query("//Metadata/dataIdInfo/resConst")->item(0);
+						if ($resconst)
+							$resconst->parentNode->insertBefore($new_resconst,$resconst);
+						else				
+							$desckey->parentNode->insertBefore($new_resconst,$desckey);
+						$new_data=$dom->saveXML();
+						//防止错误
+						if (!empty($new_data))
+						{			
+							$sql="update metadata set data=? where uuid='".$row['uuid']."'";
+							if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
+							{
+							$deal['uuid']=$uuid;
+							$deal['title']=$title;
+							$this->view->deal[]=$deal;
+							}
+						}
+					}				
+				}
+			}
+		}
+		$this->view->form=$form;		
+	}
+
+	//联系人信息替换
+	function contactAction()
+	{
+		if ($this->_request->isPost()) {
+			$formdata=$this->_request->getPost();
+			if (isset($formdata["test"]))
+			{
+				$this->view->test=$this->contactReplace($formdata["testxml"],$formdata);
+			} elseif (isset($formdata["submit"]))
+			{
+				$sql="select uuid,data from metadata where istemplate = 'n' and data like '%".$formdata['oldname']."%'";
+				$rows=$this->wdb->fetchAll($sql);
+				$this->view->deal=array();
+				foreach($rows as $row)
+				{
+					//do the replace
+					$new_data=$this->contactReplace($row["data"],$formdata);
+					//防止错误
+					if (!empty($new_data))
+					{			
+						$sql="update metadata set data=? where uuid='".$row['uuid']."'";
+						if ($this->wdb->exec($this->wdb->quoteInto($sql,$new_data)))
+						{
+						$dom = new DOMDocument();
+						$dom->loadXML($row['data']);
+						$title=$dom->getElementsByTagName('resTitle')->item(0)->nodeValue;
+						$deal['uuid']=$row['uuid'];
+						$deal['title']=$title;
+						$this->view->deal[]=$deal;
+						}
+					}
+				}
+			}
+			$this->view->formdata=$formdata;
+		}		
+	}
+	
+	private function contactReplace($xml,$replace)
+	{
+		$dom = new DOMDocument();
+		$dom->loadXML($xml);
+		$xpath = new DOMXpath($dom);
+		$contacts=$xpath->query('//rpIndName');
+		foreach($contacts as $contact)
+		{
+			if ($contact->nodeValue==$replace['oldname'])
+			{
+				$newrpIndName=$dom->createElement('rpIndName',$replace['name']);
+				$newrpOrgName=$dom->createElement('rpOrgName',$replace['unit']);
+				$newrpCntInfo=$dom->createElement('rpCntInfo');
+				$newcntPhone=$dom->createElement('cntPhone');
+				$newrpCntInfo->appendChild($newcntPhone);
+				$newvoiceNum=$dom->createElement('voiceNum',$replace['voicenum']);
+				$newcntPhone->appendChild($newvoiceNum);
+				$newcntAddress=$dom->createElement('cntAddress');
+				$newrpCntInfo->appendChild($newcntAddress);
+				$newdelPoint=$dom->createElement('delPoint',$replace['delpoint']);
+				$newcntAddress->appendChild($newdelPoint);
+				$newcity=$dom->createElement('city',$replace['city']);
+				$newcntAddress->appendChild($newcity);
+				$newarea=$dom->createElement('adminArea',$replace['adminarea']);
+				$newcntAddress->appendChild($newarea);
+				$newpostCode=$dom->createElement('postCode',$replace['postcode']);
+				$newcntAddress->appendChild($newpostCode);
+				$newcountry=$dom->createElement('country',$replace['country']);
+				$newcntAddress->appendChild($newcountry);
+				$neweMailAdd=$dom->createElement('eMailAdd',$replace['email']);
+				$newcntAddress->appendChild($neweMailAdd);
+				
+				$rporg=$xpath->query('rpOrgName',$contact->parentNode);
+				$contact->parentNode->removeChild($rporg->item(0));
+				$rpcnt=$xpath->query('rpCntInfo',$contact->parentNode);
+				$contact->parentNode->removeChild($rpcnt->item(0));
+
+				$contact->parentNode->insertBefore($newrpIndName,$contact);
+				$contact->parentNode->insertBefore($newrpOrgName,$contact);
+				$contact->parentNode->insertBefore($newrpCntInfo,$contact);
+				
+				$contact->parentNode->removeChild($contact);
+			}
+		}
+		return $dom->saveXML();
+	}
+}
+

application/admin/views/scripts/data/attachments.phtml

@@ -11,14 +11,13 @@
 	$this->headLink()->appendStylesheet('/css/colorbox.css');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
 
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -27,34 +26,33 @@
 </div>
 <?php endif; ?>
 
-		<div class="form-group">
-			<a class="btn btn-primary btn-sm" href="/admin/data/attachments/add/1">上传新附件</a>
-			<a class="btn btn-primary btn-sm" href="attachments/search/my">查看我的附件</a>
-		</div>
-		<div class="input-group form-group" id="datalist">
-			<form action="" method="get" class="search_form input-group">
-				<input class="form-control" type="text" name="keyword" value="<?php echo $this->keyword; ?>" placeholder="搜索关键字" />
-				<input type="hidden" name="search" value='1' />
-				<span class="input-group-btn"><button class="btn btn-default" type="submit" class="searchbtn" >搜索</button></span>
+<div><a href="/admin/data/attachments/add/1">上传新附件</a> | <a href="attachments/search/my">查看我的附件</a></div>
 
+<div class="search">
+	<form action="" method="get">
+    <input type="hidden" name="search" value='1' />
+    	<ul>
+    	<li><label>搜索关键字</label><input type="text" name="keyword" value="<?php echo $this->keyword; ?>" /></li>
+    	<li><input type="submit" class="searchbtn" value="搜索" /></li>
+    	</ul>
     </form>
-		</div>
+</div><!-- search DIV -->
 
 <?php if (count($this->paginator)): ?>
 <form method="get" action="/admin/data/md/att/1/addatts/1">
-		<table class="stylized table table-bordered table-striped table-hover">
+<table class="stylized">
 <thead><tr>
 	<?php 
 	if(!empty($this->uuid))
 	echo '<th width="40">选择</th>';
 	?>
-			<th width="5%">ID</th>
-			<th width="45%">上传文件名</th>
-			<th width="5%">类型</th>
-			<th width="5%">大小</th>
-			<th width="8%">下载次数</th>
-			<th width="16%">上传时间</th>
-			<th width="28%">操作</th>
+    <th width="50">ID</th>
+    <th width='100'>上传文件名</th>
+    <th width='80'>类型</th>
+    <th width='80'>大小</th>
+    <th width='80'>下载次数</th>
+	<th width='150'>上传时间</th>
+    <th width="150">操作</th>
 	</tr></thead>
 	<tbody id="list">
 	<?php $autoindex=0;?>
@@ -96,7 +94,6 @@
 <?php endif; ?>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
 <script>
 function delatt(id){
 	$.ajax({

application/admin/views/scripts/data/attachmentsadd.phtml

@@ -9,63 +9,43 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->theme->AppendPlus($this,"uploadify");
 ?>
-<div class="row">
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
-    <div class="form-group">
-        <a class="btn btn-primary btn-sm" href="/admin/data/md/att/1/uuid/<?php echo $this->uuid;?>">返回元数据附件列表</a>
-        <a class="btn btn-primary btn-sm" href="/data/<?php echo $this->uuid; ?>">查看元数据</a>
-        <a class="btn btn-primary btn-sm" href="/admin/data/attachments/">返回附件管理</a>
-    </div>
-    <form action="#" method="POST" enctype='multipart/form-data' class="form-horizontal">
-        <input type="hidden" name="add" value="1" />
-        <input type="hidden" name="submit" value="1" />
-        <div class="form-group">
-            <label for="doi" class="col-md-2 col-sm-2 control-label">请先选择附件语言：</label>
-            <div class="col-md-2 col-sm-2">
-                <select name="language" id="language" class="form-control">
-                    <option value="zh">zh</option>
-                    <option value="en">en</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label for="doi" class="col-md-2 col-sm-2 control-label">可选择多个文件：</label>
-            <div class="col-md-6 col-sm-63">
-                <input id="file_upload" name="Filedata" type="file" />
-                <div id="datalist"></div>
-            </div>
-        </div>
-    </form>
-</div>
+<div id="rightPanel">
+
+<div class="ctrlplan">
+<a href="/admin/data/md/att/1/uuid/<?php echo $this->uuid;?>">返回元数据附件列表</a>
+<a href="/data/<?php echo $this->uuid; ?>">查看元数据</a>
+<a href="/admin/data/attachments/">返回附件管理</a>
 </div>
 	
-<style type="text/css">.uploadify{margin:0;} #file_upload-queue a:focus {outline:none;-moz-outline:none;}</style>
+    <form action="#" method="POST" enctype='multipart/form-data'>
+    <input type="hidden" name="add" value="1" />
+    <input type="hidden" name="submit" value="1" />
+    
+    <p>注:可选择多个文件<br />
+	<div id="datalist">
+    </div>
+	<input id="file_upload" name="Filedata" type="file" />
+    </p>
+
+    </form>   
+</div>
 <script>
 var _this = {
 	SessionID : '<?php echo session_id(); ?>'
 };
 var uploader;
-    var param = {};
+var param;
 param = {
 	"PHPSESSID" : _this.SessionID,
 	"multi" : 'yes'
 };
-   
-	$("#language").click(function(){
-		param.language = $("#language").val();
-	});
-
 $(function() {
     $('#file_upload').uploadify({
         'swf'      : '/js/lib/uploadify/uploadify.swf',
         'uploader' : '/admin/data/upload/<?php if(!empty($this->uuid)) echo "uuid/".$this->uuid; ?>',
-            'width': 155,
-            'buttonText': '浏览',
-            'debug': false,
-            'preventCaching':false,
 		'multi'	   : true,
 		'auto'	   : true,
 		'fileTypeExts' : '*',
@@ -74,24 +54,22 @@
         },
 		'onUploadStart' : function(file) {
             $('#file_upload').uploadify('settings','formData',param);
-
         } 
     });
 });
 var upload = {
 	onsuccess : function(file, data, response){
 		_data = $.parseJSON(data);
-            if (!$.isEmptyObject(_data.error)) {
+		if(!$.isEmptyObject(_data.error))
+		{
 			alert(_data.error);
 		}else{
 			$('#datalist').append(upload.makeFileHtml(_data));
-                // console.log($("#language").val());
-                //console.log(_data);
 		}
 	},
 	makeFileHtml : function(data){
 		return   '<div class="alert alert-success">'
-                    + '<button type="button" class="close" data-dismiss="alert" onclick="upload.deleteFile('+ data.id +')"><i class="glyphicon glyphicon-trash"></i></button>'
+		  		+ '<button type="button" class="close" data-dismiss="alert" onclick="upload.deleteFile('+data.id+')"><i class="icon-trash icon-white"></i></button>'
 		  		+ '<a href="/service/attach/id/' + data.id + '">' +data.realname + '</a>'
 				+'<input type="hidden" name="attid" value="'+data.id+'"></input>'
 				+'</div>';
@@ -102,12 +80,14 @@
 			'url':'/admin/data/attachments/',
 			'data':'uuid=<?php echo $this->uuid?>&mdattdel='+id,
 			'success':function(data){
-                    if (typeof (data) == 'undefined') {
+				if(typeof(data) == 'undefined')
+				{
 					alert("数据源错误，请联系管理员");
 					return false;
 				}
 				
-                    if (!$.isEmptyObject(data.error)) {
+				if(!$.isEmptyObject(data.error))
+				{
 					alert(data.error);
 					return false;
 				}
@@ -122,7 +102,8 @@
 
 $(document).ready(function() {		
 	 $.getJSON("/admin/data/getatts/uuid/<?php echo $this->uuid;?>", function(data) {
-            if (data) {
+		  if(data)
+		  {
 			  $.each(data, function(key, val) {
 					$('#datalist').append(upload.makeFileHtml(val));
 			  });

application/admin/views/scripts/data/attmanager.phtml

@@ -14,13 +14,13 @@
 	$this->breadcrumb('数据管理');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-			<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -28,12 +28,14 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-		<div class="form-group">
-		    <a class="btn btn-primary  btn-sm" href="/admin/data/md/att/1/uuid/<?php echo $this->uuid;?>/addatts/1/mdtitle/<?php echo $this->mdtitle ;?>">为此元数据选择附件</a>
-		    <a class="btn btn-primary  btn-sm" href="/admin/data/attachments/add/1/uuid/<?php echo $this->uuid;?>">为此元数据添加附件</a>
-		    <a class="btn btn-primary  btn-sm" href="/data/<?php echo $this->uuid; ?>">查看元数据</a>
+
+<div class="ctrlplan">
+<a href="/admin/data/md/att/1/uuid/<?php echo $this->uuid;?>/addatts/1/mdtitle/<?php echo $this->mdtitle ;?>">为此元数据选择附件</a>
+<a href="/admin/data/attachments/add/1/uuid/<?php echo $this->uuid;?>">为此元数据添加附件</a>
+<a href="/data/<?php echo $this->uuid; ?>">查看元数据</a>
 </div>
-		<table class="stylized table table-bordered table-striped table-hover">
+
+<table class="stylized">
 <thead><tr>
 	<th width='250'>文件名</th>
     <th width='80'>类型</th>
@@ -62,8 +64,7 @@
 	  </tr>';
 	}
   ?>
-			</tbody>
-		</table>
+</tbody></table>
 </div>
 <div style="display:none;">
 <form id="fileUpdate" method="post">
@@ -75,7 +76,6 @@
     </p>
 </form>
 </div>
-</div>
 <script>
 function delmdatt(id){
 	$.ajax({

application/admin/views/scripts/data/author-datas.phtml

@@ -4,61 +4,55 @@
 $this->headTitle()->setSeparator(' - ');
 $this->headScript()->appendFile('/js/jquery-1.7.min.js');
 $this->headLink()->appendStylesheet('/css/admin.css');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-	$this->headScript()->appendFile('/js/modal.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('数据作者管理');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<a class="btn btn-primary btn-sm" href="/admin/data/author">作者管理</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/author/ac/list">查看所有数据作者</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/author/ac/datas">所有数据</a>
+<div id="rightPanel">
+<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/author">作者管理</a></li>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/author/ac/list">查看所有数据作者</a></li>
+            <li class="box-shadow active"><a class="text-shadow" href="/admin/data/author/ac/datas">所有数据</a></li>
+		</ul>
 	</div>
-		<div class="input-group form-group">
-			<form id="datasearch" class="search_form input-group" action="/admin/data/author/ac/datas">
-				<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字" />
-				<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+	<div>
+		<p>请输入元数据标题关键字进行搜索</p>
+        <form id="datasearch" class="search_form" action="/admin/data/author/ac/datas">
+            <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+            <button type="submit" class="btn" id="search_btn">搜索</button>
         </form>
 	</div> 
-		<div id="datalistZ">
+    <div id="datalist">
 		<?php
 		if (count($this->paginator)): 
 		if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
-			echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-				<li id="list_<?php echo $item['id'];?>" class="well well-sm">
-					<h4><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> </h4>
-					<h5>
+			<li id="list_<?php echo $item['id'];?>">
+				<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> </p>
+                <p>
                 <?php if ($item['c']) : ?>                
-						作者数量 ：<span id="sumAuthor_<?php echo $item['id'];?>"><?php echo $item['c']; ?></span>
-						<a class="label label-info" data-trigger="modal" data-title="作者" href="/admin/data/author/ac/edit/uuid/<?php echo $item['uuid']; ?>/window/iframe" class="iframe">
-							<span class="glyphicon glyphicon-user"></span> 作者管理</a>
+                作者数量 ：<span id="sumAuthor_<?php echo $item['id'];?>"><?php echo $item['c']; ?></span> | <a href="/admin/data/author/ac/edit/uuid/<?php echo $item['uuid']; ?>/window/iframe" class="iframe">作者管理</a> | 
                 <?php endif; ?>
-						<span class="form-inline" id="addauthor_<?php echo $item['id'];?>">
-							<a class="label label-success" href="javascript:;" onclick="AddAuthor(<?php echo $item['id']; ?>,'<?php echo $item['uuid']; ?>')">
-							<span class="glyphicon glyphicon-plus"></span> 添加作者</a>
-						</span>
+                <span id="addauthor_<?php echo $item['id'];?>"><a href="javascript:;" onclick="AddAuthor(<?php echo $item['id']; ?>,'<?php echo $item['uuid']; ?>')">添加作者</a></span>
                 <?php if($item['c']):?>
-						  <span id="sendmail_<?php echo $item['id'];?>">
-							  <a class="label label-primary" href="javascript:;" onclick="SendMail('<?php echo $item['uuid']; ?>')">
-							  <span class="glyphicon glyphicon-envelope"></span> 发邮件</a>
-						  </span>
+                 | <span id="sendmail_<?php echo $item['id'];?>"><a href="javascript:;" onclick="SendMail('<?php echo $item['uuid']; ?>')">发邮件</a></span>
                 <?php endif;?>
-					</h5>
+                </p>
 			</li>
 		<?php endforeach; 
 		echo "</ul>";
@@ -66,11 +60,10 @@
         <div class="pagenavi"><?= $this->paginator; ?></div>
     </div>
 </div>
-</div>
 <!-- //页面内容 -->
 <script>
 function AddAuthor(id,uuid){
-	$('#addauthor_'+id).html('用户名：<input class="form-control input-sm" type="text" id="authorInp_'+id+'"/> <button class="btn btn-success btn-sm" onclick="addAuthor('+id+',\''+uuid+'\')">添加</button>');
+	$('#addauthor_'+id).html('用户名：<input type="text" id="authorInp_'+id+'"/><button class="btn btn-green" onclick="addAuthor('+id+',\''+uuid+'\')">添加</button>');
 }
 function addAuthor(id,uuid){
 	$.ajax({
@@ -85,7 +78,7 @@ function addAuthor(id,uuid){
 			if(typeof(data.msg)!='undefined')
 			{Alert(data.msg);}
 			if(typeof(data.added)!='undefined')
-			{$('#addauthor_'+id).html('<a class="label label-success" href="javascript:;" onclick="AddAuthor('+id+',\''+uuid+'\')"><span class="glyphicon glyphicon-plus"></span> 添加作者</a>');}
+			{$('#addauthor_'+id).html('<a href="javascript:;" onclick="AddAuthor('+id+',\''+uuid+'\')">添加作者</a>');}
 		  }
 		  else{ 
 		  	Alert('出现错误，请稍后再试');

application/admin/views/scripts/data/author-edit-iframe.phtml

@@ -1,4 +1,25 @@
-    <ul class="list-unstyled">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>作者管理</title>
+<link rel="stylesheet" type="text/css" media="screen" href="/css/default.css" />
+<script src='/static/js/jquery-1.7.2.min.js' type="text/javascript"></script>
+<script type="text/javascript" src="/js/jquery.colorbox-min.js"></script>
+<link href="/css/author.css" media="screen" rel="stylesheet" type="text/css"/>
+<link href="/static/js/uploadify/uploadify.css" media="screen" rel="stylesheet" type="text/css" />
+<link href="/css/colorbox.css" media="screen" rel="stylesheet" type="text/css" />
+<style>
+#loading{margin:0px;border:none;height:50px;width:98%;background:url(/static/img/colorbox-images/loading.gif) center center no-repeat;display:none;position:absolute;left:0px;top:0px;overflow:hidden;background:#ccc;}
+</style>
+</head>
+<body>
+
+<!-- 页面内容 -->
+<div id="warpper">
+	<div id="loading" class="info info-box"></div>
+	<div id="datalist">
+    <ul>
 	<?php
 	if(isset($this->authors))
 	{
@@ -13,9 +34,10 @@
             </p>
         </li>
 	<?php } } ?>
-    </ul>
+    </ul></div>
+</div>
 <!-- //页面内容 -->
-<script type="text/javascript">
+<script>
 function update(id){
 	$.ajax({
 		'type':"POST",
@@ -25,13 +47,13 @@ function update(id){
 			if (data!=null)
 			{
 				if(typeof(data.error)!='undefined')
-				{alert(data.error);return false;}
+				{Alert(data.error);return false;}
 				if(data.msg!=null)
-				{alert(data.msg);}
+				{Alert(data.msg);}
 				if(typeof(data.updated)!='undefined')
 				{$('#status_'+data.updated).html('已认证');$('#statusChange_'+data.updated).html('');}
 			}else{ 
-				alert('处理中出现错误');
+				Alert('处理中出现错误');
 			}
 		},
 		'timeout': 30000
@@ -48,11 +70,11 @@ function remove(id){
 		if (data!=null)
 		{
 			if(typeof(data.error)!='undefined')
-			{alert(data.error);return false;}
+			{Alert(data.error);return false;}
 			if(typeof(data.deleted)!='undefined')
 			{$('#author_'+data.deleted).fadeOut("slow",function(){$(this).remove();});}
 		}else{ 
-			alert('处理中出现错误');
+			Alert('处理中出现错误');
 		}
 	},
 	'timeout': 30000
@@ -68,8 +90,12 @@ $('#loading').ajaxSend(function() {
 });
 $("#loading").ajaxError(function() {
   $(this).css('display','none');
-  alert('请求超时或服务器开小差了，请刷新页面后重试');
+  Alert('请求超时或服务器开小差了，请刷新页面后重试');
 });
-
+function Alert(html){
+	$.colorbox({'innerWidth':'50%','html':'<h4>'+html+'</h4>'});
+}
 </script>
 
+</body>
+</html>

application/admin/views/scripts/data/author-edit.phtml

@@ -8,11 +8,11 @@
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,"colorbox");
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span3">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
         <div id="loading" class="info info-box"></div>
         <div id="datalist">
         <?php if(!empty($this->authors)) { ?>

application/admin/views/scripts/data/author-list.phtml

@@ -2,52 +2,53 @@
 $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
 $this->headLink()->appendStylesheet('/css/admin.css');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('数据作者管理');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<a class="btn btn-primary" href="/admin/data/author">作者管理</a>
-			<a class="btn btn-primary" href="/admin/data/author/ac/list">查看所有数据作者</a>
-			<a class="btn btn-primary" href="/admin/data/author/ac/datas">所有数据</a>
+<div id="rightPanel">
+	<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/author">作者管理</a></li>
+			<li class="box-shadow active"><a class="text-shadow" href="/admin/data/author/ac/list">查看所有数据作者</a></li>
+            <li class="box-shadow"><a class="text-shadow" href="/admin/data/author/ac/datas">所有数据</a></li>
+		</ul>
 	</div>
-		<div class="input-group form-group">
-			<form id="datasearch" class="search_form input-group" action="/admin/data/author/ac/list">
-				<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字" />
-				<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+	<div>
+		<p>请输入元数据标题关键字进行搜索</p>
+        <form id="datasearch" class="search_form" action="/admin/data/author/ac/list">
+            <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+            <button type="submit" class="btn" id="search_btn">搜索</button>
         </form>
 	</div> 
-		<div id="datalistZ">
+    <div id="datalist">
 		<?php
 		if (count($this->paginator)): 
 		if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
-			echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-				<li id="list_<?php echo $item['id'];?>" class="well well-sm">
-					<h4><a href="/admin/user/show/id/<?= $item['id'] ?>" target="_blank"><span class="glyphicon glyphicon-user"></span> <?php echo $item['realname'];?></a> </h4>
-					<h5>
+			<li id="list_<?php echo $item['id'];?>">
+				<p><a href="/admin/user/show/id/<?= $item['id'] ?>" target="_blank"><?php echo $item['realname'];?></a> </p>
+                <p>
                 <?php if ($item['d']) : ?>                
-						数据个数 ：<span id="sumAuthor_<?php echo $item['id'];?>"><?php echo $item['d']; ?></span> 
-						<a href="javascript:;" onclick="view(<?= $item['id']?>)">查看数据</a>&nbsp;&nbsp;
-						<!-- <a data-trigger="modal" data-title="数据" href="view(<?= $item['id']?>)" onclick="view(<?= $item['id']?>)" >查看数据2</a> -->
-						<span><a href="mailto:<?= $item['email']; ?>"><span class="glyphicon glyphicon-envelope"></span> :  <?= $item['email']; ?></a></span>
+                数据个数 ：<span id="sumAuthor_<?php echo $item['id'];?>"><?php echo $item['d']; ?></span> | <a href="javascript:;" onclick="view(<?= $item['id']?>)">查看数据</a> | Email: <span><?= $item['email'];?></span>
                 <?php endif; ?>
-					</h5>
+                </p>
 			</li>
 		<?php endforeach; 
 		echo "</ul>";
@@ -55,7 +56,6 @@
         <div class="pagenavi"><?= $this->paginator; ?></div>
     </div>
 </div>
-</div>
 <!-- //页面内容 -->
 <script>
 function view(id){

application/admin/views/scripts/data/author.phtml

@@ -2,58 +2,54 @@
 $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
 $this->headLink()->appendStylesheet('/css/admin.css');
-	$this->headScript()->appendFile('/js/modal.js');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('数据作者管理');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
 
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<a class="btn btn-primary btn-sm" href="/admin/data/author">作者管理</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/author/ac/list">查看所有数据作者</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/author/ac/datas">所有数据</a>
+<div id="rightPanel">
+<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow active"><a class="text-shadow" href="/admin/data/author">作者管理</a></li>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/author/ac/list">查看所有数据作者</a></li>
+            <li class="box-shadow"><a class="text-shadow" href="/admin/data/author/ac/datas">所有数据</a></li>
+		</ul>
 	</div>
-		<div class="input-group form-group">
-			<form id="datasearch" class="search_form input-group" action="/admin/data/author">
-				<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字" />
-				<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+	<div>
+		<p>请输入元数据标题关键字进行搜索</p>
+        <form id="datasearch" class="search_form" action="/admin/data/author">
+            <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+            <button type="submit" class="btn" id="search_btn">搜索</button>
         </form>
 	</div> 
-		<div id="datalistZ" >
+    <div id="datalist">
 		<?php
 		if (count($this->paginator)): 
 		if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
-			echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-				<li id="list_<?php echo $item['id'];?>" class="well well-sm">
-					<h4><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> </h4>
-					<p></p>
-					<h5>
+			<li id="list_<?php echo $item['id'];?>">
+				<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> </p>
+                <p>
                 <?php if ($item['c']) : ?>                
-						作者数量 ：<span id="sumAuthor_<?php echo $item['id'];?>"><?php echo $item['c']; ?></span>
-						<a class="label label-info" data-trigger="modal" data-title="作者" href="/admin/data/author/ac/edit/uuid/<?php echo $item['uuid']; ?>/window/iframe" class="iframe">
-						<span class="glyphicon glyphicon-user"></span> 作者管理</a>
+                作者数量 ：<span id="sumAuthor_<?php echo $item['id'];?>"><?php echo $item['c']; ?></span> | <a href="/admin/data/author/ac/edit/uuid/<?php echo $item['uuid']; ?>/window/iframe" class="iframe">作者管理</a> | 
                 <?php endif; ?>
-						<span class="form-inline" id="addauthor_<?php echo $item['id'];?>">
-							<a class="label label-success" href="javascript:;" onclick="AddAuthor(<?php echo $item['id']; ?>,'<?php echo $item['uuid']; ?>')">
-							<span class="glyphicon glyphicon-plus"></span> 添加作者</a>
-						</span>
-					</h5>
+                <span id="addauthor_<?php echo $item['id'];?>"><a href="javascript:;" onclick="AddAuthor(<?php echo $item['id']; ?>,'<?php echo $item['uuid']; ?>')">添加作者</a></span>
+                </p>
 			</li>
 		<?php endforeach; 
 		echo "</ul>";
@@ -61,10 +57,10 @@
         <div class="pagenavi"><?= $this->paginator; ?></div>
     </div>
 </div>
-</div>
-<script type="text/javascript">
+<!-- //页面内容 -->
+<script>
 function AddAuthor(id,uuid){
-	$('#addauthor_'+id).html('用户名：<input  class="form-control input-sm" type="text" id="authorInp_'+id+'"/> <button class="btn btn-success btn-sm" onclick="addAuthor('+id+',\''+uuid+'\')">添加</button>');
+	$('#addauthor_'+id).html('用户名：<input type="text" id="authorInp_'+id+'"/><button class="btn btn-green" onclick="addAuthor('+id+',\''+uuid+'\')">添加</button>');
 }
 function addAuthor(id,uuid){
 	$.ajax({
@@ -75,9 +71,9 @@ function addAuthor(id,uuid){
 		  if (typeof(data)=='object')
 		  {
 			if(typeof(data.error)!='undefined')
-			{alert(data.error);return false;}
+			{Alert(data.error);return false;}
 			if(typeof(data.msg)!='undefined')
-			{alert(data.msg);}
+			{Alert(data.msg);}
 			if(typeof(data.status)!='undefined')
 			{$('#addauthor_'+id).html('<a href="javascript:;" onclick="AddAuthor('+id+',\''+uuid+'\')">添加作者</a>');}
 		  }
@@ -91,5 +87,9 @@ function addAuthor(id,uuid){
 	   }
   });
 }
+$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+$(".inline").colorbox({inline:true, width:"50%"});
+function Alert(html){
+	$.colorbox({'innerWidth':'50%','html':'<h4 style="font-size:16px;font-weight:bold;">'+html+'</h4>'});
+}
 </script>
-

application/admin/views/scripts/data/batchimport.phtml

@@ -9,14 +9,13 @@
 	$this->breadcrumb('导入服务器上元数据目录</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <form method="POST">
    <p>服务器上元数据所在目录（含所有子目录的xml文件）:  <input type="text" name="directory"></p>
    <input type="submit" value="导入元数据" />
 </form>
-	</div>
+    
 </div>

application/admin/views/scripts/data/comment.phtml

@@ -4,25 +4,24 @@
 	$this->headTitle()->setSeparator(' - ');
 	$this->headLink()->appendStylesheet('/css/admin.css');
 	$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->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
 	$this->breadcrumb('数据反馈管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
-    $this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-    $this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if(isset($this->title)) {
 	echo "元数据《".$this->title."》的所有评论";
 }?>
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -30,30 +29,24 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-		<div id="datalistZ">
+
+<div id="datalist">
 <?php if (count($this->paginator)): ?>
-			<ul class=list-unstyled>
+<ul>
 <?php foreach ($this->paginator as $item): ?>
-				<li class="well well-sm">
-					<h5 class="text-muted">
-						<span class="glyphicon glyphicon-user"></span> 
-						<?php ($item['url'])?print '<a href="'.$item['url'].'">'.$item['author'].'</a>':print $item['author']; ?>，
-						<span class="glyphicon glyphicon-envelope"></span> EMAIL：<?= $item['email']; ?>
-						［类型：<?= $item['type']; ?>，
-						创建时间：<?= date('Y-m-d',strtotime($item['ts_created'])); ?> 。
-						操作： <a href="/admin/data/comment/delete/<?= $item['id']; ?>">
-						<span class="glyphicon glyphicon-trash"></span> 
-						删除&nbsp;&nbsp;</a> <a href="javascript:;" onclick="showreply(<?= $item['id']; ?>)">
-						<span class="glyphicon glyphicon-pencil"></span> 
-						回复 <?php if($item['reply_count']>0){echo "(".$item['reply_count'].")";}?></a>］
-					</h5>
-					 <div style="display:none;vertical-align:bottom" id="comment_reply_<?= $item['id']; ?>"  class="form-inline h4" >
-						 <textarea id="reply_<?= $item['id']; ?>" class="form-control" style="width: 688px; height: 100px; margin-bottom:9px;"></textarea>
-						 <button type="button" onclick="reply(<?= $item['id']; ?>,'<?= $item['uuid']; ?>')" class="btn btn-primary" >提交</button>
-						 <div style="h4">
-							<ul class="list-unstyled" id="replyList_<?= $item['id']; ?>"></ul>
-						 </div>
+<li>
+<p>用户名：<?php ($item['url'])?print '<a href="'.$item['url'].'">'.$item['author'].'</a>':print $item['author']; ?>，
+EMAIL：<?= $item['email']; ?>
+［类型：<?= $item['type']; ?>，创建时间：<?= date('Y-m-d',strtotime($item['ts_created'])); ?>
+ 。操作： <a href="/admin/data/comment/delete/<?= $item['id']; ?>">删除</a> <a href="javascript:;" onclick="showreply(<?= $item['id']; ?>)">回复 
+ <?php if($item['reply_count']>0){echo "(".$item['reply_count'].")";}?></a>］</p>
+ <p style="display:none;vertical-align:bottom" id="comment_reply_<?= $item['id']; ?>"><textarea id="reply_<?= $item['id']; ?>" class="middle half"></textarea>
+ <button type="button" onclick="reply(<?= $item['id']; ?>,'<?= $item['uuid']; ?>')" class="btn btn-green" style="vertical-align:bottom">提交</button>
+ <div style="width:90%; margin:0 auto;">
+ 	<ul id="replyList_<?= $item['id']; ?>">
+    </ul>
  </div>
+ </p>
 <p>元数据：<a href="/data/<?= $item['uuid']; ?>"><?= $item['title']; ?></a></p>
 <p><?= $item['content']; ?></p>
 <p>IP:<?= $item['ip']; ?>，AGENT:<?= $item['agent']; ?></p>
@@ -62,9 +55,7 @@
 </ul>
 <?php endif; ?>   
 </div>
-		<div class="pagenavi"><?= $this->paginator;?></div>
-	</div>
-</div>
+<?= $this->paginator; ?>
 <script>
 function reply(id,uuid)
 {
@@ -106,9 +97,8 @@ function showreply(id){
 					var html=new Array();
 					for(i in data)
 					{
-						html.push('<blockquote><li class="h5" id="subReplyList_'+data[i].id+'"><span class="text-success"> '+data[i].body+
-						'</span>&nbsp;&nbsp; [ <span class="glyphicon glyphicon-user text-primary"></span> <span class="text-primary">'
-						+data[i].username+' </span>| <span class="glyphicon glyphicon-trash text-primary"></span> <a href="javascript:void(0);" onClick="delreply('+data[i].id+')">删除</a> ]</li></blockquote>');
+						html.push('<li id="subReplyList_'+data[i].id+'">'+data[i].body+
+						' ['+data[i].username+' | <a href="javascript:void(0);" onClick="delreply('+data[i].id+')">删除</a>]</li>');
 					}
 					html = html.join('');
 					$('#replyList_'+id).html(html);

application/admin/views/scripts/data/datafileimport.phtml

@@ -9,12 +9,12 @@
 	$this->breadcrumb('导入数据目录文件</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>

application/admin/views/scripts/data/dataimport-preprocess.phtml

@@ -0,0 +1,72 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('后台管理');
+$this->headTitle()->setSeparator(' - ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+    	<h3>数据导入<small>文件预处理</small></h3>
+        <hr />
+
+        处理文件：<?= $this->file ?>...
+
+        <h5>文件信息</h5>
+        <ul>
+            <li>文件行數:<?= $this->Count ?></li>
+            <li>文件大小:<?= $this->Size ?></li>
+            <li>文件类型:<?= $this->Type ?></li>
+        </ul>
+
+        <hr />
+
+        <h5 class="error-alerts" style="display: none;">错误消息</h5>
+        <ul id="errors" class="error-alerts" style="display: none;">
+
+        </ul>
+
+        <h6 id="error-loading"></h6>
+
+        <a href="javascript:void(0);" id="clt-next" class="btn btn-success disabled">下一步</a>
+
+    </div>
+</div>
+<script>
+    $(document).ready(function(){
+        $.ajax({
+            'type':"POST",
+            'url':'/admin/data/dataimport/ac/check',
+            'data':'file=<?= $this->file ?>',
+            'success':function(data){
+                if (data!=null)
+                {
+                    if(data.status == true)
+                    {
+                        $('#clt-next').removeClass('disabled');
+                        $('#clt-next').attr('href','/admin/data/dataimport/ac/target?file=<?= $this->file ?>');
+                        alert("數據完整性檢查成功，可以進行下一步");
+                        return true;
+                    }
+                    $('.error-alerts').show();
+                    $.each(data.status,function(index,value){
+                        $('#errors').append("<li>"+value+"</li>");
+                    });
+                }else{
+                    alert('处理中出现错误');
+                }
+            },
+            'timeout': 30000,
+            'beforeSend' : function(){
+                $('#error-loading').html("正在對文件進行初始化檢查......");
+                $('#error-loading').show();
+            },
+            'complete' : function(){
+                $('#error-loading').hide();
+            }
+
+        });
+    });
+</script>

application/admin/views/scripts/data/dataimport-target.phtml

@@ -0,0 +1,238 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('后台管理');
+$this->headTitle()->setSeparator(' - ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+    	<h3>数据导入<small>选择导入目标</small></h3>
+        <hr />
+
+        导入文件：<?= $this->file ?>
+
+        <div class="row-fluid">
+            <div class="span3">
+                <h5>数据库：</h5>
+                    <label class="radio">
+                        <input type="radio" class="ctl-schema-btn" value="<?= $this->schema ?>" name="schema" selected readonly> <?= $this->schema ?>
+                    </label>
+            </div>
+            <div class="span3" id="table-list">
+            </div>
+            <div class="span4" id="field-list">
+            </div>
+        </div>
+        <hr class="clear" />
+
+        <h5 class="error-alerts" style="display: none;">消息</h5>
+        <ul id="errors" class="error-alerts" style="display: none;">
+
+        </ul>
+
+        <h6 id="error-loading"></h6>
+
+        <form action="/admin/data/dataimport/ac/checktables" id="schema-form">
+            <input type="hidden" name="file" value="<?= $this->file ?>">
+            <input type="hidden" name="schema" value="">
+            <input type="hidden" name="table" value="" id="input-table">
+            <button type="button" id="ctl-next" class="btn btn-success disabled" disabled>下一步</button>
+            <button type="button" id="ctl-import" class="btn btn-info" disabled="disabled" style="display: none;">导入数据表</button>
+        </form>
+    </div>
+</div>
+<script>
+    $(document).ready(function(){
+
+        $('#ctl-next').click(function(){
+            ctl.checkTable();
+        });
+
+        $("#ctl-import").click(function(){
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/import',
+                'data':$('#schema-form').serialize(),
+                'success':function(data){
+
+                    if (data!=true)
+                    {
+                        if(!$.isEmptyObject(data))
+                            $(".error-alerts").show();
+                        $("#errors").html(data.join("<br />"));
+                        return true;
+                    }else{
+                        $('#ctl-import').remove();
+                        $("#errors").html("数据导入成功！页面将自动跳转到数据可视化管理页面");
+                        setTimeout("top.location = '/admin/data/visual';",3000);
+                    }
+                },
+                'timeout': 30000,
+                'beforeSend' : function(){
+                    $('#error-loading').html("正在进行数据导入......");
+                    $('#error-loading').show();
+                    $('#ctl-import').attr('disabled','disabled');
+                },
+                'complete' : function(){
+                    $('#error-loading').hide();
+                },
+                'error' : function(){
+                    $('#ctl-import').removeAttr('disabled');
+                }
+
+            });
+        });
+
+        $('.ctl-schema-btn').click(function(){
+            $('#schema-form input[name=schema]').val($(this).val());
+
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/gettables',
+                'data':'schema=' + $(this).val(),
+                'success':function(data){
+                    if (data!=null)
+                    {
+                        if($.isEmptyObject(data))
+                        {
+                            ctl.disableNext();
+                            alert("此数据库中尚无数据表");
+                            return true;
+                        }
+                        $('#table-list').html('<h5>选择数据表</h5>');
+
+                        $.each(data,function(index,value){
+                            $('#table-list').append('<label class="radio">'
+                                + '<input type="radio" value="'+value.tablename+'" name="table" class="ctl-table-name">'
+                                + value.tablename
+                                +"</label>"
+                            );
+                        });
+
+                        $('.ctl-table-name').click(function(){
+                            $('#schema-form input[name=table]').val($(this).val());
+                            if($('#schema-form input[name=schema]').val() != '' &&  $('#schema-form input[name=table]').val() != '')
+                            {
+                                ctl.enableNext();
+                            }
+                            ctl.getFields();
+                        });
+
+                        $('#clt-next').removeClass('disabled');
+                        $('#clt-next').attr('href','/admin/data/dataimport/ac/target?file=<?= $this->file ?>');
+                        return true;
+
+                    }else{
+                        alert('处理中出现错误');
+                    }
+                },
+                'timeout': 30000,
+                'beforeSend' : function(){
+                    $('#error-loading').html("正在加载数据表......");
+                    $('#error-loading').show();
+                    $('#table-list').html('');
+                    $('.ctl-table-name').unbind();
+                },
+                'complete' : function(){
+                    $('#error-loading').hide();
+                }
+
+            });
+
+        });
+    });
+
+    var ctl = {
+        enableNext : function(){
+            $('#ctl-next').removeClass("disabled");
+            $('#ctl-next').removeAttr("disabled");
+        },
+        disableNext : function(){
+            $('#ctl-next').addClass("disabled");
+            $('#ctl-next').attr("disabled","disabled");
+        },
+        checkTable : function(){
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/checktables',
+                'data':$('#schema-form').serialize(),
+                'success':function(data){
+
+                    if (data!=true)
+                    {
+                        if(!$.isEmptyObject(data))
+                        $(".error-alerts").show();
+                        $("#errors").html(data.join("<br />"));
+                        return true;
+                    }else{
+                        $(".error-alerts").show();
+                        $('#errors').html('数据准备完成，可以进行导入操作');
+
+                        $('.ctl-schema-btn').attr("disabled","disabled");
+                        $('.ctl-table-name').attr("disabled","disabled");
+
+                        $('#ctl-next').hide();
+                        $('#ctl-show-table').hide();
+                        $('#ctl-import').show();
+                        $('#ctl-import').removeAttr("disabled");
+                    }
+                },
+                'timeout': 30000,
+                'beforeSend' : function(){
+                    $('#error-loading').html("正在校验数据是否可以导入......");
+                    $('#error-loading').show();
+                },
+                'complete' : function(){
+                    $('#error-loading').hide();
+                },
+                'error' : function(){
+                    $(".error-alerts").show();
+                    $("#errors").html("数据表字段检测失败，请检查导入得文件是否于数据表中得字段对应");
+                }
+            });
+        },
+        getFields : function (){
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/getfields',
+                'data':$('#schema-form').serialize(),
+                'success':function(data){
+
+                    if($.isEmptyObject(data))
+                    {
+                        return true;
+                    }
+
+                    $(".error-alerts").show();
+
+                    var html = new Array();
+
+                    html.push('<span>数据表字段信息</span>');
+                    html.push('<table class="table table-striped table-bordered" style="width:300px;">');
+                    html.push('<thead><th>排序</th><th>列名</th><th>数据类型</th></thead>');
+
+                    $.each(data,function(index,value){
+                        html.push("<tr><td>"+value.dtd_identifier+"</td><td>" + value.column_name + "</td><td>" + value.data_type + "</td></tr>");
+                    });
+
+                    html.push('</table>');
+
+                    $('#errors').html(html.join(""));
+
+                },
+                'timeout': 30000,
+                'beforeSend' : function(){
+                    $('#error-loading').html("正在获取数据表信息......");
+                    $('#error-loading').show();
+                },
+                'complete' : function(){
+                    $('#error-loading').hide();
+                }
+
+            });
+        }
+    }
+</script>

application/admin/views/scripts/data/dataimport.phtml

@@ -0,0 +1,151 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('后台管理');
+$this->headTitle()->setSeparator(' - ');
+$this->theme->AppendPlus($this,"jquery-fileupload");
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+    	<h3>数据导入</h3>
+        <hr />
+
+        <label>上传文件,请选择CSV文件进行上传</label>
+
+            <span class="btn btn-success fileinput-button file-upload-ctls">上传文件<input id="fileupload" type="file" name="FileData"></span>
+            <a href="javascript:void(0);" class="btn btn-info" id="ctl-show-files">查看已上传的文件</a>
+            <div class="progress" id="pdf-upload-progress" style="display: none;">
+                <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%">
+                </div>
+            </div>
+            <div id="uploadedFile"></div>
+
+    </div>
+</div>
+<script>
+    $(function () {
+        'use strict';
+
+        var jqXHR = $('#fileupload').fileupload({
+            url: '/admin/data/dataimport/ac/upload',
+            dataType: 'json',
+            done: function (e, data) {
+
+                if(typeof(data.result.error) != 'undefined' && data.result.error != 0)
+                {
+                    alert(data.result.error);
+                    return false;
+                }
+
+                if($('#uploadedFile').html() == "")
+                    $('#uploadedFile').html(upload.makeFileHtml(data.result));
+                else
+                    $('#uploadedFile').append(upload.makeFileHtml(data.result));
+
+                return true;
+
+            },
+            stop : function (e) {
+                $('#pdf-upload-progress').hide();
+                $('.file-upload-ctls').show();
+            },//stop
+            start : function (e) {
+                $('.file-upload-ctls').hide();
+                $('#pdf-upload-progress .progress-bar').css('width', 0 + '%');
+                $('#pdf-upload-progress').show();
+            },//start
+            progressall: function (e, data) {
+                var progress = parseInt(data.loaded / data.total * 100, 10);
+                $('#pdf-upload-progress .progress-bar').css(
+                    'width',
+                    progress + '%'
+                );
+            },//progressall
+            add: function (e, data) {
+                if($('input[name=attid]').length >= 1)
+                {
+                    upload.deleteFile($('input[name=attid]').val());
+                    $('file-alert').alert('close')
+                }
+
+                data.process().done(function () {
+                    data.submit();
+                });
+            }//add
+        }).prop('disabled', !$.support.fileInput)
+            .parent().addClass($.support.fileInput ? undefined : 'disabled');
+        //file upload end
+
+        $('#ctl-show-files').click(function(){
+
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/files',
+                'data':'',
+                'success':function(data){
+                    if (data!=null)
+                    {
+                        if($.isEmptyObject(data))
+                        {
+                            alert("目前沒有文件");
+                            return;
+                        }
+
+                        if($('#uploadedFile').html() == "")
+                            $('#uploadedFile').html(upload.makeFileList(data));
+                        else
+                            $('#uploadedFile').append(upload.makeFileList(data));
+
+                        $('#ctl-show-files').attr('disabled','disabled');
+                        $("#ctl-show-files").unbind( "click" );
+                    }else{
+                        alert('处理中出现错误');
+                    }
+                },
+                'timeout': 30000
+            });
+
+        });//show files
+    });
+
+    var upload = {
+        makeFileHtml : function(data){
+            return '<div class="alert alert-success">'
+                + '<span class="ctl-files">'+data.file+'</span>'
+                + ' <a href="/admin/data/dataimport/ac/prepare/?file='+ encodeURI(data.file) +'">导入数据</a>'
+                + '<a href="javascript:void(0)" onclick="upload.delete(this,\''+data.file+'\')" class="pull-right">删除</a>'
+                + "</div>";
+        },
+        makeFileList : function(data){
+
+            var li = [];
+
+            $.each(data,function(k,v){
+                    li.push('<div class="alert alert-success ctl-files">'
+                    + '<span class="ctl-files">'+v+'</span>'
+                    + ' <a href="/admin/data/dataimport/ac/prepare/?file='+ encodeURI(v) +'">导入数据</a>'
+                    + '<a href="javascript:void(0);" onclick="upload.delete(this,\''+v+'\')" class="pull-right">删除</a>'
+                    + "</div>");
+            });
+
+            return li.join("");
+        },
+        delete : function(dom,file){
+            $.ajax({
+                'type':"POST",
+                'url':'/admin/data/dataimport/ac/delete',
+                'data':'file='+file,
+                'success':function(data){
+                    if(data.success == true)
+                        $(dom).parent('div').remove();
+                    else
+                        alert("failed");
+                },
+                'timeout': 30000
+            });
+        }
+    };
+</script>

application/admin/views/scripts/data/datasetcd.phtml

@@ -9,12 +9,12 @@
 	$this->breadcrumb('特色数据集管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>

application/admin/views/scripts/data/datasetcdadd.phtml

@@ -9,12 +9,12 @@
 	$this->breadcrumb('特色数据集管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>

application/admin/views/scripts/data/doi-add.phtml

@@ -2,18 +2,18 @@
 $this->headTitle($this->config->title->site);
 $this->headTitle('后台管理');
 $this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/admin.css');
+//$this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('DOI');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <ul class="nav nav-tabs">
                 <li><a href="/admin/data/doi">浏览所有</a></li>
@@ -29,79 +29,64 @@ $this->theme->AppendPlus($this,'colorbox');
         	<?php if(!empty($this->msg)) { ?>
             	<?= $this->msg ?>
             <?php } else{ ?>
-                <p></p>
                 <div class="alert alert-info">
                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                 <h4>提示</h4>
                 如果元数据中标题发生了变更，在DOI中也需要变更时需要在这里点击“提交”按钮才能生效
                 </div>
-
            <form class="form-horizontal" method="post">
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="doi">doi</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="doi" name="doi" readonly="readonly"  class="form-control" 
+              <div class="control-group">
+                <label class="control-label" for="doi">doi</label>
+                <div class="controls">
+                  <input type="text" id="doi" name="doi" readonly="readonly"  class="input-block-level" 
                   value="<?= (isset($this->data['doi'])&&!empty($this->data['doi'])) ? $this->data['doi']:"doi:10.3972/westdc.x.2013.db" ?>" />
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="uuid">uuid</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="uuid" name="uuid" readonly="readonly" value="<?= isset($this->data['uuid']) ? $this->data['uuid']:"" ?>" class="form-control" />
+              <div class="control-group">
+                <label class="control-label" for="uuid">uuid</label>
+                <div class="controls">
+                  <input type="text" id="uuid" name="uuid" readonly="readonly" value="<?= isset($this->data['uuid']) ? $this->data['uuid']:"" ?>" class="input-block-level" />
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="publisher">发布者</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="publisher" name="publisher" value="<?= isset($this->data['publisher']) ? $this->data['publisher']:"" ?>"  class="form-control" />
+              <div class="control-group">
+                <label class="control-label" for="publisher">发布者</label>
+                <div class="controls">
+                  <input type="text" id="publisher" name="publisher" value="<?= isset($this->data['publisher']) ? $this->data['publisher']:"" ?>"  class="input-block-level" />
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="url">url</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="url" name="url" value="<?= isset($this->data['url']) ? $this->data['url']:"" ?>" class="form-control" />
+              <div class="control-group">
+                <label class="control-label" for="url">url</label>
+                <div class="controls">
+                  <input type="text" id="url" name="url" value="<?= isset($this->data['url']) ? $this->data['url']:"" ?>"  class="input-block-level"/>
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="title">标题</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="title" name="title" readonly="readonly" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" class="form-control"/>
+              <div class="control-group">
+                <label class="control-label" for="title">标题</label>
+                <div class="controls">
+                  <input type="text" id="title" name="title" readonly="readonly" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" class="input-block-level"/>
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="title_en">英文标题</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="title_en" name="title_en" readonly="readonly" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" class="form-control" />
+              <div class="control-group">
+                <label class="control-label" for="title_en">英文标题</label>
+                <div class="controls">
+                  <input type="text" id="title_en" name="title_en" readonly="readonly" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" class="input-block-level" />
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="publisher_en">发布者英文</label>
-                <div class="col-md-10 col-sm-10">
-                  <input type="text" id="publisher_en" name="publisher_en" value="<?= isset($this->data['publisher_en']) ? $this->data['publisher_en']:"" ?>"  class="form-control" />
+              <div class="control-group">
+                <label class="control-label" for="publisher_en">发布者英文</label>
+                <div class="controls">
+                  <input type="text" id="publisher_en" name="publisher_en" value="<?= isset($this->data['publisher_en']) ? $this->data['publisher_en']:"" ?>" />
                 </div>
               </div>
-
               <?php if(empty($this->data['info']) || !is_array($this->data['info'])) {?>
-              <div class="form-group infocontrol" id="info1">
-                <label class="col-md-2 col-sm-2 control-label" for="title_en">info</label>
-                <div class="col-md-10 col-sm-10">
-                  <div class="controls row">
-                  <div class="col-md-2 col-sm-4">
-                    <input type="text" name="info[1][author]" value="" placeholder="作者" class="form-control"/>
-                  </div>
-                  <div class="col-md-2 col-sm-3">
-                    <input type="text" name="info[1][author_en]" value="" placeholder="作者英文" class="form-control"/>
-                  </div>
-                  <div class="col-md-1 col-sm-2">
-                    <input type="text" name="info[1][order]" value="" placeholder="排序" class="form-control"/>
-                  </div>
-                  <div class="col-md-3 col-sm-7">
-                    <input type="text" name="info[1][organization]" value="" placeholder="单位" class="form-control"/>
-                  </div>
-                  <div class="col-md-3 col-sm-6">
-                    <input type="text" name="info[1][organization_en]" value="" placeholder="单位英文" class="form-control"/>
-                  </div>
-                  </div>
+              <div class="control-group infocontrol" id="info1">
+                <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>
               </div>
               <?php }else{ ?>
@@ -110,38 +95,28 @@ $this->theme->AppendPlus($this,'colorbox');
 			  foreach($this->data['info'] as $k=>$v){ 
 			  $index ++;
 			  ?>
-              <div class="form-group infocontrol">
-                <label class="col-md-2 col-sm-2 control-label">info</label>
-                <div class="col-sm-10">
-                  <div class="row">
-				            <div class="col-md-2 col-sm-4"><input class="form-control" type="text" name="info[<?= $k ?>][author]" value="<?= $v['author'] ?>" placeholder="作者" /></div>
-                    
-                    <div class="col-md-2 col-sm-3">
-                      <input class="form-control" type="text" name="info[<?= $k ?>][author_en]" value="<?= $v['author_en'] ?>" placeholder="作者英文" />
-                    </div>
-                    <div class="col-md-1 col-sm-2"><input class="form-control" type="text" name="info[<?= $k ?>][order]" value="<?= $v['order'] ?>" placeholder="排序" /></div>
-                    <div class="col-md-3 col-sm-7"><input class="form-control" type="text" name="info[<?= $k ?>][organization]" value="<?= $v['organization'] ?>" placeholder="单位" /></div>
-                    <div class="col-md-3 col-sm-6">
-                      <input class="form-control" type="text" name="info[<?= $k ?>][organization_en]" value="<?= $v['organization_en'] ?>" placeholder="单位英文" />
-                    </div>
-                    <div class="col-md-1">
+              <div class="control-group infocontrol">
+                <label class="control-label">info</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="排序" />
                     <?php if($index>1){ ?>
-                      <label class="control-label"><a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a></label>
+                    <a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>
 					<?php }?>
                 </div>
               </div>
-
-                </div>
-              </div>
               <?php } ?>
               <?php } ?>
-				<div class="form-group">
-					<div class="col-sm-12">
-						<a class="pull-right" href="javascript:void(0);" onclick="addinput()" >+添加一条</a>
+              <div class="control-group">
+                <div class="controls">
+					<a href="javascript:void(0);" onclick="addinput()">+添加一条</a>
                 </div>
               </div>
-              <div class="form-group">
-                <div class="col-sm-12">
+              <div class="control-group">
+                <div class="controls">
 					<input type="hidden" name="submit" value="1" />
                     <?php if(!empty($this->id)) { ?>
                     <input type="hidden" name="id" value=" <?=$this->id?> " />
@@ -149,7 +124,7 @@ $this->theme->AppendPlus($this,'colorbox');
                     <?php if(!empty($this->uuid)) { ?>
                     <input type="hidden" name="uuid" value=" <?=$this->uuid?>" />
                     <?php } ?>
-					           <button type="submit" class="btn btn-primary pull-right">提交</button>
+					<button type="submit" class="btn btn-primary">提交</button>
                 </div>
               </div>
             </form>
@@ -161,23 +136,21 @@ $this->theme->AppendPlus($this,'colorbox');
 function addinput(){
 	var now_index = $('.infocontrol').length;
 	var index = now_index + 1;
-	html =  '<div class="form-group infocontrol"><label class="col-md-2 col-sm-2 control-label">info</label>'
-			+'<div class="col-sm-10"><div class="controls row">'
-			+'<div class="col-md-2 col-sm-4"><input class="form-control" type="text" name="info[' + index + '][author]" placeholder="作者" /></div>'
-			+'<div class="col-md-2 col-sm-3"><input class="form-control" type="text" name="info[' + index + '][author_en]" placeholder="作者英文" /></div>'
-			+'<div class="col-md-1 col-sm-2"><input class="form-control" type="text" name="info[' + index + '][order]" placeholder="排序" /></div>'
-			+'<div class="col-md-3 col-sm-7"><input class="form-control" type="text" name="info[' + index + '][organization]" placeholder="单位" /></div>'
-			+'<div class="col-md-3 col-sm-6"><input class="form-control" type="text" name="info[' + index + '][organization_en]" placeholder="单位英文" /></div>'
-			+'<div class="col-md-1"><label class="control-label"><a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a></label></div>'
-			+'</div></div></div>';
+	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="排序" /> '
+			 +  '<a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a>'
+			 + '</div></div>';
 	now_index = null;
 	index = null;
 	$('.infocontrol').last().after(html);
 }
 function RmInput(e){
 	$e = $(e);
-	$e.parent().parent().parent().parent().parent('div.infocontrol').remove();
-    
+	$e.parent('div').parent('div.infocontrol').remove();
 }
 </script>
 <!-- //页面内容 -->

application/admin/views/scripts/data/doi.phtml

@@ -2,33 +2,34 @@
 $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/data">数据管理</a>');
 $this->breadcrumb('DOI');
 $this->breadcrumb()->setSeparator(' > ');
-	// $this->theme->AppendPlus($this,'colorbox');
+$this->theme->AppendPlus($this,'colorbox');
 $this->theme->AppendPlus($this,'admin_plugin');
-    $this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-    $this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<style>
+table thead tr th {background:#EBF2F6;}
+</style>
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12 span10">
-        <div class="form-group">
-            <ul class="nav nav-tabs" role="tablist">
+	<div class="span10">
+        <div>
+            <ul class="nav nav-tabs">
                 <li class="active"><a href="/admin/data/doi">浏览所有</a></li>
             </ul>
         </div>
-        <div class="input-group form-group">
-            <form id="datasearch" class="search_form input-group" action="">
-                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字" />
-                <span class="input-group-btn"><button class="btn btn-default" type="submit" id="search_btn">搜索</button></span>
+        <div>
+            <div class="input-append">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+                <button type="submit" class="btn" id="search_btn">搜索</button>
             </form>
             </div>
-    
+        </div>
         <?php if(!empty($this->error)) { ?>
         	<?= $this->error ?>
         <?php } ?>
@@ -37,7 +38,7 @@
         <?php } else{ ?>
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
-			<table class="stylized table table-bordered table-striped table-hover">
+			<table class="table table-bordered table-striped">
             	<thead>
                     <tr>
                         <th>状态</th>

application/admin/views/scripts/data/feature.phtml

@@ -9,12 +9,12 @@
 	$this->breadcrumb('特色推荐管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>

application/admin/views/scripts/data/featureadd.phtml

@@ -9,12 +9,12 @@
 	$this->breadcrumb('特色推荐管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>

application/admin/views/scripts/data/fund-add.phtml

@@ -2,19 +2,26 @@
 $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/admin.css');
+//$this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('支持项目');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
-        <?= $this->partial('data/fund-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
+	<div class="span10">
+        <div>
+            <ul class="nav nav-tabs">
+            	<li><a href="/admin/data/fund/ac/datalist">数据相关</a></li>
+                <li><a href="/admin/data/fund/">所有项目</a></li>
+                <li class="active"><a href="/admin/data/fund/ac/add">添加新项目</a></li>
+            </ul>
+        </div>
+        <div class="">
         	<?php if(!empty($this->error)) { ?>
             <div class="alert alert-block alert-error fade in" id="Alert-error-box">
                 <a class="close" data-dismiss="alert" href="#">×</a>
@@ -36,49 +43,49 @@ $this->theme->AppendPlus($this,'colorbox');
                 <script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
                 <?php } ?>
             <?php } else{ ?>
-        <p></p>
            <form class="form-horizontal" method="post">
-              <div class="form-group">
-                <label class="col-sm-2 control-label" for="title">项目名称</label>
-                <div class="col-sm-6">
-                <input class="form-control" placeholder="项目名称" type="text" id="title" name="title" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" />
+              <div class="control-group">
+                <label class="control-label" for="title">项目名称</label>
+                <div class="controls">
+                  <input type="text" id="title" name="title" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" />
                 </div>
               </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-label" for="fund_id">编号</label>
-              <div class="col-sm-6">
-                <input class="form-control" placeholder="编号" type="text" id="fund_id" name="fund_id" value="<?= isset($this->data['fund_id']) ? $this->data['fund_id']:"" ?>" />
+              <div class="control-group">
+                <label class="control-label" for="fund_id">编号</label>
+                <div class="controls">
+                  <input type="text" id="fund_id" name="fund_id" value="<?= isset($this->data['fund_id']) ? $this->data['fund_id']:"" ?>" />
                 </div>
               </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-label" for="fund_type">类型</label>
-                <div class="col-sm-6">
-                <input class="form-control" placeholder="类型" type="text" id="fund_type" name="fund_type" value="<?= isset($this->data['fund_type']) ? $this->data['fund_type']:"" ?>" />
+              <div class="control-group">
+                <label class="control-label" for="fund_type">类型</label>
+                <div class="controls">
+                  <input type="text" id="fund_type" name="fund_type" value="<?= isset($this->data['fund_type']) ? $this->data['fund_type']:"" ?>" />
                 </div>
               </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-label" for="title_en">英文名称</label>
-                <div class="col-sm-6">
-                <input class="form-control" placeholder="英文名称" type="text" id="title_en" name="title_en" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" />
+              <div class="control-group">
+                <label class="control-label" for="title_en">英文名称</label>
+                <div class="controls">
+                  <input type="text" id="title_en" name="title_en" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" />
                 </div>
               </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-label" for="fund_type_en">英文类型</label>
-                <div class="col-sm-6">
-                <input class="form-control" placeholder="英文类型" type="text" id="fund_type_en" name="fund_type_en" value="<?= isset($this->data['fund_type_en']) ? $this->data['fund_type_en']:"" ?>" />
+              <div class="control-group">
+                <label class="control-label" for="fund_type_en">英文类型</label>
+                <div class="controls">
+                  <input type="text" id="fund_type_en" name="fund_type_en" value="<?= isset($this->data['fund_type_en']) ? $this->data['fund_type_en']:"" ?>" />
                 </div>
               </div>
-              <div class="form-group">
-              <div class="col-sm-8">
+              <div class="control-group">
+                <div class="controls">
 					<input type="hidden" name="submit" value="1" />
                     <?php if(!empty($this->id)) { ?>
                     <input type="hidden" name="id" value=" <?=$this->id?> " />
                     <?php } ?>
-                <button type="submit" class="btn btn-primary pull-right">提交</button>
+					<button type="submit" class="btn btn-primary">提交</button>
                 </div>
               </div>
             </form>
             <?php } ?>
         </div>
     </div>
+</div>
 <!-- //页面内容 -->

application/admin/views/scripts/data/fund-data-add.phtml

@@ -1,108 +0,0 @@
-<?php
-$this->headTitle($this->config->title->site);
-$this->headTitle('后台管理');
-$this->headTitle()->setSeparator(' - ');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->headLink()->appendStylesheet('/css/admin.css');
-$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-$this->breadcrumb('项目管理');
-$this->breadcrumb()->setSeparator(' > ');
-$this->theme->AppendPlus($this,'colorbox');
-$this->theme->AppendPlus($this,'admin_plugin');
-$this->theme->AppendModel($this,'admin-data-fund');
-?>
-<style>
-table thead tr th {background:#EBF2F6;}
-</style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-	<div class="col-md-10 col-sm-12">
-        <div>
-            <?= $this->partial('data/fund-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
-        </div>
-        <div>
-	    <h3><?php echo $this->md['title']; ?> <a href="/data/<?php echo $this->uuid; ?>">查看</a></h3>
-            <div class="input-append">
-            <form id="datasearch" class="search_form" action="">
-                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
-                <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
-                <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                <button type="submit" class="btn" id="search_btn">搜索项目（数据外搜索，可以添加到数据）</button>
-            </form>
-            </div>
-        </div>
-        <?php if(!empty($this->error)) { ?>
-        	<?= $this->error ?>
-        <?php } ?>
-        <?php if(!empty($this->msg)) { ?>
-            <?= $this->msg ?>
-        <?php } else{ ?>
-            
-        <div id="datalist">
-            <?php if (count($this->paginator)): ?>
-			<table class="table table-bordered table-striped">
-            	<thead>
-                    <tr>
-                        <th>项目名称
-                        <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>编号
-                        <a href="?order=fund_id&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_id&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-			<th>类型
-                        <a href="?order=fund_type&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			</th>
-			<th>英文标题
-                        <a href="?order=title_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			</th>
-                        <th>英文类型
-                        <a href="?order=fund_type_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>		
-			</th>
-						<th>序</th>
-                        <th width="60">操作</th>
-                    </tr>
-                </thead>
-				<tbody>
-                <?php 
-				if($this->page > 1)
-				{
-					$autoindex = ($this->page - 1) * $this->pagelimit;
-				}else{
-					$autoindex=0;
-				}
-                foreach ($this->paginator as $item): 
-                $autoindex++;?>
-                <tr id="DataLine_<?= $item['mfid']?>">
-                	<td>
-			[<?= $autoindex ?>]&nbsp;
-                        <?= $item['title'] ?> <a href="/admin/data/fund/ac/add/id/<?= $item['id']?>">项目编辑</a>
-						<a href="/admin/data/fund/ac/data/id/<?= $item['id'] ?>">数据</a>
-                    </td>
-               	<td><?= $item['fund_id'] ?></td>
-                    <td><?= $item['fund_type'] ?></td>
-		    <td><?= $item['title_en'] ?></td>
-		    <td><?= $item['fund_type_en'] ?></td>
-			<td><?= $item['place'] ?></td>
-                    <td>
-						<a href="javascript:void(0);" onclick="$('#mdfund')[0].reset();mdfund.edit(<?= $item['mfid']?>,<?= $item['id']?>,'<?= $this->uuid ?>',<?= $item['place']?>)">编辑</a>
-                        <a href="/admin/data/fund/ac/remove/id/<?= $item['mfid']?>">移除</a>
-                    </td>
-                </tr>
-            	<?php endforeach; ?>
-            </tbody>
-			</table>
-            <?php endif; ?>
-            <div class="pagenavi"><?= $this->paginator; ?></div>
-        </div>
-        <?php } ?>
-    </div>
-</div>
-<!-- //页面内容 -->
-<?= $this->partial('data/fund-mdfund-form.phtml'); ?>

application/admin/views/scripts/data/fund-data-list.phtml

@@ -3,8 +3,7 @@
 $this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
 $this->breadcrumb('<a href="/">首页</a>');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	// $this->headLink()->appendStylesheet('/css/author.css');
+$this->headLink()->appendStylesheet('/css/author.css');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
 $this->theme->AppendPlus($this,'admin_plugin');
@@ -12,22 +11,38 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12 span10">
-        <div class=" form-group">
-            <?= $this->partial('data/fund-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
+	<div class="span10">
+        <div>
+            <ul class="nav nav-tabs">
+            	<li class="active"><a href="/admin/data/fund/ac/data">数据相关</a></li>
+                <li><a href="/admin/data/fund/">所有项目</a></li>
+                <li><a href="/admin/data/fund/ac/add">添加新项目</a></li>
+            </ul>
         </div>
-        
-            <div class="input-group form-group">
-            <form id="datasearch" class="search_form input-group" action="">
-                <input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
-                <span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+        <?php if(!empty($this->md)) { ?>
+        <div>
+        	<?php if(empty($this->ct)) { ?>
+        	<a class="btn btn-primary pull-right" href="/author/fund/ac/formd/uuid/<?= $this->md['uuid'] ?>"><i class="icon-plus"></i>为此数据添加项目</a>
+            <?php }else{ ?>
+            <a class="pull-right btn" href="/author/fund/uuid/<?= $this->md['uuid'] ?>">返回</a>
+            <div class="pull-right label label-info">点击“添加此项目”即可将项目添加到元数据</div>
+            <?php } ?>
+        	<h3>《<?= $this->md['title'] ?>》 的支持项目</h3>
+            <hr />
+        </div>
+        <?php } ?>
+        <div>
+            <div class="input-append">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+                <button type="submit" class="btn" id="search_btn">搜索</button>
             </form>
             </div>
-
+        </div>
         <?php if(!empty($this->error)) { ?>
         <?php if(empty($this->AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?>
         <div class="alert alert-block fade in <?= $AlertType ?>" id="Alert-error-box">
@@ -55,54 +70,28 @@ table thead tr th {background:#EBF2F6;}
 			<table class="table table-bordered table-striped">
             	<thead>
                     <tr>
-                        <th>项目名称
-                        <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>编号
-                        <a href="?order=fund_id&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_id&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-			<th>类型
-                        <a href="?order=fund_type&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			</th>
-			<th>英文标题
-                        <a href="?order=title_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			</th>
-                        <th>英文类型
-                        <a href="?order=fund_type_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>		
-			</th>
-						<th>量</th>
-                        <th width="100">操作</th>
+                    	<th>名称</th>
+                        <th>项目编号</th>
+                        <th>项目类型</th>
+                        <th>数据个数</th>
+                        <th width="70">操作</th>
                     </tr>
                 </thead>
                 <tbody>
-                <?php 
-				if($this->page > 1)
-				{
-					$autoindex = ($this->page - 1) * $this->pagelimit;
-				}else{
-					$autoindex=0;
-				}
+                <?php $autoindex=0;
                 foreach ($this->paginator as $item): 
                 $autoindex++;?>
+                <?php if(empty($this->md)) { ?>
+				<tr id="DataLine_<?= $item['id']?>">
+				<?php }else{?>
                 <tr id="DataLine_<?= $item['mfid']?>">
-                	<td>
-			[<?= $autoindex ?>]&nbsp;
-                    <?= $item['title'] ?>
-                    </td>
+                <?php }?>
+                	<td><?= $item['title'] ?></td>
                 	<td><?= $item['fund_id'] ?></td>
                     <td><?= $item['fund_type'] ?></td>
-		    <td><?= $item['title_en'] ?></td>
-		    <td><?= $item['fund_type_en'] ?></td>
-			<td><?= $item['mdcount'] ?></td>
+                    <th><?= $item['mds'] ?></th>
                     <td>
-						<a href="/admin/data/fund/ac/data/id/<?= $item['id'] ?>">数据</a>
-						<a href="/admin/data/fund/ac/add/id/<?= $item['id']?>">编辑</a>
-                        <a href="/admin/data/fund/ac/delete/id/<?= $item['id']?>">删除</a>
+                        <a href="/data/fund/ac/dataview/id/<?= $item['id'] ?>">查看数据</a>
                     </td>
                 </tr>
             <?php endforeach; ?>
@@ -115,3 +104,10 @@ table thead tr th {background:#EBF2F6;}
     </div>
 </div>
 <!-- //页面内容 -->
+<script>
+var info = {
+	btn_prefix : "delbtn_",
+	item_prefix : "DataLine_",
+	url : "/author/fund/ac/mdfunddel/uuid/<?= $this->md['uuid'] ?>"
+}
+</script>

application/admin/views/scripts/data/fund-data-search.phtml

@@ -1,108 +0,0 @@
-<?php
-$this->headTitle($this->config->title->site);
-$this->headTitle('后台管理');
-$this->headTitle()->setSeparator(' - ');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->headLink()->appendStylesheet('/css/admin.css');
-$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-$this->breadcrumb('项目管理');
-$this->breadcrumb()->setSeparator(' > ');
-$this->theme->AppendPlus($this,'colorbox');
-$this->theme->AppendPlus($this,'admin_plugin');
-$this->theme->AppendModel($this,'admin-data-fund');
-?>
-<style>
-table thead tr th {background:#EBF2F6;}
-</style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2 span2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-	<div class="col-md-10 col-sm-12 span10">
-        <div>
-            <?= $this->partial('data/fund-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
-        </div>
-        <div>
-	    <h3><?php echo $this->md['title']; ?> <a href="/data/<?php echo $this->uuid; ?>">查看</a></h3>
-            <div class="input-append">
-            <form id="datasearch" class="search_form" action="">
-                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
-                <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
-                <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                <button type="submit" class="btn" id="search_btn">搜索项目（数据外搜索，可以添加到数据）</button>
-            </form>
-            </div>
-        </div>
-        <?php if(!empty($this->error)) { ?>
-        	<?= $this->error ?>
-        <?php } ?>
-        <?php if(!empty($this->msg)) { ?>
-            <?= $this->msg ?>
-        <?php } else{ ?>
-            
-        <div id="datalist">
-            <?php if (count($this->paginator)): ?>
-			<table class="table table-bordered table-striped">
-				<thead>
-                    <tr>
-                        <th>项目名称
-                        <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>编号
-                        <a href="?order=fund_id&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_id&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-			<th>类型
-                        <a href="?order=fund_type&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			</th>
-			<th>英文标题
-                        <a href="?order=title_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			</th>
-                        <th>英文类型
-                        <a href="?order=fund_type_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>		
-			</th>
-						<th>序</th>
-                        <th width="60">操作</th>
-                    </tr>
-                </thead>
-                <tbody>
-                <?php 
-				if($this->page > 1)
-				{
-					$autoindex = ($this->page - 1) * $this->pagelimit;
-				}else{
-					$autoindex=0;
-				}
-                foreach ($this->paginator as $item): 
-                $autoindex++;?>
-                <tr id="DataLine_<?= $item['mfid']?>">
-                	<td>
-			[<?= $autoindex ?>]&nbsp;
-                        <?= $item['title'] ?> <a href="/admin/data/fund/ac/add/id/<?= $item['id']?>">项目编辑</a>
-						<a href="/admin/data/fund/ac/data/id/<?= $item['id'] ?>">数据</a>
-                    </td>
-               	<td><?= $item['fund_id'] ?></td>
-                    <td><?= $item['fund_type'] ?></td>
-		    <td><?= $item['title_en'] ?></td>
-		    <td><?= $item['fund_type_en'] ?></td>
-			<td><?= $item['place'] ?></td>
-                    <td>
-						<a href="javascript:void(0);" onclick="$('#mdfund')[0].reset();mdfund.edit('<?= $item['mfid'] ?>',<?= $item['id']?>,'<?= $this->uuid ?>','<?= $item['place']?>')"><?= ($item['mfid'])?'编辑':'添加' ?></a>
-                        <a href="/admin/data/fund/ac/remove/id/<?= $item['mfid']?>">移除</a>
-                    </td>
-                </tr>
-            	<?php endforeach; ?>
-            </tbody>
-			</table>
-            <?php endif; ?>
-            <div class="pagenavi"><?= $this->paginator; ?></div>
-        </div>
-        <?php } ?>
-    </div>
-</div>
-<!-- //页面内容 -->
-<?= $this->partial('data/fund-mdfund-form.phtml'); ?>

application/admin/views/scripts/data/fund-data-view.phtml

@@ -4,9 +4,7 @@ $this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/author">数据作者</a>');
-
 $this->headLink()->appendStylesheet('/css/author.css');
-$this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('申请成为元数据作者');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
@@ -15,8 +13,8 @@ $this->theme->AppendPlus($this,'admin_plugin');
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2 span2">
+<div class="row-fluid">
+    <div class="span3">
         <?= $this->partial('author/navi.phtml'); ?>
     </div>
 	<div class="span9">

application/admin/views/scripts/data/fund-data.phtml

@@ -1,26 +1,28 @@
 <?php
 $this->headTitle($this->config->title->site);
-$this->headTitle('后台管理');
+$this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
 $this->breadcrumb('<a href="/">首页</a>');
-$this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
-$this->breadcrumb('项目管理');
+$this->breadcrumb('支持项目');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
 $this->theme->AppendPlus($this,'admin_plugin');
-$this->theme->AppendModel($this,'admin-data-fund');
 ?>
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
-            <?= $this->partial('data/fund-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
+            <ul class="nav nav-tabs">
+                <li><a href="/admin/data/fund/">所有项目</a></li>
+                <li><a href="/admin/data/fund/ac/add">添加新项目</a></li>
+                <li class="active"><a href="/admin/data/fund/ac/data/id/<?= $this->id ?>">相关数据</a></li>
+            </ul>
         </div>
         <div>
             <div class="input-append">
@@ -33,7 +35,7 @@ table thead tr th {background:#EBF2F6;}
         <?php if(!empty($this->error)) { ?>
         	<?= $this->error ?>
         <?php } ?>
-        <h3><?= $this->info['title'] ?> [<?= $this->info['fund_id'] ?>]</h3>
+        <h3><?= $this->info['title'] ?> 的相关数据</h3>
         <hr />
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
@@ -41,18 +43,21 @@ table thead tr th {background:#EBF2F6;}
             	<thead>
                     <tr>
                         <th>名称</th>
-                        <th width="100">操作</th>
+                        <th width="70">操作</th>
                     </tr>
                 </thead>
                 <tbody>
                 <?php $autoindex=0;
                 foreach ($this->paginator as $item): 
                 $autoindex++;?>
+                <?php if(empty($this->md)) { ?>
 				<tr id="DataLine_<?= $item['id']?>">
-                	<td>[<?= $autoindex ?>]&nbsp;<a href="/data/<?= $item['uuid'] ?>"><?= $item['title'] ?></a></td>
+				<?php }else{?>
+                <tr id="DataLine_<?= $item['mfid']?>">
+                <?php }?>
+                	<td><?= $item['title'] ?></td>
                     <td>
-						<a href="/admin/data/fund/uuid/<?= $item['uuid'] ?>">其他项目</a>
-                        <a href="/admin/data/fund/ac/remove/id/<?= $item['mfid']?>">移除</a>
+                        <a href="javascript:void(0);" onclick="onedel(<?= $item['id']?>)" id="delbtn_<?= $item['id']?>">删除</a>
                     </td>
                 </tr>
             <?php endforeach; ?>
@@ -64,3 +69,10 @@ table thead tr th {background:#EBF2F6;}
     </div>
 </div>
 <!-- //页面内容 -->
+<script>
+var info = {
+	btn_prefix : "delbtn_",
+	item_prefix : "DataLine_",
+	url : "/admin/data/fund/ac/mdfunddel/"
+}
+</script>

application/admin/views/scripts/data/fund-mdfund-form.phtml

@@ -1,44 +0,0 @@
-<!-- Modal -->
-<div class="modal fade" id="mdfund-form" >
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel">数据和项目的关联</h4>
-      </div>
-      <div class="modal-body">
-        <form id="mdfund" method="post" class="form-horizontal">
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="inputRefid">项目ID</label>
-            <div class="col-sm-8">
-                <input type="text" name="fid" id="inputfid" placeholder="项目ID" class="form-control" value="<?= empty($this->fid) ? "":$this->fid ?>" >
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="inputUuid">元数据UUID</label>
-            <div class="col-sm-8">
-                <input type="text" name="uuid" id="inputUuid" placeholder="UUID" class="form-control">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="inputPlace">排序数值(数字)</label>
-            <div class="col-sm-8">
-                <input type="text" name="place" id="inputPlace" placeholder="排序" class="form-control">
-            </div>
-        </div>
-        <input type="hidden" name="id" value="" />
-    </form>
-      </div>
-      <div class="modal-footer">
-        <div class="progress progress-striped active" id="submit-loading" style="display:none;">
-            <div class="bar" style="width:100%;"></div>
-        </div>
-        <button onclick="$('#mdfund')[0].reset();" class="btn">重置</button>
-        <button onclick="$('#mdfund-form').modal('hide');" class="btn">关闭</button>
-        <button onclick="mdfund.create()" class="btn btn-primary" id="submit_btn">保存</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-

application/admin/views/scripts/data/fund-nav.phtml

@@ -1,12 +0,0 @@
-<ul class="nav nav-tabs">
-    <?php if (!empty($this->uuid)) : ?>
-    <li class="active"><a href="/admin/data/fund/uuid/<?= $this->uuid ?>">数据的项目</a></li>
-    <?php endif; ?>
-    <li <?= empty($this->ac) && empty($this->uuid) ? 'class="active"':"" ?>><a href="/admin/data/fund">所有项目</a></li>
-    <li <?= $this->ac=="datalist" ? 'class="active"':"" ?>><a href="/admin/data/fund/ac/datalist">数据相关的项目</a></li>
-    <li <?= $this->ac=="nodata" ? 'class="active"':"" ?>><a href="/admin/data/fund/ac/nodata">数据不相关的项目</a></li>
-    <li <?= $this->ac=="add" ? 'class="active"':"" ?>><a href="/admin/data/fund/ac/add">添加新项目</a></li>
-    <?php if ($this->ac=='data') : ?>
-    <li class="active"><a href="#">项目相关的数据</a></li>
-    <?php endif; ?>
-</ul>

application/admin/views/scripts/data/fund.phtml

@@ -1,100 +1,139 @@
 <?php
 $this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
+$this->headTitle($this->config->title->author);
 $this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('项目管理');
+$this->breadcrumb('支持项目');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
 $this->theme->AppendPlus($this,'admin_plugin');
-	$this->theme->AppendModel($this,'admin-data-fund');
 ?>
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12 span10">
-        <div class="form-group">
-            <?= $this->partial('data/fund-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
-        </div>
+	<div class="span10">
         <div>
-            <div class="input-group form-group">
-            <form id="datasearch" class="search_form input-group" action="">
-                <input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" placeholder="搜索关键字" />
-                <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
-                <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                <span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+            <ul class="nav nav-tabs">
+            	<li><a href="/admin/data/fund/ac/datalist">数据相关</a></li>
+                <li <?php if(empty($this->md)) { ?>class="active"<?php } ?>><a href="/admin/data/fund/">所有项目</a></li>
+                <li><a href="/admin/data/fund/ac/add">添加新项目</a></li>
+                <?php if(!empty($this->md)) { ?>
+                <li class="active"><a href="/admin/data/fund/">按数据查看</a></li>
+                <?php } ?>
+            </ul>
+        </div>
+        <?php if(!empty($this->md)) { ?>
+        <div>
+        	<?php if(empty($this->ct)) { ?>
+        	<a class="btn btn-primary pull-right" href="/admin/data/fund/ac/formd/uuid/<?= $this->md['uuid'] ?>"><i class="icon-plus"></i>为此数据添加项目</a>
+            <?php }else{ ?>
+            <a class="pull-right btn" href="/admin/data/fund/uuid/<?= $this->md['uuid'] ?>">返回</a>
+            <div class="pull-right label label-info">点击“添加此项目”即可将项目添加到元数据</div>
+            <?php } ?>
+        	<h3>《<?= $this->md['title'] ?>》 的支持项目</h3>
+            <hr />
+        </div>
+        <?php } ?>
+        <div>
+            <div class="input-append">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+                <button type="submit" class="btn" id="search_btn">搜索</button>
             </form>
             </div>
         </div>
         <?php if(!empty($this->error)) { ?>
-        	<?= $this->error ?>
+        <?php if(empty($this->AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?>
+        <div class="alert alert-block fade in <?= $AlertType ?>" id="Alert-error-box">
+            <a class="close" data-dismiss="alert" href="#">×</a>
+            <?php if(!is_array($this->error)) { ?><h4 class="alert-heading"><?= $this->error ?></h4><?php } else { ?>
+            <ul>
+                <?php foreach($this->error as $v) { ?>
+                <li><?= $v ?></li>
+                <?php } ?>
+            </ul>
+            <?php } ?>
+        </div>
         <?php } ?>
         <?php if(!empty($this->msg)) { ?>
-            <?= $this->msg ?>
+            <div class="alert <?= $this->AlertType;?>">
+                <a data-dismiss="alert" class="close">×</a>
+                <?php echo $this->msg ?>
+            </div>
+            <?php if(!empty($this->jump_url)) { ?>
+            <script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
+            <?php } ?>
         <?php } else{ ?>
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
-			<table class="stylized table table-bordered table-striped table-hover">
+			<table class="table table-bordered table-striped">
             	<thead>
                     <tr>
-                        <th>项目名称
-                        <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>编号
-                        <a href="?order=fund_id&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_id&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-			             <th>类型
-                        <a href="?order=fund_type&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			             </th>
-			             <th>英文标题
-                        <a href="?order=title_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=title_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-			             </th>
-                        <th>英文类型
-                        <a href="?order=fund_type_en&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                        <a href="?order=fund_type_en&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>		
-			             </th>
-                        <th width="110">操作</th>
+                        <th>名称</th>
+                        <th>编号</th>
+                        <th>类型</th>
+                        <?php if($this->md) { ?>
+                        <th width="80">排序</th>
+                        <?php }else{ ?>
+                        <th>英文标题</th>
+                        <th>英文类型</th>
+                        <?php } ?>
+                        <?php if($this->ct) { ?>
+                        <th>添加</th>
+                        <?php } ?>
+                        <th width="100">操作</th>
                     </tr>
                 </thead>
                 <tbody>
-                <?php 
-				if($this->page > 1)
-				{
-					$autoindex = ($this->page - 1) * $this->pagelimit;
-				}else{
-					$autoindex=0;
-				}
+                <?php $autoindex=0;
                 foreach ($this->paginator as $item): 
                 $autoindex++;?>
+                <?php if(empty($this->md)) { ?>
+				<tr id="DataLine_<?= $item['id']?>">
+				<?php }else{?>
                 <tr id="DataLine_<?= $item['mfid']?>">
-                	<td>
-			[<?= $autoindex ?>]&nbsp;
-                        <?= $item['title'] ?>
-                    </td>
+                <?php }?>
+                	<td><?= $item['title'] ?></td>
                 	<td><?= $item['fund_id'] ?></td>
                     <td><?= $item['fund_type'] ?></td>
+                    <?php if($this->md) { ?>
+                    	<?php if($this->ct) { ?>
+                    	<td><input type="text" name="order" id="order_<?= $item['id']?>" class="span12" /></td>
+                    	<?php }else{ ?>
+                        <td><input type="text" name="order" id="order_<?= $item['mfid']?>" class="span12" value="<?= $item['place'] ?>" /></td>
+                        <?php }?>
+                    <?php }else{ ?>
                     <td><?= $item['title_en'] ?></td>
                     <td><?= $item['fund_type_en'] ?></td>
-			
+                    <?php } ?>
+                    <?php if($this->ct) { ?>
+                    <td><a href="javascript:void(0);" class="addtomd" rel="<?= $item['id']?>">添加此项目</a></td>
+                    <?php } ?>
                     <td>
-                        <a href="/admin/data/fund/ac/add/id/<?= $item['id']?>">编辑</a>
-                        <a href="/admin/data/fund/ac/data/id/<?= $item['id'] ?>">数据</a>(<a href="javascript:void(0);" onclick="$('#mdfund')[0].reset();mdfund.edit('',<?= $item['id']?>,'',0,0)">+</a>)
-                        <a href="/admin/data/fund/ac/delete/id/<?= $item['id']?>">删除</a>
+                        <?php if(empty($this->md)) { ?>
+                        <a href="/admin/data/fund/ac/data/id/<?= $item['id']?>">数据</a>
+                        <a href="/admin/data/fund/ac/edit/id/<?= $item['id']?>">编辑</a>
+                        <a href="javascript:void(0);" onclick="onedel(<?= $item['id']?>)" id="delbtn_<?= $item['id']?>">删除</a>
+                        <?php }else{ ?>
+                        <?php if(empty($this->ct)) { ?><a href="javascript:void(0);" class="changeorder" rel="<?= $item['mfid']?>">排序</a> <?php } ?>
+                        <a href="javascript:void(0);" onclick="onedel(<?= $item['mfid']?>)" id="delbtn_<?= $item['mfid']?>">移除</a>
+                        <?php } ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
 			</table>
+            <?php else: ?>
+            <?php if(!empty($this->md)) { ?>
+            	暂无数据，点击标题右侧添加按钮为此数据添加项目
+            <?php }else{ ?>
+            	暂无数据
+            <?php } ?>
             <?php endif; ?>
             <div class="pagenavi"><?= $this->paginator; ?></div>
         </div>
@@ -102,4 +141,35 @@ table thead tr th {background:#EBF2F6;}
     </div>
 </div>
 <!-- //页面内容 -->
-<?= $this->partial('data/fund-mdfund-form.phtml'); ?>
+<script>
+<?php if(!empty($this->ct)) { ?>
+$('.addtomd').each(function(index, element) {
+    $(this).click(function(){
+		id = $(this).attr('rel');
+		order = $('#order_'+id).val();
+		self.location='/admin/data/fund/ac/formd/uuid/<?= $this->md['uuid'] ?>/id/'+id+'/order/'+ order
+	});
+});
+<?php }else{ ?>
+$('.changeorder').each(function(index, element) {
+    $(this).click(function(){
+		id = $(this).attr('rel');
+		order = $('#order_'+id).val();
+		self.location='/admin/data/fund/ac/formd/uuid/<?= $this->md['uuid'] ?>/mfid/'+id+'/order/'+ order
+	});
+});
+<?php } ?>
+<?php if(empty($this->md)) { ?>
+var info = {
+	btn_prefix : "delbtn_",
+	item_prefix : "DataLine_",
+	url : "/admin/data/fund/ac/del"
+}
+<?php }else{ ?>
+var info = {
+	btn_prefix : "delbtn_",
+	item_prefix : "DataLine_",
+	url : "/admin/data/fund/ac/mdfunddel/uuid/<?= $this->md['uuid'] ?>"
+}
+<?php } ?>
+</script>

application/admin/views/scripts/data/import.phtml

@@ -9,10 +9,10 @@
 	$this->breadcrumb('上传元数据</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <form enctype="multipart/form-data" method="POST">
    <!-- MAX_FILE_SIZE must precede the file input field -->
    <input type="hidden" name="MAX_FILE_SIZE" value="3000000" />

application/admin/views/scripts/data/index.phtml

@@ -2,18 +2,87 @@
 	$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('数据管理');
 	$this->breadcrumb()->setSeparator(' > ');
+	$Theme = new Theme;
+	$Theme->AppendPlus($this,'highstock');
 ?>
-<div class="row" >
-	<div class="hidden-sm col-md-2">
+<div class="row-fluid">
+    <div class="span2">
     	<?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
-		<h3>数据管理</h3>
+    <div class="span10">
+    	<h2>元数据管理 <small>概况</small></h2>
         <hr />
+        
+        <ul class="unstyled">
+        	<li>元数据总条数：<?= $this->total ?></li>
+            <li>待评审的元数据：<a href="/admin/review/accept"><?= $this->review_accept ?></a></li>
+            <li>已评审的元数据：<a href="/admin/review/reviewed"><?= $this->review_finish ?></a></li>
+            <li>可视化数据：<a href="/admin/data/visual"><?= $this->visual ?></a></li>
+        </ul>
+        
+        <div id="container">
+      		
         </div>
     </div>
+</div>
+<script>
+$(function () {
+	Highcharts.setOptions({
+		lang: {
+			months : [ '一月', '二月', '三月', '四月', '五月', '六月',  '七月', '八月', '九月', '十月', '十一月', '十二月'],
+			//months : ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+			weekdays: ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日']
+		}
+	});
+    $('#container').highcharts('StockChart', {
+		  
+		  title : {
+			  text : '元数据数量增加情况'
+		  },
+		  
+		  rangeSelector : {
+			  selected : 1,
+			  inputEnabled: $('#container').width() > 480
+		  },
+		  
+		  credits : {
+			  enabled : false
+		  },
+		  
+		  tooltip : {
+		      dateTimeLabelFormats :{
+				  day:"%A, %b %e, %Y-%m-%d",
+			  }
+		  },
+		  
+		  xAxis : {
+			  dateTimeLabelFormats : {
+				  day:"%Y/%m/%d",
+			  }
+		  }
+		  
+	});
+	
+	var chart = $('#container').highcharts();
+	
+	$.ajax({
+		'url': '?time=<?= time() ?>',
+		'data': '',
+		'method': 'GET',
+		'dataType': 'json',
+		'success': function(data){
+			chart.addSeries({
+				name: "元数据个数",
+				data: data,
+				type : 'line'
+			});
+		},
+		'timeout': 30000,
+		'global' : true
+	});
+});
+</script>

application/admin/views/scripts/data/left.phtml

@@ -1,30 +1,13 @@
-<div class="well">
-	<ul class="nav nav-stacked">
-		<li class="nav-header text-muted"><h4>数据管理</h4></li>
-		<li class="nav-divider"></li>
-		<li id="Nav-data-md"><a href="/admin/data/md">元数据管理</a></li>
-		<li id="Nav-data-newdata"><a href="/admin/data/newdata">新建元数据</a></li>
-		<li id="Nav-data-author"><a href="/admin/data/author">数据作者管理</a></li>
-		<li id="Nav-data-version"><a href="/admin/data/version">数据版本管理</a></li>
-		<li id="Nav-data-comment"><a href="/admin/data/comment">数据反馈管理</a></li>
-		<!--
-		<li><a href="/admin/data/reference">数据文献管理</a></li>
-		-->
-		<li id="Nav-data-ref"><a href="/admin/data/ref">文献管理</a></li>
-		<li id="Nav-data-attachments"><a href="/admin/data/attachments">数据附件管理</a></li>
-		<!--
-		<li><a href="/admin/data/import">上传元数据文件</a></li>
-		<li><a href="/admin/data/batchimport">导入服务器元数据目录</a></li>
-		<li><a href="/admin/data/datafileimport">导入数据目录</a></li>
-		<li><a href="/admin/data/sync">同步GeoNetwork元数据</a></li>
-		<li><a href="/admin/data/datasetcd">特色数据集管理</a></li>
-		<li><a href="/admin/data/newsletter">数据中心通讯管理</a></li>
-		<li><a href="/admin/data/feature">特色推荐</a></li> 
-		-->
-		<li id="Nav-data-source"><a href="/admin/data/source">专题管理</a></li>
-		<li id="Nav-data-project"><a href="/admin/data/project">汇交计划</a></li>
-		<li id="Nav-data-fund"><a href="/admin/data/fund">支持项目</a></li>
-		<li id="Nav-data-doi"><a href="/admin/data/doi">DOI</a></li>
-		<li id="Nav-data-spatial"><a href="/admin/data/spatial">数据时空范围</a></li>
+<div class="well" style="padding:8px 0">
+    <ul class="nav nav-list">
+    <li class="nav-header"><h4>数据管理</h4></li>
+    <li class="divider"></li>
+    <li><a href="/admin/data/md">元数据管理</a></li>
+    <li><a href="/admin/data/author">数据作者管理</a></li>
+    <li><a href="/admin/data/version">数据版本管理</a></li>
+    <li><a href="/admin/data/comment">数据反馈管理</a></li>
+    <li><a href="/admin/data/attachments">数据附件管理</a></li>
+    <li><a href="/admin/data/visual">数据可视化管理</a></li>
+    <li><a href="/admin/data/dataimport">数据入库处理</a></li>
     </ul>
 </div>

application/admin/views/scripts/data/md-dataset.phtml

@@ -24,16 +24,10 @@
 	{?>
 		<p>主机：<br /><input type="text" id="host" name="host" value="<?= $this->dataset['host']?>" class="full" /></p>
         <p>路径：<br /><input type="text" id="path" name="path" value="<?= $this->dataset['path']?>" class="full" /></p>
-		<p>语言：<br /><input type="radio" name="lang" value="" <?php if ($this->dataset['lang']=='') echo 'checked="checked"'; ?> /> 不限制语言
-		<input type="radio" name="lang" value="cn" <?php if ($this->dataset['lang']=='cn') echo 'checked="checked"'; ?> /> 中文
-		<input type="radio" name="lang" value="en" <?php if ($this->dataset['lang']=='en') echo 'checked="checked"'; ?> /> 英文 </p>
         <p><button type="button" class="btn btn-green" onclick="updateDataSet()">修改</button></p>
 	<?php }else{ ?>
     	<p>主机：<br /><input type="text" id="host" name="host" value="" class="full" /></p>
         <p>路径：<br /><input type="text" id="path" name="path" value="" class="full" /></p>
-		<p>语言：<br /><input type="radio" name="lang" value="" /> 不限制语言
-		<input type="radio" name="lang" value="cn" /> 中文
-		<input type="radio" name="lang" value="en" /> 英文 </p>			
         <p><button type="button" class="btn btn-green" onclick="addDataSet()">添加</button></p>
     <?php } ?>
     </div>
@@ -46,7 +40,7 @@ function updateDataSet(){
 	$.ajax({
 	  'type':"POST",
 	  'url':'/admin/data/dataset',
-	  'data':'ac=update&uuid=<?= $this->uuid ?>&host='+$('#host').val()+'&path='+$('#path').val()+'&lang='+$("input[type='radio'][name='lang']:checked").val(),
+	  'data':'ac=update&uuid=<?= $this->uuid ?>&host='+$('#host').val()+'&path='+$('#path').val(),
 	  'success':function(data){
 		  if (typeof(data)=='object')
 		  {
@@ -72,7 +66,7 @@ function addDataSet(){
 	$.ajax({
 	  'type':"POST",
 	  'url':'/admin/data/dataset',
-	  'data':'ac=add&uuid=<?= $this->uuid ?>&host='+$('#host').val()+'&path='+$('#path').val()+'&lang='+$("input[type='radio'][name='lang']:checked").val(),
+	  'data':'ac=add&uuid=<?= $this->uuid ?>&host='+$('#host').val()+'&path='+$('#path').val(),
 	  'success':function(data){
 		  if (typeof(data)=='object')
 		  {

application/admin/views/scripts/data/md.phtml

@@ -2,23 +2,24 @@
 	$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(' > ');
-    //$this->theme->AppendPlus($this,'colorbox');
-    $this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-    $this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
+	$this->theme->AppendPlus($this,'colorbox');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
     	<?= $this->partial('data/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span10">
+    
+    	<h3>元数据管理</h3>
+        <hr />
+        
 		<?php if ($this->msg or $this->messages) :?>
-        <div id="message" class="alert alert-info">
+        <div id="message">
         <?php if ($this->msg) : ?>
             <p><?php echo $this->msg; ?></p>
         <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -27,63 +28,54 @@
         </div>
         <?php endif; ?>
         
-        <!-- <div class="right_title">元数据管理</div> -->
-
-        <div class="input-group form-group">
-            <form action="" method="get" class="search_form input-group">
-                <input class="form-control" type="text" name="keyword" value="<?php echo $this->keyword; ?>" placeholder="搜索关键字" />
-                <input type="hidden" name="search" value="1"/>
-                <span class="input-group-btn"><button class="btn btn-default" value="搜索">搜索</button></span>
+        <div class="search" style="overflow:hidden;">
+            <div class="span6">
+                <form action="" method="get" class="form-search">
+                <div class="input-append">
+                <input type="hidden" name="search" value='1' />
+                    <input class="span12" type="text" name="keyword" value="<?php echo $this->keyword; ?>" placeholder="搜索关键字"/>
+                    <button type="submit" class="btn">搜索</button>
+                </div>
                 </form>
+            </div>
+            <div class="span6 text-right">
+                <a href="/admin/data/md/down/1">下载全部xml元数据</a>
+            </div>
     	</div><!-- search DIV -->
-        <p><a href="/admin/data/md/down/1">下载全部xml元数据</a></p>
+        
         <?php if (count($this->paginator)): ?>
         <div class="datalist">
-            <ul class="list-unstyled">
+        <ul class="unstyled">
         <?php foreach ($this->paginator as $item): ?>
-                <li class="well well-sm">
+        <li class="well well-small">
             <h4><a href="/data/<?= $item['uuid']; ?>" class="title"><?= $item['title']; ?></a></h4>
             <p>大小：<?= $item['filesize']; ?>M，创建时间：<?= date('Y-m-d',strtotime($item['ts_created'])); ?>，查看：<?= $item['viewed']; ?>次。</p>
-                    <?php if(isset($item['heihe_fund_title']) && !empty($item['heihe_fund_title'])) { ?><p>计划内项目: <?= $item['heihe_fund_title'] ?></p><?php } ?>
-                    <p>
-                    操作：
-                        <?php if ($item['gid']>0) : ?>
-                        <a class="label label-primary" href="/service/geonetwork?url=metadata.edit?id=<?= $item['gid']; ?>" target="_blank">编辑</a>
-                        <?php endif; ?>
-                        <a class="label label-danger" href="/admin/data/md/delete/<?= $item['uuid']; ?>">删除</a>
-                        <!-- <a href="/admin/data/sync/uuid/<?= $item['uuid']; ?>">同步</a> -->
-                        <a class="label label-primary" href="/admin/data/ref/uuid/<?php echo $item['uuid'];?>">文献管理</a>
-                        <a class="label label-primary" href="/admin/data/md/att/1/uuid/<?php echo $item['uuid'];?>">附件管理</a>
-                        <a class="label label-primary" href="/admin/data/comment/uuid/<?php echo $item['uuid'];?>">反馈管理</a>
-                        <a class="label label-primary" href="/admin/data/author/uuid/<?php echo $item['uuid'];?>">作者管理</a>
-                        <a class="label label-primary" href="/admin/data/version/uuid/<?php echo $item['uuid'];?>">版本管理</a>
-                        <?php if (@!is_numeric($item['mdstatus'])) : ?>
-                        <a class="label label-primary" href="/admin/review/addon/uuid/<?php echo $item['uuid'];?>">放入元数据评审</a>
-                        <?php endif; ?>
-                        <a class="label label-primary" href="/admin/data/source/do/datasource/uuid/<?php echo $item['uuid'];?>">数据来源</a>
-                        <?php if(!empty($item['datasetid'])):?>
-                        <a class="label label-primary  iframe" href="/admin/data/dataset/ac/getdataset/uuid/<?php echo $item['uuid'];?>">数据路径</a>
-                        <a class="label label-primary iframe" href="/admin/data/dataset/ac/import/uuid/<?php echo $item['uuid'];?>" class="iframe">重新导入数据目录</a>
-                        <?php else: ?>
-                        <a class="label label-primary iframe" href="/admin/data/dataset/ac/getdataset/uuid/<?php echo $item['uuid'];?>">设置数据路径</a>
-                        <?php endif;?>
-                        <a class="label label-primary" href="/admin/down/sendmail/uuid/<?php echo $item['uuid'];?>" title="向数据下载者发送通知邮件">邮件通知</a>
-                        <a class="label label-primary" href="/admin/data/fund/uuid/<?php echo $item['uuid'];?>">支持项目</a>
-                        <a class="label label-primary" href="/admin/data/doi/uuid/<?php echo $item['uuid'];?>">DOI</a>
-                        <?php if ($item['datatype']==1 && ($item['mdstatus']==5 || $item['mdstatus']==6)) :?>
-                        <a class="label label-primary iframe" href="/admin/data/author/ac/delegate/uuid/<?php echo $item['uuid'];?>">委托数据中心管理</a>
-                        <?php endif; ?>
-                        <?php if (!isset($item['genid']) || !$item['genid']>0) : ?>
-                        <a class="label label-primary iframe" href="/admin/data/gnenexport/uuid/<?php echo $item['uuid'];?>">导入英文版</a>
-                        <?php endif; ?>
-                        <?php if (!isset($item['stid']) || !$item['stid']>0) : ?>
-                        <a  class="label label-primary" href="/admin/data/spatial/ac/edit/uuid/<?php echo $item['uuid']; ?>">数据时空范围采集</a>
-                        <?php endif; ?>
-                    </p>
             <?php if($item['author']) :?>
             <p>数据贡献者：<?= $item['author']; ?></p>
             <?php endif;?>
             <p class="content"><?= $item['description']; ?></p>
+            <p>
+            操作：
+            <a href="/service/geonetwork?url=metadata.edit?id=<?= $item['gid']; ?>" target="_blank">编辑</a> | 
+            <a href="/admin/data/md/delete/<?= $item['uuid']; ?>">删除</a> | 
+            <a href="/admin/data/md/att/1/uuid/<?php echo $item['uuid'];?>">附件管理</a> | 
+            <a href="/admin/data/comment/uuid/<?php echo $item['uuid'];?>">反馈管理</a> | 
+            <a href="/admin/data/author/uuid/<?php echo $item['uuid'];?>">作者管理</a> | 
+            <a href="/admin/data/version/uuid/<?php echo $item['uuid'];?>">版本管理</a> | 
+            <?php if (@!is_numeric($item['mdstatus'])) : ?>
+            <a href="/admin/review/addon/uuid/<?php echo $item['uuid'];?>">放入元数据评审</a> | 
+            <?php endif; ?>
+            <?php if(!empty($item['datasetid'])):?>
+            <a href="/admin/data/dataset/ac/getdataset/uuid/<?php echo $item['uuid'];?>" class="iframe">数据路径</a> |
+            <a href="/admin/data/dataset/ac/import/uuid/<?php echo $item['uuid'];?>" class="iframe">重新导入数据目录</a> | 
+            <?php else: ?>
+            <a href="/admin/data/dataset/ac/getdataset/uuid/<?php echo $item['uuid'];?>" class="iframe">设置数据路径</a> | 
+            <?php endif;?>	
+            <a href="/admin/down/sendmail/uuid/<?php echo $item['uuid'];?>" title="向数据下载者发送通知邮件">邮件通知</a> | 
+            <a href="/admin/data/fund/uuid/<?php echo $item['uuid'];?>">支持项目</a> | 
+            <a href="/admin/data/visual/uuid/<?php echo $item['uuid'];?>">数据可视化</a> | 
+            <a href="javascript:void(0);" onclick="getFtp('<?= $item['uuid'] ?>')">FTP数据管理</a>
+            </p>
         </li>
         <?php endforeach; ?>
         </ul>
@@ -98,4 +90,36 @@
 function Alert(html){
 	$.colorbox({'innerWidth':'50%','html':'<h4 style="font-size:16px;font-weight:bold;">'+html+'</h4>'});
 }
+function getFtp(uuid){
+	$.ajax({
+	  'type':"POST",
+	  'url':'/admin/data/ftp/uuid/'+uuid,
+	  'data':'',
+	  'success':function(data){
+		  if (typeof(data)=='object')
+		  {
+			if(typeof(data.error)!='undefined')
+			{Alert(data.error);return false;}
+			if(typeof(data.statu)!='undefined')
+			{
+				if(data.statu > 0)
+				{
+					var html = '<p>临时FTP帐号信息<b>(此帐号仅对应当前数据集！)</b></p><p>ftp://ftp.sanjiangyuan.org.cn/</p>'+
+								'<p>用户名：'+data.user+
+								'</p><p>密码：'+data.passwd+'</p>'
+								+'<p><a href="ftp://'+data.user+':'+data.passwd+'@ftp.sanjiangyuan.org.cn/">或直接点击此链接</a></p>';
+					Alert(html);
+				}
+			}
+		  }
+		  else{ 
+		  	Alert('出现错误，请稍候再试</h4>');
+		  }
+	  },
+	  'timeout': 30000,
+	  'error': function(){
+		  Alert('处理中出现错误，请刷新页面后重试</h4>');
+	   }
+  });
+}
 </script>

application/admin/views/scripts/data/newdata-add-bydata.phtml

@@ -13,29 +13,32 @@
 $this->breadcrumb('新建元数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id='leftPanel'>
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata">未提交数据列表</a>
-			<a class="btn btn-primary btn-sm" href="/service/geonetwork?url=metadata.xmlinsert.form">导入元数据</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata/ac/add-by-template">根据模板新建元数据</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata/ac/add-by-data">根据已有数据新建元数据</a>
+<div id="rightPanel">
+<div id="tabs-controller">
+	<ul>
+		<li class="box-shadow"><a class="text-shadow" href="/admin/data/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="/admin/data/newdata/ac/add-by-template">根据模板新建元数据</a></li>
+		<li class="box-shadow active"><a class="text-shadow" href="/admin/data/newdata/ac/add-by-data">根据已有数据新建元数据</a></li>
+	</ul>
 </div>
-		<div id="datalist" class="input-group form-group">
+
+<div id="datalist">
 <h2>根据已有数据创建元数据</h2>
-		<form id="datasearch" class="search_form input-group" action="/admin/data/newdata/ac/add-by-data">
-			<input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" placeholder="搜索关键字"/>
-			<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+<form id="datasearch" class="search_form" action="/admin/data/newdata/ac/add-by-data">
+    <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+    <button type="submit" class="btn" id="search_btn">搜索</button>
 </form>
     <?php
 		if (count($this->paginator)): 
-				echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;
@@ -53,7 +56,6 @@
 </div>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
 <!-- //页面内容 -->
 <script>
 $(".iframe").colorbox({iframe:true, width:"80%", height:"80%"}); 

application/admin/views/scripts/data/newdata-add.phtml

@@ -14,28 +14,31 @@ $this->breadcrumb('新建元数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
 <!-- 左侧导航 -->
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id='leftPanel'>
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata">未提交数据列表</a>
-			<a class="btn btn-primary btn-sm" href="/service/geonetwork?url=metadata.xmlinsert.form">导入元数据</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata/ac/add-by-template">根据模板新建元数据</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata/ac/add-by-data">根据已有数据新建元数据</a>
+<div id="rightPanel">
+<div id="tabs-controller">
+	<ul>
+		<li class="box-shadow"><a class="text-shadow" href="/admin/data/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 active"><a class="text-shadow" href="/admin/data/newdata/ac/add-by-template">根据模板新建元数据</a></li>
+		<li class="box-shadow"><a class="text-shadow" href="/admin/data/newdata/ac/add-by-data">根据已有数据新建元数据</a></li>
+	</ul>
 </div>
-		<div id="datalist" class="input-group form-group">
+
+<div id="datalist">
 <h2>根据预制元数据模板创建数据</h2>
-		<form id="datasearch" class="search_form input-group" action="/admin/data/newdata/ac/add-by-template">
-			<input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" placeholder="搜索关键字"/>
-			<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+<form id="datasearch" class="search_form" action="/admin/data/newdata/ac/add-by-template">
+    <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+    <button type="submit" class="btn" id="search_btn">搜索</button>
 </form>
     <?php
 		if (count($this->paginator)): 
-				echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;
@@ -54,7 +57,6 @@ $this->breadcrumb()->setSeparator(' > ');
 </div>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
 <!-- //页面内容 -->
 <script>
 $(".iframe").colorbox({iframe:true, width:"80%", height:"80%"}); 

application/admin/views/scripts/data/newdata.phtml

@@ -3,47 +3,49 @@
 $this->headTitle('后台管理');
 $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/admin.css');
-	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin">后台首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('新建元数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div  class="hidden-sm hidden-xs col-md-2">
+<div id='leftPanel'>
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata">未提交数据列表</a>
-			<a class="btn btn-primary btn-sm" href="/service/geonetwork?url=metadata.xmlinsert.form">导入元数据</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata/ac/add-by-template">根据模板新建元数据</a>
-			<a class="btn btn-primary btn-sm" href="/admin/data/newdata/ac/add-by-data">根据已有数据新建元数据</a>
+<div id="rightPanel">
+<div id="tabs-controller">
+	<ul>
+		<li class="box-shadow active"><a class="text-shadow" href="/admin/data/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="/admin/data/newdata/ac/add-by-template">根据模板新建元数据</a></li>
+		<li class="box-shadow"><a class="text-shadow" href="/admin/data/newdata/ac/add-by-data">根据已有数据新建元数据</a></li>
+	</ul>
 </div>
-		<div id="datalistZ">
+
+<div id="datalist">
     <?php
 		if (count($this->paginator)): 
-				echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;
 			?>
-					<li class="well well-sm">
-						<h4><?php echo $item['title'];?><small>&nbsp;<?php echo $item['username'];?>( <?php echo $item['realname'];?> ) </small></h4> 
-						<a class="label label-info" href="/service/geonetwork?url=metadata.show?id=<?php echo $item['id']; ?>" target="_blank"><span class="glyphicon glyphicon-zoom-in"></span>&nbsp;在geonetwork里查看</a>
-						<a class="label label-primary" href="/service/geonetwork?url=metadata.edit?id=<?php echo $item['id']; ?>" target="_blank"><span class="glyphicon glyphicon-pencil"></span>&nbsp;在geonetwork里修改</a>
-						<a class="label label-danger" href="/service/geonetwork?url=metadata.delete?id=<?php echo $item['id']; ?>" target="_blank"><span class="glyphicon glyphicon-remove"></span>&nbsp;删除此条数据</a>
-						<a class="label label-primary" onclick="validate(<?php echo $item['id'];?>);" class="more inline"><span class="glyphicon glyphicon-search"></span>&nbsp;检查元数据错误</a>				
-						<a class="label label-success more inline" onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" ><span class="glyphicon glyphicon-ok"></span>&nbsp;提交评审发布</a>
-						<span class="text-primary"> &nbsp;版本数：<?= $item['version_count'] ?>个</span>
-						
+            <li>
+				<p><?php echo $item['username'];?>(<?php echo $item['realname'];?>) <span class="title"><?php echo $item['title'];?></span> 
+				【<a href="/service/geonetwork?url=metadata.show?id=<?php echo $item['id']; ?>" target="_blank">在geonetwork里查看</a>
+				| <a href="/service/geonetwork?url=metadata.edit?id=<?php echo $item['id']; ?>" target="_blank">在geonetwork里修改</a>
+				| <a href="/service/geonetwork?url=metadata.delete?id=<?php echo $item['id']; ?>" target="_blank">删除此条数据</a>
+				| <a onclick="validate(<?php echo $item['id'];?>);" class="more inline">检查元数据错误</a>				
+				| <a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline">提交评审发布</a>
+				】</p>
 			</li>
      <?php
 		endforeach; 
@@ -54,7 +56,6 @@
 </div>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
 <!-- //页面内容 -->
 <script>
 $('#wapper').width($('body').width()-300);
@@ -84,7 +85,7 @@ function action(ac,id){
 	   }
   });
 }
-$(".inline").colorbox({inline:true, width:"50%", height:"50%"});
+$(".inline").colorbox({inline:true, width:"50%"});
 $(".iframe").colorbox({iframe:true, width:"80%", height:"80%"}); 
 function commit(id){
 	action('commit&changelog='+$('#changelog').val(),id);
@@ -98,10 +99,10 @@ function validate(id){
     <form>
         <p>
         <label>简要功能:</label><br />
-        <textarea rows="12" class="full" style="width:100%;" id="changelog"></textarea>
+        <textarea class="full" style="resize:none;height:200px;" id="changelog"></textarea>
         <br /><small>请输入此数据的简要功能和特色</small>
         </p>
-        <input type="button" onclick="" id="commit_submit" class="btn btn-success pull-right" value="提交"/>
+        <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>

application/admin/views/scripts/data/newsletter.phtml

@@ -9,13 +9,12 @@
 	$this->breadcrumb('数据通讯管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -31,10 +30,11 @@
 	list(,$num)=explode("_",$name);
 ?>
  <div class="newsletter">
+
                 <a href="/images/newsletter/<?php echo $nl; ?>" target="_blank">
                     <img src="/images/newsletter/<?php echo $name; ?>.jpg" /></a><br />
                 <a href="/images/newsletter/<?php echo $nl; ?>" target="_blank">第<?php echo $num;?>期数据通讯</a>
 </div>
 <?php } ?>
-	</div>
+
 </div>

application/admin/views/scripts/data/project-status.phtml

@@ -1,77 +0,0 @@
-<?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/heihe">黑河数据集</a>');
-	$this->breadcrumb('黑河数据集');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
-	$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
-	$this->headLink()->appendStylesheet('/css/colorbox.css');
-	$this->headLink()->appendStylesheet('/css/author.css');
-?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-    <div class="col-md-10 col-sm-12">
-        <h2>统计信息</h2>
-        <hr />
-
-        <h4>数据：</h4>
-        <p>项目个数：<?= $this->projectsCount ?></p>
-        <p>数据条数：<?= $this->dataCount ?></p>
-        <p>总数据量：<?= round($this->dataFileSize / 1024 , 2) . 'GB' ?></p>
-        <p>文件个数：<a href="javascript:void(0);" id="fileCount">点击查看</a></p>
-        <p>服务次数(人/次)：<a href="/admin/data/project/ac/userdown"><?= $this->applyTimes ?></a></p>
-        <p>服务次数(人/合并次,单个用户多次申请算作一次服务)： <?= $this->applyTimesDistanct ?></p>
-        <p>服务次数(数据条/次)：<?= $this->dataApplyTimes  ?></p>
-
-
-        <h4>项目服务情况<small>（数据中心所有数据向计划内项目提供的服务)</small></h4>
-        <p>为黑河计划项目服务的次数-离线：<?= $this->offlineServiceTimes ?></p>
-        <p>为黑河计划项目服务的数据量-离线：<?= round($this->offlineServiceSize,2) ?>GB</p>
-        <p>为黑河计划项目服务的次数-在线：<?= $this->onlineServiceTimes ?></p>
-        <p>为黑河计划项目服务的数据量-在线：<?= round($this->onlineServiceSize ,2) ?>GB</p>
-        <p>为黑河计划项目服务的次数-总数：<?= $this->onlineServiceTimes + $this->offlineServiceTimes ?></p>
-        <p>为黑河计划项目服务的数据量-总数：<?= round($this->onlineServiceSize + $this->offlineServiceSize ,2)?>GB</p>
-        <p>服务计划内项目个数-离线：<?= $this->offlineServiceProjects ?></p>
-        <p>服务计划内项目个数-在线：<?= $this->onlineServiceProjects ?></p>
-        <p>服务计划内项目个数-综合(在线离线合并)：<?= $this->allServiceProjects ?></p>
-
-        <h3>选择项目进行统计</h3>
-
-        <form method="get">
-            <div class="form-group">
-                <?php foreach($this->projects as $v) { ?>
-                <label class="checkbox-inline" title="<?= $v['title'] ?>">
-                    <input type="checkbox" name="fund_id[]" value="<?= $v['code'] ?>" <?= (is_array($this->funds) && in_array($v['code'],$this->funds)) ? "checked":'' ?> title="<?= $v['title'] ?>" /><?= $v['code'] ?>
-                </label>
-                <?php }?>
-            </div>
-            <button type="submit" name="submit" value="1" class="btn btn-success">重新统计</button>
-        </form>
-
-
-    </div>
-</div>
-<?php $query = isset($_GET) && count($_GET) ? "?".http_build_query($_GET) :"" ; ?>
-<script>
-    $('#fileCount').click(function(){
-        $.ajax({
-            'type': "POST",
-            'url': "<?= $query ?>",
-            'data': '',
-            'success': function(data){
-                $('#fileCount').after(data);
-                $('#fileCount').remove();
-            },
-            'beforeSend':function(){
-                $('#fileCount').html('正在加载...');
-            }
-        })
-    });
-</script>

application/admin/views/scripts/data/project-userdown.phtml

@@ -1,89 +0,0 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin">后台首页</a>');
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('黑河数据集');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->theme->AppendPlus($this,'jquery');
-	// $this->theme->AppendPlus($this,'colorbox');
-	$this->headLink()->appendStylesheet('/css/author.css');
-    $this->headLink()->appendStylesheet('/css/admin.css');
-    $this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-    $this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-
-?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
-		<?= $this->partial('data/left.phtml'); ?>
-	</div>
-	<div class="col-md-10 col-sm-12">
-		<?php if(!empty($this->searchLink)){ ?>
-		<div class="input-group form-group">
-			<form id="datasearch" class="search_form input-group" action="<?= $this->searchLink ?>">
-				<input class="form-control" type="text" id="keyword" name="q" value="<?= $this->searchKeyword; ?>" placeholder="搜索关键字"  />
-				<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
-			</form>
-		</div>
-		<?php }?>
-        <div class="">
-            <a href="/admin/data/project/ac/status" class="btn btn-info">统计</a>
-            <a href="/admin/data/project/ac/datas" class="btn btn-info">计划内的数据</a>
-            <a href="/admin/data/project/ac/download" class="btn btn-info">计划内的下载纪录</a>
-        </div>
-		<h5>
-		共 <?= $this->Count; ?> 条记录
-		</h5>
-		<div id="datalistZ">
-			<?php if (count($this->paginator)):  ?>
-                <table class="table">
-                    <thead>
-
-                        <th>用户ID</th>
-                        <th>用户名</th>
-                        <th>姓名</th>
-                        <th>下载次数</th>
-
-                    </thead>
-                    <tbody>
-			<?php
-                    $autoindex=0;
-					foreach ($this->paginator as $item): 
-					$autoindex++;
-			?>
-            <tr>
-                <td><?= $item['id'] ?></td>
-                <td><?= $item['username'] ?></td>
-                <td><?= $item['realname'] ?></td>
-                <td><?= $item['c'] ?></td>
-            </tr>
-			 <?php endforeach;?>
-                    </tbody>
-                </table>
-				<?php endif; ?>
-		</div>
-		<div class="pagenavi"><?= $this->paginator; ?></div>
-	</div>
-	<div style="display:none;">
-		<div id="confirm_dialog" class="cbox_content">
-			<div class="sepH_c tac"><strong>状态修改</strong></div>
-			<div id="cbox_dialog_content" class="sepH_c ">
-				<select id="status_selector" style="width:300px;" name="" class="form-control">
-					<?php 
-					foreach($this->project_status as $k=>$v)
-					{
-						echo '<option value="'.$k.'">'.$v.'</option>';
-					}
-					?>
-				</select>
-			</div>
-			<div class="tac pull-right" id="cbox_ctl_btns">
-				<a href="javascript:void(0);" class="btn btn-success btn-sm" id="confirm_yes" 
-				onclick="changeStatusAction($('#status_selector').attr('name'),$('#status_selector').val());">确定</a>
-				<a href="javascript:void(0);" class="btn btn-danger btn-sm" id="confirm_no" onclick="$.colorbox.close();">取消</a>
-			</div>
-		</div>
-	</div>
-</div>

application/admin/views/scripts/data/project.phtml

@@ -2,74 +2,59 @@
 	$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('黑河数据集');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->theme->AppendPlus($this,'jquery');
-	// $this->theme->AppendPlus($this,'colorbox');
+	$this->theme->AppendPlus($this,'colorbox');
 	$this->headLink()->appendStylesheet('/css/author.css');
-    $this->headLink()->appendStylesheet('/css/admin.css');
-    $this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-    $this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 	<?php if(!empty($this->searchLink)){ ?>
-		<div class="input-group form-group">
-			<form id="datasearch" class="search_form input-group" action="<?= $this->searchLink ?>">
-				<input class="form-control" type="text" id="keyword" name="q" value="<?= $this->searchKeyword; ?>" placeholder="搜索关键字"  />
-				<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+	<div>
+        <form id="datasearch" class="search_form" action="<?= $this->searchLink ?>">
+            <input type="text" id="keyword" name="q" value="<?= $this->searchKeyword; ?>" />
+            <button type="submit" class="btn" id="search_btn">搜索</button>
         </form>
 	</div>
 	<?php }?>
-        <div class="">
-            <a href="/admin/data/project/ac/status" class="btn btn-info">统计</a>
-            <a href="/admin/data/project/ac/datas" class="btn btn-info">计划内的数据</a>
-            <a href="/admin/data/project/ac/userdown" class="btn btn-info">计划内的下载纪录</a>
-        </div>
-		<h5>
+    <div>
     共 <?= $this->Count; ?> 条记录
-		</h5>
-		<div id="datalistZ">
+    </div>
+	<div id="datalist">
 		<?php
             if (count($this->paginator)): 
-				echo "<ul class=list-unstyled>";
+            echo "<ul>";
                 $autoindex=0;
                 foreach ($this->paginator as $item): 
                 $autoindex++;
                 ?>
-			<li class="well well-sm">
-				<h3><span class="title"><?php echo $item['title'];?></span></h3>
-				<p class="text-muted">
-					编号：<?= $item['code'];?>&nbsp;&nbsp;|&nbsp;&nbsp;
-					负责人：<?= $item['name'];?>&nbsp;&nbsp;|&nbsp;&nbsp;
-					开始时间：<?= $item['pstart'];?>&nbsp;&nbsp;|&nbsp;&nbsp;
-					<span id="status_alias_<?= $item['id']?>" <?php if ($item['status'] == 3) echo 'class="glyphicon glyphicon-ok text-success"'; else echo 'class="glyphicon glyphicon-pencil text-warning"'; ?> >状态：<?= $item['status_alias'];?></span>
-				</p>
-
+            <li>
+            <p><span class="title"><?php echo $item['title'];?></span></p>
+            <p>编号：<?= $item['code'];?> | 负责人：<?= $item['name'];?> | 开始时间：<?= $item['pstart'];?>　|
+            　状态：<span id="status_alias_<?= $item['id']?>"><?= $item['status_alias'];?></span></p>
             <p>
-					<a href="javascript:void(0);" onclick="$('#inviteFrom_<?= $item['id'];?>').toggle();">邀请跟踪专家</a>&nbsp;&nbsp;|&nbsp;&nbsp;
-					<a class="iframe" href="/admin/data/project/ac/showexpert/id/<?= $item['id'];?>">查看跟踪专家</a>&nbsp;&nbsp;|&nbsp;&nbsp;
-					<a href="/admin/data/project/ac/upload/pid/<?= $item['id']?>" class="iframe">上传计划</a>&nbsp;&nbsp;|&nbsp;&nbsp;
-					<a href="javascript:void(0);" onclick="changeStatus(<?= $item['id'];?>,<?= $item['status']?>)">状态修改</a>&nbsp;&nbsp;|&nbsp;&nbsp;
-					
+            	<a href="javascript:void(0);" onclick="$('#inviteFrom_<?= $item['id'];?>').toggle();">邀请跟踪专家</a>　|　
+                <a class="iframe" href="/admin/data/project/ac/showexpert/id/<?= $item['id'];?>">查看跟踪专家</a>　|　
+                <a href="/admin/data/project/ac/upload/pid/<?= $item['id']?>" class="iframe">上传计划</a>　|　
+                <a href="javascript:void(0);" onclick="changeStatus(<?= $item['id'];?>,<?= $item['status']?>)">状态修改</a>
                 <?php if(!empty($item['attachid'])) { ?>
-					<a href="/service/attach/id/<?= $item['attachid'];?>">下载</a>
+                　|　<a href="/service/attach/id/<?= $item['attachid'];?>">下载</a>
                 <?php } ?>
             </p>
-				<div id="inviteFrom_<?= $item['id'];?>" style="display:none;" class="form-inline">
-					<input class="form-control" type="text" id="expert_name_<?= $item['id'];?>" value="<?= $this->input_NameDefaultVal ?>"
+            <p id="inviteFrom_<?= $item['id'];?>" style="display:none;">
+            	<input type="text" id="expert_name_<?= $item['id'];?>" value="<?= $this->input_NameDefaultVal ?>"
                  onfocus="if(this.value=='<?= $this->input_NameDefaultVal ?>'){this.value=''}" onblur="if(this.value==''){this.value='<?= $this->input_NameDefaultVal ?>'}" />
-					<input class="form-control" type="text" id="expert_email_<?= $item['id'];?>" value="<?= $this->input_EmailDefaultVal ?>"
+                <input type="text" id="expert_email_<?= $item['id'];?>" value="<?= $this->input_EmailDefaultVal ?>"
                  onfocus="if(this.value=='<?= $this->input_EmailDefaultVal ?>'){this.value=''}" onblur="if(this.value==''){this.value='<?= $this->input_EmailDefaultVal ?>'}" />
-					<button type="button " class="btn btn-primary" onclick="invite(<?= $item['id'];?>)" id="inviteBtn_<?= $item['id'];?>">邀请</button>
-				</div>
+                <button type="button" class="btn btn-green" onclick="invite(<?= $item['id'];?>)" id="inviteBtn_<?= $item['id'];?>">邀请</button>
+            </p>
             </li>
          <?php
             endforeach; 
@@ -82,7 +67,7 @@
 	<div id="confirm_dialog" class="cbox_content">
         <div class="sepH_c tac"><strong>状态修改</strong></div>
         <div id="cbox_dialog_content" class="sepH_c">
-				<select id="status_selector" style="width:300px;" name="" class="form-control">
+        	<select id="status_selector" style="width:300px;" name="">
             	<?php 
 				foreach($this->project_status as $k=>$v)
 				{
@@ -91,11 +76,10 @@
 				?>
             </select>
         </div>
-			<div class="tac pull-right" id="cbox_ctl_btns">
-				<a href="javascript:void(0);" class="btn btn-success btn-sm" id="confirm_yes" 
-				onclick="changeStatusAction($('#status_selector').attr('name'),$('#status_selector').val());">确定</a>
-				<a href="javascript:void(0);" class="btn btn-danger btn-sm" id="confirm_no" onclick="$.colorbox.close();">取消</a>
-			</div>
+        <div class="tac" id="cbox_ctl_btns">
+            <a href="javascript:void(0);" class="btn btn-green" id="confirm_yes" 
+            onclick="changeStatusAction($('#status_selector').attr('name'),$('#status_selector').val());">OK</a>
+            <a href="javascript:void(0);" class="btn" id="confirm_no" onclick="$.colorbox.close();">Cancel</a>
         </div>
     </div>
 </div>
@@ -167,5 +151,5 @@ function invite(id){
 function Alert(html){
 	$.colorbox({'innerWidth':'50%','html':'<h4 style="font-size:16px;font-weight:bold;">'+html+'</h4>'});
 }
-$(".iframe").colorbox({iframe:true, width:"50%", height:"50%"});
+$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
 </script>

application/admin/views/scripts/data/ref-add.phtml

@@ -3,7 +3,6 @@
 $this->headTitle('后台管理');
 $this->headTitle()->setSeparator(' - ');
 $this->breadcrumb('<a href="/">首页</a>');
-    $this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('文献管理');
 $this->breadcrumb()->setSeparator(' > ');
@@ -14,11 +13,11 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
@@ -28,19 +27,17 @@
         <?php if(!empty($this->msg)) { ?>
             <?= $this->msg ?>
         <?php } else{ ?>
-        <form class="form-horizontal" method="post" class="form-horizontal">
-            <div class="col-md-8">
-                <p></p>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputTitle">文章标题</label>
-                    <div class="col-md-10 col-sm-10">
-                        <input type="text" name="title" id="inputTitle" class="form-control" value="<?= isset($this->data['title']) ? $this->data['title']:" " ?>">
+            <form class="form-horizontal" method="post">
+              <div class="control-group">
+                <label class="control-label" for="inputTitle">文章标题</label>
+                <div class="controls">
+                  <input type="text" name="title" id="inputTitle" class="input-block-level" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>">
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputYear">出版年份</label>
-                    <div class="col-md-10 col-sm-10">
-                        <input class="form-control" type="text" name="year" id="inputYear" value="<?= isset($this->data['year']) ? $this->data['year']:" " ?>">
+              <div class="control-group">
+                <label class="control-label" for="inputYear">出版年份</label>
+                <div class="controls">
+                  <input type="text" name="year" id="inputYear" value="<?= isset($this->data['year']) ? $this->data['year']:"" ?>">
                   <select class="span2">
                   <?php for($i=2000;$i<=(int)date("Y");$i++)  {?>
 					  <option value="<?= $i ?>" onclick="$('#inputYear').val(this.value)"><?= $i ?></option>
@@ -48,76 +45,71 @@
                   </select>
                 </div>
               </div>
-                
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputYear">出版社/期刊</label>
-                        <div class="col-md-10 col-sm-10">
-                            <input type="text" name="publisher" id="inputYear" class="form-control" value="<?= isset($this->data['publisher']) ? $this->data['publisher']:" " ?>">
+              <div class="control-group">
+                <label class="control-label" for="inputYear">出版社/期刊</label>
+                <div class="controls">
+                  <input type="text" name="publisher" id="inputYear" class="input-block-level" value="<?= isset($this->data['publisher']) ? $this->data['publisher']:"" ?>">
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputReference">引用方式(前台显示)</label>
-                    <div class="col-md-10 col-sm-10">
-                        <textarea name="reference" id="inputReference" class="form-control"><?= isset($this->data['reference']) ? $this->data['reference']:"" ?></textarea>
+              <div class="control-group">
+                <label class="control-label" for="inputReference">引用方式(前台显示)</label>
+                <div class="controls">
+                  <textarea name="reference" id="inputReference" class="input-block-level"><?= isset($this->data['reference']) ? $this->data['reference']:"" ?></textarea>
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputLink">链接(自动填写请留空)</label>
-                        <div class="col-md-10 col-sm-10">
-                            <input type="text" name="link" id="inputLink" class="form-control" value="<?= isset($this->data['link']) ? $this->data['link']:" " ?>" />
+              <div class="control-group">
+                <label class="control-label" for="inputLink">链接(自动填写请留空)</label>
+                <div class="controls">
+                  <input type="text" name="link" id="inputLink" class="input-block-level" value="<?= isset($this->data['link']) ? $this->data['link']:"" ?>"/>
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputType">类型</label>
-                        <div class="col-md-10 col-sm-10">
-                            <input type="text" name="type" id="inputType" class="form-control" value="<?= isset($this->data['type']) ? $this->data['type']:" " ?>">
+              <div class="control-group">
+                <label class="control-label" for="inputType">类型</label>
+                <div class="controls">
+                  <input type="text" name="type" id="inputType" class="input-block-level" value="<?= isset($this->data['type']) ? $this->data['type']:"" ?>">
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputLanguage">语言</label>
-                        <div class="col-md-10 col-sm-10">
-                            <input type="text" name="language" id="inputLanguage" class="form-control" value="<?= isset($this->data['language']) ? $this->data['language']:" " ?>">
+              <div class="control-group">
+                <label class="control-label" for="inputLanguage">语言</label>
+                <div class="controls">
+                  <input type="text" name="language" id="inputLanguage" class="input-block-level" value="<?= isset($this->data['language']) ? $this->data['language']:"" ?>">
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputDoi">DOI</label>
-                        <div class="col-md-10 col-sm-10">
-                            <input type="text" name="doi" id="inputDoi" class="form-control" value="<?= isset($this->data['doi']) ? $this->data['doi']:" " ?>">
+              <div class="control-group">
+                <label class="control-label" for="inputDoi">DOI</label>
+                <div class="controls">
+                  <input type="text" name="doi" id="inputDoi" class="input-block-level" value="<?= isset($this->data['doi']) ? $this->data['doi']:"" ?>">
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputBibtex">ris</label>
-                        <div class="col-md-10 col-sm-10">
-                            <textarea name="ris" id="inputBibtex" class="form-control"><?= isset($this->data['ris']) ? $this->data['ris']:"" ?></textarea>
+              <div class="control-group">
+                <label class="control-label" for="inputBibtex">ris</label>
+                <div class="controls">
+                  <textarea name="ris" id="inputBibtex" class="input-block-level"><?= isset($this->data['ris']) ? $this->data['ris']:"" ?></textarea>
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputAbstract">摘要</label>
-                        <div class="col-md-10 col-sm-10">
-                            <textarea name="abstract" id="inputAbstract" class="form-control"><?= isset($this->data['abstract']) ? $this->data['abstract']:"" ?></textarea>
+              <div class="control-group">
+                <label class="control-label" for="inputAbstract">摘要</label>
+                <div class="controls">
+                  <textarea name="abstract" id="inputAbstract" class="input-block-level"><?= isset($this->data['abstract']) ? $this->data['abstract']:"" ?></textarea>
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputNote">备注</label>
-                        <div class="col-md-10 col-sm-10">
-                            <textarea name="note" id="inputNote" class="form-control"><?= isset($this->data['note']) ? $this->data['note']:"" ?></textarea>
+              <div class="control-group">
+                <label class="control-label" for="inputNote">备注</label>
+                <div class="controls">
+                  <textarea name="note" id="inputNote" class="input-block-level"><?= isset($this->data['note']) ? $this->data['note']:"" ?></textarea>
                 </div>
               </div>
-                <div class="form-group">
-                    <label class="col-md-2 col-sm-2 control-label" for="inputPDF">PDF：</label>
-                        <div class="col-md-10 col-sm-10">
+              <div class="control-group">
+                <label class="control-label" for="inputPDF">PDF</label>
+                <div class="controls">
                   <input type="file" name="Filedata" id="file_upload" />
                   <div id="uploadedFile"></div>
                 </div>
               </div>
-                <div class="form-group">
-                    <div class="col-md-2 col-sm-2"></div>
-                    <div class="col-md-5 col-sm-5">
+              <div class="form-actions">
                 <input type="hidden" name="submit" value="1" />
-                        <button type="submit" class="btn btn-primary">保存</button>
-                        <button type="reset" class="btn btn-default">取消</button>
-                    </div>
-                </div>
+              	<button type="submit" class="btn btn-primary">Save changes</button>
+              	<button type="reset" class="btn">Cancel</button>
               </div>
             </form>
         <?php } ?>
@@ -145,7 +137,7 @@
         'uploader' : '/admin/data/ref/ac/pdfupload',
 		'multi'	   : false,
 		'auto'	   : true,
-            'fileTypeExts': '*.pdf;*.caj',
+		'fileTypeExts' : '*.pdf',
 		'onUploadSuccess' : function(file, data, response) {
             upload.onsuccess(file, data, response);
         },
@@ -158,7 +150,8 @@
 var upload = {
 	onsuccess : function(file, data, response){
 		_data = $.parseJSON(data);
-            if (!$.isEmptyObject(_data.error)) {
+		if(!$.isEmptyObject(_data.error))
+		{
 			alert(_data.error);
 		}else{
 			$('#uploadedFile').html(upload.makeFileHtml(_data));
@@ -177,12 +170,14 @@
 			'url':'/admin/data/ref/ac/delete',
 			'data':'attid=' + id,
 			'success':function(data){
-                    if (typeof (data) == 'undefined') {
+				if(typeof(data) == 'undefined')
+				{
 					alert("数据源错误，请联系管理员");
 					return false;
 				}
 				
-                    if (!$.isEmptyObject(data.error)) {
+				if(!$.isEmptyObject(data.error))
+				{
 					alert(data.error);
 					return false;
 				}

application/admin/views/scripts/data/ref-data-add.phtml

@@ -1,119 +0,0 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->headLink()->appendStylesheet('/css/admin.css'); 
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('文献管理');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->theme->AppendPlus($this,'colorbox');
-	$this->theme->AppendPlus($this,'admin_plugin');
-	$this->theme->AppendModel($this,'admin-data-ref');
-?>
-<style>
-    table thead tr th { background: #EBF2F6; }
-</style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-    <div class="col-md-10 col-sm-12">
-        <div>
-            <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
-        </div>
-        <div>
-            <h3><?php echo $this->md['title']; ?> <a href="/data/<?php echo $this->uuid; ?>">查看</a></h3>
-            <div class="input-append row">
-                <form id="datasearch" class="navbar-form" action="">
-                    <input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
-                    <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
-                    <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                    <button type="submit" class="btn btn-default" id="search_btn">搜索文献（数据外搜索，可以添加到数据）</button>
-                </form>
-            </div>
-        </div>
-        <?php if(!empty($this->error)) { ?>
-        <?= $this->error ?>
-        <?php } ?>
-        <?php if(!empty($this->msg)) { ?>
-        <?= $this->msg ?>
-        <?php } else{ ?>
-
-        <?php if($this->ac == 'westdc'){ ?>
-        <button type="button" class="btn btn-primary" onclick="$('#mdref')[0].reset();mdref.edit('','','e31f5ea7-a4af-4ae3-9ac1-1a84132c4338',0,0)">添加数据中心文献</button>
-        <?php } ?>
-
-        <?php if(!empty($this->years)) { ?>
-        <?php foreach($this->years as $k=>$v){ ?>
-        <a class="btn btn-info" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
-        <?php } ?>
-        <?php } ?>
-
-        <div id="datalist">
-            <?php if (count($this->paginator)): ?>
-            <table class="table table-bordered table-striped">
-                <thead>
-                    <tr>
-                        <th>
-                            标题
-                            <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                            <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                            年份
-                            <a href="?order=year&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                            <a href="?order=year&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>
-                            创建
-                            <a href="?order=ts_created&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
-                            <a href="?order=ts_created&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>类型</th>
-                        <th>序</th>
-                        <th width="40">操作</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php
-                    if($this->page > 1)
-                    {
-                    $autoindex = ($this->page - 1) * $this->pagelimit;
-                    }else{
-                    $autoindex=0;
-                    }
-                    foreach ($this->paginator as $item):
-                    $autoindex++;?>
-                    <tr id="DataLine_<?= $item['id']?>">
-                        <td>
-                            [<?= $autoindex ?>]&nbsp;
-                            <?php if ($item['ris']) :
-                            echo $item['reference'];
-                            else :
-                            ?>
-                            {<?php $authors = $this->reference->getAuthorByReference($item['id'],true); echo count($authors) ? join(",",$authors):'<font color="#CC0000">未知作者</font>'; ?>}&nbsp;
-                            {<?= empty($item['title']) ? '<font color="#CC0000">未知标题</font>':$item['title'] ?>}&nbsp;
-                            {<?= empty($item['publisher']) ? '<font color="#CC0000">未知期刊</font>':$item['publisher'] ?>}&nbsp;
-                            {<?= empty($item['year']) ? '<font color="#CC0000">未知年份</font>':$item['year'] ?>}&nbsp;
-                            <?php endif; ?>
-                            <a href="/admin/data/ref/ac/singleris/id/<?= $item['id'] ?>">RIS编辑</a>
-                            <a href="/admin/data/ref/ac/data/id/<?= $item['id'] ?>">数据</a>
-                        </td>
-                        <td><?= date("Y-m-d",strtotime($item['ts_created'])) ?></td>
-                        <td><?= $this->referenceType[$item['reftype']] ?></td>
-                        <td><?= $item['place'] ?></td>
-                        <td>
-                            <a href="javascript:void(0);" onclick="$('#mdref')[0].reset();mdref.edit(<?= $item['mrid']?>,<?= $item['id']?>,'<?= $this->uuid; ?>',<?= $item['reftype']?>,<?= $item['place']?>)">编辑</a>
-                            <a href="/admin/data/ref/ac/deletemdref/mrid/<?= $item['mrid']?>">移除</a>
-                        </td>
-                    </tr>
-                    <?php endforeach; ?>
-                </tbody>
-            </table>
-            <?php endif; ?>
-            <div class="pagenavi"><?= $this->paginator; ?></div>
-        </div>
-        <?php } ?>
-    </div>
-</div>
-<!-- //页面内容 -->
-<?= $this->partial('data/ref-mdref-form.phtml',array('referenceType'=>$this->referenceType)); ?>

application/admin/views/scripts/data/ref-data-search.phtml

@@ -1,124 +0,0 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->headLink()->appendStylesheet('/css/admin.css');  
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('文献管理');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->theme->AppendPlus($this,'colorbox');
-	$this->theme->AppendPlus($this,'admin_plugin');
-	$this->theme->AppendModel($this,'admin-data-ref');
-?>
-<style>
-    table thead tr th { background: #EBF2F6; }
-</style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-    <div class="col-md-10 col-sm-12">
-        <div>
-            <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
-        </div>
-        <div>
-            <h3><?php echo $this->md['title']; ?> <a href="/data/<?php echo $this->uuid; ?>">查看</a></h3>
-            <div class="input-append row">
-                <form id="datasearch" class="navbar-form" action="">
-                    <input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
-                    <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
-                    <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                    <button type="submit" class="btn btn-default" id="search_btn">搜索文献（数据外搜索，可以添加到数据）</button>
-                </form>
-            </div>
-        </div>
-        <?php if(!empty($this->error)) { ?>
-        <?= $this->error ?>
-        <?php } ?>
-        <?php if(!empty($this->msg)) { ?>
-        <?= $this->msg ?>
-        <?php } else{ ?>
-
-        <?php if($this->ac == 'westdc'){ ?>
-        <button type="button" class="btn btn-success" onclick="$('#mdref')[0].reset();mdref.edit('','','e31f5ea7-a4af-4ae3-9ac1-1a84132c4338',0,0)">添加数据中心文献</button>
-        <?php } ?>
-
-        <?php if(!empty($this->years)) { ?>
-        <?php foreach($this->years as $k=>$v){ ?>
-        <a class="btn btn-info" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
-        <?php } ?>
-        <?php } ?>
-
-        <div id="datalist">
-            <?php if (count($this->paginator)): ?>
-            <table class="table table-bordered table-striped">
-                <thead>
-                    <tr>
-                        <th>
-                            标题
-                            <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>">
-                            <i class="icon-arrow-up"></i></a>
-                            <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>">
-                            <i class="icon-arrow-down"></i></a>
-                            年份
-                            <a href="?order=year&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>">
-                            <i class="icon-arrow-up"></i></a>
-                            <a href="?order=year&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>">
-                            <i class="icon-arrow-down"></i></a>
-                            记录创建
-                            <a href="?order=ts_created&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>">
-                            <i class="icon-arrow-up"></i></a>
-                            <a href="?order=ts_created&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>">
-                            <i class="icon-arrow-down"></i></a>
-                        </th>
-                        <th>类型</th>
-                        <th>序</th>
-                        <th width="70">操作</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php
-                    if($this->page > 1)
-                    {
-                    $autoindex = ($this->page - 1) * $this->pagelimit;
-                    }else{
-                    $autoindex=0;
-                    }
-                    foreach ($this->paginator as $item):
-                    $autoindex++;?>
-                    <tr id="DataLine_<?= $item['id']?>">
-                        <td>
-                            [<?= $autoindex ?>]&nbsp;
-                            <?php if ($item['ris']) :
-                            echo $item['reference'];
-                            else :
-                            ?>
-                            {<?php $authors = $this->reference->getAuthorByReference($item['id'],true); echo count($authors) ? join(",",$authors):'<font color="#CC0000">未知作者</font>'; ?>}&nbsp;
-                            {<?= empty($item['title']) ? '<font color="#CC0000">未知标题</font>':$item['title'] ?>}&nbsp;
-                            {<?= empty($item['publisher']) ? '<font color="#CC0000">未知期刊</font>':$item['publisher'] ?>}&nbsp;
-                            {<?= empty($item['year']) ? '<font color="#CC0000">未知年份</font>':$item['year'] ?>}&nbsp;
-                            <?php endif; ?>
-                            <a href="/admin/data/ref/ac/singleris/id/<?= $item['id'] ?>">RIS编辑</a>
-                            <a href="/admin/data/ref/ac/data/id/<?= $item['id'] ?>">数据</a>
-                        </td>
-                        <td><?= ($item['reftype']>-1)?$this->referenceType[$item['reftype']]:'' ?></td>
-                        <td><?= $item['place'] ?></td>
-                        <td>
-                            <a href="javascript:void(0);" onclick="$('#mdref')[0].reset();mdref.edit('<?= $item['mrid'] ?>',<?= $item['id']?>,'<?= $this->uuid ?>','<?= $item['reftype'] ?>','<?= $item['place'] ?>')">
-                                <?= ($item['mrid'])?'编辑':'添加' ?>
-                            </a>
-                            <a href="/admin/data/ref/ac/deletemdref/mrid/<?= $item['mrid']?>">移除</a>
-                        </td>
-                    </tr>
-                    <?php endforeach; ?>
-                </tbody>
-            </table>
-            <?php endif; ?>
-            <div class="pagenavi"><?= $this->paginator; ?></div>
-        </div>
-        <?php } ?>
-    </div>
-</div>
-<!-- //页面内容 -->
-<?= $this->partial('data/ref-mdref-form.phtml',array('referenceType'=>$this->referenceType)); ?>

application/admin/views/scripts/data/ref-files.phtml

@@ -12,20 +12,19 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
         <div>
-            <p></p>
-            <div class="input-group form-group">
-            <form id="datasearch" class="search_form input-group" action="">
-                <input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" placeholder="搜索关键字" />
-                <span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+            <div class="input-append">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+                <button type="submit" class="btn" id="search_btn">搜索</button>
             </form>
             </div>
         </div>
@@ -37,7 +36,6 @@ table thead tr th {background:#EBF2F6;}
         <?php } else{ ?>
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
-                <p></p>
 			<table class="table table-bordered table-striped">
             	<thead>
                     <tr>

application/admin/views/scripts/data/ref-mdref-form.phtml

@@ -1,35 +1,32 @@
-<!-- Modal -->
-<div class="modal fade" id="mdref-form" >
-  <div class="modal-dialog">
-    <div class="modal-content">
+<div class="modal hide fade" id="mdref-form">
   <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel">添加数据文献</h4>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>添加数据文献</h3>
   </div>
   <div class="modal-body">
     <form id="mdref" method="post" class="form-horizontal">
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="inputRefid">文献ID</label>
-            <div class="col-sm-8">
-                <input type="text" name="refid" id="inputfid" placeholder="文献ID" class="form-control" value="<?= empty($this->refid) ? "":$this->refid ?>" >
+        <div class="control-group">
+            <label class="control-label" for="inputRefid">文献ID</label>
+            <div class="controls">
+                <input type="text" name="refid" id="inputRefid" placeholder="文献ID" value="<?= empty($this->refid) ? "":$this->refid ?>">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="inputUuid">元数据UUID</label>
-            <div class="col-sm-8">
-                <input type="text" name="uuid" id="inputUuid" placeholder="UUID" class="form-control">
+        <div class="control-group">
+            <label class="control-label" for="inputUuid">元数据UUID</label>
+            <div class="controls">
+                <input type="text" name="uuid" id="inputUuid" placeholder="UUID">
                 <span class="help-block"><a href="javascript:void(0);" onclick="$(this).parent('span').prev('input').val('e31f5ea7-a4af-4ae3-9ac1-1a84132c4338')">设为数据中心文献</a></span>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="inputPlace">排序数值(数字)</label>
-            <div class="col-sm-8">
-                <input type="text" name="place" id="inputPlace" placeholder="排序" class="form-control">
+        <div class="control-group">
+            <label class="control-label" for="inputPlace">排序数值(数字)</label>
+            <div class="controls">
+                <input type="text" name="place" id="inputPlace" placeholder="排序">
             </div>
         </div>
-        <div class="form-group">
-          <label class="col-sm-3 control-label">文献类型</label>
-          <div class="col-sm-8">
+        <div class="control-group">
+            <label class="control-label">文献类型</label>
+            <div class="controls">
                 <?php foreach($this->referenceType as $k=>$v) { ?>
                 <label class="radio">
                 <input type="radio" name="reftype" value="<?= $k ?>" /> <?= $v ?>
@@ -40,14 +37,13 @@
         <input type="hidden" name="id" value="" />
     </form>
   </div>
+  <div id="alert-info"></div>
   <div class="modal-footer">
     <div class="progress progress-striped active" id="submit-loading" style="display:none;">
     <div class="bar" style="width:100%;"></div>
     </div>
-        <button onclick="$('#mdref')[0].reset();" class="btn">重置</button>
-        <button onclick="$('#mdref-form').modal('hide');" class="btn">关闭</button>
-        <button onclick="mdref.create()" class="btn btn-primary" id="submit_btn">保存</button>
-      </div>
-    </div>
+    <button onclick="$('#mdref')[0].reset();" class="btn">Reset</button>
+    <button onclick="$('#mdref-form').modal('hide');" class="btn">Close</button>
+    <button onclick="mdref.create()" class="btn btn-primary" id="submit_btn">Save changes</button>
   </div>
 </div>

application/admin/views/scripts/data/ref-metadatas.phtml

@@ -4,7 +4,6 @@
 $this->headTitle()->setSeparator(' - ');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 $this->breadcrumb('文献管理');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
@@ -14,12 +13,12 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
-        <div class="form-group">
+	<div class="span10">
+        <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
         <?php if(!empty($this->error)) { ?>
@@ -28,7 +27,7 @@ table thead tr th {background:#EBF2F6;}
         <?php if(!empty($this->msg)) { ?>
             <?= $this->msg ?>
         <?php } else{ ?>
-        <div class="form-group"><button type="button" class="btn btn-primary" onclick="$('#mdref')[0].reset();$('#mdref-form').modal('show');">添加一条</button></div>
+        <button type="button" class="btn btn-primary" onclick="$('#mdref')[0].reset();$('#mdref-form').modal('show');">添加一条</button>
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
 			<table class="table table-bordered table-striped">
@@ -45,7 +44,7 @@ table thead tr th {background:#EBF2F6;}
                 foreach ($this->paginator as $item): 
                 $autoindex++;?>
 				<tr id="DataLine_<?= $item['id']?>">
-                	<td><?= $item['title'] ?> <a href="/data/<?= $item['uuid'] ?>" target="_blank">查看</a></td>
+                	<td><?= $item['title'] ?></td>
                     <td><?= isset($this->referenceType[$item['reftype']]) ? $this->referenceType[$item['reftype']]:"" ?></td>
                 	<td><?= $item['place'] ?></td>
                     <td>

application/admin/views/scripts/data/ref-multiupload.phtml

@@ -13,11 +13,11 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
@@ -59,7 +59,7 @@ $(function() {
         'uploader' : '/admin/data/ref/ac/pdfupload',
 		'multi'	   : true,
 		'auto'	   : true,
-		'fileTypeExts' : '*.pdf;*.caj',
+		'fileTypeExts' : '*.pdf',
 		'onUploadSuccess' : function(file, data, response) {
             upload.onsuccess(file, data, response);
         },

application/admin/views/scripts/data/ref-nav.phtml

@@ -1,12 +1,8 @@
 <ul class="nav nav-tabs">
-    <?php if (!empty($this->uuid)) : ?>
-    <li class="active"><a href="/admin/data/ref/uuid/<?= $this->uuid ?>">数据文献</a></li>
-    <?php endif; ?>
-    <li <?= empty($this->ac) && empty($this->uuid) ? 'class="active"':"" ?>><a href="/admin/data/ref">浏览所有</a></li>
+    <li <?= empty($this->ac) ? 'class="active"':"" ?>><a href="/admin/data/ref">浏览所有</a></li>
     <li <?= $this->ac=="water" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/water">WATER文献</a></li>
 	<li <?= $this->ac=="westdc" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/westdc">数据中心文献</a></li>
-	<li <?= $this->ac=="todo" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/todo">无数据文献</a></li>
-    <li <?= $this->ac=="author" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/author">数据作者文献</a></li>
+	<li <?= $this->ac=="todo" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/todo">待处理文献</a></li>
     <li <?= $this->ac=="add" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/add">单篇添加</a></li>
     <li <?= $this->ac=="multiupload" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/multiupload">批量上传</a></li>
     <li <?= $this->ac=="files" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/files">文件管理</a></li>

application/admin/views/scripts/data/ref-ris.phtml

@@ -13,15 +13,14 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
-        <p></p>
         <?php if(!empty($this->error)) { ?>
         	<?= $this->error ?>
         <?php } ?>
@@ -30,24 +29,22 @@ table thead tr th {background:#EBF2F6;}
         <?php } else{ ?>
         	<?php if(empty($this->data)) {  ?>
             <form class="form-horizontal" method="post" enctype="multipart/form-data">
-              <div class="form-group">
-                <label class="col-md-1 col-sm-1 control-label" for="inputPassword">RIS文件</label>
-                <div class="controls col-md-3 col-sm-3">
+              <div class="control-group">
+                <label class="control-label" for="inputPassword">RIS文件</label>
+                <div class="controls">
                   <input type="file" name="Filedata" id="file_upload" />
                   <div id="uploadedFile"></div>
                 </div>
               </div>
-              <div class="form-group">
-                <label class="col-md-1 col-sm-1 control-label" for="inputPassword">RIS文本</label>
-                <div class="controls col-md-3 col-sm-3">
-                  <textarea class="input-block-level form-control" name="ristext" rows="5"></textarea>
+              <div class="control-group">
+                <label class="control-label" for="inputPassword">RIS文本</label>
+                <div class="controls">
+                  <textarea class="input-block-level" name="ristext" rows="5"></textarea>
                 </div>
               </div>
-              <div class="form-group">
-              <div class="col-md-4 col-sm-4">
+              <div class="form-actions">
               	<input type="hidden" name="submit" value="1" />
-              	<button type="submit" class="btn btn-primary pull-right">导入</button>
-                </div>
+              	<button type="submit" class="btn btn-primary">导入</button>
               </div>
             </form>
             <?php }else{ ?>

application/admin/views/scripts/data/ref-risoutput.phtml

@@ -2,7 +2,6 @@
 $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/data">数据管理</a>');
 $this->breadcrumb('文献管理');
@@ -14,11 +13,11 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
@@ -30,18 +29,21 @@ table thead tr th {background:#EBF2F6;}
         <?php } else{ ?>
         	<h3>RIS导出</h3>
             <hr />
+            
             <div>
             <?php if(!empty($this->years)) { ?>
             	按年份　：
 				<?php foreach($this->years as $k=>$v){ ?>
-                <a class="btn btn-info btn-double btn-sm" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
+                <a class="btn btn-info" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
                 <?php } ?>
                 <hr />
             <?php } ?>
             </div>
+            
             <div>
             	其它方式：<a class="btn btn-info" href="?submit=1&mode=all">全部</a>
             </div>
+            
         <?php } ?>
     </div>
 </div>

application/admin/views/scripts/data/ref-singleris.phtml

@@ -13,11 +13,11 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
         <div>
             <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
@@ -31,16 +31,17 @@ table thead tr th {background:#EBF2F6;}
             <hr />
         	<?php if(empty($this->data)) {  ?>
             <form class="form-horizontal" method="post" enctype="multipart/form-data">
-              <div class="form-group">
-                <label class="col-md-2 col-sm-2 control-label" for="inputPassword">RIS文本</label>
-                <div class="col-md-5 col-sm-5">
-                  <textarea  class="form-control" name="ristext" rows="5"><?= $this->ristext ?></textarea>
-                  <p class="clearfix"></p>
-                  <div class="alert alert-info"> <strong> * </strong>此功能是使用单个文献的 RIS 文本导入并覆盖以前填写过的信息</div>
-                  <input type="hidden" name="submit" value="1" />
-                  <button type="submit" class="btn btn-primary pull-right">导入</button>
+              <div class="control-group">
+                <label class="control-label" for="inputPassword">RIS文本</label>
+                <div class="controls">
+                  <textarea class="input-block-level" name="ristext" rows="5"><?= $this->ristext ?></textarea>
+                  <span class="help-block">* 此功能是使用单个文献的 RIS 文本导入并覆盖以前填写过的信息</span>
                 </div>
               </div>
+              <div class="form-actions">
+              	<input type="hidden" name="submit" value="1" />
+              	<button type="submit" class="btn btn-primary">导入</button>
+              </div>
             </form>
             <?php }else{ ?>
             <?php

application/admin/views/scripts/data/ref.phtml

@@ -6,7 +6,6 @@
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('文献管理');
 $this->breadcrumb()->setSeparator(' > ');
-    $this->headLink()->appendStylesheet('/css/admin.css');
 $this->theme->AppendPlus($this,'colorbox');
 $this->theme->AppendPlus($this,'admin_plugin');
 $this->theme->AppendModel($this,'admin-data-ref');
@@ -14,23 +13,24 @@
 <style>
 table thead tr th {background:#EBF2F6;}
 </style>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('data/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
-        <div class="form-group">
-            <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac,'uuid'=>$this->uuid)); ?>
+	<div class="span10">
+        <div>
+            <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
         </div>
-            <div class="input-group form-group">
-                <form id="datasearch" class="search_form input-group" action="">
-                    <input type="text" class="form-control" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" placeholder="搜索关键字" />
+        <div>
+            <div class="input-append">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
                 <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
                 <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                    <span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+                <button type="submit" class="btn" id="search_btn">搜索</button>
             </form>
             </div>
-        
+        </div>
         <?php if(!empty($this->error)) { ?>
         	<?= $this->error ?>
         <?php } ?>
@@ -39,34 +39,32 @@
         <?php } else{ ?>
         
         <?php if($this->ac == 'westdc'){ ?>
-        <button type="button" class="btn btn-primary" onclick="$('#mdref')[0].reset();mdref.edit('','','e31f5ea7-a4af-4ae3-9ac1-1a84132c4338',0,0)">添加数据中心文献</button>
+        	<button type="button" class="btn btn-success" onclick="$('#mdref')[0].reset();mdref.edit('','','e31f5ea7-a4af-4ae3-9ac1-1a84132c4338',0,0)">添加数据中心文献</button>
         <?php } ?>
-        <div class="form-group">
+        
         <?php if(!empty($this->years)) { ?>
 			<?php foreach($this->years as $k=>$v){ ?>
-            <a class="btn btn-info btn-double btn-sm" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
+            <a class="btn btn-info" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
             <?php } ?>
         <?php } ?>
-        </div>
+            
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
-            <table class="stylized table table-bordered table-striped table-hover">
+			<table class="table table-bordered table-striped">
             	<thead>
                     <tr>
-                        <th>
-                            标题
+                        <th>标题
                         <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
                         <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
                          年份
                         <a href="?order=year&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
                         <a href="?order=year&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
                         </th>
-                        <th width="170">
-                            记录创建
+                        <th>记录创建
                         <a href="?order=ts_created&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
                         <a href="?order=ts_created&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
                         </th>
-                        <th width="200">操作</th>
+                        <th width="140">操作</th>
                     </tr>
                 </thead>
                 <tbody>

application/admin/views/scripts/data/reference.phtml

@@ -11,13 +11,12 @@
 	$this->theme->AppendPlus($this,'colorbox');
 	$this->theme->AppendModel($this,"author-literature");
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -65,4 +64,3 @@
 <?php endif; ?>
 <?= $this->paginator; ?>
 </div>
-</div>

application/admin/views/scripts/data/referenceadd.phtml

@@ -9,13 +9,12 @@
 	$this->breadcrumb('数据文献管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -50,4 +49,3 @@
 <?php }
 else ?><?= $this->form; ?>
 </div>
-</div>

application/admin/views/scripts/data/referenceimport.phtml

@@ -9,13 +9,12 @@
 	$this->breadcrumb('数据文献管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-			<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -33,4 +32,3 @@
    <input type="submit" value="导入" />
 </form>
 </div>
-</div>

application/admin/views/scripts/data/source.phtml

@@ -10,13 +10,12 @@
 	$this->breadcrumb('项目来源管理');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-    <div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-			<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -24,40 +23,35 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-		<div class="form-group">
-				<a class="btn btn-primary btn-sm" href="/admin/data/source">项目来源管理</a>
-				<a class="btn btn-primary btn-sm" href="/admin/data/source/do/add">添加项目来源</a>
-				<a class="btn btn-primary btn-sm" href="/admin/data/source/do/sync">同步项目来源（以此处为准）</a>
+
+<div class="ctrlplan">
+	<a href="/admin/data/source">项目来源管理</a>
+    <a href="/admin/data/source/do/add">添加项目来源</a>
 </div>
-		<div class="input-group form-group">
-			<form action="" method="get" class="search_form input-group">
-			<input type="text" class="q form-control" name="q" value="<?php echo $this->q; ?>" placeholder="搜索关键字" class="form-control" />
+
+<div class="search">
+	<form action="" method="get">
     <input type="hidden" name="search" value='1' />
     <input type="hidden" name="id" value='<?php echo $this->id;?>' />
-			<span class="input-group-btn"><button type="submit" class="btn btn-default">搜索</button></span>
+    <label>搜索关键字</label><input type="text" class="q" name="q" value="<?php echo $this->q; ?>" />
+    <input type="submit" class="btn" value="搜索" />
     </form>
 </div><!-- search DIV -->
-		<div class="">
-			<table class="stylized table table-bordered table-striped table-hover">
+
+<table class="stylized" width="700">
         <thead>
             <tr>
                 <td width='40%'>标题</td>
-						<td width='15%'>Code字符</td>
-						<td width='15%'>项目管理机构</td>
+                <td width='30%'>Code字符</td>
                 <td width='30%'>操作</td>
             </tr>
         </thead>
 		<?php if (count($this->paginator)): ?>
         <tbody id="list">
 			<?php foreach ($this->paginator as $item): ?>
-                    
-                    	<?php
-							$admin_status=array(0=>"暂无管理机构",1=>"由专家委员会进行管理",2=>"委托数据中心进行管理");
-						?>
             <tr>
                 <td><a href="/admin/data/source/do/fetch/id/<?php echo $item['id']?>"><?php echo $item['title']; ?></a></td>
-						<td><span><?php echo $item['code'];?></span></td>
-						<td><span><?php echo $admin_status[$item['admin_status']];?></span></td>
+                <td><?php echo $item['code'];?></td>
                 <td>
                 <a href="/admin/data/source/do/edit/id/<?php echo $item['id']?>">查看编辑</a>|
                 <a href="/admin/data/source/do/fetch/id/<?php echo $item['id']?>">查看元数据</a>|
@@ -68,8 +62,6 @@
         </tbody>
         <?php endif; ?>
     </table>
-		</div>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
-<script type="text/javascript" >$("#list tr").mouseover(function(){$(this).addClass("high")}).mouseout(function(){$(this).removeClass("high")})</script>
+<script>$("#list tr").mouseover(function(){$(this).addClass("high")}).mouseout(function(){$(this).removeClass("high")})</script>

application/admin/views/scripts/data/sourceadd.phtml

@@ -10,14 +10,13 @@
 	$this->breadcrumb('项目来源管理');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-
-<div class="row">
-  <div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-  <div class="col-md-10 col-sm-12">
+<div id="rightPanel">
+
 <?php if ($this->msg or $this->messages) :?>
-    <div id="message" class="alert alert-success">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -25,169 +24,41 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-    <div class="form-group">
-      <ul class="nav nav-tabs">
-        <li><a href="/admin/data/source">项目来源管理</a></li>
-        <li class="active"><a href="/admin/data/source/do/add">添加项目来源</a></li>
-      </ul>
-    </div>
-    <form method="post" action="/admin/data/source" class="form-horizontal">
-      <div class="form-group">
-        <label for="title" class="col-md-2 col-sm-2 control-label">标题</label>
-        <div class="col-md-4 col-sm-4">
-          <input class="form-control" type="text" name="title" value="<?php echo $this->info['title'];?>" />
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-md-2 col-sm-2 control-label">uuid:</label>
-        <div class="col-md-4 col-sm-4">
-          <input class="form-control" type="text" name="uuid" value="<?php echo $this->info['uuid'];?>" />
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-md-2 col-sm-2 control-label">Code:</label>
-        <div class="col-md-4 col-sm-4">
-          <input class="form-control" type="text" name="code" value="<?php echo $this->info['code'];?>" />
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-md-2 col-sm-2 control-label">项目管理机构</label>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="admin_status" value="0" <?php if(empty($this->info['admin_status']) | $this->info['admin_status'] =='0') echo 'checked="checked"';?> />
-            暂无管理机构 </label>
-        </div>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="admin_status" value="1" <?php if($this->info['admin_status']=='1') echo 'checked="checked"';?> />
-            由专家委员会管理 </label>
-        </div>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="admin_status" value="2" <?php if($this->info['admin_status']=='2') echo 'checked="checked"';?> />
-            委托数据中心管理 </label>
-        </div>
-      </div>
-      <?php if(!empty($this->info['admin_email'])) {
-		# 去除数组数据中的｛｝
-		$emailarry = explode(',',substr($this->info['admin_email'],1,-1));
-		$uuidarry = explode(',',substr($this->info['exclude_data'],1,-1));
 
-	?>
-      <div id="emails">
-        <?php foreach($emailarry as $email):?>
-        <div class="form-group subemail">
-          <label class="col-md-2 col-sm-2 control-label">管理邮箱</label>
-          <div class="col-md-4 col-sm-4">
-            <input class="form-control" type="text" name="admin_email[]" value="<?php echo $email;?>" />
+<div class="ctrlplan">
+	<a href="/admin/data/source/">项目来源管理</a>
+    <a href="/admin/data/source/do/add">添加项目来源</a>
 </div>
-          <div class="col-md-1 col-sm-1"><a href="javascript:void(0);" onclick="addemail()" class="glyphicon glyphicon-plus "></a>&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" onclick="rminput(this)" class="glyphicon glyphicon-minus "></a></div>
-        </div>
-        <?php endforeach;?>
-      </div>
-      
-      <div id="plusuuid">
-        <?php foreach($uuidarry as $uuid):?>
-        <div class="form-group subuuid">
-          <label class="col-md-2 col-sm-2 control-label">不管理数据UUID:</label>
-			<div class="col-md-4 col-sm-4">
-			<input class="form-control" type="text" name="exclude_data[]" value="<?php echo $uuid;?>" />
-			</div>
-			<div class="col-md-1 col-sm-1"><a href="javascript:void(0);" onclick="adduuid()" class="glyphicon glyphicon-plus "></a>&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" onclick="rminput(this)" class="glyphicon glyphicon-minus "></a></div>
-		</div>
-        <?php endforeach;?>
-      </div>
-      <?php }else{ ?>
-      <div id="emails">
-        <div class="form-group subemail">
-          <label class="col-md-2 col-sm-2 control-label">管理邮箱</label>
-          <div class="col-md-4 col-sm-4">
-            <input class="form-control" type="text" name="admin_email[]" />
-          </div>
-
-          <div class="col-md-1 col-sm-1"><a href="javascript:void(0);" onclick="addemail()" class="glyphicon glyphicon-plus "></a>&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" onclick="rminput(this)" class="glyphicon glyphicon-minus "></a></div>
-        </div>
-      </div>
-      <div id="plusuuid">
-        <div class="form-group subuuid">
-          <label class="col-md-2 col-sm-2 control-label">不管理数据UUID:</label>
-          <div class="col-md-4 col-sm-4">
-            <input class="form-control" type="text" name="exclude_data[]" />
-          </div>
-          <div class="col-md-1 col-sm-1"><a href="javascript:void(0);" onclick="adduuid()" class="glyphicon glyphicon-plus "></a>&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" onclick="rminput(this)" class="glyphicon glyphicon-minus "></a></div>
-        </div>
-      </div>
-      <?php }?>
-      <div class="form-group">
-        <label class="col-md-2 col-sm-2 control-label">描述</label>
-        <div class="col-md-4 col-sm-4">
-          <textarea id="form-control" class="samll half form-control" name="description">
-						<?php echo $this->info['description'];?>
-					</textarea>
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-md-2 col-sm-2 control-label">has_pages</label>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="has_pages" value="true" <?php if($this->info['has_pages']) echo 'checked="checked"';?> />
-            True </label>
-        </div>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="has_pages" value="false" <?php if(!$this->info['has_pages']) echo 'checked="checked"';?> />
-            False </label>
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-md-2 col-sm-2 control-label">has_agreement</label>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="has_agreement" value="true" <?php if($this->info['has_agreement']) echo 'checked="checked"';?> />
-            True </label>
-        </div>
-        <div class="col-md-2 col-sm-2">
-          <label class="radio-inline">
-            <input type="radio" name="has_agreement" value="false" <?php if(!$this->info['has_agreement']) echo 'checked="checked"';?> />
-            False </label>
-        </div>
-      </div>
-      <div class="form-group">
-        <div class="col-md-6 col-sm-6">
+<form method="post" action="/admin/data/source">
+	<p>
+    <label>标题:</label><br />
+    <input type="text" name="title" value="<?php echo $this->info['title'];?>" />
+    </p>
+    <p>
+    <label class="required">uuid:</label><br />
+    <input type="text" name="uuid" value="<?php echo $this->info['uuid'];?>" />
+    </p>
+    <p>
+    <label class="required">Code:</label><br />
+    <input type="text" name="code" value="<?php echo $this->info['code'];?>" />
+    </p>
+    <p>
+    <label>描述</label><br />
+    <textarea id="description" class="samll half" name="description"><?php echo $this->info['description'];?></textarea>
+    </p>
+    <p>
+    <label>has_pages</label><br />
+    <input type="radio" name="has_pages" value="true" <?php if($this->info['has_pages']) echo 'checked="checked"';?> />True　<input type="radio" name="has_pages" value="false" <?php if(!$this->info['has_pages']) echo 'checked="checked"';?> />False
+    </p>
+    <p>
+    <label>has_agreement</label><br />
+	<input type="radio" name="has_agreement" value="true" <?php if($this->info['has_agreement']) echo 'checked="checked"';?> />True　<input type="radio" name="has_agreement" value="false" <?php if(!$this->info['has_agreement']) echo 'checked="checked"';?> />False
+    </p>
+    <p>
     <input type="hidden" name="id" value="<?php echo $this->info['id'];?>" />
     <input type="hidden" name="do" value="<?php if($this->info['uuid']!='') echo 'edit';else echo 'add';?>" />
     <input type="hidden" name="submit" value="1" />
-          <input type="submit" value="提交" class="btn btn-primary pull-right" />
-        </div>
-      </div>
+    <input type="submit" value="提交" />
+    </p>
     </form>
 </div>
-</div>
-
-<script>
-function addemail(){
-	$("#emails").append('<div class="form-group subemail">'
-          +'<label class="col-md-2 col-sm-2 control-label">管理邮箱</label>'
-          +'<div class="col-md-4 col-sm-4">'
-          +'<input class="form-control" type="text" name="admin_email[]" value="" />'
-          +'</div>'
-          +'<div class="col-md-1 col-sm-1"><a href="javascript:void(0);" onclick="addemail()" class="glyphicon glyphicon-plus "></a>&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" onclick="rminput(this)" class="glyphicon glyphicon-minus "></a></div>'
-		+'</div>');	
-}
-
-function adduuid(){
-	$("#plusuuid").append('<div class="form-group subuuid">'
-          +'<label class="col-md-2 col-sm-2 control-label">不管理数据UUID:</label>'
-          +'<div class="col-md-4 col-sm-4">'
-          +'<input class="form-control" type="text" name="exclude_data[]" value="" />'
-          +'</div>'
-          +'<div class="col-md-1 col-sm-1"><a href="javascript:void(0);" onclick="adduuid()" class="glyphicon glyphicon-plus "></a>&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" onclick="rminput(this)" class="glyphicon glyphicon-minus "></a></div>'
-		+'</div>');	
-}
-
-function rminput(e){
-	$e = $(e);
-	$e.parent().parent().remove();
-  };
-
-</script>

application/admin/views/scripts/data/sourcefetchone.phtml

@@ -10,13 +10,12 @@
 	$this->breadcrumb('项目来源管理');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -24,14 +23,16 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
+
 <div class="ctrlplan">
 	<a href="/admin/data/source">项目来源管理</a>
     <a href="/admin/data/source/do/add">添加项目来源</a>
 </div>
+
 <div class="search">
 	<form action="" method="get">
     <input type="hidden" name="search" value='1' />
-		<input type="hidden" name="id" value='<?php echo $this->id;?>' placeholder="搜索关键字"/>
+    <input type="hidden" name="id" value='<?php echo $this->id;?>' />
     <label>搜索关键字</label><input type="text" class="q" name="q" value="<?php echo $this->q; ?>" />
     <input type="submit" class="btn" value="搜索" />
     </form>
@@ -60,5 +61,4 @@
     </table>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
 <script>$("#list tr").mouseover(function(){$(this).addClass("high")}).mouseout(function(){$(this).removeClass("high")})</script>

application/admin/views/scripts/data/sourceselect.phtml

@@ -10,13 +10,13 @@
 	$this->breadcrumb('项目来源管理');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
+
 <?php if ($this->msg or $this->messages) :?>
-			<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -24,14 +24,19 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-		<p>为元数据《<?php echo $this->info['title'];?>》选择项目来源</p>
-		<div class="input-group">
-			<form method="get" action="" class="input-group">
-				<input type="text" value="" placeholder="搜索关键字" name="q" class="form-control q">
-				<span class="input-group-btn"><input type="submit" value="搜索" class="btn btn-default"></span>
+
+为元数据《<?php echo $this->info['title'];?>》选择项目来源
+
+<div class="search">
+	<form action="" method="get">
+    <input type="hidden" name="search" value='1' />
+    <input type="hidden" name="id" value='<?php echo $this->id;?>' />
+    <label>搜索关键字</label><input type="text" class="q" name="q" value="<?php echo $this->q; ?>" />
+    <input type="submit" class="btn" value="搜索" />
     </form>
-		</div>
-		<!-- search DIV -->
+</div><!-- search DIV -->
+
+
 <form method="post">
 <table class="stylized" width="700">
         <thead>
@@ -66,7 +71,10 @@
 ?>
 <input type="submit" value="提交" />
 </form>
-		<?php if(!empty($this->info['id'])) { ?>
+<?php
+	if(!empty($this->info['id']))
+	{
+		?>
         <form method="post" action="/admin/data/source/">
 		<input type="hidden" name="uuid" value="<?php echo $this->uuid;?>" />
 		<input type="hidden" name="do" value="delsource" />
@@ -75,8 +83,9 @@
 		<br /><button type="submit" class="btn btn-red" onclick="return confirm('是否确定删除该来源')">清除数据来源</button>
         </form>
         <?php
-		} ?>
+	}
+?>
+
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>
 <script>$("#list tr").mouseover(function(){$(this).addClass("high")}).mouseout(function(){$(this).removeClass("high")})</script>

application/admin/views/scripts/data/spatial-add.phtml

@@ -1,121 +0,0 @@
-<?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/data">数据管理</a>');
-$this->breadcrumb('数据时空范围');
-$this->breadcrumb()->setSeparator(' > ');
-$this->theme->AppendPlus($this,'colorbox');
-?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-	<div class="col-md-10 col-sm-12">
-        <div>
-            <ul class="nav nav-tabs">
-                <li><a href="/admin/data/spatial">浏览所有</a></li>
-                <?php if(!empty($this->uuid)) {?>
-                <li class="active"><a href="javascript:void(0);">编辑</a></li>
-                <?php }?>
-            </ul>
-        </div>
-        <div class="">
-        	<?php if(!empty($this->error)) { ?>
-            	<?= $this->error ?>
-            <?php } ?>
-        	<?php if(!empty($this->msg)) { ?>
-            	<?= $this->msg ?>
-            <?php } else{ ?>
-                <p></p>
-                <div class="alert alert-info">
-                <button type="button" class="close" data-dismiss="alert">&times;</button>
-                <h4>提示</h4>
-				1. 空间范围请使用经纬度（dd）格式进行添加。<br/>
-				2. 日期精确到天。中括号代表包含，小括号代表不包含。
-                </div>
-			<h2><?php echo $this->data[0]['title']; ?></h2>
-           <form class="form-horizontal" method="post">
-			<div id="datalist">
-            <?php if (count($this->data)): ?>
-			<table class="stylized table table-bordered table-striped table-hover">
-            	<thead>
-                    <tr>
-                        <th width="60%">空间范围</th>
-                        <th>时间范围</th>
-                        <th width="100">操作</th>
-                    </tr>
-                </thead>
-                <tbody>
-                <?php $autoindex=0;
-                foreach ($this->data as $item): 
-				if (isset($item['id']) && $item['id']>0) :
-				$autoindex++; ?>
-				<tr class="infocontrol">
-                	<td><textarea class="col-md-12" rows="3" name="info[<?= $autoindex ?>][spatial]" ><?= $item['spatial'] ?></textarea></td>
-					<td><input type="text" name="info[<?= $autoindex ?>][temporal]"  class="form-control" value="<?= $item['temporal'] ?>" /></td>
-                    <td>
-						编辑：点 线 矩形 多边形
-                        <a href="javascript:void(0);" onclick="onedel(<?= $item['id']?>)" id="delbtn_<?= $item['id']?>">删除</a>
-                    </td>
-                    <input type="hidden" name="info[<?= $autoindex ?>][id]" value=" <?=$item->id?> " />
-                </tr>
-            <?php endif; endforeach; if ((count($this->data)==1) && !isset($this->data[0]['id'])) :
-			$item=$this->data[0]; ?>
-				<tr class="infocontrol">
-                	<td><textarea class="col-md-12" rows="3" name="info[1][spatial]" ><?= $item['spatial'] ?></textarea></td>
-					<td><input type="text" name="info[1][temporal]"  class="form-control" 
-                  value="<?= $item['temporal'] ?>" /></td>
-                    <td>
-						点 线 矩形 多边形
-                        <a href="/admin/data/spatial/ac/edit/uuid/<?= $item['uuid']?>">编辑</a>
-                    </td>
-                    <input type="hidden" name="info[1][id]" value="0" />
-				</tr>
-            <?php endif; endif;?>
-            </tbody>
-			</table>
-        </div>
-		<div class="form-group">
-			<div class="col-sm-12">
-				<a class="pull-right" href="javascript:void(0);" onclick="addinput()" >+为该数据添加一行新时空范围</a>
-			</div>
-		</div>
-        <div class="form-group">
-                <div class="col-sm-12">
-					         <input type="hidden" name="submit" value="1" />
-                    <?php if(!empty($this->uuid)) { ?>
-                    <input type="hidden" name="uuid" value=" <?=$this->uuid?>" />
-                    <?php } ?>
-					           <button type="submit" class="btn btn-primary pull-right">提交</button>
-                </div>
-              </div>
-            </form>
-            <?php } ?>
-        </div>
-    </div>
-</div>
-<script>
-function addinput(){
-	var now_index = $('.infocontrol').length;
-	var index = now_index + 1;
-	html =  '<tr class="infocontrol">'
-            +'<td><textarea class="col-md-12" rows="3" name="info['+index+'][spatial]"  placeholder="WKT Geometry"></textarea></td>'
-			+'<td><input type="text" name="info['+index+'][temporal]"  class="form-control" value="" placeholder="Date range"/></td>'
-			+'<td><a href="">点 线 矩形 多边形</a>'
-			+' <label class="control-label"><a href="javascript:void(0);" onclick="RmInput(this)"> -删除</a></label>'
-			+'</td><input type="hidden" name="info['+index+'][id]" value="0" />'
-			+'</tr>';
-	now_index = null;
-	index = null;
-	$('.infocontrol').last().after(html);
-}
-function RmInput(e){
-	$e = $(e);
-	$e.parent().parent().parent('tr.infocontrol').remove();
-    
-}
-</script>
-<!-- //页面内容 -->

application/admin/views/scripts/data/spatial.phtml

@@ -1,167 +0,0 @@
-<?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/data">数据管理</a>');
-	$this->breadcrumb('数据时空范围');
-	$this->breadcrumb()->setSeparator(' > ');
-	// $this->theme->AppendPlus($this,'colorbox');
-	$this->theme->AppendPlus($this,'admin_plugin');
-    $this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-    $this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
-        <?= $this->partial('data/left.phtml'); ?>
-    </div>
-	<div class="col-md-10 col-sm-12 span10">
-        <div class="form-group">
-            <ul class="nav nav-tabs" role="tablist">
-                <li class="active"><a href="/admin/data/spatial">浏览所有</a></li>
-            </ul>
-        </div>
-        <div class="input-group form-group">
-            <form id="datasearch" class="search_form input-group" action="">
-                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字" />
-                <span class="input-group-btn"><button class="btn btn-default" type="submit" id="search_btn">搜索</button></span>
-            </form>
-        </div>
-    
-        <?php if(!empty($this->error)) { ?>
-        	<?= $this->error ?>
-        <?php } ?>
-        <?php if(!empty($this->msg)) { ?>
-            <?= $this->msg ?>
-        <?php } else{ ?>
-        <div id="datalist">
-            <?php if (count($this->paginator)): ?>
-			<table class="stylized table table-bordered table-striped table-hover">
-            	<thead>
-                    <tr>
-                        <th>元数据</th>
-                        <th>空间范围</th>
-                        <th>时间范围</th>
-						<th>修改时间</th>
-                        <th width="100">操作</th>
-                    </tr>
-                </thead>
-                <tbody>
-                <?php $autoindex=0;
-                foreach ($this->paginator as $item): 
-                $autoindex++;?>
-				<tr id="DataLine_<?= $item['id']?>">
-                	<td><a href="/data/<?= $item['uuid'] ?>"><?= $item['title'] ?></a></td>
-                    <td><?= $item['spatial'] ?></td>
-					<td><?= $item['temporal'] ?></td>
-					<td><?= date("Y-m-d H:i",strtotime($item['ts_changed'])) ?></td>
-                    <td>
-                        <a href="/admin/data/spatial/ac/edit/uuid/<?= $item['uuid']?>">编辑</a>
-                        <a href="javascript:void(0);" onclick="onedel(<?= $item['id']?>)" id="delbtn_<?= $item['id']?>">删除</a>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            </tbody>
-			</table>
-            <?php endif; ?>
-            <div class="pagenavi"><?= $this->paginator; ?></div>
-        </div>
-        <?php } ?>
-    </div>
-</div>
-<!-- //页面内容 -->
-<script>
-var info = {
-	btn_prefix : "delbtn_",
-	item_prefix : "DataLine_",
-	url : "/admin/data/spatial/ac/del"
-}
-$(document).ready(function(e) {
-    $('.verified_btn').click(function(e) {
-        $(this).ajaxmsg({
-			callback:function(){window.location.reload();}
-		});
-    });
-});
-(function( $ ){
-
-  $.fn.ajaxmsg = function( options ) {
-	  
-	  var settings = $.extend( {
-		url:'',
-		callback : '',
-    	}, options);
-	
-	  var methods = {
-		  msg : function(id)
-		  {
-			  methods.submited();
-		  },
-		  creatWindow : function(content){
-			  $.colorbox({
-				  initialHeight: '0',
-				  initialWidth: '0',
-				  html: methods.dialog(content),
-				  opacity: '0.3',
-				  onComplete: function(){
-					  $('.confirm_yes').click(function(e){
-						  e.preventDefault();
-						  if(typeof(settings.callback)=='function')
-						  {
-							settings.callback();
-						  }
-						  $.colorbox.close();
-					  });
-					  $('.confirm_no').click(function(e){
-						  e.preventDefault();
-						  $.colorbox.close(); 
-					  });
-				  }
-			  });
-		  },
-		  submited : function(){
-			  $.ajax({
-				  'type':"POST",
-				  'url':settings.url,
-				  'data':'',
-				  'success':function(data){
-					  if (typeof(data)=='object')
-					  {
-						if(typeof(data.error)!='undefined')
-						{alert(data.error);}
-						if(typeof(data.success)!='undefined')
-						{
-							methods.creatWindow(data.success);
-						}
-					  }
-					  else{ 
-						alert('出现错误，请稍候再试');
-					  }
-				  },
-				  'timeout': 30000,
-				  'error': function(){
-					  alert('出现错误，请刷新后重试');
-				   }
-			  });
-		  },
-		  dialog : function(content){
-			  HTML  = '<div class=""><div class="modal-header"><h3>提示信息</h3></div>' 
-					+ '<div class="modal-body"><div class=" span5">'+content+'</div></div>'
-					+ '<div class="modal-footer"><a href="javascript:void(0);" class="btn btn-primary confirm_yes">确定</a></div></div>';
-			  return HTML;
-		  }
-	  }
-
-    this.each(function() {
-		settings.url = $(this).attr('rel');
-		if(settings.url == '')
-		{
-			alert('参数错误');
-		}
-		methods.msg();
-    });
-
-  };
-})( jQuery );
-</script>

application/admin/views/scripts/data/sync.phtml

@@ -9,13 +9,12 @@
 	$this->breadcrumb('同步GEONETWORK元数据</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-			<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,6 +22,7 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
+
 <p>WESTDC有元数据<?php echo $this->mdcount->westdccount; ?>条，GEONETWORK有元数据<?php echo $this->mdcount->gncount; ?>条。</p>
 <p><a href="/admin/data/sync/source/geonetwork">开始同步：从GEONETWORK同步到WESTDC，若有冲突，以GEONETWORK为准</a> </p>
 <p><a href="/admin/data/sync/source/westdc">开始同步：从WESTDC同步到GEONETWORK</a> </p>
@@ -48,4 +48,3 @@
 </ul>
 <?php endif; ?>
 </div>
-</div>

application/admin/views/scripts/data/version-bydata.phtml

@@ -10,35 +10,33 @@
 $this->breadcrumb('数据版本管理');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<ul class="nav nav-tabs" role="tablist">
-				<li class=""><a href="/admin/data/version">所有版本概况</a></li>
-				<li class=""><a href="/admin/data/version/ac/unpublish">已发布数据的未发布版本</a></li>
-				<li class="active"><a href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
+<div id="rightPanel">
+	<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/version/">所有版本概况</a></li>
+         <li class="box-shadow active"><a class="text-shadow" href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
 		</ul>
 	</div> 
-		<div class="input-group form-group">
-			<form id="datasearch" class="search_form input-group" action="/admin/data/version/ac/bydata">
-				<input class="form-control" type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" placeholder="搜索关键字" />
-				<span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+	<p>请输入元数据标题关键字进行搜索</p>
+	<form id="datasearch" class="search_form" action="/admin/data/version/ac/bydata">
+    	<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+        <button type="submit" class="btn" id="search_btn">搜索</button>
     </form>
-		</div>
-		<div id="datalistZ">
+    <div id="datalist">
     	<?php
 		if (count($this->paginator)): 
-			echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-				<li class="well well-sm">
+			<li>
             	<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a></p>
                <p>数据库中共有版本数：<?php echo $item['c'];?> (<a href="/admin/data/version/uuid/<?php echo $item['uuid'];?>">查看详细</a>)</p>
             </li>
@@ -48,7 +46,6 @@
         <div class="pagenavi"><?= $this->paginator; ?></div>
     </div>
 </div>
-</div>
 <!-- //页面内容 -->
 <script>
 $('#wapper').width($('body').width()-300);

application/admin/views/scripts/data/version-diff.phtml

@@ -13,19 +13,18 @@
 $this->breadcrumb('查看数据作者');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
 
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<ul class="nav nav-tabs" role="tablist">
-				<li class=""><a href="/admin/data/version">所有版本概况</a></li>
-				<li class=""><a href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
+<div id="rightPanel">
+<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/version">所有版本概况</a></li>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
 		</ul>
 	</div> 
 	<?php
@@ -44,7 +43,6 @@
 	?>
     
 </div>
-</div>
 
 <!-- //页面内容 -->
 <script>

application/admin/views/scripts/data/version-unpublish.phtml

@@ -1,115 +0,0 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle($this->config->title->author);
-	$this->headTitle()->setSeparator(' - ');
-	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
-	$this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('数据版本管理');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-<!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
-		<?= $this->partial('data/left.phtml'); ?>
-	</div>
-	<!-- //左侧导航 -->
-	<!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<ul class="nav nav-tabs" role="tablist">
-				<li class=""><a href="/admin/data/version">所有版本概况</a></li>
-				<li class="active"><a href="/admin/data/version/ac/unpublish">已发布数据的未发布版本</a></li>
-				<li class=""><a href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
-			</ul>
-		</div>
-			<?php
-			if (count($this->paginator)): 
-			if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
-			echo "<ul class=list-unstyled>";
-				$autoindex=0;
-				$edited=false;
-				foreach ($this->paginator as $item): 
-				$autoindex++;?>
-				<li id="list_<?php echo $item['id'];?>" class="well well-sm">
-					<h4><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> 
-					<small><a class="" href="/admin/data/version/uuid/<?php echo $item['uuid']; ?>">查看此数据所有版本</a>
-					<?php if (!$edited && @$item['gid'])
-					{ $edited=true; echo '<a href="/service/geonetwork?url=metadata.edit?id='.$item['gid'].'" target="_blank">编辑最新版本</a> ';} ?>
-					</small></h4>
-					<p>版本创建时间: <?php echo date("Y-m-d H:i",strtotime($item['ts_created']));?> 
-						<?php if ($item['owner']) :
-						  echo "修改者： ".(empty($item['realname'])?$item['username']:$item['realname'])." ";
-						  endif;
-						 ?>
-				 	</p>
-				 	<h5>
-						<a class="label label-danger" onclick="return confirm('是否确定删除该版本？');" href="javascript:action('delete','<?php echo $item['id'];?>');" class="more">
-						<span class="glyphicon glyphicon-trash"> 删除</a></span>
-						<a class="label label-primary" class="label label-danger" onclick="return confirm('是否确定将这个版本恢复到geonetwork？');" href="javascript:action('restore','<?php echo $item['id'];?>');" class="more">恢复到geonetwork</a>
-						<a class="label label-primary" href="/admin/data/version/ac/diff/id/<?php echo $item['id'];?>" class="more">与前一版对比</a>
-						<a class="label label-primary" href="/admin/data/version/ac/diff1/id/<?php echo $item['id'];?>" class="more">与前一发布或提交版对比</a>
-						<a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline label label-primary">提交评审发布</a>
-					</h5>
-					<?php if ($item['changelog']) : ?>                
-					<p><?php echo $item['changelog']; ?></p>
-					<?php endif; ?>
-				</li>
-			<?php endforeach; 
-			echo "</ul>";
-			endif; ?>
-			<div class="pagenavi"><?= $this->paginator; ?></div>
-	</div>
-</div>
-<!-- //页面内容 -->
-<script>
-$('#wapper').width($('body').width()-300);
-function action(ac,id){
-	$.ajax({
-	  'type':"POST",
-	  'url':'/admin/data/version/',
-	  'data':'ac='+ ac +'&id='+id,
-	  'success':function(data){
-		  if (typeof(data)=='object')
-		  {
-			if(typeof(data.error)!='undefined')
-			{$.colorbox({'innerWidth':'50%','html':data.error});}
-			if(typeof(data.deleted)!='undefined')
-			{$('#list_'+data.deleted).fadeOut("slow",function(){$(this).remove();});}
-			if(typeof(data.commited)!='undefined')
-			{$('#changelog').val('');$('#commit_submit').attr('onclick','');}
-		  }
-		  else{ 
-		  	$.colorbox({'innerWidth':'50%','html':'<h4>出现错误，请稍候再试</h4>'});
-		  }
-	  },
-	  'timeout': 30000,
-	  'error': function(){
-		  $.colorbox({'innerWidth':'50%','html':'<h4>处理中出现错误，请刷新页面后重试</h4>'});
-	   }
-  });
-}
-$(".inline").colorbox({inline:true, width:"50%", height:"50%"});
-function commit(id){
-	action('commit&changelog='+$('#changelog').val(),id);
-}
-</script>
-<div class="colorbox" style="display:none;">
-	<div id="commitform">
-    <form>
-        <p>
-        <label>版本改动:</label><br />
-        <textarea rows="12" class="full" style="width:100%;" id="changelog"></textarea>
-        <br /><small>请输入此版本与之前版本的差别</small>
-        </p>
-        <input type="button" onclick="" id="commit_submit" class="btn btn-success pull-right" 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>
-</div>

application/admin/views/scripts/data/version.phtml

@@ -4,57 +4,59 @@
 $this->headTitle()->setSeparator(' - ');
 $this->headScript()->appendFile('/js/jquery-1.7.min.js');
 $this->headLink()->appendStylesheet('/css/admin.css');
-	$this->headScript()->appendFile('/js/lib/colorbox/jquery.colorbox-min.js');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/js/lib/colorbox/colorbox.css');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/admin/data">数据管理</a>');
 $this->breadcrumb('数据版本管理');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
 <!-- 左侧导航 -->
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
     <?= $this->partial('data/left.phtml'); ?>
 </div>
 <!-- //左侧导航 -->
+
 <!-- 页面内容 -->
-	<div class="col-md-10 col-sm-12">
-		<div class="form-group">
-			<ul class="nav nav-tabs" role="tablist">
-				<li class="<?php if(!$this->mdtitle) echo "active";?>"><a href="/admin/data/version">所有版本概况</a></li>
-				<li class=""><a href="/admin/data/version/ac/unpublish">已发布数据的未发布版本</a></li>
-				<li class=""><a href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
+<div id="rightPanel">
+	<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow <?php if(!$this->mdtitle) echo "active";?>"><a class="text-shadow" href="/admin/data/version">所有版本概况</a></li>
+			<li class="box-shadow"><a class="text-shadow" href="/admin/data/version/ac/bydata">逐数据浏览</a></li>
 		</ul>
 	</div> 
+    <div id="datalist">
 		<?php
 		if (count($this->paginator)): 
 		if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
-			echo "<ul class=list-unstyled>";
+		echo "<ul>";
 			$autoindex=0;
 			$edited=false;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-				<li id="list_<?php echo $item['id'];?>" class="well well-sm">
-					<h4><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> 
-					<small><a class="" href="/admin/data/version/uuid/<?php echo $item['uuid']; ?>">查看此数据所有版本</a>
-					<?php if (!$edited && @$item['gid'])
-					{ $edited=true; echo '<a href="/service/geonetwork?url=metadata.edit?id='.$item['gid'].'" target="_blank">编辑最新版本</a> ';} ?>
-					</small></h4>
+			<li id="list_<?php echo $item['id'];?>">
+				<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> 
+				【<a href="/admin/data/version/uuid/<?php echo $item['uuid']; ?>">查看此数据所有版本</a>				
+				<?php
+				if (!$edited && @$item['gid'])
+				{
+					$edited=true;
+					echo '<a href="/service/geonetwork?url=metadata.edit?id='.$item['gid'].'" target="_blank">编辑最新版本</a> ';
+				}
+				?>
+				】</p>
                 <p>版本创建时间: <?php echo date("Y-m-d H:i",strtotime($item['ts_created']));?> 
                 <?php if ($item['userid']) :
                   echo "发布人： ".(empty($item['realname'])?$item['username']:$item['realname'])." ";
                   endif;
                  ?>
-				 	</p>
-				 	<h5>
-						<a class="label label-danger" onclick="return confirm('是否确定删除该版本？');" href="javascript:action('delete','<?php echo $item['id'];?>');" class="more">
-						<span class="glyphicon glyphicon-trash"> 删除</a></span>
-						<a class="label label-primary" class="label label-danger" onclick="return confirm('是否确定将这个版本恢复到geonetwork？');" href="javascript:action('restore','<?php echo $item['id'];?>');" class="more">恢复到geonetwork</a>
-						<a class="label label-primary" href="/admin/data/version/ac/diff/id/<?php echo $item['id'];?>" class="more">与前一版对比</a>
-						<a class="label label-primary" href="/admin/data/version/ac/diff1/id/<?php echo $item['id'];?>" class="more">与前一发布或提交版对比</a>
-						<a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline label label-primary">提交评审发布</a>
-					</h5>
+                【<a onclick="return confirm('是否确定删除该版本？');" href="javascript:action('delete','<?php echo $item['id'];?>');" class="more">删除</a>
+                <a onclick="return confirm('是否确定将这个版本恢复到geonetwork？');" href="javascript:action('restore','<?php echo $item['id'];?>');" class="more">恢复到geonetwork</a>
+                <a href="/admin/data/version/ac/diff/id/<?php echo $item['id'];?>" class="more">与前一版对比</a>
+				<a href="/admin/data/version/ac/diff1/id/<?php echo $item['id'];?>" class="more">与前一发布或提交版对比</a>
+                <a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline">提交评审发布</a>
+                】</p>
                 <?php if ($item['changelog']) : ?>                
                 <p><?php echo $item['changelog']; ?></p>
                 <?php endif; ?>
@@ -93,7 +95,7 @@ function action(ac,id){
 	   }
   });
 }
-$(".inline").colorbox({inline:true, width:"50%", height:"50%"});
+$(".inline").colorbox({inline:true, width:"50%"});
 function commit(id){
 	action('commit&changelog='+$('#changelog').val(),id);
 }
@@ -103,10 +105,10 @@ function commit(id){
     <form>
         <p>
         <label>版本改动:</label><br />
-        <textarea rows="12" class="full" style="width:100%;" id="changelog"></textarea>
+        <textarea class="full" style="resize:none;height:200px;" id="changelog"></textarea>
         <br /><small>请输入此版本与之前版本的差别</small>
         </p>
-        <input type="button" onclick="" id="commit_submit" class="btn btn-success pull-right" value="提交"/>
+        <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>

application/admin/views/scripts/data/visual-add.phtml

@@ -0,0 +1,275 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+    	<h3>添加可视化要素</h3>
+        <hr />
+        <?php if(!empty($this->error)) {?>
+			    <div class="alert alert-error">
+                <?= $this->error ?>
+                </div>
+		<?php }?>
+
+        <form class="form-horizontal" method="post" action="">
+
+            <div class="control-group">
+                <label class="control-label" for="inputUUID">UUID</label>
+                <div class="controls">
+                    <input type="text" id="inputUUID" placeholder="UUID" value="<?= $this->data['uuid'] ?>" class="input-block-level" name="uuid">
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label">状态</label>
+                <div class="controls">
+                    <label class="radio inline">
+                        <?php $checked = function(){
+                            if(isset($this->info['status']))
+                            {
+                                if($this->info['status'] == 1)
+                                {
+                                    return 'checked="checked"';
+                                }
+                            }else{
+                                return 'checked="checked"';
+                            }
+                        }; ?>
+                        <input type="radio" name="status" id="optionsRadios1" value="1" <?= $checked() ?>>
+                        启用
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="status" id="optionsRadios2" value="0"
+                            <?= isset($this->info['status']) && $this->info['status'] == 0 ? 'checked="checked"':"" ?>>
+                        禁用
+                    </label>
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label">绘图插件</label>
+                <div class="controls">
+                    <label class="radio inline">
+                        <input type="radio" name="chartjs" id="optionsRadios1" value="highcharts" <?= (isset($this->info['chartjs']) && $this->info['chartjs']=='highcharts') ? "checked":"" ?>>
+                        Highcharts（适合分类数据展示和三维展示）
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="chartjs" id="optionsRadios2" value="highstock"
+                            <?= (isset($this->info['chartjs']) && $this->info['chartjs'] == 'highstock') || empty($this->info['chartjs']) ? 'checked="checked"':"" ?>>
+                        Highstock（适合时间序列数据可视化）
+                    </label>
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label">默认绘制类型</label>
+                <div class="controls">
+                    <label class="radio inline">
+                        <input type="radio" name="charttype" id="optionsRadios1" value="line" <?= (isset($this->info['charttype']) && $this->info['charttype']=='line') || empty($this->info['charttype']) ? "checked":"" ?>>
+                        折线图
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="charttype" id="optionsRadios2" value="column"
+                            <?= isset($this->info['charttype']) && $this->info['charttype'] == 'column' ? 'checked="checked"':"" ?>>
+                        柱状图
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="charttype" id="optionsRadios3" value="spline"
+                            <?= isset($this->info['charttype']) && $this->info['charttype'] == 'spline' ? 'checked="checked"':"" ?>>
+                        样条线图
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="charttype" id="optionsRadios4" value="area"
+                            <?= isset($this->info['charttype']) && $this->info['charttype'] == 'area' ? 'checked="checked"':"" ?>>
+                        面积图
+                    </label>
+                </div>
+            </div>
+
+            <div class="control-group" style="display: none;">
+                <label class="control-label">数据表</label>
+                <div class="controls">
+                    <select name="visual_datatable" id="data-table">
+                        <option value="0">请选择</option>
+                        <?php foreach($this->visualTable as $k=>$v){ ?>
+                            <?php if(isset($this->info['visual_datatable']) && $this->info['visual_datatable']==$v){ ?>
+                                <option value="<?= $v ?>" selected="selected"><?= $v ?></option>
+                            <?php }else{ ?>
+                                <option value="<?= $v ?>"><?= $v ?></option>
+                            <?php  } ?>
+                        <?php } ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label" for="inputData">数据读取SQL或表名</label>
+                <div class="controls">
+                    <textarea name="data" rows="4" class="input-block-level" id="inputData"><?= !isset($this->info['data']) ? "":$this->info['data']?></textarea>
+                    <p class="help-block">如果设置了某个字段的读取sql会自动忽略此项设置</p>
+                </div>
+            </div>
+
+            <div class="control-group time-field-select">
+                <label class="control-label">X轴取值</label>
+                <div class="controls">
+                    <input type="text" name="xaxis" placeholder="时间字段读取SQL" class="input-block-level" value="<?= isset($this->info['xaxis']) ? $this->info['xaxis']:'' ?>" />
+                    <p class="help-block">例如: utctime, times , (year||'-'||month||'-1')::timestamp without time zone ,不需要在最外层加括号或者双引号。如果是制作分类图，则X轴必须是category，请在数据读取SQL中用将所需字段命名为category。</p>
+                </div>
+            </div>
+
+
+            <?php if(!empty($this->info['variable'])) { ?>
+                <?php $vars = array() ?>
+                <?php $encoder = new \Westdc\Visual\VariableEncoder; ?>
+                <?php $vars = $encoder->decode($this->info['variable']);?>
+                <?php foreach($vars as $index=>$value) { ?>
+                    <div class="control-group var-group">
+                        <label class="control-label" for="inputVariable">可视化要素 <small><a href="javascript:void(0);" onclick="delVar(this)">删除</a></small></label>
+                        <div class="controls">
+                            <input type="text" placeholder="字段名" class="" name="var[<?= $index ?>][name]" value="<?= $value['name'] ?>">
+                            <input type="text" placeholder="显示名" class="" name="var[<?= $index ?>][title]" value="<?= $value['title'] ?>">
+                            <input type="text" placeholder="字段sql" class="" name="var[<?= $index ?>][sql]" value="<?= (isset($value['sql']))?$value['sql']:'' ?>">
+                            <input type="text" placeholder="查询条件" name="var[<?= $index ?>][condition]" value="<?= isset($value['condition']) && is_string($value['condition']) ? $value['condition']:"" ?><?= isset($value['condition']) && is_array($value['condition']) ? join(";",$value['condition']):"" ?>">
+                        </div>
+                    </div>
+                <?php } ?>
+            <?php } ?>
+
+
+            <div class="control-group" id="last-control-group">
+                <div class="controls">
+                    <button type="button" class="btn btn-defualt" id="addVariable">添加要素</button>
+                </div>
+            </div>
+
+
+            <div class="control-group" id="last-control-group">
+                <div class="controls">
+                    <input type="hidden" name="submit" value="1" />
+                    <button type="submit" class="btn btn-primary">提交</button>
+                </div>
+            </div>
+
+        </form>
+
+    </div>
+</div>
+<script type="text/javascript">
+    var fieldData,fieldHtml,varHtml,current_count;
+
+    function makeVarSelectHtml(field_data){
+
+        current_count = $('.var-group').length;
+
+        fieldHtml = []
+
+        varHtml = '<input type="text" placeholder="字段名" class="" name="var['+current_count+'][name]">'
+                + '<input type="text" placeholder="显示名" class="" name="var['+current_count+'][title]">'
+                + '<input type="text" placeholder="字段sql" class="" name="var['+current_count+'][sql]">'
+                + '<input type="text" placeholder="查询条件" class="" name="var['+current_count+'][condition]">';
+
+        html = '<div class="control-group var-group">'
+        +  '<label class="control-label" for="inputVariable">可视化要素 <small><a href="javascript:void(0);" onclick="delVar(this)">删除</a></small></label>'
+        +  '<div class="controls">'
+        +   varHtml
+        +  '</div>'
+        +'</div>';
+        return html;
+    }
+
+	function delVar(dom){
+		$(dom).parent().parent().parent('.control-group').remove();
+	};
+
+    $(document).ready(function(){
+        $('#data-table').change(function(){
+            $('.var-group').remove();
+            $.ajax({
+                type:"POST",
+                url:'',
+                data:'tablename='+ $(this).val(),
+                success:function(data){
+                    fieldData = data;
+                    html = [];
+                    for(i in data)
+                    {
+                        html.push('<option value="' + data[i] + '">' + data[i] + '</option>');
+                    }
+                    html = '<select name="visual_timefield">' + html.join('')+'</select>';
+                    $('#field-time').html(html);
+                },
+                beforeSend:function(){
+                    $('#field-time').html('加载中');
+                }
+            });
+        });
+        <?php if(!empty($this->info['ts_created']) && !empty($this->info['visual_datatable'])) { ?>
+        $.ajax({
+            type:"POST",
+            url:'',
+            data:'tablename=<?= $this->info['visual_datatable'] ?>',
+            success:function(data){
+                fieldData = data;
+                html = [];
+                for(i in data)
+                {
+                    if('<?= $this->info['visual_timefield'] ?>' == data[i])
+                        html.push('<option value="' + data[i] + '" selected="selected">' + data[i] + '</option>');
+                    else
+                        html.push('<option value="' + data[i] + '">' + data[i] + '</option>');
+                }
+                html = '<select name="visual_timefield">' + html.join('')+'</select>';
+                $('#field-time').html(html);
+            },
+            beforeSend:function(){
+                $('#field-time').html('加载中');
+            }
+        });
+        <?php } ?>
+
+        $('#addVariable').click(function(e) {
+            if($('#var-group').length > 0)
+                $('#var-group').append(makeVarSelectHtml(fieldData));
+            else
+                $('#last-control-group').prepend(makeVarSelectHtml(fieldData));
+        });
+
+        $('#open-field-helper').click(function(){
+            if(null == fieldData || $('#data-table').val() == '0')
+            {
+                alert('请先选择数据表和时间字段');
+                return false;
+            }
+
+            $('.modal-body p').html(fieldData.join(','));
+
+            $('#modal-show-field').modal('show');
+
+        });
+
+
+    });
+</script>
+<div id="modal-show-field" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3 id="myModalLabel">字段列表</h3>
+    </div>
+    <div class="modal-body">
+        <p></p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    </div>
+</div>

application/admin/views/scripts/data/visual.phtml

@@ -0,0 +1,40 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
+	$this->breadcrumb('同步GEONETWORK元数据</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+    	<?php if (count($this->paginator)): ?>
+    <div class="datalist">
+    <ul class="unstyled">
+    <?php foreach ($this->paginator as $item): ?>
+    <li class="well well-small">
+        <h4><a href="/data/<?= $item['uuid']; ?>" class="title"><?= $item['title']; ?></a></h4>
+        <p>大小：<?= $item['filesize']; ?>M，创建时间：<?= date('Y-m-d',strtotime($item['ts_created'])); ?>。</p>
+        <?php if($item['author']) :?>
+        <p>数据贡献者：<?= $item['author']; ?></p>
+        <?php endif;?>
+        <p class="content"><?= $item['description']; ?></p>
+        <p>
+        操作：
+        <a href="/admin/data/visual/uuid/<?php echo $item['uuid'];?>">编辑可视化要素</a> |
+        <a href="/visual/view/uuid/<?= $item['uuid'] ?>">前台预览</a>
+        </p>
+    </li>
+    <?php endforeach; ?>
+    </ul>
+    </div>
+    <?php endif; ?>
+    <?php echo $this->paginator; ?> 
+    </div>
+</div>

application/admin/views/scripts/down/data.phtml

@@ -2,20 +2,24 @@
 	$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/down">申请管理</a>');
 	$this->breadcrumb('在线下载记录');
 	$this->breadcrumb()->setSeparator(' > ');
+	$this->headScript()->appendFile('/js/prototype.js');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div  class="col-md-10 col-sm-12">
+    <div class="span10">
+    
+		<h3><?php if(!empty($this->title)) echo $this->title;?>共 <?php echo $this->count;?> 数据下载记录</h3>
+        <hr />
+        
 		<?php if ($this->msg or $this->messages) :?>
-        <div id="message" class="alert alert-info">
+        <div class="alert">
         <?php if ($this->msg) : ?>
             <p><?php echo $this->msg; ?></p>
         <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,27 +27,33 @@
         <?php endforeach;endif; ?>
         </div>
         <?php endif; ?>
-        <h4 class="right_title"><?php if(!empty($this->title)) echo $this->title;?>共 <?php echo $this->count;?> 数据下载记录</h4>
-        <hr />
-        <div class="input-group form-group">
-        	<form action="/admin/down/data/" method="get" class="input-group">
-            	<input type="text" name="keyword" value="<?php echo $this->keyword; ?>" class="form-control" placeholder="搜索关键字"/>
+        
+        <div class="row-fluid">
+        	<div class="span12">
+            <form action="/admin/down/data/" method="get"  class="form-search">
+            	<div class="input-append">
             	<input type="hidden" name="search" value='1'  />
-            	<span class="input-group-btn"><input type="submit" class="btn btn-default" value="搜索" /></span>
+                <input type="text" name="keyword" value="<?php echo $this->keyword; ?>"  class="span8 search-query"/>
+                <button type="submit" class="btn">搜索</button>
+                </div>
             </form>
+            </div>
         </div><!-- search DIV -->
-        <table class="stylized table table-bordered table-striped table-hover">
-        <thead><tr>
+        
+        <table class="table table-hover">
+            <thead>
+                <tr>
                 <td width='350'>数据</td>
                 <td width='150'>下载次数</td>
                 <td width='150'>操作</td>
-        </tr></thead>
+                </tr>
+            </thead>
 			<?php if (count($this->paginator)): ?>
             <?php $autoindex=0;?>
             <?php foreach ($this->paginator as $item): ?>
             <?php $autoindex++;?>
-        <tr>
-            <td><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><span class="glyphicon glyphicon-hdd"></span></a> <a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
+                <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+                <td><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><img src="/images/data.gif" /></a><a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
                 <td><?php echo $item['num']; ?></td>
                 <td>
                 <a href='/admin/down/data/show/<?php echo $item['uuid'];?>'>详细</a>

application/admin/views/scripts/down/fixoffline.phtml

@@ -7,13 +7,12 @@
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
-    <div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-            <div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -21,18 +20,18 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-        <h4 class="right_title">离线申请中可能与网站会员关联的账户列表 (<?php echo $this->count;?> 条)</h4><hr />
-        <p><a class="btn btn-primary" href="/admin/down/fixoffline/nouserid/1">查看所有无用户ID的申请记录</a></p>
+<div class="right_title">离线申请中可能与网站会员关联的账户列表 (<?php echo $this->count;?> 条)</div>
+<div><a href="/admin/down/fixoffline/nouserid/1">查看所有无用户ID的申请记录</a></div>
 <form action="" method="get">
-            <table class="stylized table table-bordered table-striped table-hover">
-                <thead><tr>
-                    <td width='40'>选择</td>
+<table><thead>
+<tr>
+<td width='30'>选择</td>
 <td width='80'>离线申请ID</td>
 <td width='100'>离线申请姓名</td>
 <td width='250'>离线申请单位</td>
 <td width='100'>用户名</td>
 <td width='100'>用户姓名</td>
-                    <td width='220'>用户单位</td>
+<td width='250'>用户单位</td>
 </tr></thead>
 <?php if (count($this->paginator)): ?>
 <?php $autoindex=0;?>
@@ -52,9 +51,8 @@
 </table>
 <div style="width:100%;text-align:left;">
 <input type="hidden" name="fix" value='1' />
-                <input class="btn btn-primary" type="submit" value="匹配已选择的记录" onclick="return confirm('是否确定匹配这些用户')" />
+<input type="submit" value="匹配已选择的记录" onclick="return confirm('是否确定匹配这些用户')" />
 </div>
 </form>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>

application/admin/views/scripts/down/index.phtml

@@ -2,18 +2,16 @@
 	$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('申请管理');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-    <div class="hidden-sm col-md-2">
+<div class="row-fluid">
+    <div class="span2">
     <?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
-        <h3>申请管理</h3>
-        <hr />
+    <div class="span10">
+    
     </div>
 </div>

application/admin/views/scripts/down/left.phtml

@@ -1,12 +1,11 @@
-<div class="well">
-	<ul class="nav nav-stacked">
-		<li class="nav-header text-muted"><h4>申请管理与在线下载记录</h4></li>
-		<li class="nav-divider"></li>
-		<li id="Nav-down-offlineapp"><a href="/admin/down/offlineapp">离线数据申请管理</a></li>
-		<li id="Nav-down-offline"><a href="/admin/down/offline">离线数据服务记录</a></li>
-		<li id="Nav-down-fixoffline"><a href="/admin/down/fixoffline">手动同步离线申请用户与网站帐号</a></li>
-		<li id="Nav-down-online"><a href="/admin/down/online">在线数据下载记录（从20110908开始）</a></li>
-		<li id="Nav-down-user"><a href="/admin/down/user">用户下载记录</a></li>
-		<li id="Nav-down-data"><a href="/admin/down/data">数据下载记录</a></li>
+<div class="well" style="padding:8px 0">
+    <ul class="nav nav-list">
+    <li class="nav-header"><h4>申请管理与记录</h4></li>
+    <li class="divider"></li>
+    <li><a href="/admin/down/offlineapp">离线数据申请管理</a></li>
+    <li><a href="/admin/down/offline">离线数据服务记录</a></li>
+    <li><a href="/admin/down/online">在线数据下载记录</a></li>
+    <li><a href="/admin/down/user">用户下载记录</a></li>
+    <li><a href="/admin/down/data">数据下载记录</a></li>
     </ul>
 </div>

application/admin/views/scripts/down/nouserid.phtml

@@ -9,13 +9,12 @@
 	$this->breadcrumb('离线数据申请管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
-    <div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-        <div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,9 +22,9 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-        <div class="right_title">所有无网站用户信息的离线数据服务记录 <?php echo $this->count;?>条</div><hr />
+<div class="right_title">所有无网站用户信息的离线数据服务记录 <?php echo $this->count;?>条</div>
 <?php if (count($this->paginator)): ?>
-        <table class="stylized table table-bordered table-striped table-hover">
+<table>
 <thead><tr>
 	<th width='70'>姓名</th>
 	<th width='150'>单位</th>
@@ -40,16 +39,13 @@
 	<?php $autoindex=0;?>
 	<?php foreach ($this->paginator as $item): ?>
 	<?php $autoindex++;?>
-            <tr>
-                <td>
-                    <a href="/admin/user/show/id/<?php echo $item['userid'];?>"><span class="glyphicon glyphicon-user"></span></a> 
-                    <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> 
-                </td>
+	<tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+  <td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><img src="/images/user.gif" /></a> <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
   <td><?= $item['unit']; ?></td>
   <td><?= $item['address']; ?></td>
   <td><?= $item['postcode']; ?></td>
-                <td><textarea readonly="readonly" style="width:98%;height:100px;border:none;font-size:12px;"><?= $item['project']; ?></textarea></td>
-                <td><textarea readonly="readonly" style="width:98%;height:100px;border:none;font-size:12px;"><?= $item['datalist']; ?></textarea></td>
+  <td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?= $item['project']; ?></textarea></td>
+  <td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?= $item['datalist']; ?></textarea></td>
   <td><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
   <td>
  <a href="/admin/down/offline/edit/<?= $item['id']; ?>">编辑</a> | 
@@ -59,9 +55,7 @@
  </td> 
   </tr>
 <?php endforeach; ?>
-            </tbody>
-        </table>
+</tbody></table>
 <?php endif; ?>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>

application/admin/views/scripts/down/offline.phtml

@@ -2,7 +2,6 @@
 	$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/down">申请管理</a>');
@@ -11,14 +10,21 @@
 	$this->breadcrumb('离线数据申请管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<style>
+table thead tr th {background:#EBF2F6;color:#444;}
+.high{background:#444;color:#FFF;}
+</style>
+<div class="row-fluid">
+    <div class="span2">
         <?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+<div class="span10">
+	
+    <h3>离线数据服务记录</h3>
+    <hr />
+    
 	<?php if ($this->msg or $this->messages) :?>
-    <div id="message" class="alert alert-info">
+    <div id="message">
     <?php if ($this->msg) : ?>
         <p><?php echo $this->msg; ?></p>
     <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -26,24 +32,21 @@
     <?php endforeach;endif; ?>
     </div>
     <?php endif; ?>
-	<!-- <h4>离线数据服务记录</h4> -->
-    <div class="form-group">
-		<a href="/admin/down/offline/add/1" class="btn btn-primary btn-sm">添加新的离线服务记录</a> 
-        <a href="/admin/down/offline/down/1" class="btn btn-primary btn-sm">下载所有离线服务记录</a> 
-        <a href="/admin/down/offline/update/1" class="btn btn-primary btn-sm" onclick="return confirm('该操作需要较长时间，请不要中途刷新页面，是否确定继续？')">自动匹配离线下载用户与网站用户</a> 
-        <a href="/admin/down/offline/emaillist/1" class="btn btn-primary btn-sm">下载服务用户邮箱列表</a> 
-        <a href="/admin/down/offline/monthreport/1" class="btn btn-primary btn-sm">下载上月服务记录(科技部上报)</a>
+        <div class="pull-left">
+		<a href="/admin/down/offline/add/1" class="btn btn-info">添加新的离线服务记录</a> 
+        <a href="/admin/down/offline/down/1" class="btn btn-info">下载所有离线服务记录</a> 
+        <a href="/admin/down/offline/emaillist/1" class="btn btn-info">下载服务用户邮箱列表</a> 
         </div>
-	<div class="input-group form-group">
-        <form id="datasearch" class="search_form input-group" action="">
-            <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字" />
+		<div class="input-append pull-right">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
                 <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
                 <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-            <span class="input-group-btn"><button type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+                <button type="submit" class="btn" id="search_btn">搜索</button>
             </form>
         </div>
 <?php if (count($this->paginator)): ?>
-<table class="stylized table table-bordered table-striped table-hover">
+<table class="table table-bordered table-hover">
 <thead>
 	<tr>
 	<th width="52">姓名</th>
@@ -85,13 +88,10 @@
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
 </div><!-- row -->
-
-<div class="modal fade" id="upload-form" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
+<div id="upload-form" class="modal hide fade" tabindex="-1" aria-hidden="true">
     <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel">申请表上传</h4>
+    	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    	<h3 id="myModalLabel">申请表上传</h3>
     </div>
     <div class="modal-body">
     	<form id="application-form">
@@ -104,8 +104,6 @@
     	<button class="btn btn-primary">上传完成</button>
     </div>
 </div>
-  </div>
-</div>
 <script>
 //var param = {};
 //var upload_count = 0;

application/admin/views/scripts/down/offlineadd.phtml

@@ -9,13 +9,12 @@
 	$this->breadcrumb('离线数据服务记录管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
-	<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php if ($this->msg or $this->messages) :?>
-		<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,9 +22,6 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-		<a class="btn btn-primary bt-sm" href="/admin/down/offline/add/1">添加新的离线服务记录</a><p></p>
+<a href="/admin/down/offline/add/1">添加新的离线服务记录</a>
 <?= $this->form; ?>
-
-		
-	</div>
 </div>

application/admin/views/scripts/down/offlineapp.phtml

@@ -2,7 +2,6 @@
 	$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/down">申请管理</a>');
@@ -11,13 +10,16 @@
 	$this->breadcrumb('离线数据申请管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-	<div class="col-md-10 col-sm-12">
+	<div class="span10">
+		<h3>离线数据申请管理</h3>
+        <hr />
+        
         <?php if ($this->msg or $this->messages) :?>
-        <div id="message" class="alert alert-info">
+        <div id="message">
         <?php if ($this->msg) : ?>
             <p><?php echo $this->msg; ?></p>
         <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -25,66 +27,64 @@
         <?php endforeach;endif; ?>
         </div>
         <?php endif; ?>
-        <!-- <h4>离线数据申请管理</h4> -->
-        <div class="form-group">
-            <a href="/admin/down/offlineapp/reset/-1" onclick="return confirm('是否重置该申请？')" class="btn btn-danger">重置1年前的所有未收到申请表的记录</a>
+        
+        <div style="overflow:hidden">
+            <div class="pull-left">
             <a href="/admin/down/offlineapp/status/4" class="btn btn-info">已收到的申请</a>
-            <a href="/admin/down/offlineapp/status/-1" class="btn btn-warning">已拒绝的申请</a>
-            <a href="/admin/down/offlineapp/ac/pending" class="btn btn-primary">待处理的申请</a>  
-            <a href="/admin/down/offline" class="btn btn-success">已通过的申请(离线服务记录)</a> 
+            <a href="/admin/down/offlineapp/status/-1" class="btn btn-info">已拒绝的申请</a>
+            <a href="/admin/down/offlineapp/ac/pending" class="btn btn-info">待处理的申请</a>  
+            <a href="/admin/down/offline" class="btn btn-info">已通过的申请(离线服务记录)</a> 
             </div>
             
-        <div class="input-group form-group">
-            <form id="datasearch" class="search_form input-group" action="">
-                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" class="form-control" placeholder="搜索关键字"/>
+            <div class="input-append pull-right">
+                <form id="datasearch" class="search_form" action="">
+                    <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
                     <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
                     <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
-                <span class="input-group-btn"><button  type="submit" class="btn btn-default" id="search_btn">搜索</button></span>
+                    <button type="submit" class="btn" id="search_btn">搜索</button>
                 </form>
+            </div>
 		</div>
     
- 		<div id="">
+ 		<div id="datalist" style="overflow:hidden">
 		<?php
 		if (count($this->paginator)): 
-		echo '<ul class="list-unstyled">';
+		echo '<ul class="unstyled">';
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-			<li id="list_<?php echo $item['id'];?>" class="well well-sm">
-				<h4>
+			<li id="list_<?php echo $item['id'];?>" class="well well-small">
+				<p>
                 <?= $autoindex ?>. 
-                    <a href="mailto:<?= $item['email']; ?>?subject=答复数据申请问题"><span class="glyphicon glyphicon-user"></span> <?= $item['username']; ?></a> | 
+                <a href="mailto:<?= $item['email']; ?>?subject=答复数据申请问题"><?= $item['username']; ?></a> | 
                 申请时间:<?= date('Y-m-d',strtotime($item['ts_created'])); ?> 
                 <?php if(!empty($item['ts_received'])) echo  " | 收到时间:".date('Y-m-d',strtotime($item['ts_received']));?>
-                </h4>
-                <p class="text-muted">
+                </p>
+                <p>
                 单位:<?= $item['unit']; ?> | 
                 地址:<?= $item['address']; ?> | 
                 邮编:<?= $item['postcode']; ?> 
                 </p>
-                <blockquote>
+                <p>
                 用途：
 				<p style="width:95%;margin:0px auto;"><q><cite><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></cite></q></p>
-                </blockquote>
-                <p>数据清单:<?= $item['datalist']; ?></p>
+                </p>
                 <p>
-               		<a class="label label-info" href="/admin/down/offlineapp/view/<?= $item['id']; ?>">原始申请表</a>
-                	<?php if ($item['datastatus']!=4) : ?>
-                        <span id="start_<?= $item['id']; ?>">
-                            <a class="label label-success"  href="javascript:action('start',<?= $item['id']; ?>);" onclick="return confirm('确定收到该申请?')">收到</a>
-                        </span>
-                    <?php else: ?>
- 					<a class="label label-success" href="javascript:action('finish',<?= $item['id']; ?>);" onclick="return confirm('确定确定通过该申请?')">通过</a>
+                数据清单:<?= $item['datalist']; ?>
+                </p>
+                <p>
+               		<a href="/admin/down/offlineapp/view/<?= $item['id']; ?>">原始申请表</a> | 
+                	<?php if ($item['datastatus']==3) : ?> 	
+                        <span id="start_<?= $item['id']; ?>"><a href="javascript:action('start',<?= $item['id']; ?>);" onclick="return confirm('确定收到该申请?')">收到</a></span> | 
                     <?php endif; ?>
-					<a class="label label-danger" href="javascript:action('deleted',<?= $item['id']; ?>);" onclick="return confirm('确定将此记录删除?')">删除</a>
-                    <?php if ($item['datastatus']!=-1) : ?>
-					   <a class="label label-warning" href="javascript:action('deny',<?= $item['id']; ?>);" onclick="return confirm('确定拒绝该申请？')">拒绝</a>
-                    <?php endif; ?>
-					<a class="label label-warning" href="javascript:action('reset',<?= $item['id']; ?>);" onclick="return confirm('是否重置该申请？')">重置</a>
-                    <a class="label label-primary" href="javascript:void(0);" onclick="upload.showUploadForm(<?= $item['id'] ?>);">上传签字申请表</a>
+ 					<a href="javascript:action('finish',<?= $item['id']; ?>);" onclick="return confirm('确定确定通过该申请?')">通过</a> | 
+					<a href="javascript:action('deleted',<?= $item['id']; ?>);" onclick="return confirm('确定将此记录删除?')">删除</a> | 
+					<a href="javascript:action('deny',<?= $item['id']; ?>);" onclick="return confirm('确定拒绝该申请？')">拒绝</a> | 
+					<a href="javascript:action('reset',<?= $item['id']; ?>);" onclick="return confirm('是否重置该申请？')">重置</a> | 
+                    <a href="javascript:void(0);" onclick="upload.showUploadForm(<?= $item['id'] ?>);">上传签字申请表</a>
                     <?php if(!empty($item['applicationform'])) { ?>
-                        <a class="label label-primary" href="/admin/down/applicationform/ac/view/?link=<?= urlencode($item['applicationform'])?>">查看签字申请表</a>
-                        <a class="label label-warning" href="/admin/down/offlineapps/ac/resetappform/?offlineappid=<?= $item['id'] ?>" onclick="return confirm('是否重置该申请表？')">重置申请表</a>
+						 | <a href="/admin/down/applicationform/ac/view/?link=<?= urlencode($item['applicationform'])?>">查看签字申请表</a>
+                         | <a href="/admin/down/offlineapps/ac/resetappform/?offlineappid=<?= $item['id'] ?>" onclick="return confirm('是否重置该申请表？')">重置申请表</a>
 					<?php }?>
                </p>
 			</li>
@@ -95,13 +95,10 @@
     </div>
     </div>
  </div>
-
-<div class="modal fade" id="upload-form" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
+<div id="upload-form" class="modal hide fade" tabindex="-1" aria-hidden="true">
     <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel">申请表上传</h4>
+    	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    	<h3 id="myModalLabel">申请表上传</h3>
     </div>
     <div class="modal-body">
     	<form id="application-form">
@@ -114,8 +111,6 @@
     	<button class="btn btn-primary">上传完成</button>
     </div>
 </div>
-  </div>
-</div>
 <script>
 //var param = {};
 //var upload_count = 0;

application/admin/views/scripts/down/offlineapps-navpills.phtml

@@ -11,8 +11,5 @@
   <li class="<?= $this->navIn == "passed" ? "active":"" ?>">
   	<a href="/admin/down/offlineapps/ac/passed">已上传申请表已通过</a>
   </li>
-  <li class="<?= $this->navIn == "notsubmitted" ? "active":"" ?>">
-    <a href="/admin/down/offlineapps/ac/notsubmitted">未接收未上传申请表</a>
-  </li>
   
 </ul>

application/admin/views/scripts/down/offlineapps-nopdf.phtml

@@ -2,7 +2,6 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
@@ -22,11 +21,11 @@
 table thead tr th {background:#EBF2F6;color:#444;}
 .high{background:#444;color:#FFF;}
 </style>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+	<div class="span3">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
 
 		<?= $this->partial('down/offlineapps-navpills.phtml',array('navIn'=>$this->navIn)); ?>
 		

application/admin/views/scripts/down/offlineapps-notpassed.phtml

@@ -2,7 +2,6 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
@@ -22,11 +21,11 @@
 table thead tr th {background:#EBF2F6;color:#444;}
 .high{background:#444;color:#FFF;}
 </style>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+	<div class="span3">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
 
 		<?= $this->partial('down/offlineapps-navpills.phtml',array('navIn'=>$this->navIn)); ?>
 		

application/admin/views/scripts/down/offlineapps-notreceived.phtml

@@ -2,7 +2,6 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
@@ -22,11 +21,11 @@
 table thead tr th {background:#EBF2F6;color:#444;}
 .high{background:#444;color:#FFF;}
 </style>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+	<div class="span3">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
 
 		<?= $this->partial('down/offlineapps-navpills.phtml',array('navIn'=>$this->navIn)); ?>
 		

application/admin/views/scripts/down/offlineapps-toauthor.phtml

@@ -2,7 +2,6 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
@@ -22,11 +21,11 @@
 table thead tr th {background:#EBF2F6;color:#444;}
 .high{background:#444;color:#FFF;}
 </style>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+	<div class="span3">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
 
 		<?= $this->partial('down/offlineapps-navpills.phtml',array('navIn'=>$this->navIn)); ?>
 		

application/admin/views/scripts/down/offlineapps-uploaderform.phtml

@@ -1,13 +1,7 @@
-<script>
-_this.SessionID = '<?php echo session_id(); ?>';
-</script>
-<!-- Modal -->
-<div class="modal fade" id="upload-form" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
+<div id="upload-form" class="modal hide fade" tabindex="-1" aria-hidden="true">
     <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">申请表上传</h4>
+    	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    	<h3 id="myModalLabel">申请表上传</h3>
     </div>
     <div class="modal-body">
     	<form id="application-form">
@@ -20,5 +14,6 @@ _this.SessionID = '<?php echo session_id(); ?>';
     	<button class="btn btn-primary">上传完成</button>
     </div>
 </div>
-    </div>
-</div>
+<script>
+_this.SessionID = '<?php echo session_id(); ?>';
+</script>

application/admin/views/scripts/down/offlineapps-view.phtml

@@ -2,7 +2,6 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
@@ -22,11 +21,11 @@
 table thead tr th {background:#EBF2F6;color:#444;}
 .high{background:#444;color:#FFF;}
 </style>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+	<div class="span3">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
 
 		<?= $this->partial('down/offlineapps-navpills.phtml',array('navIn'=>$this->navIn)); ?>
 		

application/admin/views/scripts/down/offlineapps.phtml

@@ -2,19 +2,20 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
 <style>
 table thead tr th {background:#EBF2F6;color:#444;}
 .high{background:#444;color:#FFF;}
 </style>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+	<div class="span3">
     	<?= $this->partial('down/left.phtml'); ?>
     </div>
-    <div class="col-md-10 col-sm-12">
+    <div class="span9">
+
 		<?= $this->partial('down/offlineapps-navpills.phtml',array('navIn'=>$this->navIn)); ?>
+		
         <form action="" method="get" class="search input-append">
         <input type="hidden" name="search" value='1' />
         <input type="text" name="keyword" class="q" value="<?php echo $this->keyword; ?>" />

application/admin/views/scripts/down/offlineshow.phtml

@@ -10,12 +10,14 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('/js/prototype.js');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="divContent">
+
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
+
 <?php if ($this->msg or $this->messages) :?>
-	<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,8 +25,10 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-	<div class="col-md-10 col-sm-12">
-		<table class="stylized table table-bordered table-striped table-hover">
+
+
+<div id="rightPanel">
+<table>
 <tr><td width='80'>姓名</td><td><?php echo $this->infos['username'];?></td></tr>
 <tr><td>单位</td><td><?php echo $this->infos['unit'];?></td></tr>
 <tr><td>电话</td><td><?php echo $this->infos['phone'];?></td></tr>
@@ -32,7 +36,7 @@
 <tr><td>邮编</td><td><?php echo $this->infos['postcode'];?></td></tr>
 <tr><td>电话</td><td><?php echo $this->infos['phone'];?></td></tr>
 <tr><td>Email</td><td><?php echo $this->infos['email'];?></td></tr>
-			<tr><td>用途</td><td><textarea style="width: 99%; height: 163px;" readonly="readonly"><?php echo $this->infos['project'];?></textarea></td></tr>
+<tr><td>用途</td><td><textarea style="width:500px;height:200px;font-size:12px;" readonly="readonly"><?php echo $this->infos['project'];?></textarea></td></tr>
 <tr><td>时间</td><td><?php echo date('Y-m-d H:i:s', strtotime($this->infos['ts_created']));?></td></tr>
 </table>
 </div>

application/admin/views/scripts/down/online.phtml

@@ -2,19 +2,24 @@
 	$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/down">申请管理</a>');
 	$this->breadcrumb('在线数据下载记录</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-    <div class="hidden-sm hidden-xs col-md-2">
+<div class="row-fluid">
+    <div class="span2">
     <?= $this->partial('down/left.phtml'); ?>
     </div>
+	
+    <div class="span10">
+    
+        <h3><?php if(!empty($this->title)) echo $this->title;?>共有 <?php echo $this->count;?> 条在线下载记录</h3>
+        <hr />
+        
         <?php if ($this->msg or $this->messages) :?>
-    <div id="message" class="alert alert-info">
+        <div id="message">
         <?php if ($this->msg) : ?>
             <p><?php echo $this->msg; ?></p>
         <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -22,40 +27,37 @@
         <?php endforeach;endif; ?>
         </div>
         <?php endif; ?>
-    <div  class="col-md-10 col-sm-12">
-        <h4 class="right_title"><?php if(!empty($this->title)) echo $this->title;?>共有 <?php echo $this->count;?> 条在线下载记录</h4><hr />
-        <div class="input-group form-group">
-        	<form action="/admin/down/search/" method="get" class="search_form input-group">
-            	<input type="text" name="keyword" value="<?php echo $this->keyword; ?>"  class="form-control" placeholder="搜索关键字" />
+        
+        <div class="search">
+            <form action="/admin/down/search/" method="get">
+            	<div class="input-append">
                 	<input type="hidden" name="search" value='1' />
-            	<span class="input-group-btn"><input class="btn btn-default" type="submit" class="searchbtn" value="搜索" /></span>
+                	<input type="text" name="keyword" value="<?php echo $this->keyword; ?>" />
+                	<button class="btn" type="submit">搜索</button>
+                </div>
             </form>
         </div><!-- search DIV -->
-        <div class="table-responsive">
-            <table class="stylized table table-bordered table-striped table-hover">
-                <thead><tr>
+        
+        <table class="table table-hover">
+        <thead>
+        <tr>
         <td width='100'>姓名</td>
         <td width='150'>单位</td>
         <td width='350'>数据</td>
         <td width='300'>用途</td>
         <td width='120'>下载时间</td>
         <td width='100'>操作</td>
-                </tr></thead>
+        </tr>
+        </thead>
         <?php if (count($this->paginator)): ?>
         <?php $autoindex=0;?>
         <?php foreach ($this->paginator as $item): ?>
         <?php $autoindex++;?>
-                <tr>
-                    <td>
-                        <a href="/admin/user/show/id/<?php echo $item['userid'];?>"><span class="glyphicon glyphicon-user"></span></a> 
-                        <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> 
-                    </td>
+        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+        <td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><img src="/images/user.gif" /></a><a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
         <td><?= $item['unit']?></td>
-                    <td>
-                        <a href="/data/<?php echo $item['uuid'];?>" target="_blank"><span class="glyphicon glyphicon-hdd"></span></a> 
-                        <a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a>
-                    </td>
-                    <td><textarea readonly="readonly" style="width:98%;height:98%;border:none;font-size:12px;background:#FFF;"><?php echo $item['project']; ?></textarea></td>
+        <td><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><img src="/images/data.gif" /></a><a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
+        <td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?php echo $item['project']; ?></textarea></td>
         <td><?php echo date('Y-m-d H:i:s', strtotime($item['ts_created'])); ?></td>
         <td>
         <a href='/admin/down/online/show/<?php echo $item['id'];?>'>详细</a>
@@ -65,7 +67,6 @@
         <?php endforeach; ?>
         <?php endif; ?>
         </table>
-        </div>
         <div class="pagenavi"><?= $this->paginator; ?></div>
 	</div>
 </div>

application/admin/views/scripts/down/onlineshow.phtml

@@ -10,12 +10,12 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('/js/prototype.js');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
+
 <?php if ($this->msg or $this->messages) :?>
-	<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,8 +23,8 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-	<div class="col-md-10 col-sm-12">
-		<table class="stylized table table-bordered table-striped table-hover">
+<div id="rightPanel">
+<table>
 <tr><td>用户</td><td><a href="/admin/user/show/id/<?php echo $this->infos['uid'];?>"><?php echo $this->infos['uname'];?> </a> （<a href="/admin/down/user/show/<?php echo $this->infos['uid'];?>">用户下载记录 </a>）</td></tr>
 <tr><td>姓名</td><td><?php echo $this->infos['username'];?></td></tr>
 <tr><td>数据</td><td><a href="/data/<?php echo $this->infos['uuid'];?>"><?php echo $this->infos['title'];?></a>（<a href="/admin/down/data/show/<?php echo $this->infos['uuid'];?>">数据下载记录</a>）</td></tr>
@@ -34,7 +34,7 @@
 <tr><td>邮编</td><td><?php echo $this->infos['postcode'];?></td></tr>
 <tr><td>电话</td><td><?php echo $this->infos['phone'];?></td></tr>
 <tr><td>Email</td><td><?php echo $this->infos['email'];?></td></tr>
-		<tr><td>用途</td><td><textarea style="width:99%;height:200px;font-size:12px;"><?php echo $this->infos['project'];?></textarea></td></tr>
+<tr><td>用途</td><td><textarea style="width:500px;height:200px;font-size:12px;"><?php echo $this->infos['project'];?></textarea></td></tr>
 <tr><td>项目编号</td><td><?php echo $this->infos['project_id'];?></td></tr>
 <tr><td>项目标题</td><td><?php echo $this->infos['project_title'];?></td></tr>
 <tr><td>项目类型</td><td><?php echo $this->infos['project_type'];?></td></tr>
@@ -42,4 +42,3 @@
 <tr><td>时间</td><td><?php echo date('Y-m-d H:i:s', strtotime($this->infos['ts_created']));?></td></tr>
 </table>
 </div>
-</div>

application/admin/views/scripts/down/sendmail.phtml

@@ -12,11 +12,10 @@
 	$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 	$this->headLink()->appendStylesheet('/css/colorbox.css');
 ?>
-<div class="row">
-<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
 </div>
-<div class="col-md-10 col-sm-12">
+<div id="rightPanel">
 <?php
 	if(!empty($this->error))
 	{
@@ -55,7 +54,6 @@
 	}
 	?>
 </div>
-</div>
 <script>
 $('#wapper').width($('body').width()-300);
 function sendmail(){

application/admin/views/scripts/down/showdata.phtml

@@ -10,12 +10,12 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('/js/prototype.js');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
+
 <?php if ($this->msg or $this->messages) :?>
-	<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,14 +23,11 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-	<div class="col-md-10 col-sm-12">
-		<h4>
-			<a href="/data/<?php echo $this->infos['uuid'];?>" target="_blank">
-			<span class="glyphicon glyphicon-hdd"></span> “<?php echo $this->infos['title']; ?>”</a> 的下载记录
-		</h4>
-		<hr />
-		<table class="stylized table table-bordered table-striped table-hover">
-			<thead><tr>
+
+<div id="rightPanel">
+<div><a href="/data/<?php echo $this->infos['uuid'];?>" target="_blank"><img src="/images/data.gif" /></a>“<?php echo $this->infos['title']; ?>” 的下载记录</div>
+<table><thead>
+<tr>
 <td width='120'>用户</td>
 <td width='350'>姓名</td>
 <td width='150'>下载时间</td>
@@ -40,8 +37,8 @@
 <?php $autoindex=0;?>
 <?php foreach ($this->paginator as $item): ?>
 <?php $autoindex++;?>
-			<tr >
-				<td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><span class="glyphicon glyphicon-user"></span></a> <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
+<tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+<td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><img src="/images/user.gif" /></a> <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
 <td><a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['realname'];?></a></td>
 <td><?php echo date('Y-m-d H:i:s', strtotime($item['ts_created'])); ?></td>
 <td>
@@ -58,4 +55,3 @@
 </table>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>

application/admin/views/scripts/down/showuser.phtml

@@ -10,12 +10,12 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('/js/prototype.js');
 ?>
-<div class="row">
-	<div class="hidden-sm hidden-xs col-md-2">
+<div id="leftPanel">
 <?= $this->partial('down/left.phtml'); ?>
 </div>
+
 <?php if ($this->msg or $this->messages) :?>
-	<div id="message" class="alert alert-info">
+<div id="message">
 <?php if ($this->msg) : ?>
 	<p><?php echo $this->msg; ?></p>
 <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
@@ -23,11 +23,11 @@
 <?php endforeach;endif; ?>
 </div>
 <?php endif; ?>
-	<div class="col-md-10 col-sm-12">
-		<h4>用户 “<?php echo $this->infos['username']; ?>” 的下载记录dd</h4>
-		<hr />
-		<table class="stylized table table-bordered table-striped table-hover">
-			<thead><tr>
+
+<div id="rightPanel">
+<div style="font-size:16px;line-height:30px;">用户 “<?php echo $this->infos['username']; ?>” 的下载记录</div>
+<table><thead>
+<tr>
 <td width='100'>姓名</td>
 <td width='350'>数据</td>
 <td width='150'>下载时间</td>
@@ -37,9 +37,9 @@
 <?php $autoindex=0;?>
 <?php foreach ($this->paginator as $item): ?>
 <?php $autoindex++;?>
-			<tr>
-				<td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><span class="glyphicon glyphicon-user"></span></a> <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
-				<td><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><span class="glyphicon glyphicon-hdd"></span></a><a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a>(<?php echo $item['filesize'];?>MB)</td>
+<tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+<td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><img src="/images/user.gif" /></a> <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
+<td><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><img src="/images/data.gif" /></a><a href="/admin/down/data/show/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a>(<?php echo $item['filesize'];?>MB)</td>
 <td><?php echo date('Y-m-d H:i:s', strtotime($item['ts_created'])); ?></td>
 <td>
 <?php if($item['onlineappid']>0){echo '<a href="/admin/down/online/show/'.$item['onlineappid'].'">详细</a>';} ?>
@@ -53,4 +53,3 @@
 </table>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
-</div>