Merge branch 'dev' of github.com:gogits/gogs into dev

3 files changed, 52 insertions, 8 deletions

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 6ff68a5b28..636a866774 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1404,14 +1404,16 @@ The register and sign-in page style
 #auth-setting-form,
 #org-setting-form,
 #repo-setting-form,
-#user-profile-form {
+#user-profile-form,
+.repo-setting-form {
   background-color: #FFF;
   padding: 30px 0;
 }
 #auth-setting-form textarea,
 #org-setting-form textarea,
 #repo-setting-form textarea,
-#user-profile-form textarea {
+#user-profile-form textarea,
+.repo-setting-form textarea {
   margin-left: 4px;
   height: 100px;
 }
@@ -1419,24 +1421,38 @@ The register and sign-in page style
 #org-setting-form label,
 #repo-setting-form label,
 #user-profile-form label,
+.repo-setting-form label,
 #auth-setting-form .form-label,
 #org-setting-form .form-label,
 #repo-setting-form .form-label,
-#user-profile-form .form-label {
+#user-profile-form .form-label,
+.repo-setting-form .form-label {
   width: 240px;
 }
 #auth-setting-form .ipt,
 #org-setting-form .ipt,
 #repo-setting-form .ipt,
-#user-profile-form .ipt {
+#user-profile-form .ipt,
+.repo-setting-form .ipt {
   width: 360px;
 }
 #auth-setting-form .field,
 #org-setting-form .field,
 #repo-setting-form .field,
-#user-profile-form .field {
+#user-profile-form .field,
+.repo-setting-form .field {
   margin-bottom: 24px;
 }
+#hook-type {
+  padding: 10px 0 0 0;
+  background-color: #fff;
+}
+#hook-type .field {
+  margin-bottom: 24px;
+}
+#hook-type label {
+  width: 240px;
+}
 #repo-hooks-panel,
 #repo-hooks-history-panel,
 #user-social-panel,
diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js
index bade9f3420..c08a887a4c 100644
--- a/public/ng/js/gogs.js
+++ b/public/ng/js/gogs.js
@@ -359,6 +359,22 @@ function initRepoSetting() {
             return true;
         }
     });
+
+    // web hook type change
+    $('select#hook-type').on("change", function () {
+      hookTypes = ['Gogs','Slack'];
+
+      var curHook = $(this).val();
+      hookTypes.forEach(function(hookType) {
+        if (curHook === hookType) {
+          $('div#'+hookType.toLowerCase()).toggleShow();
+        }
+        else {
+          $('div#'+hookType.toLowerCase()).toggleHide();
+        }
+      });
+    });
+
     $('#transfer-button').click(function () {
         $('#transfer-form').show();
     });
@@ -594,4 +610,4 @@ function homepage() {
         }
         $('#promo-form').attr('action', '/user/sign_up');
     });
-}
\ No newline at end of file
+}
diff --git a/public/ng/less/gogs/settings.less b/public/ng/less/gogs/settings.less
index b246a947ec..80c00f2dbe 100644
--- a/public/ng/less/gogs/settings.less
+++ b/public/ng/less/gogs/settings.less
@@ -34,7 +34,8 @@
 #auth-setting-form,
 #org-setting-form,
 #repo-setting-form,
-#user-profile-form {
+#user-profile-form,
+.repo-setting-form {
     background-color: #FFF;
     padding: 30px 0;
     textarea {
@@ -53,6 +54,17 @@
     }
 }
 
+#hook-type {
+    padding: 10px 0 0 0;
+    background-color: #fff;
+    .field {
+        margin-bottom: 24px;
+    }
+    label {
+        width: 240px;
+    }
+}
+
 #repo-hooks-panel,
 #repo-hooks-history-panel,
 #user-social-panel,
@@ -109,4 +121,4 @@
   .field {
     margin-bottom: 24px;
   }
-}
\ No newline at end of file
+}