Skip to content

Commit 6874fe9

Browse files
silverwindwxiaoguang
silverwind
and
wxiaoguang
authored
Cleanup and use global style on popups (#17674)
* Cleanup and use global style on popups - Fix typo 'poping' to 'popping' - Remove most inline 'data-variation' attributes - Initialize all popups with 'inverted tiny' variation * misc tweaks * rename to .tooltip, use jQuery Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent c98dd7a commit 6874fe9

38 files changed

+129
-121
lines changed

‎templates/admin/auth/list.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
3030
<td>{{.TypeName}}</td>
3131
<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
32-
<td><span class="poping up" data-content="{{.UpdatedUnix.FormatShort}}" data-variation="tiny">{{.UpdatedUnix.FormatShort}}</span></td>
33-
<td><span class="poping up" data-content="{{.CreatedUnix.FormatLong}}" data-variation="tiny">{{.CreatedUnix.FormatShort}}</span></td>
32+
<td><span class="tooltip" data-content="{{.UpdatedUnix.FormatShort}}">{{.UpdatedUnix.FormatShort}}</span></td>
33+
<td><span class="tooltip" data-content="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
3434
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
3535
</tr>
3636
{{end}}

‎templates/admin/notice.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<td>{{.ID}}</td>
3030
<td>{{$.i18n.Tr .TrStr}}</td>
3131
<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
32-
<td><span class="notice-created-time poping up" data-content="{{.CreatedUnix.AsTime}}" data-variation="inverted tiny">{{.CreatedUnix.FormatShort}}</span></td>
32+
<td><span class="notice-created-time tooltip" data-content="{{.CreatedUnix.AsTime}}">{{.CreatedUnix.FormatShort}}</span></td>
3333
<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
3434
</tr>
3535
{{end}}

‎templates/admin/user/edit.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<div class="menu">
4646
{{range $mode := .AllowedUserVisibilityModes}}
4747
{{if $mode.IsPublic}}
48-
<div class="item poping up" data-content="{{$.i18n.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.i18n.Tr "settings.visibility.public"}}</div>
48+
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.i18n.Tr "settings.visibility.public"}}</div>
4949
{{else if $mode.IsLimited}}
50-
<div class="item poping up" data-content="{{$.i18n.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.i18n.Tr "settings.visibility.limited"}}</div>
50+
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.i18n.Tr "settings.visibility.limited"}}</div>
5151
{{else if $mode.IsPrivate}}
52-
<div class="item poping up" data-content="{{$.i18n.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.i18n.Tr "settings.visibility.private"}}</div>
52+
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.i18n.Tr "settings.visibility.private"}}</div>
5353
{{end}}
5454
{{end}}
5555
</div>
@@ -117,7 +117,7 @@
117117
</div>
118118
</div>
119119
<div class="inline field">
120-
<div class="ui checkbox poping up" data-content="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}" data-variation="very wide">
120+
<div class="ui checkbox tooltip" data-content="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}" data-variation="very wide">
121121
<label><strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong></label>
122122
<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
123123
</div>

‎templates/admin/user/new.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
<div class="menu">
4040
{{range $mode := .AllowedUserVisibilityModes}}
4141
{{if $mode.IsPublic}}
42-
<div class="item poping up" data-content="{{$.i18n.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.i18n.Tr "settings.visibility.public"}}</div>
42+
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.i18n.Tr "settings.visibility.public"}}</div>
4343
{{else if $mode.IsLimited}}
44-
<div class="item poping up" data-content="{{$.i18n.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.i18n.Tr "settings.visibility.limited"}}</div>
44+
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.i18n.Tr "settings.visibility.limited"}}</div>
4545
{{else if $mode.IsPrivate}}
46-
<div class="item poping up" data-content="{{$.i18n.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.i18n.Tr "settings.visibility.private"}}</div>
46+
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.i18n.Tr "settings.visibility.private"}}</div>
4747
{{end}}
4848
{{end}}
4949
</div>

‎templates/base/head_navbar.tmpl

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="ui container" id="navbar">
22
<div class="item brand" style="justify-content: space-between;">
3-
<a href="{{AppSubUrl}}/" data-content="{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}" data-variation="tiny inverted">
3+
<a href="{{AppSubUrl}}/" data-content="{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}">
44
<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg">
55
</a>
66
<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
@@ -41,7 +41,7 @@
4141

4242
{{if and .IsSigned .MustChangePassword}}
4343
<div class="right stackable menu">
44-
<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
44+
<div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}">
4545
<span class="text">
4646
{{avatar .SignedUser 24 "tiny"}}
4747
<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
@@ -84,23 +84,23 @@
8484
<form class="stopwatch-commit" method="POST" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/toggle">
8585
{{.CsrfTokenHtml}}
8686
<button
87-
class="ui button mini compact basic icon fitted poping up"
87+
class="ui button mini compact basic icon fitted tooltip"
8888
data-content="{{.i18n.Tr "repo.issues.stop_tracking"}}"
89-
data-position="top right" data-variation="small inverted"
89+
data-position="top right"
9090
>{{svg "octicon-square-fill"}}</button>
9191
</form>
9292
<form class="stopwatch-cancel" method="POST" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/cancel">
9393
{{.CsrfTokenHtml}}
9494
<button
95-
class="ui button mini compact basic icon fitted poping up"
95+
class="ui button mini compact basic icon fitted tooltip"
9696
data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}"
97-
data-position="top right" data-variation="small inverted"
97+
data-position="top right"
9898
>{{svg "octicon-trash"}}</button>
9999
</form>
100100
</div>
101101
</div>
102102

103-
<a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
103+
<a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.i18n.Tr "notifications"}}'>
104104
<span class="text">
105105
<span class="fitted">{{svg "octicon-bell"}}</span>
106106
<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
@@ -112,7 +112,7 @@
112112
</span>
113113
</a>
114114

115-
<div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
115+
<div class="ui dropdown jump item tooltip" data-content="{{.i18n.Tr "create_new"}}">
116116
<span class="text">
117117
<span class="fitted">{{svg "octicon-plus"}}</span>
118118
<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
@@ -135,7 +135,7 @@
135135
</div><!-- end content create new menu -->
136136
</div><!-- end dropdown menu create new -->
137137

138-
<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
138+
<div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}">
139139
<span class="text">
140140
{{avatar .SignedUser 24 "tiny"}}
141141
<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>

‎templates/install.tmpl

+12-12
Original file line numberDiff line numberDiff line change
@@ -186,73 +186,73 @@
186186
</summary>
187187
<div class="inline field">
188188
<div class="ui checkbox" id="offline-mode">
189-
<label class="poping up" data-content="{{.i18n.Tr "install.offline_mode_popup"}}"><strong>{{.i18n.Tr "install.offline_mode"}}</strong></label>
189+
<label class="tooltip" data-content="{{.i18n.Tr "install.offline_mode_popup"}}"><strong>{{.i18n.Tr "install.offline_mode"}}</strong></label>
190190
<input name="offline_mode" type="checkbox" {{if .offline_mode}}checked{{end}}>
191191
</div>
192192
</div>
193193
<div class="inline field">
194194
<div class="ui checkbox" id="disable-gravatar">
195-
<label class="poping up" data-content="{{.i18n.Tr "install.disable_gravatar_popup"}}"><strong>{{.i18n.Tr "install.disable_gravatar"}}</strong></label>
195+
<label class="tooltip" data-content="{{.i18n.Tr "install.disable_gravatar_popup"}}"><strong>{{.i18n.Tr "install.disable_gravatar"}}</strong></label>
196196
<input name="disable_gravatar" type="checkbox" {{if .disable_gravatar}}checked{{end}}>
197197
</div>
198198
</div>
199199
<div class="inline field">
200200
<div class="ui checkbox" id="federated-avatar-lookup">
201-
<label class="poping up" data-content="{{.i18n.Tr "install.federated_avatar_lookup_popup"}}"><strong>{{.i18n.Tr "install.federated_avatar_lookup"}}</strong></label>
201+
<label class="tooltip" data-content="{{.i18n.Tr "install.federated_avatar_lookup_popup"}}"><strong>{{.i18n.Tr "install.federated_avatar_lookup"}}</strong></label>
202202
<input name="enable_federated_avatar" type="checkbox" {{if .enable_federated_avatar}}checked{{end}}>
203203
</div>
204204
</div>
205205
<div class="inline field">
206206
<div class="ui checkbox" id="enable-openid-signin">
207-
<label class="poping up" data-content="{{.i18n.Tr "install.openid_signin_popup"}}"><strong>{{.i18n.Tr "install.openid_signin"}}</strong></label>
207+
<label class="tooltip" data-content="{{.i18n.Tr "install.openid_signin_popup"}}"><strong>{{.i18n.Tr "install.openid_signin"}}</strong></label>
208208
<input name="enable_open_id_sign_in" type="checkbox" {{if .enable_open_id_sign_in}}checked{{end}}>
209209
</div>
210210
</div>
211211
<div class="inline field">
212212
<div class="ui checkbox" id="disable-registration">
213-
<label class="poping up" data-content="{{.i18n.Tr "install.disable_registration_popup"}}"><strong>{{.i18n.Tr "install.disable_registration"}}</strong></label>
213+
<label class="tooltip" data-content="{{.i18n.Tr "install.disable_registration_popup"}}"><strong>{{.i18n.Tr "install.disable_registration"}}</strong></label>
214214
<input name="disable_registration" type="checkbox" {{if .disable_registration}}checked{{end}}>
215215
</div>
216216
</div>
217217
<div class="inline field">
218218
<div class="ui checkbox" id="allow-only-external-registration">
219-
<label class="poping up" data-content="{{.i18n.Tr "install.allow_only_external_registration_popup"}}"><strong>{{.i18n.Tr "install.allow_only_external_registration_popup"}}</strong></label>
219+
<label class="tooltip" data-content="{{.i18n.Tr "install.allow_only_external_registration_popup"}}"><strong>{{.i18n.Tr "install.allow_only_external_registration_popup"}}</strong></label>
220220
<input name="allow_only_external_registration" type="checkbox" {{if .allow_only_external_registration}}checked{{end}}>
221221
</div>
222222
</div>
223223
<div class="inline field">
224224
<div class="ui checkbox" id="enable-openid-signup">
225-
<label class="poping up" data-content="{{.i18n.Tr "install.openid_signup_popup"}}"><strong>{{.i18n.Tr "install.openid_signup"}}</strong></label>
225+
<label class="tooltip" data-content="{{.i18n.Tr "install.openid_signup_popup"}}"><strong>{{.i18n.Tr "install.openid_signup"}}</strong></label>
226226
<input name="enable_open_id_sign_up" type="checkbox" {{if .enable_open_id_sign_up}}checked{{end}}>
227227
</div>
228228
</div>
229229
<div class="inline field">
230230
<div class="ui checkbox" id="enable-captcha">
231-
<label class="poping up" data-content="{{.i18n.Tr "install.enable_captcha_popup"}}"><strong>{{.i18n.Tr "install.enable_captcha"}}</strong></label>
231+
<label class="tooltip" data-content="{{.i18n.Tr "install.enable_captcha_popup"}}"><strong>{{.i18n.Tr "install.enable_captcha"}}</strong></label>
232232
<input name="enable_captcha" type="checkbox" {{if .enable_captcha}}checked{{end}}>
233233
</div>
234234
</div>
235235
<div class="inline field">
236236
<div class="ui checkbox">
237-
<label class="poping up" data-content="{{.i18n.Tr "install.require_sign_in_view_popup"}}"><strong>{{.i18n.Tr "install.require_sign_in_view"}}</strong></label>
237+
<label class="tooltip" data-content="{{.i18n.Tr "install.require_sign_in_view_popup"}}"><strong>{{.i18n.Tr "install.require_sign_in_view"}}</strong></label>
238238
<input name="require_sign_in_view" type="checkbox" {{if .require_sign_in_view}}checked{{end}}>
239239
</div>
240240
</div>
241241
<div class="inline field">
242242
<div class="ui checkbox">
243-
<label class="poping up" data-content="{{.i18n.Tr "install.default_keep_email_private_popup"}}"><strong>{{.i18n.Tr "install.default_keep_email_private"}}</strong></label>
243+
<label class="tooltip" data-content="{{.i18n.Tr "install.default_keep_email_private_popup"}}"><strong>{{.i18n.Tr "install.default_keep_email_private"}}</strong></label>
244244
<input name="default_keep_email_private" type="checkbox" {{if .default_keep_email_private}}checked{{end}}>
245245
</div>
246246
</div>
247247
<div class="inline field">
248248
<div class="ui checkbox">
249-
<label class="poping up" data-content="{{.i18n.Tr "install.default_allow_create_organization_popup"}}"><strong>{{.i18n.Tr "install.default_allow_create_organization"}}</strong></label>
249+
<label class="tooltip" data-content="{{.i18n.Tr "install.default_allow_create_organization_popup"}}"><strong>{{.i18n.Tr "install.default_allow_create_organization"}}</strong></label>
250250
<input name="default_allow_create_organization" type="checkbox" {{if .default_allow_create_organization}}checked{{end}}>
251251
</div>
252252
</div>
253253
<div class="inline field">
254254
<div class="ui checkbox">
255-
<label class="poping up" data-content="{{.i18n.Tr "install.default_enable_timetracking_popup"}}"><strong>{{.i18n.Tr "install.default_enable_timetracking"}}</strong></label>
255+
<label class="tooltip" data-content="{{.i18n.Tr "install.default_enable_timetracking_popup"}}"><strong>{{.i18n.Tr "install.default_enable_timetracking"}}</strong></label>
256256
<input name="default_enable_timetracking" type="checkbox" {{if .default_enable_timetracking}}checked{{end}}>
257257
</div>
258258
</div>

‎templates/org/team/new.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<br>
8383
{{range $t, $unit := $.Units}}
8484
{{if $unit.Type.UnitGlobalDisabled}}
85-
<div class="field poping up" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
85+
<div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
8686
{{else}}
8787
<div class="field">
8888
{{end}}

‎templates/repo/blame.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</td>
4545
<td class="lines-blame-btn">
4646
{{if $row.PreviousSha}}
47-
<a href="{{$row.PreviousShaURL}}" class="poping up" data-content='{{$.i18n.Tr "repo.blame_prior"}}' data-variation="tiny inverted">
47+
<a href="{{$row.PreviousShaURL}}" class="tooltip" data-content='{{$.i18n.Tr "repo.blame_prior"}}'>
4848
{{svg "octicon-versions"}}
4949
</a>
5050
{{end}}

0 commit comments

Comments
 (0)