Skip to content

Commit 2d37e9b

Browse files
qwerty287qwerty287
committed
Improve html, rm js
1 parent 266ed1f commit 2d37e9b

File tree

4 files changed

+33
-63
lines changed

4 files changed

+33
-63
lines changed

‎templates/repo/settings/deploy_keys.tmpl

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
{{template "repo/settings/navbar" .}}
55
<div class="ui container">
66
{{template "base/alert" .}}
7-
<div {{if not .HasError}}class="hide"{{end}} id="add-deploy-key-panel">
8-
<h4 class="ui top attached header">
9-
{{.i18n.Tr "repo.settings.add_deploy_key"}}
10-
<div class="ui right">
11-
<button class="ui red tiny hide-panel button" data-panel="#add-deploy-key-panel">
12-
{{.i18n.Tr "cancel"}}
13-
</button>
14-
</div>
15-
</h4>
16-
<div class="ui attached segment">
7+
<h4 class="ui top attached header">
8+
{{.i18n.Tr "repo.settings.deploy_keys"}}
9+
<div class="ui right">
10+
{{if not .DisableSSH}}
11+
<div class="ui blue tiny show-panel button" data-panel="#add-deploy-key-panel">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div>
12+
{{else}}
13+
<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
14+
{{end}}
15+
</div>
16+
</h4>
17+
<div class="ui attached segment">
18+
<div class="{{if not .HasError}}hide{{end}} mb-4" id="add-deploy-key-panel">
1719
<form class="ui form" action="{{.Link}}" method="post">
1820
{{.CsrfTokenHtml}}
1921
<div class="field">
@@ -39,21 +41,11 @@
3941
<button class="ui green button">
4042
{{.i18n.Tr "repo.settings.add_deploy_key"}}
4143
</button>
44+
<button class="ui hide-panel button" data-panel="#add-deploy-key-panel">
45+
{{.i18n.Tr "cancel"}}
46+
</button>
4247
</form>
4348
</div>
44-
<br>
45-
</div>
46-
<h4 class="ui top attached header">
47-
{{.i18n.Tr "repo.settings.deploy_keys"}}
48-
<div class="ui right">
49-
{{if not .DisableSSH}}
50-
<div class="ui blue tiny show-panel button" data-panel="#add-deploy-key-panel">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div>
51-
{{else}}
52-
<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
53-
{{end}}
54-
</div>
55-
</h4>
56-
<div class="ui attached segment">
5749
{{if .Deploykeys}}
5850
<div class="ui key list">
5951
{{range .Deploykeys}}

‎templates/user/settings/keys_gpg.tmpl

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
<div {{if not .HasGPGError}}class="hide"{{end}} id="add-gpg-key-panel">
2-
<h4 class="ui top attached header">
3-
{{.i18n.Tr "settings.add_new_gpg_key"}}
4-
<div class="ui right">
5-
<button class="ui red tiny hide-panel button" data-panel="#add-gpg-key-panel">
6-
{{.i18n.Tr "cancel"}}
7-
</button>
8-
</div>
9-
</h4>
10-
<div class="ui attached segment">
1+
<h4 class="ui top attached header">
2+
{{.i18n.Tr "settings.manage_gpg_keys"}}
3+
<div class="ui right">
4+
<div class="ui blue tiny show-panel button" data-panel="#add-gpg-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
5+
</div>
6+
</h4>
7+
<div class="ui attached segment">
8+
<div class="{{if not .HasGPGError}}hide{{end}} mb-4" id="add-gpg-key-panel">
119
<form class="ui form{{if .HasGPGError}} error{{end}}" action="{{.Link}}" method="post">
1210
{{.CsrfTokenHtml}}
1311
<input type="hidden" name="title" value="none">
@@ -36,17 +34,12 @@
3634
<button class="ui green button">
3735
{{.i18n.Tr "settings.add_key"}}
3836
</button>
37+
<button class="ui hide-panel button" data-panel="#add-gpg-key-panel">
38+
{{.i18n.Tr "cancel"}}
39+
</button>
3940
</form>
4041
</div>
41-
</div>
42-
<h4 class="ui top attached header">
43-
{{.i18n.Tr "settings.manage_gpg_keys"}}
44-
<div class="ui right">
45-
<div class="ui blue tiny show-panel button" data-panel="#add-gpg-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
46-
</div>
47-
</h4>
48-
<div class="ui attached segment">
49-
<div class="ui key list">
42+
<div class="ui key list mt-0">
5043
<div class="item">
5144
{{.i18n.Tr "settings.gpg_desc"}}
5245
</div>

‎templates/user/settings/keys_ssh.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
{{.i18n.Tr "settings.manage_ssh_keys"}}
33
<div class="ui right">
44
{{if not .DisableSSH }}
5-
<div id="add-ssh-button" class="ui blue tiny show-panel button" data-toggle-button="#cancel-ssh-button" data-panel="#add-ssh-key-panel">
5+
<div id="add-ssh-button" class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">
66
{{.i18n.Tr "settings.add_key"}}
77
</div>
88
{{else}}
99
<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
1010
{{end}}
11-
<button id="cancel-ssh-button" class="ui red tiny hide-panel button" data-toggle-button="#add-ssh-button" data-panel="#add-ssh-key-panel" style="display: none;">
12-
{{.i18n.Tr "cancel"}}
13-
</button>
1411
</div>
1512
</h4>
1613
<div class="ui attached segment">
@@ -29,6 +26,9 @@
2926
<button class="ui green button">
3027
{{.i18n.Tr "settings.add_key"}}
3128
</button>
29+
<button id="cancel-ssh-button" class="ui hide-panel button" data-panel="#add-ssh-key-panel">
30+
{{.i18n.Tr "cancel"}}
31+
</button>
3232
</form>
3333
</div>
3434
<div class="ui key list mt-0">

‎web_src/js/features/common-global.js

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -292,26 +292,11 @@ function handlePanelButtonToggle($btn) {
292292

293293
export function initGlobalButtons() {
294294
$('.show-panel.button').on('click', function () {
295-
if ($($(this).data('panel')).is(":visible")) {
296-
$($(this).data('panel')).hide();
297-
} else {
298-
$($(this).data('panel')).show();
299-
}
300-
handlePanelButtonToggle($(this));
295+
$($(this).data('panel')).show();
301296
});
302297

303298
$('.hide-panel.button').on('click', function () {
304-
if ($($(this).data('panel')).is(":visible")) {
305-
$($(this).data('panel')).hide();
306-
} else {
307-
$($(this).data('panel')).show();
308-
}
309-
handlePanelButtonToggle($(this));
310-
});
311-
312-
$('.swap.button').on('click', function () {
313-
$($(this).data('show-button')).show();
314-
$(this).hide();
299+
$($(this).data('panel')).hide();
315300
});
316301

317302
$('.show-modal.button').on('click', function () {

0 commit comments

Comments
 (0)