Skip to content

Commit 40826dd

Browse files
rajesh-jonnalagaddarajesh-jonnalagadda
authored
Merge branch 'main' into feat-32257-add-comments-unchanged-lines-and-show
2 parents fa4c61e + 0f4b0cf commit 40826dd

22 files changed

+192
-183
lines changed

‎routers/web/admin/emails.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func ActivateEmail(ctx *context.Context) {
154154

155155
// DeleteEmail serves a POST request for delete a user's email
156156
func DeleteEmail(ctx *context.Context) {
157-
u, err := user_model.GetUserByID(ctx, ctx.FormInt64("Uid"))
157+
u, err := user_model.GetUserByID(ctx, ctx.FormInt64("uid"))
158158
if err != nil || u == nil {
159159
ctx.ServerError("GetUserByID", err)
160160
return

‎routers/web/devtest/devtest.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ func List(ctx *context.Context) {
2424
var subNames []string
2525
for _, tmplName := range templateNames {
2626
subName := strings.TrimSuffix(tmplName, ".tmpl")
27-
if subName != "list" {
27+
if !strings.HasPrefix(subName, "devtest-") {
2828
subNames = append(subNames, subName)
2929
}
3030
}
3131
ctx.Data["SubNames"] = subNames
32-
ctx.HTML(http.StatusOK, "devtest/list")
32+
ctx.HTML(http.StatusOK, "devtest/devtest-list")
3333
}
3434

3535
func FetchActionTest(ctx *context.Context) {

‎templates/admin/emails/list.tmpl

+20-35
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,21 @@
5050
<td>{{svg (Iif .IsPrimary "octicon-check" "octicon-x")}}</td>
5151
<td>
5252
{{if .CanChange}}
53-
<a class="link-email-action" href data-uid="{{.UID}}"
54-
data-email="{{.Email}}"
55-
data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
56-
data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
53+
<a class="show-modal" href data-modal="#change-email-modal" data-modal-uid="{{.UID}}"
54+
data-modal-email="{{.Email}}"
55+
data-modal-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
56+
data-modal-activate="{{if .IsActivated}}0{{else}}1{{end}}">
5757
{{svg (Iif .IsActivated "octicon-check" "octicon-x")}}
5858
</a>
5959
{{else}}
6060
{{svg (Iif .IsActivated "octicon-check" "octicon-x")}}
6161
{{end}}
6262
</td>
6363
<td>
64-
<div class="tw-flex tw-gap-2">
65-
<a class="delete-button" href="" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-data-uid="{{.UID}}">{{svg "octicon-trash"}}</a>
66-
</div>
64+
<a class="link-action negative" href data-url="{{$.Link}}/delete?id={{.ID}}&uid={{.UID}}"
65+
data-modal-confirm-header="{{ctx.Locale.Tr "admin.emails.delete"}}"
66+
data-modal-confirm-content="{{ctx.Locale.Tr "admin.emails.delete_desc"}}"
67+
>{{svg "octicon-trash"}}</a>
6768
</td>
6869
</tr>
6970
{{end}}
@@ -77,40 +78,24 @@
7778
<div class="header">
7879
{{ctx.Locale.Tr "admin.emails.change_email_header"}}
7980
</div>
80-
<div class="content">
81+
<form class="content ui form" action="{{AppSubUrl}}/-/admin/emails/activate" method="post">
8182
<p class="center">{{ctx.Locale.Tr "admin.emails.change_email_text"}}</p>
8283

83-
<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/-/admin/emails/activate" method="post">
84-
{{$.CsrfTokenHtml}}
84+
{{$.CsrfTokenHtml}}
8585

86-
<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
87-
<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
88-
<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
89-
<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
86+
<input type="hidden" name="sort" value="{{.SortType}}">
87+
<input type="hidden" name="q" value="{{.Keyword}}">
88+
<input type="hidden" name="is_primary" value="{{.IsPrimary}}">
89+
<input type="hidden" name="is_activated" value="{{.IsActivated}}">
9090

91-
<input type="hidden" id="form-uid" name="uid" value="" required>
92-
<input type="hidden" id="form-email" name="email" value="" required>
93-
<input type="hidden" id="form-primary" name="primary" value="" required>
94-
<input type="hidden" id="form-activate" name="activate" value="" required>
91+
<input type="hidden" name="uid">
92+
<input type="hidden" name="email">
93+
<input type="hidden" name="primary">
94+
<input type="hidden" name="activate">
9595

96-
<div class="center">
97-
{{template "base/modal_actions_confirm" .}}
98-
</div>
99-
</form>
100-
</div>
96+
{{template "base/modal_actions_confirm" .}}
97+
</form>
10198
</div>
102-
103-
</div>
104-
105-
<div class="ui g-modal-confirm delete modal">
106-
<div class="header">
107-
{{svg "octicon-trash"}}
108-
{{ctx.Locale.Tr "admin.emails.delete"}}
109-
</div>
110-
<div class="content">
111-
{{ctx.Locale.Tr "admin.emails.delete_desc"}}
11299
</div>
113-
{{template "base/modal_actions_confirm" .}}
114-
</div>
115100

116101
{{template "admin/layout_footer" .}}

‎templates/devtest/devtest-footer.tmpl

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{/* TODO: the devtest.js is isolated from index.js, so no module is shared and many index.js functions do not work in devtest.ts */}}
2+
<script src="{{AssetUrlPrefix}}/js/devtest.js?v={{AssetVersion}}"></script>
3+
{{template "base/footer" dict}}

‎templates/devtest/devtest-header.tmpl

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{template "base/head" dict}}
2+
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">

‎templates/devtest/list.tmpl ‎templates/devtest/devtest-list.tmpl

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{template "base/head" .}}
2-
1+
{{template "devtest/devtest-header"}}
32
<ul>
43
{{range .SubNames}}
54
<li><a href="{{AppSubUrl}}/devtest/{{.}}">{{.}}</a></li>
@@ -11,5 +10,4 @@ ul {
1110
line-height: 2em;
1211
}
1312
</style>
14-
15-
{{template "base/footer" .}}
13+
{{template "devtest/devtest-footer"}}

‎templates/devtest/fetch-action.tmpl

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{template "base/head" .}}
1+
{{template "devtest/devtest-header"}}
22
<div class="page-content devtest ui container">
33
{{template "base/alert" .}}
44
<div>
@@ -11,6 +11,7 @@
1111
<button class="link-action" data-url="fetch-action-test?k=1">test action</button>
1212
<button class="link-action" data-url="fetch-action-test?k=1" data-modal-confirm="confirm?">test with confirm</button>
1313
<button class="ui red button link-action" data-url="fetch-action-test?k=1" data-modal-confirm="confirm?">test with risky confirm</button>
14+
<button class="ui button link-action" data-url="fetch-action-test?k=1" data-modal-confirm-header="confirm header" data-modal-confirm-content="confirm content">test with confirm header</button>
1415
</div>
1516
</div>
1617
<div>
@@ -41,4 +42,4 @@
4142
border: 1px red dashed; /* show the border for demo purpose */
4243
}
4344
</style>
44-
{{template "base/footer" .}}
45+
{{template "devtest/devtest-footer"}}

‎templates/devtest/flex-list.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{template "base/head" .}}
2-
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
1+
{{template "devtest/devtest-header"}}
32
<div class="page-content devtest">
43
<div class="ui container">
54
<h1>Flex List (standalone)</h1>
@@ -112,4 +111,4 @@
112111
</div>
113112
</div>
114113
</div>
115-
{{template "base/footer" .}}
114+
{{template "devtest/devtest-footer"}}

‎templates/devtest/fomantic-dropdown.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{template "base/head" .}}
2-
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
1+
{{template "devtest/devtest-header"}}
32
<div class="page-content devtest ui container">
43
<div>
54
<h2>Dropdown</h2>
@@ -128,4 +127,4 @@
128127
</div>
129128
</div>
130129
</div>
131-
{{template "base/footer" .}}
130+
{{template "devtest/devtest-footer"}}

‎templates/devtest/fomantic-modal.tmpl

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{{template "base/head" .}}
1+
{{template "devtest/devtest-header"}}
22
<div class="page-content devtest ui container">
33
{{template "base/alert" .}}
44
<div class="modal-buttons flex-text-block tw-flex-wrap"></div>
55
<script type="module">
6-
for (const el of $('.ui.modal')) {
6+
for (const el of $('.ui.modal:not([data-skip-button])')) {
77
const $btn = $('<button class="ui button">').text(`${el.id}`).on('click', () => {
88
$(el).modal({onApprove() {alert('confirmed')}}).modal('show');
99
});
@@ -69,5 +69,27 @@
6969
<div class="content">hello, this is the modal dialog content, this is a dangerous operation</div>
7070
{{template "base/modal_actions_confirm" (dict "ModalButtonDangerText" "I know and must do this is dangerous operation")}}
7171
</div>
72+
73+
<div class="divider"></div>
74+
75+
<button class="show-modal" data-modal="#test-modal-fill-values"
76+
data-modal-fill-by-id="value for id"
77+
data-modal-fill-by-name="value for name"
78+
data-modal-fill-by-class="value for class"
79+
data-modal-p="value for tag"
80+
data-modal-a.text-content="fill with attr"
81+
>test-modal-fill-values</button>
82+
83+
<div id="test-modal-fill-values" class="ui mini modal" data-skip-button>
84+
<div class="header">Modal dialog (fill values)</div>
85+
<form class="content">
86+
<div id="fill-by-id"></div>
87+
<input name="fill-by-name">
88+
<div class="fill-by-class"></div>
89+
<p></p>
90+
<a href="#">link</a>
91+
{{template "base/modal_actions_confirm" dict}}
92+
</form>
93+
</div>
7294
</div>
73-
{{template "base/footer" .}}
95+
{{template "devtest/devtest-footer"}}

‎templates/devtest/gitea-ui.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{template "base/head" .}}
2-
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
1+
{{template "devtest/devtest-header"}}
32
<div class="page-content devtest ui container">
43
<div>
54
<h1>Link</h1>
@@ -193,4 +192,4 @@
193192
<button class="{{if true}}tw-bg-red{{end}} tw-p-5 tw-border tw-rounded hover:tw-bg-blue active:tw-bg-yellow">Button</button>
194193
</div>
195194
</div>
196-
{{template "base/footer" .}}
195+
{{template "devtest/devtest-footer"}}

‎templates/devtest/global-button.tmpl

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{{template "devtest/devtest-header"}}
2+
<div class="page-content devtest ui container">
3+
<div>
4+
<h1>Show/Hide panel</h1>
5+
<div>
6+
<!-- to test Space/Enter also works on non-button buttons with children -->
7+
<div tabindex="0" class="ui button show-panel toggle" data-panel="#devtest-panel-show-hide"><span>Toggle panel 1</span></div>
8+
<span tabindex="0" class="ui button show-panel" data-panel="#devtest-panel-show-hide"><span>Show panel 1</span></span>
9+
</div>
10+
<div id="devtest-panel-show-hide">
11+
<div>Panel 1 content</div>
12+
<div class="ui button hide-panel" data-panel-closest="div">Hide panel 1</div>
13+
</div>
14+
</div>
15+
</div>
16+
{{template "devtest/devtest-footer"}}

‎templates/devtest/label.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{template "base/head" .}}
2-
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
1+
{{template "devtest/devtest-header"}}
32
<div class="page-content devtest ui container">
43
<div>
54
<h1>Label</h1>
@@ -24,4 +23,4 @@
2423
</div>
2524
</div>
2625
</div>
27-
{{template "base/footer" .}}
26+
{{template "devtest/devtest-footer"}}

‎templates/devtest/tmplerr.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{template "base/head" .}}
1+
{{template "devtest/devtest-header"}}
22
<div class="page-content devtest">
33
<div class="tw-flex">
44
<div class="tw-w-4/5">
@@ -9,4 +9,4 @@
99
</div>
1010
</div>
1111
</div>
12-
{{template "base/footer" .}}
12+
{{template "devtest/devtest-footer"}}

‎templates/devtest/toast.tmpl

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{template "base/head" .}}
2-
1+
{{template "devtest/devtest-header"}}
32
<div>
43
<h1>Toast</h1>
54
<div>
@@ -9,7 +8,4 @@
98
<button class="ui button toast-test-button" data-toast-level="error" data-toast-message="very looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong message">Show Error Toast (long)</button>
109
</div>
1110
</div>
12-
13-
<script src="{{AssetUrlPrefix}}/js/devtest.js?v={{AssetVersion}}"></script>
14-
15-
{{template "base/footer" .}}
11+
{{template "devtest/devtest-footer"}}

‎web_src/js/features/admin/emails.ts

-13
This file was deleted.

0 commit comments

Comments
 (0)