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

6 files changed, 75 insertions, 36 deletions

diff --git a/templates/repo/settings/gogs_hook.tmpl b/templates/repo/settings/gogs_hook.tmpl
new file mode 100644
index 0000000000..678d640baf
--- /dev/null
+++ b/templates/repo/settings/gogs_hook.tmpl
@@ -0,0 +1,23 @@
+<div id="gogs" class="{{if (and .PageIsSettingsHooksEdit (not (eq .HookType "gogs")))}}hidden{{end}}">
+  <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-gogs"  action="{{.RepoLink}}/settings/hooks/gogs/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
+    {{.CsrfTokenHtml}}
+    <input type="hidden" name="hook_type" value="gogs">
+    <div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_webhook_desc" | Str2html}}</div>
+    <div class="field">
+        <label class="req" for="payload-url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="payload-url" name="payload_url" type="url" value="{{.Webhook.Url}}" required />
+    </div>
+    <div class="field">
+      <label class="req">{{.i18n.Tr "repo.settings.content_type"}}</label>
+      <select name="content_type">
+          <option value="1" {{if or .PageIsSettingsHooksNew (eq .Webhook.ContentType 1)}}selected{{end}}>application/json</option>
+          <option value="2" {{if eq .Webhook.ContentType 2}}selected{{end}}>application/x-www-form-urlencoded</option>
+      </select>
+    </div>
+    <div class="field">
+        <label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off" />
+    </div>
+    {{template "repo/settings/hook_settings" .}}
+  </form>
+</div>
diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl
index 2cd0eacb6a..7a450282b1 100644
--- a/templates/repo/settings/hook_new.tmpl
+++ b/templates/repo/settings/hook_new.tmpl
@@ -13,40 +13,9 @@
 	                        <div class="panel-header">
 	                        	<strong>{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}</strong>
 	                        </div>
-	                        <form class="form form-align panel-body" id="repo-setting-form" action="{{.RepoLink}}/settings/hooks/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
-	                            {{.CsrfTokenHtml}}
-                        		<div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_webhook_desc" | Str2html}}</div>
-	                            <div class="field">
-	                                <label class="req" for="payload-url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="payload-url" name="payload_url" type="url" value="{{.Webhook.Url}}" required />
-	                            </div>
-					            <div class="field">
-					                <label class="req">{{.i18n.Tr "repo.settings.content_type"}}</label>
-					                <select name="content_type">
-                                		<option value="1" {{if or .PageIsSettingsHooksNew (eq .Webhook.ContentType 1)}}selected{{end}}>application/json</option>
-                                		<option value="2" {{if eq .Webhook.ContentType 2}}selected{{end}}>application/x-www-form-urlencoded</option>
-					                </select>
-					            </div>
-	                            <div class="field">
-	                                <label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off" />
-	                            </div>
-								<div class="field">
-									<h4 class="text-center">{{.i18n.Tr "repo.settings.event_desc"}}</h4>
-									<label></label>
-	                                <input name="push_only" type="radio" {{if or .PageIsSettingsHooksNew .Webhook.PushOnly}}checked{{end}}> {{.i18n.Tr "repo.settings.event_push_only" | Str2html}}
-	                            </div>
-					            <div class="field">
-					                <label for="active">{{.i18n.Tr "repo.settings.active"}}</label>
-					                <input class="ipt-chk" id="active" name="active" type="checkbox" {{if or .PageIsSettingsHooksNew .Webhook.IsActive}}checked{{end}} />
-					                <span>{{.i18n.Tr "repo.settings.active_helper"}}</span>
-					            </div>
-	                            <div class="field">
-	                                <label></label>
-	                                <button class="btn btn-green btn-large btn-radius">{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}</button>
-	                                {{if .PageIsSettingsHooksEdit}}<a class="btn btn-red btn-large btn-link btn-radius" href="{{.RepoLink}}/settings/hooks?remove={{.Webhook.Id}}"><strong>{{.i18n.Tr "repo.settings.delete_webhook"}}</strong></a>{{end}}
-	                            </div>
-							</form>
+                          {{template "repo/settings/hook_types" .}}
+                          {{template "repo/settings/gogs_hook" .}}
+                          {{template "repo/settings/slack_hook" .}}
 	                    </div>
 	                </div>
 	                {{if .PageIsSettingsHooksEdit}}
@@ -67,4 +36,4 @@
 		</div>
 	</div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "ng/base/footer" .}}
diff --git a/templates/repo/settings/hook_settings.tmpl b/templates/repo/settings/hook_settings.tmpl
new file mode 100644
index 0000000000..7bf4e2a36c
--- /dev/null
+++ b/templates/repo/settings/hook_settings.tmpl
@@ -0,0 +1,15 @@
+<div class="field">
+  <h4 class="text-center">{{.i18n.Tr "repo.settings.event_desc"}}</h4>
+  <label></label>
+  <input name="push_only" type="radio" {{if or .PageIsSettingsHooksNew .Webhook.PushOnly}}checked{{end}}> {{.i18n.Tr "repo.settings.event_push_only" | Str2html}}
+</div>
+<div class="field">
+  <label for="active">{{.i18n.Tr "repo.settings.active"}}</label>
+  <input class="ipt-chk" id="active" name="active" type="checkbox" {{if or .PageIsSettingsHooksNew .Webhook.IsActive}}checked{{end}} />
+<span>{{.i18n.Tr "repo.settings.active_helper"}}</span>
+</div>
+<div class="field">
+    <label></label>
+    <button class="btn btn-green btn-large btn-radius">{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}</button>
+    {{if .PageIsSettingsHooksEdit}}<a class="btn btn-red btn-large btn-link btn-radius" href="{{.RepoLink}}/settings/hooks?remove={{.Webhook.Id}}"><strong>{{.i18n.Tr "repo.settings.delete_webhook"}}</strong></a>{{end}}
+</div>
diff --git a/templates/repo/settings/hook_types.tmpl b/templates/repo/settings/hook_types.tmpl
new file mode 100644
index 0000000000..782e2a4e73
--- /dev/null
+++ b/templates/repo/settings/hook_types.tmpl
@@ -0,0 +1,11 @@
+{{if .PageIsSettingsHooksNew}}
+<div id="hook-type" class="form-align">
+  <label class="req">{{.i18n.Tr "repo.settings.hook_type"}}</label>
+  <select name="hook_type" id="hook-type" class="form-control">
+    {{if .HookType}}<option value="{{.HookType}}">{{.HookType}}</option>{{end}}
+    {{range .HookTypes}}
+    {{if not (eq $.HookType .)}}<option value="{{.}}" >{{.}}</option>{{end}}
+    {{end}}
+  </select>
+</div>
+{{end}}
diff --git a/templates/repo/settings/slack_hook.tmpl b/templates/repo/settings/slack_hook.tmpl
new file mode 100644
index 0000000000..e68571a081
--- /dev/null
+++ b/templates/repo/settings/slack_hook.tmpl
@@ -0,0 +1,20 @@
+<div id="slack" class="{{if or .PageIsSettingsHooksNew (and .PageIsSettingsHooksEdit (not (eq .HookType "slack")))}}hidden{{end}}">
+  <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-slack" action="{{.RepoLink}}/settings/hooks/slack/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
+    {{.CsrfTokenHtml}}
+    <input type="hidden" name="hook_type" value="slack">
+    <div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_slack_hook_desc" | Str2html}}</div>
+    <div class="field">
+        <label class="req" for="domain">{{.i18n.Tr "repo.settings.slack_domain"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="domain" name="domain" type="text" value="{{.SlackHook.Domain}}" placeholde="myslack" required />
+    </div>
+    <div class="field">
+        <label class="req" for="token">{{.i18n.Tr "repo.settings.slack_token"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="token" name="token" type="text" value="{{.SlackHook.Token}}" autocomplete="off" required />
+    </div>
+    <div class="field">
+        <label class="req" for="channel">{{.i18n.Tr "repo.settings.slack_channel"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="channel" name="channel" type="text" value="{{.SlackHook.Channel}}" placeholder="#general" required />
+    </div>
+    {{template "repo/settings/hook_settings" .}}
+  </form>
+</div>
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index df4fc0b65e..bf0aba097b 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -58,6 +58,7 @@
                     </button>
                     <ul class="menu menu-vertical drop-down" id="dashboard-new-repo-menu">
                         <li><a href="/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li>
+                        <li><a href="/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li>
                         <li><a href="/org/create"><i class="octicon octicon-organization"></i>{{.i18n.Tr "new_org"}}</a></li>
                     </ul>
                 </li>
@@ -165,4 +166,4 @@
         </div>
     </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "ng/base/footer" .}}