From 4f0c842ea3d803365cf431b5a87fb5b2b2ab3ac7 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Mon, 9 Sep 2013 23:11:06 +0200 Subject: Add menu to filter advisories list --- NEWS | 2 + static/advisories.css | 7 +++ tmpl/advisories.html | 140 ++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 146 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 0feedc7..0b95855 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- add menu to filter advisories list + Version 0.15 - correctly encode html in rss feed diff --git a/static/advisories.css b/static/advisories.css index 462a148..e1c8737 100644 --- a/static/advisories.css +++ b/static/advisories.css @@ -10,3 +10,10 @@ padding-top: 1em; padding-bottom: 1em; } + +#adv_menu { + text-align: left; + padding-left: 2em; + padding-top: 1em; + background: #fff; +} diff --git a/tmpl/advisories.html b/tmpl/advisories.html index e5fa506..eab4bf8 100644 --- a/tmpl/advisories.html +++ b/tmpl/advisories.html @@ -1,17 +1,151 @@ -[% USE date -%] +[%- USE JSON ( pretty => 1 ) -%] +[%- USE date -%] +[%- + jsadvdb = []; + mga_releases = {}; + FOREACH adv IN advdb.sorted; + a = {}; + a.src = []; + pkgs = {}; + FOREACH rel IN advdb.advisories.$adv.src.keys; + FOREACH media IN advdb.advisories.$adv.src.$rel.keys; + FOREACH srpm IN advdb.advisories.$adv.src.$rel.$media; + SET srcname = tools.pkgname(srpm); + IF ! pkgs.$srcname; + pkgs.$srcname = 1; + a.src.push(srcname); + END; + END; + END; + END; + a.CVE = advdb.advisories.$adv.CVE; + a.rel = advdb.advisories.$adv.src.keys; + FOREACH rel IN a.rel; + mga_releases.$rel = 1; + END; + a.type = advdb.advisories.$adv.type; + html = BLOCK -%] + + + [% date.format(advdb.advisories.$adv.status.published, format => '%Y-%m-%d', gmt => 1) %] + + [% adv %] + + [% SET sep = '' %] + [% FOREACH srcname IN a.src -%] + [%- sep -%] + [%- SET sep = ', ' -%] + [% srcname %] + [%- END -%] + + [% advdb.advisories.$adv.type %] + + [% SET sep = '' %] + [% FOREACH rel IN advdb.advisories.$adv.src.keys %] + [% sep %] + [% SET sep = ', ' %] + [% rel %] + [% END %] + + + [% SET sep = '' %] + [% FOREACH cve IN advdb.advisories.$adv.CVE %] + [% sep %] + [% SET sep = ', ' %] + [% cve %] + [% END %] + + + [%- END; + a.html = html.collapse; + jsadvdb.push(a); + END; +-%] Mageia Advisories [%- INCLUDE head.html -%] + [%- INCLUDE body_top.html -%]

Advisories » All

- [% INCLUDE advisories_table.html advlst = advdb.sorted %] +

+ -- cgit v1.2.1