Fix and improve repo visibility checkbox when FORCE_PRIVATE is on

templates/repo/create.tmpl

@@ -49,14 +49,17 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
 						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">

templates/repo/migrate/codebase.tmpl

@@ -88,14 +88,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/git.tmpl

@@ -62,14 +62,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/gitbucket.tmpl

@@ -104,14 +104,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/gitea.tmpl

@@ -100,14 +100,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}} checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/github.tmpl

@@ -102,14 +102,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/gitlab.tmpl

@@ -99,14 +99,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/gogs.tmpl

@@ -102,14 +102,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}} checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>

templates/repo/migrate/onedev.tmpl

@@ -88,14 +88,18 @@
 					<div class="inline field">
 						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
+							<input name="private" type="checkbox"
 								{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
+									checked disabled
-								<label>{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</label>
 								{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+									{{if .private}}checked{{end}}
+								{{end}}>
 							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
-							{{end}}
 						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>