webcheck branch master updated. 1.10.4-73-g3c2b822

[Commits of the webcheck project <webcheck-commits [at] lists.arthurdejong.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "webcheck".

The branch, master has been updated
       via  3c2b822f966e9b8a0dfb23391ce906ad0e9bcd25 (commit)
      from  8de60b500dc50357d11637f39f8ce01fd09ec0ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://arthurdejong.org/git/webcheck/commit/?id=3c2b822f966e9b8a0dfb23391ce906ad0e9bcd25

commit 3c2b822f966e9b8a0dfb23391ce906ad0e9bcd25
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Sep 22 22:44:12 2013 +0200

    Add missing template changes from Jinja merge
    
    This also fixes newlines in link meta information that were incorrectly
    escaped.

diff --git a/webcheck/templates/index.html b/webcheck/templates/index.html
index 9d54512..fb696ec 100644
--- a/webcheck/templates/index.html
+++ b/webcheck/templates/index.html
@@ -23,6 +23,8 @@
 
 {% extends 'base.html' %}
 
+{% from 'macros.html' import make_link with context %}
+
 {% block content %}
   <p class="description">
     This an overview of the crawled site.
diff --git a/webcheck/templates/macros.html b/webcheck/templates/macros.html
index f1f550d..88bed52 100644
--- a/webcheck/templates/macros.html
+++ b/webcheck/templates/macros.html
@@ -28,31 +28,31 @@
 
 {# output an overview of the link information #}
 {% macro link_info(link, separator='&#10;') -%}
-  url: {{ link.url }}{{ separator }}
-  {%- if link.status %}{{ link.status }}{{ separator }}{% endif -%}
-  {%- if link.title %}title: {{ link.title|trim }}{{ separator }}{% endif -%}
-  {%- if link.author %}author: {{ link.author|trim }}{{ separator }}{% endif 
-%}
+  url: {{ link.url }}{{ separator|safe }}
+  {%- if link.status %}{{ link.status }}{{ separator|safe }}{% endif -%}
+  {%- if link.title %}title: {{ link.title|trim }}{{ separator|safe }}{% endif 
-%}
+  {%- if link.author %}author: {{ link.author|trim }}{{ separator|safe }}{% 
endif -%}
   {%- if link.is_internal %}internal link{% else %}external link{% endif -%}
-  {%- if link.yanked %}, not checked ({{ link.yanked }}){% endif -%}{{ 
separator }}
+  {%- if link.yanked %}, not checked ({{ link.yanked }}){% endif -%}{{ 
separator|safe }}
   {%- if link.redirectdepth -%}
     {%- if link.children.count() > 0 -%}
       redirect: {{ link.children.first().url }}
     {%- else -%}
       redirect (not followed)
-    {%- endif -%}{{ separator }}
+    {%- endif -%}{{ separator|safe }}
   {%- endif -%}
   {%- set count = link.count_parents -%}
   {%- if count == 1 -%}
-    linked from 1 page{{ separator }}
+    linked from 1 page{{ separator|safe }}
   {%- elif count > 1 -%}
-    linked from {{ count }} pages{{ separator }}
+    linked from {{ count }} pages{{ separator|safe }}
   {%- endif -%}
-  {%- if link.mtime %}last modified: {{ time.ctime(link.mtime) }}{{ separator 
}}{% endif -%}
-  {%- if link.size %}size: {{ link.size|filesizeformat(binary=True) }}{{ 
separator }}{% endif -%}
-  {%- if link.mimetype %}mime-type: {{ link.mimetype }}{{ separator }}{% endif 
-%}
-  {%- if link.encoding %}encoding: {{ link.encoding }}{{ separator }}{% endif 
-%}
+  {%- if link.mtime %}last modified: {{ time.ctime(link.mtime) }}{{ 
separator|safe }}{% endif -%}
+  {%- if link.size %}size: {{ link.size|filesizeformat(binary=True) }}{{ 
separator|safe }}{% endif -%}
+  {%- if link.mimetype %}mime-type: {{ link.mimetype }}{{ separator|safe }}{% 
endif -%}
+  {%- if link.encoding %}encoding: {{ link.encoding }}{{ separator|safe }}{% 
endif -%}
   {%- for problem in link.linkproblems -%}
-    problem: {{ problem.message }}{{ separator }}
+    problem: {{ problem.message }}{{ separator|safe }}
   {%- endfor -%}
 {%- endmacro %}
 
diff --git a/webcheck/templates/problems.html b/webcheck/templates/problems.html
index d184356..a5028f9 100644
--- a/webcheck/templates/problems.html
+++ b/webcheck/templates/problems.html
@@ -1,5 +1,30 @@
+{#
+ # problems.html - template for webcheck problem list plugin
+ #
+ # Copyright (C) 2013 Arthur de Jong
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ #
+ # The files produced as output from the software do not automatically fall
+ # under the copyright of the software, unless explicitly stated otherwise.
+ #}
+
 {% extends 'base.html' %}
 
+{% from 'macros.html' import make_link with context %}
+
 {% block content %}
   {% if not authors %}
     <p class="description">

-----------------------------------------------------------------------

Summary of changes:
 webcheck/templates/index.html    |    2 ++
 webcheck/templates/macros.html   |   26 +++++++++++++-------------
 webcheck/templates/problems.html |   25 +++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
webcheck
-- 
To unsubscribe send an email to
webcheck-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/webcheck-commits/