new webhooks list UI

templates/org/header.tmpl

@@ -0,0 +1,26 @@
+{{with .Org}}
+<div class="ui container">
+	<div class="ui vertically grid head">
+		<div class="column">
+			<div class="ui header">
+				<img class="ui image" src="{{.AvatarLink}}?s=100">
+				<span class="text thin grey"><a href="{{AppSubUrl}}/org/{{.Name}}">{{.DisplayName}}</a></span>
+
+				<div class="ui right">
+			    <div class="ui menu">
+			      <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
+			        <i class="octicon octicon-jersey"></i>&nbsp;{{$.i18n.Tr "org.teams"}}
+			        <div class="floating ui black label">{{.NumTeams}}</div>
+			      </a>
+			      <a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+			        <i class="octicon octicon-organization"></i>&nbsp;{{$.i18n.Tr "org.people"}}
+			        <div class="floating ui black label">{{.NumMembers}}</div>
+			      </a>
+			    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="ui divider"></div>
+{{end}}

templates/org/settings/hooks.tmpl

@@ -1,38 +1,11 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-{{template "org/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="org-setting" class="container clear">
-	        {{template "org/settings/nav" .}}
-	        <div class="grid-4-5 left">
-	            <div class="setting-content">
-	                {{template "ng/base/alert" .}}
-	                <div id="setting-content">
-                      <div id="repo-hooks-panel" class="panel panel-radius">
-                          <div class="panel-header">
-                              <a class="btn btn-small btn-black btn-header btn-radius right" href="{{.OrgLink}}/settings/hooks/new">{{.i18n.Tr "repo.settings.add_webhook"}}</a>
-                            <strong>{{.i18n.Tr "repo.settings.hooks"}}</strong>
-                          </div>
-                          <ul class="panel-body setting-list">
-                              <li>{{.i18n.Tr "org.settings.hooks_desc" | Str2html}}</li>
-                              {{range .Webhooks}}
-                              <li>
-                                {{if .IsActive}}
-                                <span class="left text-success"><i class="octicon octicon-check"></i></span>
-                                {{else}}
-                                <span class="left text-grey"><i class="octicon octicon-primitive-dot"></i></span>
-                                {{end}}
-                                <a class="link" href="{{$.OrgLink}}/settings/hooks/{{.Id}}">{{.Url}}</a>
-                                <a href="{{$.OrgLink}}/settings/hooks?remove={{.Id}}" class="text-red right"><i class="fa fa-times"></i></a>
-                                <a href="{{$.OrgLink}}/settings/hooks/{{.Id}}" class="text-blue right"><i class="fa fa-pencil"></i></a>
-                              </li>
-                              {{end}}
-                          </ul>
-                      </div>
-                  </div>
-              </div>
-          </div>
-      </div>
+{{template "base/head" .}}
+<div class="organization settings webhooks">
+  {{template "org/header" .}}
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "org/settings/navbar" .}}
+      {{template "repo/settings/hook_list" .}}
+    </div>
   </div>
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}

templates/org/settings/nav.tmpl

@@ -4,9 +4,9 @@
   </div>
   <div class="panel-body">
     <ul class="menu menu-vertical switching-list grid-1-5 left">
-      <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{AppSubUrl}}/org/{{.Org.Name}}/settings">{{.i18n.Tr "org.settings.options"}}</a></li>
-      <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{AppSubUrl}}/org/{{.Org.Name}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li>
-      <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppSubUrl}}/org/{{.Org.Name}}/settings/delete">{{.i18n.Tr "org.settings.delete"}}</a></li>
+      <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.Org.HomeLink}}/settings">{{.i18n.Tr "org.settings.options"}}</a></li>
+      <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.Org.HomeLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li>
+      <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{.Org.HomeLink}}/settings/delete">{{.i18n.Tr "org.settings.delete"}}</a></li>
     </ul>
   </div>
 </div>

templates/org/settings/navbar.tmpl

@@ -0,0 +1,14 @@
+<div class="four wide column">
+	<div class="ui vertical menu">
+		<div class="header item">{{.i18n.Tr "org.settings"}}</div>
+	  <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.Org.HomeLink}}/settings">
+	    {{.i18n.Tr "org.settings.options"}}
+	  </a>
+	  <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.Org.HomeLink}}/settings/hooks">
+	    {{.i18n.Tr "repo.settings.hooks"}}
+	  </a>
+	  <a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.Org.HomeLink}}/settings/delete">
+	    {{.i18n.Tr "org.settings.delete"}}
+	  </a>
+	</div>
+</div>