2023-04-23 13:21:21 +03:00
|
|
|
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
|
|
|
|
<div class="admin-setting-content">
|
2020-03-02 21:25:36 +03:00
|
|
|
<h4 class="ui top attached header">
|
2023-09-25 15:42:40 +03:00
|
|
|
{{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
|
2020-03-02 21:25:36 +03:00
|
|
|
</h4>
|
|
|
|
<div class="ui attached segment">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 19:42:49 +03:00
|
|
|
<div class="ui secondary filter menu tw-items-center tw-mx-0">
|
2024-03-22 16:45:10 +03:00
|
|
|
<form class="ui form ignore-dirty tw-flex-1">
|
2024-03-15 02:24:59 +03:00
|
|
|
{{template "shared/search/combo" dict "Value" .Keyword}}
|
2023-06-28 15:10:36 +03:00
|
|
|
</form>
|
|
|
|
<!-- Sort -->
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 19:42:49 +03:00
|
|
|
<div class="ui dropdown type jump item tw-mr-0">
|
2020-03-02 21:25:36 +03:00
|
|
|
<span class="text">
|
2023-09-25 11:56:50 +03:00
|
|
|
{{ctx.Locale.Tr "repo.issues.filter_sort"}}
|
2020-03-02 21:25:36 +03:00
|
|
|
</span>
|
2023-09-21 18:54:26 +03:00
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
2020-03-02 21:25:36 +03:00
|
|
|
<div class="menu">
|
2024-03-20 08:56:42 +03:00
|
|
|
<a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="?sort=email&q={{$.Keyword}}">{{ctx.Locale.Tr "admin.emails.filter_sort.email"}}</a>
|
|
|
|
<a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="?sort=reverseemail&q={{$.Keyword}}">{{ctx.Locale.Tr "admin.emails.filter_sort.email_reverse"}}</a>
|
|
|
|
<a class="{{if eq .SortType "username"}}active {{end}}item" href="?sort=username&q={{$.Keyword}}">{{ctx.Locale.Tr "admin.emails.filter_sort.name"}}</a>
|
|
|
|
<a class="{{if eq .SortType "reverseusername"}}active {{end}}item" href="?sort=reverseusername&q={{$.Keyword}}">{{ctx.Locale.Tr "admin.emails.filter_sort.name_reverse"}}</a>
|
2020-03-02 21:25:36 +03:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="ui attached table segment">
|
Improve UI on mobile (#19546)
Start making the mobile experience not painful and be actually usable. This contains a few smaller changes to enhance this experience.
- Submit buttons on the review forms aren't columns anymore and are now allowed to be displayed on one row.
- The label/milestone & New Issue buttons were given each own row even tough, there's enough place to do it one the same row. This commit fixes that.
- The issues+Pull tab on repo's has a third item besides the label/milestone & New Issue buttons, the search bar. On desktop there's enough place to do this on one row, for mobile it isn't, currently it was using for each item a new row. This commits fixes that by only giving the searchbar a new row and have the other two buttons on the same row.
- The notification table will now be show a scrollbar instead of overflow.
- The repo buttons(Watch, Star, Fork) on mobile were showing quite big and the SVG wasn't even displayed on the same line, if the count of those numbers were too high it would even overflow. This commit removes the SVG, as there isn't any place to show them on the same row and allows them to have a new row if the counts of those buttons are high.
- The admin page can show you a lot of interesting information, on mobile the System Status + Configuration weren't properly displayed as the margin's were too high. This commit fixes that by reducing the margin to a number that makes sense on mobile.
- Fixes to not overflow the tables but instead force them to be scrollable.
- When viewing a issue or pull request, the comments aren't full-width but instead 80% and aligned to right, on mobile this is a annoyance as there isn't much width to begin with. This commits fixes that by forcing full-width and removing the avatars on the left side and instead including them inline in the comment header.
2022-05-01 19:11:21 +03:00
|
|
|
<table class="ui very basic striped table unstackable">
|
2020-03-02 21:25:36 +03:00
|
|
|
<thead>
|
|
|
|
<tr>
|
2020-06-25 01:23:05 +03:00
|
|
|
<th data-sortt-asc="username" data-sortt-desc="reverseusername">
|
2023-09-25 11:56:50 +03:00
|
|
|
{{ctx.Locale.Tr "admin.users.name"}}
|
2020-06-25 01:23:05 +03:00
|
|
|
{{SortArrow "username" "reverseusername" $.SortType false}}
|
|
|
|
</th>
|
2023-09-25 11:56:50 +03:00
|
|
|
<th>{{ctx.Locale.Tr "admin.users.full_name"}}</th>
|
2020-06-25 01:23:05 +03:00
|
|
|
<th data-sortt-asc="email" data-sortt-desc="reverseemail" data-sortt-default="true">
|
2023-09-25 11:56:50 +03:00
|
|
|
{{ctx.Locale.Tr "email"}}
|
2020-06-25 01:23:05 +03:00
|
|
|
{{SortArrow "email" "reverseemail" $.SortType true}}
|
|
|
|
</th>
|
2023-09-25 11:56:50 +03:00
|
|
|
<th>{{ctx.Locale.Tr "admin.emails.primary"}}</th>
|
|
|
|
<th>{{ctx.Locale.Tr "admin.emails.activated"}}</th>
|
2020-03-02 21:25:36 +03:00
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
<tbody>
|
|
|
|
{{range .Emails}}
|
|
|
|
<tr>
|
2021-11-16 21:18:25 +03:00
|
|
|
<td><a href="{{AppSubUrl}}/{{.Name | PathEscape}}">{{.Name}}</a></td>
|
2024-03-05 08:29:32 +03:00
|
|
|
<td class="gt-ellipsis tw-max-w-48">{{.FullName}}</td>
|
|
|
|
<td class="gt-ellipsis tw-max-w-48">{{.Email}}</td>
|
2020-12-13 05:48:03 +03:00
|
|
|
<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
|
2020-03-02 21:25:36 +03:00
|
|
|
<td>
|
|
|
|
{{if .CanChange}}
|
|
|
|
<a class="link-email-action" href data-uid="{{.UID}}"
|
|
|
|
data-email="{{.Email}}"
|
|
|
|
data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
|
|
|
|
data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
|
2020-12-09 22:03:19 +03:00
|
|
|
{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
|
2020-03-02 21:25:36 +03:00
|
|
|
</a>
|
|
|
|
{{else}}
|
2020-12-09 22:03:19 +03:00
|
|
|
{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
|
2020-03-02 21:25:36 +03:00
|
|
|
{{end}}
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
{{end}}
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{template "base/paginate" .}}
|
|
|
|
|
2023-04-24 14:08:59 +03:00
|
|
|
<div class="ui g-modal-confirm modal" id="change-email-modal">
|
2023-04-23 12:24:19 +03:00
|
|
|
<div class="header">
|
2023-09-25 11:56:50 +03:00
|
|
|
{{ctx.Locale.Tr "admin.emails.change_email_header"}}
|
2020-03-02 21:25:36 +03:00
|
|
|
</div>
|
2023-04-23 12:24:19 +03:00
|
|
|
<div class="content">
|
2023-09-25 11:56:50 +03:00
|
|
|
<p class="center">{{ctx.Locale.Tr "admin.emails.change_email_text"}}</p>
|
2020-03-02 21:25:36 +03:00
|
|
|
|
|
|
|
<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
|
|
|
<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
|
|
|
|
<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
|
|
|
|
<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
|
|
|
|
<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
|
|
|
|
|
|
|
|
<input type="hidden" id="form-uid" name="uid" value="" required>
|
|
|
|
<input type="hidden" id="form-email" name="email" value="" required>
|
|
|
|
<input type="hidden" id="form-primary" name="primary" value="" required>
|
|
|
|
<input type="hidden" id="form-activate" name="activate" value="" required>
|
|
|
|
|
2023-03-14 06:34:09 +03:00
|
|
|
<div class="center">
|
2023-04-23 12:24:19 +03:00
|
|
|
{{template "base/modal_actions_confirm" .}}
|
2020-03-02 21:25:36 +03:00
|
|
|
</div>
|
|
|
|
</form>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
2023-04-23 13:21:21 +03:00
|
|
|
{{template "admin/layout_footer" .}}
|