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 424)
@@ -44,5 +44,5 @@
 									<div class="col-sm-offset-1 col-sm-10">
 
-										<form id="profile" class="form-horizontal">
+										<!--form id="profile" class="form-horizontal"-->
 											<div class="tabbable">
 												<ul class="nav nav-tabs padding-16">
@@ -63,73 +63,94 @@
 
 												<div class="tab-content profile-edit-tab-content">
-													<div class="tab-pane in active" id="edit-basic">
+													<div class="tab-pane in active" id="edit-basic" class="form-horizontal">
+														<div class="space-10"></div>
+														<form id="frm1" role="form" class="form-horizontal">
 														<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>
-
+														
+														<div class="form-group">
+															<label for="form-field-1" class="col-sm-3 control-label no-padding-right"> TÃ i khoáº£n </label>
+															<div class="col-sm-9">
+																<span class="input-icon">
+																	<input type="text" name="login_name" placeholder="TÃ i khoáº£n" value="<?php echo $login_name; ?>" disabled>
+																	<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"> 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>
+					
 														<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>
+														<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">
+																	<label class="block clearfix has-error">
+																		<span class="input-icon">
+																			<input type="text" name="email" placeholder="Email" value="<?php echo $email; ?>">
+																			<i class="icon-envelope blue"></i>
 																		</span>
-																	</div>
+																		<div class="help-block" id="email_err"> </div>
+																	</label>
+																</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">
+																	<label class="block clearfix has-error">
+																		<span class="input-icon">
+																			<input type="text" name="phone" placeholder="Phone" value="<?php echo $phone; ?>">
+																			<i class="icon-phone blue"></i>
+																		</span>
+																		<div class="help-block" id="phone_err"> </div>
+																	</label>
 																</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>
-														
+															</label>
+														</div>
+														
+														<div class="clearfix form-actions">
+															<div class="col-md-offset-3 col-md-9">
+																<button type="button" onclick="return updateInfo();" class="btn btn-info">
+																	<i class="icon-ok bigger-110"></i>
+																	Cáº­p nháº­t
+																</button>
+															</div>
+														</div>
+														</form>
 													</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">
+														<form id="frm2" class="form-horizontal" role="form">
+														<div class="form-group">
+															<label for="form-field-passwd" class="col-sm-3 control-label no-padding-right">Máº­t kháº©u hiá»n táº¡i</label>
+															<div class="col-sm-9">
+																<label class="block clearfix has-error">
+																	<span class="input-icon">
+																		<input type="password" name="passwd" id="form-field-pass1">
+																		<i class="icon-lock blue"></i>
+																	</span>
+								
+																	<div class="help-block" id="passwd_old_err"> </div>
+																</label>
+																
 															</div>
 														</div>
@@ -139,5 +160,11 @@
 
 															<div class="col-sm-9">
-																<input type="password" name="passwd_new" id="form-field-pass1">
+																<label class="block clearfix has-error">
+																	<span class="input-icon">
+																		<input type="password" name="passwd_new" id="form-field-pass1">
+																		<i class="icon-lock blue"></i>
+																	</span>
+																	<div class="help-block" id="passwd_new_err"> </div>
+																</label>
 															</div>
 														</div>
@@ -146,10 +173,24 @@
 
 														<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>
+															<label for="form-field-pass2" class="col-sm-3 control-label no-padding-right">XÃ¡c nháº­n máº­t kháº©u má»i</label>
+
+															<div class="col-sm-9">
+																<label class="block clearfix has-error">
+																	<span class="input-icon">
+																		<input type="password" name="confirm_passwd_new" id="form-field-pass2">
+																	</span>
+																	<div class="help-block" id="confirm_passwd_new_err"> </div>
+																</label>
+															</div>
+														</div>
+														<div class="clearfix form-actions">
+															<div class="col-md-offset-3 col-md-9">
+																<button type="button" onclick="return changePassword();"  class="btn btn-info">
+																	<i class="icon-ok bigger-110"></i>
+																	Thay Äá»i máº­t kháº©u
+																</button>
+															</div>
+														</div>
+														
 														</form>
 													</div>
@@ -157,13 +198,6 @@
 											</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>
+											
+										<!--/form-->
 									</div><!-- /span -->
 								</div>
