alert public root

controllers/ConfigController.php

@@ -34,6 +34,7 @@ class ConfigController extends Controller {
     }
 
     public $config_json = [
+		"lang" => "vi",
         "camera" => [
             "auto_check" => 1,
             "num_cam" => 2,
@@ -252,7 +253,7 @@ class ConfigController extends Controller {
                     'content' => json_encode([
                         'path' => $engineConfig['data']['engines'][0]['path'],
                         'config' => $engineConfig,
-                        'configEngine' => $config_json
+                        'configEngine' => json_encode($config_json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
                     ])
                 ]
             ]));

views/config/config.tpl

@@ -165,13 +165,11 @@
         </div>
         <br>
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6 col-md-push-1">
                 {$config_json}
-                <div class="text-center">
+                <button style="position: fixed;left: 0;top: 170px;" class="btn btn-primary" onclick="saveStep2(this);" data-href="{Url::to(['/config/cau-hinh-nhan-dien'])}">
-                    <button class="btn btn-primary" onclick="saveStep2(this);" data-href="{Url::to(['/config/cau-hinh-nhan-dien'])}">
+                    <i class="fa fa-floppy-o"></i> Lưu lại
-                        <i class="fa fa-floppy-o"></i> Lưu lại
+                </button>
-                    </button>
-                </div>
             </div>
         </div>
     </div>

views/user/password.tpl

@@ -28,7 +28,7 @@
                     <i class="fa fa-check"></i> Đổi mật khẩu thành công!
                 </div>
                 <div class="text-center">
-                    <button class="btn btn-primary" onclick="user.password(this);" data-href="{Url::to(['/user/change-password','id'=>$model->id])}">
+                    <button class="btn btn-primary" onclick="user.changePassword(this);" data-href="{Url::to(['/user/change-password','id'=>$model->id])}">
                         <i class="fa fa-lock"></i> Đổi mật khẩu
                     </button>
                 </div>

widgets/ConfigTree.php

@@ -17,8 +17,8 @@ class ConfigTree extends Widget {
 
     public function run() {
 
-        $public_root = ['engine', 'recognition', 'open_door'];
+        $public_root = ['engine', 'recognition', 'open_door', 'screen', 'lang'];
-        $public_cfg = ['engine|cam_id', 'engine|server_authen', 'recognition|server_recog', 'open_door|enable', 'open_door|port_name'];
+        $public_cfg = ['engine|cam_id', 'engine|server_authen', 'recognition|server_recog', 'open_door|enable', 'open_door|port_name', 'screen|banner', 'lang'];
 
         return $this->render("config-tree", [
                     "configLists" => $this->configLists,