Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrating wiki don't require token, so we should move it out of the require form (#17645) 

* Migrating wiki don't require token, so we should move it out of the require form

* Fix lint
This commit is contained in:
Lunny Xiao 2021-11-16 14:17:21 +08:00 committed by GitHub
parent 6f7082ff56
commit d789670894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 78 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
templates/repo/migrate/gitbucket.tmpl
View File

@ -22,7 +22,6 @@
<label for="auth_username">{{.i18n.Tr "username"}}</label> <label for="auth_username">{{.i18n.Tr "username"}}</label>
<input id="auth_username" name="auth_username" value="{{.auth_username}}" {{if not .auth_username}}data-need-clear="true"{{end}}> <input id="auth_username" name="auth_username" value="{{.auth_username}}" {{if not .auth_username}}data-need-clear="true"{{end}}>
</div> </div>
<input class="fake" type="password">
<div class="inline field {{if .Err_Auth}}error{{end}}"> <div class="inline field {{if .Err_Auth}}error{{end}}">
<label for="auth_password">{{.i18n.Tr "password"}}</label> <label for="auth_password">{{.i18n.Tr "password"}}</label>
<input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}"> <input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}">
@ -30,19 +29,16 @@
{{template "repo/migrate/options" .}} {{template "repo/migrate/options" .}}
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field">
<div id="migrate_items"> <label>{{.i18n.Tr "repo.migrate_items"}}</label>
<div class="inline field"> <div class="ui checkbox">
<label>{{.i18n.Tr "repo.migrate_items"}}</label> <input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
<div class="ui checkbox"> <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div> </div>
</div>
<div id="migrate_items">
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
<div class="inline field"> <div class="inline field">
<label></label> <label></label>
<div class="ui checkbox"> <div class="ui checkbox">
@ -65,6 +61,13 @@
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
</div> </div>
</div> </div>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>

28
templates/repo/migrate/gitea.tmpl
View File

@ -26,19 +26,16 @@
{{template "repo/migrate/options" .}} {{template "repo/migrate/options" .}}
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field">
<div id="migrate_items"> <label>{{.i18n.Tr "repo.migrate_items"}}</label>
<div class="inline field"> <div class="ui checkbox">
<label>{{.i18n.Tr "repo.migrate_items"}}</label> <input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
<div class="ui checkbox"> <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div> </div>
</div>
<div id="migrate_items">
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
<div class="inline field"> <div class="inline field">
<label></label> <label></label>
<div class="ui checkbox"> <div class="ui checkbox">
@ -61,6 +58,13 @@
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
</div> </div>
</div> </div>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>

27
templates/repo/migrate/github.tmpl
View File

@ -29,19 +29,15 @@
{{template "repo/migrate/options" .}} {{template "repo/migrate/options" .}}
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field">
<div id="migrate_items"> <label>{{.i18n.Tr "repo.migrate_items"}}</label>
<div class="inline field"> <div class="ui checkbox">
<label>{{.i18n.Tr "repo.migrate_items"}}</label> <input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
<div class="ui checkbox"> <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div> </div>
</div>
<div id="migrate_items">
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
<div class="inline field"> <div class="inline field">
<label></label> <label></label>
<div class="ui checkbox"> <div class="ui checkbox">
@ -64,6 +60,13 @@
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
</div> </div>
</div> </div>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>

27
templates/repo/migrate/gitlab.tmpl
View File

@ -26,19 +26,15 @@
{{template "repo/migrate/options" .}} {{template "repo/migrate/options" .}}
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field">
<div id="migrate_items"> <label>{{.i18n.Tr "repo.migrate_items"}}</label>
<div class="inline field"> <div class="ui checkbox">
<label>{{.i18n.Tr "repo.migrate_items"}}</label> <input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
<div class="ui checkbox"> <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div> </div>
</div>
<div id="migrate_items">
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
<div class="inline field"> <div class="inline field">
<label></label> <label></label>
<div class="ui checkbox"> <div class="ui checkbox">
@ -61,6 +57,13 @@
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
</div> </div>
</div> </div>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>

28
templates/repo/migrate/gogs.tmpl
View File

@ -26,19 +26,16 @@
{{template "repo/migrate/options" .}} {{template "repo/migrate/options" .}}
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field">
<div id="migrate_items"> <label>{{.i18n.Tr "repo.migrate_items"}}</label>
<div class="inline field"> <div class="ui checkbox">
<label>{{.i18n.Tr "repo.migrate_items"}}</label> <input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
<div class="ui checkbox"> <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
</div>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div> </div>
</div>
<div id="migrate_items">
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
<div class="inline field"> <div class="inline field">
<label></label> <label></label>
<div class="ui checkbox"> <div class="ui checkbox">
@ -50,6 +47,13 @@
<label>{{.i18n.Tr "repo.migrate_items_issues" | Safe}}</label> <label>{{.i18n.Tr "repo.migrate_items_issues" | Safe}}</label>
</div> </div>
</div> </div>
<div class="inline field">
<label></label>
<div class="ui checkbox">
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
</div>
</div>
<!-- Gogs do not support it <!-- Gogs do not support it
<div class="inline field"> <div class="inline field">
<label></label> <label></label>

1
web_src/less/_form.less
View File

@ -135,7 +135,6 @@ textarea:focus,
.form { .form {
.help { .help {
color: #999999; color: #999999;
padding-top: .6em;
padding-bottom: .6em; padding-bottom: .6em;
display: inline-block; display: inline-block;
} }