From 6c42842cb464afccc497caf98bba09587981deaa Mon Sep 17 00:00:00 2001 From: Christian Walde Date: Sat, 31 Jul 2010 18:09:18 +0200 Subject: [PATCH] mass tagger now loads the correct base directories for its static components --- contrib/mass_tagger/mass_tagger.js | 14 +++++++++----- contrib/mass_tagger/theme.php | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/contrib/mass_tagger/mass_tagger.js b/contrib/mass_tagger/mass_tagger.js index 2461fa8b..e13d6a4b 100644 --- a/contrib/mass_tagger/mass_tagger.js +++ b/contrib/mass_tagger/mass_tagger.js @@ -23,20 +23,24 @@ function remove_mass_tag_id( button, list, id, string ) { return false; } -function activate_mass_tagger () { +function activate_mass_tagger ( image_link ) { - $('.thumbblock').each(add_mass_tag_button); + $('.thumbblock').each( + function ( index, block ) { + add_mass_tag_button( block, image_link ); + } + ); $('#mass_tagger_controls').attr( 'style', 'display:block' ); $('#mass_tagger_activate').attr( 'style', 'display:none' ); return false; } -function add_mass_tag_button ( index, block ) { +function add_mass_tag_button ( block, image_link ) { var id = get_image_id( block ); - var button = create_mass_tag_button( id ); + var button = create_mass_tag_button( id, image_link ); $(block).append( button ); return; @@ -51,7 +55,7 @@ function get_image_id ( block ) { function create_mass_tag_button ( id ) { var img = $(''); - img.attr("src",'/ext/mass_tagger/toggle.gif'); + img.attr( "src", image_link+'/ext/mass_tagger/toggle.gif' ); var link = $(''); link.attr("class",'zoom'); diff --git a/contrib/mass_tagger/theme.php b/contrib/mass_tagger/theme.php index 3d28f344..ff74d6c8 100644 --- a/contrib/mass_tagger/theme.php +++ b/contrib/mass_tagger/theme.php @@ -5,12 +5,12 @@ class MassTaggerTheme extends Themelet { * Show $text on the $page */ public function display_mass_tagger( Page $page, Event $event, $config ) { - $base_href = $config->get_string('base_href'); - $page->add_header(""); - $page->add_header(""); + $data_href = get_base_href(); + $page->add_header(""); + $page->add_header(""); $body = "
- +
Click on images to mark them. Use the 'Index Options' in the Board Config to increase the amount of shown images.