Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/admin_acc.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/admin_acc.php	(revision 422)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/admin_acc.php	(revision 423)
@@ -131,4 +131,5 @@
 		if ($admin_info)
 		{
+			/*
 			$input = $this->input->post();
 			$result = array();
@@ -144,4 +145,29 @@
 				$result['success'] = 1;
 			}
+			echo json_encode($result);*
+			*/
+			$admin_id = $this->uri->segment(4);
+			$this->load->model('admin_model');
+			$data = $this->admin_model->search_by_id($admin_id);
+			$this->load->view('admin_acc/edit_admin', $data);
+		}else
+		{
+			$this->load->view('login');
+		}
+	}
+	
+	public function update_admin()
+	{
+		$admin_info = $this->session->userdata('adminInfo');
+		if ($admin_info)
+		{
+			$input = $this->input->post();
+			$result = array();
+			$result['success'] = 0;
+			//$admin_id = $this->uri->segment(4);
+			$this->load->model('admin_model');
+			$input['updated_time']=date("Y-m-d H:i:s");
+			$this->admin_model->update($input['admin_id'], $input);
+			$result['success'] = 1;
 			echo json_encode($result);
 		}else
@@ -150,5 +176,5 @@
 		}
 	}
-		
+	
 	public function delete_admin()
 	{
@@ -179,18 +205,8 @@
 		if ($admin_info)
 		{
-			$result = array();
-			$result['success'] = 0;
-			$admin_id = (int)$this->uri->segment(4, 0);
-			if ($admin_id == 0)
-			{
-				$result['success'] = 0;	
-			}else
-			{
-				$this->load->model('admin_model');
-				$data = $this->admin_model->search_by_id($admin_id);
-				$result['item'] = $data;
-				$result['success'] = 1;
-			}
-			echo json_encode($result);
+			$admin_id = (int)$this->uri->segment(4);
+			$this->load->model('admin_model');
+			$data = $this->admin_model->search_by_id($admin_id);
+			$this->load->view('admin_acc/view_admin', $data);
 		}else
 		{
Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/home.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/home.php	(revision 422)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/home.php	(revision 423)
@@ -25,9 +25,9 @@
 	{
            
-		$username = $this->input->post('user_admin');
-		$password = $this->input->post('password');
+		$login_name = $this->input->post('login_name');
+		$passwd = $this->input->post('passwd');
 		
 		$this->load->model(array('admin_model'));
-		$data = $this->admin_model->check_login($username, $password);
+		$data = $this->admin_model->check_login($login_name, $passwd);
 		if ($data == null)
 		{
@@ -37,5 +37,5 @@
 		else
 		{
-			$admindata = array('user_admin' => $username, "logined_in" => TRUE);
+			$admindata = array('login_name' => $login_name, 'admin_id'=>$data->admin_id, "logined_in" => TRUE);
 			$this->session->set_userdata('adminInfo', $admindata);
 			redirect("/admin/home");
@@ -49,10 +49,13 @@
 	}
 	
-	public function user_profile()
+	public function admin_profile()
 	{
 		$admin_info = $this->session->userdata('adminInfo');
 		if($admin_info)
 		{
-			$this->load->view('user_profile');
+			$admin_id = $admin_info['admin_id'];
+			$this->load->model(array('admin_model'));
+			$data = $this->admin_model->search_by_id($admin_id);
+			$this->load->view('admin_acc/admin_profile', $data);
 		}else
 		{
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/admin_profile.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/admin_profile.php	(revision 423)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/admin_profile.php	(revision 423)
@@ -0,0 +1,184 @@
+<?php
+$base_url = base_url();
+$this->load->view('layout/admin/header', array('base_url' => $base_url));
+$this->load->view('layout/admin/sidebar', array('base_url' => $base_url));
+?>
+				<div class="main-content">
+					<div class="breadcrumbs" id="breadcrumbs">
+						<script type="text/javascript">
+							try{ace.settings.check('breadcrumbs' , 'fixed')}catch(e){}
+						</script>
+
+						<ul class="breadcrumb">
+							<li>
+								<i class="icon-home home-icon"></i>
+								<a href="#">Trang chá»§</a>
+							</li>
+						</ul><!-- .breadcrumb -->
+
+						<div class="nav-search" id="nav-search">
+							<form class="form-search">
+								<span class="input-icon">
+									<input type="text" placeholder="TÃ¬m kiáº¿m ..." class="nav-search-input" id="nav-search-input" autocomplete="off" />
+									<i class="icon-search nav-search-icon"></i>
+								</span>
+							</form>
+						</div><!-- #nav-search -->
+					</div>
+
+					<div class="page-content">
+						<div class="page-header">
+							<h1>
+								ThÃŽng tin cÃ¡ nhÃ¢n
+								<small>
+									<i class="icon-double-angle-right"></i>
+									Admin
+								</small>
+							</h1>
+						</div><!-- /.page-header -->
+
+						<div class="row">
+							<div class="col-xs-12">
+								<!-- PAGE CONTENT BEGINS -->
+								<div class="user-profile row" id="user-profile-3">
+									<div class="col-sm-offset-1 col-sm-10">
+
+										<form id="profile" class="form-horizontal">
+											<div class="tabbable">
+												<ul class="nav nav-tabs padding-16">
+													<li class="active">
+														<a href="#edit-basic" data-toggle="tab">
+															<i class="green icon-edit bigger-125"></i>
+															ThÃŽng tin cÃ¡ nhÃ¢n
+														</a>
+													</li>
+
+													<li>
+														<a href="#edit-password" data-toggle="tab">
+															<i class="blue icon-key bigger-125"></i>
+															Äá»i máº­t kháº©u
+														</a>
+													</li>
+												</ul>
+
+												<div class="tab-content profile-edit-tab-content">
+													<div class="tab-pane in active" id="edit-basic">
+														<h4 class="header blue bolder smaller">ThÃŽng tin chung</h4>
+
+														<div class="row">
+
+															<div class="col-xs-12 col-sm-8">
+																<div class="form-group">
+																	<label for="form-field-username" class="col-sm-4 control-label no-padding-right">TÃ i khoáº£n</label>
+
+																	<div class="col-sm-8">
+																		<input type="text" value="<?php echo $login_name; ?>" name="login_name"  placeholder="TÃ i khoáº£n" id="form-field-username" class="col-xs-12 col-sm-10" disabled>
+																	</div>
+																</div>
+
+																<div class="space-4"></div>
+
+																<div class="form-group">
+																	<label for="form-field-first" class="col-sm-4 control-label no-padding-right">Há» tÃªn</label>
+
+																	<div class="col-sm-8">
+																		<input type="text" value="<?php echo $full_name; ?>" name="full_name" placeholder="Há» tÃªn" id="form-field-full_name" class="col-xs-12 col-sm-10">
+																	</div>
+																</div>
+															</div>
+														</div>
+
+														<hr>
+
+														<div class="space-4"></div>
+														<h4 class="header blue bolder smaller">ThÃŽng tin liÃªn há»</h4>
+
+														<div class="row">
+
+															<div class="col-xs-12 col-sm-8">
+																<div class="form-group">
+																	<label for="form-field-username" class="col-sm-4 control-label no-padding-right">Email</label>
+
+																	<div class="col-sm-8">
+																		<span class="input-icon input-icon-right">
+																			<input type="email" value="<?php echo $email; ?>" name="email" style="width: 308px;" placeholder="Email" id="form-field-email">
+																			<i class="icon-envelope"></i>
+																		</span>
+																	</div>
+																</div>
+
+																<div class="space-4"></div>
+
+																<div class="form-group">
+																	<label for="form-field-first" class="col-sm-4 control-label no-padding-right">Phone</label>
+
+																	<div class="col-sm-8">
+																		<span class="input-icon input-icon-right">
+																			<input type="number" value="<?php echo $phone; ?>" name="phone" style="width: 308px;" placeholder="Phone" id="form-field-phone" class="col-xs-12 col-sm-10">
+																			<i class="icon-phone"></i>
+																		</span>
+																	</div>
+																</div>
+															</div>
+														</div>
+														
+													</div>
+
+													<div class="tab-pane" id="edit-password">
+														<div class="space-10"></div>
+														<form>
+														<div class="form-group">
+															<label for="form-field-passwd" class="col-sm-3 control-label no-padding-right">Máº­t kháº©u cÅ©</label>
+															<div class="col-sm-9">
+																<input type="password" name="passwd" id="form-field-pass1">
+															</div>
+														</div>
+														
+														<div class="form-group">
+															<label for="form-field-pass1" class="col-sm-3 control-label no-padding-right">Máº­t kháº©u má»i</label>
+
+															<div class="col-sm-9">
+																<input type="password" name="passwd_new" id="form-field-pass1">
+															</div>
+														</div>
+
+														<div class="space-4"></div>
+
+														<div class="form-group">
+															<label for="form-field-pass2" class="col-sm-3 control-label no-padding-right">Nháº­p láº¡i máº­t kháº©u</label>
+
+															<div class="col-sm-9">
+																<input type="password" name="passwd_new_2" id="form-field-pass2">
+															</div>
+														</div>
+														</form>
+													</div>
+												</div>
+											</div>
+
+											<div class="clearfix form-actions">
+												<div class="col-md-offset-3 col-md-9">
+													<button type="button" id="edit-tab" class="btn btn-info">
+														<i class="icon-ok bigger-110"></i>
+														Cáº­p nháº­t
+													</button>
+												</div>
+											</div>
+										</form>
+									</div><!-- /span -->
+								</div>
+
+								<!-- PAGE CONTENT ENDS -->
+							</div><!-- /.col -->
+						</div><!-- /.row -->
+					</div><!-- /.page-content -->
+				</div><!-- /.main-content -->
+			</div><!-- /.main-container-inner -->
+
+			<a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
+				<i class="icon-double-angle-up icon-only bigger-110"></i>
+			</a>
+		</div><!-- /.main-container -->
+<?php
+$this->load->view('layout/admin/footer', array('base_url' => $base_url, 'adminjs' => array('assets/js/admin/admin.js')));
+?>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/edit_admin.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/edit_admin.php	(revision 423)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/edit_admin.php	(revision 423)
@@ -0,0 +1,84 @@
+<div class="modal-dialog">
+	<div class="modal-content">
+		<div class="modal-header no-padding">
+			<div class="table-header">
+				<button aria-hidden="true" data-dismiss="modal" class="close" type="button">
+					<span class="white">Ã</span>
+				</button>
+				Cáº­p nháº­t quáº£n trá» viÃªn
+			</div>
+		</div>
+
+		<div class="modal-body">
+			<form id="editAdmin_<?php echo $admin_id;?>" onsubmit="return false;" class="form-horizontal " role="form">
+				<input type="hidden" name="admin_id" value="<?php echo $admin_id; ?>" />
+				<div class="form-group">
+					<label for="form-field-1" class="col-sm-3 control-label no-padding-right"> Há» tÃªn </label>
+					<div class="col-sm-9">
+						<span class="input-icon">
+							<input type="text" name="full_name" placeholder="Há» tÃªn" value="<?php echo $full_name; ?>">
+							<i class="icon-user blue"></i>
+						</span>
+					</div>
+					<label class="block clearfix has-error">
+						<div class="help-block"> </div>
+					</label>
+					
+				</div>
+				<div class="form-group">
+					<label for="form-field-2" class="col-sm-3 control-label no-padding-right"> TÃ i khoáº£n </label>
+					<div class="col-sm-9">
+						<label class="block clearfix has-error">
+							<span class="input-icon">
+								<input type="text" name="login_name" placeholder="TÃ i khoáº£n" value="<?php echo $login_name; ?>">
+								<i class="icon-user blue"></i>
+							</span>
+							<div class="help-block"> </div>
+						</label>
+					</div>
+				</div>
+
+				<div class="form-group">
+					<label for="form-field-3" class="col-sm-3 control-label no-padding-right"> Email </label>
+					<div class="col-sm-9">
+						<span class="input-icon">
+							<input type="text" name="email" placeholder="Email" value="<?php echo $email; ?>">
+							<i class="icon-envelope blue"></i>
+						</span>
+					</div>
+					<label class="block clearfix has-error">
+						<div class="help-block"> </div>
+					</label>
+					
+				</div>
+				<div class="form-group">
+					<label for="form-field-4" class="col-sm-3 control-label no-padding-right"> Phone </label>
+					<div class="col-sm-9">
+						<span class="input-icon">
+							<input type="text" name="phone" placeholder="Phone" value="<?php echo $phone; ?>">
+							<i class="icon-phone blue"></i>
+						</span>
+					</div>
+					<label class="block clearfix has-error">
+						<div class="help-block"> </div>
+					</label>
+					
+				</div>
+
+				<div class="space-4"></div>
+				<div class="clearfix form-actions">
+					<div class="col-md-offset-3 col-md-9">
+						<button type="button"  onclick="return updateAdmin('<?php echo $admin_id;?>')" class="btn btn-info">
+							<i class="icon-ok bigger-110"></i>
+							HoÃ n táº¥t
+						</button>
+
+						&nbsp; &nbsp; &nbsp;
+						<button id="close_<?php echo $admin_id;?>" class="btn btn-primary" data-dismiss="modal">
+							Há»§y
+						</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/index.php	(revision 422)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/index.php	(revision 423)
@@ -57,4 +57,17 @@
             filter();
         });
+		
+		$('[data-toggle="ajaxModal"]').on('click',
+			function(e) {
+			$('#ajaxModal').remove();
+			e.preventDefault();
+			var $this = $(this)
+			  , $remote = $this.data('remote') || $this.attr('href')
+			  , $modal = $('<div class="modal" id="ajaxModal"><div class="modal-body"></div></div>');
+			$('body').append($modal);
+			$modal.modal({backdrop: 'static', keyboard: false});
+			$modal.load($remote);
+			}
+        );
 	}
 	
@@ -219,95 +232,4 @@
 	</div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
-
-<!-- Edit Admin -->
-<div tabindex="-1" class="modal fade in" id="editAdmin">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header no-padding">
-				<div class="table-header">
-					<button aria-hidden="true" data-dismiss="modal" class="close" type="button">
-						<span class="white">Ã</span>
-					</button>
-					Sá»­a quáº£n trá» viÃªn
-				</div>
-			</div>
-	
-			<div class="modal-body">
-				<form id="edit_frm" onsubmit="return false;" class="form-horizontal" role="form">
-					<div class="form-group">
-						<label for="form-field-1" class="col-sm-3 control-label no-padding-right"> Há» tÃªn </label>
-						<div class="col-sm-9">
-							<span class="input-icon">
-								<input type="text" name="full_name" placeholder="Há» tÃªn" id="edit_full_name" value="">
-								<i class="icon-user blue"></i>
-							</span>
-						</div>
-						<label class="block clearfix has-error">
-							<div class="help-block"> </div>
-						</label>
-						
-					</div>
-					<div class="form-group">
-						<label for="form-field-2" class="col-sm-3 control-label no-padding-right"> TÃ i khoáº£n </label>
-						<div class="col-sm-9">
-							<label class="block clearfix has-error">
-								<span class="input-icon">
-									<input type="text" name="login_name" placeholder="TÃ i khoáº£n" id="edit_login_name" value="">
-									<i class="icon-user blue"></i>
-								</span>
-								<div class="help-block"> </div>
-							</label>
-						</div>
-					</div>
-
-					<div class="form-group">
-						<label for="form-field-3" class="col-sm-3 control-label no-padding-right"> Email </label>
-						<div class="col-sm-9">
-							<span class="input-icon">
-								<input type="text" name="email" placeholder="Email" id="edit_email" value="">
-								<i class="icon-envelope blue"></i>
-							</span>
-						</div>
-						<label class="block clearfix has-error">
-							<div class="help-block"> </div>
-						</label>
-						
-					</div>
-					<div class="form-group">
-						<label for="form-field-4" class="col-sm-3 control-label no-padding-right"> Phone </label>
-						<div class="col-sm-9">
-							<span class="input-icon">
-								<input type="text" name="phone" placeholder="Phone" id="edit_phone" value="">
-								<i class="icon-phone blue"></i>
-							</span>
-						</div>
-						<label class="block clearfix has-error">
-							<div class="help-block"> </div>
-						</label>
-						
-					</div>
-
-					<div class="space-4"></div>
-					<div class="clearfix form-actions">
-						<div class="col-md-offset-3 col-md-9">
-							<button type="button" id="edit" class="btn btn-info">
-								<i class="icon-ok bigger-110"></i>
-								HoÃ n táº¥t
-							</button>
-
-							&nbsp; &nbsp; &nbsp;
-							<button type="reset" name="reset" class="btn">
-								<i class="icon-undo bigger-110"></i>
-								XÃ³a háº¿t
-							</button>
-						</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-<!-- End Edit Admin -->
-
 <!-- Delete Admin -->
 <div tabindex="-1" class="modal fade in" id="deleteAdmin">
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/listview.php	(revision 422)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/listview.php	(revision 423)
@@ -86,4 +86,5 @@
 								<th class="<?php if ($sorting_field == 'full_name') {echo $sorting_order;} else {echo "sorting";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 183px;" aria-label="Há» tÃªn: activate to sort column ascending">Há» tÃªn</th>
                                 <th class="<?php if ($sorting_field == 'phone') {echo $sorting_order;} else {echo "sorting";}?>" id="phone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">Sá» Äiá»n thoáº¡i</th>
+								<th class="<?php if ($sorting_field == 'email') {echo $sorting_order;} else {echo "sorting";}?>" id="email" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Email: activate to sort column ascending">Email</th>
                                 <th class="<?php if ($sorting_field == 'created_time') {echo $sorting_order;} else {echo "sorting";}?>" id="created_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="NgÃ y ÄÄng kÃœ: activate to sort column ascending">
                                     <i class="icon-time bigger-110 hidden-480"></i>
@@ -108,8 +109,9 @@
 
                                 <td class=" ">
-                                    <a href="#"><?php echo $admin['login_name']; ?></a>
+                                    <a data-toggle="ajaxModal" href='http://viettel.violet.vn/admin/quan_tri_vien/xem/<?php echo $admin['admin_id'];?>' data-toggle="modal" href="#view_admin"><?php echo $admin['login_name']; ?></a>
                                 </td>
                                 <td class="hidden-480 "><?php echo $admin['full_name']; ?></td>
 								<td class="hidden-480 "><?php echo $admin['phone']; ?></td>
+								<td class="hidden-480 "><?php echo $admin['email']; ?></td>
                                 <td class=" "><?php echo $admin['created_time']; ?></td>
 
@@ -121,9 +123,10 @@
                                     <div class="visible-md visible-lg hidden-sm hidden-xs action-buttons">
                                         <a href="#" class="blue">
-                                            <i class="icon-zoom-in bigger-130"></i>
+                                            <i data-toggle="ajaxModal" href='http://viettel.violet.vn/admin/quan_tri_vien/xem/<?php echo $admin['admin_id'];?>' data-toggle="modal" href="#view_admin" class="icon-zoom-in bigger-130"></i>
                                         </a>
 
-                                        <a href="#editAdmin" data-toggle="modal" data-admin-id=<?php echo $admin['admin_id']; ?> class="green">
-                                            <i class="icon-pencil bigger-130"></i>
+                                        <!--a href="#editAdmin" data-toggle="modal" data-admin-id=<?php echo $admin['admin_id']; ?> class="green"-->
+										<a href="#" class="green">
+                                             <i data-toggle="ajaxModal" href='http://viettel.violet.vn/admin/quan_tri_vien/sua/<?php echo $admin['admin_id'];?>' data-toggle="modal" href='#edit_admin' class="icon-pencil bigger-130"></i>
                                         </a>
 
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/view_admin.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/view_admin.php	(revision 423)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/view_admin.php	(revision 423)
@@ -0,0 +1,77 @@
+<div class="modal-dialog">
+	<div class="modal-content">
+		<div class="modal-header no-padding">
+			<div class="table-header">
+				<button aria-hidden="true" data-dismiss="modal" class="close" type="button">
+					<span class="white">Ã</span>
+				</button>
+				ThÃŽng tin quáº£n trá» viÃªn
+			</div>
+		</div>
+
+		<div class="modal-body">
+			<form id="viewAdmin_<?php echo $admin_id;?>" onsubmit="return false;" class="form-horizontal " role="form">
+				<div class="form-group">
+					<label for="form-field-1" class="col-sm-3 control-label no-padding-right"> Há» tÃªn </label>
+					<div class="col-sm-9">
+						<span class="input-icon">
+							<input type="text" readonly name="full_name" placeholder="Há» tÃªn" value="<?php echo $full_name; ?>">
+							<i class="icon-user blue"></i>
+						</span>
+					</div>
+					<label class="block clearfix has-error">
+						<div class="help-block"> </div>
+					</label>
+					
+				</div>
+				<div class="form-group">
+					<label for="form-field-2" class="col-sm-3 control-label no-padding-right"> TÃ i khoáº£n </label>
+					<div class="col-sm-9">
+						<label class="block clearfix has-error">
+							<span class="input-icon">
+								<input type="text" readonly name="login_name" placeholder="TÃ i khoáº£n" value="<?php echo $login_name; ?>">
+								<i class="icon-user blue"></i>
+							</span>
+							<div class="help-block"> </div>
+						</label>
+					</div>
+				</div>
+
+				<div class="form-group">
+					<label for="form-field-3" class="col-sm-3 control-label no-padding-right"> Email </label>
+					<div class="col-sm-9">
+						<span class="input-icon">
+							<input type="text" readonly name="email" placeholder="Email" value="<?php echo $email; ?>">
+							<i class="icon-envelope blue"></i>
+						</span>
+					</div>
+					<label class="block clearfix has-error">
+						<div class="help-block"> </div>
+					</label>
+					
+				</div>
+				<div class="form-group">
+					<label for="form-field-4" class="col-sm-3 control-label no-padding-right"> Phone </label>
+					<div class="col-sm-9">
+						<span class="input-icon">
+							<input type="text" readonly name="phone" placeholder="Phone" value="<?php echo $phone; ?>">
+							<i class="icon-phone blue"></i>
+						</span>
+					</div>
+					<label class="block clearfix has-error">
+						<div class="help-block"> </div>
+					</label>
+					
+				</div>
+
+				<div class="space-4"></div>
+				<div class="clearfix form-actions">
+					<div class="col-md-offset-3 col-md-9">
+						<button id="close_<?php echo $admin_id;?>" class="btn btn-primary" data-dismiss="modal">
+							ÄÃ³ng
+						</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/login.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/login.php	(revision 422)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/login.php	(revision 423)
@@ -66,5 +66,5 @@
 													<label class="block clearfix">
 														<span class="block input-icon input-icon-right">
-															<input type="text" name="user_admin" class="form-control" placeholder="TÃ i khoáº£n" />
+															<input type="text" name="login_name" class="form-control" placeholder="TÃ i khoáº£n" />
 															<i class="icon-user"></i>
 														</span>
@@ -74,5 +74,5 @@
 													<label class="block clearfix">
 														<span class="block input-icon input-icon-right">
-															<input type="password" name="password" class="form-control" placeholder="Máº­t kháº©u" />
+															<input type="password" name="passwd" class="form-control" placeholder="Máº­t kháº©u" />
 															<i class="icon-lock"></i>
 														</span>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user_profile.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user_profile.php	(revision 422)
+++ 	(revision )
@@ -1,255 +1,0 @@
-<?php
-$base_url = base_url();
-$this->load->view('layout/admin/header', array('base_url' => $base_url));
-$this->load->view('layout/admin/sidebar', array('base_url' => $base_url));
-?>
-				<div class="main-content">
-					<div class="breadcrumbs" id="breadcrumbs">
-						<script type="text/javascript">
-							try{ace.settings.check('breadcrumbs' , 'fixed')}catch(e){}
-						</script>
-
-						<ul class="breadcrumb">
-							<li>
-								<i class="icon-home home-icon"></i>
-								<a href="#">Trang chá»§</a>
-							</li>
-						</ul><!-- .breadcrumb -->
-
-						<div class="nav-search" id="nav-search">
-							<form class="form-search">
-								<span class="input-icon">
-									<input type="text" placeholder="TÃ¬m kiáº¿m ..." class="nav-search-input" id="nav-search-input" autocomplete="off" />
-									<i class="icon-search nav-search-icon"></i>
-								</span>
-							</form>
-						</div><!-- #nav-search -->
-					</div>
-
-					<div class="page-content">
-						<div class="page-header">
-							<h1>
-								ThÃŽng tin cÃ¡ nhÃ¢n
-								<small>
-									<i class="icon-double-angle-right"></i>
-									Admin
-								</small>
-							</h1>
-						</div><!-- /.page-header -->
-
-						<div class="row">
-							<div class="col-xs-12">
-								<!-- PAGE CONTENT BEGINS -->
-								<div class="user-profile row" id="user-profile-3">
-									<div class="col-sm-offset-1 col-sm-10">
-
-										<form class="form-horizontal">
-											<div class="tabbable">
-												<ul class="nav nav-tabs padding-16">
-													<li class="active">
-														<a href="#edit-basic" data-toggle="tab">
-															<i class="green icon-edit bigger-125"></i>
-															ThÃŽng tin cÃ¡ nhÃ¢n
-														</a>
-													</li>
-
-													<li>
-														<a href="#edit-password" data-toggle="tab">
-															<i class="blue icon-key bigger-125"></i>
-															Äá»i máº­t kháº©u
-														</a>
-													</li>
-												</ul>
-
-												<div class="tab-content profile-edit-tab-content">
-													<div class="tab-pane in active" id="edit-basic">
-														<h4 class="header blue bolder smaller">ThÃŽng tin chung</h4>
-
-														<div class="row">
-															<div class="col-xs-12 col-sm-4">
-																<div class="ace-file-input ace-file-multiple"><input type="file"><a href="#" class="remove"><i class="icon-remove"></i></a></div>
-															</div>
-
-															<div class="vspace-xs"></div>
-
-															<div class="col-xs-12 col-sm-8">
-																<div class="form-group">
-																	<label for="form-field-username" class="col-sm-4 control-label no-padding-right">TÃ i khoáº£n</label>
-
-																	<div class="col-sm-8">
-																		<input type="text" value="Admin" placeholder="TÃ i khoáº£n" id="form-field-username" class="col-xs-12 col-sm-10" disabled>
-																	</div>
-																</div>
-
-																<div class="space-4"></div>
-
-																<div class="form-group">
-																	<label for="form-field-first" class="col-sm-4 control-label no-padding-right">Há» vÃ  tÃªn</label>
-
-																	<div class="col-sm-8">
-																		<input type="text" value="" placeholder="Há»" id="form-field-first" class="input-small">
-																		<input type="text" value="" placeholder="TÃªn" id="form-field-last" class="input-small">
-																	</div>
-																</div>
-															</div>
-														</div>
-
-														<hr>
-														<div class="form-group">
-															<label for="form-field-date" class="col-sm-3 control-label no-padding-right">NgÃ y sinh</label>
-
-															<div class="col-sm-9">
-																<div class="input-medium">
-																	<div class="input-group">
-																		<input type="text" placeholder="dd-mm-yyyy" data-date-format="dd-mm-yyyy" id="form-field-date" class="input-medium date-picker">
-																		<span class="input-group-addon">
-																			<i class="icon-calendar"></i>
-																		</span>
-																	</div>
-																</div>
-															</div>
-														</div>
-
-														<div class="space-4"></div>
-
-														<div class="form-group">
-															<label class="col-sm-3 control-label no-padding-right">Giá»i tÃ­nh</label>
-
-															<div class="col-sm-9">
-																<label class="inline">
-																	<input type="radio" class="ace" name="form-field-radio">
-																	<span class="lbl"> Nam</span>
-																</label>
-
-																&nbsp; &nbsp; &nbsp;
-																<label class="inline">
-																	<input type="radio" class="ace" name="form-field-radio">
-																	<span class="lbl"> Ná»¯</span>
-																</label>
-															</div>
-														</div>
-
-														<div class="space"></div>
-														<h4 class="header blue bolder smaller">ThÃŽng tin liÃªn há»</h4>
-
-														<div class="form-group">
-															<label for="form-field-email" class="col-sm-3 control-label no-padding-right">Email</label>
-
-															<div class="col-sm-9">
-																<span class="input-icon input-icon-right">
-																	<input type="email" value="" id="form-field-email">
-																	<i class="icon-envelope"></i>
-																</span>
-															</div>
-														</div>
-
-														<div class="space-4"></div>
-
-														<div class="form-group">
-															<label for="form-field-website" class="col-sm-3 control-label no-padding-right">Website</label>
-
-															<div class="col-sm-9">
-																<span class="input-icon input-icon-right">
-																	<input type="url" value="" id="form-field-website">
-																	<i class="icon-globe"></i>
-																</span>
-															</div>
-														</div>
-
-														<div class="space"></div>
-														<h4 class="header blue bolder smaller">Máº¡ng xÃ£ há»i</h4>
-
-														<div class="form-group">
-															<label for="form-field-facebook" class="col-sm-3 control-label no-padding-right">Facebook</label>
-
-															<div class="col-sm-9">
-																<span class="input-icon">
-																	<input type="text" id="form-field-facebook" value="">
-																	<i class="icon-facebook blue"></i>
-																</span>
-															</div>
-														</div>
-
-														<div class="space-4"></div>
-
-														<div class="form-group">
-															<label for="form-field-twitter" class="col-sm-3 control-label no-padding-right">Twitter</label>
-
-															<div class="col-sm-9">
-																<span class="input-icon">
-																	<input type="text" id="form-field-twitter" value="">
-																	<i class="icon-twitter light-blue"></i>
-																</span>
-															</div>
-														</div>
-
-														<div class="space-4"></div>
-
-														<div class="form-group">
-															<label for="form-field-gplus" class="col-sm-3 control-label no-padding-right">Google+</label>
-
-															<div class="col-sm-9">
-																<span class="input-icon">
-																	<input type="text" id="form-field-gplus" value="">
-																	<i class="icon-google-plus red"></i>
-																</span>
-															</div>
-														</div>
-													</div>
-
-													<div class="tab-pane" id="edit-password">
-														<div class="space-10"></div>
-
-														<div class="form-group">
-															<label for="form-field-pass1" class="col-sm-3 control-label no-padding-right">Máº­t kháº©u má»i</label>
-
-															<div class="col-sm-9">
-																<input type="password" id="form-field-pass1">
-															</div>
-														</div>
-
-														<div class="space-4"></div>
-
-														<div class="form-group">
-															<label for="form-field-pass2" class="col-sm-3 control-label no-padding-right">Nháº­p láº¡i máº­t kháº©u</label>
-
-															<div class="col-sm-9">
-																<input type="password" id="form-field-pass2">
-															</div>
-														</div>
-													</div>
-												</div>
-											</div>
-
-											<div class="clearfix form-actions">
-												<div class="col-md-offset-3 col-md-9">
-													<button type="button" class="btn btn-info">
-														<i class="icon-ok bigger-110"></i>
-														LÆ°u láº¡i
-													</button>
-
-													&nbsp; &nbsp;
-													<button type="reset" class="btn">
-														<i class="icon-undo bigger-110"></i>
-														XÃ³a háº¿t
-													</button>
-												</div>
-											</div>
-										</form>
-									</div><!-- /span -->
-								</div>
-
-								<!-- PAGE CONTENT ENDS -->
-							</div><!-- /.col -->
-						</div><!-- /.row -->
-					</div><!-- /.page-content -->
-				</div><!-- /.main-content -->
-			</div><!-- /.main-container-inner -->
-
-			<a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
-				<i class="icon-double-angle-up icon-only bigger-110"></i>
-			</a>
-		</div><!-- /.main-container -->
-<?php
-$this->load->view('layout/admin/footer', array('base_url' => $base_url));
-?>
