aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Magorsch <arzano@gentoo.org>2020-09-08 02:06:03 +0200
committerMax Magorsch <arzano@gentoo.org>2020-09-08 02:06:03 +0200
commitc266260ea734c9d72ea9bab12f071f7eae1bd146 (patch)
tree6b7427a739edc821552aaf5777d6ab3dd958c414
parentAdd wkd (diff)
downloadwww-c266260ea734c9d72ea9bab12f071f7eae1bd146.tar.gz
www-c266260ea734c9d72ea9bab12f071f7eae1bd146.tar.bz2
www-c266260ea734c9d72ea9bab12f071f7eae1bd146.zip
Add GLEP pages
Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r--.gitmodules3
m---------content/glep0
-rw-r--r--layouts/_default/single.html87
-rw-r--r--layouts/glep/baseof.html108
-rw-r--r--layouts/inside-gentoo/glep.html125
5 files changed, 288 insertions, 35 deletions
diff --git a/.gitmodules b/.gitmodules
index aa16b6b..56b6cca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "glep"]
path = glep
url = git://anongit.gentoo.org/data/glep.git
+[submodule "content/glep"]
+ path = content/glep
+ url = https://anongit.gentoo.org/git/data/glep.git
diff --git a/content/glep b/content/glep
new file mode 160000
+Subproject f89ff538122d32e8df6d194624262ab3da49a3f
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2d591fc..db99329 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,87 @@
-{{ define "main" }}
+<!DOCTYPE html>
+<html>
+{{- partial "head.html" . -}}
+<body>
+<header>
+ {{- partial "tyriannav.html" . -}}
- {{.Content}}
+ <nav class="navbar navbar-expand-lg navbar-light navbar-grey mb-3">
+ <div class="container">
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+ <div class="navbar-nav">
+ <a class="nav-link {{if in .Page "/developers"}}active{{end}}" href="/inside-gentoo/developers/">Developers</a>
+ <a class="nav-link" href="https://wiki.gentoo.org/wiki/Project:Gentoo">Projects <span class="fa fa-fw fa-external-link-square external-link" title="This link will leave www.gentoo.org."></span></a>
+ <a class="nav-link {{if in .Page "/glep"}}active{{end}}" href="/inside-gentoo/glep/">GLEPs</a>
+ <a class="nav-link {{if in .Page "/artwork"}}active{{end}}" href="/inside-gentoo/artwork/">Artwork</a>
+ <a class="nav-link {{if in .Page "/foundation"}}active{{end}}" href="/inside-gentoo/foundation/">Gentoo Foundation</a>
+ <a class="nav-link {{if in .Page "/sponsors"}}active{{end}}" href="/inside-gentoo/sponsors/">Sponsors</a>
+ <a class="nav-link {{if in .Page "/stores"}}active{{end}}" href="/inside-gentoo/stores/">Stores</a>
+ <a class="nav-link {{if in .Page "/contact"}}active{{end}}" href="/inside-gentoo/contact/">Contact</a>
+ </div>
+ </div>
+ </div>
+ </nav>
+</header>
-{{ end }} \ No newline at end of file
+<div class="container">
+ <div class="row">
+ <div id="content" class="col-md-12">
+ <h1 class="first-header">{{ if $.Param "GLEP" }}GLEP {{ $.Param "GLEP" }}: {{end}}{{ .Title }}</h1>
+
+ {{ if $.Param "GLEP" }}
+ <table class="table-bordered table-condensed table-striped float-right col-md-4">
+ <tbody>
+ <tr>
+ <th>Author</th>
+ <td>{{ $.Param "Author" }}</td>
+ </tr>
+ <tr>
+ <th>Type</th>
+ <td>{{ $.Param "Type" }}</td>
+ </tr>
+ <tr>
+ <th>Status</th>
+ <td>{{ $.Param "Status" }}</td>
+ </tr>
+ <tr>
+ <th>Version</th>
+ <td>{{ $.Param "Version" }}</td>
+ </tr>
+ <tr>
+ <th>Created</th>
+ <td>{{ $.Param "Created" }}</td>
+ </tr>
+ <tr>
+ <th>Last modified</th>
+ <td>{{ $.Param "Last-Modified" }}</td>
+ </tr>
+ <tr>
+ <th>Posting history</th>
+ <td>{{ $.Param "Post-History" }}</td>
+ </tr>
+
+ <tr>
+ <th>GLEP source</th>
+ <td>
+ <a href="https://gitweb.gentoo.org/data/glep.git/tree/glep-{{ $.Param "GLEP" }}.rst">glep-{{ $.Param "GLEP" }}.rst</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ {{end}}
+
+ {{ .Content }}
+
+ </div>
+ </div>
+</div>
+
+{{- partial "footer.html" . -}}
+<script src="/js/leaflet.js"></script>
+<script src="/js/devmap.js"></script>
+</body>
+</html>
diff --git a/layouts/glep/baseof.html b/layouts/glep/baseof.html
index d675bf2..b8608e8 100644
--- a/layouts/glep/baseof.html
+++ b/layouts/glep/baseof.html
@@ -32,47 +32,91 @@
<div id="content" class="col-md-12">
<h1 class="first-header">{{.Title}}</h1>
- <table class="table-bordered table-condensed table-striped float-right col-md-4">
+ <h2>Implemented GLEPs (Final or Active)</h2>
+ <table class="table table-condensed table-striped">
<tbody><tr>
- <th>Author</th>
- <td>{{ $.Param "Author" }}</td>
- </tr>
- <tr>
+ <th>GLEP number</th>
<th>Type</th>
- <td>{{ $.Param "Type" }}</td>
- </tr>
- <tr>
<th>Status</th>
- <td>{{ $.Param "Status" }}</td>
- </tr>
- <tr>
- <th>Version</th>
- <td>{{ $.Param "Version" }}</td>
- </tr>
- <tr>
- <th>Created</th>
- <td>{{ $.Param "Created" }}</td>
- </tr>
- <tr>
- <th>Last modified</th>
- <td>{{ $.Param "Last-Modified" }}</td>
- </tr>
- <tr>
- <th>Posting history</th>
- <td>{{ $.Param "Post-History" }}</td>
+ <th>Title</th>
</tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if or (eq .Params.status "Active") (eq .Params.status "Final") }}
+ <tr>
+ <td><a href="{{.Permalink}}">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
+ <h2>Accepted but not implemented GLEPs (Accepted)</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
+ </tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if eq .Params.status "Accepted" }}
+ <tr>
+ <td><a href="/glep/glep-{{ .Params.glep }}.html">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
+ <h2>Draft GLEPs (Draft)</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
+ </tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if eq .Params.status "Draft" }}
+ <tr>
+ <td><a href="/glep/glep-{{ .Params.glep }}.html">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
- <tr>
- <th>GLEP source</th>
- <td>
- <a href="https://gitweb.gentoo.org/data/glep.git/tree/glep-{{ $.Param "GLEP" }}.rst">glep-{{ $.Param "GLEP" }}.rst</a>
- </td>
+ <h2>Deferred, Rejected, Withdrawn, Replaced, or Moribund GLEPs</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
</tr>
- </tbody></table>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if or (eq .Params.status "Deferred") (eq .Params.status "Rejected") (eq .Params.status "Withdrawn") (eq .Params.status "Replaced") (eq .Params.status "Moribund") }}
+ <tr>
+ <td><a href="/glep/glep-{{ .Params.glep }}.html">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
- {{ .Content }}
+ {{- block "main" . }}{{- end }}
</div>
</div>
diff --git a/layouts/inside-gentoo/glep.html b/layouts/inside-gentoo/glep.html
new file mode 100644
index 0000000..f7a14cf
--- /dev/null
+++ b/layouts/inside-gentoo/glep.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html>
+ {{- partial "head.html" . -}}
+ <body>
+ <header>
+ {{- partial "tyriannav.html" . -}}
+
+ <nav class="navbar navbar-expand-lg navbar-light navbar-grey mb-3">
+ <div class="container">
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+ <div class="navbar-nav">
+ <a class="nav-link {{if in .Page "/developers"}}active{{end}}" href="/inside-gentoo/developers/">Developers</a>
+ <a class="nav-link" href="https://wiki.gentoo.org/wiki/Project:Gentoo">Projects <span class="fa fa-fw fa-external-link-square external-link" title="This link will leave www.gentoo.org."></span></a>
+ <a class="nav-link {{if in .Page "/glep"}}active{{end}}" href="/inside-gentoo/glep/">GLEPs</a>
+ <a class="nav-link {{if in .Page "/artwork"}}active{{end}}" href="/inside-gentoo/artwork/">Artwork</a>
+ <a class="nav-link {{if in .Page "/foundation"}}active{{end}}" href="/inside-gentoo/foundation/">Gentoo Foundation</a>
+ <a class="nav-link {{if in .Page "/sponsors"}}active{{end}}" href="/inside-gentoo/sponsors/">Sponsors</a>
+ <a class="nav-link {{if in .Page "/stores"}}active{{end}}" href="/inside-gentoo/stores/">Stores</a>
+ <a class="nav-link {{if in .Page "/contact"}}active{{end}}" href="/inside-gentoo/contact/">Contact</a>
+
+ </div>
+ </div>
+ </div>
+ </nav>
+ </header>
+
+ <div class="container">
+ <div class="row">
+ <div id="content" class="col-md-12">
+ <h1 class="first-header">{{.Title}}</h1>
+
+ <h2>Implemented GLEPs (Final or Active)</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
+ </tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if or (eq .Params.status "Active") (eq .Params.status "Final") }}
+ <tr>
+ <td><a href="{{.Permalink}}">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
+
+ <h2>Accepted but not implemented GLEPs (Accepted)</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
+ </tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if eq .Params.status "Accepted" }}
+ <tr>
+ <td><a href="/glep/glep-{{ .Params.glep }}.html">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
+
+ <h2>Draft GLEPs (Draft)</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
+ </tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if eq .Params.status "Draft" }}
+ <tr>
+ <td><a href="/glep/glep-{{ .Params.glep }}.html">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
+
+ <h2>Deferred, Rejected, Withdrawn, Replaced, or Moribund GLEPs</h2>
+ <table class="table table-condensed table-striped">
+ <tbody><tr>
+ <th>GLEP number</th>
+ <th>Type</th>
+ <th>Status</th>
+ <th>Title</th>
+ </tr>
+ {{ range $key, $value := sort (where .Site.RegularPages.ByTitle "Section" "glep" ) "Params.glep" }}
+ {{ if or (eq .Params.status "Deferred") (eq .Params.status "Rejected") (eq .Params.status "Withdrawn") (eq .Params.status "Replaced") (eq .Params.status "Moribund") }}
+ <tr>
+ <td><a href="/glep/glep-{{ .Params.glep }}.html">{{ .Params.glep }}</a></td>
+ <td>{{ .Params.type }}</td>
+ <td>{{ .Params.status | humanize | title }}</td>
+ <td>{{ .Params.title | humanize | title }}</td>
+ </tr>
+ {{ end }}
+ {{ end }}
+ </tbody>
+ </table>
+
+ </div>
+ </div>
+ </div>
+
+ {{- partial "footer.html" . -}}
+ </body>
+</html>