From 269fc0afa50a77416a74aece971c55bffb621649 Mon Sep 17 00:00:00 2001 From: volpino Date: Wed, 15 Aug 2012 15:32:16 +0200 Subject: [PATCH] euscanwww: Fixing all templates to be XHTML compliant Signed-off-by: volpino --- euscanwww/djeuscan/feeds.py | 6 +++-- euscanwww/djeuscan/templates/_base.html | 10 ++++---- .../templates/euscan/_categories_table.html | 18 +++++++------- .../djeuscan/templates/euscan/_datatable.html | 10 ++++---- .../templates/euscan/_herds_table.html | 18 +++++++------- .../templates/euscan/_maintainers_table.html | 18 +++++++------- .../templates/euscan/_overlays_table.html | 4 +++- .../templates/euscan/_package_details.html | 8 +++---- .../djeuscan/templates/euscan/_packages.html | 18 +++++++------- .../djeuscan/templates/euscan/about.html | 10 ++++---- euscanwww/djeuscan/templates/euscan/api.html | 4 +--- .../djeuscan/templates/euscan/category.html | 22 ++++++++--------- .../djeuscan/templates/euscan/feeds.html | 2 +- euscanwww/djeuscan/templates/euscan/herd.html | 24 +++++++++---------- .../djeuscan/templates/euscan/maintainer.html | 24 +++++++++---------- .../djeuscan/templates/euscan/overlay.html | 4 ++-- .../djeuscan/templates/euscan/package.html | 8 +++---- .../djeuscan/templates/euscan/statistics.html | 12 +++++----- .../djeuscan/templates/euscan/world_scan.html | 4 ++-- 19 files changed, 118 insertions(+), 106 deletions(-) diff --git a/euscanwww/djeuscan/feeds.py b/euscanwww/djeuscan/feeds.py index 9306bcb..5836d87 100644 --- a/euscanwww/djeuscan/feeds.py +++ b/euscanwww/djeuscan/feeds.py @@ -43,8 +43,10 @@ class BaseFeed(Feed): def item_link(self, vlog): kwargs = {'category': vlog.package.category, 'package': vlog.package.name} - return "%s#%s" % (reverse('djeuscan.views.package', kwargs=kwargs), - vlog.tag()) + return "%s#version-%s-%s:%s-%s" % ( + reverse('djeuscan.views.package', kwargs=kwargs), + vlog.version, vlog.revision, vlog.slot, vlog.overlay, + ) def item_pubdate(self, vlog): return vlog.datetime diff --git a/euscanwww/djeuscan/templates/_base.html b/euscanwww/djeuscan/templates/_base.html index 35a3e4b..2d26a33 100644 --- a/euscanwww/djeuscan/templates/_base.html +++ b/euscanwww/djeuscan/templates/_base.html @@ -1,11 +1,13 @@ + + + {% load url from future %} {% load timedelta %} - - + {% block title %}euscan{% endblock %} - + {% block meta %} {% endblock %} @@ -19,7 +21,7 @@ diff --git a/euscanwww/djeuscan/templates/euscan/_categories_table.html b/euscanwww/djeuscan/templates/euscan/_categories_table.html index 891826f..d3571e2 100644 --- a/euscanwww/djeuscan/templates/euscan/_categories_table.html +++ b/euscanwww/djeuscan/templates/euscan/_categories_table.html @@ -3,14 +3,16 @@ - - - - - - {% if extras %} - - {% endif %} + + + + + + + {% if extras %} + + {% endif %} + {% for category in categories %} diff --git a/euscanwww/djeuscan/templates/euscan/_datatable.html b/euscanwww/djeuscan/templates/euscan/_datatable.html index b3b8a1d..6af9ba9 100644 --- a/euscanwww/djeuscan/templates/euscan/_datatable.html +++ b/euscanwww/djeuscan/templates/euscan/_datatable.html @@ -26,11 +26,11 @@ {{ block.super }}
    -
  • Gentoo
    • -
  • Overlays
    • -
  • Upstream
    • -
  • Unstable
    • -
  • Freshness
    • +
  • gentoo Gentoo
    • +
  • overlays Overlays
    • +
  • upstream Upstream
    • +
  • unstable Unstable
    • +
  • freshness Freshness
{% endblock %} diff --git a/euscanwww/djeuscan/templates/euscan/_herds_table.html b/euscanwww/djeuscan/templates/euscan/_herds_table.html index f7e5b54..9f3f337 100644 --- a/euscanwww/djeuscan/templates/euscan/_herds_table.html +++ b/euscanwww/djeuscan/templates/euscan/_herds_table.html @@ -3,14 +3,16 @@
CategorygentoooverlaysupstreamGraphs
CategorygentoooverlaysupstreamfreshnessGraphs
- - - - - - {% if extras %} - - {% endif %} + + + + + + + {% if extras %} + + {% endif %} + {% for herd in herds %} diff --git a/euscanwww/djeuscan/templates/euscan/_maintainers_table.html b/euscanwww/djeuscan/templates/euscan/_maintainers_table.html index ebd1748..bfbdd21 100644 --- a/euscanwww/djeuscan/templates/euscan/_maintainers_table.html +++ b/euscanwww/djeuscan/templates/euscan/_maintainers_table.html @@ -3,14 +3,16 @@
HerdgentoooverlaysupstreamGraphs
HerdgentoooverlaysupstreamfreshnessGraphs
- - - - - - {% if extras %} - - {% endif %} + + + + + + + {% if extras %} + + {% endif %} + {% for maintainer in maintainers %} diff --git a/euscanwww/djeuscan/templates/euscan/_overlays_table.html b/euscanwww/djeuscan/templates/euscan/_overlays_table.html index f1a59f6..68409ca 100644 --- a/euscanwww/djeuscan/templates/euscan/_overlays_table.html +++ b/euscanwww/djeuscan/templates/euscan/_overlays_table.html @@ -2,7 +2,9 @@
MaintainergentoooverlaysupstreamGraphs
MaintainergentoooverlaysupstreamfreshnessGraphs
- + + + {% for overlay in overlays %} diff --git a/euscanwww/djeuscan/templates/euscan/_package_details.html b/euscanwww/djeuscan/templates/euscan/_package_details.html index 6204e90..b6a85ec 100644 --- a/euscanwww/djeuscan/templates/euscan/_package_details.html +++ b/euscanwww/djeuscan/templates/euscan/_package_details.html @@ -47,7 +47,7 @@
    {% for version in packaged %} -
  • +
  • {% if version.overlay == "gentoo" %} gentoo {% else %} @@ -69,7 +69,7 @@
      {% for version in upstream %} -
    • +
    • upstream {% if version.vtype and not version.vtype|is_stable %} @@ -77,7 +77,7 @@ {% endif %} {{ version.version }} - {{ version.urls }} - {% if confidence < 100 %}({{ version.confidence }}%){% endif %} + {% if confidence < 100 %}({{ version.confidence }}%){% endif %}
      • {% endfor %}
    @@ -87,7 +87,7 @@ {% if log %}
    euscan log
    -

    Date: {{ log.datetime }} +

    Date: {{ log.datetime }}

    {{ msg|ansi_to_html|safe }}
    {% endif %} diff --git a/euscanwww/djeuscan/templates/euscan/_packages.html b/euscanwww/djeuscan/templates/euscan/_packages.html index b9cba44..4ecb9d3 100644 --- a/euscanwww/djeuscan/templates/euscan/_packages.html +++ b/euscanwww/djeuscan/templates/euscan/_packages.html @@ -8,14 +8,16 @@
Overlay
Overlay
- - - - - - - - + + + + + + + + + + {% for package in packages %} diff --git a/euscanwww/djeuscan/templates/euscan/about.html b/euscanwww/djeuscan/templates/euscan/about.html index 657edfb..83b5b87 100644 --- a/euscanwww/djeuscan/templates/euscan/about.html +++ b/euscanwww/djeuscan/templates/euscan/about.html @@ -25,17 +25,17 @@

Powered by: - - Linux Kernel + + Linux Kernel - Gentoo Linux + Gentoo Linux - Django + Django - Python + Python

{% endblock %} diff --git a/euscanwww/djeuscan/templates/euscan/api.html b/euscanwww/djeuscan/templates/euscan/api.html index 8157ddd..e3f5ce3 100644 --- a/euscanwww/djeuscan/templates/euscan/api.html +++ b/euscanwww/djeuscan/templates/euscan/api.html @@ -5,7 +5,6 @@ {% block content %}

API

-

-Formats: xml, yaml and json -

+

Formats: xml, yaml and json

{% endblock %} diff --git a/euscanwww/djeuscan/templates/euscan/category.html b/euscanwww/djeuscan/templates/euscan/category.html index 78768f9..85935bf 100644 --- a/euscanwww/djeuscan/templates/euscan/category.html +++ b/euscanwww/djeuscan/templates/euscan/category.html @@ -24,10 +24,10 @@ {% if user.is_authenticated %} {% endif %} @@ -35,22 +35,22 @@ {% packages packages %} -

Statistics

+

Statistics

Current statistics

- - + pie versions + pie packages

All Time

- - + versions weekly + versions monthly

- - + packages weekly + packages monthly

Packagegentoooverlaysupstreamgentoooverlaysupstream
Packagegentoooverlaysupstreamgentoooverlaysupstreamfreshness