Move add deploy key form before the list and add a cancel button (#17228)

diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index d2e9e256d2e1d63bbb822ff22355393c1c634581..68ab36b593b355b00b63055c6e9dc9608fc1f4e7 100644 (file)
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -4,6 +4,45 @@
        {{template "repo/settings/navbar" .}}
        <div class="ui container">
                {{template "base/alert" .}}
+               <div {{if not .HasError}}class="hide"{{end}} id="add-deploy-key-panel">
+                       <h4 class="ui top attached header">
+                               {{.i18n.Tr "repo.settings.add_deploy_key"}}
+                               <div class="ui right">
+                                       <button class="ui red tiny hide-panel button" data-panel="#add-deploy-key-panel">
+                                               {{.i18n.Tr "cancel"}}
+                                       </button>
+                               </div>
+                       </h4>
+                       <div class="ui attached segment">
+                               <form class="ui form" action="{{.Link}}" method="post">
+                                       {{.CsrfTokenHtml}}
+                                       <div class="field">
+                                               {{.i18n.Tr "repo.settings.deploy_key_desc"}}
+                                       </div>
+                                       <div class="field {{if .Err_Title}}error{{end}}">
+                                               <label for="title">{{.i18n.Tr "repo.settings.title"}}</label>
+                                               <input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
+                                       </div>
+                                       <div class="field {{if .Err_Content}}error{{end}}">
+                                               <label for="content">{{.i18n.Tr "repo.settings.deploy_key_content"}}</label>
+                                               <textarea id="ssh-key-content" name="content" placeholder="{{.i18n.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
+                                       </div>
+                                       <div class="field">
+                                               <div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
+                                                       <input id="ssh-key-is-writable" name="is_writable" class="hidden" type="checkbox" value="1">
+                                                       <label for="is_writable">
+                                                               {{.i18n.Tr "repo.settings.is_writable"}}
+                                                       </label>
+                                                       <small style="padding-left: 26px;">{{$.i18n.Tr "repo.settings.is_writable_info" | Str2html}}</small>
+                                               </div>
+                                       </div>
+                                       <button class="ui green button">
+                                               {{.i18n.Tr "repo.settings.add_deploy_key"}}
+                                       </button>
+                               </form>
+                       </div>
+                       <br>
+               </div>
                <h4 class="ui top attached header">
                        {{.i18n.Tr "repo.settings.deploy_keys"}}
                        <div class="ui right">
@@ -43,40 +82,6 @@
                                {{.i18n.Tr "repo.settings.no_deploy_keys"}}
                        {{end}}
                </div>
-               <br>
-               <div {{if not .HasError}}class="hide"{{end}} id="add-deploy-key-panel">
-                       <h4 class="ui top attached header">
-                               {{.i18n.Tr "repo.settings.add_deploy_key"}}
-                       </h4>
-                       <div class="ui attached segment">
-                               <form class="ui form" action="{{.Link}}" method="post">
-                                       {{.CsrfTokenHtml}}
-                                       <div class="field">
-                                               {{.i18n.Tr "repo.settings.deploy_key_desc"}}
-                                       </div>
-                                       <div class="field {{if .Err_Title}}error{{end}}">
-                                               <label for="title">{{.i18n.Tr "repo.settings.title"}}</label>
-                                               <input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
-                                       </div>
-                                       <div class="field {{if .Err_Content}}error{{end}}">
-                                               <label for="content">{{.i18n.Tr "repo.settings.deploy_key_content"}}</label>
-                                               <textarea id="ssh-key-content" name="content" placeholder="{{.i18n.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
-                                       </div>
-                                       <div class="field">
-                                               <div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
-                                                       <input id="ssh-key-is-writable" name="is_writable" class="hidden" type="checkbox" value="1">
-                                                       <label for="is_writable">
-                                                               {{.i18n.Tr "repo.settings.is_writable"}}
-                                                       </label>
-                                                       <small style="padding-left: 26px;">{{$.i18n.Tr "repo.settings.is_writable_info" | Str2html}}</small>
-                                               </div>
-                                       </div>
-                                       <button class="ui green button">
-                                               {{.i18n.Tr "repo.settings.add_deploy_key"}}
-                                       </button>
-                               </form>
-                       </div>
-               </div>
        </div>
 </div>
 

diff --git a/web_src/js/index.js b/web_src/js/index.js
index d6787e89bf0fd43d47de22a8b04226e7471cf300..868b3ad0493878c3e993950f0fe1598989cdbf2b 100644 (file)
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -2750,6 +2750,9 @@ $(document).ready(async () => {
   $('.show-panel.button').on('click', function () {
     $($(this).data('panel')).show();
   });
+  $('.hide-panel.button').on('click', function () {
+    $($(this).data('panel')).hide();
+  });
   $('.show-create-branch-modal.button').on('click', function () {
     $('#create-branch-form')[0].action = $('#create-branch-form').data('base-action') + $(this).data('branch-from');
     $('#modal-create-branch-from-span').text($(this).data('branch-from'));