Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

Commit d528e7f

Browse files
author
icymind
committed
fix ui: incorrect modal
1 parent bf07c8d commit d528e7f

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

html/index.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<div id="proxies-tab" class="ui bottom attached tab segment" data-tab="proxies">
7373
<div class="ui teal icon labeled button" v-on:click="newProfile">
7474
<i class="ui plus icon"></i>
75-
添加配置
75+
新建配置
7676
</div>
7777
<div class="ui divider hidden"></div>
7878
<div id="profiles">
@@ -234,7 +234,7 @@ <h4 class="ui header teal">代理状态</h4>
234234
登录到 VRouter 虚拟机
235235
</div>
236236
<div class="content">
237-
<p>VRouter 和后台的虚拟机紧密关联, 各项功能都依赖于正确设置了虚拟机. 修改虚拟机可能会造成 VRouter 无法正常工作. 用户名密码均为root</p>
237+
<p>后台虚拟机用户名密码均为root, VRouter 和后台的虚拟机紧密关联, 各项功能都依赖于正确设置了虚拟机. 修改虚拟机可能会造成 VRouter 无法正常工作.</p>
238238
</div>
239239
<div class="actions">
240240
<div class="ui red inverted button" v-on:click="guiLogin">
@@ -297,6 +297,13 @@ <h4 class="ui header teal">代理状态</h4>
297297

298298
<div id="profileModal" class="ui modal" ref="profileModal">
299299
<div class="scrolling content">
300+
<div class="ui action input">
301+
<input type="text">
302+
<div class="ui button teal right labeled icon">
303+
<i class="copy icon"></i>
304+
导入URI
305+
</div>
306+
</div>
300307
<form class="ui form">
301308
<div class="field">
302309
<label>配置名称</label>

js/manage.js

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,14 @@ const myApp = new Vue({
141141
}
142142
winston.error(err)
143143
this.errorMsg = err.toString()
144-
$(this.$refs.errorModal).modal('show')
144+
$(this.$refs.errorModal)
145+
.modal({
146+
blurring: true,
147+
dimmerSettings: {
148+
opacity: 0.8
149+
}
150+
})
151+
.modal('show')
145152
},
146153
toggleProfileEditor (action = 'show') {
147154
this.resetProxiesDropdown()
@@ -468,6 +475,12 @@ const myApp = new Vue({
468475
async showLoginModal () {
469476
$('*[data-content]').popup('hide')
470477
$(this.$refs.loginModal)
478+
.modal({
479+
blurring: true,
480+
dimmerSettings: {
481+
opacity: 0.8
482+
}
483+
})
471484
.modal('show')
472485
},
473486
openLogFile () {
@@ -478,7 +491,14 @@ const myApp = new Vue({
478491
return getCurrentWindow().toggleDevTools()
479492
},
480493
showAboutModal () {
481-
$(this.$refs.aboutModal).modal('show')
494+
$(this.$refs.aboutModal)
495+
.modal({
496+
blurring: true,
497+
dimmerSettings: {
498+
opacity: 0.8
499+
}
500+
})
501+
.modal('show')
482502
},
483503
goToHomepage () {
484504
return shell.openExternal('https://github.com/icymind/VRouter')

0 commit comments

Comments
 (0)