Gallery2: HighSlide uses its own navigation images

In the long term, it is easier than parasiting on other themes.

diff --git a/gal/Makefile b/gal/Makefile
index 48813468a76acf9e2bddeacb04e92ce07e48feea..fcab4134318bc1ac027cef4e83aa2fc75e6d4f14 100644 (file)
--- a/gal/Makefile
+++ b/gal/Makefile
@@ -6,6 +6,7 @@ $(call lib-copy, $(addprefix UCW/Gallery/Web/, Plain.pm NrtBlue.pm HighSlide.pm)
 
 $(call copy, $(addprefix nrt-blue/,back.png bot.png left.png next.png prev.png right.png top.png style.css))
 $(call copy, $(addprefix plain/,back.png next.png prev.png style.css))
+$(call copy, $(addprefix highslide/nav/,back.png next.png prev.png))
 
 $(call copy, $(addprefix highslide/, highslide.css highslide-ie6.css highslide-with-gallery.js custom.css custom.js))
 $(call copy, $(addprefix highslide/graphics/, \

diff --git a/gal/UCW/Gallery/Web/HighSlide.pm b/gal/UCW/Gallery/Web/HighSlide.pm
index b3df6e6eaeae445f41373d26aa5c00f798008150..a1cffec59f41be05894722bcb515f9bf3686eb32 100644 (file)
--- a/gal/UCW/Gallery/Web/HighSlide.pm
+++ b/gal/UCW/Gallery/Web/HighSlide.pm
@@ -11,13 +11,6 @@ use UCW::Gallery::Web;
 
 our @ISA = qw(UCW::Gallery::Web);
 
-my $theme_name = "plain";
-
-sub theme_dir($) {
-       my ($self) = @_;
-       return $self->get('ThemeUrlPrefix') . $theme_name;
-}
-
 sub theme_head_extras($) {
        my ($self) = @_;
        my $hsdir = $self->get('ThemeUrlPrefix') . "highslide";
@@ -37,11 +30,11 @@ AMEN
 
 sub show_links($$$$) {
        my ($self, $prev, $up, $next) = @_;
-       my $theme = $self->theme_dir;
+       my $nav = $self->get('ThemeUrlPrefix') . "highslide/nav";
        print "<p class=parent>";
-       print "<a href='$prev'><img class=back prev src='$theme/prev.png'></a>" if $prev ne "";
-       printf "<a href='$next'><img class=fwd src='$theme/next.png'></a>" if $next ne "";
-       printf "<a href='$up'><img class=up src='$theme/back.png'></a>" if $up ne "";
+       print "<a href='$prev'><img class=back prev src='$nav/prev.png'></a>" if $prev ne "";
+       printf "<a href='$next'><img class=fwd src='$nav/next.png'></a>" if $next ne "";
+       printf "<a href='$up'><img class=up src='$nav/back.png'></a>" if $up ne "";
 }
 
 sub show_pre_thumbs($) {

diff --git a/gal/highslide/nav/back.png b/gal/highslide/nav/back.png
new file mode 100644 (file)
index 0000000..501909c
Binary files /dev/null and b/gal/highslide/nav/back.png differ

diff --git a/gal/highslide/nav/next.png b/gal/highslide/nav/next.png
new file mode 100644 (file)
index 0000000..bdd1011
Binary files /dev/null and b/gal/highslide/nav/next.png differ

diff --git a/gal/highslide/nav/prev.png b/gal/highslide/nav/prev.png
new file mode 100644 (file)
index 0000000..68b2514
Binary files /dev/null and b/gal/highslide/nav/prev.png differ