Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5333DD9B2 for ; Wed, 25 Jul 2012 01:16:58 +0000 (UTC) Received: (qmail 29267 invoked by uid 500); 25 Jul 2012 01:16:58 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 29225 invoked by uid 500); 25 Jul 2012 01:16:58 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 29217 invoked by uid 99); 25 Jul 2012 01:16:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2012 01:16:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2012 01:16:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AC16F2388860; Wed, 25 Jul 2012 01:16:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1365385 - in /incubator/ooo/ooo-site/trunk: lib/view.pm templates/skeleton.html Date: Wed, 25 Jul 2012 01:16:11 -0000 To: ooo-commits@incubator.apache.org From: wave@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120725011611.AC16F2388860@eris.apache.org> Author: wave Date: Wed Jul 25 01:16:11 2012 New Revision: 1365385 URL: http://svn.apache.org/viewvc?rev=1365385&view=rev Log: (1) Change header to head to avoid confusion with headers. (2) Properly include bodytag in template. Modified: incubator/ooo/ooo-site/trunk/lib/view.pm incubator/ooo/ooo-site/trunk/templates/skeleton.html Modified: incubator/ooo/ooo-site/trunk/lib/view.pm URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/view.pm?rev=1365385&r1=1365384&r2=1365385&view=diff ============================================================================== --- incubator/ooo/ooo-site/trunk/lib/view.pm (original) +++ incubator/ooo/ooo-site/trunk/lib/view.pm Wed Jul 25 01:16:11 2012 @@ -93,7 +93,7 @@ sub html_page { read_text_file $ssi_header_file, $args{ssi}; if ($args{content} =~ m!(.*?)(?:.*?)?(.*?)(?:|\Z)!si) { - @args{qw/header bodytag content/} = ($1, $2, $3); + @args{qw/head bodytag content/} = ($1, $2, $3); } $args{breadcrumbs} =~ s/home/$args{ssi}{headers}{home}/; Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1365385&r1=1365384&r2=1365385&view=diff ============================================================================== --- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original) +++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Wed Jul 25 01:16:11 2012 @@ -2,19 +2,18 @@ -{% if header %} -{% autoescape off %}{{ header }}{% endautoescape %}{% else %} +{% if head %}{{ head|safe }}{% else %} {% block title %}{{ headers.title }}{% endblock %} {% if headers.css %}{% endif %} {% endif %} - +

{% if ssi.headers.topnav %}{% endif %} -

{% block breaddcrumbs %}{% autoescape off %}{{ breadcrumbs }}{% endautoescape %}{% endblock %}

{% block breaddcrumbs %}{{ breadcrumbs|safe }}{% endblock %}

{% if ssi.headers.leftnav %}{% endif %} @@ -24,8 +23,6 @@ {% block title %}{% if headers.title %}

{% endif %}{% endblock %} {% block content %}{{ content|markdown }}{% endblock %} - -