Skip to content

Commit 8302201

Browse files
wxiaoguangwxiaoguang
authored
Fix layouts of admin table / adapt repo / email test (#24370)
Ref: #24315 (review) And fix the incorrect layout for "dasbboard", the "form" shouldn't follow `<h4 class="ui top attached header">`, so move it to inner. Diff with ignoring spaces: https://github.com/go-gitea/gitea/pull/24370/files?diff=unified&w=1 A known bug: the adapt/delete button doesn't work due to a historical messy logic, will fix it in next PR (#24374) ![image](https://user-images.githubusercontent.com/2114189/234754656-d160b098-b8d4-4783-962a-27d5c764863c.png) ![image](https://user-images.githubusercontent.com/2114189/234762327-3e77e2e4-a156-4498-8a8b-092e14cf9204.png) ![image](https://user-images.githubusercontent.com/2114189/234767811-74b7272c-e40c-4850-8e3c-499e3b53b827.png) ![image](https://user-images.githubusercontent.com/2114189/234761247-e6aad889-dcad-443c-948f-2d44df68725b.png)
1 parent 63a401a commit 8302201

File tree

10 files changed

+69
-87
lines changed

10 files changed

+69
-87
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2959,6 +2959,7 @@ config.mailer_sendmail_timeout = Sendmail Timeout
29592959
config.mailer_use_dummy = Dummy
29602960
config.test_email_placeholder = Email (e.g. [email protected])
29612961
config.send_test_mail = Send Testing Email
2962+
config.send_test_mail_submit = Send
29622963
config.test_mail_failed = Failed to send a testing email to "%s": %v
29632964
config.test_mail_sent = A testing email has been sent to "%s".
29642965

‎templates/admin/config.tmpl

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,18 @@
238238
<dd>{{.Mailer.SMTPPort}}</dd>
239239
{{end}}
240240
<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
241-
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
242-
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
243-
{{.CsrfTokenHtml}}
244-
<div class="inline field ui left">
245-
<div class="ui input">
241+
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd>
242+
<div class="ui divider"></div>
243+
<dt class="gt-py-2">{{.locale.Tr "admin.config.send_test_mail"}}</dt>
244+
<dd>
245+
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
246+
{{.CsrfTokenHtml}}
247+
<div class="ui tiny input">
246248
<input type="email" name="email" placeholder="{{.locale.Tr "admin.config.test_email_placeholder"}}" size="29" required>
247249
</div>
248-
</div>
249-
<button class="ui green button" id="test-mail-btn">{{.locale.Tr "admin.config.send_test_mail"}}</button>
250-
</form>
250+
<button class="ui tiny green button">{{.locale.Tr "admin.config.send_test_mail_submit"}}</button>
251+
</form>
252+
</dd>
251253
{{end}}
252254
</dl>
253255
</div>

‎templates/admin/dashboard.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<h4 class="ui top attached header">
1717
{{.locale.Tr "admin.dashboard.operations"}}
1818
</h4>
19-
<form method="post" action="{{AppSubUrl}}/admin">
20-
{{.CsrfTokenHtml}}
21-
<div class="ui attached table segment">
19+
<div class="ui attached table segment">
20+
<form method="post" action="{{AppSubUrl}}/admin">
21+
{{.CsrfTokenHtml}}
2222
<table class="ui very basic table gt-px-4">
2323
<tbody>
2424
<tr>
@@ -71,8 +71,8 @@
7171
</tr>
7272
</tbody>
7373
</table>
74-
</div>
75-
</form>
74+
</form>
75+
</div>
7676

7777
<h4 class="ui top attached header">
7878
{{.locale.Tr "admin.dashboard.system_status"}}

‎templates/admin/repo/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}
22
<div class="admin-setting-content">
33
<h4 class="ui top attached header">
44
{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})

‎templates/admin/repo/unadopted.tmpl

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}
22
<div class="admin-setting-content">
33
<h4 class="ui top attached header">
44
{{.locale.Tr "admin.repos.unadopted"}}
@@ -18,47 +18,44 @@
1818
{{if .search}}
1919
<div class="ui attached segment settings">
2020
{{if .Dirs}}
21-
<div class="ui middle aligned divided list">
21+
<div class="ui aligned divided list">
2222
{{range $dirI, $dir := .Dirs}}
23-
<div class="item">
24-
<div class="content">
25-
<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
26-
<span class="name">{{$dir}}</span>
27-
<div class="right floated content">
28-
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
29-
<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
30-
<div class="header">
31-
<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
32-
</div>
33-
<div class="content">
34-
<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
35-
</div>
36-
<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
37-
{{$.CsrfTokenHtml}}
38-
<input type="hidden" name="id" value="{{$dir}}">
39-
<input type="hidden" name="action" value="adopt">
40-
<input type="hidden" name="q" value="{{$.Keyword}}">
41-
<input type="hidden" name="page" value="{{$.CurrentPage}}">
42-
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
43-
</form>
23+
<div class="item gt-df gt-ac">
24+
<span class="gt-f1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span>
25+
<div>
26+
<button class="ui button green show-modal gt-p-3" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{$.locale.Tr "repo.adopt_preexisting_label"}}</button>
27+
<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
28+
<div class="header">
29+
<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
4430
</div>
45-
<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
46-
<div class="ui g-modal-confirm modal" id="delete-unadopted-modal-{{$dirI}}">
47-
<div class="header">
48-
<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
49-
</div>
50-
<div class="content">
51-
<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
52-
</div>
53-
<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
54-
{{$.CsrfTokenHtml}}
55-
<input type="hidden" name="id" value="{{$dir}}">
56-
<input type="hidden" name="action" value="delete">
57-
<input type="hidden" name="q" value="{{$.Keyword}}">
58-
<input type="hidden" name="page" value="{{$.CurrentPage}}">
59-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
60-
</form>
31+
<div class="content">
32+
<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
6133
</div>
34+
<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
35+
{{$.CsrfTokenHtml}}
36+
<input type="hidden" name="id" value="{{$dir}}">
37+
<input type="hidden" name="action" value="adopt">
38+
<input type="hidden" name="q" value="{{$.Keyword}}">
39+
<input type="hidden" name="page" value="{{$.CurrentPage}}">
40+
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
41+
</form>
42+
</div>
43+
<button class="ui button red show-modal gt-p-3" data-modal="#delete-unadopted-modal-{{$dirI}}">{{svg "octicon-x"}} {{$.locale.Tr "repo.delete_preexisting_label"}}</button>
44+
<div class="ui g-modal-confirm modal" id="delete-unadopted-modal-{{$dirI}}">
45+
<div class="header">
46+
<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
47+
</div>
48+
<div class="content">
49+
<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
50+
</div>
51+
<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
52+
{{$.CsrfTokenHtml}}
53+
<input type="hidden" name="id" value="{{$dir}}">
54+
<input type="hidden" name="action" value="delete">
55+
<input type="hidden" name="q" value="{{$.Keyword}}">
56+
<input type="hidden" name="page" value="{{$.CurrentPage}}">
57+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
58+
</form>
6259
</div>
6360
</div>
6461
</div>

‎templates/repo/settings/webhook/base_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h4 class="ui top attached header">
22
{{.Title}}
33
<div class="ui right">
4-
<div class="ui floating1 jump dropdown">
4+
<div class="ui jump dropdown">
55
<div class="ui primary tiny button">{{.locale.Tr "repo.settings.add_webhook"}}</div>
66
<div class="menu">
77
<a class="item" href="{{.BaseLinkNew}}/gitea/new">

‎templates/user/settings/repos.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="ui middle aligned divided list">
1010
{{range $dirI, $dir := .Dirs}}
1111
{{$repo := index $.ReposMap $dir}}
12-
<div class="item">
12+
<div class="item {{if not $repo}}gt-py-2{{end}}">{{/* if not repo, then there are "adapt" buttons, so the padding shouldn't be that default large*/}}
1313
<div class="content">
1414
{{if $repo}}
1515
{{if $repo.IsPrivate}}
@@ -30,11 +30,11 @@
3030
<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
3131
{{end}}
3232
{{else}}
33-
<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
34-
<span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
35-
<div class="right floated content">
33+
<span class="icon gt-dib gt-pt-3">{{svg "octicon-file-directory-fill"}}</span>
34+
<span class="name gt-dib gt-pt-3">{{$.ContextUser.Name}}/{{$dir}}</span>
35+
<div class="ui right">
3636
{{if $.allowAdopt}}
37-
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
37+
<button class="ui button green show-modal gt-p-3" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
3838
<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
3939
<div class="header">
4040
<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
@@ -51,7 +51,7 @@
5151
</div>
5252
{{end}}
5353
{{if $.allowDelete}}
54-
<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
54+
<button class="ui button red show-modal gt-p-3" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
5555
<div class="ui g-modal-confirm modal" id="delete-unadopted-modal-{{$dirI}}">
5656
<div class="header">
5757
<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>

‎web_src/css/admin.css

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,7 @@
44
margin: 12px -1rem -1rem;
55
}
66

7-
.admin .settings .button.adopt,
8-
.admin .settings .button.delete {
9-
margin-top: -15px;
10-
margin-bottom: -15px;
11-
}
12-
13-
.admin .settings .button.adopt .label,
14-
.admin .settings .button.delete .label {
15-
vertical-align: middle;
16-
}
17-
18-
.admin.user .email {
7+
.admin.user table.table .email {
198
max-width: 200px;
209
}
2110

@@ -51,12 +40,12 @@
5140
}
5241
}
5342

54-
.admin.config #test-mail-btn {
55-
margin-left: 5px;
56-
}
57-
5843
.admin code,
5944
.admin pre {
6045
white-space: pre-wrap;
6146
word-wrap: break-word;
6247
}
48+
49+
.admin .ui.table.segment {
50+
overflow-x: auto; /* if the screen width is small, many wide tables (eg: user list) need scroll bars */
51+
}

‎web_src/css/runner.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
padding-bottom: 30px;
33
}
44

5+
.runner-container .ui.table.segment {
6+
overflow-x: auto;
7+
}
8+
59
.runner-container .runner-ops > a {
610
margin-left: 0.5em;
711
}

‎web_src/css/user.css

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,6 @@
9090
padding: 8px 15px;
9191
}
9292

93-
.user .button.adopt,
94-
.user .button.delete {
95-
margin-top: -15px;
96-
margin-bottom: -15px;
97-
}
98-
99-
.user .button.adopt .label,
100-
.user .button.delete .label {
101-
vertical-align: middle;
102-
}
103-
10493
.user.link-account:not(.icon) {
10594
padding-top: 15px;
10695
padding-bottom: 5px;

0 commit comments

Comments
 (0)