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

diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl
index b554a3a75606a47139ae1e4ce521bc57455737e8..9c634dba347fc1dca057f212f9f6d849b68dbbf3 100644 (file)
--- a/templates/repo/migrate/gitbucket.tmpl
+++ b/templates/repo/migrate/gitbucket.tmpl
@@ -22,7 +22,6 @@
                                                <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}}>
                                        </div>
-                                       <input class="fake" type="password">
                                        <div class="inline field {{if .Err_Auth}}error{{end}}">
                                                <label for="auth_password">{{.i18n.Tr "password"}}</label>
                                                <input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}">
@@ -30,19 +29,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">
@@ -65,6 +61,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/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 901524d112272c6584b8d45f5d8d9ffe37d6e8b6..d0532923e1306b2ff2c1ceb9fdf1225b4dbb8909 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 9bd7228a43b4f0431202cde823cd61a99434715f..1dfd164c8553bb75279f2d18fc1a494686e50ec1 100644 (file)
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -29,19 +29,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">
@@ -64,6 +60,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 9c14e9571d70d5264232c86b0d2eea5c0bcd7c17..1a92b8e369d353ba8fa564c775e17fbc828fa6a1 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;
   }