From b1eef95d3d00595afc53ac0f56c6627cf04fb2c8 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 19 Dec 2009 19:00:39 +0000 Subject: Reports: Fix html validation errors for #798 (Patch from Thorsten Lockert) Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5625 ce84e21b-d406-0410-9b95-82705330c041 --- .../xsl-transform-includes/html-templates.xsl | 5 +++-- .../xsl-transform-includes/sorttable-js.xsl | 4 ++-- .../Server/Hostbase/hostbase/webtemplates/edit.html | 2 +- .../Hostbase/hostbase/webtemplates/zoneedit.html | 3 +-- src/lib/Server/Reports/reports/templates/base.html | 10 ++++++---- .../reports/templates/clients/client-nodebox.html | 2 +- .../reports/templates/clients/detailed-list.html | 2 +- .../Reports/reports/templates/clients/index.html | 20 +++++++++++--------- .../Reports/reports/templates/clients/manage.html | 14 ++++++++------ .../reports/templates/config_items/index.html | 16 +++++++++------- .../reports/templates/config_items/listing.html | 6 +++--- .../reports/templates/displays/summary-block.html | 16 ++++++++-------- .../Reports/reports/templates/displays/summary.html | 16 +++++++++------- .../Reports/reports/templates/displays/timing.html | 18 ++++++++++-------- 14 files changed, 73 insertions(+), 61 deletions(-) diff --git a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl index 6e358df8b..74adbfe94 100644 --- a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl +++ b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl @@ -3,7 +3,8 @@ -
+ +
Time Ran: () @@ -146,4 +147,4 @@
  • SymLink:
  • - \ No newline at end of file + diff --git a/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl b/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl index ea2cb64a5..9c3742861 100644 --- a/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl +++ b/reports/xsl-transforms/xsl-transform-includes/sorttable-js.xsl @@ -5,7 +5,7 @@ - - \ No newline at end of file + diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html index 62109b2db..8df833821 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html @@ -20,7 +20,7 @@ {% block content %} - - + {% endblock%} {% block title %}Client Index Listing{% endblock %} @@ -19,18 +19,20 @@
    Enter date or use calendar popup: -
    -@ - - + + +@ + +Calendar | -
    -



    + +


    {% if client_list_b %} -
    +
      {% for client in client_list_b %}
    • @@ -38,7 +40,7 @@
    • {% endfor %}
    -
    +
      {% if client_list_a %} {% for client in client_list_a %} diff --git a/src/lib/Server/Reports/reports/templates/clients/manage.html b/src/lib/Server/Reports/reports/templates/clients/manage.html index 6b7cd2ee0..61f0fe017 100644 --- a/src/lib/Server/Reports/reports/templates/clients/manage.html +++ b/src/lib/Server/Reports/reports/templates/clients/manage.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block extra_header_info %} - + {% endblock%} {% block title %}{{client.name}}{% endblock %} @@ -13,14 +13,16 @@
      Enter date or use calendar popup: +
      -@ - - +@ + +Calendar -
      -


      + +




      {{message}}

      diff --git a/src/lib/Server/Reports/reports/templates/config_items/index.html b/src/lib/Server/Reports/reports/templates/config_items/index.html index 8de1a63cc..313e28633 100644 --- a/src/lib/Server/Reports/reports/templates/config_items/index.html +++ b/src/lib/Server/Reports/reports/templates/config_items/index.html @@ -5,7 +5,7 @@ {% block extra_header_info %} - + {% endblock%} {% block title %}Configuration Element Details{% endblock %} @@ -52,10 +52,12 @@
      Enter date or use calendar popup: -
      -@ - - + + +@ + +Calendar {% ifequal mod_or_bad "modified" %} {% endifequal %} -
      -



      + +


      {% if associated_client_list %}

      The following clients had this problem as of {{timestamp_date}}@{{timestamp_time}}:

      {% for client in associated_client_list %} diff --git a/src/lib/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Server/Reports/reports/templates/config_items/listing.html index 1dba4bd6d..64a60e506 100644 --- a/src/lib/Server/Reports/reports/templates/config_items/listing.html +++ b/src/lib/Server/Reports/reports/templates/config_items/listing.html @@ -2,8 +2,8 @@ {% load django_templating_sigh %} {% block extra_header_info %} - - + + @@ -15,7 +15,7 @@ YAHOO.example.init = function( ){ {% for item_list in item_list_pseudodict %} tabView.addTab( new YAHOO.widget.Tab({ label: '{{item_list.0}}', - content: '

      ', + content: '