diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index fdb523c3..d3e0ec48 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -76,23 +76,17 @@ - - - - - + + @@ -332,7 +326,6 @@ saveBtnDisable: true, user: {}, lang: getLang(), - showAlert: false, remarkModels: {i:'Inbound',e:'Email',o:'Other'}, remarkSeparators: [' ','-','_','@',':','~','|',',','.','/'], datepickerList: [{name:'Gregorian (Standard)', value: 'gregorian'}, {name:'Jalalian (شمسی)', value: 'jalalian'}], @@ -514,23 +507,21 @@ get: function() { if (!this.allSetting) return []; var alerts = [] - if (this.allSetting.port == 54321) alerts.push('{{ i18n "pages.settings.panelPort"}}'); + if (window.location.protocol !== "https:") alerts.push('{{ i18n "secAlertSSL" }}'); + if (this.allSetting.webPort == 54321) alerts.push('{{ i18n "secAlertPanelPort" }}'); panelPath = window.location.pathname.split('/').length<4 - if (panelPath && this.allSetting.webBasePath == '/') alerts.push('{{ i18n "pages.settings.panelSettings"}} {{ i18n "pages.settings.panelUrlPath"}}'); + if (panelPath && this.allSetting.webBasePath == '/') alerts.push('{{ i18n "secAlertPanelURI" }}'); if (this.allSetting.subEnable) { subPath = this.allSetting.subURI.length >0 ? new URL(this.allSetting.subURI).pathname : this.allSetting.subPath; - if (subPath == '/sub/') alerts.push('{{ i18n "pages.settings.subSettings"}} {{ i18n "pages.settings.subPath"}}'); + if (subPath == '/sub/') alerts.push('{{ i18n "secAlertSubURI" }}'); subJsonPath = this.allSetting.subJsonURI.length >0 ? new URL(this.allSetting.subJsonURI).pathname : this.allSetting.subJsonPath; - if (subJsonPath == '/json/') alerts.push('JSON {{ i18n "pages.settings.subPath"}}'); + if (subJsonPath == '/json/') alerts.push('{{ i18n "secAlertSubJsonURI" }}'); } return alerts } } }, async mounted() { - if (window.location.protocol !== "https:") { - this.showAlert = true; - } await this.getAllSetting(); while (true) { await PromiseUtil.sleep(1000); @@ -540,4 +531,4 @@ }); - + \ No newline at end of file