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

* 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>

diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 52528fc57c27f5988a55bc85c0c8ac88dfcfe1ea..6b0445ff37c65fa497e2966f2e0c39c35a07c8b8 100644 (file)
--- 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 156f8896fce04f5812b8087500ed1e9664b07753..a96922b06573aee0388f3085076f2887eaa29d23 100644 (file)
--- 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 e1424c250fb059db30364e7d0a501e83b633f44f..b730164a8ff084a568762f87b62eff043150abdd 100644 (file)
--- 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 b1900e83d1019f20508ea6efbfb366bde0902071..c35ef017b33595e0f4d4a7740a94625ab1994947 100644 (file)
--- 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 4de0ed8d45332e3989aa0104a5819e86e5690860..7fdce11690874ab08f0e5f4a108652a101add221 100644 (file)
--- 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;
   }