BlueGit

timfa bluegit

Eigen modals i.p.v. browserpopups, tooltips, taalkiezer, Beheer-tab met gebruikersbeheer, retry alleen bij gefaalde jobs

timfa Tim Falken · pushed by timfa

Authored 2026-10-24 · 3 weeks ago

Hash
1a672451c5ddad95796689fef65f00c05b65866b
Parent
8a49bc27
Pipeline
Passed
27 files changed +1197 −57
cmd/bluegit-runner/ui.go +29 −14
@@ -18,6 +18,7 @@ import (
18 18 "time"
19 19
20 20 "gitlab.com/Timfa/bluegit/internal/i18n"
21 "gitlab.com/Timfa/bluegit/internal/langpick"
21 22 "gitlab.com/Timfa/bluegit/internal/runnercfg"
22 23 "gitlab.com/Timfa/bluegit/internal/server/static"
23 24 )
@@ -125,6 +126,14 @@ func newWebUI(cfg Config, token string, h *runnercfg.Handler) *webUI {
125 126 w.Header().Set("Content-Type", "image/svg+xml")
126 127 _, _ = w.Write(static.LogoSVG)
127 128 })
129 for name, body := range map[string][]byte{"confirm.js": static.ConfirmJS, "tip.js": static.TipJS, "langpick.js": static.LangpickJS} {
130 b := body
131 u.mux.HandleFunc("GET /assets/"+name, func(w http.ResponseWriter, r *http.Request) {
132 w.Header().Set("Content-Type", "text/javascript; charset=utf-8")
133 _, _ = w.Write(b)
134 })
135 }
136 u.mux.HandleFunc("POST /lang", u.switchLang)
128 137 u.mux.HandleFunc("GET /docs", u.docs)
129 138 u.mux.HandleFunc("GET /login", u.loginPage)
130 139 u.mux.HandleFunc("POST /login", u.login)
@@ -137,13 +146,20 @@ func (u *webUI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
137 146 w.Header().Set("X-Frame-Options", "DENY")
138 147 w.Header().Set("X-Content-Type-Options", "nosniff")
139 148 w.Header().Set("Referrer-Policy", "same-origin")
140 w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' data:; style-src 'self'; script-src 'self' 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'")
149 w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' data:; style-src 'self'; script-src 'self'; form-action 'self'; frame-ancestors 'none'")
141 150 if q := r.URL.Query().Get("lang"); q != "" && r.Method == http.MethodGet {
142 151 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(i18n.Parse(q)), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode})
143 152 }
144 153 u.mux.ServeHTTP(w, r)
145 154 }
146 155
156 // switchLang komt van de taalkiezer: taal in een cookie, terug naar back.
157 func (u *webUI) switchLang(w http.ResponseWriter, r *http.Request) {
158 l := i18n.Parse(r.FormValue("lang"))
159 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(l), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode, HttpOnly: true})
160 http.Redirect(w, r, langpick.SafeBack(r.FormValue("back")), http.StatusSeeOther)
161 }
162
147 163 func (u *webUI) loginPage(w http.ResponseWriter, r *http.Request) {
148 164 lang := u.lang(r)
149 165 var b bytes.Buffer
@@ -185,13 +201,15 @@ func (u *webUI) docs(w http.ResponseWriter, r *http.Request) {
185 201 func (u *webUI) layout(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
186 202 w.Header().Set("Content-Type", "text/html; charset=utf-8")
187 203 w.Header().Set("Cache-Control", "no-store")
188 path := r.URL.Path
189 langs := []map[string]any{}
190 for _, l := range []i18n.Lang{i18n.EN, i18n.NL, i18n.DE, i18n.FR} {
191 langs = append(langs, map[string]any{"Code": string(l), "Name": l.Name(), "On": l == lang})
204 back := r.URL.Path
205 if q := r.URL.Query(); len(q) > 0 {
206 q.Del("lang")
207 if e := q.Encode(); e != "" {
208 back += "?" + e
209 }
192 210 }
193 211 _ = layoutTmpl.Execute(w, map[string]any{
194 "Title": title, "Body": body, "T": tfunc(lang), "Lang": string(lang), "Langs": langs, "Path": path,
212 "Title": title, "Body": body, "T": tfunc(lang), "Lang": string(lang), "LangPick": langpick.HTML(lang, "/lang", back, "", ""),
195 213 "Authed": u.authed(r), "CSRF": u.mac("csrf"),
196 214 })
197 215 }
@@ -226,25 +244,22 @@ var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
226 244 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
227 245 <link rel="stylesheet" href="/assets/style.css">
228 246 </head>
229 <body>
247 <body data-modal-title="{{call .T "modal.title"}}" data-modal-ok="{{call .T "modal.ok"}}" data-modal-cancel="{{call .T "modal.cancel"}}">
230 248 <header class="top">
231 249 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> {{call .T "rui.brand"}}</a>
232 250 <nav class="rui-nav">
233 251 {{if .Authed}}<a href="/">{{call .T "rui.nav.overview"}}</a>{{end}}
234 252 <a href="/docs">{{call .T "rui.nav.docs"}}</a>
235 <span class="rui-langs">{{range .Langs}}<a href="{{$.Path}}?lang={{.Code}}" title="{{.Name}}"{{if .On}} class="on"{{end}}>{{.Code}}</a>{{end}}</span>
253 {{.LangPick}}
236 254 {{if .Authed}}<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{call .T "rui.nav.logout"}}</button></form>{{end}}
237 255 </nav>
238 256 </header>
239 257 <div class="frame"><div class="content"><main class="wide">
240 258 {{.Body}}
241 259 </main></div></div>
242 <script>
243 document.addEventListener('submit', function (e) {
244 var f = e.target, q = f.getAttribute('data-confirm');
245 if (q && !window.confirm(q)) { e.preventDefault(); }
246 });
247 </script>
260 <script src="/assets/confirm.js"></script>
261 <script src="/assets/tip.js"></script>
262 <script src="/assets/langpick.js"></script>
248 263 </body>
249 264 </html>`))
250 265
@@ -18,6 +18,7 @@ import (
18 "time"
18 "time"
19
19
20 "gitlab.com/Timfa/bluegit/internal/i18n"
20 "gitlab.com/Timfa/bluegit/internal/i18n"
21 "gitlab.com/Timfa/bluegit/internal/langpick"
21 "gitlab.com/Timfa/bluegit/internal/runnercfg"
22 "gitlab.com/Timfa/bluegit/internal/runnercfg"
22 "gitlab.com/Timfa/bluegit/internal/server/static"
23 "gitlab.com/Timfa/bluegit/internal/server/static"
23)
24)
@@ -125,6 +126,14 @@ func newWebUI(cfg Config, token string, h *runnercfg.Handler) *webUI {
125 w.Header().Set("Content-Type", "image/svg+xml")
126 w.Header().Set("Content-Type", "image/svg+xml")
126 _, _ = w.Write(static.LogoSVG)
127 _, _ = w.Write(static.LogoSVG)
127 })
128 })
129 for name, body := range map[string][]byte{"confirm.js": static.ConfirmJS, "tip.js": static.TipJS, "langpick.js": static.LangpickJS} {
130 b := body
131 u.mux.HandleFunc("GET /assets/"+name, func(w http.ResponseWriter, r *http.Request) {
132 w.Header().Set("Content-Type", "text/javascript; charset=utf-8")
133 _, _ = w.Write(b)
134 })
135 }
136 u.mux.HandleFunc("POST /lang", u.switchLang)
128 u.mux.HandleFunc("GET /docs", u.docs)
137 u.mux.HandleFunc("GET /docs", u.docs)
129 u.mux.HandleFunc("GET /login", u.loginPage)
138 u.mux.HandleFunc("GET /login", u.loginPage)
130 u.mux.HandleFunc("POST /login", u.login)
139 u.mux.HandleFunc("POST /login", u.login)
@@ -137,13 +146,20 @@ func (u *webUI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
137 w.Header().Set("X-Frame-Options", "DENY")
146 w.Header().Set("X-Frame-Options", "DENY")
138 w.Header().Set("X-Content-Type-Options", "nosniff")
147 w.Header().Set("X-Content-Type-Options", "nosniff")
139 w.Header().Set("Referrer-Policy", "same-origin")
148 w.Header().Set("Referrer-Policy", "same-origin")
140 w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' data:; style-src 'self'; script-src 'self' 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'")
149 w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' data:; style-src 'self'; script-src 'self'; form-action 'self'; frame-ancestors 'none'")
141 if q := r.URL.Query().Get("lang"); q != "" && r.Method == http.MethodGet {
150 if q := r.URL.Query().Get("lang"); q != "" && r.Method == http.MethodGet {
142 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(i18n.Parse(q)), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode})
151 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(i18n.Parse(q)), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode})
143 }
152 }
144 u.mux.ServeHTTP(w, r)
153 u.mux.ServeHTTP(w, r)
145}
154}
146
155
156// switchLang komt van de taalkiezer: taal in een cookie, terug naar back.
157func (u *webUI) switchLang(w http.ResponseWriter, r *http.Request) {
158 l := i18n.Parse(r.FormValue("lang"))
159 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(l), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode, HttpOnly: true})
160 http.Redirect(w, r, langpick.SafeBack(r.FormValue("back")), http.StatusSeeOther)
161}
162
147func (u *webUI) loginPage(w http.ResponseWriter, r *http.Request) {
163func (u *webUI) loginPage(w http.ResponseWriter, r *http.Request) {
148 lang := u.lang(r)
164 lang := u.lang(r)
149 var b bytes.Buffer
165 var b bytes.Buffer
@@ -185,13 +201,15 @@ func (u *webUI) docs(w http.ResponseWriter, r *http.Request) {
185func (u *webUI) layout(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
201func (u *webUI) layout(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
186 w.Header().Set("Content-Type", "text/html; charset=utf-8")
202 w.Header().Set("Content-Type", "text/html; charset=utf-8")
187 w.Header().Set("Cache-Control", "no-store")
203 w.Header().Set("Cache-Control", "no-store")
188 path := r.URL.Path
204 back := r.URL.Path
189 langs := []map[string]any{}
205 if q := r.URL.Query(); len(q) > 0 {
190 for _, l := range []i18n.Lang{i18n.EN, i18n.NL, i18n.DE, i18n.FR} {
206 q.Del("lang")
191 langs = append(langs, map[string]any{"Code": string(l), "Name": l.Name(), "On": l == lang})
207 if e := q.Encode(); e != "" {
208 back += "?" + e
209 }
192 }
210 }
193 _ = layoutTmpl.Execute(w, map[string]any{
211 _ = layoutTmpl.Execute(w, map[string]any{
194 "Title": title, "Body": body, "T": tfunc(lang), "Lang": string(lang), "Langs": langs, "Path": path,
212 "Title": title, "Body": body, "T": tfunc(lang), "Lang": string(lang), "LangPick": langpick.HTML(lang, "/lang", back, "", ""),
195 "Authed": u.authed(r), "CSRF": u.mac("csrf"),
213 "Authed": u.authed(r), "CSRF": u.mac("csrf"),
196 })
214 })
197}
215}
@@ -226,25 +244,22 @@ var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
226 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
244 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
227 <link rel="stylesheet" href="/assets/style.css">
245 <link rel="stylesheet" href="/assets/style.css">
228</head>
246</head>
229<body>
247<body data-modal-title="{{call .T "modal.title"}}" data-modal-ok="{{call .T "modal.ok"}}" data-modal-cancel="{{call .T "modal.cancel"}}">
230<header class="top">
248<header class="top">
231 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> {{call .T "rui.brand"}}</a>
249 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> {{call .T "rui.brand"}}</a>
232 <nav class="rui-nav">
250 <nav class="rui-nav">
233 {{if .Authed}}<a href="/">{{call .T "rui.nav.overview"}}</a>{{end}}
251 {{if .Authed}}<a href="/">{{call .T "rui.nav.overview"}}</a>{{end}}
234 <a href="/docs">{{call .T "rui.nav.docs"}}</a>
252 <a href="/docs">{{call .T "rui.nav.docs"}}</a>
235 <span class="rui-langs">{{range .Langs}}<a href="{{$.Path}}?lang={{.Code}}" title="{{.Name}}"{{if .On}} class="on"{{end}}>{{.Code}}</a>{{end}}</span>
253 {{.LangPick}}
236 {{if .Authed}}<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{call .T "rui.nav.logout"}}</button></form>{{end}}
254 {{if .Authed}}<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{call .T "rui.nav.logout"}}</button></form>{{end}}
237 </nav>
255 </nav>
238</header>
256</header>
239<div class="frame"><div class="content"><main class="wide">
257<div class="frame"><div class="content"><main class="wide">
240{{.Body}}
258{{.Body}}
241</main></div></div>
259</main></div></div>
242<script>
260<script src="/assets/confirm.js"></script>
243document.addEventListener('submit', function (e) {
261<script src="/assets/tip.js"></script>
244 var f = e.target, q = f.getAttribute('data-confirm');
262<script src="/assets/langpick.js"></script>
245 if (q && !window.confirm(q)) { e.preventDefault(); }
246});
247</script>
248</body>
263</body>
249</html>`))
264</html>`))
250
265
docs/BEHEER.md +9 −0
@@ -48,3 +48,12 @@ Webhooks hebben een URL-sjabloon, eigen headers en een body-sjabloon. `{{secret.
48 48 [`blue-ci-cd.yml`](../blue-ci-cd.yml) test, bouwt een statische binary, maakt een release en kan die via SSH naar de host kopiëren. De eerste binary zet je neer met het pakket. Daarna zijn de geheimen `DEPLOY_HOST`, `DEPLOY_USER`, `DEPLOY_PORT`, `DEPLOY_PATH` en `DEPLOY_SSH_KEY` genoeg, als beschermde geheimen op een beschermde branch.
49 49
50 50 De geïnstalleerde instantie kan zich daarnaast zelf bijwerken door het AUR-pakket met pacman te installeren. Dat pad, de unit `bluegit-update.service` en de token staan in [AUR.md](AUR.md).
51
52 ## Beheer in de webinterface
53
54 Sitebeheerders zien in de bovenbalk één tab **Beheer**. Daaronder staan de subtabs Gebruikers, Runner en Opslag. Anderen zien de tab niet, en de pagina's geven hun 403. De oude adressen `/setup` en `/admin/runner` blijven werken. `/admin` stuurt door naar `/admin/users`.
55
56 - **Gebruikers**: een gebruiker beheerder maken of die rol afnemen, telkens na een eigen bevestigingsvenster. Je eigen knop is uitgeschakeld, en de server weigert het ook. Er blijft altijd minstens één beheerder over. Elke wijziging komt als regel `admin audit` in de journal.
57 - **Taal**: rechtsboven zit een vlaggetje voor NL/EN/DE/FR. Ingelogd wordt de keuze bij je account bewaard, anders in een cookie.
58 - **Bevestigingen** gebruiken nooit browserpopups (`alert`, `confirm`, `prompt`), maar een eigen venster in de huisstijl. De test `TestNoBrowserPopups` laat CI falen bij nieuwe popups.
59 - **Tooltips**: het (i)-icoon bij een instelling geeft uitleg bij hover, bij focus en bij tikken.
@@ -48,3 +48,12 @@ Webhooks hebben een URL-sjabloon, eigen headers en een body-sjabloon. `{{secret.
48[`blue-ci-cd.yml`](../blue-ci-cd.yml) test, bouwt een statische binary, maakt een release en kan die via SSH naar de host kopiëren. De eerste binary zet je neer met het pakket. Daarna zijn de geheimen `DEPLOY_HOST`, `DEPLOY_USER`, `DEPLOY_PORT`, `DEPLOY_PATH` en `DEPLOY_SSH_KEY` genoeg, als beschermde geheimen op een beschermde branch.
48[`blue-ci-cd.yml`](../blue-ci-cd.yml) test, bouwt een statische binary, maakt een release en kan die via SSH naar de host kopiëren. De eerste binary zet je neer met het pakket. Daarna zijn de geheimen `DEPLOY_HOST`, `DEPLOY_USER`, `DEPLOY_PORT`, `DEPLOY_PATH` en `DEPLOY_SSH_KEY` genoeg, als beschermde geheimen op een beschermde branch.
49
49
50De geïnstalleerde instantie kan zich daarnaast zelf bijwerken door het AUR-pakket met pacman te installeren. Dat pad, de unit `bluegit-update.service` en de token staan in [AUR.md](AUR.md).
50De geïnstalleerde instantie kan zich daarnaast zelf bijwerken door het AUR-pakket met pacman te installeren. Dat pad, de unit `bluegit-update.service` en de token staan in [AUR.md](AUR.md).
51
52## Beheer in de webinterface
53
54Sitebeheerders zien in de bovenbalk één tab **Beheer**. Daaronder staan de subtabs Gebruikers, Runner en Opslag. Anderen zien de tab niet, en de pagina's geven hun 403. De oude adressen `/setup` en `/admin/runner` blijven werken. `/admin` stuurt door naar `/admin/users`.
55
56- **Gebruikers**: een gebruiker beheerder maken of die rol afnemen, telkens na een eigen bevestigingsvenster. Je eigen knop is uitgeschakeld, en de server weigert het ook. Er blijft altijd minstens één beheerder over. Elke wijziging komt als regel `admin audit` in de journal.
57- **Taal**: rechtsboven zit een vlaggetje voor NL/EN/DE/FR. Ingelogd wordt de keuze bij je account bewaard, anders in een cookie.
58- **Bevestigingen** gebruiken nooit browserpopups (`alert`, `confirm`, `prompt`), maar een eigen venster in de huisstijl. De test `TestNoBrowserPopups` laat CI falen bij nieuwe popups.
59- **Tooltips**: het (i)-icoon bij een instelling geeft uitleg bij hover, bij focus en bij tikken.
docs/agents.md +14 −0
@@ -29,6 +29,7 @@ bg pipeline wait timfa/bluegit --sha "$(git rev-parse HEAD)" --timeout 1200 --in
29 29 bg pipeline logs timfa/bluegit 158 611
30 30 bg pipeline retry timfa/bluegit 158 # alleen mislukte jobs (+ wat daarop wachtte)
31 31 bg pipeline retry timfa/bluegit 158 --all # nieuwe pipeline
32 # beide alleen als minstens één job gefaald is (ook runner_system_failure); anders 409, en de UI toont dan geen retry-knop
32 33 ```
33 34
34 35 `wait` wacht eerst tot er voor de selectie een pipeline is (handig direct na een push) en daarna tot die klaar is. De exitcodes:
@@ -131,3 +132,16 @@ curl -fsS -H "Authorization: Bearer $BLUEGIT_TOKEN" $BLUEGIT_URL/api/v1/admin/ru
131 132 curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \
132 133 -d '{"concurrency":2,"memory_mb":4096}' $BLUEGIT_URL/api/v1/admin/runner/settings
133 134 ```
135
136 **Beheerders** (alleen voor sitebeheerders, token met scope `api`):
137
138 - `GET /api/v1/admin/users` geeft alle gebruikers met `admin: true|false`.
139 - `PUT /api/v1/admin/users/{username}/admin` met `{"admin": true}` of `{"admin": false}` kent de rol toe of neemt hem af.
140 - Jezelf afnemen geeft 403. Als er geen beheerder over zou blijven, krijg je 409. Een onbekende gebruiker geeft 404.
141 - Elke wijziging komt als regel `admin audit` in de serverlog (journal), met actie, door wie en voor wie.
142
143 ```sh
144 bg admin list
145 bg admin grant bob
146 bg admin revoke bob
147 ```
@@ -29,6 +29,7 @@ bg pipeline wait timfa/bluegit --sha "$(git rev-parse HEAD)" --timeout 1200 --in
29bg pipeline logs timfa/bluegit 158 611
29bg pipeline logs timfa/bluegit 158 611
30bg pipeline retry timfa/bluegit 158 # alleen mislukte jobs (+ wat daarop wachtte)
30bg pipeline retry timfa/bluegit 158 # alleen mislukte jobs (+ wat daarop wachtte)
31bg pipeline retry timfa/bluegit 158 --all # nieuwe pipeline
31bg pipeline retry timfa/bluegit 158 --all # nieuwe pipeline
32# beide alleen als minstens één job gefaald is (ook runner_system_failure); anders 409, en de UI toont dan geen retry-knop
32```
33```
33
34
34`wait` wacht eerst tot er voor de selectie een pipeline is (handig direct na een push) en daarna tot die klaar is. De exitcodes:
35`wait` wacht eerst tot er voor de selectie een pipeline is (handig direct na een push) en daarna tot die klaar is. De exitcodes:
@@ -131,3 +132,16 @@ curl -fsS -H "Authorization: Bearer $BLUEGIT_TOKEN" $BLUEGIT_URL/api/v1/admin/ru
131curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \
132curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \
132 -d '{"concurrency":2,"memory_mb":4096}' $BLUEGIT_URL/api/v1/admin/runner/settings
133 -d '{"concurrency":2,"memory_mb":4096}' $BLUEGIT_URL/api/v1/admin/runner/settings
133```
134```
135
136**Beheerders** (alleen voor sitebeheerders, token met scope `api`):
137
138- `GET /api/v1/admin/users` geeft alle gebruikers met `admin: true|false`.
139- `PUT /api/v1/admin/users/{username}/admin` met `{"admin": true}` of `{"admin": false}` kent de rol toe of neemt hem af.
140- Jezelf afnemen geeft 403. Als er geen beheerder over zou blijven, krijg je 409. Een onbekende gebruiker geeft 404.
141- Elke wijziging komt als regel `admin audit` in de serverlog (journal), met actie, door wie en voor wie.
142
143```sh
144bg admin list
145bg admin grant bob
146bg admin revoke bob
147```
internal/i18n/catalog_rui.go +220 −0
@@ -166,6 +166,61 @@ var ruiEN = map[string]string{
166 166 "rdoc.trouble.p": "Offline in BlueGit: check journalctl -u bluegit-runner and whether HTTPS to the server works. Jobs fail with runner_system_failure: check docker info as the bluegit-runner user (group docker). 401 from the server: the runner was revoked; register again. The web interface does not open: check ui_listen and that nothing else uses the port.",
167 167 "rdoc.cmd.h": "Useful commands",
168 168 "rdoc.more": "Full documentation on the server:",
169 "modal.title": "Are you sure?",
170 "modal.ok": "Confirm",
171 "modal.cancel": "Cancel",
172 "lang.pick": "Language",
173 "tip.info": "More information",
174 "nav.admin": "Admin",
175 "title.admin": "Admin",
176 "admin.tab.users": "Users",
177 "admin.tab.runner": "Runner",
178 "admin.tab.storage": "Storage",
179 "admin.users.title": "Users",
180 "admin.users.lead": "Admins can change runners, storage and updates for the whole site, and can make other users admin.",
181 "admin.tip.admin": "An admin is someone who may manage the whole BlueGit site. Give this only to people you trust. You cannot remove yourself, and there is always at least one admin left.",
182 "admin.col.user": "User",
183 "admin.col.role": "Role",
184 "admin.col.since": "Member since",
185 "admin.you": "you",
186 "admin.role.admin": "admin",
187 "admin.role.user": "user",
188 "admin.grant": "Make admin",
189 "admin.revoke": "Remove admin",
190 "admin.grantAsk": "Make %s an admin? They can then manage the whole site.",
191 "admin.revokeAsk": "Remove admin rights from %s?",
192 "admin.selfWhy": "You cannot remove your own admin rights; ask another admin.",
193 "admin.ok.granted": "%s is now an admin.",
194 "admin.ok.revoked": "%s is no longer an admin.",
195 "admin.err.self": "You cannot remove your own admin rights.",
196 "admin.err.last": "There must always be at least one admin.",
197 "admin.err.user": "That user does not exist.",
198 "admin.err.body": "Send {\"admin\": true} or {\"admin\": false}.",
199 "rui.tip.name": "The name you see for this runner in BlueGit and in job logs. Pick something you recognise, like the computer's name.",
200 "rui.tip.labels": "Short tags for your own overview, such as gpu or linux. They do not change which jobs the runner gets.",
201 "rui.tip.concurrency": "How many jobs this machine runs at the same time. More is faster but needs more CPU and memory. Tip: 1 job per 2 CPU cores; see the recommended value below.",
202 "rui.tip.maxImages": "Docker images are the ready-made toolboxes jobs start from. Keeping them saves download time but uses disk space. Usually 10–30 is fine.",
203 "rui.tip.timeout": "Stops a job that takes longer than this many minutes, so a stuck job does not block the machine. Leave empty to follow the pipeline; 60 is a safe choice.",
204 "rui.tip.cpus": "The maximum number of CPU cores one job may use, so one job cannot slow down everything else. 2 is a good start; 1.5 also works.",
205 "rui.tip.memory": "The most memory (in MB) one job may use. If a job needs more, it stops with an error instead of freezing the computer. 2048 MB (2 GB) suits most jobs.",
206 "rui.tip.pids": "Limits how many programs one job can start, which protects against runaway scripts. 4096 is plenty for normal builds.",
207 "rui.tip.disk": "How much disk space the runner should aim to use in total. About half of the free space is a sensible value.",
208 "rui.tip.pull": "Whether the runner downloads images again. “When missing” is the fastest and right for almost everyone.",
209 "rui.tip.cleanupWork": "Deletes the job's files when it is done, so the disk does not fill up. Leave this on unless you want to inspect a failed job.",
210 "rui.tip.pruneDangling": "Removes leftover, unnamed image layers that nothing uses anymore. Safe to leave on.",
211 "rui.tip.pruneCache": "Jobs can keep a cache (for example downloaded packages) to be faster next time. Above this size, the oldest cache is removed. 5–20 GB is usual.",
212 "rui.tip.alias": "The short name a pipeline uses after image:, for example team/tools.",
213 "rui.tip.image": "An existing image from Docker Hub or another registry to use as is, like node:22-alpine.",
214 "rui.tip.from": "The starting image for your Dockerfile, or a different start for a built-in preset (for example a newer Python).",
215 "rui.tip.note": "A short reminder for yourself about what this preset is for.",
216 "rui.tip.dockerfile": "A recipe that builds your own toolbox: start with FROM and add RUN lines that install tools. It is built once and reused.",
217 "rui.tip.pause": "Pause before you update or restart this machine: jobs that are running finish normally, and new jobs wait or go to another runner. When nothing is running it is safe to upgrade.",
218 "rui.tip.presets": "Presets are named toolboxes for jobs. Built-in ones cover common languages; add your own when a project needs extra tools.",
219 "runner.tip.prefBuiltin": "Jobs run on the BlueGit server first. Your own computers only help when the server is busy.",
220 "runner.tip.prefOwn": "Jobs run on your own computers first; the BlueGit server takes over when none of them is online.",
221 "runner.tip.token": "Creates a one-time code (valid 24 hours) to connect a computer as a runner. Run the shown command on that computer.",
222 "runner.tip.builtinFirst": "When on, the BlueGit server tries the group's jobs first, before group and member runners.",
223 "runner.tip.optin": "Allows your own account runners to also run jobs of this group. You can stop this at any time.",
169 224 }
170 225
171 226 var ruiNL = map[string]string{
@@ -325,6 +380,61 @@ var ruiNL = map[string]string{
325 380 "rdoc.trouble.p": "Offline in BlueGit: kijk in journalctl -u bluegit-runner en of HTTPS naar de server werkt. Jobs mislukken met runner_system_failure: controleer docker info als gebruiker bluegit-runner (groep docker). 401 van de server: de runner is ingetrokken; registreer opnieuw. De webinterface opent niet: controleer ui_listen en of niets anders de poort gebruikt.",
326 381 "rdoc.cmd.h": "Handige commando’s",
327 382 "rdoc.more": "Volledige documentatie op de server:",
383 "modal.title": "Weet je het zeker?",
384 "modal.ok": "Bevestigen",
385 "modal.cancel": "Annuleren",
386 "lang.pick": "Taal",
387 "tip.info": "Meer uitleg",
388 "nav.admin": "Beheer",
389 "title.admin": "Beheer",
390 "admin.tab.users": "Gebruikers",
391 "admin.tab.runner": "Runner",
392 "admin.tab.storage": "Opslag",
393 "admin.users.title": "Gebruikers",
394 "admin.users.lead": "Beheerders kunnen runners, opslag en updates voor de hele site aanpassen en andere gebruikers beheerder maken.",
395 "admin.tip.admin": "Een beheerder mag de hele BlueGit-site beheren. Geef dit alleen aan mensen die je vertrouwt. Jezelf verwijderen kan niet, en er blijft altijd minstens één beheerder over.",
396 "admin.col.user": "Gebruiker",
397 "admin.col.role": "Rol",
398 "admin.col.since": "Lid sinds",
399 "admin.you": "jij",
400 "admin.role.admin": "beheerder",
401 "admin.role.user": "gebruiker",
402 "admin.grant": "Beheerder maken",
403 "admin.revoke": "Beheerder afnemen",
404 "admin.grantAsk": "%s beheerder maken? Diegene kan dan de hele site beheren.",
405 "admin.revokeAsk": "Beheerdersrechten van %s afnemen?",
406 "admin.selfWhy": "Je kunt je eigen beheerdersrechten niet afnemen; vraag een andere beheerder.",
407 "admin.ok.granted": "%s is nu beheerder.",
408 "admin.ok.revoked": "%s is geen beheerder meer.",
409 "admin.err.self": "Je kunt je eigen beheerdersrechten niet afnemen.",
410 "admin.err.last": "Er moet altijd minstens één beheerder zijn.",
411 "admin.err.user": "Die gebruiker bestaat niet.",
412 "admin.err.body": "Stuur {\"admin\": true} of {\"admin\": false}.",
413 "rui.tip.name": "De naam waaronder je deze runner in BlueGit en in joblogs ziet. Kies iets herkenbaars, zoals de naam van de computer.",
414 "rui.tip.labels": "Korte labels voor je eigen overzicht, zoals gpu of linux. Ze veranderen niet welke jobs de runner krijgt.",
415 "rui.tip.concurrency": "Hoeveel jobs deze machine tegelijk draait. Meer is sneller maar vraagt meer CPU en geheugen. Tip: 1 job per 2 CPU-kernen; zie de aanbevolen waarde eronder.",
416 "rui.tip.maxImages": "Docker-images zijn de kant-en-klare gereedschapskisten waar jobs mee starten. Bewaren scheelt downloadtijd maar kost schijfruimte. Meestal is 10–30 prima.",
417 "rui.tip.timeout": "Stopt een job die langer duurt dan dit aantal minuten, zodat een vastgelopen job de machine niet blokkeert. Leeg volgt de pipeline; 60 is een veilige keuze.",
418 "rui.tip.cpus": "Het maximale aantal CPU-kernen dat één job mag gebruiken, zodat één job niet alles vertraagt. 2 is een goed begin; 1,5 kan ook.",
419 "rui.tip.memory": "Het meeste geheugen (in MB) dat één job mag gebruiken. Heeft een job meer nodig, dan stopt hij met een fout in plaats van de computer te laten vastlopen. 2048 MB (2 GB) past bij de meeste jobs.",
420 "rui.tip.pids": "Begrenst hoeveel programma’s één job kan starten; dat beschermt tegen op hol geslagen scripts. 4096 is ruim genoeg voor gewone builds.",
421 "rui.tip.disk": "Hoeveel schijfruimte de runner in totaal ongeveer mag gebruiken. Ongeveer de helft van de vrije ruimte is een verstandige waarde.",
422 "rui.tip.pull": "Of de runner images opnieuw downloadt. “Als het ontbreekt” is het snelst en goed voor bijna iedereen.",
423 "rui.tip.cleanupWork": "Verwijdert de bestanden van een job als hij klaar is, zodat de schijf niet volloopt. Laat dit aan, tenzij je een mislukte job wilt bekijken.",
424 "rui.tip.pruneDangling": "Ruimt overgebleven, naamloze image-lagen op die niets meer gebruikt. Veilig om aan te laten.",
425 "rui.tip.pruneCache": "Jobs kunnen een cache bewaren (bijv. gedownloade packages) om de volgende keer sneller te zijn. Boven deze grootte gaat de oudste cache weg. 5–20 GB is gebruikelijk.",
426 "rui.tip.alias": "De korte naam die een pipeline na image: gebruikt, bijvoorbeeld team/tools.",
427 "rui.tip.image": "Een bestaand image van Docker Hub of een andere registry dat je zo gebruikt, zoals node:22-alpine.",
428 "rui.tip.from": "Het startimage voor je Dockerfile, of een ander begin voor een ingebouwde preset (bijv. een nieuwere Python).",
429 "rui.tip.note": "Een korte notitie voor jezelf waar deze preset voor is.",
430 "rui.tip.dockerfile": "Een recept dat je eigen gereedschapskist bouwt: begin met FROM en voeg RUN-regels toe die tools installeren. Hij wordt één keer gebouwd en hergebruikt.",
431 "rui.tip.pause": "Pauzeer voordat je deze machine bijwerkt of herstart: lopende jobs maken gewoon af en nieuwe wachten of gaan naar een andere runner. Draait er niets meer, dan is upgraden veilig.",
432 "rui.tip.presets": "Presets zijn gereedschapskisten met een naam voor jobs. De ingebouwde dekken gangbare talen; voeg je eigen toe als een project extra tools nodig heeft.",
433 "runner.tip.prefBuiltin": "Jobs draaien eerst op de BlueGit-server. Je eigen computers helpen alleen als de server bezet is.",
434 "runner.tip.prefOwn": "Jobs draaien eerst op je eigen computers; de BlueGit-server neemt het over als er geen online is.",
435 "runner.tip.token": "Maakt een eenmalige code (24 uur geldig) om een computer als runner te koppelen. Voer het getoonde commando op die computer uit.",
436 "runner.tip.builtinFirst": "Als dit aan staat, probeert de BlueGit-server jobs van de groep eerst, vóór groeps- en ledenrunners.",
437 "runner.tip.optin": "Staat toe dat je eigen account-runners ook jobs van deze groep draaien. Je kunt dit altijd weer stoppen.",
328 438 }
329 439
330 440 var ruiDE = map[string]string{
@@ -484,6 +594,61 @@ var ruiDE = map[string]string{
484 594 "rdoc.trouble.p": "Offline in BlueGit: journalctl -u bluegit-runner prüfen und ob HTTPS zum Server geht. Jobs scheitern mit runner_system_failure: docker info als Benutzer bluegit-runner prüfen (Gruppe docker). 401 vom Server: Runner wurde widerrufen; neu registrieren. Weboberfläche öffnet nicht: ui_listen prüfen und ob der Port belegt ist.",
485 595 "rdoc.cmd.h": "Nützliche Befehle",
486 596 "rdoc.more": "Vollständige Dokumentation auf dem Server:",
597 "modal.title": "Bist du sicher?",
598 "modal.ok": "Bestätigen",
599 "modal.cancel": "Abbrechen",
600 "lang.pick": "Sprache",
601 "tip.info": "Mehr Infos",
602 "nav.admin": "Verwaltung",
603 "title.admin": "Verwaltung",
604 "admin.tab.users": "Benutzer",
605 "admin.tab.runner": "Runner",
606 "admin.tab.storage": "Speicher",
607 "admin.users.title": "Benutzer",
608 "admin.users.lead": "Admins können Runner, Speicher und Updates für die ganze Website ändern und andere zu Admins machen.",
609 "admin.tip.admin": "Ein Admin darf die ganze BlueGit-Website verwalten. Gib das nur Personen, denen du vertraust. Dich selbst kannst du nicht entfernen, und es bleibt immer mindestens ein Admin.",
610 "admin.col.user": "Benutzer",
611 "admin.col.role": "Rolle",
612 "admin.col.since": "Mitglied seit",
613 "admin.you": "du",
614 "admin.role.admin": "Admin",
615 "admin.role.user": "Benutzer",
616 "admin.grant": "Zum Admin machen",
617 "admin.revoke": "Admin entziehen",
618 "admin.grantAsk": "%s zum Admin machen? Diese Person kann dann die ganze Website verwalten.",
619 "admin.revokeAsk": "%s die Admin-Rechte entziehen?",
620 "admin.selfWhy": "Du kannst dir die Admin-Rechte nicht selbst entziehen; frag einen anderen Admin.",
621 "admin.ok.granted": "%s ist jetzt Admin.",
622 "admin.ok.revoked": "%s ist kein Admin mehr.",
623 "admin.err.self": "Du kannst dir die Admin-Rechte nicht selbst entziehen.",
624 "admin.err.last": "Es muss immer mindestens einen Admin geben.",
625 "admin.err.user": "Diesen Benutzer gibt es nicht.",
626 "admin.err.body": "Sende {\"admin\": true} oder {\"admin\": false}.",
627 "rui.tip.name": "Der Name, unter dem du diesen Runner in BlueGit und in Job-Logs siehst. Wähle etwas Wiedererkennbares, z. B. den Computernamen.",
628 "rui.tip.labels": "Kurze Labels für deine Übersicht, z. B. gpu oder linux. Sie ändern nicht, welche Jobs der Runner bekommt.",
629 "rui.tip.concurrency": "Wie viele Jobs diese Maschine gleichzeitig ausführt. Mehr ist schneller, braucht aber mehr CPU und Speicher. Tipp: 1 Job pro 2 CPU-Kerne; siehe den empfohlenen Wert darunter.",
630 "rui.tip.maxImages": "Docker-Images sind fertige Werkzeugkisten, mit denen Jobs starten. Aufbewahren spart Downloadzeit, kostet aber Speicherplatz. Meist sind 10–30 gut.",
631 "rui.tip.timeout": "Stoppt einen Job, der länger als so viele Minuten dauert, damit ein hängender Job die Maschine nicht blockiert. Leer folgt der Pipeline; 60 ist sicher.",
632 "rui.tip.cpus": "Wie viele CPU-Kerne ein Job höchstens nutzen darf, damit ein Job nicht alles bremst. 2 ist ein guter Start; 1,5 geht auch.",
633 "rui.tip.memory": "Höchster Speicher (in MB) für einen Job. Braucht ein Job mehr, stoppt er mit einem Fehler, statt den Rechner einzufrieren. 2048 MB (2 GB) passt für die meisten Jobs.",
634 "rui.tip.pids": "Begrenzt, wie viele Programme ein Job starten kann – Schutz gegen ausufernde Skripte. 4096 reicht für normale Builds.",
635 "rui.tip.disk": "Wie viel Speicherplatz der Runner insgesamt ungefähr nutzen soll. Etwa die Hälfte des freien Platzes ist sinnvoll.",
636 "rui.tip.pull": "Ob der Runner Images neu lädt. „Wenn es fehlt“ ist am schnellsten und für fast alle richtig.",
637 "rui.tip.cleanupWork": "Löscht die Dateien eines Jobs nach dem Ende, damit die Platte nicht voll läuft. Lass das an, außer du willst einen fehlgeschlagenen Job untersuchen.",
638 "rui.tip.pruneDangling": "Entfernt übrig gebliebene, namenlose Image-Schichten, die nichts mehr nutzt. Kann sicher an bleiben.",
639 "rui.tip.pruneCache": "Jobs können einen Cache behalten (z. B. geladene Pakete), um beim nächsten Mal schneller zu sein. Darüber wird der älteste Cache gelöscht. 5–20 GB sind üblich.",
640 "rui.tip.alias": "Der kurze Name nach image: in einer Pipeline, z. B. team/tools.",
641 "rui.tip.image": "Ein vorhandenes Image von Docker Hub oder einer anderen Registry, unverändert, z. B. node:22-alpine.",
642 "rui.tip.from": "Das Start-Image für dein Dockerfile oder ein anderer Start für ein eingebautes Preset (z. B. neueres Python).",
643 "rui.tip.note": "Eine kurze Notiz für dich, wofür dieses Preset ist.",
644 "rui.tip.dockerfile": "Ein Rezept für deine eigene Werkzeugkiste: mit FROM beginnen und RUN-Zeilen zum Installieren hinzufügen. Wird einmal gebaut und wiederverwendet.",
645 "rui.tip.pause": "Pausiere vor einem Update oder Neustart: laufende Jobs werden normal fertig, neue warten oder gehen an einen anderen Runner. Läuft nichts mehr, ist das Upgrade sicher.",
646 "rui.tip.presets": "Presets sind benannte Werkzeugkisten für Jobs. Eingebaute decken gängige Sprachen ab; eigene hinzufügen, wenn ein Projekt mehr braucht.",
647 "runner.tip.prefBuiltin": "Jobs laufen zuerst auf dem BlueGit-Server. Deine Rechner helfen nur, wenn der Server ausgelastet ist.",
648 "runner.tip.prefOwn": "Jobs laufen zuerst auf deinen Rechnern; der BlueGit-Server übernimmt, wenn keiner online ist.",
649 "runner.tip.token": "Erstellt einen einmaligen Code (24 Stunden gültig), um einen Rechner als Runner zu verbinden. Den angezeigten Befehl dort ausführen.",
650 "runner.tip.builtinFirst": "Wenn an, versucht der BlueGit-Server die Jobs der Gruppe zuerst, vor Gruppen- und Mitglieder-Runnern.",
651 "runner.tip.optin": "Erlaubt deinen eigenen Konto-Runnern, auch Jobs dieser Gruppe auszuführen. Jederzeit widerrufbar.",
487 652 }
488 653
489 654 var ruiFR = map[string]string{
@@ -643,4 +808,59 @@ var ruiFR = map[string]string{
643 808 "rdoc.trouble.p": "Hors ligne dans BlueGit : vérifie journalctl -u bluegit-runner et que le HTTPS vers le serveur passe. Jobs en runner_system_failure : vérifie docker info en tant que bluegit-runner (groupe docker). 401 du serveur : le runner a été révoqué ; réenregistre-le. L’interface ne s’ouvre pas : vérifie ui_listen et que le port est libre.",
644 809 "rdoc.cmd.h": "Commandes utiles",
645 810 "rdoc.more": "Documentation complète sur le serveur :",
811 "modal.title": "Es-tu sûr ?",
812 "modal.ok": "Confirmer",
813 "modal.cancel": "Annuler",
814 "lang.pick": "Langue",
815 "tip.info": "Plus d’informations",
816 "nav.admin": "Administration",
817 "title.admin": "Administration",
818 "admin.tab.users": "Utilisateurs",
819 "admin.tab.runner": "Runner",
820 "admin.tab.storage": "Stockage",
821 "admin.users.title": "Utilisateurs",
822 "admin.users.lead": "Les administrateurs gèrent runners, stockage et mises à jour du site et peuvent nommer d’autres administrateurs.",
823 "admin.tip.admin": "Un administrateur peut gérer tout le site BlueGit. Ne le donne qu’à des personnes de confiance. Tu ne peux pas te retirer toi-même et il reste toujours au moins un administrateur.",
824 "admin.col.user": "Utilisateur",
825 "admin.col.role": "Rôle",
826 "admin.col.since": "Membre depuis",
827 "admin.you": "toi",
828 "admin.role.admin": "administrateur",
829 "admin.role.user": "utilisateur",
830 "admin.grant": "Nommer administrateur",
831 "admin.revoke": "Retirer l’administration",
832 "admin.grantAsk": "Nommer %s administrateur ? Cette personne pourra gérer tout le site.",
833 "admin.revokeAsk": "Retirer les droits d’administration de %s ?",
834 "admin.selfWhy": "Tu ne peux pas retirer tes propres droits ; demande à un autre administrateur.",
835 "admin.ok.granted": "%s est maintenant administrateur.",
836 "admin.ok.revoked": "%s n’est plus administrateur.",
837 "admin.err.self": "Tu ne peux pas retirer tes propres droits d’administration.",
838 "admin.err.last": "Il doit toujours y avoir au moins un administrateur.",
839 "admin.err.user": "Cet utilisateur n’existe pas.",
840 "admin.err.body": "Envoie {\"admin\": true} ou {\"admin\": false}.",
841 "rui.tip.name": "Le nom de ce runner dans BlueGit et dans les journaux. Choisis quelque chose de reconnaissable, comme le nom de l’ordinateur.",
842 "rui.tip.labels": "Courtes étiquettes pour ton suivi, comme gpu ou linux. Elles ne changent pas les jobs reçus.",
843 "rui.tip.concurrency": "Combien de jobs cette machine exécute en même temps. Plus est plus rapide mais demande plus de CPU et de mémoire. Conseil : 1 job pour 2 cœurs ; voir la valeur recommandée.",
844 "rui.tip.maxImages": "Les images Docker sont les boîtes à outils de départ des jobs. Les garder évite des téléchargements mais prend de la place. 10 à 30 suffisent en général.",
845 "rui.tip.timeout": "Arrête un job qui dure plus que ce nombre de minutes, pour qu’un job bloqué n’occupe pas la machine. Vide suit la pipeline ; 60 est un choix sûr.",
846 "rui.tip.cpus": "Le nombre maximal de cœurs qu’un job peut utiliser, pour qu’un job ne ralentisse pas tout. 2 est un bon début ; 1,5 marche aussi.",
847 "rui.tip.memory": "La mémoire maximale (en Mo) d’un job. S’il en faut plus, il s’arrête avec une erreur au lieu de bloquer l’ordinateur. 2048 Mo (2 Go) conviennent à la plupart des jobs.",
848 "rui.tip.pids": "Limite le nombre de programmes qu’un job peut lancer, contre les scripts qui s’emballent. 4096 suffit pour des builds normaux.",
849 "rui.tip.disk": "L’espace disque total que le runner devrait viser. Environ la moitié de l’espace libre est raisonnable.",
850 "rui.tip.pull": "Si le runner retélécharge les images. « Si absente » est le plus rapide et convient presque toujours.",
851 "rui.tip.cleanupWork": "Supprime les fichiers d’un job à la fin pour ne pas remplir le disque. Laisse activé sauf pour examiner un job échoué.",
852 "rui.tip.pruneDangling": "Supprime les couches d’images orphelines inutilisées. Sans risque.",
853 "rui.tip.pruneCache": "Les jobs gardent un cache (paquets téléchargés…) pour aller plus vite ensuite. Au-delà de cette taille, le plus ancien est supprimé. 5 à 20 Go est courant.",
854 "rui.tip.alias": "Le nom court utilisé après image: dans une pipeline, par ex. team/tools.",
855 "rui.tip.image": "Une image existante de Docker Hub ou d’un autre registre, telle quelle, comme node:22-alpine.",
856 "rui.tip.from": "L’image de départ de ton Dockerfile, ou un autre départ pour un preset intégré (par ex. un Python plus récent).",
857 "rui.tip.note": "Une courte note pour toi sur l’usage de ce preset.",
858 "rui.tip.dockerfile": "Une recette pour ta propre boîte à outils : commence par FROM et ajoute des lignes RUN qui installent des outils. Construite une fois puis réutilisée.",
859 "rui.tip.pause": "Mets en pause avant de mettre à jour ou redémarrer : les jobs en cours se terminent, les nouveaux attendent ou vont ailleurs. Quand rien ne tourne, la mise à jour est sans risque.",
860 "rui.tip.presets": "Les presets sont des boîtes à outils nommées. Les intégrés couvrent les langages courants ; ajoute les tiens si un projet a besoin d’outils en plus.",
861 "runner.tip.prefBuiltin": "Les jobs tournent d’abord sur le serveur BlueGit. Tes ordinateurs n’aident que s’il est occupé.",
862 "runner.tip.prefOwn": "Les jobs tournent d’abord sur tes ordinateurs ; le serveur BlueGit prend le relais si aucun n’est en ligne.",
863 "runner.tip.token": "Crée un code à usage unique (valable 24 h) pour connecter un ordinateur comme runner. Lance la commande affichée sur cet ordinateur.",
864 "runner.tip.builtinFirst": "Si activé, le serveur BlueGit essaie d’abord les jobs du groupe, avant les runners du groupe et des membres.",
865 "runner.tip.optin": "Autorise tes runners de compte à exécuter aussi les jobs de ce groupe. Tu peux arrêter à tout moment.",
646 866 }
@@ -166,6 +166,61 @@ var ruiEN = map[string]string{
166 "rdoc.trouble.p": "Offline in BlueGit: check journalctl -u bluegit-runner and whether HTTPS to the server works. Jobs fail with runner_system_failure: check docker info as the bluegit-runner user (group docker). 401 from the server: the runner was revoked; register again. The web interface does not open: check ui_listen and that nothing else uses the port.",
166 "rdoc.trouble.p": "Offline in BlueGit: check journalctl -u bluegit-runner and whether HTTPS to the server works. Jobs fail with runner_system_failure: check docker info as the bluegit-runner user (group docker). 401 from the server: the runner was revoked; register again. The web interface does not open: check ui_listen and that nothing else uses the port.",
167 "rdoc.cmd.h": "Useful commands",
167 "rdoc.cmd.h": "Useful commands",
168 "rdoc.more": "Full documentation on the server:",
168 "rdoc.more": "Full documentation on the server:",
169 "modal.title": "Are you sure?",
170 "modal.ok": "Confirm",
171 "modal.cancel": "Cancel",
172 "lang.pick": "Language",
173 "tip.info": "More information",
174 "nav.admin": "Admin",
175 "title.admin": "Admin",
176 "admin.tab.users": "Users",
177 "admin.tab.runner": "Runner",
178 "admin.tab.storage": "Storage",
179 "admin.users.title": "Users",
180 "admin.users.lead": "Admins can change runners, storage and updates for the whole site, and can make other users admin.",
181 "admin.tip.admin": "An admin is someone who may manage the whole BlueGit site. Give this only to people you trust. You cannot remove yourself, and there is always at least one admin left.",
182 "admin.col.user": "User",
183 "admin.col.role": "Role",
184 "admin.col.since": "Member since",
185 "admin.you": "you",
186 "admin.role.admin": "admin",
187 "admin.role.user": "user",
188 "admin.grant": "Make admin",
189 "admin.revoke": "Remove admin",
190 "admin.grantAsk": "Make %s an admin? They can then manage the whole site.",
191 "admin.revokeAsk": "Remove admin rights from %s?",
192 "admin.selfWhy": "You cannot remove your own admin rights; ask another admin.",
193 "admin.ok.granted": "%s is now an admin.",
194 "admin.ok.revoked": "%s is no longer an admin.",
195 "admin.err.self": "You cannot remove your own admin rights.",
196 "admin.err.last": "There must always be at least one admin.",
197 "admin.err.user": "That user does not exist.",
198 "admin.err.body": "Send {\"admin\": true} or {\"admin\": false}.",
199 "rui.tip.name": "The name you see for this runner in BlueGit and in job logs. Pick something you recognise, like the computer's name.",
200 "rui.tip.labels": "Short tags for your own overview, such as gpu or linux. They do not change which jobs the runner gets.",
201 "rui.tip.concurrency": "How many jobs this machine runs at the same time. More is faster but needs more CPU and memory. Tip: 1 job per 2 CPU cores; see the recommended value below.",
202 "rui.tip.maxImages": "Docker images are the ready-made toolboxes jobs start from. Keeping them saves download time but uses disk space. Usually 10–30 is fine.",
203 "rui.tip.timeout": "Stops a job that takes longer than this many minutes, so a stuck job does not block the machine. Leave empty to follow the pipeline; 60 is a safe choice.",
204 "rui.tip.cpus": "The maximum number of CPU cores one job may use, so one job cannot slow down everything else. 2 is a good start; 1.5 also works.",
205 "rui.tip.memory": "The most memory (in MB) one job may use. If a job needs more, it stops with an error instead of freezing the computer. 2048 MB (2 GB) suits most jobs.",
206 "rui.tip.pids": "Limits how many programs one job can start, which protects against runaway scripts. 4096 is plenty for normal builds.",
207 "rui.tip.disk": "How much disk space the runner should aim to use in total. About half of the free space is a sensible value.",
208 "rui.tip.pull": "Whether the runner downloads images again. “When missing” is the fastest and right for almost everyone.",
209 "rui.tip.cleanupWork": "Deletes the job's files when it is done, so the disk does not fill up. Leave this on unless you want to inspect a failed job.",
210 "rui.tip.pruneDangling": "Removes leftover, unnamed image layers that nothing uses anymore. Safe to leave on.",
211 "rui.tip.pruneCache": "Jobs can keep a cache (for example downloaded packages) to be faster next time. Above this size, the oldest cache is removed. 5–20 GB is usual.",
212 "rui.tip.alias": "The short name a pipeline uses after image:, for example team/tools.",
213 "rui.tip.image": "An existing image from Docker Hub or another registry to use as is, like node:22-alpine.",
214 "rui.tip.from": "The starting image for your Dockerfile, or a different start for a built-in preset (for example a newer Python).",
215 "rui.tip.note": "A short reminder for yourself about what this preset is for.",
216 "rui.tip.dockerfile": "A recipe that builds your own toolbox: start with FROM and add RUN lines that install tools. It is built once and reused.",
217 "rui.tip.pause": "Pause before you update or restart this machine: jobs that are running finish normally, and new jobs wait or go to another runner. When nothing is running it is safe to upgrade.",
218 "rui.tip.presets": "Presets are named toolboxes for jobs. Built-in ones cover common languages; add your own when a project needs extra tools.",
219 "runner.tip.prefBuiltin": "Jobs run on the BlueGit server first. Your own computers only help when the server is busy.",
220 "runner.tip.prefOwn": "Jobs run on your own computers first; the BlueGit server takes over when none of them is online.",
221 "runner.tip.token": "Creates a one-time code (valid 24 hours) to connect a computer as a runner. Run the shown command on that computer.",
222 "runner.tip.builtinFirst": "When on, the BlueGit server tries the group's jobs first, before group and member runners.",
223 "runner.tip.optin": "Allows your own account runners to also run jobs of this group. You can stop this at any time.",
169}
224}
170
225
171var ruiNL = map[string]string{
226var ruiNL = map[string]string{
@@ -325,6 +380,61 @@ var ruiNL = map[string]string{
325 "rdoc.trouble.p": "Offline in BlueGit: kijk in journalctl -u bluegit-runner en of HTTPS naar de server werkt. Jobs mislukken met runner_system_failure: controleer docker info als gebruiker bluegit-runner (groep docker). 401 van de server: de runner is ingetrokken; registreer opnieuw. De webinterface opent niet: controleer ui_listen en of niets anders de poort gebruikt.",
380 "rdoc.trouble.p": "Offline in BlueGit: kijk in journalctl -u bluegit-runner en of HTTPS naar de server werkt. Jobs mislukken met runner_system_failure: controleer docker info als gebruiker bluegit-runner (groep docker). 401 van de server: de runner is ingetrokken; registreer opnieuw. De webinterface opent niet: controleer ui_listen en of niets anders de poort gebruikt.",
326 "rdoc.cmd.h": "Handige commando’s",
381 "rdoc.cmd.h": "Handige commando’s",
327 "rdoc.more": "Volledige documentatie op de server:",
382 "rdoc.more": "Volledige documentatie op de server:",
383 "modal.title": "Weet je het zeker?",
384 "modal.ok": "Bevestigen",
385 "modal.cancel": "Annuleren",
386 "lang.pick": "Taal",
387 "tip.info": "Meer uitleg",
388 "nav.admin": "Beheer",
389 "title.admin": "Beheer",
390 "admin.tab.users": "Gebruikers",
391 "admin.tab.runner": "Runner",
392 "admin.tab.storage": "Opslag",
393 "admin.users.title": "Gebruikers",
394 "admin.users.lead": "Beheerders kunnen runners, opslag en updates voor de hele site aanpassen en andere gebruikers beheerder maken.",
395 "admin.tip.admin": "Een beheerder mag de hele BlueGit-site beheren. Geef dit alleen aan mensen die je vertrouwt. Jezelf verwijderen kan niet, en er blijft altijd minstens één beheerder over.",
396 "admin.col.user": "Gebruiker",
397 "admin.col.role": "Rol",
398 "admin.col.since": "Lid sinds",
399 "admin.you": "jij",
400 "admin.role.admin": "beheerder",
401 "admin.role.user": "gebruiker",
402 "admin.grant": "Beheerder maken",
403 "admin.revoke": "Beheerder afnemen",
404 "admin.grantAsk": "%s beheerder maken? Diegene kan dan de hele site beheren.",
405 "admin.revokeAsk": "Beheerdersrechten van %s afnemen?",
406 "admin.selfWhy": "Je kunt je eigen beheerdersrechten niet afnemen; vraag een andere beheerder.",
407 "admin.ok.granted": "%s is nu beheerder.",
408 "admin.ok.revoked": "%s is geen beheerder meer.",
409 "admin.err.self": "Je kunt je eigen beheerdersrechten niet afnemen.",
410 "admin.err.last": "Er moet altijd minstens één beheerder zijn.",
411 "admin.err.user": "Die gebruiker bestaat niet.",
412 "admin.err.body": "Stuur {\"admin\": true} of {\"admin\": false}.",
413 "rui.tip.name": "De naam waaronder je deze runner in BlueGit en in joblogs ziet. Kies iets herkenbaars, zoals de naam van de computer.",
414 "rui.tip.labels": "Korte labels voor je eigen overzicht, zoals gpu of linux. Ze veranderen niet welke jobs de runner krijgt.",
415 "rui.tip.concurrency": "Hoeveel jobs deze machine tegelijk draait. Meer is sneller maar vraagt meer CPU en geheugen. Tip: 1 job per 2 CPU-kernen; zie de aanbevolen waarde eronder.",
416 "rui.tip.maxImages": "Docker-images zijn de kant-en-klare gereedschapskisten waar jobs mee starten. Bewaren scheelt downloadtijd maar kost schijfruimte. Meestal is 10–30 prima.",
417 "rui.tip.timeout": "Stopt een job die langer duurt dan dit aantal minuten, zodat een vastgelopen job de machine niet blokkeert. Leeg volgt de pipeline; 60 is een veilige keuze.",
418 "rui.tip.cpus": "Het maximale aantal CPU-kernen dat één job mag gebruiken, zodat één job niet alles vertraagt. 2 is een goed begin; 1,5 kan ook.",
419 "rui.tip.memory": "Het meeste geheugen (in MB) dat één job mag gebruiken. Heeft een job meer nodig, dan stopt hij met een fout in plaats van de computer te laten vastlopen. 2048 MB (2 GB) past bij de meeste jobs.",
420 "rui.tip.pids": "Begrenst hoeveel programma’s één job kan starten; dat beschermt tegen op hol geslagen scripts. 4096 is ruim genoeg voor gewone builds.",
421 "rui.tip.disk": "Hoeveel schijfruimte de runner in totaal ongeveer mag gebruiken. Ongeveer de helft van de vrije ruimte is een verstandige waarde.",
422 "rui.tip.pull": "Of de runner images opnieuw downloadt. “Als het ontbreekt” is het snelst en goed voor bijna iedereen.",
423 "rui.tip.cleanupWork": "Verwijdert de bestanden van een job als hij klaar is, zodat de schijf niet volloopt. Laat dit aan, tenzij je een mislukte job wilt bekijken.",
424 "rui.tip.pruneDangling": "Ruimt overgebleven, naamloze image-lagen op die niets meer gebruikt. Veilig om aan te laten.",
425 "rui.tip.pruneCache": "Jobs kunnen een cache bewaren (bijv. gedownloade packages) om de volgende keer sneller te zijn. Boven deze grootte gaat de oudste cache weg. 5–20 GB is gebruikelijk.",
426 "rui.tip.alias": "De korte naam die een pipeline na image: gebruikt, bijvoorbeeld team/tools.",
427 "rui.tip.image": "Een bestaand image van Docker Hub of een andere registry dat je zo gebruikt, zoals node:22-alpine.",
428 "rui.tip.from": "Het startimage voor je Dockerfile, of een ander begin voor een ingebouwde preset (bijv. een nieuwere Python).",
429 "rui.tip.note": "Een korte notitie voor jezelf waar deze preset voor is.",
430 "rui.tip.dockerfile": "Een recept dat je eigen gereedschapskist bouwt: begin met FROM en voeg RUN-regels toe die tools installeren. Hij wordt één keer gebouwd en hergebruikt.",
431 "rui.tip.pause": "Pauzeer voordat je deze machine bijwerkt of herstart: lopende jobs maken gewoon af en nieuwe wachten of gaan naar een andere runner. Draait er niets meer, dan is upgraden veilig.",
432 "rui.tip.presets": "Presets zijn gereedschapskisten met een naam voor jobs. De ingebouwde dekken gangbare talen; voeg je eigen toe als een project extra tools nodig heeft.",
433 "runner.tip.prefBuiltin": "Jobs draaien eerst op de BlueGit-server. Je eigen computers helpen alleen als de server bezet is.",
434 "runner.tip.prefOwn": "Jobs draaien eerst op je eigen computers; de BlueGit-server neemt het over als er geen online is.",
435 "runner.tip.token": "Maakt een eenmalige code (24 uur geldig) om een computer als runner te koppelen. Voer het getoonde commando op die computer uit.",
436 "runner.tip.builtinFirst": "Als dit aan staat, probeert de BlueGit-server jobs van de groep eerst, vóór groeps- en ledenrunners.",
437 "runner.tip.optin": "Staat toe dat je eigen account-runners ook jobs van deze groep draaien. Je kunt dit altijd weer stoppen.",
328}
438}
329
439
330var ruiDE = map[string]string{
440var ruiDE = map[string]string{
@@ -484,6 +594,61 @@ var ruiDE = map[string]string{
484 "rdoc.trouble.p": "Offline in BlueGit: journalctl -u bluegit-runner prüfen und ob HTTPS zum Server geht. Jobs scheitern mit runner_system_failure: docker info als Benutzer bluegit-runner prüfen (Gruppe docker). 401 vom Server: Runner wurde widerrufen; neu registrieren. Weboberfläche öffnet nicht: ui_listen prüfen und ob der Port belegt ist.",
594 "rdoc.trouble.p": "Offline in BlueGit: journalctl -u bluegit-runner prüfen und ob HTTPS zum Server geht. Jobs scheitern mit runner_system_failure: docker info als Benutzer bluegit-runner prüfen (Gruppe docker). 401 vom Server: Runner wurde widerrufen; neu registrieren. Weboberfläche öffnet nicht: ui_listen prüfen und ob der Port belegt ist.",
485 "rdoc.cmd.h": "Nützliche Befehle",
595 "rdoc.cmd.h": "Nützliche Befehle",
486 "rdoc.more": "Vollständige Dokumentation auf dem Server:",
596 "rdoc.more": "Vollständige Dokumentation auf dem Server:",
597 "modal.title": "Bist du sicher?",
598 "modal.ok": "Bestätigen",
599 "modal.cancel": "Abbrechen",
600 "lang.pick": "Sprache",
601 "tip.info": "Mehr Infos",
602 "nav.admin": "Verwaltung",
603 "title.admin": "Verwaltung",
604 "admin.tab.users": "Benutzer",
605 "admin.tab.runner": "Runner",
606 "admin.tab.storage": "Speicher",
607 "admin.users.title": "Benutzer",
608 "admin.users.lead": "Admins können Runner, Speicher und Updates für die ganze Website ändern und andere zu Admins machen.",
609 "admin.tip.admin": "Ein Admin darf die ganze BlueGit-Website verwalten. Gib das nur Personen, denen du vertraust. Dich selbst kannst du nicht entfernen, und es bleibt immer mindestens ein Admin.",
610 "admin.col.user": "Benutzer",
611 "admin.col.role": "Rolle",
612 "admin.col.since": "Mitglied seit",
613 "admin.you": "du",
614 "admin.role.admin": "Admin",
615 "admin.role.user": "Benutzer",
616 "admin.grant": "Zum Admin machen",
617 "admin.revoke": "Admin entziehen",
618 "admin.grantAsk": "%s zum Admin machen? Diese Person kann dann die ganze Website verwalten.",
619 "admin.revokeAsk": "%s die Admin-Rechte entziehen?",
620 "admin.selfWhy": "Du kannst dir die Admin-Rechte nicht selbst entziehen; frag einen anderen Admin.",
621 "admin.ok.granted": "%s ist jetzt Admin.",
622 "admin.ok.revoked": "%s ist kein Admin mehr.",
623 "admin.err.self": "Du kannst dir die Admin-Rechte nicht selbst entziehen.",
624 "admin.err.last": "Es muss immer mindestens einen Admin geben.",
625 "admin.err.user": "Diesen Benutzer gibt es nicht.",
626 "admin.err.body": "Sende {\"admin\": true} oder {\"admin\": false}.",
627 "rui.tip.name": "Der Name, unter dem du diesen Runner in BlueGit und in Job-Logs siehst. Wähle etwas Wiedererkennbares, z. B. den Computernamen.",
628 "rui.tip.labels": "Kurze Labels für deine Übersicht, z. B. gpu oder linux. Sie ändern nicht, welche Jobs der Runner bekommt.",
629 "rui.tip.concurrency": "Wie viele Jobs diese Maschine gleichzeitig ausführt. Mehr ist schneller, braucht aber mehr CPU und Speicher. Tipp: 1 Job pro 2 CPU-Kerne; siehe den empfohlenen Wert darunter.",
630 "rui.tip.maxImages": "Docker-Images sind fertige Werkzeugkisten, mit denen Jobs starten. Aufbewahren spart Downloadzeit, kostet aber Speicherplatz. Meist sind 10–30 gut.",
631 "rui.tip.timeout": "Stoppt einen Job, der länger als so viele Minuten dauert, damit ein hängender Job die Maschine nicht blockiert. Leer folgt der Pipeline; 60 ist sicher.",
632 "rui.tip.cpus": "Wie viele CPU-Kerne ein Job höchstens nutzen darf, damit ein Job nicht alles bremst. 2 ist ein guter Start; 1,5 geht auch.",
633 "rui.tip.memory": "Höchster Speicher (in MB) für einen Job. Braucht ein Job mehr, stoppt er mit einem Fehler, statt den Rechner einzufrieren. 2048 MB (2 GB) passt für die meisten Jobs.",
634 "rui.tip.pids": "Begrenzt, wie viele Programme ein Job starten kann – Schutz gegen ausufernde Skripte. 4096 reicht für normale Builds.",
635 "rui.tip.disk": "Wie viel Speicherplatz der Runner insgesamt ungefähr nutzen soll. Etwa die Hälfte des freien Platzes ist sinnvoll.",
636 "rui.tip.pull": "Ob der Runner Images neu lädt. „Wenn es fehlt“ ist am schnellsten und für fast alle richtig.",
637 "rui.tip.cleanupWork": "Löscht die Dateien eines Jobs nach dem Ende, damit die Platte nicht voll läuft. Lass das an, außer du willst einen fehlgeschlagenen Job untersuchen.",
638 "rui.tip.pruneDangling": "Entfernt übrig gebliebene, namenlose Image-Schichten, die nichts mehr nutzt. Kann sicher an bleiben.",
639 "rui.tip.pruneCache": "Jobs können einen Cache behalten (z. B. geladene Pakete), um beim nächsten Mal schneller zu sein. Darüber wird der älteste Cache gelöscht. 5–20 GB sind üblich.",
640 "rui.tip.alias": "Der kurze Name nach image: in einer Pipeline, z. B. team/tools.",
641 "rui.tip.image": "Ein vorhandenes Image von Docker Hub oder einer anderen Registry, unverändert, z. B. node:22-alpine.",
642 "rui.tip.from": "Das Start-Image für dein Dockerfile oder ein anderer Start für ein eingebautes Preset (z. B. neueres Python).",
643 "rui.tip.note": "Eine kurze Notiz für dich, wofür dieses Preset ist.",
644 "rui.tip.dockerfile": "Ein Rezept für deine eigene Werkzeugkiste: mit FROM beginnen und RUN-Zeilen zum Installieren hinzufügen. Wird einmal gebaut und wiederverwendet.",
645 "rui.tip.pause": "Pausiere vor einem Update oder Neustart: laufende Jobs werden normal fertig, neue warten oder gehen an einen anderen Runner. Läuft nichts mehr, ist das Upgrade sicher.",
646 "rui.tip.presets": "Presets sind benannte Werkzeugkisten für Jobs. Eingebaute decken gängige Sprachen ab; eigene hinzufügen, wenn ein Projekt mehr braucht.",
647 "runner.tip.prefBuiltin": "Jobs laufen zuerst auf dem BlueGit-Server. Deine Rechner helfen nur, wenn der Server ausgelastet ist.",
648 "runner.tip.prefOwn": "Jobs laufen zuerst auf deinen Rechnern; der BlueGit-Server übernimmt, wenn keiner online ist.",
649 "runner.tip.token": "Erstellt einen einmaligen Code (24 Stunden gültig), um einen Rechner als Runner zu verbinden. Den angezeigten Befehl dort ausführen.",
650 "runner.tip.builtinFirst": "Wenn an, versucht der BlueGit-Server die Jobs der Gruppe zuerst, vor Gruppen- und Mitglieder-Runnern.",
651 "runner.tip.optin": "Erlaubt deinen eigenen Konto-Runnern, auch Jobs dieser Gruppe auszuführen. Jederzeit widerrufbar.",
487}
652}
488
653
489var ruiFR = map[string]string{
654var ruiFR = map[string]string{
@@ -643,4 +808,59 @@ var ruiFR = map[string]string{
643 "rdoc.trouble.p": "Hors ligne dans BlueGit : vérifie journalctl -u bluegit-runner et que le HTTPS vers le serveur passe. Jobs en runner_system_failure : vérifie docker info en tant que bluegit-runner (groupe docker). 401 du serveur : le runner a été révoqué ; réenregistre-le. L’interface ne s’ouvre pas : vérifie ui_listen et que le port est libre.",
808 "rdoc.trouble.p": "Hors ligne dans BlueGit : vérifie journalctl -u bluegit-runner et que le HTTPS vers le serveur passe. Jobs en runner_system_failure : vérifie docker info en tant que bluegit-runner (groupe docker). 401 du serveur : le runner a été révoqué ; réenregistre-le. L’interface ne s’ouvre pas : vérifie ui_listen et que le port est libre.",
644 "rdoc.cmd.h": "Commandes utiles",
809 "rdoc.cmd.h": "Commandes utiles",
645 "rdoc.more": "Documentation complète sur le serveur :",
810 "rdoc.more": "Documentation complète sur le serveur :",
811 "modal.title": "Es-tu sûr ?",
812 "modal.ok": "Confirmer",
813 "modal.cancel": "Annuler",
814 "lang.pick": "Langue",
815 "tip.info": "Plus d’informations",
816 "nav.admin": "Administration",
817 "title.admin": "Administration",
818 "admin.tab.users": "Utilisateurs",
819 "admin.tab.runner": "Runner",
820 "admin.tab.storage": "Stockage",
821 "admin.users.title": "Utilisateurs",
822 "admin.users.lead": "Les administrateurs gèrent runners, stockage et mises à jour du site et peuvent nommer d’autres administrateurs.",
823 "admin.tip.admin": "Un administrateur peut gérer tout le site BlueGit. Ne le donne qu’à des personnes de confiance. Tu ne peux pas te retirer toi-même et il reste toujours au moins un administrateur.",
824 "admin.col.user": "Utilisateur",
825 "admin.col.role": "Rôle",
826 "admin.col.since": "Membre depuis",
827 "admin.you": "toi",
828 "admin.role.admin": "administrateur",
829 "admin.role.user": "utilisateur",
830 "admin.grant": "Nommer administrateur",
831 "admin.revoke": "Retirer l’administration",
832 "admin.grantAsk": "Nommer %s administrateur ? Cette personne pourra gérer tout le site.",
833 "admin.revokeAsk": "Retirer les droits d’administration de %s ?",
834 "admin.selfWhy": "Tu ne peux pas retirer tes propres droits ; demande à un autre administrateur.",
835 "admin.ok.granted": "%s est maintenant administrateur.",
836 "admin.ok.revoked": "%s n’est plus administrateur.",
837 "admin.err.self": "Tu ne peux pas retirer tes propres droits d’administration.",
838 "admin.err.last": "Il doit toujours y avoir au moins un administrateur.",
839 "admin.err.user": "Cet utilisateur n’existe pas.",
840 "admin.err.body": "Envoie {\"admin\": true} ou {\"admin\": false}.",
841 "rui.tip.name": "Le nom de ce runner dans BlueGit et dans les journaux. Choisis quelque chose de reconnaissable, comme le nom de l’ordinateur.",
842 "rui.tip.labels": "Courtes étiquettes pour ton suivi, comme gpu ou linux. Elles ne changent pas les jobs reçus.",
843 "rui.tip.concurrency": "Combien de jobs cette machine exécute en même temps. Plus est plus rapide mais demande plus de CPU et de mémoire. Conseil : 1 job pour 2 cœurs ; voir la valeur recommandée.",
844 "rui.tip.maxImages": "Les images Docker sont les boîtes à outils de départ des jobs. Les garder évite des téléchargements mais prend de la place. 10 à 30 suffisent en général.",
845 "rui.tip.timeout": "Arrête un job qui dure plus que ce nombre de minutes, pour qu’un job bloqué n’occupe pas la machine. Vide suit la pipeline ; 60 est un choix sûr.",
846 "rui.tip.cpus": "Le nombre maximal de cœurs qu’un job peut utiliser, pour qu’un job ne ralentisse pas tout. 2 est un bon début ; 1,5 marche aussi.",
847 "rui.tip.memory": "La mémoire maximale (en Mo) d’un job. S’il en faut plus, il s’arrête avec une erreur au lieu de bloquer l’ordinateur. 2048 Mo (2 Go) conviennent à la plupart des jobs.",
848 "rui.tip.pids": "Limite le nombre de programmes qu’un job peut lancer, contre les scripts qui s’emballent. 4096 suffit pour des builds normaux.",
849 "rui.tip.disk": "L’espace disque total que le runner devrait viser. Environ la moitié de l’espace libre est raisonnable.",
850 "rui.tip.pull": "Si le runner retélécharge les images. « Si absente » est le plus rapide et convient presque toujours.",
851 "rui.tip.cleanupWork": "Supprime les fichiers d’un job à la fin pour ne pas remplir le disque. Laisse activé sauf pour examiner un job échoué.",
852 "rui.tip.pruneDangling": "Supprime les couches d’images orphelines inutilisées. Sans risque.",
853 "rui.tip.pruneCache": "Les jobs gardent un cache (paquets téléchargés…) pour aller plus vite ensuite. Au-delà de cette taille, le plus ancien est supprimé. 5 à 20 Go est courant.",
854 "rui.tip.alias": "Le nom court utilisé après image: dans une pipeline, par ex. team/tools.",
855 "rui.tip.image": "Une image existante de Docker Hub ou d’un autre registre, telle quelle, comme node:22-alpine.",
856 "rui.tip.from": "L’image de départ de ton Dockerfile, ou un autre départ pour un preset intégré (par ex. un Python plus récent).",
857 "rui.tip.note": "Une courte note pour toi sur l’usage de ce preset.",
858 "rui.tip.dockerfile": "Une recette pour ta propre boîte à outils : commence par FROM et ajoute des lignes RUN qui installent des outils. Construite une fois puis réutilisée.",
859 "rui.tip.pause": "Mets en pause avant de mettre à jour ou redémarrer : les jobs en cours se terminent, les nouveaux attendent ou vont ailleurs. Quand rien ne tourne, la mise à jour est sans risque.",
860 "rui.tip.presets": "Les presets sont des boîtes à outils nommées. Les intégrés couvrent les langages courants ; ajoute les tiens si un projet a besoin d’outils en plus.",
861 "runner.tip.prefBuiltin": "Les jobs tournent d’abord sur le serveur BlueGit. Tes ordinateurs n’aident que s’il est occupé.",
862 "runner.tip.prefOwn": "Les jobs tournent d’abord sur tes ordinateurs ; le serveur BlueGit prend le relais si aucun n’est en ligne.",
863 "runner.tip.token": "Crée un code à usage unique (valable 24 h) pour connecter un ordinateur comme runner. Lance la commande affichée sur cet ordinateur.",
864 "runner.tip.builtinFirst": "Si activé, le serveur BlueGit essaie d’abord les jobs du groupe, avant les runners du groupe et des membres.",
865 "runner.tip.optin": "Autorise tes runners de compte à exécuter aussi les jobs de ce groupe. Tu peux arrêter à tout moment.",
646}
866}
internal/langpick/langpick.go added +66 −0
@@ -0,0 +1,66 @@
1 // Package langpick is de taalkiezer in de kopbalk van BlueGit en van de
2 // bluegit-runner-webinterface: een vlag van de huidige taal, met een eigen
3 // popover met de andere vlaggen (inline SVG, geen emoji of browser-select).
4 // Elke vlag is een submitknop in een POST-formulier; zonder JavaScript
5 // werkt hij als gewone lijst. langpick.js regelt openen/sluiten.
6 package langpick
7
8 import (
9 "html/template"
10 "strings"
11
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 )
14
15 // Langs is de volgorde in de kiezer.
16 var Langs = []i18n.Lang{i18n.NL, i18n.EN, i18n.DE, i18n.FR}
17
18 // Flag geeft een inline SVG-vlag (3:2) met de taalnaam als titel.
19 func Flag(l i18n.Lang) template.HTML {
20 var inner string
21 switch l {
22 case i18n.NL:
23 inner = `<rect width="30" height="20" fill="#21468B"/><rect width="30" height="13.34" fill="#fff"/><rect width="30" height="6.67" fill="#AE1C28"/>`
24 case i18n.DE:
25 inner = `<rect width="30" height="20" fill="#FFCE00"/><rect width="30" height="13.34" fill="#DD0000"/><rect width="30" height="6.67" fill="#000"/>`
26 case i18n.FR:
27 inner = `<rect width="30" height="20" fill="#ED2939"/><rect width="20" height="20" fill="#fff"/><rect width="10" height="20" fill="#002395"/>`
28 case i18n.EN:
29 inner = `<clipPath id="ukc"><rect width="30" height="20"/></clipPath><g clip-path="url(#ukc)"><rect width="30" height="20" fill="#012169"/><path d="M0 0L30 20M30 0L0 20" stroke="#fff" stroke-width="4"/><path d="M0 0L30 20M30 0L0 20" stroke="#C8102E" stroke-width="1.6"/><path d="M15 0V20M0 10H30" stroke="#fff" stroke-width="6"/><path d="M15 0V20M0 10H30" stroke="#C8102E" stroke-width="3.4"/></g>`
30 default:
31 inner = `<rect width="30" height="20" rx="2" fill="#142033"/><text x="15" y="14.5" font-size="12" text-anchor="middle" fill="#fff">𒀭</text>`
32 }
33 return template.HTML(`<svg class="flag" viewBox="0 0 30 20" width="24" height="16" aria-hidden="true" focusable="false">` + inner + `</svg>`)
34 }
35
36 // HTML maakt de kiezer. action ontvangt POST lang=…&back=…; csrfField
37 // leeg betekent geen CSRF-veld (anoniem met SameSite-cookie).
38 func HTML(cur i18n.Lang, action, back, csrfField, csrf string) template.HTML {
39 esc := template.HTMLEscapeString
40 label := i18n.T(cur, "lang.pick")
41 var b strings.Builder
42 b.WriteString(`<div class="langpick" data-langpick>`)
43 b.WriteString(`<button type="button" class="langpick-btn" aria-haspopup="true" aria-expanded="false" aria-label="` + esc(label+": "+cur.Name()) + `" title="` + esc(cur.Name()) + `">`)
44 b.WriteString(string(Flag(cur)) + `<span class="langpick-caret" aria-hidden="true">▾</span></button>`)
45 b.WriteString(`<form class="langpick-menu" method="post" action="` + esc(action) + `" role="menu" aria-label="` + esc(label) + `" hidden>`)
46 if csrfField != "" {
47 b.WriteString(`<input type="hidden" name="` + esc(csrfField) + `" value="` + esc(csrf) + `">`)
48 }
49 b.WriteString(`<input type="hidden" name="back" value="` + esc(back) + `">`)
50 for _, l := range Langs {
51 if l == cur {
52 continue
53 }
54 b.WriteString(`<button type="submit" role="menuitem" name="lang" value="` + string(l) + `" lang="` + string(l) + `" title="` + esc(l.Name()) + `" aria-label="` + esc(l.Name()) + `">` + string(Flag(l)) + `<span>` + esc(l.Name()) + `</span></button>`)
55 }
56 b.WriteString(`</form></div>`)
57 return template.HTML(b.String())
58 }
59
60 // SafeBack laat alleen lokale paden toe (geen open redirect).
61 func SafeBack(back string) string {
62 if !strings.HasPrefix(back, "/") || strings.HasPrefix(back, "//") || strings.ContainsAny(back, "\\\r\n") {
63 return "/"
64 }
65 return back
66 }
@@ -0,0 +1,66 @@
1// Package langpick is de taalkiezer in de kopbalk van BlueGit en van de
2// bluegit-runner-webinterface: een vlag van de huidige taal, met een eigen
3// popover met de andere vlaggen (inline SVG, geen emoji of browser-select).
4// Elke vlag is een submitknop in een POST-formulier; zonder JavaScript
5// werkt hij als gewone lijst. langpick.js regelt openen/sluiten.
6package langpick
7
8import (
9 "html/template"
10 "strings"
11
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13)
14
15// Langs is de volgorde in de kiezer.
16var Langs = []i18n.Lang{i18n.NL, i18n.EN, i18n.DE, i18n.FR}
17
18// Flag geeft een inline SVG-vlag (3:2) met de taalnaam als titel.
19func Flag(l i18n.Lang) template.HTML {
20 var inner string
21 switch l {
22 case i18n.NL:
23 inner = `<rect width="30" height="20" fill="#21468B"/><rect width="30" height="13.34" fill="#fff"/><rect width="30" height="6.67" fill="#AE1C28"/>`
24 case i18n.DE:
25 inner = `<rect width="30" height="20" fill="#FFCE00"/><rect width="30" height="13.34" fill="#DD0000"/><rect width="30" height="6.67" fill="#000"/>`
26 case i18n.FR:
27 inner = `<rect width="30" height="20" fill="#ED2939"/><rect width="20" height="20" fill="#fff"/><rect width="10" height="20" fill="#002395"/>`
28 case i18n.EN:
29 inner = `<clipPath id="ukc"><rect width="30" height="20"/></clipPath><g clip-path="url(#ukc)"><rect width="30" height="20" fill="#012169"/><path d="M0 0L30 20M30 0L0 20" stroke="#fff" stroke-width="4"/><path d="M0 0L30 20M30 0L0 20" stroke="#C8102E" stroke-width="1.6"/><path d="M15 0V20M0 10H30" stroke="#fff" stroke-width="6"/><path d="M15 0V20M0 10H30" stroke="#C8102E" stroke-width="3.4"/></g>`
30 default:
31 inner = `<rect width="30" height="20" rx="2" fill="#142033"/><text x="15" y="14.5" font-size="12" text-anchor="middle" fill="#fff">𒀭</text>`
32 }
33 return template.HTML(`<svg class="flag" viewBox="0 0 30 20" width="24" height="16" aria-hidden="true" focusable="false">` + inner + `</svg>`)
34}
35
36// HTML maakt de kiezer. action ontvangt POST lang=…&back=…; csrfField
37// leeg betekent geen CSRF-veld (anoniem met SameSite-cookie).
38func HTML(cur i18n.Lang, action, back, csrfField, csrf string) template.HTML {
39 esc := template.HTMLEscapeString
40 label := i18n.T(cur, "lang.pick")
41 var b strings.Builder
42 b.WriteString(`<div class="langpick" data-langpick>`)
43 b.WriteString(`<button type="button" class="langpick-btn" aria-haspopup="true" aria-expanded="false" aria-label="` + esc(label+": "+cur.Name()) + `" title="` + esc(cur.Name()) + `">`)
44 b.WriteString(string(Flag(cur)) + `<span class="langpick-caret" aria-hidden="true">▾</span></button>`)
45 b.WriteString(`<form class="langpick-menu" method="post" action="` + esc(action) + `" role="menu" aria-label="` + esc(label) + `" hidden>`)
46 if csrfField != "" {
47 b.WriteString(`<input type="hidden" name="` + esc(csrfField) + `" value="` + esc(csrf) + `">`)
48 }
49 b.WriteString(`<input type="hidden" name="back" value="` + esc(back) + `">`)
50 for _, l := range Langs {
51 if l == cur {
52 continue
53 }
54 b.WriteString(`<button type="submit" role="menuitem" name="lang" value="` + string(l) + `" lang="` + string(l) + `" title="` + esc(l.Name()) + `" aria-label="` + esc(l.Name()) + `">` + string(Flag(l)) + `<span>` + esc(l.Name()) + `</span></button>`)
55 }
56 b.WriteString(`</form></div>`)
57 return template.HTML(b.String())
58}
59
60// SafeBack laat alleen lokale paden toe (geen open redirect).
61func SafeBack(back string) string {
62 if !strings.HasPrefix(back, "/") || strings.HasPrefix(back, "//") || strings.ContainsAny(back, "\\\r\n") {
63 return "/"
64 }
65 return back
66}
internal/langpick/langpick_test.go added +28 −0
@@ -0,0 +1,28 @@
1 package langpick
2
3 import (
4 "strings"
5 "testing"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
8 )
9
10 func TestSafeBack(t *testing.T) {
11 for in, want := range map[string]string{"/help": "/help", "//evil": "/", "https://x": "/", "": "/", `/\evil`: "/", "/a?b=1": "/a?b=1"} {
12 if got := SafeBack(in); got != want {
13 t.Errorf("SafeBack(%q)=%q", in, got)
14 }
15 }
16 }
17
18 func TestHTML(t *testing.T) {
19 h := string(HTML(i18n.NL, "/-/lang", "/x", "csrf", "tok"))
20 for _, s := range []string{"data-langpick", `aria-haspopup`, `value="en"`, `value="de"`, `value="fr"`, `name="csrf" value="tok"`, "<svg"} {
21 if !strings.Contains(h, s) {
22 t.Errorf("mist %s", s)
23 }
24 }
25 if strings.Contains(h, `value="nl"`) {
26 t.Error("huidige taal staat in menu")
27 }
28 }
@@ -0,0 +1,28 @@
1package langpick
2
3import (
4 "strings"
5 "testing"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
8)
9
10func TestSafeBack(t *testing.T) {
11 for in, want := range map[string]string{"/help": "/help", "//evil": "/", "https://x": "/", "": "/", `/\evil`: "/", "/a?b=1": "/a?b=1"} {
12 if got := SafeBack(in); got != want {
13 t.Errorf("SafeBack(%q)=%q", in, got)
14 }
15 }
16}
17
18func TestHTML(t *testing.T) {
19 h := string(HTML(i18n.NL, "/-/lang", "/x", "csrf", "tok"))
20 for _, s := range []string{"data-langpick", `aria-haspopup`, `value="en"`, `value="de"`, `value="fr"`, `name="csrf" value="tok"`, "<svg"} {
21 if !strings.Contains(h, s) {
22 t.Errorf("mist %s", s)
23 }
24 }
25 if strings.Contains(h, `value="nl"`) {
26 t.Error("huidige taal staat in menu")
27 }
28}
internal/runnercfg/tip.go added +20 −0
@@ -0,0 +1,20 @@
1 package runnercfg
2
3 import (
4 "html/template"
5 "strings"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
8 )
9
10 // Tip maakt een info-icoon (i) met uitleg uit de catalogus. Het is een
11 // span (geen button), zodat het label van het omringende veld blijft
12 // wijzen naar het invoerveld; tip.js maakt hem bedienbaar met tik/Enter.
13 // De uitleg verschijnt bij hover, toetsenbordfocus en als het veld in
14 // hetzelfde .tiphost-element focus heeft.
15 func Tip(lang i18n.Lang, key string) template.HTML {
16 id := "tip-" + strings.NewReplacer(".", "-", "_", "-").Replace(key)
17 text := template.HTMLEscapeString(i18n.T(lang, key))
18 info := template.HTMLEscapeString(i18n.T(lang, "tip.info"))
19 return template.HTML(`<span class="tip"><span class="tip-i" role="button" tabindex="0" aria-expanded="false" aria-label="` + info + `" aria-describedby="` + id + `">i</span><span class="tip-b" role="tooltip" id="` + id + `">` + text + `</span></span>`)
20 }
@@ -0,0 +1,20 @@
1package runnercfg
2
3import (
4 "html/template"
5 "strings"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
8)
9
10// Tip maakt een info-icoon (i) met uitleg uit de catalogus. Het is een
11// span (geen button), zodat het label van het omringende veld blijft
12// wijzen naar het invoerveld; tip.js maakt hem bedienbaar met tik/Enter.
13// De uitleg verschijnt bij hover, toetsenbordfocus en als het veld in
14// hetzelfde .tiphost-element focus heeft.
15func Tip(lang i18n.Lang, key string) template.HTML {
16 id := "tip-" + strings.NewReplacer(".", "-", "_", "-").Replace(key)
17 text := template.HTMLEscapeString(i18n.T(lang, key))
18 info := template.HTMLEscapeString(i18n.T(lang, "tip.info"))
19 return template.HTML(`<span class="tip"><span class="tip-i" role="button" tabindex="0" aria-expanded="false" aria-label="` + info + `" aria-describedby="` + id + `">i</span><span class="tip-b" role="tooltip" id="` + id + `">` + text + `</span></span>`)
20}
internal/runnercfg/tip_test.go added +38 −0
@@ -0,0 +1,38 @@
1 package runnercfg
2
3 import (
4 "regexp"
5 "strings"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9 )
10
11 // Elke instelling (label met invoer) heeft een tooltip, en elke tip-sleutel
12 // bestaat in alle talen.
13 func TestEverySettingHasTip(t *testing.T) {
14 lbl := regexp.MustCompile(`(?s)<label[^>]*>(.*?)</label>`)
15 n := 0
16 for _, m := range lbl.FindAllStringSubmatch(uiSource, -1) {
17 if !strings.Contains(m[1], "<input") && !strings.Contains(m[1], "<select") && !strings.Contains(m[1], "<textarea") {
18 continue
19 }
20 n++
21 if !strings.Contains(m[1], `{{tip "`) {
22 t.Errorf("instelling zonder tooltip: %.120s", strings.TrimSpace(m[1]))
23 }
24 }
25 if n < 15 {
26 t.Fatalf("te weinig instellingen gevonden: %d", n)
27 }
28 for _, k := range regexp.MustCompile(`tip "([^"]+)"`).FindAllStringSubmatch(uiSource, -1) {
29 for _, l := range []i18n.Lang{i18n.EN, i18n.NL, i18n.DE, i18n.FR} {
30 if got := i18n.T(l, k[1]); got == k[1] || got == "" {
31 t.Errorf("%s ontbreekt in %s", k[1], l)
32 }
33 }
34 }
35 if !strings.Contains(string(Tip(i18n.NL, "rui.tip.name")), `role="tooltip"`) {
36 t.Fatal("tip zonder role")
37 }
38 }
@@ -0,0 +1,38 @@
1package runnercfg
2
3import (
4 "regexp"
5 "strings"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9)
10
11// Elke instelling (label met invoer) heeft een tooltip, en elke tip-sleutel
12// bestaat in alle talen.
13func TestEverySettingHasTip(t *testing.T) {
14 lbl := regexp.MustCompile(`(?s)<label[^>]*>(.*?)</label>`)
15 n := 0
16 for _, m := range lbl.FindAllStringSubmatch(uiSource, -1) {
17 if !strings.Contains(m[1], "<input") && !strings.Contains(m[1], "<select") && !strings.Contains(m[1], "<textarea") {
18 continue
19 }
20 n++
21 if !strings.Contains(m[1], `{{tip "`) {
22 t.Errorf("instelling zonder tooltip: %.120s", strings.TrimSpace(m[1]))
23 }
24 }
25 if n < 15 {
26 t.Fatalf("te weinig instellingen gevonden: %d", n)
27 }
28 for _, k := range regexp.MustCompile(`tip "([^"]+)"`).FindAllStringSubmatch(uiSource, -1) {
29 for _, l := range []i18n.Lang{i18n.EN, i18n.NL, i18n.DE, i18n.FR} {
30 if got := i18n.T(l, k[1]); got == k[1] || got == "" {
31 t.Errorf("%s ontbreekt in %s", k[1], l)
32 }
33 }
34 }
35 if !strings.Contains(string(Tip(i18n.NL, "rui.tip.name")), `role="tooltip"`) {
36 t.Fatal("tip zonder role")
37 }
38}
internal/runnercfg/ui_tmpl.go +21 −20
@@ -30,6 +30,7 @@ func uiTmpl(lang i18n.Lang) *template.Template {
30 30 func Funcs(lang i18n.Lang) template.FuncMap {
31 31 return template.FuncMap{
32 32 "t": func(key string, args ...any) string { return i18n.T(lang, key, args...) },
33 "tip": func(key string) template.HTML { return Tip(lang, key) },
33 34 "ago": func(t time.Time) string { return i18n.Ago(lang, t.Unix()) },
34 35 "dur": func(a, b time.Time) string {
35 36 if b.IsZero() {
@@ -99,7 +100,7 @@ const uiSource = `{{define "runnerui"}}
99 100 </dl>
100 101 </section>
101 102 <section class="panel rui-card rui-upgrade">
102 <h2>{{t "rui.upgrade"}}</h2>
103 <h2 class="tiphost">{{t "rui.upgrade"}} {{tip "rui.tip.pause"}}</h2>
103 104 <p class="rui-big">{{len .Active}} <span class="muted">{{t "rui.activeCount"}}</span></p>
104 105 {{if .Safe}}<p class="rui-safe ok">✓ {{t "rui.safe"}}</p>{{else}}<p class="rui-safe warn">⏳ {{t "rui.notSafe"}}</p>{{end}}
105 106 {{if .S.Paused}}
@@ -146,37 +147,37 @@ const uiSource = `{{define "runnerui"}}
146 147 <form method="post" action="{{.Prefix}}/settings" class="rui-form">
147 148 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
148 149 <fieldset><legend>{{t "rui.grp.general"}}</legend>
149 <label>{{t "rui.f.name"}}<input name="name" value="{{.S.Name}}" maxlength="63" placeholder="{{.Status.Name}}"><small class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.h.nameBuiltin"}}{{else}}{{t "rui.h.name"}}{{end}}</small></label>
150 <label>{{t "rui.f.labels"}}<input name="labels" value="{{join .S.Labels}}" placeholder="docker, linux, gpu"><small class="muted">{{t "rui.h.labels"}}</small></label>
150 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.name"}} {{tip "rui.tip.name"}}</span><input name="name" value="{{.S.Name}}" maxlength="63" placeholder="{{.Status.Name}}"><small class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.h.nameBuiltin"}}{{else}}{{t "rui.h.name"}}{{end}}</small></label>
151 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.labels"}} {{tip "rui.tip.labels"}}</span><input name="labels" value="{{join .S.Labels}}" placeholder="docker, linux, gpu"><small class="muted">{{t "rui.h.labels"}}</small></label>
151 152 </fieldset>
152 153 <fieldset><legend>{{t "rui.grp.capacity"}}</legend>
153 <label>{{t "rui.f.concurrency"}}<input type="number" min="1" max="64" name="concurrency" value="{{.S.Concurrency}}"><small class="rui-rec">{{t "rui.rec" .Rec.Concurrency}}</small></label>
154 <label>{{t "rui.f.maxImages"}}<input type="number" min="1" max="1000" name="max_images" value="{{.S.MaxImages}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxImages}}</small></label>
155 <label>{{t "rui.f.timeout"}}<input type="number" min="0" name="job_timeout_min" value="{{num .S.JobTimeoutMin}}" placeholder="{{t "rui.unlimited"}}"><small class="muted">{{t "rui.h.timeout"}}</small></label>
154 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.concurrency"}} {{tip "rui.tip.concurrency"}}</span><input type="number" min="1" max="64" name="concurrency" value="{{.S.Concurrency}}"><small class="rui-rec">{{t "rui.rec" .Rec.Concurrency}}</small></label>
155 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.maxImages"}} {{tip "rui.tip.maxImages"}}</span><input type="number" min="1" max="1000" name="max_images" value="{{.S.MaxImages}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxImages}}</small></label>
156 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.timeout"}} {{tip "rui.tip.timeout"}}</span><input type="number" min="0" name="job_timeout_min" value="{{num .S.JobTimeoutMin}}" placeholder="{{t "rui.unlimited"}}"><small class="muted">{{t "rui.h.timeout"}}</small></label>
156 157 </fieldset>
157 158 <fieldset><legend>{{t "rui.grp.limits"}}</legend>
158 <label>{{t "rui.f.cpus"}}<input inputmode="decimal" name="cpus" value="{{cpus .S.CPUs}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" (cpus .Rec.CPUs)}}</small></label>
159 <label>{{t "rui.f.memory"}}<input type="number" min="0" step="64" name="memory_mb" value="{{num .S.MemoryMB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MemoryMB}}</small></label>
160 <label>{{t "rui.f.pids"}}<input type="number" min="0" name="pids_limit" value="{{num .S.PidsLimit}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PidsLimit}}</small></label>
161 <label>{{t "rui.f.disk"}}<input type="number" min="0" name="max_disk_gb" value="{{num .S.MaxDiskGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxDiskGB}} · {{t "rui.h.disk"}}</small></label>
159 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.cpus"}} {{tip "rui.tip.cpus"}}</span><input inputmode="decimal" name="cpus" value="{{cpus .S.CPUs}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" (cpus .Rec.CPUs)}}</small></label>
160 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.memory"}} {{tip "rui.tip.memory"}}</span><input type="number" min="0" step="64" name="memory_mb" value="{{num .S.MemoryMB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MemoryMB}}</small></label>
161 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.pids"}} {{tip "rui.tip.pids"}}</span><input type="number" min="0" name="pids_limit" value="{{num .S.PidsLimit}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PidsLimit}}</small></label>
162 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.disk"}} {{tip "rui.tip.disk"}}</span><input type="number" min="0" name="max_disk_gb" value="{{num .S.MaxDiskGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxDiskGB}} · {{t "rui.h.disk"}}</small></label>
162 163 </fieldset>
163 164 <fieldset><legend>{{t "rui.grp.images"}}</legend>
164 <label>{{t "rui.f.pull"}}
165 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.pull"}} {{tip "rui.tip.pull"}}</span>
165 166 <select name="pull_policy">
166 167 <option value="if-not-present"{{if eq .S.PullPolicy "if-not-present"}} selected{{end}}>{{t "rui.pull.ifNotPresent"}}</option>
167 168 <option value="always"{{if eq .S.PullPolicy "always"}} selected{{end}}>{{t "rui.pull.always"}}</option>
168 169 <option value="never"{{if eq .S.PullPolicy "never"}} selected{{end}}>{{t "rui.pull.never"}}</option>
169 170 </select><small class="muted">{{t "rui.h.pull"}}</small></label>
170 <label class="rui-check"><input type="checkbox" name="cleanup_work"{{if .S.CleanupWork}} checked{{end}}> {{t "rui.f.cleanupWork"}}</label>
171 <label class="rui-check"><input type="checkbox" name="prune_dangling"{{if .S.PruneDangling}} checked{{end}}> {{t "rui.f.pruneDangling"}}</label>
172 <label>{{t "rui.f.pruneCache"}}<input type="number" min="0" name="prune_cache_gb" value="{{num .S.PruneCacheGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PruneCacheGB}}</small></label>
171 <label class="rui-check tiphost"><input type="checkbox" name="cleanup_work"{{if .S.CleanupWork}} checked{{end}}> {{t "rui.f.cleanupWork"}} {{tip "rui.tip.cleanupWork"}}</label>
172 <label class="rui-check tiphost"><input type="checkbox" name="prune_dangling"{{if .S.PruneDangling}} checked{{end}}> {{t "rui.f.pruneDangling"}} {{tip "rui.tip.pruneDangling"}}</label>
173 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.pruneCache"}} {{tip "rui.tip.pruneCache"}}</span><input type="number" min="0" name="prune_cache_gb" value="{{num .S.PruneCacheGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PruneCacheGB}}</small></label>
173 174 </fieldset>
174 175 <div class="rui-actions"><button type="submit">{{t "rui.save"}}</button></div>
175 176 </form>
176 177 </section>
177 178
178 179 <section class="panel" id="presets">
179 <h2>{{t "rui.presets"}}</h2>
180 <h2 class="tiphost">{{t "rui.presets"}} {{tip "rui.tip.presets"}}</h2>
180 181 <p class="muted">{{t "rui.presetsLead"}}</p>
181 182 <div class="hscroll"><table class="rui-table">
182 183 <thead><tr><th>{{t "rui.col.alias"}}</th><th>{{t "rui.col.base"}}</th><th>{{t "rui.col.kind"}}</th><th></th></tr></thead>
@@ -194,11 +195,11 @@ const uiSource = `{{define "runnerui"}}
194 195 <form method="post" action="{{.Prefix}}/presets" class="rui-form">
195 196 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
196 197 <fieldset>
197 <label>{{t "rui.f.alias"}}<input name="name" required placeholder="team/tools" pattern="[a-z0-9._/-]+"><small class="muted">{{t "rui.h.alias"}}</small></label>
198 <label>{{t "rui.f.image"}}<input name="image" placeholder="node:22-alpine"><small class="muted">{{t "rui.h.image"}}</small></label>
199 <label>{{t "rui.f.from"}}<input name="from" placeholder="debian:bookworm-slim"><small class="muted">{{t "rui.h.from"}}</small></label>
200 <label>{{t "rui.f.note"}}<input name="note" maxlength="120"></label>
201 <label class="rui-wide">{{t "rui.f.dockerfile"}}<textarea name="dockerfile" rows="6" placeholder="FROM debian:bookworm-slim&#10;RUN apt-get update &amp;&amp; apt-get install -y git make"></textarea><small class="muted">{{t "rui.h.dockerfile"}}</small></label>
198 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.alias"}} {{tip "rui.tip.alias"}}</span><input name="name" required placeholder="team/tools" pattern="[a-z0-9._/-]+"><small class="muted">{{t "rui.h.alias"}}</small></label>
199 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.image"}} {{tip "rui.tip.image"}}</span><input name="image" placeholder="node:22-alpine"><small class="muted">{{t "rui.h.image"}}</small></label>
200 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.from"}} {{tip "rui.tip.from"}}</span><input name="from" placeholder="debian:bookworm-slim"><small class="muted">{{t "rui.h.from"}}</small></label>
201 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.note"}} {{tip "rui.tip.note"}}</span><input name="note" maxlength="120"></label>
202 <label class="rui-wide tiphost"><span class="rui-lbl">{{t "rui.f.dockerfile"}} {{tip "rui.tip.dockerfile"}}</span><textarea name="dockerfile" rows="6" placeholder="FROM debian:bookworm-slim&#10;RUN apt-get update &amp;&amp; apt-get install -y git make"></textarea><small class="muted">{{t "rui.h.dockerfile"}}</small></label>
202 203 </fieldset>
203 204 <div class="rui-actions"><button type="submit">{{t "rui.presetSave"}}</button></div>
204 205 </form>
@@ -30,6 +30,7 @@ func uiTmpl(lang i18n.Lang) *template.Template {
30func Funcs(lang i18n.Lang) template.FuncMap {
30func Funcs(lang i18n.Lang) template.FuncMap {
31 return template.FuncMap{
31 return template.FuncMap{
32 "t": func(key string, args ...any) string { return i18n.T(lang, key, args...) },
32 "t": func(key string, args ...any) string { return i18n.T(lang, key, args...) },
33 "tip": func(key string) template.HTML { return Tip(lang, key) },
33 "ago": func(t time.Time) string { return i18n.Ago(lang, t.Unix()) },
34 "ago": func(t time.Time) string { return i18n.Ago(lang, t.Unix()) },
34 "dur": func(a, b time.Time) string {
35 "dur": func(a, b time.Time) string {
35 if b.IsZero() {
36 if b.IsZero() {
@@ -99,7 +100,7 @@ const uiSource = `{{define "runnerui"}}
99 </dl>
100 </dl>
100 </section>
101 </section>
101 <section class="panel rui-card rui-upgrade">
102 <section class="panel rui-card rui-upgrade">
102 <h2>{{t "rui.upgrade"}}</h2>
103 <h2 class="tiphost">{{t "rui.upgrade"}} {{tip "rui.tip.pause"}}</h2>
103 <p class="rui-big">{{len .Active}} <span class="muted">{{t "rui.activeCount"}}</span></p>
104 <p class="rui-big">{{len .Active}} <span class="muted">{{t "rui.activeCount"}}</span></p>
104 {{if .Safe}}<p class="rui-safe ok">✓ {{t "rui.safe"}}</p>{{else}}<p class="rui-safe warn">⏳ {{t "rui.notSafe"}}</p>{{end}}
105 {{if .Safe}}<p class="rui-safe ok">✓ {{t "rui.safe"}}</p>{{else}}<p class="rui-safe warn">⏳ {{t "rui.notSafe"}}</p>{{end}}
105 {{if .S.Paused}}
106 {{if .S.Paused}}
@@ -146,37 +147,37 @@ const uiSource = `{{define "runnerui"}}
146 <form method="post" action="{{.Prefix}}/settings" class="rui-form">
147 <form method="post" action="{{.Prefix}}/settings" class="rui-form">
147 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
148 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
148 <fieldset><legend>{{t "rui.grp.general"}}</legend>
149 <fieldset><legend>{{t "rui.grp.general"}}</legend>
149 <label>{{t "rui.f.name"}}<input name="name" value="{{.S.Name}}" maxlength="63" placeholder="{{.Status.Name}}"><small class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.h.nameBuiltin"}}{{else}}{{t "rui.h.name"}}{{end}}</small></label>
150 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.name"}} {{tip "rui.tip.name"}}</span><input name="name" value="{{.S.Name}}" maxlength="63" placeholder="{{.Status.Name}}"><small class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.h.nameBuiltin"}}{{else}}{{t "rui.h.name"}}{{end}}</small></label>
150 <label>{{t "rui.f.labels"}}<input name="labels" value="{{join .S.Labels}}" placeholder="docker, linux, gpu"><small class="muted">{{t "rui.h.labels"}}</small></label>
151 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.labels"}} {{tip "rui.tip.labels"}}</span><input name="labels" value="{{join .S.Labels}}" placeholder="docker, linux, gpu"><small class="muted">{{t "rui.h.labels"}}</small></label>
151 </fieldset>
152 </fieldset>
152 <fieldset><legend>{{t "rui.grp.capacity"}}</legend>
153 <fieldset><legend>{{t "rui.grp.capacity"}}</legend>
153 <label>{{t "rui.f.concurrency"}}<input type="number" min="1" max="64" name="concurrency" value="{{.S.Concurrency}}"><small class="rui-rec">{{t "rui.rec" .Rec.Concurrency}}</small></label>
154 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.concurrency"}} {{tip "rui.tip.concurrency"}}</span><input type="number" min="1" max="64" name="concurrency" value="{{.S.Concurrency}}"><small class="rui-rec">{{t "rui.rec" .Rec.Concurrency}}</small></label>
154 <label>{{t "rui.f.maxImages"}}<input type="number" min="1" max="1000" name="max_images" value="{{.S.MaxImages}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxImages}}</small></label>
155 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.maxImages"}} {{tip "rui.tip.maxImages"}}</span><input type="number" min="1" max="1000" name="max_images" value="{{.S.MaxImages}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxImages}}</small></label>
155 <label>{{t "rui.f.timeout"}}<input type="number" min="0" name="job_timeout_min" value="{{num .S.JobTimeoutMin}}" placeholder="{{t "rui.unlimited"}}"><small class="muted">{{t "rui.h.timeout"}}</small></label>
156 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.timeout"}} {{tip "rui.tip.timeout"}}</span><input type="number" min="0" name="job_timeout_min" value="{{num .S.JobTimeoutMin}}" placeholder="{{t "rui.unlimited"}}"><small class="muted">{{t "rui.h.timeout"}}</small></label>
156 </fieldset>
157 </fieldset>
157 <fieldset><legend>{{t "rui.grp.limits"}}</legend>
158 <fieldset><legend>{{t "rui.grp.limits"}}</legend>
158 <label>{{t "rui.f.cpus"}}<input inputmode="decimal" name="cpus" value="{{cpus .S.CPUs}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" (cpus .Rec.CPUs)}}</small></label>
159 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.cpus"}} {{tip "rui.tip.cpus"}}</span><input inputmode="decimal" name="cpus" value="{{cpus .S.CPUs}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" (cpus .Rec.CPUs)}}</small></label>
159 <label>{{t "rui.f.memory"}}<input type="number" min="0" step="64" name="memory_mb" value="{{num .S.MemoryMB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MemoryMB}}</small></label>
160 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.memory"}} {{tip "rui.tip.memory"}}</span><input type="number" min="0" step="64" name="memory_mb" value="{{num .S.MemoryMB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MemoryMB}}</small></label>
160 <label>{{t "rui.f.pids"}}<input type="number" min="0" name="pids_limit" value="{{num .S.PidsLimit}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PidsLimit}}</small></label>
161 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.pids"}} {{tip "rui.tip.pids"}}</span><input type="number" min="0" name="pids_limit" value="{{num .S.PidsLimit}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PidsLimit}}</small></label>
161 <label>{{t "rui.f.disk"}}<input type="number" min="0" name="max_disk_gb" value="{{num .S.MaxDiskGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxDiskGB}} · {{t "rui.h.disk"}}</small></label>
162 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.disk"}} {{tip "rui.tip.disk"}}</span><input type="number" min="0" name="max_disk_gb" value="{{num .S.MaxDiskGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxDiskGB}} · {{t "rui.h.disk"}}</small></label>
162 </fieldset>
163 </fieldset>
163 <fieldset><legend>{{t "rui.grp.images"}}</legend>
164 <fieldset><legend>{{t "rui.grp.images"}}</legend>
164 <label>{{t "rui.f.pull"}}
165 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.pull"}} {{tip "rui.tip.pull"}}</span>
165 <select name="pull_policy">
166 <select name="pull_policy">
166 <option value="if-not-present"{{if eq .S.PullPolicy "if-not-present"}} selected{{end}}>{{t "rui.pull.ifNotPresent"}}</option>
167 <option value="if-not-present"{{if eq .S.PullPolicy "if-not-present"}} selected{{end}}>{{t "rui.pull.ifNotPresent"}}</option>
167 <option value="always"{{if eq .S.PullPolicy "always"}} selected{{end}}>{{t "rui.pull.always"}}</option>
168 <option value="always"{{if eq .S.PullPolicy "always"}} selected{{end}}>{{t "rui.pull.always"}}</option>
168 <option value="never"{{if eq .S.PullPolicy "never"}} selected{{end}}>{{t "rui.pull.never"}}</option>
169 <option value="never"{{if eq .S.PullPolicy "never"}} selected{{end}}>{{t "rui.pull.never"}}</option>
169 </select><small class="muted">{{t "rui.h.pull"}}</small></label>
170 </select><small class="muted">{{t "rui.h.pull"}}</small></label>
170 <label class="rui-check"><input type="checkbox" name="cleanup_work"{{if .S.CleanupWork}} checked{{end}}> {{t "rui.f.cleanupWork"}}</label>
171 <label class="rui-check tiphost"><input type="checkbox" name="cleanup_work"{{if .S.CleanupWork}} checked{{end}}> {{t "rui.f.cleanupWork"}} {{tip "rui.tip.cleanupWork"}}</label>
171 <label class="rui-check"><input type="checkbox" name="prune_dangling"{{if .S.PruneDangling}} checked{{end}}> {{t "rui.f.pruneDangling"}}</label>
172 <label class="rui-check tiphost"><input type="checkbox" name="prune_dangling"{{if .S.PruneDangling}} checked{{end}}> {{t "rui.f.pruneDangling"}} {{tip "rui.tip.pruneDangling"}}</label>
172 <label>{{t "rui.f.pruneCache"}}<input type="number" min="0" name="prune_cache_gb" value="{{num .S.PruneCacheGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PruneCacheGB}}</small></label>
173 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.pruneCache"}} {{tip "rui.tip.pruneCache"}}</span><input type="number" min="0" name="prune_cache_gb" value="{{num .S.PruneCacheGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PruneCacheGB}}</small></label>
173 </fieldset>
174 </fieldset>
174 <div class="rui-actions"><button type="submit">{{t "rui.save"}}</button></div>
175 <div class="rui-actions"><button type="submit">{{t "rui.save"}}</button></div>
175 </form>
176 </form>
176</section>
177</section>
177
178
178<section class="panel" id="presets">
179<section class="panel" id="presets">
179 <h2>{{t "rui.presets"}}</h2>
180 <h2 class="tiphost">{{t "rui.presets"}} {{tip "rui.tip.presets"}}</h2>
180 <p class="muted">{{t "rui.presetsLead"}}</p>
181 <p class="muted">{{t "rui.presetsLead"}}</p>
181 <div class="hscroll"><table class="rui-table">
182 <div class="hscroll"><table class="rui-table">
182 <thead><tr><th>{{t "rui.col.alias"}}</th><th>{{t "rui.col.base"}}</th><th>{{t "rui.col.kind"}}</th><th></th></tr></thead>
183 <thead><tr><th>{{t "rui.col.alias"}}</th><th>{{t "rui.col.base"}}</th><th>{{t "rui.col.kind"}}</th><th></th></tr></thead>
@@ -194,11 +195,11 @@ const uiSource = `{{define "runnerui"}}
194 <form method="post" action="{{.Prefix}}/presets" class="rui-form">
195 <form method="post" action="{{.Prefix}}/presets" class="rui-form">
195 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
196 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
196 <fieldset>
197 <fieldset>
197 <label>{{t "rui.f.alias"}}<input name="name" required placeholder="team/tools" pattern="[a-z0-9._/-]+"><small class="muted">{{t "rui.h.alias"}}</small></label>
198 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.alias"}} {{tip "rui.tip.alias"}}</span><input name="name" required placeholder="team/tools" pattern="[a-z0-9._/-]+"><small class="muted">{{t "rui.h.alias"}}</small></label>
198 <label>{{t "rui.f.image"}}<input name="image" placeholder="node:22-alpine"><small class="muted">{{t "rui.h.image"}}</small></label>
199 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.image"}} {{tip "rui.tip.image"}}</span><input name="image" placeholder="node:22-alpine"><small class="muted">{{t "rui.h.image"}}</small></label>
199 <label>{{t "rui.f.from"}}<input name="from" placeholder="debian:bookworm-slim"><small class="muted">{{t "rui.h.from"}}</small></label>
200 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.from"}} {{tip "rui.tip.from"}}</span><input name="from" placeholder="debian:bookworm-slim"><small class="muted">{{t "rui.h.from"}}</small></label>
200 <label>{{t "rui.f.note"}}<input name="note" maxlength="120"></label>
201 <label class="tiphost"><span class="rui-lbl">{{t "rui.f.note"}} {{tip "rui.tip.note"}}</span><input name="note" maxlength="120"></label>
201 <label class="rui-wide">{{t "rui.f.dockerfile"}}<textarea name="dockerfile" rows="6" placeholder="FROM debian:bookworm-slim&#10;RUN apt-get update &amp;&amp; apt-get install -y git make"></textarea><small class="muted">{{t "rui.h.dockerfile"}}</small></label>
202 <label class="rui-wide tiphost"><span class="rui-lbl">{{t "rui.f.dockerfile"}} {{tip "rui.tip.dockerfile"}}</span><textarea name="dockerfile" rows="6" placeholder="FROM debian:bookworm-slim&#10;RUN apt-get update &amp;&amp; apt-get install -y git make"></textarea><small class="muted">{{t "rui.h.dockerfile"}}</small></label>
202 </fieldset>
203 </fieldset>
203 <div class="rui-actions"><button type="submit">{{t "rui.presetSave"}}</button></div>
204 <div class="rui-actions"><button type="submit">{{t "rui.presetSave"}}</button></div>
204 </form>
205 </form>
internal/server/admin_users.go added +172 −0
@@ -0,0 +1,172 @@
1 package server
2
3 import (
4 "errors"
5 "net/http"
6 "strconv"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/store"
11 )
12
13 // Beheer > Gebruikers: elke sitebeheerder kan een ander beheerder maken of
14 // die rechten weer afnemen. Jezelf degraderen kan niet, en er blijft altijd
15 // minstens één beheerder (store.SetInstanceAdmin). Elke wijziging komt als
16 // auditregel in de log ("admin audit").
17
18 // AdminTab is één subtab onder Beheer.
19 type AdminTab struct {
20 Key, Href string
21 On bool
22 }
23
24 func adminTabs(page string) []AdminTab {
25 tabs := []AdminTab{
26 {Key: "admin.tab.users", Href: "/admin/users"},
27 {Key: "admin.tab.runner", Href: "/admin/runner"},
28 {Key: "admin.tab.storage", Href: "/setup"},
29 }
30 for i := range tabs {
31 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2)
32 }
33 return tabs
34 }
35
36 func isAdminPage(page string) bool {
37 return page == "adminusers" || page == "adminrunner" || page == "setup"
38 }
39
40 func (s *Server) mountAdmin(mux *http.ServeMux) {
41 mux.HandleFunc("GET /admin", s.adminHome)
42 mux.HandleFunc("GET /admin/{$}", s.adminHome)
43 mux.HandleFunc("GET /admin/users", s.adminUsers)
44 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
45 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
46 if ok, _ := s.adminOnly(w, r); ok {
47 http.Redirect(w, r, "/setup", http.StatusFound)
48 }
49 })
50 }
51
52 func (s *Server) adminHome(w http.ResponseWriter, r *http.Request) {
53 if ok, _ := s.adminOnly(w, r); ok {
54 http.Redirect(w, r, "/admin/users", http.StatusFound)
55 }
56 }
57
58 // AdminUserRow is één rij in Beheer > Gebruikers.
59 type AdminUserRow struct {
60 User store.User
61 Self bool
62 }
63
64 func (s *Server) adminUsers(w http.ResponseWriter, r *http.Request) {
65 if ok, _ := s.adminOnly(w, r); !ok {
66 return
67 }
68 users, err := s.Store.ListUsers(r.Context())
69 if err != nil {
70 http.Error(w, err.Error(), http.StatusInternalServerError)
71 return
72 }
73 v := s.view(w, r, "title.admin")
74 v.Page = "adminusers"
75 me := s.who(r).User.ID
76 for _, u := range users {
77 v.AdminUsers = append(v.AdminUsers, AdminUserRow{User: u, Self: u.ID == me})
78 }
79 s.render(w, "adminusers", v)
80 }
81
82 func adminRoleErr(err error) error {
83 switch {
84 case errors.Is(err, store.ErrSelfDemote):
85 return i18n.E("admin.err.self")
86 case errors.Is(err, store.ErrLastAdmin):
87 return i18n.E("admin.err.last")
88 }
89 return i18n.E("admin.err.user")
90 }
91
92 func (s *Server) setAdmin(r *http.Request, target int64, admin bool) (store.User, error) {
93 by := s.who(r).User
94 if by.ID == 0 {
95 by = apiUser(r)
96 }
97 u, err := s.Store.SetInstanceAdmin(r.Context(), by.ID, target, admin)
98 if err != nil {
99 return u, err
100 }
101 if s.Log != nil {
102 s.Log.Info("admin audit", "action", map[bool]string{true: "grant_admin", false: "revoke_admin"}[admin], "by", by.Username, "target", u.Username)
103 }
104 return u, nil
105 }
106
107 func (s *Server) adminUserRole(w http.ResponseWriter, r *http.Request) {
108 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
109 return
110 }
111 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
112 u, err := s.setAdmin(r, id, r.FormValue("admin") == "1")
113 if err != nil {
114 s.redirect(w, r, "/admin/users", "", s.trErr(r, adminRoleErr(err)))
115 return
116 }
117 key := "admin.ok.granted"
118 if !u.InstanceAdmin {
119 key = "admin.ok.revoked"
120 }
121 s.redirect(w, r, "/admin/users", s.tr(r, key, u.Username), "")
122 }
123
124 func adminUserJSON(u store.User) map[string]any {
125 return map[string]any{"id": u.ID, "username": u.Username, "admin": u.InstanceAdmin, "created_at": rfcTime(u.CreatedAt)}
126 }
127
128 func (s *Server) apiAdminUsers(w http.ResponseWriter, r *http.Request) {
129 if !apiUser(r).InstanceAdmin {
130 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
131 return
132 }
133 users, err := s.Store.ListUsers(r.Context())
134 if err != nil {
135 s.writeAPIErr(w, r, err)
136 return
137 }
138 out := []map[string]any{}
139 for _, u := range users {
140 out = append(out, adminUserJSON(u))
141 }
142 writeJSON(w, http.StatusOK, out)
143 }
144
145 func (s *Server) apiAdminUserRole(w http.ResponseWriter, r *http.Request) {
146 if !apiUser(r).InstanceAdmin {
147 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
148 return
149 }
150 var in struct {
151 Admin *bool `json:"admin"`
152 }
153 if err := readJSON(r, &in); err != nil || in.Admin == nil {
154 s.writeAPIErr(w, r, fail(400, i18n.E("admin.err.body")))
155 return
156 }
157 target, err := s.Store.UserByUsername(r.Context(), strings.TrimSpace(r.PathValue("username")))
158 if err != nil {
159 s.writeAPIErr(w, r, fail(404, i18n.E("admin.err.user")))
160 return
161 }
162 u, err := s.setAdmin(r, target.ID, *in.Admin)
163 if err != nil {
164 code := 409
165 if errors.Is(err, store.ErrSelfDemote) {
166 code = 403
167 }
168 s.writeAPIErr(w, r, fail(code, adminRoleErr(err)))
169 return
170 }
171 writeJSON(w, http.StatusOK, adminUserJSON(u))
172 }
@@ -0,0 +1,172 @@
1package server
2
3import (
4 "errors"
5 "net/http"
6 "strconv"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/store"
11)
12
13// Beheer > Gebruikers: elke sitebeheerder kan een ander beheerder maken of
14// die rechten weer afnemen. Jezelf degraderen kan niet, en er blijft altijd
15// minstens één beheerder (store.SetInstanceAdmin). Elke wijziging komt als
16// auditregel in de log ("admin audit").
17
18// AdminTab is één subtab onder Beheer.
19type AdminTab struct {
20 Key, Href string
21 On bool
22}
23
24func adminTabs(page string) []AdminTab {
25 tabs := []AdminTab{
26 {Key: "admin.tab.users", Href: "/admin/users"},
27 {Key: "admin.tab.runner", Href: "/admin/runner"},
28 {Key: "admin.tab.storage", Href: "/setup"},
29 }
30 for i := range tabs {
31 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2)
32 }
33 return tabs
34}
35
36func isAdminPage(page string) bool {
37 return page == "adminusers" || page == "adminrunner" || page == "setup"
38}
39
40func (s *Server) mountAdmin(mux *http.ServeMux) {
41 mux.HandleFunc("GET /admin", s.adminHome)
42 mux.HandleFunc("GET /admin/{$}", s.adminHome)
43 mux.HandleFunc("GET /admin/users", s.adminUsers)
44 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
45 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
46 if ok, _ := s.adminOnly(w, r); ok {
47 http.Redirect(w, r, "/setup", http.StatusFound)
48 }
49 })
50}
51
52func (s *Server) adminHome(w http.ResponseWriter, r *http.Request) {
53 if ok, _ := s.adminOnly(w, r); ok {
54 http.Redirect(w, r, "/admin/users", http.StatusFound)
55 }
56}
57
58// AdminUserRow is één rij in Beheer > Gebruikers.
59type AdminUserRow struct {
60 User store.User
61 Self bool
62}
63
64func (s *Server) adminUsers(w http.ResponseWriter, r *http.Request) {
65 if ok, _ := s.adminOnly(w, r); !ok {
66 return
67 }
68 users, err := s.Store.ListUsers(r.Context())
69 if err != nil {
70 http.Error(w, err.Error(), http.StatusInternalServerError)
71 return
72 }
73 v := s.view(w, r, "title.admin")
74 v.Page = "adminusers"
75 me := s.who(r).User.ID
76 for _, u := range users {
77 v.AdminUsers = append(v.AdminUsers, AdminUserRow{User: u, Self: u.ID == me})
78 }
79 s.render(w, "adminusers", v)
80}
81
82func adminRoleErr(err error) error {
83 switch {
84 case errors.Is(err, store.ErrSelfDemote):
85 return i18n.E("admin.err.self")
86 case errors.Is(err, store.ErrLastAdmin):
87 return i18n.E("admin.err.last")
88 }
89 return i18n.E("admin.err.user")
90}
91
92func (s *Server) setAdmin(r *http.Request, target int64, admin bool) (store.User, error) {
93 by := s.who(r).User
94 if by.ID == 0 {
95 by = apiUser(r)
96 }
97 u, err := s.Store.SetInstanceAdmin(r.Context(), by.ID, target, admin)
98 if err != nil {
99 return u, err
100 }
101 if s.Log != nil {
102 s.Log.Info("admin audit", "action", map[bool]string{true: "grant_admin", false: "revoke_admin"}[admin], "by", by.Username, "target", u.Username)
103 }
104 return u, nil
105}
106
107func (s *Server) adminUserRole(w http.ResponseWriter, r *http.Request) {
108 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
109 return
110 }
111 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
112 u, err := s.setAdmin(r, id, r.FormValue("admin") == "1")
113 if err != nil {
114 s.redirect(w, r, "/admin/users", "", s.trErr(r, adminRoleErr(err)))
115 return
116 }
117 key := "admin.ok.granted"
118 if !u.InstanceAdmin {
119 key = "admin.ok.revoked"
120 }
121 s.redirect(w, r, "/admin/users", s.tr(r, key, u.Username), "")
122}
123
124func adminUserJSON(u store.User) map[string]any {
125 return map[string]any{"id": u.ID, "username": u.Username, "admin": u.InstanceAdmin, "created_at": rfcTime(u.CreatedAt)}
126}
127
128func (s *Server) apiAdminUsers(w http.ResponseWriter, r *http.Request) {
129 if !apiUser(r).InstanceAdmin {
130 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
131 return
132 }
133 users, err := s.Store.ListUsers(r.Context())
134 if err != nil {
135 s.writeAPIErr(w, r, err)
136 return
137 }
138 out := []map[string]any{}
139 for _, u := range users {
140 out = append(out, adminUserJSON(u))
141 }
142 writeJSON(w, http.StatusOK, out)
143}
144
145func (s *Server) apiAdminUserRole(w http.ResponseWriter, r *http.Request) {
146 if !apiUser(r).InstanceAdmin {
147 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
148 return
149 }
150 var in struct {
151 Admin *bool `json:"admin"`
152 }
153 if err := readJSON(r, &in); err != nil || in.Admin == nil {
154 s.writeAPIErr(w, r, fail(400, i18n.E("admin.err.body")))
155 return
156 }
157 target, err := s.Store.UserByUsername(r.Context(), strings.TrimSpace(r.PathValue("username")))
158 if err != nil {
159 s.writeAPIErr(w, r, fail(404, i18n.E("admin.err.user")))
160 return
161 }
162 u, err := s.setAdmin(r, target.ID, *in.Admin)
163 if err != nil {
164 code := 409
165 if errors.Is(err, store.ErrSelfDemote) {
166 code = 403
167 }
168 s.writeAPIErr(w, r, fail(code, adminRoleErr(err)))
169 return
170 }
171 writeJSON(w, http.StatusOK, adminUserJSON(u))
172}
internal/server/admin_users_test.go added +161 −0
@@ -0,0 +1,161 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/url"
7 "os"
8 "path/filepath"
9 "regexp"
10 "strings"
11 "testing"
12 )
13
14 func TestAdminUsersRoles(t *testing.T) {
15 e := newCIEnv(t)
16 ctx := context.Background()
17 st, base := e.st, e.ts.URL
18 tim, _ := st.UserByID(ctx, e.user.ID)
19 if !tim.InstanceAdmin {
20 t.Skip("eerste gebruiker is geen beheerder")
21 }
22 bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
23
24 // Niet-beheerder: geen Beheer-link, UI en API 403.
25 bc, bcsrf := sessionClient(t, st, base, bob.ID)
26 res, _ := bc.Get(base + "/")
27 if strings.Contains(body(t, res), `href="/admin"`) {
28 t.Fatal("bob ziet Beheer-link")
29 }
30 for _, p := range []string{"/admin/users", "/admin/storage"} {
31 res, _ = bc.Get(base + p)
32 if res.StatusCode != http.StatusForbidden {
33 t.Fatalf("bob %s: %d", p, res.StatusCode)
34 }
35 res.Body.Close()
36 }
37 res, _ = bc.PostForm(base+"/admin/users/role", url.Values{"csrf": {bcsrf}, "id": {itoa(bob.ID)}, "admin": {"1"}})
38 if res.StatusCode != http.StatusForbidden {
39 t.Fatalf("bob maakt zichzelf admin: %d", res.StatusCode)
40 }
41 res.Body.Close()
42 bobTok := issue(t, st, bob.ID, "api")
43 if code, _ := rapi(t, base, bobTok, "GET", "/admin/users", nil); code != http.StatusForbidden {
44 t.Fatalf("bob api list: %d", code)
45 }
46 if code, _ := rapi(t, base, bobTok, "PUT", "/admin/users/bob/admin", map[string]any{"admin": true}); code != http.StatusForbidden {
47 t.Fatalf("bob api grant: %d", code)
48 }
49
50 // Beheerder: nav, redirect, pagina met eigen knop uitgeschakeld.
51 tc, tcsrf := sessionClient(t, st, base, tim.ID)
52 res, _ = tc.Get(base + "/admin")
53 if res.StatusCode/100 != 3 || res.Header.Get("Location") != "/admin/users" {
54 t.Fatalf("/admin: %d %s", res.StatusCode, res.Header.Get("Location"))
55 }
56 res.Body.Close()
57 res, _ = tc.Get(base + "/admin/users")
58 page := body(t, res)
59 if res.StatusCode != 200 || !strings.Contains(page, `href="/admin"`) || !strings.Contains(page, `class="admintabs"`) || !strings.Contains(page, `disabled aria-describedby="why-self"`) || !strings.Contains(page, `data-confirm=`) {
60 t.Fatalf("beheerpagina %d: %.400s", res.StatusCode, page)
61 }
62 // Zelf afnemen geweigerd (UI en API).
63 res, _ = tc.PostForm(base+"/admin/users/role", url.Values{"csrf": {tcsrf}, "id": {itoa(tim.ID)}, "admin": {"0"}})
64 res.Body.Close()
65 if u, _ := st.UserByID(ctx, tim.ID); !u.InstanceAdmin {
66 t.Fatal("zelf afnemen via UI gelukt")
67 }
68 adminTok := issue(t, st, tim.ID, "api")
69 if code, _ := rapi(t, base, adminTok, "PUT", "/admin/users/"+tim.Username+"/admin", map[string]any{"admin": false}); code != http.StatusForbidden {
70 t.Fatalf("zelf afnemen api: %d", code)
71 }
72 // Toekennen en afnemen via UI en API.
73 res, _ = tc.PostForm(base+"/admin/users/role", url.Values{"csrf": {tcsrf}, "id": {itoa(bob.ID)}, "admin": {"1"}})
74 res.Body.Close()
75 if u, _ := st.UserByID(ctx, bob.ID); !u.InstanceAdmin {
76 t.Fatal("bob geen admin na UI")
77 }
78 if code, b := rapi(t, base, adminTok, "PUT", "/admin/users/bob/admin", map[string]any{"admin": false}); code != 200 {
79 t.Fatalf("api revoke %d %s", code, b)
80 }
81 if u, _ := st.UserByID(ctx, bob.ID); u.InstanceAdmin {
82 t.Fatal("bob nog admin")
83 }
84 if code, _ := rapi(t, base, adminTok, "PUT", "/admin/users/nobody/admin", map[string]any{"admin": true}); code != 404 {
85 t.Fatalf("onbekend: %d", code)
86 }
87 if code, _ := rapi(t, base, adminTok, "PUT", "/admin/users/bob/admin", map[string]any{}); code != 400 {
88 t.Fatalf("lege body: %d", code)
89 }
90 if code, b := rapi(t, base, adminTok, "GET", "/admin/users", nil); code != 200 || !strings.Contains(string(b), `"bob"`) {
91 t.Fatalf("list %d %s", code, b)
92 }
93 // Laatste beheerder blijft: store-niveau.
94 if n, _ := st.CountAdmins(ctx); n != 1 {
95 t.Fatalf("admins %d", n)
96 }
97 if _, err := st.SetInstanceAdmin(ctx, bob.ID, tim.ID, false); err == nil {
98 t.Fatal("laatste beheerder verwijderd")
99 }
100 }
101
102 func TestLangSwitch(t *testing.T) {
103 e := newCIEnv(t)
104 c := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
105 res, _ := c.PostForm(e.ts.URL+"/-/lang", url.Values{"lang": {"de"}, "back": {"//evil.example/x"}})
106 if res.StatusCode != http.StatusSeeOther || res.Header.Get("Location") != "/" {
107 t.Fatalf("anoniem: %d %s", res.StatusCode, res.Header.Get("Location"))
108 }
109 var ck *http.Cookie
110 for _, k := range res.Cookies() {
111 if k.Name == "bluegit_lang" {
112 ck = k
113 }
114 }
115 if ck == nil || ck.Value != "de" {
116 t.Fatal("geen taalcookie")
117 }
118 req, _ := http.NewRequest("GET", e.ts.URL+"/login", nil)
119 req.AddCookie(ck)
120 res, _ = http.DefaultClient.Do(req)
121 page := body(t, res)
122 if !strings.Contains(page, `lang="de"`) || !strings.Contains(page, `data-langpick`) {
123 t.Fatalf("taal niet toegepast")
124 }
125 tc, csrf := sessionClient(t, e.st, e.ts.URL, e.user.ID)
126 res, _ = tc.PostForm(e.ts.URL+"/-/lang", url.Values{"lang": {"fr"}, "back": {"/help"}, "csrf": {csrf}})
127 res.Body.Close()
128 if u, _ := e.st.UserByID(context.Background(), e.user.ID); u.Language != "fr" || res.Header.Get("Location") != "/help" {
129 t.Fatalf("ingelogd: %s %s", u.Language, res.Header.Get("Location"))
130 }
131 }
132
133 // Nooit browser-popups: geen alert/confirm/prompt of beforeunload in
134 // templates, JS of Go-HTML van BlueGit en de runner. Gebruik BGModal.
135 func TestNoBrowserPopups(t *testing.T) {
136 bad := regexp.MustCompile(`(^|[^.\w])(window\.)?(alert|confirm|prompt)\s*\(|window\.(alert|confirm|prompt)|beforeunload`)
137 root := filepath.Join("..", "..")
138 n := 0
139 for _, dir := range []string{"internal", "cmd"} {
140 _ = filepath.Walk(filepath.Join(root, dir), func(p string, fi os.FileInfo, err error) error {
141 if err != nil || fi.IsDir() || strings.HasSuffix(p, "_test.go") {
142 return nil
143 }
144 ext := filepath.Ext(p)
145 if ext != ".html" && ext != ".js" && ext != ".go" {
146 return nil
147 }
148 b, _ := os.ReadFile(p)
149 for i, line := range strings.Split(string(b), "\n") {
150 if bad.MatchString(line) {
151 t.Errorf("%s:%d browser-popup: %s", p, i+1, strings.TrimSpace(line))
152 }
153 }
154 n++
155 return nil
156 })
157 }
158 if n < 20 {
159 t.Fatalf("te weinig bestanden gescand: %d", n)
160 }
161 }
@@ -0,0 +1,161 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/url"
7 "os"
8 "path/filepath"
9 "regexp"
10 "strings"
11 "testing"
12)
13
14func TestAdminUsersRoles(t *testing.T) {
15 e := newCIEnv(t)
16 ctx := context.Background()
17 st, base := e.st, e.ts.URL
18 tim, _ := st.UserByID(ctx, e.user.ID)
19 if !tim.InstanceAdmin {
20 t.Skip("eerste gebruiker is geen beheerder")
21 }
22 bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
23
24 // Niet-beheerder: geen Beheer-link, UI en API 403.
25 bc, bcsrf := sessionClient(t, st, base, bob.ID)
26 res, _ := bc.Get(base + "/")
27 if strings.Contains(body(t, res), `href="/admin"`) {
28 t.Fatal("bob ziet Beheer-link")
29 }
30 for _, p := range []string{"/admin/users", "/admin/storage"} {
31 res, _ = bc.Get(base + p)
32 if res.StatusCode != http.StatusForbidden {
33 t.Fatalf("bob %s: %d", p, res.StatusCode)
34 }
35 res.Body.Close()
36 }
37 res, _ = bc.PostForm(base+"/admin/users/role", url.Values{"csrf": {bcsrf}, "id": {itoa(bob.ID)}, "admin": {"1"}})
38 if res.StatusCode != http.StatusForbidden {
39 t.Fatalf("bob maakt zichzelf admin: %d", res.StatusCode)
40 }
41 res.Body.Close()
42 bobTok := issue(t, st, bob.ID, "api")
43 if code, _ := rapi(t, base, bobTok, "GET", "/admin/users", nil); code != http.StatusForbidden {
44 t.Fatalf("bob api list: %d", code)
45 }
46 if code, _ := rapi(t, base, bobTok, "PUT", "/admin/users/bob/admin", map[string]any{"admin": true}); code != http.StatusForbidden {
47 t.Fatalf("bob api grant: %d", code)
48 }
49
50 // Beheerder: nav, redirect, pagina met eigen knop uitgeschakeld.
51 tc, tcsrf := sessionClient(t, st, base, tim.ID)
52 res, _ = tc.Get(base + "/admin")
53 if res.StatusCode/100 != 3 || res.Header.Get("Location") != "/admin/users" {
54 t.Fatalf("/admin: %d %s", res.StatusCode, res.Header.Get("Location"))
55 }
56 res.Body.Close()
57 res, _ = tc.Get(base + "/admin/users")
58 page := body(t, res)
59 if res.StatusCode != 200 || !strings.Contains(page, `href="/admin"`) || !strings.Contains(page, `class="admintabs"`) || !strings.Contains(page, `disabled aria-describedby="why-self"`) || !strings.Contains(page, `data-confirm=`) {
60 t.Fatalf("beheerpagina %d: %.400s", res.StatusCode, page)
61 }
62 // Zelf afnemen geweigerd (UI en API).
63 res, _ = tc.PostForm(base+"/admin/users/role", url.Values{"csrf": {tcsrf}, "id": {itoa(tim.ID)}, "admin": {"0"}})
64 res.Body.Close()
65 if u, _ := st.UserByID(ctx, tim.ID); !u.InstanceAdmin {
66 t.Fatal("zelf afnemen via UI gelukt")
67 }
68 adminTok := issue(t, st, tim.ID, "api")
69 if code, _ := rapi(t, base, adminTok, "PUT", "/admin/users/"+tim.Username+"/admin", map[string]any{"admin": false}); code != http.StatusForbidden {
70 t.Fatalf("zelf afnemen api: %d", code)
71 }
72 // Toekennen en afnemen via UI en API.
73 res, _ = tc.PostForm(base+"/admin/users/role", url.Values{"csrf": {tcsrf}, "id": {itoa(bob.ID)}, "admin": {"1"}})
74 res.Body.Close()
75 if u, _ := st.UserByID(ctx, bob.ID); !u.InstanceAdmin {
76 t.Fatal("bob geen admin na UI")
77 }
78 if code, b := rapi(t, base, adminTok, "PUT", "/admin/users/bob/admin", map[string]any{"admin": false}); code != 200 {
79 t.Fatalf("api revoke %d %s", code, b)
80 }
81 if u, _ := st.UserByID(ctx, bob.ID); u.InstanceAdmin {
82 t.Fatal("bob nog admin")
83 }
84 if code, _ := rapi(t, base, adminTok, "PUT", "/admin/users/nobody/admin", map[string]any{"admin": true}); code != 404 {
85 t.Fatalf("onbekend: %d", code)
86 }
87 if code, _ := rapi(t, base, adminTok, "PUT", "/admin/users/bob/admin", map[string]any{}); code != 400 {
88 t.Fatalf("lege body: %d", code)
89 }
90 if code, b := rapi(t, base, adminTok, "GET", "/admin/users", nil); code != 200 || !strings.Contains(string(b), `"bob"`) {
91 t.Fatalf("list %d %s", code, b)
92 }
93 // Laatste beheerder blijft: store-niveau.
94 if n, _ := st.CountAdmins(ctx); n != 1 {
95 t.Fatalf("admins %d", n)
96 }
97 if _, err := st.SetInstanceAdmin(ctx, bob.ID, tim.ID, false); err == nil {
98 t.Fatal("laatste beheerder verwijderd")
99 }
100}
101
102func TestLangSwitch(t *testing.T) {
103 e := newCIEnv(t)
104 c := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
105 res, _ := c.PostForm(e.ts.URL+"/-/lang", url.Values{"lang": {"de"}, "back": {"//evil.example/x"}})
106 if res.StatusCode != http.StatusSeeOther || res.Header.Get("Location") != "/" {
107 t.Fatalf("anoniem: %d %s", res.StatusCode, res.Header.Get("Location"))
108 }
109 var ck *http.Cookie
110 for _, k := range res.Cookies() {
111 if k.Name == "bluegit_lang" {
112 ck = k
113 }
114 }
115 if ck == nil || ck.Value != "de" {
116 t.Fatal("geen taalcookie")
117 }
118 req, _ := http.NewRequest("GET", e.ts.URL+"/login", nil)
119 req.AddCookie(ck)
120 res, _ = http.DefaultClient.Do(req)
121 page := body(t, res)
122 if !strings.Contains(page, `lang="de"`) || !strings.Contains(page, `data-langpick`) {
123 t.Fatalf("taal niet toegepast")
124 }
125 tc, csrf := sessionClient(t, e.st, e.ts.URL, e.user.ID)
126 res, _ = tc.PostForm(e.ts.URL+"/-/lang", url.Values{"lang": {"fr"}, "back": {"/help"}, "csrf": {csrf}})
127 res.Body.Close()
128 if u, _ := e.st.UserByID(context.Background(), e.user.ID); u.Language != "fr" || res.Header.Get("Location") != "/help" {
129 t.Fatalf("ingelogd: %s %s", u.Language, res.Header.Get("Location"))
130 }
131}
132
133// Nooit browser-popups: geen alert/confirm/prompt of beforeunload in
134// templates, JS of Go-HTML van BlueGit en de runner. Gebruik BGModal.
135func TestNoBrowserPopups(t *testing.T) {
136 bad := regexp.MustCompile(`(^|[^.\w])(window\.)?(alert|confirm|prompt)\s*\(|window\.(alert|confirm|prompt)|beforeunload`)
137 root := filepath.Join("..", "..")
138 n := 0
139 for _, dir := range []string{"internal", "cmd"} {
140 _ = filepath.Walk(filepath.Join(root, dir), func(p string, fi os.FileInfo, err error) error {
141 if err != nil || fi.IsDir() || strings.HasSuffix(p, "_test.go") {
142 return nil
143 }
144 ext := filepath.Ext(p)
145 if ext != ".html" && ext != ".js" && ext != ".go" {
146 return nil
147 }
148 b, _ := os.ReadFile(p)
149 for i, line := range strings.Split(string(b), "\n") {
150 if bad.MatchString(line) {
151 t.Errorf("%s:%d browser-popup: %s", p, i+1, strings.TrimSpace(line))
152 }
153 }
154 n++
155 return nil
156 })
157 }
158 if n < 20 {
159 t.Fatalf("te weinig bestanden gescand: %d", n)
160 }
161}
internal/server/api_routes.go +2 −0
@@ -7,6 +7,8 @@ import (
7 7 )
8 8
9 9 var apiCatalog = []apiRoute{
10 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
11 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
10 12 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
11 13 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
12 14 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
@@ -7,6 +7,8 @@ import (
7)
7)
8
8
9var apiCatalog = []apiRoute{
9var apiCatalog = []apiRoute{
10 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
11 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
10 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
12 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
11 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
13 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
12 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
14 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
internal/server/ops_ci.go +11 −0
@@ -113,6 +113,17 @@ func (s *Server) opRetryPipeline(ctx context.Context, user store.User, repo stor
113 113 if err != nil {
114 114 return 0, notFound(err)
115 115 }
116 if mode == "all" || mode == "failed" {
117 // Opnieuw starten kan alleen als er minstens één job gefaald is
118 // (ook runner_system_failure); zelfde regel als de knop in de UI.
119 jobs, err := s.Store.JobsByPipeline(ctx, p.ID)
120 if err != nil {
121 return 0, err
122 }
123 if !jobsFailed(jobs) {
124 return 0, fail(409, i18n.E("err.pipeNoFailed"))
125 }
126 }
116 127 switch mode {
117 128 case "all":
118 129 id, err := s.Store.ClonePipeline(ctx, repo.ID, p.ID)
@@ -113,6 +113,17 @@ func (s *Server) opRetryPipeline(ctx context.Context, user store.User, repo stor
113 if err != nil {
113 if err != nil {
114 return 0, notFound(err)
114 return 0, notFound(err)
115 }
115 }
116 if mode == "all" || mode == "failed" {
117 // Opnieuw starten kan alleen als er minstens één job gefaald is
118 // (ook runner_system_failure); zelfde regel als de knop in de UI.
119 jobs, err := s.Store.JobsByPipeline(ctx, p.ID)
120 if err != nil {
121 return 0, err
122 }
123 if !jobsFailed(jobs) {
124 return 0, fail(409, i18n.E("err.pipeNoFailed"))
125 }
126 }
116 switch mode {
127 switch mode {
117 case "all":
128 case "all":
118 id, err := s.Store.ClonePipeline(ctx, repo.ID, p.ID)
129 id, err := s.Store.ClonePipeline(ctx, repo.ID, p.ID)
internal/server/pipeline_retry_test.go +18 −0
@@ -210,6 +210,24 @@ func TestPipelineRetryButtonAndAPI(t *testing.T) {
210 210 if code != 409 {
211 211 t.Fatalf("tweede failed %d %s", code, body)
212 212 }
213 // Zonder gefaalde job weigert ook "all" (zelfde regel als de UI).
214 for _, pid := range []int64{id, okID} {
215 code, body = retryAPI(t, ts, http.MethodPost, "/api/v1/projects/tim/opnieuw/pipelines/"+strconv.FormatInt(pid, 10)+"/retry", ownerToken, `{"mode":"all"}`)
216 if code != 409 || !strings.Contains(body, "no failed jobs") {
217 t.Fatalf("all zonder mislukking %d: %d %s", pid, code, body)
218 }
219 }
220 if !strings.Contains(read(t, mustGet(t, tim, ts.URL+"/tim/opnieuw/-/pipelines/"+strconv.FormatInt(okID, 10))), okForm) {
221 t.Fatal("geslaagde pipeline toont retry")
222 }
223 jobs, _ = st.JobsByPipeline(ctx, id)
224 for _, j := range jobs {
225 if j.Name == "unit" {
226 if err := st.FinishJob(ctx, j.ID, "failed", "runner_system_failure: weg\n"); err != nil {
227 t.Fatal(err)
228 }
229 }
230 }
213 231 code, body = retryAPI(t, ts, http.MethodPost, "/api/v1/projects/tim/opnieuw/pipelines/"+strconv.FormatInt(id, 10)+"/retry", ownerToken, `{"mode":"all"}`)
214 232 if code != 201 {
215 233 t.Fatalf("all %d %s", code, body)
@@ -210,6 +210,24 @@ func TestPipelineRetryButtonAndAPI(t *testing.T) {
210 if code != 409 {
210 if code != 409 {
211 t.Fatalf("tweede failed %d %s", code, body)
211 t.Fatalf("tweede failed %d %s", code, body)
212 }
212 }
213 // Zonder gefaalde job weigert ook "all" (zelfde regel als de UI).
214 for _, pid := range []int64{id, okID} {
215 code, body = retryAPI(t, ts, http.MethodPost, "/api/v1/projects/tim/opnieuw/pipelines/"+strconv.FormatInt(pid, 10)+"/retry", ownerToken, `{"mode":"all"}`)
216 if code != 409 || !strings.Contains(body, "no failed jobs") {
217 t.Fatalf("all zonder mislukking %d: %d %s", pid, code, body)
218 }
219 }
220 if !strings.Contains(read(t, mustGet(t, tim, ts.URL+"/tim/opnieuw/-/pipelines/"+strconv.FormatInt(okID, 10))), okForm) {
221 t.Fatal("geslaagde pipeline toont retry")
222 }
223 jobs, _ = st.JobsByPipeline(ctx, id)
224 for _, j := range jobs {
225 if j.Name == "unit" {
226 if err := st.FinishJob(ctx, j.ID, "failed", "runner_system_failure: weg\n"); err != nil {
227 t.Fatal(err)
228 }
229 }
230 }
213 code, body = retryAPI(t, ts, http.MethodPost, "/api/v1/projects/tim/opnieuw/pipelines/"+strconv.FormatInt(id, 10)+"/retry", ownerToken, `{"mode":"all"}`)
231 code, body = retryAPI(t, ts, http.MethodPost, "/api/v1/projects/tim/opnieuw/pipelines/"+strconv.FormatInt(id, 10)+"/retry", ownerToken, `{"mode":"all"}`)
214 if code != 201 {
232 if code != 201 {
215 t.Fatalf("all %d %s", code, body)
233 t.Fatalf("all %d %s", code, body)
internal/server/server.go +40 −0
@@ -7,7 +7,9 @@ import (
7 7 "embed"
8 8 "encoding/hex"
9 9 "fmt"
10 "gitlab.com/Timfa/bluegit/internal/langpick"
10 11 "gitlab.com/Timfa/bluegit/internal/readcache"
12 "gitlab.com/Timfa/bluegit/internal/runnercfg"
11 13 "html/template"
12 14 "io/fs"
13 15 "log/slog"
@@ -88,6 +90,8 @@ func (s *Server) Handler() http.Handler {
88 90 mux.HandleFunc("GET /help", s.helpIndex)
89 91 mux.HandleFunc("GET /help/{doc}", s.helpPage)
90 92 s.mountRunnerAdmin(mux)
93 s.mountAdmin(mux)
94 mux.HandleFunc("POST /-/lang", s.switchLang)
91 95 mux.HandleFunc("GET /-/card.png", s.cardPNG)
92 96 mux.HandleFunc("GET /api/v1/oembed", s.oembed)
93 97 s.mountAPI(mux)
@@ -257,6 +261,9 @@ func (s *Server) mustTemplates() {
257 261 for _, lang := range i18n.All() {
258 262 l := lang
259 263 s.byLang[string(l)] = template.Must(template.New("web").Funcs(template.FuncMap{
264 "tip": func(key string) template.HTML { return runnercfg.Tip(l, key) },
265 "admintabs": adminTabs,
266 "adminpage": isAdminPage,
260 267 "short": func(v string) string {
261 268 if len(v) > 10 {
262 269 return v[:10]
@@ -458,9 +465,31 @@ func (s *Server) langOf(r *http.Request) i18n.Lang {
458 465 if p := s.who(r); p.OK {
459 466 return i18n.Parse(p.User.Language)
460 467 }
468 if c, err := r.Cookie("bluegit_lang"); err == nil {
469 return i18n.Parse(c.Value)
470 }
461 471 return i18n.EN
462 472 }
463 473
474 // switchLang is de taalkiezer in de kopbalk: ingelogd slaat hij de taal op
475 // het account op, anoniem in een cookie. back is altijd een lokaal pad.
476 func (s *Server) switchLang(w http.ResponseWriter, r *http.Request) {
477 lang := i18n.Parse(r.FormValue("lang"))
478 back := langpick.SafeBack(r.FormValue("back"))
479 if p := s.who(r); p.OK {
480 if !s.csrfOK(w, r) {
481 return
482 }
483 if _, err := s.opSetLanguage(r.Context(), p.User, string(lang)); err != nil {
484 s.redirect(w, r, back, "", s.trErr(r, err))
485 return
486 }
487 } else {
488 http.SetCookie(w, &http.Cookie{Name: "bluegit_lang", Value: string(lang), Path: "/", MaxAge: 365 * 86400, HttpOnly: true, SameSite: http.SameSiteLaxMode, Secure: strings.HasPrefix(s.Cfg.BaseURL, "https://")})
489 }
490 http.Redirect(w, r, back, http.StatusSeeOther)
491 }
492
464 493 func (s *Server) tr(r *http.Request, key string, args ...any) string {
465 494 return i18n.T(s.langOf(r), key, args...)
466 495 }
@@ -492,6 +521,15 @@ func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View
492 521 v.User = &u
493 522 v.CSRF = p.Session.CSRF
494 523 }
524 back := r.URL.Path
525 if r.URL.RawQuery != "" {
526 back += "?" + r.URL.RawQuery
527 }
528 csrfField := ""
529 if v.User != nil {
530 csrfField = "csrf"
531 }
532 v.LangPick = langpick.HTML(lang, "/-/lang", back, csrfField, v.CSRF)
495 533 pic := s.cardForPath(r.Context(), r.URL.Path, r.URL.RawQuery, r.URL.Fragment)
496 534 v.Social = &pic.Meta
497 535 return v
@@ -634,6 +672,8 @@ type View struct {
634 672 HelpDocs []HelpDoc
635 673 HelpDoc *HelpDoc
636 674 RunnerUI template.HTML
675 AdminUsers []AdminUserRow
676 LangPick template.HTML
637 677 ShowUpdate bool
638 678 Update *UpdateView
639 679 HookDoc string
@@ -7,7 +7,9 @@ import (
7 "embed"
7 "embed"
8 "encoding/hex"
8 "encoding/hex"
9 "fmt"
9 "fmt"
10 "gitlab.com/Timfa/bluegit/internal/langpick"
10 "gitlab.com/Timfa/bluegit/internal/readcache"
11 "gitlab.com/Timfa/bluegit/internal/readcache"
12 "gitlab.com/Timfa/bluegit/internal/runnercfg"
11 "html/template"
13 "html/template"
12 "io/fs"
14 "io/fs"
13 "log/slog"
15 "log/slog"
@@ -88,6 +90,8 @@ func (s *Server) Handler() http.Handler {
88 mux.HandleFunc("GET /help", s.helpIndex)
90 mux.HandleFunc("GET /help", s.helpIndex)
89 mux.HandleFunc("GET /help/{doc}", s.helpPage)
91 mux.HandleFunc("GET /help/{doc}", s.helpPage)
90 s.mountRunnerAdmin(mux)
92 s.mountRunnerAdmin(mux)
93 s.mountAdmin(mux)
94 mux.HandleFunc("POST /-/lang", s.switchLang)
91 mux.HandleFunc("GET /-/card.png", s.cardPNG)
95 mux.HandleFunc("GET /-/card.png", s.cardPNG)
92 mux.HandleFunc("GET /api/v1/oembed", s.oembed)
96 mux.HandleFunc("GET /api/v1/oembed", s.oembed)
93 s.mountAPI(mux)
97 s.mountAPI(mux)
@@ -257,6 +261,9 @@ func (s *Server) mustTemplates() {
257 for _, lang := range i18n.All() {
261 for _, lang := range i18n.All() {
258 l := lang
262 l := lang
259 s.byLang[string(l)] = template.Must(template.New("web").Funcs(template.FuncMap{
263 s.byLang[string(l)] = template.Must(template.New("web").Funcs(template.FuncMap{
264 "tip": func(key string) template.HTML { return runnercfg.Tip(l, key) },
265 "admintabs": adminTabs,
266 "adminpage": isAdminPage,
260 "short": func(v string) string {
267 "short": func(v string) string {
261 if len(v) > 10 {
268 if len(v) > 10 {
262 return v[:10]
269 return v[:10]
@@ -458,9 +465,31 @@ func (s *Server) langOf(r *http.Request) i18n.Lang {
458 if p := s.who(r); p.OK {
465 if p := s.who(r); p.OK {
459 return i18n.Parse(p.User.Language)
466 return i18n.Parse(p.User.Language)
460 }
467 }
468 if c, err := r.Cookie("bluegit_lang"); err == nil {
469 return i18n.Parse(c.Value)
470 }
461 return i18n.EN
471 return i18n.EN
462}
472}
463
473
474// switchLang is de taalkiezer in de kopbalk: ingelogd slaat hij de taal op
475// het account op, anoniem in een cookie. back is altijd een lokaal pad.
476func (s *Server) switchLang(w http.ResponseWriter, r *http.Request) {
477 lang := i18n.Parse(r.FormValue("lang"))
478 back := langpick.SafeBack(r.FormValue("back"))
479 if p := s.who(r); p.OK {
480 if !s.csrfOK(w, r) {
481 return
482 }
483 if _, err := s.opSetLanguage(r.Context(), p.User, string(lang)); err != nil {
484 s.redirect(w, r, back, "", s.trErr(r, err))
485 return
486 }
487 } else {
488 http.SetCookie(w, &http.Cookie{Name: "bluegit_lang", Value: string(lang), Path: "/", MaxAge: 365 * 86400, HttpOnly: true, SameSite: http.SameSiteLaxMode, Secure: strings.HasPrefix(s.Cfg.BaseURL, "https://")})
489 }
490 http.Redirect(w, r, back, http.StatusSeeOther)
491}
492
464func (s *Server) tr(r *http.Request, key string, args ...any) string {
493func (s *Server) tr(r *http.Request, key string, args ...any) string {
465 return i18n.T(s.langOf(r), key, args...)
494 return i18n.T(s.langOf(r), key, args...)
466}
495}
@@ -492,6 +521,15 @@ func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View
492 v.User = &u
521 v.User = &u
493 v.CSRF = p.Session.CSRF
522 v.CSRF = p.Session.CSRF
494 }
523 }
524 back := r.URL.Path
525 if r.URL.RawQuery != "" {
526 back += "?" + r.URL.RawQuery
527 }
528 csrfField := ""
529 if v.User != nil {
530 csrfField = "csrf"
531 }
532 v.LangPick = langpick.HTML(lang, "/-/lang", back, csrfField, v.CSRF)
495 pic := s.cardForPath(r.Context(), r.URL.Path, r.URL.RawQuery, r.URL.Fragment)
533 pic := s.cardForPath(r.Context(), r.URL.Path, r.URL.RawQuery, r.URL.Fragment)
496 v.Social = &pic.Meta
534 v.Social = &pic.Meta
497 return v
535 return v
@@ -634,6 +672,8 @@ type View struct {
634 HelpDocs []HelpDoc
672 HelpDocs []HelpDoc
635 HelpDoc *HelpDoc
673 HelpDoc *HelpDoc
636 RunnerUI template.HTML
674 RunnerUI template.HTML
675 AdminUsers []AdminUserRow
676 LangPick template.HTML
637 ShowUpdate bool
677 ShowUpdate bool
638 Update *UpdateView
678 Update *UpdateView
639 HookDoc string
679 HookDoc string
internal/server/static/confirm.js +72 −10
@@ -1,15 +1,77 @@
1 // Eigen bevestigingsvenster in BlueGit-stijl (geen browser-popups).
2 // Formulieren met data-confirm="vraag" openen een <dialog>: focus blijft
3 // in het venster, Escape annuleert, Enter bevestigt. Teksten komen uit
4 // data-modal-* op <body> (vertaald), per formulier te overschrijven met
5 // data-confirm-ok. Een knop met class danger maakt de bevestiging rood.
1 6 (function () {
7 var body = document.body;
8 function txt(name, fallback) {
9 return (body && body.getAttribute("data-modal-" + name)) || fallback;
10 }
11 var dlg, msg, okBtn, cancelBtn, titleEl, resolveFn, lastFocus;
12 function build() {
13 dlg = document.createElement("dialog");
14 dlg.className = "bgmodal";
15 dlg.setAttribute("aria-modal", "true");
16 dlg.setAttribute("aria-labelledby", "bgmodal-title");
17 dlg.setAttribute("aria-describedby", "bgmodal-msg");
18 dlg.innerHTML = '<form method="dialog" class="bgmodal-box">' +
19 '<h2 id="bgmodal-title"></h2><p id="bgmodal-msg"></p>' +
20 '<div class="bgmodal-acts"><button type="button" class="ghost" data-modal-cancel></button>' +
21 '<button type="submit" data-modal-ok></button></div></form>';
22 document.body.appendChild(dlg);
23 titleEl = dlg.querySelector("#bgmodal-title");
24 msg = dlg.querySelector("#bgmodal-msg");
25 okBtn = dlg.querySelector("[data-modal-ok]");
26 cancelBtn = dlg.querySelector("[data-modal-cancel]");
27 dlg.querySelector("form").addEventListener("submit", function (e) { e.preventDefault(); close(true); });
28 cancelBtn.addEventListener("click", function () { close(false); });
29 dlg.addEventListener("cancel", function (e) { e.preventDefault(); close(false); });
30 dlg.addEventListener("click", function (e) { if (e.target === dlg) { close(false); } });
31 dlg.addEventListener("keydown", function (e) {
32 if (e.key !== "Tab") { return; }
33 var f = [cancelBtn, okBtn], i = f.indexOf(document.activeElement);
34 e.preventDefault();
35 f[(i + (e.shiftKey ? f.length - 1 : 1)) % f.length].focus();
36 });
37 }
38 function close(ok) {
39 if (!dlg || !dlg.open) { return; }
40 dlg.close();
41 document.documentElement.classList.remove("bgmodal-open");
42 if (lastFocus && lastFocus.focus) { lastFocus.focus({ preventScroll: true }); }
43 var r = resolveFn; resolveFn = null;
44 if (r) { r(ok); }
45 }
46 // BGModal.confirm(tekst, {ok, cancel, title, danger}) → Promise<bool>
47 function ask(text, opt) {
48 opt = opt || {};
49 if (!dlg) { build(); }
50 titleEl.textContent = opt.title || txt("title", "Are you sure?");
51 msg.textContent = text;
52 okBtn.textContent = opt.ok || txt("ok", "OK");
53 cancelBtn.textContent = opt.cancel || txt("cancel", "Cancel");
54 okBtn.classList.toggle("danger", !!opt.danger);
55 lastFocus = document.activeElement;
56 document.documentElement.classList.add("bgmodal-open");
57 if (dlg.showModal) { dlg.showModal(); } else { dlg.setAttribute("open", ""); }
58 okBtn.focus({ preventScroll: true });
59 return new Promise(function (res) { resolveFn = res; });
60 }
61 window.BGModal = { confirm: ask };
2 62 document.addEventListener("submit", function (ev) {
3 63 var form = ev.target;
4 if (!form || !form.getAttribute) {
5 return;
6 }
7 var ask = form.getAttribute("data-confirm");
8 if (!ask) {
9 return;
10 }
11 if (!window.confirm(ask)) {
12 ev.preventDefault();
13 }
64 if (!form || !form.getAttribute) { return; }
65 var q = form.getAttribute("data-confirm");
66 if (!q) { return; }
67 if (form.__bgConfirmed) { form.__bgConfirmed = false; return; }
68 ev.preventDefault();
69 ev.stopImmediatePropagation();
70 var by = ev.submitter || form.querySelector("[type=submit]");
71 ask(q, { ok: form.getAttribute("data-confirm-ok") || (by && by.textContent.trim()) || "", danger: !!(by && by.classList.contains("danger")) }).then(function (ok) {
72 if (!ok) { return; }
73 form.__bgConfirmed = true;
74 if (form.requestSubmit) { form.requestSubmit(by && by.form === form ? by : undefined); } else { form.submit(); }
75 });
14 76 }, true);
15 77 })();
@@ -1,15 +1,77 @@
1// Eigen bevestigingsvenster in BlueGit-stijl (geen browser-popups).
2// Formulieren met data-confirm="vraag" openen een <dialog>: focus blijft
3// in het venster, Escape annuleert, Enter bevestigt. Teksten komen uit
4// data-modal-* op <body> (vertaald), per formulier te overschrijven met
5// data-confirm-ok. Een knop met class danger maakt de bevestiging rood.
1(function () {
6(function () {
7 var body = document.body;
8 function txt(name, fallback) {
9 return (body && body.getAttribute("data-modal-" + name)) || fallback;
10 }
11 var dlg, msg, okBtn, cancelBtn, titleEl, resolveFn, lastFocus;
12 function build() {
13 dlg = document.createElement("dialog");
14 dlg.className = "bgmodal";
15 dlg.setAttribute("aria-modal", "true");
16 dlg.setAttribute("aria-labelledby", "bgmodal-title");
17 dlg.setAttribute("aria-describedby", "bgmodal-msg");
18 dlg.innerHTML = '<form method="dialog" class="bgmodal-box">' +
19 '<h2 id="bgmodal-title"></h2><p id="bgmodal-msg"></p>' +
20 '<div class="bgmodal-acts"><button type="button" class="ghost" data-modal-cancel></button>' +
21 '<button type="submit" data-modal-ok></button></div></form>';
22 document.body.appendChild(dlg);
23 titleEl = dlg.querySelector("#bgmodal-title");
24 msg = dlg.querySelector("#bgmodal-msg");
25 okBtn = dlg.querySelector("[data-modal-ok]");
26 cancelBtn = dlg.querySelector("[data-modal-cancel]");
27 dlg.querySelector("form").addEventListener("submit", function (e) { e.preventDefault(); close(true); });
28 cancelBtn.addEventListener("click", function () { close(false); });
29 dlg.addEventListener("cancel", function (e) { e.preventDefault(); close(false); });
30 dlg.addEventListener("click", function (e) { if (e.target === dlg) { close(false); } });
31 dlg.addEventListener("keydown", function (e) {
32 if (e.key !== "Tab") { return; }
33 var f = [cancelBtn, okBtn], i = f.indexOf(document.activeElement);
34 e.preventDefault();
35 f[(i + (e.shiftKey ? f.length - 1 : 1)) % f.length].focus();
36 });
37 }
38 function close(ok) {
39 if (!dlg || !dlg.open) { return; }
40 dlg.close();
41 document.documentElement.classList.remove("bgmodal-open");
42 if (lastFocus && lastFocus.focus) { lastFocus.focus({ preventScroll: true }); }
43 var r = resolveFn; resolveFn = null;
44 if (r) { r(ok); }
45 }
46 // BGModal.confirm(tekst, {ok, cancel, title, danger}) → Promise<bool>
47 function ask(text, opt) {
48 opt = opt || {};
49 if (!dlg) { build(); }
50 titleEl.textContent = opt.title || txt("title", "Are you sure?");
51 msg.textContent = text;
52 okBtn.textContent = opt.ok || txt("ok", "OK");
53 cancelBtn.textContent = opt.cancel || txt("cancel", "Cancel");
54 okBtn.classList.toggle("danger", !!opt.danger);
55 lastFocus = document.activeElement;
56 document.documentElement.classList.add("bgmodal-open");
57 if (dlg.showModal) { dlg.showModal(); } else { dlg.setAttribute("open", ""); }
58 okBtn.focus({ preventScroll: true });
59 return new Promise(function (res) { resolveFn = res; });
60 }
61 window.BGModal = { confirm: ask };
2 document.addEventListener("submit", function (ev) {
62 document.addEventListener("submit", function (ev) {
3 var form = ev.target;
63 var form = ev.target;
4 if (!form || !form.getAttribute) {
64 if (!form || !form.getAttribute) { return; }
5 return;
65 var q = form.getAttribute("data-confirm");
6 }
66 if (!q) { return; }
7 var ask = form.getAttribute("data-confirm");
67 if (form.__bgConfirmed) { form.__bgConfirmed = false; return; }
8 if (!ask) {
68 ev.preventDefault();
9 return;
69 ev.stopImmediatePropagation();
10 }
70 var by = ev.submitter || form.querySelector("[type=submit]");
11 if (!window.confirm(ask)) {
71 ask(q, { ok: form.getAttribute("data-confirm-ok") || (by && by.textContent.trim()) || "", danger: !!(by && by.classList.contains("danger")) }).then(function (ok) {
12 ev.preventDefault();
72 if (!ok) { return; }
13 }
73 form.__bgConfirmed = true;
74 if (form.requestSubmit) { form.requestSubmit(by && by.form === form ? by : undefined); } else { form.submit(); }
75 });
14 }, true);
76 }, true);
15})();
77})();
internal/server/static/langpick.js added +30 −0
@@ -0,0 +1,30 @@
1 // Taalkiezer: vlag-knop met eigen popover. Escape of klikken ernaast
2 // sluit; pijltjes bewegen door de vlaggen.
3 (function () {
4 function close(p, focus) {
5 var btn = p.querySelector(".langpick-btn"), menu = p.querySelector(".langpick-menu");
6 menu.hidden = true;
7 btn.setAttribute("aria-expanded", "false");
8 if (focus) { btn.focus(); }
9 }
10 document.querySelectorAll("[data-langpick]").forEach(function (p) {
11 var btn = p.querySelector(".langpick-btn"), menu = p.querySelector(".langpick-menu");
12 var items = function () { return Array.prototype.slice.call(menu.querySelectorAll("button")); };
13 btn.addEventListener("click", function () {
14 var open = menu.hidden;
15 menu.hidden = !open;
16 btn.setAttribute("aria-expanded", open ? "true" : "false");
17 if (open && items()[0]) { items()[0].focus(); }
18 });
19 p.addEventListener("keydown", function (e) {
20 if (menu.hidden) { return; }
21 if (e.key === "Escape") { e.preventDefault(); close(p, true); return; }
22 if (e.key === "ArrowDown" || e.key === "ArrowUp") {
23 e.preventDefault();
24 var it = items(), i = it.indexOf(document.activeElement);
25 it[(i + (e.key === "ArrowDown" ? 1 : it.length - 1)) % it.length].focus();
26 }
27 });
28 document.addEventListener("click", function (e) { if (!p.contains(e.target)) { close(p, false); } });
29 });
30 })();
@@ -0,0 +1,30 @@
1// Taalkiezer: vlag-knop met eigen popover. Escape of klikken ernaast
2// sluit; pijltjes bewegen door de vlaggen.
3(function () {
4 function close(p, focus) {
5 var btn = p.querySelector(".langpick-btn"), menu = p.querySelector(".langpick-menu");
6 menu.hidden = true;
7 btn.setAttribute("aria-expanded", "false");
8 if (focus) { btn.focus(); }
9 }
10 document.querySelectorAll("[data-langpick]").forEach(function (p) {
11 var btn = p.querySelector(".langpick-btn"), menu = p.querySelector(".langpick-menu");
12 var items = function () { return Array.prototype.slice.call(menu.querySelectorAll("button")); };
13 btn.addEventListener("click", function () {
14 var open = menu.hidden;
15 menu.hidden = !open;
16 btn.setAttribute("aria-expanded", open ? "true" : "false");
17 if (open && items()[0]) { items()[0].focus(); }
18 });
19 p.addEventListener("keydown", function (e) {
20 if (menu.hidden) { return; }
21 if (e.key === "Escape") { e.preventDefault(); close(p, true); return; }
22 if (e.key === "ArrowDown" || e.key === "ArrowUp") {
23 e.preventDefault();
24 var it = items(), i = it.indexOf(document.activeElement);
25 it[(i + (e.key === "ArrowDown" ? 1 : it.length - 1)) % it.length].focus();
26 }
27 });
28 document.addEventListener("click", function (e) { if (!p.contains(e.target)) { close(p, false); } });
29 });
30})();
internal/server/static/static.go +17 −2
@@ -1,5 +1,5 @@
1 // Package static deelt de BlueGit-stylesheet en het logo met andere
2 // binaries, zoals de webinterface van bluegit-runner.
1 // Package static deelt de BlueGit-stylesheet, het logo en de gedeelde
2 // scripts (modals, tooltips) met andere binaries, zoals bluegit-runner.
3 3 package static
4 4
5 5 import _ "embed"
@@ -13,3 +13,18 @@ var StyleCSS []byte
13 13 //
14 14 //go:embed logo.svg
15 15 var LogoSVG []byte
16
17 // ConfirmJS is het eigen bevestigingsvenster (vervangt de browserdialoog).
18 //
19 //go:embed confirm.js
20 var ConfirmJS []byte
21
22 // TipJS laat info-tooltips op touch werken.
23 //
24 //go:embed tip.js
25 var TipJS []byte
26
27 // LangpickJS opent en sluit de taalkiezer.
28 //
29 //go:embed langpick.js
30 var LangpickJS []byte
@@ -1,5 +1,5 @@
1// Package static deelt de BlueGit-stylesheet en het logo met andere
1// Package static deelt de BlueGit-stylesheet, het logo en de gedeelde
2// binaries, zoals de webinterface van bluegit-runner.
2// scripts (modals, tooltips) met andere binaries, zoals bluegit-runner.
3package static
3package static
4
4
5import _ "embed"
5import _ "embed"
@@ -13,3 +13,18 @@ var StyleCSS []byte
13//
13//
14//go:embed logo.svg
14//go:embed logo.svg
15var LogoSVG []byte
15var LogoSVG []byte
16
17// ConfirmJS is het eigen bevestigingsvenster (vervangt de browserdialoog).
18//
19//go:embed confirm.js
20var ConfirmJS []byte
21
22// TipJS laat info-tooltips op touch werken.
23//
24//go:embed tip.js
25var TipJS []byte
26
27// LangpickJS opent en sluit de taalkiezer.
28//
29//go:embed langpick.js
30var LangpickJS []byte
internal/server/static/style.css +64 −0
@@ -1410,3 +1410,67 @@ table.md { display: block; max-width: 100%; overflow-x: auto; }
1410 1410 .top .brand { font-size: 14px; white-space: nowrap; }
1411 1411 .rui-sechead form, .rui-sechead button { width: 100%; }
1412 1412 }
1413
1414 /* Eigen modal (confirm.js) — nooit browser-popups */
1415 html.bgmodal-open { overflow: hidden; }
1416 .bgmodal { border: 1px solid var(--line); border-radius: var(--radius-lg); padding: 0; width: min(28rem, calc(100vw - 32px)); max-height: calc(100vh - 32px); box-shadow: 0 16px 48px rgba(20, 32, 51, .28); color: var(--ink); background: var(--card); }
1417 .bgmodal::backdrop { background: rgba(20, 32, 51, .45); }
1418 .bgmodal-box { padding: var(--sp-5); margin: 0; }
1419 .bgmodal h2 { margin: 0 0 var(--sp-2); font-size: 17px; }
1420 .bgmodal p { margin: 0 0 var(--sp-5); overflow-wrap: anywhere; color: var(--muted); }
1421 .bgmodal-acts { display: flex; justify-content: flex-end; gap: var(--sp-2); flex-wrap: wrap; }
1422 .bgmodal-acts button { min-width: 96px; }
1423 .bgmodal-acts button.danger { font-size: var(--fs); min-height: var(--control-h); padding: 0 var(--sp-3); }
1424 .bgmodal[open] { animation: bgmodal-in .12s ease-out; }
1425 @keyframes bgmodal-in { from { opacity: 0; transform: translateY(6px); } to { opacity: 1; transform: none; } }
1426 @media (max-width: 480px) { .bgmodal-acts button { flex: 1; } }
1427 @media (prefers-reduced-motion: reduce) { .bgmodal[open] { animation: none; } }
1428
1429 /* Info-tooltips (i) */
1430 .tiphost { position: relative; }
1431 .tip { display: inline-flex; vertical-align: middle; margin-left: 4px; }
1432 .tip-i { all: unset; display: inline-block; box-sizing: border-box; width: 18px; height: 18px; border-radius: 50%; border: 1px solid var(--blue); color: var(--blue-deep); background: var(--blue-soft); font: italic 700 11px/16px Georgia, serif; text-align: center; cursor: help; flex: none; }
1433 .tip-i:focus-visible { outline: 2px solid var(--blue); outline-offset: 2px; }
1434 .tip-b { display: none; position: absolute; left: 0; right: 0; top: calc(100% + 4px); z-index: 30; max-width: 26rem; padding: var(--sp-2) var(--sp-3); border-radius: var(--radius); background: var(--ink); color: #fff; font-size: var(--fs-sm); font-weight: 400; font-style: normal; line-height: 1.45; box-shadow: var(--shadow); white-space: normal; text-align: left; overflow-wrap: anywhere; }
1435 .tip-b::before { content: ""; position: absolute; top: -5px; left: 14px; border: 5px solid transparent; border-top: 0; border-bottom-color: var(--ink); }
1436 .tip:hover .tip-b, .tip-i:focus + .tip-b, .tip.open .tip-b, .tiphost:focus-within .tip-b { display: block; }
1437 .tiphost:has(.tip.open), .tiphost:focus-within, .tiphost:hover { z-index: 31; }
1438
1439 /* Taalkiezer (langpick.js) */
1440 .langpick { position: relative; display: inline-flex; }
1441 .top .langpick-btn, .langpick-btn { background: transparent; border: 1px solid rgba(255,255,255,.35); color: #fff; min-height: 30px; padding: 0 6px; gap: 4px; border-radius: var(--radius); }
1442 .langpick-btn:focus-visible, .langpick-menu button:focus-visible { outline: 2px solid var(--blue); outline-offset: 2px; }
1443 .flag { display: block; border-radius: 2px; box-shadow: 0 0 0 1px rgba(0,0,0,.18); }
1444 .langpick-caret { font-size: 10px; opacity: .8; }
1445 .langpick-menu { position: absolute; right: 0; top: calc(100% + 6px); z-index: 60; margin: 0; padding: 4px; min-width: 150px; background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg); box-shadow: var(--shadow); display: flex; flex-direction: column; gap: 2px; }
1446 .langpick-menu[hidden] { display: none; }
1447 .langpick-menu button, .top .langpick-menu button { background: transparent; color: var(--ink); border: 0; justify-content: flex-start; gap: 8px; min-height: 34px; padding: 0 8px; width: 100%; white-space: nowrap; }
1448 .langpick-menu button:hover { background: var(--blue-soft); }
1449 .rui-lbl { display: inline-flex; align-items: center; gap: 2px; }
1450
1451 /* Beheer-subtabs */
1452 .admintabs { display: flex; align-items: center; gap: var(--sp-3); margin: 0 0 var(--sp-4); border-bottom: 1px solid var(--line); min-width: 0; }
1453 .admintabs-title { font-weight: 650; color: var(--muted); font-size: var(--fs-sm); text-transform: uppercase; letter-spacing: .04em; flex: none; }
1454 .admintabs-list { display: flex; gap: 2px; overflow-x: auto; scrollbar-width: none; min-width: 0; }
1455 .admintabs-list::-webkit-scrollbar { display: none; }
1456 .admintabs-list a { padding: var(--sp-2) var(--sp-3); text-decoration: none; color: var(--ink); border-bottom: 2px solid transparent; white-space: nowrap; margin-bottom: -1px; }
1457 .admintabs-list a:hover { color: var(--blue-deep); }
1458 .admintabs-list a.on { border-bottom-color: var(--blue); color: var(--blue-deep); font-weight: 600; }
1459 .adminusers td { vertical-align: middle; }
1460 .adminusers .why { font-size: var(--fs-sm); color: var(--muted); max-width: 16rem; margin-left: auto; white-space: normal; }
1461 @media (max-width: 720px) { .admintabs-title { display: none; } }
1462 table.kv { width: 100%; max-width: 100%; }
1463 table.kv td, table.kv th { overflow-wrap: anywhere; word-break: break-word; }
1464 @media (max-width: 720px) { table.kv, table.kv tbody, table.kv tr, table.kv td, table.kv th { display: block; } table.kv th { padding-bottom: 0; } }
1465 @media (max-width: 720px) {
1466 .hscroll:has(> .adminusers) { overflow-x: visible; }
1467 table.adminusers { min-width: 0; }
1468 table.adminusers thead { display: none; }
1469 table.adminusers, table.adminusers tbody, table.adminusers tr, table.adminusers td { display: block; width: auto; }
1470 table.adminusers tr { padding: var(--sp-3) 0; border-bottom: 1px solid var(--line); }
1471 table.adminusers td { border: 0; padding: 2px 0; }
1472 table.adminusers td.act { padding-top: var(--sp-2); text-align: left; width: auto; white-space: normal; }
1473 .adminusers .why { margin-left: 0; max-width: none; width: 100%; min-width: 14rem; }
1474 table.adminusers td.act, table.adminusers td.act form { display: block; width: 100%; }
1475 }
1476 .piperetry[hidden], details.piperetry[hidden] { display: none !important; }
@@ -1410,3 +1410,67 @@ table.md { display: block; max-width: 100%; overflow-x: auto; }
1410 .top .brand { font-size: 14px; white-space: nowrap; }
1410 .top .brand { font-size: 14px; white-space: nowrap; }
1411 .rui-sechead form, .rui-sechead button { width: 100%; }
1411 .rui-sechead form, .rui-sechead button { width: 100%; }
1412}
1412}
1413
1414/* Eigen modal (confirm.js) — nooit browser-popups */
1415html.bgmodal-open { overflow: hidden; }
1416.bgmodal { border: 1px solid var(--line); border-radius: var(--radius-lg); padding: 0; width: min(28rem, calc(100vw - 32px)); max-height: calc(100vh - 32px); box-shadow: 0 16px 48px rgba(20, 32, 51, .28); color: var(--ink); background: var(--card); }
1417.bgmodal::backdrop { background: rgba(20, 32, 51, .45); }
1418.bgmodal-box { padding: var(--sp-5); margin: 0; }
1419.bgmodal h2 { margin: 0 0 var(--sp-2); font-size: 17px; }
1420.bgmodal p { margin: 0 0 var(--sp-5); overflow-wrap: anywhere; color: var(--muted); }
1421.bgmodal-acts { display: flex; justify-content: flex-end; gap: var(--sp-2); flex-wrap: wrap; }
1422.bgmodal-acts button { min-width: 96px; }
1423.bgmodal-acts button.danger { font-size: var(--fs); min-height: var(--control-h); padding: 0 var(--sp-3); }
1424.bgmodal[open] { animation: bgmodal-in .12s ease-out; }
1425@keyframes bgmodal-in { from { opacity: 0; transform: translateY(6px); } to { opacity: 1; transform: none; } }
1426@media (max-width: 480px) { .bgmodal-acts button { flex: 1; } }
1427@media (prefers-reduced-motion: reduce) { .bgmodal[open] { animation: none; } }
1428
1429/* Info-tooltips (i) */
1430.tiphost { position: relative; }
1431.tip { display: inline-flex; vertical-align: middle; margin-left: 4px; }
1432.tip-i { all: unset; display: inline-block; box-sizing: border-box; width: 18px; height: 18px; border-radius: 50%; border: 1px solid var(--blue); color: var(--blue-deep); background: var(--blue-soft); font: italic 700 11px/16px Georgia, serif; text-align: center; cursor: help; flex: none; }
1433.tip-i:focus-visible { outline: 2px solid var(--blue); outline-offset: 2px; }
1434.tip-b { display: none; position: absolute; left: 0; right: 0; top: calc(100% + 4px); z-index: 30; max-width: 26rem; padding: var(--sp-2) var(--sp-3); border-radius: var(--radius); background: var(--ink); color: #fff; font-size: var(--fs-sm); font-weight: 400; font-style: normal; line-height: 1.45; box-shadow: var(--shadow); white-space: normal; text-align: left; overflow-wrap: anywhere; }
1435.tip-b::before { content: ""; position: absolute; top: -5px; left: 14px; border: 5px solid transparent; border-top: 0; border-bottom-color: var(--ink); }
1436.tip:hover .tip-b, .tip-i:focus + .tip-b, .tip.open .tip-b, .tiphost:focus-within .tip-b { display: block; }
1437.tiphost:has(.tip.open), .tiphost:focus-within, .tiphost:hover { z-index: 31; }
1438
1439/* Taalkiezer (langpick.js) */
1440.langpick { position: relative; display: inline-flex; }
1441.top .langpick-btn, .langpick-btn { background: transparent; border: 1px solid rgba(255,255,255,.35); color: #fff; min-height: 30px; padding: 0 6px; gap: 4px; border-radius: var(--radius); }
1442.langpick-btn:focus-visible, .langpick-menu button:focus-visible { outline: 2px solid var(--blue); outline-offset: 2px; }
1443.flag { display: block; border-radius: 2px; box-shadow: 0 0 0 1px rgba(0,0,0,.18); }
1444.langpick-caret { font-size: 10px; opacity: .8; }
1445.langpick-menu { position: absolute; right: 0; top: calc(100% + 6px); z-index: 60; margin: 0; padding: 4px; min-width: 150px; background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg); box-shadow: var(--shadow); display: flex; flex-direction: column; gap: 2px; }
1446.langpick-menu[hidden] { display: none; }
1447.langpick-menu button, .top .langpick-menu button { background: transparent; color: var(--ink); border: 0; justify-content: flex-start; gap: 8px; min-height: 34px; padding: 0 8px; width: 100%; white-space: nowrap; }
1448.langpick-menu button:hover { background: var(--blue-soft); }
1449.rui-lbl { display: inline-flex; align-items: center; gap: 2px; }
1450
1451/* Beheer-subtabs */
1452.admintabs { display: flex; align-items: center; gap: var(--sp-3); margin: 0 0 var(--sp-4); border-bottom: 1px solid var(--line); min-width: 0; }
1453.admintabs-title { font-weight: 650; color: var(--muted); font-size: var(--fs-sm); text-transform: uppercase; letter-spacing: .04em; flex: none; }
1454.admintabs-list { display: flex; gap: 2px; overflow-x: auto; scrollbar-width: none; min-width: 0; }
1455.admintabs-list::-webkit-scrollbar { display: none; }
1456.admintabs-list a { padding: var(--sp-2) var(--sp-3); text-decoration: none; color: var(--ink); border-bottom: 2px solid transparent; white-space: nowrap; margin-bottom: -1px; }
1457.admintabs-list a:hover { color: var(--blue-deep); }
1458.admintabs-list a.on { border-bottom-color: var(--blue); color: var(--blue-deep); font-weight: 600; }
1459.adminusers td { vertical-align: middle; }
1460.adminusers .why { font-size: var(--fs-sm); color: var(--muted); max-width: 16rem; margin-left: auto; white-space: normal; }
1461@media (max-width: 720px) { .admintabs-title { display: none; } }
1462table.kv { width: 100%; max-width: 100%; }
1463table.kv td, table.kv th { overflow-wrap: anywhere; word-break: break-word; }
1464@media (max-width: 720px) { table.kv, table.kv tbody, table.kv tr, table.kv td, table.kv th { display: block; } table.kv th { padding-bottom: 0; } }
1465@media (max-width: 720px) {
1466 .hscroll:has(> .adminusers) { overflow-x: visible; }
1467 table.adminusers { min-width: 0; }
1468 table.adminusers thead { display: none; }
1469 table.adminusers, table.adminusers tbody, table.adminusers tr, table.adminusers td { display: block; width: auto; }
1470 table.adminusers tr { padding: var(--sp-3) 0; border-bottom: 1px solid var(--line); }
1471 table.adminusers td { border: 0; padding: 2px 0; }
1472 table.adminusers td.act { padding-top: var(--sp-2); text-align: left; width: auto; white-space: normal; }
1473 .adminusers .why { margin-left: 0; max-width: none; width: 100%; min-width: 14rem; }
1474 table.adminusers td.act, table.adminusers td.act form { display: block; width: 100%; }
1475}
1476.piperetry[hidden], details.piperetry[hidden] { display: none !important; }
internal/server/static/tip.js added +29 −0
@@ -0,0 +1,29 @@
1 // Info-tooltips (i): tonen bij hover, toetsenbordfocus en als het veld in
2 // hetzelfde label focus heeft (CSS). Op touch opent een tik de uitleg;
3 // tik ernaast of Escape sluit hem.
4 (function () {
5 function closeAll(except) {
6 document.querySelectorAll(".tip.open").forEach(function (t) {
7 if (t !== except) {
8 t.classList.remove("open");
9 var b = t.querySelector(".tip-i");
10 if (b) { b.setAttribute("aria-expanded", "false"); }
11 }
12 });
13 }
14 document.addEventListener("click", function (e) {
15 var btn = e.target.closest && e.target.closest(".tip-i");
16 if (!btn) { closeAll(null); return; }
17 e.preventDefault();
18 var tip = btn.closest(".tip");
19 var open = !tip.classList.contains("open");
20 closeAll(tip);
21 tip.classList.toggle("open", open);
22 btn.setAttribute("aria-expanded", open ? "true" : "false");
23 });
24 document.addEventListener("keydown", function (e) {
25 if (e.key === "Escape") { closeAll(null); return; }
26 var btn = e.target.closest && e.target.closest(".tip-i");
27 if (btn && (e.key === "Enter" || e.key === " ")) { e.preventDefault(); btn.click(); }
28 });
29 })();
@@ -0,0 +1,29 @@
1// Info-tooltips (i): tonen bij hover, toetsenbordfocus en als het veld in
2// hetzelfde label focus heeft (CSS). Op touch opent een tik de uitleg;
3// tik ernaast of Escape sluit hem.
4(function () {
5 function closeAll(except) {
6 document.querySelectorAll(".tip.open").forEach(function (t) {
7 if (t !== except) {
8 t.classList.remove("open");
9 var b = t.querySelector(".tip-i");
10 if (b) { b.setAttribute("aria-expanded", "false"); }
11 }
12 });
13 }
14 document.addEventListener("click", function (e) {
15 var btn = e.target.closest && e.target.closest(".tip-i");
16 if (!btn) { closeAll(null); return; }
17 e.preventDefault();
18 var tip = btn.closest(".tip");
19 var open = !tip.classList.contains("open");
20 closeAll(tip);
21 tip.classList.toggle("open", open);
22 btn.setAttribute("aria-expanded", open ? "true" : "false");
23 });
24 document.addEventListener("keydown", function (e) {
25 if (e.key === "Escape") { closeAll(null); return; }
26 var btn = e.target.closest && e.target.closest(".tip-i");
27 if (btn && (e.key === "Enter" || e.key === " ")) { e.preventDefault(); btn.click(); }
28 });
29})();
internal/server/templates/collab.html +4 −4
@@ -402,7 +402,7 @@
402 402
403 403 {{define "pipe-retry"}}
404 404 {{if .Can}}
405 <details class="rowmenu piperetry">
405 <details class="rowmenu piperetry" data-retry-failed data-pipe="{{.ID}}"{{if not .Failed}} hidden{{end}}>
406 406 <summary aria-label="{{t "pipe.retry"}}">{{t "pipe.retry"}}</summary>
407 407 <div class="menu-panel piperetry" data-pipe="{{.ID}}">
408 408 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry">
@@ -411,7 +411,7 @@
411 411 <input type="hidden" name="back" value="{{.Back}}">
412 412 <button type="submit">{{t "pipe.retry.all"}}</button>
413 413 </form>
414 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry" data-retry-failed data-pipe="{{.ID}}"{{if not .Failed}} hidden{{end}}>
414 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry">
415 415 <input type="hidden" name="csrf" value="{{.CSRF}}">
416 416 <input type="hidden" name="mode" value="failed">
417 417 <input type="hidden" name="back" value="{{.Back}}">
@@ -923,13 +923,13 @@
923 923 <p class="muted">{{t "runner.groupLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
924 924 <form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
925 925 <input type="hidden" name="csrf" value="{{.CSRF}}">
926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
926 <label class="tiphost"><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}} {{tip "runner.tip.builtinFirst"}}</label>
927 927 <button type="submit">{{t "action.save"}}</button>
928 928 </form>
929 929 <form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/optin">
930 930 <input type="hidden" name="csrf" value="{{.CSRF}}">
931 931 <input type="hidden" name="on" value="{{if .RunnerOptIn}}0{{else}}1{{end}}">
932 <p>{{if .RunnerOptIn}}{{t "runner.optinOn"}}{{else}}{{t "runner.optinOff"}}{{end}}</p>
932 <p class="tiphost">{{if .RunnerOptIn}}{{t "runner.optinOn"}}{{else}}{{t "runner.optinOff"}}{{end}} {{tip "runner.tip.optin"}}</p>
933 933 {{if .OptInNames}}<p class="muted">{{t "runner.optinWho"}} {{range $i, $n := .OptInNames}}{{if $i}}, {{end}}{{$n}}{{end}}</p>{{end}}
934 934 <button type="submit">{{if .RunnerOptIn}}{{t "runner.optinStop"}}{{else}}{{t "runner.optinStart"}}{{end}}</button>
935 935 </form>
@@ -402,7 +402,7 @@
402
402
403{{define "pipe-retry"}}
403{{define "pipe-retry"}}
404{{if .Can}}
404{{if .Can}}
405<details class="rowmenu piperetry">
405<details class="rowmenu piperetry" data-retry-failed data-pipe="{{.ID}}"{{if not .Failed}} hidden{{end}}>
406 <summary aria-label="{{t "pipe.retry"}}">{{t "pipe.retry"}}</summary>
406 <summary aria-label="{{t "pipe.retry"}}">{{t "pipe.retry"}}</summary>
407 <div class="menu-panel piperetry" data-pipe="{{.ID}}">
407 <div class="menu-panel piperetry" data-pipe="{{.ID}}">
408 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry">
408 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry">
@@ -411,7 +411,7 @@
411 <input type="hidden" name="back" value="{{.Back}}">
411 <input type="hidden" name="back" value="{{.Back}}">
412 <button type="submit">{{t "pipe.retry.all"}}</button>
412 <button type="submit">{{t "pipe.retry.all"}}</button>
413 </form>
413 </form>
414 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry" data-retry-failed data-pipe="{{.ID}}"{{if not .Failed}} hidden{{end}}>
414 <form method="post" action="/{{.Path}}/-/pipelines/{{.ID}}/retry">
415 <input type="hidden" name="csrf" value="{{.CSRF}}">
415 <input type="hidden" name="csrf" value="{{.CSRF}}">
416 <input type="hidden" name="mode" value="failed">
416 <input type="hidden" name="mode" value="failed">
417 <input type="hidden" name="back" value="{{.Back}}">
417 <input type="hidden" name="back" value="{{.Back}}">
@@ -923,13 +923,13 @@
923<p class="muted">{{t "runner.groupLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
923<p class="muted">{{t "runner.groupLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
924<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
924<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
925 <input type="hidden" name="csrf" value="{{.CSRF}}">
925 <input type="hidden" name="csrf" value="{{.CSRF}}">
926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
926 <label class="tiphost"><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}} {{tip "runner.tip.builtinFirst"}}</label>
927 <button type="submit">{{t "action.save"}}</button>
927 <button type="submit">{{t "action.save"}}</button>
928</form>
928</form>
929<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/optin">
929<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/optin">
930 <input type="hidden" name="csrf" value="{{.CSRF}}">
930 <input type="hidden" name="csrf" value="{{.CSRF}}">
931 <input type="hidden" name="on" value="{{if .RunnerOptIn}}0{{else}}1{{end}}">
931 <input type="hidden" name="on" value="{{if .RunnerOptIn}}0{{else}}1{{end}}">
932 <p>{{if .RunnerOptIn}}{{t "runner.optinOn"}}{{else}}{{t "runner.optinOff"}}{{end}}</p>
932 <p class="tiphost">{{if .RunnerOptIn}}{{t "runner.optinOn"}}{{else}}{{t "runner.optinOff"}}{{end}} {{tip "runner.tip.optin"}}</p>
933 {{if .OptInNames}}<p class="muted">{{t "runner.optinWho"}} {{range $i, $n := .OptInNames}}{{if $i}}, {{end}}{{$n}}{{end}}</p>{{end}}
933 {{if .OptInNames}}<p class="muted">{{t "runner.optinWho"}} {{range $i, $n := .OptInNames}}{{if $i}}, {{end}}{{$n}}{{end}}</p>{{end}}
934 <button type="submit">{{if .RunnerOptIn}}{{t "runner.optinStop"}}{{else}}{{t "runner.optinStart"}}{{end}}</button>
934 <button type="submit">{{if .RunnerOptIn}}{{t "runner.optinStop"}}{{else}}{{t "runner.optinStart"}}{{end}}</button>
935</form>
935</form>
internal/server/templates/help.html +27 −0
@@ -27,3 +27,30 @@
27 27 {{.RunnerUI}}
28 28 {{template "layout-end" .}}
29 29 {{end}}
30
31 {{define "adminusers"}}
32 {{template "layout-start" .}}
33 <h1>{{t "admin.users.title"}}</h1>
34 <p class="muted">{{t "admin.users.lead"}} {{tip "admin.tip.admin"}}</p>
35 <section class="panel">
36 <div class="hscroll">
37 <table class="rui-table adminusers">
38 <thead><tr><th>{{t "admin.col.user"}}</th><th>{{t "admin.col.role"}}</th><th>{{t "admin.col.since"}}</th><th></th></tr></thead>
39 <tbody>
40 {{range .AdminUsers}}<tr>
41 <td><a href="/users/{{.User.Username}}">{{.User.Username}}</a>{{if .Self}} <span class="pill">{{t "admin.you"}}</span>{{end}}</td>
42 <td>{{if .User.InstanceAdmin}}<span class="pill rui-own">{{t "admin.role.admin"}}</span>{{else}}<span class="muted">{{t "admin.role.user"}}</span>{{end}}</td>
43 <td>{{date .User.CreatedAt}}</td>
44 <td class="act">
45 {{if .User.InstanceAdmin}}
46 {{if .Self}}<button type="button" class="ghost" disabled aria-describedby="why-self">{{t "admin.revoke"}}</button><div class="why" id="why-self">{{t "admin.selfWhy"}}</div>
47 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.revokeAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="0"><button type="submit" class="danger">{{t "admin.revoke"}}</button></form>{{end}}
48 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.grantAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="1"><button type="submit">{{t "admin.grant"}}</button></form>{{end}}
49 </td>
50 </tr>{{end}}
51 </tbody>
52 </table>
53 </div>
54 </section>
55 {{template "layout-end" .}}
56 {{end}}
@@ -27,3 +27,30 @@
27{{.RunnerUI}}
27{{.RunnerUI}}
28{{template "layout-end" .}}
28{{template "layout-end" .}}
29{{end}}
29{{end}}
30
31{{define "adminusers"}}
32{{template "layout-start" .}}
33<h1>{{t "admin.users.title"}}</h1>
34<p class="muted">{{t "admin.users.lead"}} {{tip "admin.tip.admin"}}</p>
35<section class="panel">
36<div class="hscroll">
37<table class="rui-table adminusers">
38 <thead><tr><th>{{t "admin.col.user"}}</th><th>{{t "admin.col.role"}}</th><th>{{t "admin.col.since"}}</th><th></th></tr></thead>
39 <tbody>
40 {{range .AdminUsers}}<tr>
41 <td><a href="/users/{{.User.Username}}">{{.User.Username}}</a>{{if .Self}} <span class="pill">{{t "admin.you"}}</span>{{end}}</td>
42 <td>{{if .User.InstanceAdmin}}<span class="pill rui-own">{{t "admin.role.admin"}}</span>{{else}}<span class="muted">{{t "admin.role.user"}}</span>{{end}}</td>
43 <td>{{date .User.CreatedAt}}</td>
44 <td class="act">
45 {{if .User.InstanceAdmin}}
46 {{if .Self}}<button type="button" class="ghost" disabled aria-describedby="why-self">{{t "admin.revoke"}}</button><div class="why" id="why-self">{{t "admin.selfWhy"}}</div>
47 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.revokeAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="0"><button type="submit" class="danger">{{t "admin.revoke"}}</button></form>{{end}}
48 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.grantAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="1"><button type="submit">{{t "admin.grant"}}</button></form>{{end}}
49 </td>
50 </tr>{{end}}
51 </tbody>
52</table>
53</div>
54</section>
55{{template "layout-end" .}}
56{{end}}
internal/server/templates/layout.html +17 −3
@@ -26,7 +26,7 @@
26 26 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
27 27 <link rel="stylesheet" href="/assets/style.css">
28 28 </head>
29 <body data-copied="{{t "action.copied"}}">
29 <body data-copied="{{t "action.copied"}}" data-modal-title="{{t "modal.title"}}" data-modal-ok="{{t "modal.ok"}}" data-modal-cancel="{{t "modal.cancel"}}">
30 30 <header class="top">
31 31 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
32 32 <nav>
@@ -35,12 +35,14 @@
35 35 <a href="/new">{{t "nav.new"}}</a>
36 36 <a href="/-/info">{{t "nav.info"}}</a>
37 37 <a href="/help">{{t "nav.help"}}</a>
38 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a><a href="/admin/runner">{{t "nav.adminRunner"}}</a>{{end}}
38 {{if .User.InstanceAdmin}}<a href="/admin"{{if adminpage .Page}} aria-current="page"{{end}}>{{t "nav.admin"}}</a>{{end}}
39 39 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
40 {{.LangPick}}
40 41 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
41 42 {{else}}
42 43 <a href="/-/info">{{t "nav.info"}}</a>
43 44 <a href="/help">{{t "nav.help"}}</a>
45 {{.LangPick}}
44 46 <a class="btn" href="/login">{{t "nav.signin"}}</a>
45 47 {{end}}
46 48 </nav>
@@ -51,6 +53,7 @@
51 53 <main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
52 54 {{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
53 55 {{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
56 {{if and .User .User.InstanceAdmin (adminpage .Page)}}{{template "adminnav" .}}{{end}}
54 57 {{if .Repo}}
55 58 <p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>
56 59 {{else if .Group}}
@@ -74,6 +77,8 @@
74 77 </footer>
75 78 <script src="/assets/float.js"></script>
76 79 <script src="/assets/confirm.js"></script>
80 <script src="/assets/tip.js"></script>
81 <script src="/assets/langpick.js"></script>
77 82 </body>
78 83 </html>
79 84 {{end}}
@@ -115,6 +120,15 @@
115 120 </aside>
116 121 {{end}}
117 122
123 {{define "adminnav"}}
124 <nav class="admintabs" aria-label="{{t "nav.admin"}}">
125 <span class="admintabs-title">{{t "nav.admin"}}</span>
126 <div class="admintabs-list">
127 {{range admintabs .Page}}<a href="{{.Href}}"{{if .On}} class="on" aria-current="page"{{end}}>{{t .Key}}</a>{{end}}
128 </div>
129 </nav>
130 {{end}}
131
118 132 {{define "helpside"}}
119 133 <aside class="sidenav">
120 134 <a class="sidecontext" href="/help">
@@ -160,7 +174,7 @@
160 174 <a href="/new"{{if eq .Page "new"}} class="on"{{end}}>{{t "nav.new"}}</a>
161 175 <a href="/-/info"{{if eq .Page "info"}} class="on"{{end}}>{{t "nav.info"}}</a>
162 176 <a href="/settings"{{if eq .Page "account"}} class="on"{{end}}>{{.User.Username}}</a>
163 {{if .User.InstanceAdmin}}<a href="/setup"{{if eq .Page "setup"}} class="on"{{end}}>{{t "nav.storage"}}</a>{{end}}
177 {{if .User.InstanceAdmin}}<a href="/admin"{{if adminpage .Page}} class="on"{{end}}>{{t "nav.admin"}}</a>{{end}}
164 178 </nav>
165 179 </aside>
166 180 {{end}}
@@ -26,7 +26,7 @@
26 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
26 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
27 <link rel="stylesheet" href="/assets/style.css">
27 <link rel="stylesheet" href="/assets/style.css">
28</head>
28</head>
29<body data-copied="{{t "action.copied"}}">
29<body data-copied="{{t "action.copied"}}" data-modal-title="{{t "modal.title"}}" data-modal-ok="{{t "modal.ok"}}" data-modal-cancel="{{t "modal.cancel"}}">
30<header class="top">
30<header class="top">
31 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
31 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
32 <nav>
32 <nav>
@@ -35,12 +35,14 @@
35 <a href="/new">{{t "nav.new"}}</a>
35 <a href="/new">{{t "nav.new"}}</a>
36 <a href="/-/info">{{t "nav.info"}}</a>
36 <a href="/-/info">{{t "nav.info"}}</a>
37 <a href="/help">{{t "nav.help"}}</a>
37 <a href="/help">{{t "nav.help"}}</a>
38 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a><a href="/admin/runner">{{t "nav.adminRunner"}}</a>{{end}}
38 {{if .User.InstanceAdmin}}<a href="/admin"{{if adminpage .Page}} aria-current="page"{{end}}>{{t "nav.admin"}}</a>{{end}}
39 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
39 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
40 {{.LangPick}}
40 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
41 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
41 {{else}}
42 {{else}}
42 <a href="/-/info">{{t "nav.info"}}</a>
43 <a href="/-/info">{{t "nav.info"}}</a>
43 <a href="/help">{{t "nav.help"}}</a>
44 <a href="/help">{{t "nav.help"}}</a>
45 {{.LangPick}}
44 <a class="btn" href="/login">{{t "nav.signin"}}</a>
46 <a class="btn" href="/login">{{t "nav.signin"}}</a>
45 {{end}}
47 {{end}}
46 </nav>
48 </nav>
@@ -51,6 +53,7 @@
51<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
53<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
52{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
54{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
53{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
55{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
56{{if and .User .User.InstanceAdmin (adminpage .Page)}}{{template "adminnav" .}}{{end}}
54{{if .Repo}}
57{{if .Repo}}
55<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>
58<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>
56{{else if .Group}}
59{{else if .Group}}
@@ -74,6 +77,8 @@
74</footer>
77</footer>
75<script src="/assets/float.js"></script>
78<script src="/assets/float.js"></script>
76<script src="/assets/confirm.js"></script>
79<script src="/assets/confirm.js"></script>
80<script src="/assets/tip.js"></script>
81<script src="/assets/langpick.js"></script>
77</body>
82</body>
78</html>
83</html>
79{{end}}
84{{end}}
@@ -115,6 +120,15 @@
115</aside>
120</aside>
116{{end}}
121{{end}}
117
122
123{{define "adminnav"}}
124<nav class="admintabs" aria-label="{{t "nav.admin"}}">
125 <span class="admintabs-title">{{t "nav.admin"}}</span>
126 <div class="admintabs-list">
127 {{range admintabs .Page}}<a href="{{.Href}}"{{if .On}} class="on" aria-current="page"{{end}}>{{t .Key}}</a>{{end}}
128 </div>
129</nav>
130{{end}}
131
118{{define "helpside"}}
132{{define "helpside"}}
119<aside class="sidenav">
133<aside class="sidenav">
120 <a class="sidecontext" href="/help">
134 <a class="sidecontext" href="/help">
@@ -160,7 +174,7 @@
160 <a href="/new"{{if eq .Page "new"}} class="on"{{end}}>{{t "nav.new"}}</a>
174 <a href="/new"{{if eq .Page "new"}} class="on"{{end}}>{{t "nav.new"}}</a>
161 <a href="/-/info"{{if eq .Page "info"}} class="on"{{end}}>{{t "nav.info"}}</a>
175 <a href="/-/info"{{if eq .Page "info"}} class="on"{{end}}>{{t "nav.info"}}</a>
162 <a href="/settings"{{if eq .Page "account"}} class="on"{{end}}>{{.User.Username}}</a>
176 <a href="/settings"{{if eq .Page "account"}} class="on"{{end}}>{{.User.Username}}</a>
163 {{if .User.InstanceAdmin}}<a href="/setup"{{if eq .Page "setup"}} class="on"{{end}}>{{t "nav.storage"}}</a>{{end}}
177 {{if .User.InstanceAdmin}}<a href="/admin"{{if adminpage .Page}} class="on"{{end}}>{{t "nav.admin"}}</a>{{end}}
164 </nav>
178 </nav>
165</aside>
179</aside>
166{{end}}
180{{end}}
internal/server/templates/pages.html +3 −3
@@ -307,8 +307,8 @@
307 307 <p class="muted">{{t "runner.userLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
308 308 <form method="post" action="/settings/runners/pref">
309 309 <input type="hidden" name="csrf" value="{{.CSRF}}">
310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
311 <label><input type="radio" name="pref" value="own_first" {{if eq .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefOwn"}}</label>
310 <label class="tiphost"><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}} {{tip "runner.tip.prefBuiltin"}}</label>
311 <label class="tiphost"><input type="radio" name="pref" value="own_first" {{if eq .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefOwn"}} {{tip "runner.tip.prefOwn"}}</label>
312 312 <button type="submit">{{t "action.save"}}</button>
313 313 </form>
314 314 {{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" "/settings/runners/delete" "Token" .NewRunnerToken "New" "/settings/runners/token" "Base" .BaseURL)}}
@@ -692,7 +692,7 @@
692 692 <pre class="code">sudo bluegit-runner register --url {{.Base}} --token {{.Token}}</pre>{{end}}
693 693 <form method="post" action="{{.New}}">
694 694 <input type="hidden" name="csrf" value="{{.CSRF}}">
695 <button type="submit">{{t "runner.new"}}</button>
695 <span class="tiphost"><button type="submit">{{t "runner.new"}}</button> {{tip "runner.tip.token"}}</span>
696 696 </form>
697 697 {{if .Runners}}
698 698 <div class="hscroll">
@@ -307,8 +307,8 @@
307 <p class="muted">{{t "runner.userLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
307 <p class="muted">{{t "runner.userLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
308 <form method="post" action="/settings/runners/pref">
308 <form method="post" action="/settings/runners/pref">
309 <input type="hidden" name="csrf" value="{{.CSRF}}">
309 <input type="hidden" name="csrf" value="{{.CSRF}}">
310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
310 <label class="tiphost"><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}} {{tip "runner.tip.prefBuiltin"}}</label>
311 <label><input type="radio" name="pref" value="own_first" {{if eq .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefOwn"}}</label>
311 <label class="tiphost"><input type="radio" name="pref" value="own_first" {{if eq .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefOwn"}} {{tip "runner.tip.prefOwn"}}</label>
312 <button type="submit">{{t "action.save"}}</button>
312 <button type="submit">{{t "action.save"}}</button>
313 </form>
313 </form>
314 {{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" "/settings/runners/delete" "Token" .NewRunnerToken "New" "/settings/runners/token" "Base" .BaseURL)}}
314 {{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" "/settings/runners/delete" "Token" .NewRunnerToken "New" "/settings/runners/token" "Base" .BaseURL)}}
@@ -692,7 +692,7 @@
692<pre class="code">sudo bluegit-runner register --url {{.Base}} --token {{.Token}}</pre>{{end}}
692<pre class="code">sudo bluegit-runner register --url {{.Base}} --token {{.Token}}</pre>{{end}}
693<form method="post" action="{{.New}}">
693<form method="post" action="{{.New}}">
694 <input type="hidden" name="csrf" value="{{.CSRF}}">
694 <input type="hidden" name="csrf" value="{{.CSRF}}">
695 <button type="submit">{{t "runner.new"}}</button>
695 <span class="tiphost"><button type="submit">{{t "runner.new"}}</button> {{tip "runner.tip.token"}}</span>
696</form>
696</form>
697{{if .Runners}}
697{{if .Runners}}
698<div class="hscroll">
698<div class="hscroll">
internal/store/admins.go added +70 −0
@@ -0,0 +1,70 @@
1 package store
2
3 import (
4 "context"
5 "errors"
6 )
7
8 // Fouten bij het wijzigen van beheerdersrechten.
9 var (
10 ErrSelfDemote = errors.New("you cannot remove your own admin rights")
11 ErrLastAdmin = errors.New("there must always be at least one admin")
12 )
13
14 // ListUsers geeft alle gebruikers op naam.
15 func (s *Store) ListUsers(ctx context.Context) ([]User, error) {
16 rows, err := s.db.QueryContext(ctx, `SELECT `+userCols+` FROM users ORDER BY username`)
17 if err != nil {
18 return nil, err
19 }
20 defer rows.Close()
21 var out []User
22 for rows.Next() {
23 u, err := scanUser(rows)
24 if err != nil {
25 return nil, err
26 }
27 out = append(out, u)
28 }
29 return out, rows.Err()
30 }
31
32 // CountAdmins telt de sitebeheerders.
33 func (s *Store) CountAdmins(ctx context.Context) (int, error) {
34 var n int
35 err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM users WHERE instance_admin = 1`).Scan(&n)
36 return n, err
37 }
38
39 // SetInstanceAdmin geeft of ontneemt beheerdersrechten. by mag zichzelf
40 // niet degraderen, en er blijft altijd minstens één beheerder over.
41 func (s *Store) SetInstanceAdmin(ctx context.Context, by, target int64, admin bool) (User, error) {
42 if !admin && by == target {
43 return User{}, ErrSelfDemote
44 }
45 tx, err := s.db.BeginTx(ctx, nil)
46 if err != nil {
47 return User{}, err
48 }
49 defer tx.Rollback()
50 if !admin {
51 var n int
52 if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM users WHERE instance_admin = 1 AND id <> ?`, target).Scan(&n); err != nil {
53 return User{}, err
54 }
55 if n == 0 {
56 return User{}, ErrLastAdmin
57 }
58 }
59 res, err := tx.ExecContext(ctx, `UPDATE users SET instance_admin = ? WHERE id = ?`, boolInt(admin), target)
60 if err != nil {
61 return User{}, err
62 }
63 if n, _ := res.RowsAffected(); n == 0 {
64 return User{}, errNotFound
65 }
66 if err := tx.Commit(); err != nil {
67 return User{}, err
68 }
69 return s.UserByID(ctx, target)
70 }
@@ -0,0 +1,70 @@
1package store
2
3import (
4 "context"
5 "errors"
6)
7
8// Fouten bij het wijzigen van beheerdersrechten.
9var (
10 ErrSelfDemote = errors.New("you cannot remove your own admin rights")
11 ErrLastAdmin = errors.New("there must always be at least one admin")
12)
13
14// ListUsers geeft alle gebruikers op naam.
15func (s *Store) ListUsers(ctx context.Context) ([]User, error) {
16 rows, err := s.db.QueryContext(ctx, `SELECT `+userCols+` FROM users ORDER BY username`)
17 if err != nil {
18 return nil, err
19 }
20 defer rows.Close()
21 var out []User
22 for rows.Next() {
23 u, err := scanUser(rows)
24 if err != nil {
25 return nil, err
26 }
27 out = append(out, u)
28 }
29 return out, rows.Err()
30}
31
32// CountAdmins telt de sitebeheerders.
33func (s *Store) CountAdmins(ctx context.Context) (int, error) {
34 var n int
35 err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM users WHERE instance_admin = 1`).Scan(&n)
36 return n, err
37}
38
39// SetInstanceAdmin geeft of ontneemt beheerdersrechten. by mag zichzelf
40// niet degraderen, en er blijft altijd minstens één beheerder over.
41func (s *Store) SetInstanceAdmin(ctx context.Context, by, target int64, admin bool) (User, error) {
42 if !admin && by == target {
43 return User{}, ErrSelfDemote
44 }
45 tx, err := s.db.BeginTx(ctx, nil)
46 if err != nil {
47 return User{}, err
48 }
49 defer tx.Rollback()
50 if !admin {
51 var n int
52 if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM users WHERE instance_admin = 1 AND id <> ?`, target).Scan(&n); err != nil {
53 return User{}, err
54 }
55 if n == 0 {
56 return User{}, ErrLastAdmin
57 }
58 }
59 res, err := tx.ExecContext(ctx, `UPDATE users SET instance_admin = ? WHERE id = ?`, boolInt(admin), target)
60 if err != nil {
61 return User{}, err
62 }
63 if n, _ := res.RowsAffected(); n == 0 {
64 return User{}, errNotFound
65 }
66 if err := tx.Commit(); err != nil {
67 return User{}, err
68 }
69 return s.UserByID(ctx, target)
70}
internal/store/store.go +1 −1
@@ -676,7 +676,7 @@ func (s *Store) SetProfile(ctx context.Context, userID int64, name, bio string)
676 676 return err
677 677 }
678 678
679 func scanUser(row *sql.Row) (User, error) {
679 func scanUser(row interface{ Scan(...any) error }) (User, error) {
680 680 var u User
681 681 var admin, inst int
682 682 var created string
@@ -676,7 +676,7 @@ func (s *Store) SetProfile(ctx context.Context, userID int64, name, bio string)
676 return err
676 return err
677}
677}
678
678
679func scanUser(row *sql.Row) (User, error) {
679func scanUser(row interface{ Scan(...any) error }) (User, error) {
680 var u User
680 var u User
681 var admin, inst int
681 var admin, inst int
682 var created string
682 var created string
scripts/bg +14 −0
@@ -198,6 +198,18 @@ cmd_runner() {
198 198 esac
199 199 }
200 200
201 # ---------- beheer (instance admin) ----------
202 cmd_admin() {
203 local sub=${1:-}; shift || true
204 case $sub in
205 list) get "$API/admin/users" | jq -r '.[]|"\(.username)\t\(if .admin then "admin" else "-" end)"' ;;
206 grant|revoke)
207 local v=true; [[ $sub == revoke ]] && v=false
208 req PUT "$API/admin/users/${1:?gebruiker}/admin" "{\"admin\":$v}" | jq -r '"\(.username) admin=\(.admin)"' ;;
209 *) die "admin list|grant GEBRUIKER|revoke GEBRUIKER" ;;
210 esac
211 }
212
201 213 # ---------- issues ----------
202 214 cmd_issue() {
203 215 local sub=${1:-}; shift || true
@@ -262,6 +274,7 @@ usage() {
262 274 bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
263 275 bg runner wait NAAM|ID [--timeout S] [--group PAD]
264 276 bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
277 bg admin list | grant GEBRUIKER | revoke GEBRUIKER beheerders (alleen beheerders; jezelf afnemen kan niet)
265 278 U
266 279 }
267 280
@@ -273,6 +286,7 @@ case ${1:-help} in
273 286 release) shift; cmd_release "$@" ;;
274 287 file) shift; cmd_file "$@" ;;
275 288 runner) shift; cmd_runner "$@" ;;
289 admin) shift; cmd_admin "$@" ;;
276 290 help|-h|--help) usage ;;
277 291 *) usage >&2; exit 64 ;;
278 292 esac
@@ -198,6 +198,18 @@ cmd_runner() {
198 esac
198 esac
199}
199}
200
200
201# ---------- beheer (instance admin) ----------
202cmd_admin() {
203 local sub=${1:-}; shift || true
204 case $sub in
205 list) get "$API/admin/users" | jq -r '.[]|"\(.username)\t\(if .admin then "admin" else "-" end)"' ;;
206 grant|revoke)
207 local v=true; [[ $sub == revoke ]] && v=false
208 req PUT "$API/admin/users/${1:?gebruiker}/admin" "{\"admin\":$v}" | jq -r '"\(.username) admin=\(.admin)"' ;;
209 *) die "admin list|grant GEBRUIKER|revoke GEBRUIKER" ;;
210 esac
211}
212
201# ---------- issues ----------
213# ---------- issues ----------
202cmd_issue() {
214cmd_issue() {
203 local sub=${1:-}; shift || true
215 local sub=${1:-}; shift || true
@@ -262,6 +274,7 @@ usage() {
262 bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
274 bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
263 bg runner wait NAAM|ID [--timeout S] [--group PAD]
275 bg runner wait NAAM|ID [--timeout S] [--group PAD]
264 bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
276 bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
277 bg admin list | grant GEBRUIKER | revoke GEBRUIKER beheerders (alleen beheerders; jezelf afnemen kan niet)
265U
278U
266}
279}
267
280
@@ -273,6 +286,7 @@ case ${1:-help} in
273 release) shift; cmd_release "$@" ;;
286 release) shift; cmd_release "$@" ;;
274 file) shift; cmd_file "$@" ;;
287 file) shift; cmd_file "$@" ;;
275 runner) shift; cmd_runner "$@" ;;
288 runner) shift; cmd_runner "$@" ;;
289 admin) shift; cmd_admin "$@" ;;
276 help|-h|--help) usage ;;
290 help|-h|--help) usage ;;
277 *) usage >&2; exit 64 ;;
291 *) usage >&2; exit 64 ;;
278esac
292esac