diff options
author | Lunny Xiao | 2021-12-27 09:33:32 +0800 |
---|---|---|
committer | GitHub | 2021-12-27 09:33:32 +0800 |
commit | 353d88a42e2bfce9ba8923ad2ef3f2601ab65286 (patch) | |
tree | 97a4704046bb57ed7a8702763db9d6b2dba57e5c | |
parent | a17fce31a916d206557114144ef81a2ab7c7ecc8 (diff) |
Migrating wiki don't require token, so we should move it out of the require form (#17645) (#18104)
* Migrating wiki don't require token, so we should move it out of the require form
* Fix lint
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
-rw-r--r-- | templates/repo/migrate/gitea.tmpl | 28 | ||||
-rw-r--r-- | templates/repo/migrate/github.tmpl | 27 | ||||
-rw-r--r-- | templates/repo/migrate/gitlab.tmpl | 27 | ||||
-rw-r--r-- | templates/repo/migrate/gogs.tmpl | 28 | ||||
-rw-r--r-- | web_src/less/_form.less | 1 |
5 files changed, 62 insertions, 49 deletions
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 52528fc57..6b0445ff3 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -26,19 +26,16 @@ {{template "repo/migrate/options" .}} - <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> - <div id="migrate_items"> - <div class="inline field"> - <label>{{.i18n.Tr "repo.migrate_items"}}</label> - <div class="ui checkbox"> - <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 class="inline field"> + <label>{{.i18n.Tr "repo.migrate_items"}}</label> + <div class="ui checkbox"> + <input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}> + <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label> </div> + </div> + + <div id="migrate_items"> + <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field"> <label></label> <div class="ui checkbox"> @@ -61,6 +58,13 @@ <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> </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 class="ui divider"></div> diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 156f8896f..a96922b06 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -26,19 +26,15 @@ {{template "repo/migrate/options" .}} - <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> - <div id="migrate_items"> - <div class="inline field"> - <label>{{.i18n.Tr "repo.migrate_items"}}</label> - <div class="ui checkbox"> - <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 class="inline field"> + <label>{{.i18n.Tr "repo.migrate_items"}}</label> + <div class="ui checkbox"> + <input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}> + <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label> </div> + </div> + <div id="migrate_items"> + <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field"> <label></label> <div class="ui checkbox"> @@ -61,6 +57,13 @@ <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> </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 class="ui divider"></div> diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index e1424c250..b730164a8 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -26,19 +26,15 @@ {{template "repo/migrate/options" .}} - <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> - <div id="migrate_items"> - <div class="inline field"> - <label>{{.i18n.Tr "repo.migrate_items"}}</label> - <div class="ui checkbox"> - <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 class="inline field"> + <label>{{.i18n.Tr "repo.migrate_items"}}</label> + <div class="ui checkbox"> + <input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}> + <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label> </div> + </div> + <div id="migrate_items"> + <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field"> <label></label> <div class="ui checkbox"> @@ -61,6 +57,13 @@ <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> </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 class="ui divider"></div> diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index b1900e83d..c35ef017b 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -26,19 +26,16 @@ {{template "repo/migrate/options" .}} - <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> - <div id="migrate_items"> - <div class="inline field"> - <label>{{.i18n.Tr "repo.migrate_items"}}</label> - <div class="ui checkbox"> - <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 class="inline field"> + <label>{{.i18n.Tr "repo.migrate_items"}}</label> + <div class="ui checkbox"> + <input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}> + <label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label> </div> + </div> + + <div id="migrate_items"> + <span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span> <div class="inline field"> <label></label> <div class="ui checkbox"> @@ -50,6 +47,13 @@ <label>{{.i18n.Tr "repo.migrate_items_issues" | Safe}}</label> </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 <div class="inline field"> <label></label> diff --git a/web_src/less/_form.less b/web_src/less/_form.less index 4de0ed8d4..7fdce1169 100644 --- a/web_src/less/_form.less +++ b/web_src/less/_form.less @@ -135,7 +135,6 @@ textarea:focus, .form { .help { color: #999999; - padding-top: .6em; padding-bottom: .6em; display: inline-block; } |