Skip to content

Commit d879ec6

Browse files
authored
Fine tune push mirror UI (#33866)
1 parent 8a0f7f0 commit d879ec6

File tree

2 files changed

+34
-29
lines changed

2 files changed

+34
-29
lines changed

templates/repo/settings/options.tmpl

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,17 @@
203203
{{range .PushMirrors}}
204204
<tr>
205205
<td class="tw-break-anywhere">{{.RemoteAddress}}</td>
206-
<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
207-
<td>{{if .LastUpdateUnix}}{{DateUtils.FullTime .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</div>{{end}}</td>
206+
<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}} ({{.Interval}})</td>
207+
<td>
208+
<span class="flex-text-block">
209+
{{if .LastUpdateUnix}}
210+
{{DateUtils.FullTime .LastUpdateUnix}}
211+
{{else}}
212+
{{ctx.Locale.Tr "never"}}
213+
{{end}}
214+
{{if .LastError}}<span class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</span>{{end}}
215+
</span>
216+
</td>
208217
<td class="right aligned">
209218
<button
210219
class="ui tiny button show-modal"

templates/repo/settings/push_mirror_sync_modal.tmpl

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@
22
<div class="header">
33
{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.edit_sync_time"}}
44
</div>
5-
<div class="content">
6-
<form class="ui form ignore-dirty" method="post">
7-
{{.CsrfTokenHtml}}
8-
<input type="hidden" name="action" value="push-mirror-update">
9-
<input type="hidden" name="push_mirror_id" id="push-mirror-edit-id">
10-
<div class="field">
11-
<label for="name">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</label>
12-
<div class="ui small input">
13-
<input id="push-mirror-edit-address" readonly>
14-
</div>
15-
</div>
16-
<div class="inline field">
17-
<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
18-
<input id="push-mirror-edit-interval" name="push_mirror_interval" autofocus>
19-
</div>
20-
<div class="actions">
21-
<button class="ui small basic cancel button">
22-
{{svg "octicon-x"}}
23-
{{ctx.Locale.Tr "cancel"}}
24-
</button>
25-
<button class="ui primary small approve button">
26-
{{svg "fontawesome-save"}}
27-
{{ctx.Locale.Tr "save"}}
28-
</button>
29-
</div>
30-
</form>
31-
</div>
5+
<form class="content ui form ignore-dirty" method="post">
6+
{{.CsrfTokenHtml}}
7+
<input type="hidden" name="action" value="push-mirror-update">
8+
<input type="hidden" name="push_mirror_id" id="push-mirror-edit-id">
9+
<div class="field">
10+
<label>{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</label>
11+
<span id="push-mirror-edit-address"></span>
12+
</div>
13+
<div class="field">
14+
<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
15+
<input id="push-mirror-edit-interval" name="push_mirror_interval" class="tw-w-auto">
16+
</div>
17+
<div class="actions">
18+
<button class="ui small basic cancel button">
19+
{{svg "octicon-x"}}
20+
{{ctx.Locale.Tr "cancel"}}
21+
</button>
22+
<button class="ui primary small approve button">
23+
{{svg "fontawesome-save"}}
24+
{{ctx.Locale.Tr "save"}}
25+
</button>
26+
</div>
27+
</form>
3228
</div>

0 commit comments

Comments
 (0)