diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index 92e74e92..084f5711 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -2651,11 +2651,10 @@ class Admin_DataController extends Zend_Controller_Action
 	{
 		$uuid = $this->_getParam('uuid');
 		$submit = $this->_getParam('submit');
+		$visual = new Visual\Visual;
 		
 		if(!empty($uuid))
-		{
-			$visual = new Visual\Visual;
-			
+		{	
 			$this->_helper->viewRenderer('visual-add');
 			$this->view->data = ['uuid' => $uuid];
 			
@@ -2689,6 +2688,9 @@ class Admin_DataController extends Zend_Controller_Action
 				return true;
 			}
 		}
+		
+		view::addPaginator($visual->getVisualMetadata(),$this,10);
+		return;
 	}
 	
 
diff --git a/application/admin/controllers/UserController.php b/application/admin/controllers/UserController.php
index 79a21117..88cc57de 100755
--- a/application/admin/controllers/UserController.php
+++ b/application/admin/controllers/UserController.php
@@ -1,1244 +1,1244 @@
-<?php
-use Helpers\View as view;
-use Helpers\PDO;
-use Users\Users;
-
-class Admin_UserController 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->view->theme = new Theme();
-		$this->_helper->layout->setLayout('administry');
-    }
-    function postDispatch()
-    {
-    	$this->view->messages = $this->messenger->getMessages();
-    }
-    function indexAction()
-    {
-        $sql="select count(id) as total from users";
-        $uq=$this->db->query($sql);
-        $row=$uq->fetch();
-        
-        $sqlt="select count(id) as total from users where usertype='administrator'";
-        $uqt=$this->db->query($sqlt);
-        $adminrow=$uqt->fetch();
-        
-        $this->view->su=$row;
-        $this->view->suadmin=$adminrow;
-               
-    }//indexAction
-
-    function listAction()
-    {
-	
-		$select=$this->db->select();
-		
-		
-			$select->from('users')
-				->where('usertype = ?', 'member')
-				->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');
-		$this->view->paginator=$paginator;
-    }//listAction
-    
-	function searchAction()
-    {
-		$search = $this->_getParam('search');
-		$realname 	= $this->view->realname  = $this->_getParam('realname');
-		$unit 		= $this->view->unit 	 = $this->_getParam('unit');
-		$project 	= $this->view->project	 = $this->_getParam('project');
-		
-		$select=$this->db->select();
-		
-		if(!empty($search) && ( !empty($realname) || !empty($unit) || !empty($project) ))
-		{
-			$this->messenger->addMessage('搜索结果');
-			$select->from('users');
-			if(!empty($realname))
-			{
-				$select->where('realname like ? ', '%'.$realname.'%');
-				$select->orWhere('username like ? ', '%'.$realname.'%');
-			}
-			if(!empty($unit))
-			$select->where('unit like ? ', '%'.$unit.'%');
-			if(!empty($project))
-			$select->where('project like ? ', '%'.$project.'%');
-			
-			$select->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_param.phtml');
-			$this->view->paginator=$paginator;
-			$this->_helper->viewRenderer('list');
-			
-		}
-		else {
-			$this->_redirect("/admin/user/list");
-		}
-		
-    	
-		
-		
-    }//searchAction
-    
-    function deleteAction()
-    {
-    	$delete=(int)$this->_getParam('id');
-    	$deletename = $this->_getParam('uname');
-    	
-		if (isset($delete)) 
-		{
-			$sql="delete from users where id=?";
-			try {
-				$this->db->query($sql,array($delete));
-				$this->messenger->addMessage('您已经成功的删除了用户：'.$deletename);
-			} catch (Exception $e) { 	
-				$this->messenger->addMessage($e->getMessage());
-			}
-			$this->_redirect("/admin/user/list");
-		}
-    }
-    
-    function adminlistAction()
-    {
-		$select=$this->db->select();
-		$select->from('users')
-				->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');
-		$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()
-    {
-    	$id=(int)$this->_getParam('id');
-		if (isset($id)) 
-		{
-			try {
-				$user = new \Users\Users;
-				$this->view->infos=$user->getUser($id);
-				$this->view->usertypes = $user->getUserType();
-				
-			} catch (Exception $e) {
-				$this->messenger->addMessage($e->getMessage());
-			}
-		}
-		else
-		{
-			$this->_redirect("/admin/user/list");
-		}
-    }//showAction()
-	
-	function upAction()
-	{
-		$id=(int)$this->_getParam('id');
-		
-		if (isset($id)) 
-		{
-			try {
-				
-				$sql="select u.*,m.id as mid from users u left join mdexperts m on m.id=u.id where u.id='$id'";
-				$result = $this->db->query($sql);
-				$ex = $result->fetch();
-				if(empty($ex['mid'])){
-					
-					$submit=$this->_getParam('submit');
-					$speciality = $this->_getParam('speciality');
-					
-					if($submit)
-					{						
-						$sql="insert into mdexperts (id,speciality) values ('$id','$speciality')";
-						if($this->db->exec($sql)>0)
-						{
-							$this->messenger->addMessage('已经成功将用户提升为评审专家');
-							$this->_redirect("/admin/user/list");
-						}
-					}
-					else
-					{
-						$this->view->infos = $ex;
-					}
-					
-				}else
-				{
-					$this->messenger->addMessage("该用户已经是评审专家");
-					$this->_redirect("/admin/user/list");
-				}
-				
-			} catch (Exception $e) {
-				$this->messenger->addMessage($e->getMessage());
-				$this->_redirect("/admin/user/list");
-			}
-		}
-		else
-		{
-			$this->_redirect("/admin/user/list");
-		}
-		
-	}//upAction() 把用户提升为评审专家
-    
-	function editAction()
-    {
-    	$id=(int)$this->_getParam('id');
-    	$usertype=$this->_getParam('usertype');
-    	$newpwd=$this->_getParam('newpwd');
-    	$cfnewpwd=$this->_getParam('cfnewpwd');
-    	$sql="";
-    	$updates=array();
-		if (isset($id)) 
-		{
-			
-			if(!empty($newpwd)&&!empty($cfnewpwd))
-	    	{
-	    		if($newpwd==$cfnewpwd)
-	    		{
-	    			$password=md5($newpwd);
-	    			$updates[]="password='$password'";
-	    		}
-	    		else
-	    		{
-	    			$this->messenger->addMessage('两次密码不相同');
-	    			$this->_redirect("/admin/user/show/id/$id");
-	    		}
-	    	}
-	    	if(isset($usertype))
-	    	{
-	    		$updates[]="usertype='$usertype'";
-	    	}
-	    	
-	    	$update=join(',',$updates);
-	    	$sql="update users set $update where id='$id'";
-	    	
-			try {
-				$this->db->query($sql);
-				$this->messenger->addMessage('编辑成功！');
-			} catch (Exception $e) {
-				$this->messenger->addMessage($e->getMessage());
-			}
-			
-			$this->_redirect("/admin/user/show/id/$id");
-		}
-		else {
-			$this->_redirect("/admin/user/list");
-		}
-		
-    }
-    
-	function fetchpwdAction()
-    {
-    	$id=(int)$this->_getParam('id');
-    	$email=$this->_getParam('email');
-		if (!empty($email)) 
-		{
-			try {
-				$sql="select * from users where email=?";
-            	$uq=$this->db->query($sql,$email);
-            	if ($urow=$uq->fetch())
-            	{
-            		//email the url to user
-            		$username=$urow['username'];
-            		$sql="update users set activation=? where email=?";
-            		$uid=uniqid();
-            		$this->db->query($sql,array($uid,$email));
-                	$mail=new WestdcMailer($this->view->config->smtp);
-                	$body="尊敬的西部数据中心用户：
-    有人提出了针对此用户名的密码重置请求。
-	
-	用户名：";
-					$body.=$username;
-					$body.="
-
- 若想重置您的密码请打开下面的链接，否则请忽略此邮件，一切如常。
-";
-					$body.="http://westdc.westgis.ac.cn/account/fetchpwd/".$username."/".$uid;
-                	$mail->setBodyText($body);
-					$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
-                	$mail->addTo($email);
-                	$mail->setSubject('密码已重置');
-    				$mail->send();
-				$this->messenger->addMessage('密码重置成功！');
-            	}
-			} catch (Exception $e) {
-				$this->messenger->addMessage($e->getMessage().$email);
-			}
-			$this->_redirect("/admin/user/show/id/$id");
-		}
-		else {
-			$this->_redirect("/admin/user/list");
-		}
-		
-    } //overview
-	
-	
-	/*
-	* groupAction() 用户组管理
-	*
-	*/
-	function groupAction(){
-		
-		$ac = $this->_getParam('ac');
-		$groupsTable = "groups";
-		$userGroupTable = "usergroup";
-		$nameField = $paramName = "name";
-		include_once("Users.php");
-		$u = new Users($this->db);
-		
-		if(empty($ac) || $ac == "index")
-		{
-			$select=$this->db->select();
-		
-		
-			$select->from($groupsTable)
-				->order('groups.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');
-			$this->view->paginator=$paginator;
-		}//首页
-		
-		if($ac == "add")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$data[$nameField] = $this->_getParam($paramName);
-			
-			if(empty($data[$nameField]))
-			{
-				$this->jsonexit(array("error"=>'请输入组名'));
-				return true;
-			}
-			
-			if($this->db->insert($groupsTable,$data))
-			{
-				$this->jsonexit(array("status"=>1));
-				return true;
-			}else{
-				$this->jsonexit(array("error"=>"出现错误，请重试"));
-				return true;
-			}
-			
-			return true;
-		}//增加用户组
-		
-		if($ac == "edit")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$id = $this->_getParam('id');
-			$data[$nameField] = $this->_getParam($paramName);
-			
-			if(empty($id))
-			{
-				$this->jsonexit(array("error"=>'参数错误'));
-				return true;
-			}
-			
-			if(empty($data[$nameField]))
-			{
-				$this->jsonexit(array("error"=>'请输入组名'));
-				return true;
-			}
-			
-			if($this->db->update($groupsTable,$data,"id=$id"))
-			{
-				$this->jsonexit(array("status"=>1,"name"=>$data[$nameField]));
-				return true;
-			}else{
-				$this->jsonexit(array("error"=>"出现错误，请重试"));
-				return true;
-			}
-			
-			return true;
-		}//编辑
-		
-		if($ac == "del")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$id = $this->_getParam('id');
-			
-			if(empty($id))
-			{
-				$this->jsonexit(array("error"=>'参数错误'));
-				return true;
-			}
-			
-			if($this->db->delete($groupsTable,"id=$id"))
-			{
-				$this->jsonexit(array("status"=>1));
-				return true;
-			}else{
-				$this->jsonexit(array("error"=>"出现错误，请重试"));
-				return true;
-			}
-			
-			return true;
-		}//删除
-		
-		if($ac == "show")
-		{
-			$this->_helper->viewRenderer('group-users');
-			
-			$gid = (int)$this->_getParam('id');
-
-			if(empty($gid))
-			{
-				echo "参数错误!";
-				return true;
-			}
-			
-			$this->view->groupid = $gid;
-			
-			$sql = "SELECT ug.uid,ug.gid,u.id,u.username,u.realname,u.email FROM $userGroupTable ug 
-					LEFT JOIN users u ON ug.uid=u.id
-					WHERE ug.gid=$gid
-					ORDER BY ug.ts_created DESC";
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage(20);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-
-		}//查看用户
-		
-		if($ac == "adduser")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$data['uid'] = $this->_getParam('uid');
-			$data['gid'] = $this->_getParam('gid');
-			
-			if(empty($data['uid']) || empty($data['gid']))
-			{
-				$this->jsonexit(array("error"=>'参数错误'));
-				return true;
-			}
-			
-			$sql = "SELECT * FROM users WHERE id={$data['uid']}";
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			if(count($rows)<1)
-			{
-				$this->jsonexit(array("error"=>'用户不存在'));
-				return true;
-			}
-			
-			$sql = "SELECT * FROM $userGroupTable WHERE uid={$data['uid']} AND gid='{$data['gid']}'";
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			
-			if(count($rows)>0)
-			{
-				$this->jsonexit(array("error"=>'该用户已经存在于要加入的组'));
-				return true;
-			}
-
-			if($this->db->insert($userGroupTable,$data))
-			{
-				$this->jsonexit(array("status"=>1));
-				return true;
-			}else{
-				$this->jsonexit(array("error"=>"出现错误，请重试"));
-				return true;
-			}
-			
-			return true;
-		}//往组中添加用户
-		
-		if($ac == "deluser")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$uid = $this->_getParam('uid');
-			$gid = $this->_getParam('gid');
-			
-			if(empty($uid) || empty($gid))
-			{
-				$this->jsonexit(array("error"=>'参数错误'));
-				return true;
-			}
-			
-			if($this->db->delete($userGroupTable,"uid=$uid AND gid=$gid"))
-			{
-				$this->jsonexit(array("status"=>1));
-				return true;
-			}else{
-				$this->jsonexit(array("error"=>"出现错误，请重试"));
-				return true;
-			}
-			
-			return true;
-		}//从组中删除用户
-		
-		
-	}// groupAction()
-	
-	//管理用户权限
-	public function userauthAction()
-	{
-		$this->_helper->viewRenderer('auth-user');
-		include_once("Users.php");
-		$User = new Users($this->db);
-		$uid = $this->_getParam('uid');
-		if(!empty($uid))
-		{
-			$this->view->uid = $uid;
-		}
-		
-		$ac = $this->_getParam('ac');
-		
-		if(empty($ac) || $ac == "index")
-		{
-			if(empty($uid))
-			{
-				$this->view->error = "参数错误";
-				return true;
-			}
-			
-			$paginator = Zend_Paginator::factory($User->UAuthFetch($uid));
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage(20);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-		}//index
-		
-		if($ac == "add")
-		{
-			$this->_helper->viewRenderer('auth-user-add');
-			$this->view->ac = "add";
-			
-			if(empty($uid))
-			{
-				$this->view->msg = "参数错误";
-				return true;
-			}
-			
-			$submit = $this->_getParam('submit');
-			if(!empty($submit))
-			{
-				$module = $this->_getParam('name_module');
-				$controller = $this->_getParam('name_controller');
-				$action = $this->_getParam('name_action');
-				$special = $this->_getparam('name_special');
-				$allow = $this->_getParam('allow');
-				
-				if(empty($module) && empty($controller) && empty($action) && empty($special))
-				{
-					$this->view->error = "参数错误";
-					return true;
-				}
-				
-				$options = array(
-					'module'=>$module,
-					'controller'=>$controller,
-					'action'=>$action,
-					'special'=>$special
-				);
-				
-				if($User->UAuthAdd($uid,$options,$allow))
-				{
-					$this->view->msg = "添加成功！";
-					$this->view->jump_url = "/admin/user/userauth?uid=".$uid;
-				}else{
-					$this->view->msg = "添加失败，请重试";
-				}
-			}
-		}//add
-		
-		if($ac == "del")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$id = $this->_getParam('id');
-			if(empty($id))
-			{
-				$data = array("error"=>'参数错误');
-				$this->jsonexit($data);
-				return true;
-			}
-			
-			if($User->UAuthDel($id))
-			{
-				$this->jsonexit(array('deleted'=>$id));
-				return true;
-			}else{
-				$this->jsonexit(array('error'=>'移除失败，请重试'));
-				return true;
-			}
-			
-		}//del
-		
-		if($ac == "clearall")
-		{
-			if(empty($uid))
-			{
-				$this->view->error = "参数错误";
-				return true;
-			}
-			
-			if($User->UAuthDel(-1,$uid))
-			{
-				$this->view->msg = "清除成功!";
-				$this->view->jump_url = "/admin/user/userauth?uid=".$uid;
-				return true;
-			}else{
-				$this->view->msg = "清除失败，请重试";
-				$this->view->jump_url = "/admin/user/userauth?uid=".$uid;
-				return true;
-			}
-			
-		}//clearall
-		
-		if($ac == "clone")
-		{
-			if(empty($uid))
-			{
-				$this->view->msg = "参数错误";
-				return true;
-			}
-			
-			$this->_helper->viewRenderer('auth-user-clone');
-			$this->view->ac = "clone";
-			
-			$submit = $this->_getParam('submit');
-			
-			if(!empty($submit))
-			{
-				$target = $this->_getParam('target');
-				if(empty($target))
-				{
-					$this->view->error = "请输入将此用户权限要克隆到的用户ID";
-					return true;
-				}
-				
-				if($User->AuthClone($uid,$target)>0)
-				{
-					$this->view->msg = "克隆成功";
-					return true;
-				}else{
-					$this->view->error = "克隆失败，请查证Email的正确性";
-					return true;
-				}
-			}
-			
-		}//clone
-		
-	}//userauthAction()
-	
-	//组权限
-	public function groupauthAction(){
-		
-		$this->_helper->viewRenderer('auth-group');
-		include_once("Users.php");
-		$User = new Users($this->db);
-		$gid = $this->_getParam('gid');
-		if(!empty($gid))
-		{
-			$this->view->gid = $gid;
-		}
-		
-		$ac = $this->_getParam('ac');
-		
-		if(empty($ac) || $ac == "index")
-		{
-			if(empty($gid))
-			{
-				$this->view->error = "参数错误";
-				return true;
-			}
-			
-			$paginator = Zend_Paginator::factory($User->GAuthFetch($gid));
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage(20);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-		}//index
-		
-		if($ac == "add")
-		{
-			$this->_helper->viewRenderer('auth-group-add');
-			$this->view->ac = "add";
-			
-			if(empty($gid))
-			{
-				$this->view->msg = "参数错误";
-				return true;
-			}
-			
-			$submit = $this->_getParam('submit');
-			if(!empty($submit))
-			{
-				$module = $this->_getParam('name_module');
-				$controller = $this->_getParam('name_controller');
-				$action = $this->_getParam('name_action');
-				$special = $this->_getparam('name_special');
-				$allow = $this->_getParam('allow');
-				
-				if(empty($module) && empty($controller) && empty($action) && empty($special))
-				{
-					$this->view->error = "参数错误";
-					return true;
-				}
-				
-				$options = array(
-					'module'=>$module,
-					'controller'=>$controller,
-					'action'=>$action,
-					'special'=>$special
-				);
-				
-				if($User->GAuthAdd($gid,$options,$allow))
-				{
-					$this->view->msg = "添加成功！";
-					$this->view->jump_url = "/admin/user/groupauth?gid=".$gid;
-				}else{
-					$this->view->msg = "添加失败，请重试";
-				}
-			}
-		}//add
-		
-		if($ac == "del")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$id = $this->_getParam('id');
-			if(empty($id))
-			{
-				$data = array("error"=>'参数错误');
-				$this->jsonexit($data);
-				return true;
-			}
-			
-			if($User->GAuthDel($id))
-			{
-				$this->jsonexit(array('deleted'=>$id));
-				return true;
-			}else{
-				$this->jsonexit(array('error'=>'移除失败，请重试'));
-				return true;
-			}
-			
-		}//del
-		
-		if($ac == "clearall")
-		{
-			if(empty($gid))
-			{
-				$this->view->error = "参数错误";
-				return true;
-			}
-			
-			if($User->GAuthDel(-1,$gid))
-			{
-				$this->view->msg = "清除成功!";
-				$this->view->jump_url = "/admin/user/userauth?gid=".$gid;
-				return true;
-			}else{
-				$this->view->msg = "清除失败，请重试";
-				$this->view->jump_url = "/admin/user/userauth?gid=".$gid;
-				return true;
-			}
-			
-		}//clearall
-		
-	}
-	
-	/*
-	*
-	* 给时间长没有登录的用户发送邀请邮件
-	*
-	*/
-	public function sendmailAction(){
-		
-		$ac = $this->_getParam('ac');
-		
-		if(empty($ac) || $ac=='index')
-		{
-			$time = date("Y-m-d H:i:s",time()-3*365*24*3600);
-			
-			$sql = "SELECT * FROM users 
-					WHERE ts_last_login<'$time'
-					ORDER BY ts_last_login DESC";
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage(20);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-			$this->view->count_users = count($rows);
-			return true;
-			
-		}
-		
-		if($ac == "send")
-		{
-			$this->_helper->viewRenderer('sendmail-send');
-			
-			//当前进行到的数量
-			$now = $this->_getParam('now');
-
-			//需要将起始的时间传递过来，防止sql中出现多余的用户
-			$time = $this->_getParam('time');
-			if(empty($time))
-			{
-				$time = date("Y-m-d H:i:s",time()-3*365*24*3600);
-			}
-			$this->view->gotime = $time;
-			
-			//当前处理的页数
-			$page = $this->_getParam('page');
-			if(empty($page))
-			{
-				$page = 0;
-			}
-
-			$step = 20;
-			
-			$sql = "SELECT count(id) as c FROM users 
-					WHERE ts_last_login<'$time'";
-					
-			$sth = $this->db->query($sql);
-			$row = $sth->fetch();
-			
-			$total = $row['c'];
-			
-			if(empty($now))
-			{
-				$now = 0;
-			}
-			
-			//此次读取的起点
-			$start = $now + $step;
-			
-			if($start>$total)
-			{
-				$this->view->stop = "YES";
-				$msg = array(
-					"title"=>"为长时间未登录用户发送邀请",
-					"body"=>"在 ".time()." 时间给最后登陆时间在". $time ."之前的用户发送了邀请访问邮件。 "
-				);
-				include_once("message.php");
-				message::post($this->db,0,-1,$msg['title'],$msg['body']);
-				return true;
-			}
-			
-			$sql = "SELECT * FROM users 
-					WHERE ts_last_login<'$time'
-					ORDER BY ts_last_login DESC
-					LIMIT $step
-					OFFSET $start";
-					
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			
-			$result = array();
-			
-			foreach($rows as $k=>$v)
-			{
-				include_once("EmailText.php");
-				$mail=new WestdcMailer($this->view->config->smtp);
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
-				$mailtp=new EmailText($this->db,"user-invite",array(
-					'user' => $v['username'],
-					'uid' => $v['id'],
-					'realname'=> $v['realname'],
-					'lastlogin'=> date("Y-m-d",strtotime($v['ts_last_login'])),
-					));
-				$mail->setBodyText($mailtp->getBody());
-				$mail->setSubject($mailtp->getSubject());
-				@$mail->addTo($v['email']);
-				$result[$v['id']] = array(
-										'username'=>$v['username'],
-										'email'=>$v['email'],
-										'lastlogin'=>date("Y-m-d",strtotime($v['ts_last_login']))
-										);
-				//@$mail->send();
-			}
-			
-			
-			$this->view->result = $result;
-			$this->view->now = $start;
-			$this->view->total = $total;
-			
-			$percent = round( ( $start / $total ) * 100 ,1);
-			$this->view->percent = $percent;
-			
-			$page ++;	
-			
-			$this->view->page = $page;
-			
-			return true;		
-			
-		}
-		
-		//黑河用户邮件
-		if($ac == "heihe")
-		{
-			
-			$this->_helper->viewRenderer('sendmail-heihe');
-			
-			$sql = "SELECT * FROM heiheuser ORDER BY id DESC";
-			
-			$sth = $this->db->query($sql);
-			
-			$rows = $sth->fetchAll();
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage(20);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-			$this->view->count_users = count($rows);
-			
-			return true;
-			
-		}
-		
-		//黑河邮件发送
-		if($ac == "heihemail")
-		{
-			$this->_helper->viewRenderer('sendmail-heihe-send');
-			
-			//当前进行到的数量
-			$now = $this->_getParam('now');
-			
-			//当前处理的页数
-			$page = $this->_getParam('page');
-			if(empty($page))
-			{
-				$page = 0;
-			}
-
-			$step = 20;
-			
-			$sql = "SELECT count(id) as c FROM heiheuser";
-					
-			$sth = $this->db->query($sql);
-			$row = $sth->fetch();
-			
-			$total = $row['c'];
-			
-			if(empty($now))
-			{
-				$now = 0;
-			}
-			
-			//此次读取的起点
-			$start = $now + $step;
-			
-			if($start>$total)
-			{
-				$this->view->stop = "YES";
-				$msg = array(
-					"title"=>"为数字黑河用户发送了邮件通知",
-					"body"=>"在 ".time()." 时间给数字黑河用户发送了邮件通知 "
-				);
-				include_once("message.php");
-				message::post($this->db,0,-1,$msg['title'],$msg['body']);
-				return true;
-			}
-			
-			$sql = "SELECT * FROM heiheuser
-					ORDER BY id DESC
-					LIMIT $step
-					OFFSET $start";
-
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			
-			$result = array();
-			
-			foreach($rows as $k=>$v)
-			{
-				
-				include_once("EmailText.php");
-				$mail=new WestdcMailer($this->view->config->smtp);
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
-				$mailtp=new EmailText($this->db,"user-heihe-invite",array(
-					'user' => $v['username'],
-					'uid' => $v['id'],
-					'lastlogin'=> date("Y-m-d",strtotime($v['lastlogin'])),
-					));
-				$mail->setBodyText($mailtp->getBody());
-				$mail->setSubject($mailtp->getSubject());
-				@$mail->addTo($v['email']);
-				
-				$result[$v['id']] = array(
-						'username'=>$v['username'],
-						'email'=>$v['email'],
-						'lastlogin'=>date("Y-m-d",strtotime($v['lastlogin']))
-					);
-				//@$mail->send();
-			}
-			
-			
-			$this->view->result = $result;
-			$this->view->now = $start;
-			$this->view->total = $total;
-			
-			$percent = round( ( $start / $total ) * 100 ,1);
-			$this->view->percent = $percent;
-			
-			$page ++;	
-			
-			$this->view->page = $page;	
-			
-			$this->view->url = "/admin/user/sendmail/ac/heihemail?now=".$start."&page=".$page;
-			
-			return true;
-		}
-		
-		//节日祝贺邮件
-		if($ac == "holiday")
-		{
-			$this->_helper->viewRenderer('sendmail-holiday');
-			
-			$sql = "SELECT count(id) as c FROM users";
-			$sth = $this->db->query($sql);
-			$row = $sth->fetch();
-			
-			$this->view->count_users = $row['c'];
-			
-			$sql = "SELECT * FROM emailtext WHERE \"template\"='user-holiday-email'";
-			$sth = $this->db->query($sql);
-			$row = $sth->fetch();
-			
-			$this->view->mailtemp = $row;
-
-			return true;
-		}
-		
-		//节日祝贺邮件
-		if($ac == "holidaymail")
-		{
-			$this->_helper->layout->disableLayout();
-			$this->_helper->viewRenderer->setNoRender();
-			
-			$title = $this->_getParam('title');
-			$body = $this->_getParam('content');
-			
-			if(empty($title) || empty($body))
-			{
-				$this->jsonexit(array("error"=>"请填写邮件标题和内容"));
-				return true;
-			}
-			
-			//当前进行到的数量
-			$now = $this->_getParam('now');
-			
-			//当前处理的页数
-			$page = $this->_getParam('page');
-			if(empty($page))
-			{
-				$page = 0;
-			}
-
-			$step = 20;
-			
-			$sql = "SELECT count(id) as c FROM users";
-					
-			$sth = $this->db->query($sql);
-			$row = $sth->fetch();
-			
-			$total = $row['c'];
-			
-			if(empty($now))
-			{
-				$now = 0;
-			}
-			
-			//此次读取的起点
-			$start = $now + $step;
-			
-			if($start>$total)
-			{
-				$stop = "YES";
-				$msg = array(
-					"title"=>"为用户发送了节日祝贺邮件",
-					"body"=>"在 ".time()." 为用户发送了节日祝贺邮件 "
-				);
-				include_once("message.php");
-				message::post($this->db,0,-1,$msg['title'],$msg['body']);
-			}
-			
-			$sql = "SELECT * FROM users
-					ORDER BY id DESC
-					LIMIT $step
-					OFFSET $start";
-
-			$sth = $this->db->query($sql);
-			$rows = $sth->fetchAll();
-			
-			$result = array();
-			$sended = 0;
-			
-			foreach($rows as $k=>$v)
-			{
-				$replace_data = array(
-					'username' => $v['username'],
-					'uid' => $v['id'],
-					'lastlogin'=> date("Y-m-d",strtotime($v['ts_last_login'])),
-				);
-					
-				$patterns = array();
-				$replacements = array();
-				foreach($replace_data as $k=>$v)
-				{
-					$patterns[]='/{'.$k.'}/i';
-					$replacements[]=$v;
-				}
-				ksort($patterns);
-				ksort($replacements);
-				$send_body = preg_replace($patterns, $replacements, $body);
-				$send_subject = preg_replace($patterns, $replacements, $title);
-				
-				
-				/*
-				$mail=new WestdcMailer($this->view->config->smtp);
-				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
-				$mail->setBodyText($send_body);
-				$mail->setSubject($send_subject);
-				@$mail->addTo($v['email']);
-				if(@$mail->send())
-				{
-					$sended ++;
-					$status = "成功";
-				}else{
-					$status = "失败";
-				}
-				*/
-				
-				$sended ++;
-				/*
-				调试时前台循环输出result
-				$result[$v['id']] = array(
-						'username'=>$v['username'],
-						'email'=>$v['email'],
-						'send_body'=>$send_body,
-						'send_subject'=>$send_subject
-				);
-				*/
-				
-				
-			}
-
-			$percent = round( ( $start / $total ) * 100 ,1);
-			
-			if($percent > 100)
-			{
-				$percent = 100;
-			}
-			$page ++;
-			
-			$data = array(
-				'now'=>$start,
-				'total'=>$total,
-				'percent'=>$percent,
-				'page'=>$page,
-				'sended'=>$sended,
-				'url'=> "/admin/user/sendmail/ac/holidaymail?now=".$start."&page=".$page."&title=".$title."&body=".urlencode($body),
-				'content'=>$body,
-				'title'=>$title,
-				'status'=>1,
-				'result'=>$result 	//用于调试
-			);
-			
-			if(!empty($stop))
-			{
-				$data['stop'] = $stop;
-				$data['status'] = 0;
-			}
-			
-			$this->jsonexit($data);
-			return true;
-		}
-		
-	}//sendemailAction()
-	
-	
-	
-	public function jsonexit($data){
-		$this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK));
-		return true;  
-	}
-}
-
+<?php
+use Helpers\View as view;
+use Helpers\PDO;
+use Users\Users;
+
+class Admin_UserController 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->view->theme = new Theme();
+		$this->_helper->layout->setLayout('administry');
+    }
+    function postDispatch()
+    {
+    	$this->view->messages = $this->messenger->getMessages();
+    }
+    function indexAction()
+    {
+        $sql="select count(id) as total from users";
+        $uq=$this->db->query($sql);
+        $row=$uq->fetch();
+        
+        $sqlt="select count(id) as total from users where usertype='administrator'";
+        $uqt=$this->db->query($sqlt);
+        $adminrow=$uqt->fetch();
+        
+        $this->view->su=$row;
+        $this->view->suadmin=$adminrow;
+               
+    }//indexAction
+
+    function listAction()
+    {
+	
+		$select=$this->db->select();
+		
+		
+			$select->from('users')
+				->where('usertype = ?', 'member')
+				->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_param.phtml');
+		$this->view->paginator=$paginator;
+    }//listAction
+    
+	function searchAction()
+    {
+		$search = $this->_getParam('search');
+		$realname 	= $this->view->realname  = $this->_getParam('realname');
+		$unit 		= $this->view->unit 	 = $this->_getParam('unit');
+		$project 	= $this->view->project	 = $this->_getParam('project');
+		
+		$select=$this->db->select();
+		
+		if(!empty($search) && ( !empty($realname) || !empty($unit) || !empty($project) ))
+		{
+			$this->messenger->addMessage('搜索结果');
+			$select->from('users');
+			if(!empty($realname))
+			{
+				$select->where('realname like ? ', '%'.$realname.'%');
+				$select->orWhere('username like ? ', '%'.$realname.'%');
+			}
+			if(!empty($unit))
+			$select->where('unit like ? ', '%'.$unit.'%');
+			if(!empty($project))
+			$select->where('project like ? ', '%'.$project.'%');
+			
+			$select->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_param.phtml');
+			$this->view->paginator=$paginator;
+			$this->_helper->viewRenderer('list');
+			
+		}
+		else {
+			$this->_redirect("/admin/user/list");
+		}
+		
+    	
+		
+		
+    }//searchAction
+    
+    function deleteAction()
+    {
+    	$delete=(int)$this->_getParam('id');
+    	$deletename = $this->_getParam('uname');
+    	
+		if (isset($delete)) 
+		{
+			$sql="delete from users where id=?";
+			try {
+				$this->db->query($sql,array($delete));
+				$this->messenger->addMessage('您已经成功的删除了用户：'.$deletename);
+			} catch (Exception $e) { 	
+				$this->messenger->addMessage($e->getMessage());
+			}
+			$this->_redirect("/admin/user/list");
+		}
+    }
+    
+    function adminlistAction()
+    {
+		$select=$this->db->select();
+		$select->from('users')
+				->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_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()
+    {
+    	$id=(int)$this->_getParam('id');
+		if (isset($id)) 
+		{
+			try {
+				$user = new \Users\Users;
+				$this->view->infos=$user->getUser($id);
+				$this->view->usertypes = $user->getUserType();
+				
+			} catch (Exception $e) {
+				$this->messenger->addMessage($e->getMessage());
+			}
+		}
+		else
+		{
+			$this->_redirect("/admin/user/list");
+		}
+    }//showAction()
+	
+	function upAction()
+	{
+		$id=(int)$this->_getParam('id');
+		
+		if (isset($id)) 
+		{
+			try {
+				
+				$sql="select u.*,m.id as mid from users u left join mdexperts m on m.id=u.id where u.id='$id'";
+				$result = $this->db->query($sql);
+				$ex = $result->fetch();
+				if(empty($ex['mid'])){
+					
+					$submit=$this->_getParam('submit');
+					$speciality = $this->_getParam('speciality');
+					
+					if($submit)
+					{						
+						$sql="insert into mdexperts (id,speciality) values ('$id','$speciality')";
+						if($this->db->exec($sql)>0)
+						{
+							$this->messenger->addMessage('已经成功将用户提升为评审专家');
+							$this->_redirect("/admin/user/list");
+						}
+					}
+					else
+					{
+						$this->view->infos = $ex;
+					}
+					
+				}else
+				{
+					$this->messenger->addMessage("该用户已经是评审专家");
+					$this->_redirect("/admin/user/list");
+				}
+				
+			} catch (Exception $e) {
+				$this->messenger->addMessage($e->getMessage());
+				$this->_redirect("/admin/user/list");
+			}
+		}
+		else
+		{
+			$this->_redirect("/admin/user/list");
+		}
+		
+	}//upAction() 把用户提升为评审专家
+    
+	function editAction()
+    {
+    	$id=(int)$this->_getParam('id');
+    	$usertype=$this->_getParam('usertype');
+    	$newpwd=$this->_getParam('newpwd');
+    	$cfnewpwd=$this->_getParam('cfnewpwd');
+    	$sql="";
+    	$updates=array();
+		if (isset($id)) 
+		{
+			
+			if(!empty($newpwd)&&!empty($cfnewpwd))
+	    	{
+	    		if($newpwd==$cfnewpwd)
+	    		{
+	    			$password=md5($newpwd);
+	    			$updates[]="password='$password'";
+	    		}
+	    		else
+	    		{
+	    			$this->messenger->addMessage('两次密码不相同');
+	    			$this->_redirect("/admin/user/show/id/$id");
+	    		}
+	    	}
+	    	if(isset($usertype))
+	    	{
+	    		$updates[]="usertype='$usertype'";
+	    	}
+	    	
+	    	$update=join(',',$updates);
+	    	$sql="update users set $update where id='$id'";
+	    	
+			try {
+				$this->db->query($sql);
+				$this->messenger->addMessage('编辑成功！');
+			} catch (Exception $e) {
+				$this->messenger->addMessage($e->getMessage());
+			}
+			
+			$this->_redirect("/admin/user/show/id/$id");
+		}
+		else {
+			$this->_redirect("/admin/user/list");
+		}
+		
+    }
+    
+	function fetchpwdAction()
+    {
+    	$id=(int)$this->_getParam('id');
+    	$email=$this->_getParam('email');
+		if (!empty($email)) 
+		{
+			try {
+				$sql="select * from users where email=?";
+            	$uq=$this->db->query($sql,$email);
+            	if ($urow=$uq->fetch())
+            	{
+            		//email the url to user
+            		$username=$urow['username'];
+            		$sql="update users set activation=? where email=?";
+            		$uid=uniqid();
+            		$this->db->query($sql,array($uid,$email));
+                	$mail=new WestdcMailer($this->view->config->smtp);
+                	$body="尊敬的西部数据中心用户：
+    有人提出了针对此用户名的密码重置请求。
+	
+	用户名：";
+					$body.=$username;
+					$body.="
+
+ 若想重置您的密码请打开下面的链接，否则请忽略此邮件，一切如常。
+";
+					$body.="http://westdc.westgis.ac.cn/account/fetchpwd/".$username."/".$uid;
+                	$mail->setBodyText($body);
+					$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+                	$mail->addTo($email);
+                	$mail->setSubject('密码已重置');
+    				$mail->send();
+				$this->messenger->addMessage('密码重置成功！');
+            	}
+			} catch (Exception $e) {
+				$this->messenger->addMessage($e->getMessage().$email);
+			}
+			$this->_redirect("/admin/user/show/id/$id");
+		}
+		else {
+			$this->_redirect("/admin/user/list");
+		}
+		
+    } //overview
+	
+	
+	/*
+	* groupAction() 用户组管理
+	*
+	*/
+	function groupAction(){
+		
+		$ac = $this->_getParam('ac');
+		$groupsTable = "groups";
+		$userGroupTable = "usergroup";
+		$nameField = $paramName = "name";
+		include_once("Users.php");
+		$u = new Users($this->db);
+		
+		if(empty($ac) || $ac == "index")
+		{
+			$select=$this->db->select();
+		
+		
+			$select->from($groupsTable)
+				->order('groups.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');
+			$this->view->paginator=$paginator;
+		}//首页
+		
+		if($ac == "add")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$data[$nameField] = $this->_getParam($paramName);
+			
+			if(empty($data[$nameField]))
+			{
+				$this->jsonexit(array("error"=>'请输入组名'));
+				return true;
+			}
+			
+			if($this->db->insert($groupsTable,$data))
+			{
+				$this->jsonexit(array("status"=>1));
+				return true;
+			}else{
+				$this->jsonexit(array("error"=>"出现错误，请重试"));
+				return true;
+			}
+			
+			return true;
+		}//增加用户组
+		
+		if($ac == "edit")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$id = $this->_getParam('id');
+			$data[$nameField] = $this->_getParam($paramName);
+			
+			if(empty($id))
+			{
+				$this->jsonexit(array("error"=>'参数错误'));
+				return true;
+			}
+			
+			if(empty($data[$nameField]))
+			{
+				$this->jsonexit(array("error"=>'请输入组名'));
+				return true;
+			}
+			
+			if($this->db->update($groupsTable,$data,"id=$id"))
+			{
+				$this->jsonexit(array("status"=>1,"name"=>$data[$nameField]));
+				return true;
+			}else{
+				$this->jsonexit(array("error"=>"出现错误，请重试"));
+				return true;
+			}
+			
+			return true;
+		}//编辑
+		
+		if($ac == "del")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$id = $this->_getParam('id');
+			
+			if(empty($id))
+			{
+				$this->jsonexit(array("error"=>'参数错误'));
+				return true;
+			}
+			
+			if($this->db->delete($groupsTable,"id=$id"))
+			{
+				$this->jsonexit(array("status"=>1));
+				return true;
+			}else{
+				$this->jsonexit(array("error"=>"出现错误，请重试"));
+				return true;
+			}
+			
+			return true;
+		}//删除
+		
+		if($ac == "show")
+		{
+			$this->_helper->viewRenderer('group-users');
+			
+			$gid = (int)$this->_getParam('id');
+
+			if(empty($gid))
+			{
+				echo "参数错误!";
+				return true;
+			}
+			
+			$this->view->groupid = $gid;
+			
+			$sql = "SELECT ug.uid,ug.gid,u.id,u.username,u.realname,u.email FROM $userGroupTable ug 
+					LEFT JOIN users u ON ug.uid=u.id
+					WHERE ug.gid=$gid
+					ORDER BY ug.ts_created DESC";
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			
+			$paginator = Zend_Paginator::factory($rows);
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(20);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;
+
+		}//查看用户
+		
+		if($ac == "adduser")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$data['uid'] = $this->_getParam('uid');
+			$data['gid'] = $this->_getParam('gid');
+			
+			if(empty($data['uid']) || empty($data['gid']))
+			{
+				$this->jsonexit(array("error"=>'参数错误'));
+				return true;
+			}
+			
+			$sql = "SELECT * FROM users WHERE id={$data['uid']}";
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			if(count($rows)<1)
+			{
+				$this->jsonexit(array("error"=>'用户不存在'));
+				return true;
+			}
+			
+			$sql = "SELECT * FROM $userGroupTable WHERE uid={$data['uid']} AND gid='{$data['gid']}'";
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			
+			if(count($rows)>0)
+			{
+				$this->jsonexit(array("error"=>'该用户已经存在于要加入的组'));
+				return true;
+			}
+
+			if($this->db->insert($userGroupTable,$data))
+			{
+				$this->jsonexit(array("status"=>1));
+				return true;
+			}else{
+				$this->jsonexit(array("error"=>"出现错误，请重试"));
+				return true;
+			}
+			
+			return true;
+		}//往组中添加用户
+		
+		if($ac == "deluser")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$uid = $this->_getParam('uid');
+			$gid = $this->_getParam('gid');
+			
+			if(empty($uid) || empty($gid))
+			{
+				$this->jsonexit(array("error"=>'参数错误'));
+				return true;
+			}
+			
+			if($this->db->delete($userGroupTable,"uid=$uid AND gid=$gid"))
+			{
+				$this->jsonexit(array("status"=>1));
+				return true;
+			}else{
+				$this->jsonexit(array("error"=>"出现错误，请重试"));
+				return true;
+			}
+			
+			return true;
+		}//从组中删除用户
+		
+		
+	}// groupAction()
+	
+	//管理用户权限
+	public function userauthAction()
+	{
+		$this->_helper->viewRenderer('auth-user');
+		include_once("Users.php");
+		$User = new Users($this->db);
+		$uid = $this->_getParam('uid');
+		if(!empty($uid))
+		{
+			$this->view->uid = $uid;
+		}
+		
+		$ac = $this->_getParam('ac');
+		
+		if(empty($ac) || $ac == "index")
+		{
+			if(empty($uid))
+			{
+				$this->view->error = "参数错误";
+				return true;
+			}
+			
+			$paginator = Zend_Paginator::factory($User->UAuthFetch($uid));
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(20);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;
+			
+		}//index
+		
+		if($ac == "add")
+		{
+			$this->_helper->viewRenderer('auth-user-add');
+			$this->view->ac = "add";
+			
+			if(empty($uid))
+			{
+				$this->view->msg = "参数错误";
+				return true;
+			}
+			
+			$submit = $this->_getParam('submit');
+			if(!empty($submit))
+			{
+				$module = $this->_getParam('name_module');
+				$controller = $this->_getParam('name_controller');
+				$action = $this->_getParam('name_action');
+				$special = $this->_getparam('name_special');
+				$allow = $this->_getParam('allow');
+				
+				if(empty($module) && empty($controller) && empty($action) && empty($special))
+				{
+					$this->view->error = "参数错误";
+					return true;
+				}
+				
+				$options = array(
+					'module'=>$module,
+					'controller'=>$controller,
+					'action'=>$action,
+					'special'=>$special
+				);
+				
+				if($User->UAuthAdd($uid,$options,$allow))
+				{
+					$this->view->msg = "添加成功！";
+					$this->view->jump_url = "/admin/user/userauth?uid=".$uid;
+				}else{
+					$this->view->msg = "添加失败，请重试";
+				}
+			}
+		}//add
+		
+		if($ac == "del")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$id = $this->_getParam('id');
+			if(empty($id))
+			{
+				$data = array("error"=>'参数错误');
+				$this->jsonexit($data);
+				return true;
+			}
+			
+			if($User->UAuthDel($id))
+			{
+				$this->jsonexit(array('deleted'=>$id));
+				return true;
+			}else{
+				$this->jsonexit(array('error'=>'移除失败，请重试'));
+				return true;
+			}
+			
+		}//del
+		
+		if($ac == "clearall")
+		{
+			if(empty($uid))
+			{
+				$this->view->error = "参数错误";
+				return true;
+			}
+			
+			if($User->UAuthDel(-1,$uid))
+			{
+				$this->view->msg = "清除成功!";
+				$this->view->jump_url = "/admin/user/userauth?uid=".$uid;
+				return true;
+			}else{
+				$this->view->msg = "清除失败，请重试";
+				$this->view->jump_url = "/admin/user/userauth?uid=".$uid;
+				return true;
+			}
+			
+		}//clearall
+		
+		if($ac == "clone")
+		{
+			if(empty($uid))
+			{
+				$this->view->msg = "参数错误";
+				return true;
+			}
+			
+			$this->_helper->viewRenderer('auth-user-clone');
+			$this->view->ac = "clone";
+			
+			$submit = $this->_getParam('submit');
+			
+			if(!empty($submit))
+			{
+				$target = $this->_getParam('target');
+				if(empty($target))
+				{
+					$this->view->error = "请输入将此用户权限要克隆到的用户ID";
+					return true;
+				}
+				
+				if($User->AuthClone($uid,$target)>0)
+				{
+					$this->view->msg = "克隆成功";
+					return true;
+				}else{
+					$this->view->error = "克隆失败，请查证Email的正确性";
+					return true;
+				}
+			}
+			
+		}//clone
+		
+	}//userauthAction()
+	
+	//组权限
+	public function groupauthAction(){
+		
+		$this->_helper->viewRenderer('auth-group');
+		include_once("Users.php");
+		$User = new Users($this->db);
+		$gid = $this->_getParam('gid');
+		if(!empty($gid))
+		{
+			$this->view->gid = $gid;
+		}
+		
+		$ac = $this->_getParam('ac');
+		
+		if(empty($ac) || $ac == "index")
+		{
+			if(empty($gid))
+			{
+				$this->view->error = "参数错误";
+				return true;
+			}
+			
+			$paginator = Zend_Paginator::factory($User->GAuthFetch($gid));
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(20);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;
+			
+		}//index
+		
+		if($ac == "add")
+		{
+			$this->_helper->viewRenderer('auth-group-add');
+			$this->view->ac = "add";
+			
+			if(empty($gid))
+			{
+				$this->view->msg = "参数错误";
+				return true;
+			}
+			
+			$submit = $this->_getParam('submit');
+			if(!empty($submit))
+			{
+				$module = $this->_getParam('name_module');
+				$controller = $this->_getParam('name_controller');
+				$action = $this->_getParam('name_action');
+				$special = $this->_getparam('name_special');
+				$allow = $this->_getParam('allow');
+				
+				if(empty($module) && empty($controller) && empty($action) && empty($special))
+				{
+					$this->view->error = "参数错误";
+					return true;
+				}
+				
+				$options = array(
+					'module'=>$module,
+					'controller'=>$controller,
+					'action'=>$action,
+					'special'=>$special
+				);
+				
+				if($User->GAuthAdd($gid,$options,$allow))
+				{
+					$this->view->msg = "添加成功！";
+					$this->view->jump_url = "/admin/user/groupauth?gid=".$gid;
+				}else{
+					$this->view->msg = "添加失败，请重试";
+				}
+			}
+		}//add
+		
+		if($ac == "del")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$id = $this->_getParam('id');
+			if(empty($id))
+			{
+				$data = array("error"=>'参数错误');
+				$this->jsonexit($data);
+				return true;
+			}
+			
+			if($User->GAuthDel($id))
+			{
+				$this->jsonexit(array('deleted'=>$id));
+				return true;
+			}else{
+				$this->jsonexit(array('error'=>'移除失败，请重试'));
+				return true;
+			}
+			
+		}//del
+		
+		if($ac == "clearall")
+		{
+			if(empty($gid))
+			{
+				$this->view->error = "参数错误";
+				return true;
+			}
+			
+			if($User->GAuthDel(-1,$gid))
+			{
+				$this->view->msg = "清除成功!";
+				$this->view->jump_url = "/admin/user/userauth?gid=".$gid;
+				return true;
+			}else{
+				$this->view->msg = "清除失败，请重试";
+				$this->view->jump_url = "/admin/user/userauth?gid=".$gid;
+				return true;
+			}
+			
+		}//clearall
+		
+	}
+	
+	/*
+	*
+	* 给时间长没有登录的用户发送邀请邮件
+	*
+	*/
+	public function sendmailAction(){
+		
+		$ac = $this->_getParam('ac');
+		
+		if(empty($ac) || $ac=='index')
+		{
+			$time = date("Y-m-d H:i:s",time()-3*365*24*3600);
+			
+			$sql = "SELECT * FROM users 
+					WHERE ts_last_login<'$time'
+					ORDER BY ts_last_login DESC";
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			
+			$paginator = Zend_Paginator::factory($rows);
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(20);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;
+			
+			$this->view->count_users = count($rows);
+			return true;
+			
+		}
+		
+		if($ac == "send")
+		{
+			$this->_helper->viewRenderer('sendmail-send');
+			
+			//当前进行到的数量
+			$now = $this->_getParam('now');
+
+			//需要将起始的时间传递过来，防止sql中出现多余的用户
+			$time = $this->_getParam('time');
+			if(empty($time))
+			{
+				$time = date("Y-m-d H:i:s",time()-3*365*24*3600);
+			}
+			$this->view->gotime = $time;
+			
+			//当前处理的页数
+			$page = $this->_getParam('page');
+			if(empty($page))
+			{
+				$page = 0;
+			}
+
+			$step = 20;
+			
+			$sql = "SELECT count(id) as c FROM users 
+					WHERE ts_last_login<'$time'";
+					
+			$sth = $this->db->query($sql);
+			$row = $sth->fetch();
+			
+			$total = $row['c'];
+			
+			if(empty($now))
+			{
+				$now = 0;
+			}
+			
+			//此次读取的起点
+			$start = $now + $step;
+			
+			if($start>$total)
+			{
+				$this->view->stop = "YES";
+				$msg = array(
+					"title"=>"为长时间未登录用户发送邀请",
+					"body"=>"在 ".time()." 时间给最后登陆时间在". $time ."之前的用户发送了邀请访问邮件。 "
+				);
+				include_once("message.php");
+				message::post($this->db,0,-1,$msg['title'],$msg['body']);
+				return true;
+			}
+			
+			$sql = "SELECT * FROM users 
+					WHERE ts_last_login<'$time'
+					ORDER BY ts_last_login DESC
+					LIMIT $step
+					OFFSET $start";
+					
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			
+			$result = array();
+			
+			foreach($rows as $k=>$v)
+			{
+				include_once("EmailText.php");
+				$mail=new WestdcMailer($this->view->config->smtp);
+				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mailtp=new EmailText($this->db,"user-invite",array(
+					'user' => $v['username'],
+					'uid' => $v['id'],
+					'realname'=> $v['realname'],
+					'lastlogin'=> date("Y-m-d",strtotime($v['ts_last_login'])),
+					));
+				$mail->setBodyText($mailtp->getBody());
+				$mail->setSubject($mailtp->getSubject());
+				@$mail->addTo($v['email']);
+				$result[$v['id']] = array(
+										'username'=>$v['username'],
+										'email'=>$v['email'],
+										'lastlogin'=>date("Y-m-d",strtotime($v['ts_last_login']))
+										);
+				//@$mail->send();
+			}
+			
+			
+			$this->view->result = $result;
+			$this->view->now = $start;
+			$this->view->total = $total;
+			
+			$percent = round( ( $start / $total ) * 100 ,1);
+			$this->view->percent = $percent;
+			
+			$page ++;	
+			
+			$this->view->page = $page;
+			
+			return true;		
+			
+		}
+		
+		//黑河用户邮件
+		if($ac == "heihe")
+		{
+			
+			$this->_helper->viewRenderer('sendmail-heihe');
+			
+			$sql = "SELECT * FROM heiheuser ORDER BY id DESC";
+			
+			$sth = $this->db->query($sql);
+			
+			$rows = $sth->fetchAll();
+			
+			$paginator = Zend_Paginator::factory($rows);
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(20);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;
+			
+			$this->view->count_users = count($rows);
+			
+			return true;
+			
+		}
+		
+		//黑河邮件发送
+		if($ac == "heihemail")
+		{
+			$this->_helper->viewRenderer('sendmail-heihe-send');
+			
+			//当前进行到的数量
+			$now = $this->_getParam('now');
+			
+			//当前处理的页数
+			$page = $this->_getParam('page');
+			if(empty($page))
+			{
+				$page = 0;
+			}
+
+			$step = 20;
+			
+			$sql = "SELECT count(id) as c FROM heiheuser";
+					
+			$sth = $this->db->query($sql);
+			$row = $sth->fetch();
+			
+			$total = $row['c'];
+			
+			if(empty($now))
+			{
+				$now = 0;
+			}
+			
+			//此次读取的起点
+			$start = $now + $step;
+			
+			if($start>$total)
+			{
+				$this->view->stop = "YES";
+				$msg = array(
+					"title"=>"为数字黑河用户发送了邮件通知",
+					"body"=>"在 ".time()." 时间给数字黑河用户发送了邮件通知 "
+				);
+				include_once("message.php");
+				message::post($this->db,0,-1,$msg['title'],$msg['body']);
+				return true;
+			}
+			
+			$sql = "SELECT * FROM heiheuser
+					ORDER BY id DESC
+					LIMIT $step
+					OFFSET $start";
+
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			
+			$result = array();
+			
+			foreach($rows as $k=>$v)
+			{
+				
+				include_once("EmailText.php");
+				$mail=new WestdcMailer($this->view->config->smtp);
+				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mailtp=new EmailText($this->db,"user-heihe-invite",array(
+					'user' => $v['username'],
+					'uid' => $v['id'],
+					'lastlogin'=> date("Y-m-d",strtotime($v['lastlogin'])),
+					));
+				$mail->setBodyText($mailtp->getBody());
+				$mail->setSubject($mailtp->getSubject());
+				@$mail->addTo($v['email']);
+				
+				$result[$v['id']] = array(
+						'username'=>$v['username'],
+						'email'=>$v['email'],
+						'lastlogin'=>date("Y-m-d",strtotime($v['lastlogin']))
+					);
+				//@$mail->send();
+			}
+			
+			
+			$this->view->result = $result;
+			$this->view->now = $start;
+			$this->view->total = $total;
+			
+			$percent = round( ( $start / $total ) * 100 ,1);
+			$this->view->percent = $percent;
+			
+			$page ++;	
+			
+			$this->view->page = $page;	
+			
+			$this->view->url = "/admin/user/sendmail/ac/heihemail?now=".$start."&page=".$page;
+			
+			return true;
+		}
+		
+		//节日祝贺邮件
+		if($ac == "holiday")
+		{
+			$this->_helper->viewRenderer('sendmail-holiday');
+			
+			$sql = "SELECT count(id) as c FROM users";
+			$sth = $this->db->query($sql);
+			$row = $sth->fetch();
+			
+			$this->view->count_users = $row['c'];
+			
+			$sql = "SELECT * FROM emailtext WHERE \"template\"='user-holiday-email'";
+			$sth = $this->db->query($sql);
+			$row = $sth->fetch();
+			
+			$this->view->mailtemp = $row;
+
+			return true;
+		}
+		
+		//节日祝贺邮件
+		if($ac == "holidaymail")
+		{
+			$this->_helper->layout->disableLayout();
+			$this->_helper->viewRenderer->setNoRender();
+			
+			$title = $this->_getParam('title');
+			$body = $this->_getParam('content');
+			
+			if(empty($title) || empty($body))
+			{
+				$this->jsonexit(array("error"=>"请填写邮件标题和内容"));
+				return true;
+			}
+			
+			//当前进行到的数量
+			$now = $this->_getParam('now');
+			
+			//当前处理的页数
+			$page = $this->_getParam('page');
+			if(empty($page))
+			{
+				$page = 0;
+			}
+
+			$step = 20;
+			
+			$sql = "SELECT count(id) as c FROM users";
+					
+			$sth = $this->db->query($sql);
+			$row = $sth->fetch();
+			
+			$total = $row['c'];
+			
+			if(empty($now))
+			{
+				$now = 0;
+			}
+			
+			//此次读取的起点
+			$start = $now + $step;
+			
+			if($start>$total)
+			{
+				$stop = "YES";
+				$msg = array(
+					"title"=>"为用户发送了节日祝贺邮件",
+					"body"=>"在 ".time()." 为用户发送了节日祝贺邮件 "
+				);
+				include_once("message.php");
+				message::post($this->db,0,-1,$msg['title'],$msg['body']);
+			}
+			
+			$sql = "SELECT * FROM users
+					ORDER BY id DESC
+					LIMIT $step
+					OFFSET $start";
+
+			$sth = $this->db->query($sql);
+			$rows = $sth->fetchAll();
+			
+			$result = array();
+			$sended = 0;
+			
+			foreach($rows as $k=>$v)
+			{
+				$replace_data = array(
+					'username' => $v['username'],
+					'uid' => $v['id'],
+					'lastlogin'=> date("Y-m-d",strtotime($v['ts_last_login'])),
+				);
+					
+				$patterns = array();
+				$replacements = array();
+				foreach($replace_data as $k=>$v)
+				{
+					$patterns[]='/{'.$k.'}/i';
+					$replacements[]=$v;
+				}
+				ksort($patterns);
+				ksort($replacements);
+				$send_body = preg_replace($patterns, $replacements, $body);
+				$send_subject = preg_replace($patterns, $replacements, $title);
+				
+				
+				/*
+				$mail=new WestdcMailer($this->view->config->smtp);
+				$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+				$mail->setBodyText($send_body);
+				$mail->setSubject($send_subject);
+				@$mail->addTo($v['email']);
+				if(@$mail->send())
+				{
+					$sended ++;
+					$status = "成功";
+				}else{
+					$status = "失败";
+				}
+				*/
+				
+				$sended ++;
+				/*
+				调试时前台循环输出result
+				$result[$v['id']] = array(
+						'username'=>$v['username'],
+						'email'=>$v['email'],
+						'send_body'=>$send_body,
+						'send_subject'=>$send_subject
+				);
+				*/
+				
+				
+			}
+
+			$percent = round( ( $start / $total ) * 100 ,1);
+			
+			if($percent > 100)
+			{
+				$percent = 100;
+			}
+			$page ++;
+			
+			$data = array(
+				'now'=>$start,
+				'total'=>$total,
+				'percent'=>$percent,
+				'page'=>$page,
+				'sended'=>$sended,
+				'url'=> "/admin/user/sendmail/ac/holidaymail?now=".$start."&page=".$page."&title=".$title."&body=".urlencode($body),
+				'content'=>$body,
+				'title'=>$title,
+				'status'=>1,
+				'result'=>$result 	//用于调试
+			);
+			
+			if(!empty($stop))
+			{
+				$data['stop'] = $stop;
+				$data['status'] = 0;
+			}
+			
+			$this->jsonexit($data);
+			return true;
+		}
+		
+	}//sendemailAction()
+	
+	
+	
+	public function jsonexit($data){
+		$this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK));
+		return true;  
+	}
+}
+
diff --git a/application/admin/views/scripts/data/left.phtml b/application/admin/views/scripts/data/left.phtml
index 37283f40..8ec3a7f9 100644
--- a/application/admin/views/scripts/data/left.phtml
+++ b/application/admin/views/scripts/data/left.phtml
@@ -1,11 +1,14 @@
-<ul class="nav nav-pills nav-stacked well">
-<span class="label"><h4>数据管理</h4></span>
-<li><a href="/admin/data/md">元数据管理</a></li>
-<li><a href="/admin/data/newdata">新建元数据</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/fund">支持项目</a></li>
-<li><a href="/admin/data/visual">可视化数据</a></li>
-</ul>
\ No newline at end of file
+<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/newdata">新建元数据</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/fund">支持项目</a></li>
+    <li><a href="/admin/data/visual">可视化数据</a></li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/data/md.phtml b/application/admin/views/scripts/data/md.phtml
index 128427a2..e437e616 100644
--- a/application/admin/views/scripts/data/md.phtml
+++ b/application/admin/views/scripts/data/md.phtml
@@ -1,85 +1,92 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin">后台首页</a>');
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('元数据管理</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->theme->AppendPlus($this,'colorbox');
-?>
-<div id="leftPanel">
-<?= $this->partial('data/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-
-<div class="right_title">元数据管理</div>
-
-<div class="search">
-	<form action="" method="get">
-	<div class="input-prepend">
-    <input type="hidden" name="search" value='1' />
-    	<input class="span2 search-query" type="text" name="keyword" value="<?php echo $this->keyword; ?>" placeholder="搜索关键字"/>
-    	<input type="submit" class="btn" value="搜索" />
-	</div>
-    </form>
-</div><!-- search DIV -->
-
-<a href="/admin/data/md/down/1">下载全部xml元数据</a>
-<?php if (count($this->paginator)): ?>
-<div class="datalist">
-<ul>
-<?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'])); ?>，查看：<?= $item['viewed']; ?>次。</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>
-	</p>
-	<?php if($item['author']) :?>
-	<p>数据贡献者：<?= $item['author']; ?></p>
-	<?php endif;?>
-	<p class="content"><?= $item['description']; ?></p>
-</li>
-<?php endforeach; ?>
-</ul>
-</div>
-<?php endif; ?>
-<?php echo $this->paginator; ?> 
-</div>
-<script>
-$(".iframe").colorbox({iframe:true, width:"50%", height:"50%"});
-$(".inline").colorbox({inline:true, width:"50%"});
-function Alert(html){
-	$.colorbox({'innerWidth':'50%','html':'<h4 style="font-size:16px;font-weight:bold;">'+html+'</h4>'});
-}
+<?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('元数据管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+	$this->theme->AppendPlus($this,'colorbox');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    <div class="span10">
+    
+    	<h3>元数据管理</h3>
+        <hr />
+        
+		<?php if ($this->msg or $this->messages) :?>
+        <div id="message">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+        
+        <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 -->
+        
+        <?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'])); ?>，查看：<?= $item['viewed']; ?>次。</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>
+            </p>
+        </li>
+        <?php endforeach; ?>
+        </ul>
+        </div>
+        <?php endif; ?>
+        <?php echo $this->paginator; ?> 
+    </div>
+</div>
+<script>
+$(".iframe").colorbox({iframe:true, width:"50%", height:"50%"});
+$(".inline").colorbox({inline:true, width:"50%"});
+function Alert(html){
+	$.colorbox({'innerWidth':'50%','html':'<h4 style="font-size:16px;font-weight:bold;">'+html+'</h4>'});
+}
 </script>
\ No newline at end of file
diff --git a/application/admin/views/scripts/data/visual.phtml b/application/admin/views/scripts/data/visual.phtml
index ad30c23d..caccb88b 100644
--- a/application/admin/views/scripts/data/visual.phtml
+++ b/application/admin/views/scripts/data/visual.phtml
@@ -1,20 +1,39 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin">后台首页</a>');
-	$this->breadcrumb('<a href="/admin/data">数据管理</a>');
-	$this->breadcrumb('同步GEONETWORK元数据</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    	<?= $this->partial('data/left.phtml'); ?>
-    </div>
-    
-    <div class="span9">
-    	
-    </div>
-</div>
+<?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>
+        </p>
+    </li>
+    <?php endforeach; ?>
+    </ul>
+    </div>
+    <?php endif; ?>
+    <?php echo $this->paginator; ?> 
+    </div>
+</div>
diff --git a/application/admin/views/scripts/down/data.phtml b/application/admin/views/scripts/down/data.phtml
index 49f952d7..1b8571bd 100755
--- a/application/admin/views/scripts/down/data.phtml
+++ b/application/admin/views/scripts/down/data.phtml
@@ -1,62 +1,68 @@
-<?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/down">申请管理</a>');
-	$this->breadcrumb('在线下载记录');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->headScript()->appendFile('/js/prototype.js');
-?>
-
-<div id="leftPanel">
-<?= $this->partial('down/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-
-<div class="right_title"><?php if(!empty($this->title)) echo $this->title;?>共 <?php echo $this->count;?> 数据下载记录</div>
-
-<div class="search">
-	<form action="/admin/down/data/" 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><!-- search DIV -->
-
-<table><thead>
-<tr>
-<td width='350'>数据</td>
-<td width='150'>下载次数</td>
-<td width='150'>操作</td>
-</tr></thead>
-<?php if (count($this->paginator)): ?>
-<?php $autoindex=0;?>
-<?php foreach ($this->paginator as $item): ?>
-<?php $autoindex++;?>
-<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>
-<a href="/admin/down/sendmail/uuid/<?php echo $item['uuid'];?>" title="向数据下载者发送通知邮件">邮件通知</a>
-</td>
-</tr>
-<?php endforeach; ?>
-<?php endif; ?>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
+<?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/down">申请管理</a>');
+	$this->breadcrumb('在线下载记录');
+	$this->breadcrumb()->setSeparator(' > ');
+	$this->headScript()->appendFile('/js/prototype.js');
+?>
+<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 class="alert">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+        
+        <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'  />
+                <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="table table-hover">
+            <thead>
+                <tr>
+                <td width='350'>数据</td>
+                <td width='150'>下载次数</td>
+                <td width='150'>操作</td>
+                </tr>
+            </thead>
+			<?php if (count($this->paginator)): ?>
+            <?php $autoindex=0;?>
+            <?php foreach ($this->paginator as $item): ?>
+            <?php $autoindex++;?>
+                <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>
+                <a href="/admin/down/sendmail/uuid/<?php echo $item['uuid'];?>" title="向数据下载者发送通知邮件">邮件通知</a>
+                </td>
+                </tr>
+            <?php endforeach; ?>
+            <?php endif; ?>
+        </table>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/down/index.phtml b/application/admin/views/scripts/down/index.phtml
index aaae3534..62349970 100644
--- a/application/admin/views/scripts/down/index.phtml
+++ b/application/admin/views/scripts/down/index.phtml
@@ -2,15 +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 id="leftPanel">
-<?= $this->partial('down/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-
+<div class="row-fluid">
+    <div class="span2">
+    <?= $this->partial('down/left.phtml'); ?>
+    </div>
+    <div class="span10">
+    
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/down/left.phtml b/application/admin/views/scripts/down/left.phtml
index 292331de..b35a8918 100644
--- a/application/admin/views/scripts/down/left.phtml
+++ b/application/admin/views/scripts/down/left.phtml
@@ -1,8 +1,11 @@
-<ul class="nav nav-pills nav-stacked well">
-<span class="label"><h4>申请管理与记录</h4></span>
-<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>
\ No newline at end of file
+<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>
\ No newline at end of file
diff --git a/application/admin/views/scripts/down/offline.phtml b/application/admin/views/scripts/down/offline.phtml
index c4dcb6d7..0cd0fd4b 100644
--- a/application/admin/views/scripts/down/offline.phtml
+++ b/application/admin/views/scripts/down/offline.phtml
@@ -1,193 +1,194 @@
-<?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/down">申请管理</a>');
-	$this->Theme->AppendPlus($this,'colorbox');
-	$this->Theme->AppendPlus($this,'uploadify');
-	$this->breadcrumb('离线数据申请管理</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<style>
-table thead tr th {background:#EBF2F6;color:#444;}
-.high{background:#444;color:#FFF;}
-</style>
-<div class="row-fluid">
-    <div class="span3">
-        <?= $this->partial('down/left.phtml'); ?>
-    </div>
-<div class="span9">
-	<?php if ($this->msg or $this->messages) :?>
-    <div id="message">
-    <?php if ($this->msg) : ?>
-        <p><?php echo $this->msg; ?></p>
-    <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-        <p><?php echo $msg; ?></p>
-    <?php endforeach;endif; ?>
-    </div>
-    <?php endif; ?>
-    
-	<h4>离线数据服务记录</h4>
-        
-        <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-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; ?>" />
-                <button type="submit" class="btn" id="search_btn">搜索</button>
-            </form>
-        </div>
-<?php if (count($this->paginator)): ?>
-<table class="table table-bordered table-hover">
-<thead>
-	<tr>
-	<th width="52">姓名</th>
-	<th>单位</th>
-	<th>地址</th>
-	<th>邮编</th>
-	<th>用途</th>
-	<th>数据清单</th>
-	<th>申请时间</th>
-	<th>操作</th>
-	</tr></thead>
-	<tbody>
-	<?php $autoindex=0;?>
-	<?php foreach ($this->paginator as $item): ?>
-	<?php $autoindex++;?>
-  <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-  <td><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:280px;height:100px;border:none;font-size:12px;"><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></textarea></td>
-  <td><textarea readonly="readonly" style="width:280px;height:100px;border:none;font-size:12px;"><?= $item['datalist']; ?></textarea></td>
-  <td><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
-  <td>
-	<a href="/admin/down/offline/edit/<?= $item['id']; ?><?php if(empty($this->page))  "" ; else echo  "/page/".$this->page; ?>">编辑</a> | 
-	<a href="/admin/down/offline/delete/<?= $item['id']; ?>" title="该操作将删除此记录并且删除与此记录有关的申请记录！请谨慎操作" onclick="return confirm('请仅删除测试用途的离线服务记录！')">删除</a> | 
-	<a href="/admin/down/offlineapp/view/<?= $item['id']; ?>">PDF</a> | 
-	<a href="/admin/down/offline/show/<?= $item['id']; ?>">详细</a> |
-	<a href="javascript:action('finish',<?= $item['id']; ?>);" onclick="return confirm('确定确定重新通过该申请?')">重新通过</a> | 
-	<a href="javascript:void(0);" onclick="upload.showUploadForm(<?= $item['id'] ?>);">上传签字申请表</a>
-<?php if(!empty($item['applicationform'])) { ?>
-	 | <a href="/admin/down/applicationform/ac/view/?link=<?= urlencode($item['applicationform'])?>">查看签字申请表</a>
-<?php }?>
- </td> 
-  </tr>
-<?php endforeach; ?>
-</tbody></table>
-<?php endif; ?>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-</div>
-</div><!-- row -->
-<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-hidden="true">×</button>
-    	<h3 id="myModalLabel">申请表上传</h3>
-    </div>
-    <div class="modal-body">
-    	<form id="application-form">
-        	<div id="fsUploadProgress">允许上传30M以内的 PDF 文件</div>
-        	<input type="file" name="Filedata" id="file_upload" />
-        </form>
-    </div>
-    <div class="modal-footer">
-    	<button class="btn" data-dismiss="modal" aria-hidden="true">取消上传</button>
-    	<button class="btn btn-primary">上传完成</button>
-    </div>
-</div>
-<script>
-//var param = {};
-//var upload_count = 0;
-var uploader;
-var param;
-$(function() {
-    $('#file_upload').uploadify({
-        'swf'      : '/js/lib/uploadify/uploadify.swf',
-        'uploader' : '/admin/down/uploadapplicationform',
-		'multi'	   : false,
-		'auto'	   : true,
-		'fileTypeExts' : '*.pdf; *.jpg',
-		'onUploadSuccess' : function(file, data, response) {
-            upload.onsuccess(file, data, response);
-        },
-		'onUploadStart' : function(file) {
-            $('#file_upload').uploadify('settings','formData',param);
-        } 
-    });
-});
-
-var upload = {
-	onsuccess : function(file, data, response){
-		_data = $.parseJSON(data);
-		if(!$.isEmptyObject(_data.error))
-		{
-			alert(_data.error);
-		}else{
-			$('#upload-form').modal('hide');
-			window.location = window.location;
-		}
-	},
-	showUploadForm : function(id){
-		$('#upload-form').modal('show');
-		param = {
-			"PHPSESSID" : "<?php echo session_id(); ?>",
-			'orderid' : id
-		};
-	}
-};
-</script>
- <script>
-function action(name,id){
-	var url;
-	if(name == "start")
-	{url = '/admin/down/offlineapp/start/'+id;}
-	if(name == "finish")
-	{url = '/admin/down/offlineapp/finish/'+id;}
-	if(name == "deleted")
-	{url = '/admin/down/offlineapp/cancel/'+id;}
-	if(name == "deny")
-	{url = '/admin/down/offlineapp/deny/'+id;}
-	if(name == "reset")
-	{url = '/admin/down/offlineapp/reset/'+id;}
-	$.ajax({
-	  'type':"POST",
-	  'url':url,
-	  'data':'',
-	  'success':OnDataLoad,
-	  'timeout': 30000,
-	  'error': AjaxError
-  });
-}
-function OnDataLoad(data){
-	if (typeof(data)=='object')
-	{
-	  if(typeof(data.error)!='undefined')
-	  {Alert(data.error);return false;}
-	  if(typeof(data.msg)!='undefined')
-	  {Alert(data.msg);}
-	  if(typeof(data.started)!='undefined')
-	  {$('#start_'+data.started).remove();}
-	  if(typeof(data.finish) != 'undefined')
-	  {$('#list_'+data.finish).fadeOut();}
-	}
-	else{ 
-	  Alert('出现错误，请稍后再试');
-	}
-}
-function AjaxError(){
-	$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
-}
-$(".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>
+<?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/down">申请管理</a>');
+	$this->Theme->AppendPlus($this,'colorbox');
+	$this->Theme->AppendPlus($this,'uploadify');
+	$this->breadcrumb('离线数据申请管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<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="span10">
+	
+    <h3>离线数据服务记录</h3>
+    <hr />
+    
+	<?php if ($this->msg or $this->messages) :?>
+    <div id="message">
+    <?php if ($this->msg) : ?>
+        <p><?php echo $this->msg; ?></p>
+    <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+        <p><?php echo $msg; ?></p>
+    <?php endforeach;endif; ?>
+    </div>
+    <?php endif; ?>
+        <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-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; ?>" />
+                <button type="submit" class="btn" id="search_btn">搜索</button>
+            </form>
+        </div>
+<?php if (count($this->paginator)): ?>
+<table class="table table-bordered table-hover">
+<thead>
+	<tr>
+	<th width="52">姓名</th>
+	<th>单位</th>
+	<th>地址</th>
+	<th>邮编</th>
+	<th>用途</th>
+	<th>数据清单</th>
+	<th>申请时间</th>
+	<th>操作</th>
+	</tr></thead>
+	<tbody>
+	<?php $autoindex=0;?>
+	<?php foreach ($this->paginator as $item): ?>
+	<?php $autoindex++;?>
+  <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+  <td><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:280px;height:100px;border:none;font-size:12px;"><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></textarea></td>
+  <td><textarea readonly="readonly" style="width:280px;height:100px;border:none;font-size:12px;"><?= $item['datalist']; ?></textarea></td>
+  <td><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
+  <td>
+	<a href="/admin/down/offline/edit/<?= $item['id']; ?><?php if(empty($this->page))  "" ; else echo  "/page/".$this->page; ?>">编辑</a> | 
+	<a href="/admin/down/offline/delete/<?= $item['id']; ?>" title="该操作将删除此记录并且删除与此记录有关的申请记录！请谨慎操作" onclick="return confirm('请仅删除测试用途的离线服务记录！')">删除</a> | 
+	<a href="/admin/down/offlineapp/view/<?= $item['id']; ?>">PDF</a> | 
+	<a href="/admin/down/offline/show/<?= $item['id']; ?>">详细</a> |
+	<a href="javascript:action('finish',<?= $item['id']; ?>);" onclick="return confirm('确定确定重新通过该申请?')">重新通过</a> | 
+	<a href="javascript:void(0);" onclick="upload.showUploadForm(<?= $item['id'] ?>);">上传签字申请表</a>
+<?php if(!empty($item['applicationform'])) { ?>
+	 | <a href="/admin/down/applicationform/ac/view/?link=<?= urlencode($item['applicationform'])?>">查看签字申请表</a>
+<?php }?>
+ </td> 
+  </tr>
+<?php endforeach; ?>
+</tbody></table>
+<?php endif; ?>
+<div class="pagenavi"><?= $this->paginator; ?></div>
+</div>
+</div><!-- row -->
+<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-hidden="true">×</button>
+    	<h3 id="myModalLabel">申请表上传</h3>
+    </div>
+    <div class="modal-body">
+    	<form id="application-form">
+        	<div id="fsUploadProgress">允许上传30M以内的 PDF 文件</div>
+        	<input type="file" name="Filedata" id="file_upload" />
+        </form>
+    </div>
+    <div class="modal-footer">
+    	<button class="btn" data-dismiss="modal" aria-hidden="true">取消上传</button>
+    	<button class="btn btn-primary">上传完成</button>
+    </div>
+</div>
+<script>
+//var param = {};
+//var upload_count = 0;
+var uploader;
+var param;
+$(function() {
+    $('#file_upload').uploadify({
+        'swf'      : '/js/lib/uploadify/uploadify.swf',
+        'uploader' : '/admin/down/uploadapplicationform',
+		'multi'	   : false,
+		'auto'	   : true,
+		'fileTypeExts' : '*.pdf; *.jpg',
+		'onUploadSuccess' : function(file, data, response) {
+            upload.onsuccess(file, data, response);
+        },
+		'onUploadStart' : function(file) {
+            $('#file_upload').uploadify('settings','formData',param);
+        } 
+    });
+});
+
+var upload = {
+	onsuccess : function(file, data, response){
+		_data = $.parseJSON(data);
+		if(!$.isEmptyObject(_data.error))
+		{
+			alert(_data.error);
+		}else{
+			$('#upload-form').modal('hide');
+			window.location = window.location;
+		}
+	},
+	showUploadForm : function(id){
+		$('#upload-form').modal('show');
+		param = {
+			"PHPSESSID" : "<?php echo session_id(); ?>",
+			'orderid' : id
+		};
+	}
+};
+</script>
+ <script>
+function action(name,id){
+	var url;
+	if(name == "start")
+	{url = '/admin/down/offlineapp/start/'+id;}
+	if(name == "finish")
+	{url = '/admin/down/offlineapp/finish/'+id;}
+	if(name == "deleted")
+	{url = '/admin/down/offlineapp/cancel/'+id;}
+	if(name == "deny")
+	{url = '/admin/down/offlineapp/deny/'+id;}
+	if(name == "reset")
+	{url = '/admin/down/offlineapp/reset/'+id;}
+	$.ajax({
+	  'type':"POST",
+	  'url':url,
+	  'data':'',
+	  'success':OnDataLoad,
+	  'timeout': 30000,
+	  'error': AjaxError
+  });
+}
+function OnDataLoad(data){
+	if (typeof(data)=='object')
+	{
+	  if(typeof(data.error)!='undefined')
+	  {Alert(data.error);return false;}
+	  if(typeof(data.msg)!='undefined')
+	  {Alert(data.msg);}
+	  if(typeof(data.started)!='undefined')
+	  {$('#start_'+data.started).remove();}
+	  if(typeof(data.finish) != 'undefined')
+	  {$('#list_'+data.finish).fadeOut();}
+	}
+	else{ 
+	  Alert('出现错误，请稍后再试');
+	}
+}
+function AjaxError(){
+	$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
+}
+$(".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>
diff --git a/application/admin/views/scripts/down/offlineapp.phtml b/application/admin/views/scripts/down/offlineapp.phtml
index a0ac93ea..aa774690 100644
--- a/application/admin/views/scripts/down/offlineapp.phtml
+++ b/application/admin/views/scripts/down/offlineapp.phtml
@@ -1,199 +1,200 @@
-<?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/down">申请管理</a>');
-	$this->Theme->AppendPlus($this,'colorbox');
-	$this->Theme->AppendPlus($this,'uploadify');
-	$this->breadcrumb('离线数据申请管理</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row-fluid">
-    <div class="span3">
-    	<?= $this->partial('down/left.phtml'); ?>
-    </div>
-	<div class="span9">
-		<?php if ($this->msg or $this->messages) :?>
-        <div id="message">
-        <?php if ($this->msg) : ?>
-            <p><?php echo $this->msg; ?></p>
-        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-            <p><?php echo $msg; ?></p>
-        <?php endforeach;endif; ?>
-        </div>
-        <?php endif; ?>
-
-        <h4>离线数据申请管理</h4>
-        
-        <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-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-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; ?>" />
-                    <button type="submit" class="btn" id="search_btn">搜索</button>
-                </form>
-            </div>
-		</div>
-    
- 		<div id="datalist" style="overflow:hidden">
-		<?php
-		if (count($this->paginator)): 
-		echo '<ul class="unstyled">';
-			$autoindex=0;
-			foreach ($this->paginator as $item): 
-			$autoindex++;?>
-			<li id="list_<?php echo $item['id'];?>" class="well well-small">
-				<p>
-                <?= $autoindex ?>. 
-                <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']));?>
-                </p>
-                <p>
-                单位:<?= $item['unit']; ?> | 
-                地址:<?= $item['address']; ?> | 
-                邮编:<?= $item['postcode']; ?> 
-                </p>
-                <p>
-                用途：
-				<p style="width:95%;margin:0px auto;"><q><cite><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></cite></q></p>
-                </p>
-                <p>
-                数据清单:<?= $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 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 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>
-		<?php endforeach; 
-		echo "</ul>";
-		endif; ?>
-        <div class="pagenavi"><?= $this->paginator; ?></div>
-    </div>
-    </div>
- </div>
-<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-hidden="true">×</button>
-    	<h3 id="myModalLabel">申请表上传</h3>
-    </div>
-    <div class="modal-body">
-    	<form id="application-form">
-        	<div id="fsUploadProgress">允许上传30M以内的 PDF 文件</div>
-        	<input type="file" name="Filedata" id="file_upload" />
-        </form>
-    </div>
-    <div class="modal-footer">
-    	<button class="btn" data-dismiss="modal" aria-hidden="true">取消上传</button>
-    	<button class="btn btn-primary">上传完成</button>
-    </div>
-</div>
-<script>
-//var param = {};
-//var upload_count = 0;
-var uploader;
-var param;
-$(function() {
-    $('#file_upload').uploadify({
-        'swf'      : '/js/lib/uploadify/uploadify.swf',
-        'uploader' : '/admin/down/uploadapplicationform',
-		'multi'	   : false,
-		'auto'	   : true,
-		'fileTypeExts' : '*.pdf; *.jpg',
-		'onUploadSuccess' : function(file, data, response) {
-            upload.onsuccess(file, data, response);
-        },
-		'onUploadStart' : function(file) {
-            $('#file_upload').uploadify('settings','formData',param);
-        } 
-    });
-});
-
-var upload = {
-	onsuccess : function(file, data, response){
-		_data = $.parseJSON(data);
-		if(!$.isEmptyObject(_data.error))
-		{
-			alert(_data.error);
-		}else{
-			$('#upload-form').modal('hide');
-			window.location = window.location;
-		}
-	},
-	showUploadForm : function(id){
-		$('#upload-form').modal('show');
-		param = {
-			"PHPSESSID" : "<?php echo session_id(); ?>",
-			'orderid' : id
-		};
-	}
-};
-
-function action(name,id){
-	var url;
-	if(name == "start")
-	{url = '/admin/down/offlineapp/start/'+id;}
-	if(name == "finish")
-	{url = '/admin/down/offlineapp/finish/'+id;}
-	if(name == "deleted")
-	{url = '/admin/down/offlineapp/cancel/'+id;}
-	if(name == "deny")
-	{url = '/admin/down/offlineapp/deny/'+id;}
-	if(name == "reset")
-	{url = '/admin/down/offlineapp/reset/'+id;}
-	$.ajax({
-	  'type':"POST",
-	  'url':url,
-	  'data':'',
-	  'success':OnDataLoad,
-	  'timeout': 30000,
-	  'error': AjaxError
-  });
-}
-function OnDataLoad(data){
-	if (typeof(data)=='object')
-	{
-	  if(typeof(data.error)!='undefined')
-	  {Alert(data.error);return false;}
-	  if(typeof(data.msg)!='undefined')
-	  {Alert(data.msg);}
-	  if(typeof(data.started)!='undefined')
-	  {$('#start_'+data.started).remove();}
-	  if(typeof(data.finish) != 'undefined')
-	  {$('#list_'+data.finish).fadeOut();}
-	}
-	else{ 
-	  Alert('出现错误，请稍后再试');
-	}
-}
-function AjaxError(){
-	$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
-}
-$(".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>
+<?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/down">申请管理</a>');
+	$this->Theme->AppendPlus($this,'colorbox');
+	$this->Theme->AppendPlus($this,'uploadify');
+	$this->breadcrumb('离线数据申请管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('down/left.phtml'); ?>
+    </div>
+	<div class="span10">
+		<h3>离线数据申请管理</h3>
+        <hr />
+        
+        <?php if ($this->msg or $this->messages) :?>
+        <div id="message">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+        
+        <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-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-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; ?>" />
+                    <button type="submit" class="btn" id="search_btn">搜索</button>
+                </form>
+            </div>
+		</div>
+    
+ 		<div id="datalist" style="overflow:hidden">
+		<?php
+		if (count($this->paginator)): 
+		echo '<ul class="unstyled">';
+			$autoindex=0;
+			foreach ($this->paginator as $item): 
+			$autoindex++;?>
+			<li id="list_<?php echo $item['id'];?>" class="well well-small">
+				<p>
+                <?= $autoindex ?>. 
+                <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']));?>
+                </p>
+                <p>
+                单位:<?= $item['unit']; ?> | 
+                地址:<?= $item['address']; ?> | 
+                邮编:<?= $item['postcode']; ?> 
+                </p>
+                <p>
+                用途：
+				<p style="width:95%;margin:0px auto;"><q><cite><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></cite></q></p>
+                </p>
+                <p>
+                数据清单:<?= $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 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 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>
+		<?php endforeach; 
+		echo "</ul>";
+		endif; ?>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
+    </div>
+ </div>
+<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-hidden="true">×</button>
+    	<h3 id="myModalLabel">申请表上传</h3>
+    </div>
+    <div class="modal-body">
+    	<form id="application-form">
+        	<div id="fsUploadProgress">允许上传30M以内的 PDF 文件</div>
+        	<input type="file" name="Filedata" id="file_upload" />
+        </form>
+    </div>
+    <div class="modal-footer">
+    	<button class="btn" data-dismiss="modal" aria-hidden="true">取消上传</button>
+    	<button class="btn btn-primary">上传完成</button>
+    </div>
+</div>
+<script>
+//var param = {};
+//var upload_count = 0;
+var uploader;
+var param;
+$(function() {
+    $('#file_upload').uploadify({
+        'swf'      : '/js/lib/uploadify/uploadify.swf',
+        'uploader' : '/admin/down/uploadapplicationform',
+		'multi'	   : false,
+		'auto'	   : true,
+		'fileTypeExts' : '*.pdf; *.jpg',
+		'onUploadSuccess' : function(file, data, response) {
+            upload.onsuccess(file, data, response);
+        },
+		'onUploadStart' : function(file) {
+            $('#file_upload').uploadify('settings','formData',param);
+        } 
+    });
+});
+
+var upload = {
+	onsuccess : function(file, data, response){
+		_data = $.parseJSON(data);
+		if(!$.isEmptyObject(_data.error))
+		{
+			alert(_data.error);
+		}else{
+			$('#upload-form').modal('hide');
+			window.location = window.location;
+		}
+	},
+	showUploadForm : function(id){
+		$('#upload-form').modal('show');
+		param = {
+			"PHPSESSID" : "<?php echo session_id(); ?>",
+			'orderid' : id
+		};
+	}
+};
+
+function action(name,id){
+	var url;
+	if(name == "start")
+	{url = '/admin/down/offlineapp/start/'+id;}
+	if(name == "finish")
+	{url = '/admin/down/offlineapp/finish/'+id;}
+	if(name == "deleted")
+	{url = '/admin/down/offlineapp/cancel/'+id;}
+	if(name == "deny")
+	{url = '/admin/down/offlineapp/deny/'+id;}
+	if(name == "reset")
+	{url = '/admin/down/offlineapp/reset/'+id;}
+	$.ajax({
+	  'type':"POST",
+	  'url':url,
+	  'data':'',
+	  'success':OnDataLoad,
+	  'timeout': 30000,
+	  'error': AjaxError
+  });
+}
+function OnDataLoad(data){
+	if (typeof(data)=='object')
+	{
+	  if(typeof(data.error)!='undefined')
+	  {Alert(data.error);return false;}
+	  if(typeof(data.msg)!='undefined')
+	  {Alert(data.msg);}
+	  if(typeof(data.started)!='undefined')
+	  {$('#start_'+data.started).remove();}
+	  if(typeof(data.finish) != 'undefined')
+	  {$('#list_'+data.finish).fadeOut();}
+	}
+	else{ 
+	  Alert('出现错误，请稍后再试');
+	}
+}
+function AjaxError(){
+	$.colorbox({'innerWidth':'50%','html':'<img src="/images/alert_big_error.png" /><h4>处理中出现错误，请刷新页面后重试</h4>'});
+}
+$(".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>
diff --git a/application/admin/views/scripts/down/online.phtml b/application/admin/views/scripts/down/online.phtml
index 2bf31ae0..0d0ac5b6 100644
--- a/application/admin/views/scripts/down/online.phtml
+++ b/application/admin/views/scripts/down/online.phtml
@@ -2,69 +2,71 @@
 	$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 id="leftPanel">
-<?= $this->partial('down/left.phtml'); ?>
-</div>
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-
-
-<div id="rightPanel">
-
-<div class="right_title"><?php if(!empty($this->title)) echo $this->title;?>共有 <?php echo $this->count;?> 条在线下载记录</div>
-
-<div class="search">
-	<form action="/admin/down/search/" 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><!-- search DIV -->
-
-<table>
-<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>
-<?php if (count($this->paginator)): ?>
-<?php $autoindex=0;?>
-<?php foreach ($this->paginator as $item): ?>
-<?php $autoindex++;?>
-<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"><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>
-<a href='/admin/down/online/delete/<?= $item['id'];?>/' onclick="return confirm('确定将此记录删除?')">删除</a>
-</td>
-</tr>
-<?php endforeach; ?>
-<?php endif; ?>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
+<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">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+        
+        <div class="search">
+            <form action="/admin/down/search/" method="get">
+            	<div class="input-append">
+                	<input type="hidden" name="search" value='1' />
+                	<input type="text" name="keyword" value="<?php echo $this->keyword; ?>" />
+                	<button class="btn" type="submit">搜索</button>
+                </div>
+            </form>
+        </div><!-- search DIV -->
+        
+        <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>
+        <?php if (count($this->paginator)): ?>
+        <?php $autoindex=0;?>
+        <?php foreach ($this->paginator as $item): ?>
+        <?php $autoindex++;?>
+        <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"><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>
+        <a href='/admin/down/online/delete/<?= $item['id'];?>/' onclick="return confirm('确定将此记录删除?')">删除</a>
+        </td>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        </table>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/down/user.phtml b/application/admin/views/scripts/down/user.phtml
index 746875c5..48f4fc90 100755
--- a/application/admin/views/scripts/down/user.phtml
+++ b/application/admin/views/scripts/down/user.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>');
@@ -10,53 +9,59 @@
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('/js/prototype.js');
 ?>
-<div id="leftPanel">
-<?= $this->partial('down/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-
-<div class="right_title"><?php if(!empty($this->title)) echo $this->title;?>共 <?php echo $this->count;?> 数据下载记录</div>
-
-<div class="search">
-	<form action="/admin/down/user/" 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><!-- search DIV -->
-
-<table><thead>
-<tr>
-<td width='150'>姓名</td>
-<td width='350'>单位</td>
-<td width='150'>下载次数</td>
-<td width='150'>操作</td>
-</tr></thead>
-<?php if (count($this->paginator)): ?>
-<?php $autoindex=0;?>
-<?php foreach ($this->paginator as $item): ?>
-<?php $autoindex++;?>
-<tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-<td><a href="/admin/user/show/id/<?php echo $item['uid'];?>"><img src="/images/user.gif" /></a> <a href="/admin/down/user/show/<?php echo $item['uid'];?>"><?= $item['realname']?></a> </td>
-<td><?php echo $item['unit']; ?></td>
-<td><?php echo $item['num']; ?></td>
-<td>
-<a href='/admin/down/user/show/<?php echo $item['uid'];?>'>详细</a>
-</td>
-</tr>
-<?php endforeach; ?>
-<?php endif; ?>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
+<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 class="alert">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+        
+        <div class="row-fluid">
+        	<div class="span12">
+            <form action="/admin/down/user/" method="get"  class="form-search">
+            	<div class="input-append">
+            	<input type="hidden" name="search" value='1'  />
+                <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="table table-hover"><thead>
+        <tr>
+        <td width='150'>姓名</td>
+        <td width='350'>单位</td>
+        <td width='150'>下载次数</td>
+        <td width='150'>操作</td>
+        </tr></thead>
+        <?php if (count($this->paginator)): ?>
+        <?php $autoindex=0;?>
+        <?php foreach ($this->paginator as $item): ?>
+        <?php $autoindex++;?>
+        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+        <td><a href="/admin/user/show/id/<?php echo $item['uid'];?>"><img src="/images/user.gif" /></a> <a href="/admin/down/user/show/<?php echo $item['uid'];?>"><?= $item['realname']?></a> </td>
+        <td><?php echo $item['unit']; ?></td>
+        <td><?php echo $item['num']; ?></td>
+        <td>
+        <a href='/admin/down/user/show/<?php echo $item['uid'];?>'>详细</a>
+        </td>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        </table>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/index/index.phtml b/application/admin/views/scripts/index/index.phtml
index 079ab866..6ab30e67 100755
--- a/application/admin/views/scripts/index/index.phtml
+++ b/application/admin/views/scripts/index/index.phtml
@@ -1,28 +1,39 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->headLink()->appendStylesheet('/static/css/jquery.jgrowl.css');
-	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
-	$this->headScript()->appendFile('/static/js/jquery.jgrowl_minimized.js');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('后台管理首页');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div id="OneColumn">
-<?= $this->partial('data/left.phtml'); ?>
-<?= $this->partial('down/left.phtml'); ?>
-<?= $this->partial('user/left.phtml'); ?>
-<?= $this->partial('review/left.phtml'); ?>
-<?= $this->partial('news/left.phtml'); ?>
-<?= $this->partial('stat/left.phtml'); ?>
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->headLink()->appendStylesheet('/static/css/jquery.jgrowl.css');
+	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+	$this->headScript()->appendFile('/static/js/jquery.jgrowl_minimized.js');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('后台管理首页');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+	<div class="span2">
+		<?= $this->partial('data/left.phtml'); ?>
+    </div>
+    <div class="span2">
+		<?= $this->partial('down/left.phtml'); ?>
+    </div>
+    <div class="span2">
+		<?= $this->partial('user/left.phtml'); ?>
+    </div>
+    <div class="span2">
+    	<?= $this->partial('review/left.phtml'); ?>
+    </div>
+    <div class="span2">
+    	<?= $this->partial('news/left.phtml'); ?>
+    </div>
+    <div class="span2">
+    	<?= $this->partial('stat/left.phtml'); ?>
+    </div>
 </div>
-<!--
-<script>
-$.getJSON("/admin/sys/getmsg", function(data) {
-	var msg = data.count;
-	if(msg>0){$.jGrowl('<a href="/admin/sys/message/" style="color:#FFF;text-decoration:underline;font-weight:bold;">有'+data.count+'条新消息</a>', { sticky: true });}
-})
+<!--
+<script>
+$.getJSON("/admin/sys/getmsg", function(data) {
+	var msg = data.count;
+	if(msg>0){$.jGrowl('<a href="/admin/sys/message/" style="color:#FFF;text-decoration:underline;font-weight:bold;">有'+data.count+'条新消息</a>', { sticky: true });}
+})
 </script>
 -->
\ No newline at end of file
diff --git a/application/admin/views/scripts/news/index.phtml b/application/admin/views/scripts/news/index.phtml
index 147fcf0f..8d9c8a49 100644
--- a/application/admin/views/scripts/news/index.phtml
+++ b/application/admin/views/scripts/news/index.phtml
@@ -1,49 +1,41 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin">后台首页</a>');
-	$this->breadcrumb('<a href="/admin/news">新闻中心</a>');
-?>
-<style>
-.listingDetails{position:absolute;width:650px; z-index:999;}
-.pad{position:absolute;background:#FFF;border:2px solid #444;border-radius:5px;padding:5px;display:none;}
-</style>
-<div id="leftPanel">
-<?= $this->partial('news/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-    
-    <h3>统计</h3>
-    <hr/>
-    <ul>
-    <li>共 <?php echo $this->totle['c'];?> 条档案</li>
-	<li>栏目 <?php echo $this->typec['c'];?> 个</li>
-    </ul>
-	</div>
-<script type="text/javascript">
-$(document).ready(function(){
-	$('.title').bind('click', function() {
-		$('.pad').css('display','none');
-		$(this).next('.listingDetails').children('.pad').show();
-	});
-	$('.closepad').bind('click', function() {
-		$('.pad').css('display','none');
-	});
-});
-function showpad(id){
-	$('#titlebtn'+id).click();
-}
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb('<a href="/admin/news">新闻中心</a>');
+?>
+<style>
+.listingDetails{position:absolute;width:650px; z-index:999;}
+.pad{position:absolute;background:#FFF;border:2px solid #444;border-radius:5px;padding:5px;display:none;}
+</style>
+<div class="row-fluid">
+    <div class="span2">
+    <?= $this->partial('news/left.phtml'); ?>
+    </div>
+    <div class="span10">
+        
+        <h3>统计</h3>
+        <hr/>
+        <ul class="unstyled">
+        <li>共 <?php echo $this->totle['c'];?> 条档案</li>
+        <li>栏目 <?php echo $this->typec['c'];?> 个</li>
+        </ul>
+    </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){
+	$('.title').bind('click', function() {
+		$('.pad').css('display','none');
+		$(this).next('.listingDetails').children('.pad').show();
+	});
+	$('.closepad').bind('click', function() {
+		$('.pad').css('display','none');
+	});
+});
+function showpad(id){
+	$('#titlebtn'+id).click();
+}
 </script>
\ No newline at end of file
diff --git a/application/admin/views/scripts/news/left.phtml b/application/admin/views/scripts/news/left.phtml
index e6664d9d..ccac1fcb 100644
--- a/application/admin/views/scripts/news/left.phtml
+++ b/application/admin/views/scripts/news/left.phtml
@@ -1,6 +1,9 @@
-<ul class="nav nav-pills nav-stacked well">
-<span class="label"><h4>新闻中心</h4></span>
-<li><a href="/admin/news">新闻中心首页</a></li>
-<li><a href="/admin/news/newslist">新闻管理</a></li>
-<li><a href="/admin/news/newsadd">新闻发布</a></li>
-</ul>
\ No newline at end of file
+<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/news">新闻中心首页</a></li>
+        <li><a href="/admin/news/newslist">新闻管理</a></li>
+        <li><a href="/admin/news/newsadd">新闻发布</a></li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/news/newslist.phtml b/application/admin/views/scripts/news/newslist.phtml
index 8a6ae07c..aed1d91c 100644
--- a/application/admin/views/scripts/news/newslist.phtml
+++ b/application/admin/views/scripts/news/newslist.phtml
@@ -1,132 +1,140 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
-	$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/news">新闻中心</a>');
-	$this->breadcrumb('新闻列表');
-?>
-<style>
-.listingDetails{position:absolute;width:650px;}
-.pad{position:absolute;background:#FFF;border:2px solid #444;border-radius:5px;padding:5px;display:none;z-index:9999;}
-</style>
-<script>
-$('#divFooter').css('position','absolute');
-</script>
-<div id="leftPanel">
-<?= $this->partial('news/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-<div>
-<select id="navigation">
-	<option>按栏目查看</option>
-    <?php
-		if(count($this->types))
-		{
-			foreach($this->types as $v)
-			{
-				if(!empty($v[$this->deepField])) {$haed = str_repeat('-',$v[$this->deepField]);}
-				if($this->type == $v['id'])
-				echo '<option value="/admin/news/newslist/type/'.$v['id'].'" selected="selected">'
-				.$haed
-				.$v['title'].'</option>';
-				else
-				echo '<option value="/admin/news/newslist/type/'.$v['id'].'">'.$haed.$v['title'].'</option>';
-			}
-		}
-	?>
-</select>
-&nbsp;
-<a href="/admin/news/newslist">所有新闻列表</a>
-</div>
-<table id="report" class="stylized full">
-    <thead>
-        <tr>
-            <th width="50%">新闻标题</th>
-            <th width="15%">栏目</th>
-            <th width="15%">状态</th>
-            <th width="20%">新闻管理</th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php
-    if(count($this->paginator))
-    {  
-		$list = "";
-        foreach ($this->paginator as $v)
-        {
-       	$list .= '
-        <tr>
-                <td>
-                '.$v['title'].'
-                </td>
-				<td>
-                <a href="'.$v['type_url'].'"><b>'.$v['type_title'].'</b></a>
-                </td>
-				<td>';
-				if($v['ts_published']<time() and $v['is_pub']>0)
-				{
-					$list.="已发布";
-				}
-				if($v['ts_published']>time() and $v['is_pub']>0)
-				{
-					$list.= date('Y-m-d H:i',$v['ts_published']) . '发布';
-				}
-				if($v['is_pub']==0)
-				{
-					$list.="草稿";
-				}
-				if($v['is_pub']<0)
-				{
-					$list.="未发布";
-				}
-				$list .= '</td>
-                <td>
-				<a href="'.$v['url'].'">浏览</a>
-                <a href="/admin/news/newsedit/id/'.$v['id'].'"><b>编辑</b></a>
-                <a href="/admin/news/delete/id/'.$v['id'].'" onclick="return confirm(\'是否确定删除该文章\')">删除</a></td>
-            </tr>
-        ';
-        }
-		echo $list;
-    }
-    else
-    {
-        echo '
-        <tr><td>暂无数据</td><td></td></tr>
-        ';
-    }
-    ?>
-        
-    </tbody>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){
-	$('.title').bind('click', function() {
-		$.colorbox({'innerWidth':'50%','html':$(this).next('.listingDetails').children('.pad').html()});
-	});
-$("#navigation").change(function()
-{
-    window.location.href = $(this).val();
-});
-});
-function showpad(id){
-	$('#titlebtn'+id).click();
-}
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$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/news">新闻中心</a>');
+	$this->breadcrumb('新闻列表');
+?>
+<style>
+.listingDetails{position:absolute;width:650px;}
+.pad{position:absolute;background:#FFF;border:2px solid #444;border-radius:5px;padding:5px;display:none;z-index:9999;}
+</style>
+<script>
+$('#divFooter').css('position','absolute');
+</script>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('news/left.phtml'); ?>
+    </div>
+    
+	<div class="span10">
+    
+    <h3>新闻管理</h3>
+    <hr />
+    
+	<?php if ($this->msg or $this->messages) :?>
+    <div id="message">
+    <?php if ($this->msg) : ?>
+        <p><?php echo $this->msg; ?></p>
+    <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+        <p><?php echo $msg; ?></p>
+    <?php endforeach;endif; ?>
+    </div>
+    <?php endif; ?>
+    
+	<div>
+    
+    <select id="navigation">
+        <option>按栏目查看</option>
+        <?php
+            if(count($this->types))
+            {
+                foreach($this->types as $v)
+                {
+                    if(!empty($v[$this->deepField])) {$haed = str_repeat('-',$v[$this->deepField]);}
+                    if($this->type == $v['id'])
+                    echo '<option value="/admin/news/newslist/type/'.$v['id'].'" selected="selected">'
+                    .$haed
+                    .$v['title'].'</option>';
+                    else
+                    echo '<option value="/admin/news/newslist/type/'.$v['id'].'">'.$haed.$v['title'].'</option>';
+                }
+            }
+        ?>
+    </select>
+    &nbsp;
+    <a href="/admin/news/newslist">所有新闻列表</a>
+    </div>
+	<table id="report" class="table table-bordered table-striped table-hover">
+    <thead>
+        <tr>
+            <th width="50%">新闻标题</th>
+            <th width="15%">栏目</th>
+            <th width="15%">状态</th>
+            <th width="20%">新闻管理</th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php
+    if(count($this->paginator))
+    {  
+		$list = "";
+        foreach ($this->paginator as $v)
+        {
+       	$list .= '
+        <tr>
+                <td>
+                '.$v['title'].'
+                </td>
+				<td>
+                <a href="'.$v['type_url'].'"><b>'.$v['type_title'].'</b></a>
+                </td>
+				<td>';
+				if($v['ts_published']<time() and $v['is_pub']>0)
+				{
+					$list.="已发布";
+				}
+				if($v['ts_published']>time() and $v['is_pub']>0)
+				{
+					$list.= date('Y-m-d H:i',$v['ts_published']) . '发布';
+				}
+				if($v['is_pub']==0)
+				{
+					$list.="草稿";
+				}
+				if($v['is_pub']<0)
+				{
+					$list.="未发布";
+				}
+				$list .= '</td>
+                <td>
+				<a href="'.$v['url'].'">浏览</a>
+                <a href="/admin/news/newsedit/id/'.$v['id'].'"><b>编辑</b></a>
+                <a href="/admin/news/delete/id/'.$v['id'].'" onclick="return confirm(\'是否确定删除该文章\')">删除</a></td>
+            </tr>
+        ';
+        }
+		echo $list;
+    }
+    else
+    {
+        echo '
+        <tr><td>暂无数据</td><td></td></tr>
+        ';
+    }
+    ?>
+        
+    </tbody>
+</table>
+<div class="pagenavi"><?= $this->paginator; ?></div>
+</div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){
+	$('.title').bind('click', function() {
+		$.colorbox({'innerWidth':'50%','html':$(this).next('.listingDetails').children('.pad').html()});
+	});
+$("#navigation").change(function()
+{
+    window.location.href = $(this).val();
+});
+});
+function showpad(id){
+	$('#titlebtn'+id).click();
+}
 </script>
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/index.phtml b/application/admin/views/scripts/review/index.phtml
index e960af89..d0bf5e93 100644
--- a/application/admin/views/scripts/review/index.phtml
+++ b/application/admin/views/scripts/review/index.phtml
@@ -1,62 +1,65 @@
-<?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('元数据评审');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div id="leftPanel">
-<?= $this->partial('review/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-
-	最近十条元数据
-	<table><thead>
-    <tr>
-    <td width='500'>元数据标题</td>
-    <td width='150'>管理员</td>
-    <td width='150'>状态</td>
-    </tr></thead>
-    <?php if (count($this->queue)): ?>
-    <?php $autoindex=0;?>
-    <?php foreach ($this->queue as $item): ?>
-    <?php $autoindex++;?>
-    <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-    <td><?= $item['title']?></td>
-    <td><?php echo $item['realname'].'['.$item['username'].']';?></td>
-    <td><?php echo $item['status'];?></td>
-    </tr>
-    <?php endforeach; ?>
-    <?php endif; ?>
-    </table>
-    <br />
-    我管理的最近十条元数据
-	<table><thead>
-    <tr>
-    <td width='500'>元数据标题</td>
-    <td width='150'>状态</td>
-    </tr></thead>
-    <?php if (count($this->queue)): ?>
-    <?php $autoindex=0;?>
-    <?php foreach ($this->queue as $item): ?>
-    <?php $autoindex++;?>
-    <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-    <td><?= $item['title']?></td>
-    <td><?php echo $item['status'];?></td>
-    </tr>
-    <?php endforeach; ?>
-    <?php endif; ?>
-    </table>
+<?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('元数据评审');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('review/left.phtml'); ?>
+    </div>
+    <div class="span10">
+		<?php if ($this->msg or $this->messages) :?>
+        <div id="message">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+    
+        <h3>最近十条元数据</h3>
+        <hr />
+        <table class="table table-bordered"><thead>
+        <tr>
+        <td width='500'>元数据标题</td>
+        <td width='150'>管理员</td>
+        <td width='150'>状态</td>
+        </tr></thead>
+        <?php if (count($this->queue)): ?>
+        <?php $autoindex=0;?>
+        <?php foreach ($this->queue as $item): ?>
+        <?php $autoindex++;?>
+        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+        <td><?= $item['title']?></td>
+        <td><?php echo $item['realname'].'['.$item['username'].']';?></td>
+        <td><?php echo $item['status'];?></td>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        </table>
+        <br />
+        <h3>我管理的最近十条元数据</h3>
+        <hr />
+        <table class="table table-bordered"><thead>
+        <tr>
+        <td width='500'>元数据标题</td>
+        <td width='150'>状态</td>
+        </tr></thead>
+        <?php if (count($this->queue)): ?>
+        <?php $autoindex=0;?>
+        <?php foreach ($this->queue as $item): ?>
+        <?php $autoindex++;?>
+        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+        <td><?= $item['title']?></td>
+        <td><?php echo $item['status'];?></td>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        </table>
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/left.phtml b/application/admin/views/scripts/review/left.phtml
index f88b3ff1..3ca4c06f 100644
--- a/application/admin/views/scripts/review/left.phtml
+++ b/application/admin/views/scripts/review/left.phtml
@@ -1,12 +1,15 @@
-<ul class="nav nav-pills nav-stacked well">
-    <span class="label"><h4>元数据评审</h4></span>
-    <li id="Nav-review-draft"><a href="/admin/review/draft">投稿元数据</a></li>
-    <li id="Nav-review-editor"><a href="/admin/review/editor">分配责任编辑</a></li>
-    <li id="Nav-review-accept"><a href="/admin/review/accept">待审元数据</a></li>
-    <!-- <li id="Nav-review-inreview"><a href="/admin/review/inreview">在审元数据</a></li> -->
-    <li id="Nav-review-myreview"><a href="/admin/review/myreview">我负责的元数据</a></li>
-    <li id="Nav-review-reviewed"><a href="/admin/review/reviewed">通过评审的元数据</a></li>
-    <li id="Nav-review-experts"><a href="/admin/review/experts">专家库</a></li>
-    <li id="Nav-review-canceled"><a href="/admin/review/canceled">已取消评审的元数据</a></li>
-    <li id="Nav-review-comments"><a href="/admin/review/comments">元数据评审管理</a></li>
-</ul>
\ No newline at end of file
+<div class="well" style="padding:8px 0">
+    <ul class="nav nav-list">
+    <li class="nav-header"><h4>元数据评审</h4></li>
+    <li class="divider"></li>
+    <li id="Nav-review-draft"><a href="/admin/review/draft">投稿元数据</a></li>
+    <li id="Nav-review-editor"><a href="/admin/review/editor">分配责任编辑</a></li>
+    <li id="Nav-review-accept"><a href="/admin/review/accept">待审元数据</a></li>
+    <!-- <li id="Nav-review-inreview"><a href="/admin/review/inreview">在审元数据</a></li> -->
+    <li id="Nav-review-myreview"><a href="/admin/review/myreview">我负责的元数据</a></li>
+    <li id="Nav-review-reviewed"><a href="/admin/review/reviewed">通过评审的元数据</a></li>
+    <li id="Nav-review-experts"><a href="/admin/review/experts">专家库</a></li>
+    <li id="Nav-review-canceled"><a href="/admin/review/canceled">已取消评审的元数据</a></li>
+    <li id="Nav-review-comments"><a href="/admin/review/comments">元数据评审管理</a></li>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/stat/index.phtml b/application/admin/views/scripts/stat/index.phtml
index 5d57a7b3..775d1f03 100644
--- a/application/admin/views/scripts/stat/index.phtml
+++ b/application/admin/views/scripts/stat/index.phtml
@@ -1,76 +1,81 @@
-<?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()->setSeparator(' > ');
-	$this->headScript()->appendFile('/js/jquery-1.6.4.min.js');
-	$this->headScript()->appendFile('/js/jquery.masonry.min.js');
-?>
-<div id="leftPanel">
-<?= $this->partial('stat/left.phtml'); ?>
-</div>
-<div id="rightPanel">
-    <div class="tables">
-    <div class="stitle">概况</div>
-    <table>
-    <tr>
-    	<td>用户总数：</td>
-        <td><?php echo $this->stat['alluser']; ?>人</td>
-    </tr>
-    <tr>
-    	<td>元数据条数：</td>
-        <td><?php echo $this->stat['alldata']; ?>条</td>
-    </tr>
-    <tr>
-    	<td>在线数据下载数：</td>
-        <td><?php echo $this->stat['onlinedown']; ?>条</td>
-    </tr>
-    <tr>
-    	<td>离线数据下载数：</td>
-        <td><?php echo $this->stat['offlinedown']; ?>条</td>
-    </tr>
-    <tr>
-    	<td>已通过的离线申请：</td>
-        <td><?php echo $this->stat['offlinepass']; ?>次</td>
-    </tr>
-    <tr>
-    	<td>未完成的离线申请：</td>
-        <td><?php echo $this->stat['offlineunfinished']; ?>次</td>
-    </tr>    
-    <tr>
-    	<td>被拒绝的离线数据：</td>
-        <td><?php echo $this->stat['offlinedenied']; ?>条</td>
-    </tr>
-    <tr>
-    	<td>有记录的在线下载数：</td>
-        <td><?php echo $this->stat['onlineapp']; ?>次</td>
-    </tr> 	
-    </table>
+<?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()->setSeparator(' > ');
+	$this->headScript()->appendFile('/js/jquery-1.6.4.min.js');
+	$this->headScript()->appendFile('/js/jquery.masonry.min.js');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('stat/left.phtml'); ?>
     </div>
-
-    <div class="tables">
-    <div class="stitle">数据下载量概况</div>
-    <table>
-    <thead>
-    	<tr><td width="200"></td><td width="100">单位:GB</td></tr>
-    </thead>
-    <tr>
-    	<td>总下载数据量</td>
-        <td><?php echo round($this->allsize['num'],2);?></td>
-    </tr>
-    <tr>
-    	<td>离线下载数据量</td>
-        <td><?php echo round($this->offlinesize['num'],2);?></td>
-    </tr>
-    <tr>
-    	<td>在线下载数据量</td>
-        <td><?php echo round($this->onlinesize['num'],2);?></td>
-    </tr>
-	
-    </table>
+    <div class="span10">
+        <div class="row-fluid">
+        	<div class="span6">
+            <h3>概况</h3>
+            <hr />
+            
+            <table class="table table-bordered">
+            <tr>
+                <td>用户总数：</td>
+                <td><?php echo $this->stat['alluser']; ?>人</td>
+            </tr>
+            <tr>
+                <td>元数据条数：</td>
+                <td><?php echo $this->stat['alldata']; ?>条</td>
+            </tr>
+            <tr>
+                <td>在线数据下载数：</td>
+                <td><?php echo $this->stat['onlinedown']; ?>条</td>
+            </tr>
+            <tr>
+                <td>离线数据下载数：</td>
+                <td><?php echo $this->stat['offlinedown']; ?>条</td>
+            </tr>
+            <tr>
+                <td>已通过的离线申请：</td>
+                <td><?php echo $this->stat['offlinepass']; ?>次</td>
+            </tr>
+            <tr>
+                <td>未完成的离线申请：</td>
+                <td><?php echo $this->stat['offlineunfinished']; ?>次</td>
+            </tr>    
+            <tr>
+                <td>被拒绝的离线数据：</td>
+                <td><?php echo $this->stat['offlinedenied']; ?>条</td>
+            </tr>
+            <tr>
+                <td>有记录的在线下载数：</td>
+                <td><?php echo $this->stat['onlineapp']; ?>次</td>
+            </tr> 	
+            </table>
+            </div>
+    		
+            <div class="span6">
+            <h3>数据下载量概况</h3>
+            <hr />
+            <table class="table table-bordered">
+            <thead>
+                <tr><td width="200"></td><td width="100">单位:GB</td></tr>
+            </thead>
+            <tr>
+                <td>总下载数据量</td>
+                <td><?php echo round($this->allsize['num'],2);?></td>
+            </tr>
+            <tr>
+                <td>离线下载数据量</td>
+                <td><?php echo round($this->offlinesize['num'],2);?></td>
+            </tr>
+            <tr>
+                <td>在线下载数据量</td>
+                <td><?php echo round($this->onlinesize['num'],2);?></td>
+            </tr>
+            
+            </table>
+        	</div>
+        
     </div>
-    
-</div>
+</div>
diff --git a/application/admin/views/scripts/stat/left.phtml b/application/admin/views/scripts/stat/left.phtml
index 3deab535..a99db3c1 100644
--- a/application/admin/views/scripts/stat/left.phtml
+++ b/application/admin/views/scripts/stat/left.phtml
@@ -1,7 +1,10 @@
-<ul class="nav nav-pills nav-stacked well">
-<span class="label"><h4>信息统计</h4></span>
-<li><a href="/admin/stat/">统计概况</a></li>
-<li><a href="/admin/stat/unit">分单位统计</a></li>
-<li><a href="/admin/stat/month">分月统计</a></li>
-<li><a href="/admin/stat/user">按用户统计</a></li>
-</ul>
\ No newline at end of file
+<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/stat/">统计概况</a></li>
+    <li><a href="/admin/stat/unit">分单位统计</a></li>
+    <li><a href="/admin/stat/month">分月统计</a></li>
+    <li><a href="/admin/stat/user">按用户统计</a></li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/user/adminlist.phtml b/application/admin/views/scripts/user/adminlist.phtml
index e2ca9439..7f0a58fc 100755
--- a/application/admin/views/scripts/user/adminlist.phtml
+++ b/application/admin/views/scripts/user/adminlist.phtml
@@ -1,46 +1,48 @@
-<?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/user">用户管理</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div id="leftPanel">
-<?= $this->partial('user/left.phtml'); ?>
-</div>
-
-<div id="rightPanel">
-<div class="title">管理员列表</div>
-<table>
-<thead>
-<tr>
-<td width='150'>用户名</td>
-<td width='250'>电子邮箱</td>
-<td width='100'>用户类型</td>
-<td width='150'>真实姓名</td>
-<td width='150'>电话</td>
-<td width='150'>操作</td>
-</tr>
-</thead>
-<?php if (count($this->paginator)): ?>
-<?php $autoindex=0;?>
-<?php foreach ($this->paginator as $item): ?>
-<?php $autoindex++;?>
-<tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-<td><?= $item['username']?></td>
-<td><?= $item['email']; ?></td>
-<td><?= $item['usertype']; ?></td>
-<td><?= $item['realname']; ?></td>
-<td><?= $item['phone']; ?></td>
-<td>
-<a href='/admin/user/show/id/<?= $item['id'];?>'>查看详细</a>
-</td>
-</tr>
-<?php endforeach; ?>
-<?php endif; ?>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
+<?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/user">用户管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('user/left.phtml'); ?>
+    </div>
+
+	<div class="span10">
+        <h3>管理员列表</h3>
+        <hr />
+        <table class="table table-bordered table-hover">
+        <thead>
+        <tr>
+        <td width='150'>用户名</td>
+        <td width='250'>电子邮箱</td>
+        <td width='100'>用户类型</td>
+        <td width='150'>真实姓名</td>
+        <td width='150'>电话</td>
+        <td width='150'>操作</td>
+        </tr>
+        </thead>
+        <?php if (count($this->paginator)): ?>
+        <?php $autoindex=0;?>
+        <?php foreach ($this->paginator as $item): ?>
+        <?php $autoindex++;?>
+        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+        <td><?= $item['username']?></td>
+        <td><?= $item['email']; ?></td>
+        <td><?= $item['usertype']; ?></td>
+        <td><?= $item['realname']; ?></td>
+        <td><?= $item['phone']; ?></td>
+        <td>
+        <a href='/admin/user/show/id/<?= $item['id'];?>'>查看详细</a>
+        </td>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        </table>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/user/index.phtml b/application/admin/views/scripts/user/index.phtml
index bd8d7911..22de2dcc 100755
--- a/application/admin/views/scripts/user/index.phtml
+++ b/application/admin/views/scripts/user/index.phtml
@@ -1,43 +1,43 @@
-<?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle('后台管理');
-	$this->headTitle()->setSeparator(' - ');
-	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('后台管理首页');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row-fluid">
-    <div class="span3">
-    	<?= $this->partial('user/left.phtml'); ?>
-    </div>
-    
-    <div class="span9">
-        <h3>用户总数： <?php echo $this->su['total'];?>，其中管理员： <?php echo $this->suadmin['total'];?></h3>
-        <hr />
-        
-        <form action="/admin/user/search/" method="get">
-            <div class="control-group">
-                <label class="control-label" for="inputName">姓名/用户名</label>
-                <div class="controls">
-                    <input type="text" id="inputName" placeholder="Name or Username" name="realname" class="input-xxlarge">
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputUnit">单位</label>
-                <div class="controls">
-                    <input type="text" id="inputUnit" placeholder="Unit" name="unit" class="input-xxlarge">
-                </div>
-            </div>
-            <div class="control-group">
-                <label class="control-label" for="inputProject">项目</label>
-                <div class="controls">
-                    <input type="text" id="inputProject" placeholder="Project" name="project" class="input-xxlarge">
-                </div>
-            </div>
-            <div class="control-group">
-            	<input type="hidden" name="search" value="1" />
-                <button type="submit" class="btn">搜索</button>
-            </div>
-        </form>
-    </div>
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('后台管理首页');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+    	<?= $this->partial('user/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+        <h3>用户总数： <?php echo $this->su['total'];?>，其中管理员： <?php echo $this->suadmin['total'];?></h3>
+        <hr />
+        
+        <form action="/admin/user/search/" method="get">
+            <div class="control-group">
+                <label class="control-label" for="inputName">姓名/用户名</label>
+                <div class="controls">
+                    <input type="text" id="inputName" placeholder="Name or Username" name="realname" class="input-xxlarge">
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="inputUnit">单位</label>
+                <div class="controls">
+                    <input type="text" id="inputUnit" placeholder="Unit" name="unit" class="input-xxlarge">
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="inputProject">项目</label>
+                <div class="controls">
+                    <input type="text" id="inputProject" placeholder="Project" name="project" class="input-xxlarge">
+                </div>
+            </div>
+            <div class="control-group">
+            	<input type="hidden" name="search" value="1" />
+                <button type="submit" class="btn">搜索</button>
+            </div>
+        </form>
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/user/left.phtml b/application/admin/views/scripts/user/left.phtml
index 10c088a7..359d795f 100755
--- a/application/admin/views/scripts/user/left.phtml
+++ b/application/admin/views/scripts/user/left.phtml
@@ -1,6 +1,9 @@
-<ul class="nav nav-pills nav-stacked well">
-	<span class="label"><h4>用户管理</h4></span>
-	<li><a href="/admin/user/">用户管理首页</a></li>
-	<li><a href="/admin/user/adminlist">管理员列表</a></li>
-    <li><a href="/admin/user/list">查看所有账户</a></li>
-</ul>
\ No newline at end of file
+<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/user/">用户管理首页</a></li>
+	<li><a href="/admin/user/adminlist">管理员列表</a></li>
+    <li><a href="/admin/user/list">查看所有账户</a></li>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/application/admin/views/scripts/user/list.phtml b/application/admin/views/scripts/user/list.phtml
index d53be7ed..9bbe056f 100755
--- a/application/admin/views/scripts/user/list.phtml
+++ b/application/admin/views/scripts/user/list.phtml
@@ -1,72 +1,72 @@
-<?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/user">用户管理</a>');
-	$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row-fluid">
-    <div class="span3">
-   	 <?= $this->partial('user/left.phtml'); ?>
-    </div>
-    
-    <div class="span9">
-    	<h3>用户列表</h3>
-        <hr />
-    	<?php if ($this->msg or $this->messages) :?>
-        <div class="alert alert-success">
-            <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <?php if ($this->msg) : ?>
-            <?php echo $this->msg; ?>
-        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-            <?php echo $msg; ?>
-        <?php endforeach;endif; ?>
-        </div>
-        <?php endif; ?>
-        
-    	<div class="search form-inline">
-            <form action="/admin/user/search/" method="get">
-            <input type="hidden" name="search" value='1' />
-                
-                <label>姓名</label><input type="text" name="realname" value="<?php echo $this->realname; ?>" />
-                <label>单位</label><input type="text" name="unit" value="<?php echo $this->unit; ?>" />
-                <label>项目</label><input type="text" name="project" value="<?php echo $this->project; ?>" />
-                <button type="submit" value="搜索" class="btn btn-success">搜索</button>
-                
-            </form>
-        </div><!-- search DIV -->
-        
-        <hr />
-        <table class="table table-hover">
-        <thead>
-            <tr>
-                <td width='150'>用户名</td>
-                <td width='250'>电子邮箱</td>
-                <td width='100'>用户组</td>
-                <td width='200'>单位</td>
-                <td width='100'>真实姓名</td>
-                <td width='150'>操作</td>
-            </tr>
-        </thead><!-- table's head -->
-        <?php if (count($this->paginator)): ?>
-        <?php $autoindex=0;?>
-        <?php foreach ($this->paginator as $item): ?>
-        <?php $autoindex++;?>
-        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-        <td><?= $item['username']?></td>
-        <td><?= $item['email']; ?></td>
-        <td><?= $item['usertype']; ?></td>
-        <td><?= $item['unit']; ?></td>
-        <td><?= $item['realname']; ?></td>
-        <td>
-        <a href='/admin/user/show/id/<?= $item['id'];?>'>查看详细</a>
-        </td>
-        </tr>
-        <?php endforeach; ?>
-        <?php endif; ?>
-        </table>
-    	<div class="pagenavi"><?= $this->paginator; ?></div>
-    </div><!-- span9 -->
+<?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/user">用户管理</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+    <div class="span2">
+   	 <?= $this->partial('user/left.phtml'); ?>
+    </div>
+    
+    <div class="span10">
+    	<h3>用户列表</h3>
+        <hr />
+    	<?php if ($this->msg or $this->messages) :?>
+        <div class="alert alert-success">
+            <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <?php if ($this->msg) : ?>
+            <?php echo $this->msg; ?>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <?php echo $msg; ?>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
+        
+    	<div class="search form-inline">
+            <form action="/admin/user/search/" method="get">
+            <input type="hidden" name="search" value='1' />
+                
+                <label>姓名</label><input type="text" name="realname" value="<?php echo $this->realname; ?>" />
+                <label>单位</label><input type="text" name="unit" value="<?php echo $this->unit; ?>" />
+                <label>项目</label><input type="text" name="project" value="<?php echo $this->project; ?>" />
+                <button type="submit" value="搜索" class="btn btn-success">搜索</button>
+                
+            </form>
+        </div><!-- search DIV -->
+        
+        <hr />
+        <table class="table table-hover">
+        <thead>
+            <tr>
+                <td width='150'>用户名</td>
+                <td width='250'>电子邮箱</td>
+                <td width='100'>用户组</td>
+                <td width='200'>单位</td>
+                <td width='100'>真实姓名</td>
+                <td width='150'>操作</td>
+            </tr>
+        </thead><!-- table's head -->
+        <?php if (count($this->paginator)): ?>
+        <?php $autoindex=0;?>
+        <?php foreach ($this->paginator as $item): ?>
+        <?php $autoindex++;?>
+        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+        <td><?= $item['username']?></td>
+        <td><?= $item['email']; ?></td>
+        <td><?= $item['usertype']; ?></td>
+        <td><?= $item['unit']; ?></td>
+        <td><?= $item['realname']; ?></td>
+        <td>
+        <a href='/admin/user/show/id/<?= $item['id'];?>'>查看详细</a>
+        </td>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
+        </table>
+    	<div class="pagenavi"><?= $this->paginator; ?></div>
+    </div><!-- span9 -->
 </div>
\ No newline at end of file