Fix the order issue in TreeView mode. (#3218)

[Ventoy.git] / Plugson / www / plugson_password.html

diff --git a/Plugson/www/plugson_password.html b/Plugson/www/plugson_password.html
index 0f25bddbdbeea083fe01ebbb020503ee96629483..3dd3fac0fb13ce65c88fc5ec92d37b5269f9a971 100644 (file)
--- a/Plugson/www/plugson_password.html
+++ b/Plugson/www/plugson_password.html
@@ -1,10 +1,12 @@
 <div class="box box-primary" id="control">\r
     <div class="box-header">\r
-        <div class="col-sm-10" style="padding-top:8px;">\r
+        <div class="col-sm-9" style="padding-top:8px;">\r
             <i class="glyphicon glyphicon-lock">&nbsp;</i>\r
             <h1 class="box-title" style="font-weight:bold;" id="id_h1_page_title"></h1>\r
         </div>\r
-        \r
+        <div class="col-sm-1" style="padding-top:2px;">\r
+          <button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>\r
+        </div>\r
         <div class="col-sm-2" style="font-size:16px;padding-top:8px;">\r
             <a id="id_a_official_doc" target="_blank" href="https://www.ventoy.net/en/plugin_password.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>\r
         </div>\r
@@ -162,7 +164,7 @@
   }\r
 \r
   function CommonPasswordEntry(tbl, name, cn, en) {\r
-    var tr = '<tr><td>'+name+'</td><td><input type="text" class="form-control" id="id_'+name+'" disabled="disabled"/></td>' +\r
+    var tr = '<tr><td>'+name+'</td><td><input type="password" class="form-control" id="id_'+name+'" disabled="disabled"/></td>' +\r
       '<td><button id="id_btn_set_'+name+'" class="btn btn-primary btn-sm btn-add CommPwdSetBtn"><span class="fa fa-edit"></span><span id="id_span_edit"></span></button>&nbsp;&nbsp;' +\r
       '<button id="id_btn_clr_'+name+'" class="btn btn-danger btn-sm btn-del CommPwdClearBtn"><span class="fa fa-trash"></span><span id="id_span_clear"></span></button></td>' +\r
       '<td><span id="id_span_desc_cn">' + cn + '</span>' +\r
@@ -183,13 +185,13 @@
     CommonPasswordEntry($tbl, 'efipwd', '所有 .efi 文件的默认密码。', 'Default password for all .efi files.');\r
     CommonPasswordEntry($tbl, 'vtoypwd', '所有 .vtoy 文件的默认密码。', 'Default password for all .vtoy files.');\r
 \r
-    $('input:text[id=id_bootpwd]').val(data.bootpwd);\r
-    $('input:text[id=id_isopwd]').val(data.isopwd);\r
-    $('input:text[id=id_wimpwd]').val(data.wimpwd);\r
-    $('input:text[id=id_imgpwd]').val(data.imgpwd);\r
-    $('input:text[id=id_efipwd]').val(data.efipwd);\r
-    $('input:text[id=id_vhdpwd]').val(data.vhdpwd);\r
-    $('input:text[id=id_vtoypwd]').val(data.vtoypwd);\r
+    $('input:password[id=id_bootpwd]').val(data.bootpwd);\r
+    $('input:password[id=id_isopwd]').val(data.isopwd);\r
+    $('input:password[id=id_wimpwd]').val(data.wimpwd);\r
+    $('input:password[id=id_imgpwd]').val(data.imgpwd);\r
+    $('input:password[id=id_efipwd]').val(data.efipwd);\r
+    $('input:password[id=id_vhdpwd]').val(data.vhdpwd);\r
+    $('input:password[id=id_vtoypwd]').val(data.vtoypwd);\r
   }\r
 \r
   function FillMenuPwdTable(data) {\r
@@ -234,17 +236,17 @@
     }\r
     \r
     current_tab_index = index;\r
-    VtoyFillCurrentPageItem(m_data_pwd[index].tips);\r
+    VtoyFillCurrentPageItem(m_data_pwd[index]);\r
   }\r
 \r
   function VtoyGetCurrentPageItem(data) {\r
-    data.bootpwd = $('input:text[id=id_bootpwd]').val();\r
-    data.isopwd = $('input:text[id=id_isopwd]').val();\r
-    data.wimpwd = $('input:text[id=id_wimpwd]').val();\r
-    data.imgpwd = $('input:text[id=id_imgpwd]').val();\r
-    data.efipwd = $('input:text[id=id_efipwd]').val();\r
-    data.vhdpwd = $('input:text[id=id_vhdpwd]').val();\r
-    data.vtoypwd = $('input:text[id=id_vtoypwd]').val();\r
+    data.bootpwd = $('input:password[id=id_bootpwd]').val();\r
+    data.isopwd = $('input:password[id=id_isopwd]').val();\r
+    data.wimpwd = $('input:password[id=id_wimpwd]').val();\r
+    data.imgpwd = $('input:password[id=id_imgpwd]').val();\r
+    data.efipwd = $('input:password[id=id_efipwd]').val();\r
+    data.vhdpwd = $('input:password[id=id_vhdpwd]').val();\r
+    data.vtoypwd = $('input:password[id=id_vtoypwd]').val();\r
   }\r
 \r
   function VtoySaveCurrentPage() {\r
@@ -415,7 +417,7 @@ function VtoySetPassword(common, type, cb, data) {
   });\r
   \r
   function set_common_pwd_callback(path, pwd, type, data) {\r
-    var selector = 'input:text[id=id_'+ data +']';\r
+    var selector = 'input:password[id=id_'+ data +']';\r
     var value = format_password(pwd, type);\r
 \r
     $(selector).val(value);\r
@@ -431,7 +433,7 @@ function VtoySetPassword(common, type, cb, data) {
     var id = $(this).attr('id');\r
 \r
     //id_btn_clr_\r
-    var selector = 'input:text[id=id_'+ id.substr(11) +']';\r
+    var selector = 'input:password[id=id_'+ id.substr(11) +']';\r
     $(selector).val('');\r
     VtoySaveCurrentPage();\r
   });\r
@@ -462,9 +464,13 @@ function VtoySetPassword(common, type, cb, data) {
       path: data.path,\r
       pwd: data.pwd\r
     }, function(e) {\r
-      list.push(data);\r
-      FillMenuPwdTable(list);\r
-      Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);\r
+      if (e.result === 'success') {\r
+        list.push(data);\r
+        FillMenuPwdTable(list);\r
+        Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);\r
+      } else if (e.result === 'duplicate') {\r
+        Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);\r
+      }\r
     });\r
 \r
   }\r
@@ -519,13 +525,13 @@ function VtoySetPassword(common, type, cb, data) {
   });\r
 \r
   function VtoySaveCurrentPage() {\r
-    var bootpwd = $('input:text[id=id_bootpwd]').val();\r
-    var isopwd = $('input:text[id=id_isopwd]').val();\r
-    var wimpwd = $('input:text[id=id_wimpwd]').val();\r
-    var imgpwd = $('input:text[id=id_imgpwd]').val();\r
-    var vhdpwd = $('input:text[id=id_vhdpwd]').val();\r
-    var efipwd = $('input:text[id=id_efipwd]').val();\r
-    var vtoypwd = $('input:text[id=id_vtoypwd]').val();\r
+    var bootpwd = $('input:password[id=id_bootpwd]').val();\r
+    var isopwd = $('input:password[id=id_isopwd]').val();\r
+    var wimpwd = $('input:password[id=id_wimpwd]').val();\r
+    var imgpwd = $('input:password[id=id_imgpwd]').val();\r
+    var vhdpwd = $('input:password[id=id_vhdpwd]').val();\r
+    var efipwd = $('input:password[id=id_efipwd]').val();\r
+    var vtoypwd = $('input:password[id=id_vtoypwd]').val();\r
 \r
     callVtoy({\r
       method : 'save_password',\r
@@ -542,13 +548,13 @@ function VtoySetPassword(common, type, cb, data) {
     });\r
   }\r
 \r
-  $('input:text[id=id_bootpwd]').change(VtoySaveCurrentPage);\r
-  $('input:text[id=id_isopwd]').change(VtoySaveCurrentPage);\r
-  $('input:text[id=id_wimpwd]').change(VtoySaveCurrentPage);\r
-  $('input:text[id=id_imgpwd]').change(VtoySaveCurrentPage);\r
-  $('input:text[id=id_vhdpwd]').change(VtoySaveCurrentPage);\r
-  $('input:text[id=id_efipwd]').change(VtoySaveCurrentPage);\r
-  $('input:text[id=id_vtoypwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_bootpwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_isopwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_wimpwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_imgpwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_vhdpwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_efipwd]').change(VtoySaveCurrentPage);\r
+  $('input:password[id=id_vtoypwd]').change(VtoySaveCurrentPage);\r
 \r
   $('#id_tab_password a[href="#tab_0"]').click(OnClickMultiModeTab);\r
   $('#id_tab_password a[href="#tab_1"]').click(OnClickMultiModeTab);\r
@@ -557,6 +563,27 @@ function VtoySetPassword(common, type, cb, data) {
   $('#id_tab_password a[href="#tab_4"]').click(OnClickMultiModeTab);\r
   $('#id_tab_password a[href="#tab_5"]').click(OnClickMultiModeTab);\r
 \r
+  function UpdateTabTitleIcon(data) {\r
+    CommonUpdateTabTitleIcon(data.exist_password, '#id_tab_password a[href="#tab_', 'password');\r
+  }\r
+  $('#id_btn_reset').click(function() { \r
+    Modal.confirm({msg:GetResetTabConfigTipMsg(current_tab_index, 'password')}).on(function(e) {\r
+        if (e) {            \r
+            callVtoySync({\r
+                method : 'password_del',\r
+                index: current_tab_index,\r
+                path: g_del_all_path\r
+            }, function(data) {\r
+                \r
+            });\r
+            \r
+            m_data_pwd[current_tab_index].list.length = 0;\r
+            VtoyFillCurrentPageItem(m_data_pwd[g_vtoy_data_default_index]);\r
+            VtoySaveCurrentPage();\r
+        }\r
+    });\r
+  });\r
+\r
   $('#id_tab_password a[href="#tab_0"]').tab('show');\r
   VtoyFillCurrentPageItem(m_data_pwd[0]);\r
   VtoyPageLanguageChange(g_current_language);\r