Skip to content

Commit 65d051e

Browse files
lunnylunny
committed
improvements
1 parent 8e273ce commit 65d051e

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

‎options/locale/locale_en-US.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3377,6 +3377,7 @@ config.default_allow_create_organization_desc = Every new user will have rights
33773377
config.default_user_is_restricted = New user will be restricted by default
33783378
config.default_user_is_restricted_desc = Every new user will have restricted permissions depending on this setting
33793379
config.enable_time_tracking = Enable Time Tracking
3380+
config.enable_time_tracking_desc = Allow users to track time on issues and pull requests
33803381
config.default_enable_time_tracking = Enable Time Tracking by Default
33813382
config.default_enable_time_tracking_desc = Repositories will use time tracking by default depending on this setting
33823383
config.default_allow_only_contributors_to_track_time = Let Only Contributors Track Time

‎templates/admin/config_settings/service.tmpl‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,103 @@
22
{{ctx.Locale.Tr "admin.config.service_config"}}
33
</h4>
44
<div class="ui attached table segment">
5+
<form class="ui form">
56
<dl class="admin-dl-horizontal">
67
<dt>{{ctx.Locale.Tr "admin.config.default_keep_email_private"}}</dt>
78
<dd>
8-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_keep_email_private_desc"}}">
9+
<div class="ui toggle checkbox">
910
<input type="checkbox" data-config-dyn-key="service.default_keep_email_private" {{if .SystemConfig.Service.DefaultKeepEmailPrivate.Value ctx}}checked{{end}}><label></label>
1011
</div>
1112
</dd>
13+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_keep_email_private_desc"}}</p></div>
1214
<div class="divider"></div>
1315
<dt>{{ctx.Locale.Tr "admin.config.default_allow_create_organization"}}</dt>
1416
<dd>
15-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_allow_create_organization_desc"}}">
17+
<div class="ui toggle checkbox">
1618
<input type="checkbox" data-config-dyn-key="service.default_allow_create_organization" {{if .SystemConfig.Service.DefaultAllowCreateOrganization.Value ctx}}checked{{end}}><label></label>
1719
</div>
1820
</dd>
21+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_allow_create_organization_desc"}}</p></div>
1922
<div class="divider"></div>
2023
<dt>{{ctx.Locale.Tr "admin.config.default_user_is_restricted"}}</dt>
2124
<dd>
22-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_user_is_restricted_desc"}}">
25+
<div class="ui toggle checkbox">
2326
<input type="checkbox" data-config-dyn-key="service.default_user_is_restricted" {{if .SystemConfig.Service.DefaultUserIsRestricted.Value ctx}}checked{{end}}><label></label>
2427
</div>
2528
</dd>
29+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_user_is_restricted_desc"}}</p></div>
2630
<div class="divider"></div>
2731
<dt>{{ctx.Locale.Tr "admin.config.enable_time_tracking"}}</dt>
2832
<dd>
29-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.enable_time_tracking_desc"}}">
33+
<div class="ui toggle checkbox">
3034
<input type="checkbox" data-config-dyn-key="service.enable_time_tracking" {{if .SystemConfig.Service.EnableTimeTracking.Value ctx}}checked{{end}}><label></label>
3135
</div>
3236
</dd>
37+
<div><p class="help">{{ctx.Locale.Tr "admin.config.enable_time_tracking_desc"}}</p></div>
3338
<div class="divider"></div>
3439
<dt>{{ctx.Locale.Tr "admin.config.default_enable_time_tracking"}}</dt>
3540
<dd>
36-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_enable_time_tracking_desc"}}">
41+
<div class="ui toggle checkbox">
3742
<input type="checkbox" data-config-dyn-key="service.default_enable_time_tracking" {{if .SystemConfig.Service.DefaultEnableTimeTracking.Value ctx}}checked{{end}}><label></label>
3843
</div>
3944
</dd>
45+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_enable_time_tracking_desc"}}</p></div>
4046
<div class="divider"></div>
4147
<dt>{{ctx.Locale.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
4248
<dd>
43-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_allow_only_contributors_to_track_time_desc"}}">
49+
<div class="ui toggle checkbox">
4450
<input type="checkbox" data-config-dyn-key="service.default_allow_only_contributors_to_track_time" {{if .SystemConfig.Service.DefaultAllowOnlyContributorsToTrackTime.Value ctx}}checked{{end}}><label></label>
4551
</div>
4652
</dd>
53+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_allow_only_contributors_to_track_time_desc"}}</p></div>
4754
<div class="divider"></div>
4855
<dt>{{ctx.Locale.Tr "admin.config.default_enable_dependencies"}}</dt>
4956
<dd>
50-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_enable_dependencies_desc"}}">
57+
<div class="ui toggle checkbox">
5158
<input type="checkbox" data-config-dyn-key="service.default_enable_dependencies" {{if .SystemConfig.Service.DefaultEnableDependencies.Value ctx}}checked{{end}}><label></label>
5259
</div>
5360
</dd>
61+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_enable_dependencies_desc"}}</p></div>
5462
<div class="divider"></div>
5563
<dt>{{ctx.Locale.Tr "admin.config.allow_cross_repository_dependencies"}}</dt>
5664
<dd>
57-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.allow_cross_repository_dependencies_desc"}}">
65+
<div class="ui toggle checkbox">
5866
<input type="checkbox" data-config-dyn-key="service.allow_cross_repository_dependencies" {{if .SystemConfig.Service.AllowCrossRepositoryDependencies.Value ctx}}checked{{end}}><label></label>
5967
</div>
6068
</dd>
69+
<div><p class="help">{{ctx.Locale.Tr "admin.config.allow_cross_repository_dependencies_desc"}}</p></div>
6170
<div class="divider"></div>
6271
<dt>{{ctx.Locale.Tr "admin.config.enable_user_heatmap"}}</dt>
6372
<dd>
64-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.enable_user_heatmap_desc"}}">
73+
<div class="ui toggle checkbox">
6574
<input type="checkbox" data-config-dyn-key="service.enable_user_heatmap" {{if .SystemConfig.Service.EnableUserHeatmap.Value ctx}}checked{{end}}><label></label>
6675
</div>
6776
</dd>
77+
<div><p class="help">{{ctx.Locale.Tr "admin.config.enable_user_heatmap_desc"}}</p></div>
6878
<div class="divider"></div>
6979
<dt>{{ctx.Locale.Tr "admin.config.auto_watch_new_repos"}}</dt>
7080
<dd>
71-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.auto_watch_new_repos_desc"}}">
81+
<div class="ui toggle checkbox">
7282
<input type="checkbox" data-config-dyn-key="service.auto_watch_new_repos" {{if .SystemConfig.Service.AutoWatchNewRepos.Value ctx}}checked{{end}}><label></label>
7383
</div>
7484
</dd>
85+
<div><p class="help">{{ctx.Locale.Tr "admin.config.auto_watch_new_repos_desc"}}</p></div>
7586
<div class="divider"></div>
7687
<dt>{{ctx.Locale.Tr "admin.config.auto_watch_on_changes"}}</dt>
7788
<dd>
78-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.auto_watch_on_changes_desc"}}">
89+
<div class="ui toggle checkbox">
7990
<input type="checkbox" data-config-dyn-key="service.auto_watch_on_changes" {{if .SystemConfig.Service.AutoWatchOnChanges.Value ctx}}checked{{end}}><label></label>
8091
</div>
8192
</dd>
93+
<div><p class="help">{{ctx.Locale.Tr "admin.config.auto_watch_on_changes_desc"}}</p></div>
8294
<div class="divider"></div>
8395
<dt>{{ctx.Locale.Tr "admin.config.default_org_member_visible"}}</dt>
8496
<dd>
85-
<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.default_org_member_visible_desc"}}">
97+
<div class="ui toggle checkbox">
8698
<input type="checkbox" data-config-dyn-key="service.default_org_member_visible" {{if .SystemConfig.Service.DefaultOrgMemberVisible.Value ctx}}checked{{end}}><label></label>
8799
</div>
88100
</dd>
101+
<div><p class="help">{{ctx.Locale.Tr "admin.config.default_org_member_visible_desc"}}</p></div>
89102
</dl>
103+
</form>
90104
</div>

‎templates/repo/settings/options.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
</div>
373373
</div>
374374
<div class="field tw-pl-4 {{if (.Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeExternalTracker)}}disabled{{end}}" id="internal_issue_box">
375-
{{if .Repository.CanEnableTimetracker}}
375+
{{if .Repository.CanEnableTimetracker ctx}}
376376
<div class="field">
377377
<div class="ui checkbox">
378378
<input name="enable_timetracker" class="enable-system" data-target="#only_contributors" type="checkbox" {{if .Repository.IsTimetrackerEnabled ctx}}checked{{end}}>

0 commit comments

Comments
 (0)