diff options
Diffstat (limited to 'web/html/settings')
| -rw-r--r-- | web/html/settings/xray/basics.html | 14 | ||||
| -rw-r--r-- | web/html/settings/xray/dns.html | 19 |
2 files changed, 17 insertions, 16 deletions
diff --git a/web/html/settings/xray/basics.html b/web/html/settings/xray/basics.html index 374cb7dd..71aa0d7c 100644 --- a/web/html/settings/xray/basics.html +++ b/web/html/settings/xray/basics.html @@ -135,7 +135,7 @@ </template> </a-setting-list-item> </a-collapse-panel> - <a-collapse-panel key="4" header='{{ i18n "pages.xray.blockConfigs"}}'> + <a-collapse-panel key="4" header='{{ i18n "pages.xray.basicRouting"}}'> <a-row :xs="24" :sm="24" :lg="12"> <a-alert type="warning" :style="{ textAlign: 'center' }"> <template slot="message"> @@ -144,22 +144,12 @@ </template> </a-alert> </a-row> - <a-setting-list-item paddings="small"> + <a-setting-list-item paddings="small" :style="{ marginBottom: '20px' }"> <template #title>{{ i18n "pages.xray.Torrent"}}</template> - <template #description>{{ i18n "pages.xray.TorrentDesc"}}</template> <template #control> <a-switch v-model="torrentSettings"></a-switch> </template> </a-setting-list-item> - <a-setting-list-item paddings="small"> - <template #title>{{ i18n "pages.xray.Family"}}</template> - <template #description>{{ i18n "pages.xray.FamilyDesc"}}</template> - <template #control> - <a-switch v-model="familyProtectSettings"></a-switch> - </template> - </a-setting-list-item> - </a-collapse-panel> - <a-collapse-panel key="5" header='{{ i18n "pages.xray.basicRouting"}}'> <a-row :xs="24" :sm="24" :lg="12"> <a-alert type="warning" :style="{ textAlign: 'center' }"> <template slot="message"> diff --git a/web/html/settings/xray/dns.html b/web/html/settings/xray/dns.html index 11558536..ba768cb8 100644 --- a/web/html/settings/xray/dns.html +++ b/web/html/settings/xray/dns.html @@ -29,7 +29,7 @@ <template #control> <a-select v-model="dnsStrategy" :style="{ width: '100%' }" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']"> + <a-select-option :value="l" :label="l" v-for="l in ['UseSystem', 'UseIP', 'UseIPv4', 'UseIPv6']"> <span>[[ l ]]</span> </a-select-option> </a-select> @@ -56,6 +56,14 @@ <a-switch v-model="dnsDisableFallbackIfMatch"></a-switch> </template> </a-setting-list-item> + + <a-setting-list-item paddings="small"> + <template #title>{{ i18n "pages.xray.dns.useSystemHosts" }}</template> + <template #description>{{ i18n "pages.xray.dns.useSystemHostsDesc" }}</template> + <template #control> + <a-switch v-model="dnsUseSystemHosts"></a-switch> + </template> + </a-setting-list-item> </template> </a-collapse-panel> <template v-if="enableDNS"> @@ -102,9 +110,12 @@ </template> <template v-else> <a-empty description='{{ i18n "emptyDnsDesc" }}' :style="{ margin: '10px' }"> - <a-button type="primary" icon="plus" @click="addDNSServer()" :style="{ marginTop: '10px' }"> - <span>{{ i18n "pages.xray.dns.add" }}</span> - </a-button> + <a-button-group> + <a-button type="primary" icon="plus" @click="addDNSServer()"> + <span>{{ i18n "pages.xray.dns.add" }}</span> + </a-button> + <a-button type="primary" icon="menu" @click="openDNSPresets()"></a-button> + </a-button-group> </a-empty> </template> </a-collapse-panel> |