Index: pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php	(revision 454)
+++ pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php	(revision 466)
@@ -1,6 +1,10 @@
 <?php
+$base_url = base_url();
+$this->load->view('layout/frontend/header', array('base_url' => $base_url, '$username'=>@$username));
+$this->load->view('layout/frontend/sidebar', array('base_url' => $base_url));
+/*
 $this->load->view('layout/frontend/header', array('base_url'=>base_url(), '$username'=>$username));
 $base_url = base_url();
-$this->load->view('layout/frontend/sidebar');
+$this->load->view('layout/frontend/sidebar', array('base_url'=>base_url()));*/
 ?>
 <div class="main-content">
@@ -12,5 +16,5 @@
 				<small>
 					<i class="icon-double-angle-right"></i>
-					<?php echo $username; ?>
+					<?php echo @$username; ?>
 				</small>
 			</h1>
@@ -61,5 +65,5 @@
 
 														<div class="col-sm-8">
-															<input type="text" name="login_name" value="<?php echo $username; ?>" placeholder="TÃ i khoáº£n" id="form-field-username" class="col-xs-12 col-sm-10" disabled>
+															<input type="text" name="username" value="<?php echo @$username; ?>" placeholder="TÃ i khoáº£n" id="form-field-username" class="col-xs-12 col-sm-10" disabled>
 														</div>
 													</div>
@@ -71,5 +75,5 @@
 
 														<div class="col-sm-8">
-															<input type="text" name="full_name" value="<?php echo $full_name; ?>" placeholder="Há»" id="form-field-first" class="col-xs-12 col-sm-10">
+															<input type="text" name="fullname" value="<?php echo @$fullname; ?>" placeholder="Há»" id="form-field-first" class="col-xs-12 col-sm-10" disabled>
 								
 														</div>
@@ -82,5 +86,15 @@
 
 														<div class="col-sm-8">
-															<input type="text" name="school" value="<?php echo $school; ?>" placeholder="ÄÆ¡n vá»" id="form-field-username" class="col-xs-12 col-sm-10">
+															<input type="text" name="school" value="<?php echo @$school; ?>" placeholder="ÄÆ¡n vá»" id="form-field-username" class="col-xs-12 col-sm-10">
+														</div>
+													</div>
+													
+													<div class="space-4"></div>
+
+													<div class="form-group">
+														<label for="form-field-username" class="col-sm-4 control-label no-padding-right">Tá»nh / ThÃ nh phá»</label>
+
+														<div class="col-sm-8">
+															<input type="text" name="province" value="<?php echo @$province; ?>" placeholder="Tá»nh / ThÃ nh phá»" id="form-field-username" class="col-xs-12 col-sm-10">
 														</div>
 													</div>
@@ -98,5 +112,5 @@
 												<div class="col-sm-9">
 													<label class="inline">
-														<input type="radio" class="ace" name="form-field-radio">
+														<input type="radio" <?php if(@$gender=="male") echo "checked"; ?> class="ace" name="gender" value="male">
 														<span class="lbl"> Nam</span>
 													</label>
@@ -104,5 +118,5 @@
 													&nbsp; &nbsp; &nbsp;
 													<label class="inline">
-														<input type="radio" class="ace" name="form-field-radio">
+														<input type="radio" <?php if(@$gender=="female") echo "checked"; ?> class="ace" name="gender" value="female">
 														<span class="lbl"> Ná»¯</span>
 													</label>
@@ -117,8 +131,11 @@
 
 												<div class="col-sm-9">
-													<span class="input-icon input-icon-right">
-														<input name="email" type="email" value="<?php echo $email; ?>" id="form-field-email">
-														<i class="icon-envelope"></i>
-													</span>
+													<label class="block clearfix has-error">
+														<span class="input-icon input-icon-right">
+															<input name="email" type="email" value="<?php echo @$email; ?>" id="form-field-email">
+															<i class="icon-envelope"></i>
+														</span>
+														<div class="help-block" id="email_err"> </div>
+													</label>
 												</div>
 											</div>
@@ -126,5 +143,5 @@
 											<div class="clearfix form-actions">
 												<div class="col-md-offset-3 col-md-9">
-													<button type="button" onclick="return updateInfo();" class="btn btn-info">
+													<button type="button" onclick="return updateInfo(<?php echo @$us_id; ?>);" class="btn btn-info">
 														<i class="icon-ok bigger-110"></i>
 														Cáº­p nháº­t
@@ -137,58 +154,10 @@
 									
 									<div class="tab-pane" id="edit-password">
-										<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>
-											
-											<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">
-													<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>
-
-											<div class="space-4"></div>
-
-											<div class="form-group">
-												<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 class="alert alert-block alert-success">						
+											<p>
+												Äá» thay Äá»i máº­t kháº©u, quÃ­ vá» vui lÃ²ng soáº¡n tin theo cÃº phÃ¡p: <strong>SBG MK [matkhaumoi] gá»­i tá»i 8162</strong>. <br/>
+												Trong trÆ°á»ng há»£p quÃªn máº­t kháº©u, quÃ­ vá» vui lÃ²ng soan tin theo cÃº phÃ¡p: <strong>SBG MK gá»­i tá»i 8162</strong>.
+											</p>
+										</div>
 									</div>
 
@@ -197,5 +166,5 @@
 											<h4 class="header blue bolder smaller">ThÃŽng tin tÃ i khoáº£n</h4>
 											<div class="col-sm-6">
-												<h4>Sá» tiá»n </h4> <h3><?php echo $acc_balanced; ?> VND</h3>
+												<h4>Sá» tiá»n </h4> <h3><?php echo number_format(@$acc_balanced, 0); ?> VND</h3>
 											</div>
 											<div class="col-sm-6">
@@ -327,4 +296,4 @@
 		
 <?php
-$this->load->view('layout/frontend/footer');
+$this->load->view('layout/frontend/footer', array('base_url' => $base_url, 'usjs' => array('assets/js/frontend/user.js')));
 ?>
