Chris/webperl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support for commonpath in process_template.

Browse Source
This commit is contained in:
Chris 2012-06-26 11:00:44 +01:00
parent 20f20d1f57
commit 29a6507917
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Template.pm
View File

@ -111,6 +111,9 @@
# - `{V_[templatepath]}` is replaced by the path from the base of the web # - `{V_[templatepath]}` is replaced by the path from the base of the web
# application to the template directory (useful for image and other resource # application to the template directory (useful for image and other resource
# paths inside the template). This will always have a trailing '/'. # paths inside the template). This will always have a trailing '/'.
# - `{V_[commonpath]}` is replaced by the path from the base of the web
# application to the common template directory (useful for image and other resource
# paths inside the common template). This will always have a trailing '/'.
package Template; package Template;
use POSIX qw(strftime); use POSIX qw(strftime);
@ -397,6 +400,14 @@ sub set_template_dir {
# work out the current template path # work out the current template path
$self -> {"templatepath"} = path_join($self -> {"scriptpath"}, $self -> {"basedir"}, $self -> {"theme"}); $self -> {"templatepath"} = path_join($self -> {"scriptpath"}, $self -> {"basedir"}, $self -> {"theme"});
$self -> {"templatepath"} .= "/" unless($self -> {"templatepath"} =~ m|/$|); # templatepath must have trailing slash $self -> {"templatepath"} .= "/" unless($self -> {"templatepath"} =~ m|/$|); # templatepath must have trailing slash
# And the common path, if possible
if($self -> {"fallback"}) {
$self -> {"commonpath"} = path_join($self -> {"scriptpath"}, $self -> {"basedir"}, $self -> {"fallback"});
$self -> {"commonpath"} .= "/" unless($self -> {"templatepath"} =~ m|/$|); # templatepath must have trailing slash
} else {
$self -> {"commonpath"} = $self -> {"templatepath"};
}
} }
@ -535,6 +546,7 @@ sub process_template {
# Fix 'standard' variables # Fix 'standard' variables
$$textref =~ s/{V_\[scriptpath\]}/$self->{scriptpath}/g; $$textref =~ s/{V_\[scriptpath\]}/$self->{scriptpath}/g;
$$textref =~ s/{V_\[templatepath\]}/$self->{templatepath}/g; $$textref =~ s/{V_\[templatepath\]}/$self->{templatepath}/g;
$$textref =~ s/{V_\[commonpath\]}/$self->{commonpath}/g;
# Do any module marker replacements if we can # Do any module marker replacements if we can
if($self -> {"modules"}) { if($self -> {"modules"}) {