Layout: webpages_path jetzt im Layout

diff --git a/SL/Form.pm b/SL/Form.pm
index 630c0f290029816c901641efdb8038ff70374d4b..8d8f41768fb8ecd1e795d67c156d62f348683dd3 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -550,8 +550,10 @@ sub _prepare_html_template {
   }
   $language = "de" unless ($language);
 
   }
   $language = "de" unless ($language);
 

-  if (-f "templates/webpages/${file}.html") {
-    $file = "templates/webpages/${file}.html";
+  my $webpages_path = $::request->layout->webpages_path;
+
+  if (-f "${webpages_path}/${file}.html") {
+    $file = "${webpages_path}/${file}.html";

 
   } elsif (ref $file eq 'SCALAR') {
     # file is a scalarref, use inline mode
 
   } elsif (ref $file eq 'SCALAR') {
     # file is a scalarref, use inline mode

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index a1df9ebefc0b65f59f1374d2bec5592fa92858e1..c64a99ab06d3860e0969845e9a43c144aa59dec0 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -38,6 +38,10 @@ sub init_sublayouts_by_name {
   {}
 }
 
   {}
 }
 

+sub webpages_path {
+  "templates/webpages";
+}
+

 sub get {
   $_[0]->sub_layouts;
   return grep { $_ } ($_[0]->sub_layouts_by_name->{$_[1]});
 sub get {
   $_[0]->sub_layouts;
   return grep { $_ } ($_[0]->sub_layouts_by_name->{$_[1]});

diff --git a/SL/Presenter.pm b/SL/Presenter.pm
index b3191750c3e95eb8891ac7ed85e4a27c45af0569..44332bd91a666971e0ce3057039d62c6af61d7cd 100644 (file)
--- a/SL/Presenter.pm
+++ b/SL/Presenter.pm
@@ -45,8 +45,10 @@ sub render {
   # Look for the file given by $template if $template is not a reference.
   my $source;
   if (!ref $template) {
   # Look for the file given by $template if $template is not a reference.
   my $source;
   if (!ref $template) {

+    my $webpages_path = $::request->layout->webpages_path;
+

     my $ext = $options->{type} eq 'text' ? 'txt' : $options->{type};
     my $ext = $options->{type} eq 'text' ? 'txt' : $options->{type};

-    $source = "templates/webpages/${template}.${ext}";
+    $source = "${webpages_path}/${template}.${ext}";

     croak "Template file ${source} not found" unless -f $source;
 
   } elsif (ref($template) eq 'SCALAR') {
     croak "Template file ${source} not found" unless -f $source;
 
   } elsif (ref($template) eq 'SCALAR') {


@@ -96,6 +98,8 @@ sub render {
 sub get_template {
   my ($self) = @_;
 
 sub get_template {
   my ($self) = @_;
 

+  my $webpages_path = $::request->layout->webpages_path;
+

   # Make locales.pl parse generic/exception.html, too:
   # $::form->parse_html_template("generic/exception")
   $self->{template} ||=
   # Make locales.pl parse generic/exception.html, too:
   # $::form->parse_html_template("generic/exception")
   $self->{template} ||=


@@ -104,10 +108,10 @@ sub get_template {
                     ABSOLUTE     => 1,
                     CACHE_SIZE   => 0,
                     PLUGIN_BASE  => 'SL::Template::Plugin',
                     ABSOLUTE     => 1,
                     CACHE_SIZE   => 0,
                     PLUGIN_BASE  => 'SL::Template::Plugin',

-                    INCLUDE_PATH => '.:templates/webpages',
+                    INCLUDE_PATH => ".:$webpages_path",

                     COMPILE_EXT  => '.tcc',
                     COMPILE_DIR  => $::lx_office_conf{paths}->{userspath} . '/templates-cache',
                     COMPILE_EXT  => '.tcc',
                     COMPILE_DIR  => $::lx_office_conf{paths}->{userspath} . '/templates-cache',

-                    ERROR        => 'templates/webpages/generic/exception.html',
+                    ERROR        => "${webpages_path}/generic/exception.html",

                     ENCODING     => 'utf8',
                   }) || croak;
 
                     ENCODING     => 'utf8',
                   }) || croak;