feat(runner): add runner page in repo and org settings

routers/web/admin/runners.go

@@ -21,9 +21,9 @@ import (
 )
 
 const (
-	tplRunners    base.TplName = "admin/runner/list"
-	tplRunnerNew  base.TplName = "admin/runner/new"
-	tplRunnerEdit base.TplName = "admin/runner/edit"
+	tplRunners    base.TplName = "runners/list"
+	tplRunnerNew  base.TplName = "runners/new"
+	tplRunnerEdit base.TplName = "runners/edit"
 )
 
 // Runners show all the runners

routers/web/org/org_runners.go

@@ -0,0 +1,26 @@
+package org
+
+import (
+	"net/http"
+
+	"code.gitea.io/gitea/models/webhook"
+	"code.gitea.io/gitea/modules/context"
+)
+
+// Runners render runners page
+func Runners(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("org.settings")
+	ctx.Data["PageIsOrgSettings"] = true
+	ctx.Data["PageIsOrgSettingsRunners"] = true
+	ctx.Data["BaseLink"] = ctx.Org.OrgLink + "/settings/runners"
+	ctx.Data["Description"] = ctx.Tr("org.settings.runners_desc")
+
+	ws, err := webhook.ListWebhooksByOpts(ctx, &webhook.ListWebhookOptions{OrgID: ctx.Org.Organization.ID})
+	if err != nil {
+		ctx.ServerError("GetWebhooksByOrgId", err)
+		return
+	}
+
+	ctx.Data["Webhooks"] = ws
+	ctx.HTML(http.StatusOK, tplSettingsRunners)
+}

routers/web/org/setting.go

@@ -38,6 +38,8 @@ const (
 	tplSettingsHooks base.TplName = "org/settings/hooks"
 	// tplSettingsLabels template path for render labels settings
 	tplSettingsLabels base.TplName = "org/settings/labels"
+	// tplSettingsRunners template path for render runners settings
+	tplSettingsRunners base.TplName = "org/settings/runners"
 )
 
 // Settings render the main settings page

routers/web/repo/runners.go

@@ -0,0 +1,26 @@
+package repo
+
+import (
+	"net/http"
+
+	"code.gitea.io/gitea/models/webhook"
+	"code.gitea.io/gitea/modules/context"
+)
+
+// Runners render runners page
+func Runners(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("repo.settings.hooks")
+	ctx.Data["PageIsSettingsHooks"] = true
+	ctx.Data["BaseLink"] = ctx.Repo.RepoLink + "/settings/hooks"
+	ctx.Data["BaseLinkNew"] = ctx.Repo.RepoLink + "/settings/hooks"
+	ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://docs.gitea.io/en-us/webhooks/")
+
+	ws, err := webhook.ListWebhooksByOpts(ctx, &webhook.ListWebhookOptions{RepoID: ctx.Repo.Repository.ID})
+	if err != nil {
+		ctx.ServerError("GetWebhooksByRepoID", err)
+		return
+	}
+	ctx.Data["Webhooks"] = ws
+
+	ctx.HTML(http.StatusOK, tplHooks)
+}

routers/web/web.go

@@ -797,6 +797,10 @@ func RegisterRoutes(m *web.Route) {
 					m.Post("/initialize", bindIgnErr(forms.InitializeLabelsForm{}), org.InitializeLabels)
 				})
 
+				m.Group("/runners", func() {
+					m.Get("", org.Runners)
+				})
+
 				m.Route("/delete", "GET,POST", org.SettingsDelete)
 
 				m.Group("/packages", func() {
@@ -950,6 +954,11 @@ func RegisterRoutes(m *web.Route) {
 					m.Post("/{lid}/unlock", repo.LFSUnlock)
 				})
 			})
+
+			m.Group("/runners", func() {
+				m.Get("", repo.Runners)
+			})
+
 		}, func(ctx *context.Context) {
 			ctx.Data["PageIsSettings"] = true
 			ctx.Data["LFSStartServer"] = setting.LFS.StartServer

templates/admin/runner/new.tmpl

@@ -1,94 +0,0 @@
-{{template "base/head" .}}
-<div class="page-content admin new user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.users.new_account"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<!-- Types and name -->
-				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
-					<label>{{.locale.Tr "admin.users.auth_source"}}</label>
-					<div class="ui selection type dropdown">
-						<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
-						<div class="text">{{.locale.Tr "admin.users.local"}}</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
-							{{range .Sources}}
-								<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
-							{{end}}
-						</div>
-					</div>
-				</div>
-
-				<div class="inline field {{if .Err_Visibility}}error{{end}}">
-					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-					<div class="ui selection type dropdown">
-						<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
-						<div class="text">
-							{{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-							{{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-							{{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
-						</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							{{range $mode := .AllowedUserVisibilityModes}}
-								{{if $mode.IsPublic}}
-									<div class="item tooltip" data-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-								{{else if $mode.IsLimited}}
-									<div class="item tooltip" data-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-								{{else if $mode.IsPrivate}}
-									<div class="item tooltip" data-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-								{{end}}
-							{{end}}
-						</div>
-					</div>
-				</div>
-
-				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}hide{{end}}">
-					<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
-					<input id="login_name" name="login_name" value="{{.login_name}}">
-				</div>
-				<div class="required field {{if .Err_UserName}}error{{end}}">
-					<label for="user_name">{{.locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
-				</div>
-				<div class="required field {{if .Err_Email}}error{{end}}">
-					<label for="email">{{.locale.Tr "email"}}</label>
-					<input id="email" name="email" type="email" value="{{.email}}" required>
-				</div>
-				<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}hide{{end}}">
-					<label for="password">{{.locale.Tr "password"}}</label>
-					<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
-				</div>
-
-				<div class="inline field local{{if ne .login_type "0-0"}} hide{{end}}">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "auth.allow_password_change" }}</strong></label>
-						<input name="must_change_password" type="checkbox" checked>
-					</div>
-				</div>
-
-				<!-- Send register notify e-mail -->
-				{{if .CanSendEmail}}
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.users.send_register_notify"}}</strong></label>
-							<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
-						</div>
-					</div>
-				{{end}}
-
-				<div class="field">
-					<button class="ui green button">{{.locale.Tr "admin.users.new_account"}}</button>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}

templates/org/settings/navbar.tmpl

@@ -22,6 +22,9 @@
 			{{.locale.Tr "packages.title"}}
 		</a>
 		{{end}}
+		<a class="{{if .PageIsOrgSettingsRunners}}active{{end}} item" href="{{.OrgLink}}/settings/runners">
+			{{.locale.Tr "repo.runners"}}
+		</a>
 		<a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.OrgLink}}/settings/delete">
 			{{.locale.Tr "org.settings.delete"}}
 		</a>

templates/org/settings/runners.tmpl

@@ -0,0 +1,13 @@
+{{template "base/head" .}}
+<div class="page-content organization settings webhooks">
+	{{template "org/header" .}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "org/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "repo/settings/webhook/list" .}}
+			</div>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}

templates/repo/settings/navbar.tmpl

@@ -32,5 +32,8 @@
 				{{.locale.Tr "repo.settings.lfs"}}
 			</a>
 		{{end}}
+		<a class="{{if .PageIsSettingsRunners}}active{{end}} item" href="{{.RepoLink}}/settings/runners">
+			{{.locale.Tr "repo.settings.runners"}}
+		</a>
 	</div>
 </div>