svn commit: r1423191 - in /openoffice/ooo-site/trunk/lib: path.pm view.pm

[wave]

Author: wave
Date: Mon Dec 17 22:19:08 2012
New Revision: 1423191

URL: http://svn.apache.org/viewvc?rev=1423191&view=rev
Log:
*.htm files are now wrapped by htm_page which uses html_page and produced as 
*.htm files. Patch nearly as suggested by danielsh

Modified:
    openoffice/ooo-site/trunk/lib/path.pm
    openoffice/ooo-site/trunk/lib/view.pm

Modified: openoffice/ooo-site/trunk/lib/path.pm
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/lib/path.pm?rev=1423191&r1=1423190&r2=1423191&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/lib/path.pm (original)
+++ openoffice/ooo-site/trunk/lib/path.pm Mon Dec 17 22:19:08 2012
@@ -12,7 +12,7 @@ our @patterns = (
        [qr!\-passthru.html$!, passthru],
        [qr!\.mdtext$!, single_narrative => { template => 
"single_narrative.html" }],
        [qr!\.html$!, html_page => { template => "html_page.html" }],
-       [qr!\.htm$!, html_page => { template => "html_page.html" }],
+       [qr!\.htm$!, htm_page => { template => "html_page.html" }],
 ) ;
 
 # for specifying interdependencies between the files

Modified: openoffice/ooo-site/trunk/lib/view.pm
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/lib/view.pm?rev=1423191&r1=1423190&r2=1423191&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/lib/view.pm (original)
+++ openoffice/ooo-site/trunk/lib/view.pm Mon Dec 17 22:19:08 2012
@@ -101,6 +101,12 @@ sub html_page {
     return Template($template)->render(\%args), html => \%args;
 }
 
+sub htm_page {
+ my (@r) = html_page @_;
+ $r[1] = 'htm' if $r[1] eq 'html';
+ @r
+}
+
 sub sitemap {
     my %args = @_;
     my $template = "content$args{path}";