From 430febedb8889e495350d7af999bc735246a12b1 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Aug 2013 18:19:25 +0000 Subject: [PATCH 1/3] Fixed links not working if Drupal is in a subfolder (e.g.: multi-site). --- js/add_print.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/add_print.js b/js/add_print.js index 7af5c3ca..0059ed88 100644 --- a/js/add_print.js +++ b/js/add_print.js @@ -8,11 +8,11 @@ */ (function ($) { $(document).ready(function() { - $('.tabs .primary').append(''); + $('.tabs .primary').append(''); $('#print_btn').css("cursor","pointer"); $('#print_btn').click(function() { - window.location=Drupal.settings.islandora.print_link; + window.location=Drupal.settings.basePath + Drupal.settings.islandora.print_link; }); }); -})(jQuery); - +})(jQuery); + From 9a985d1d0208272bc8d36f137a26404d36096441 Mon Sep 17 00:00:00 2001 From: Christian Selig Date: Wed, 14 Aug 2013 20:11:41 +0000 Subject: [PATCH 2/3] Removed prefixed slashes that caused links to break. --- islandora.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/islandora.module b/islandora.module index 7d2c0acb..11595b67 100644 --- a/islandora.module +++ b/islandora.module @@ -796,13 +796,13 @@ function islandora_view_object(AbstractObject $object) { $path = drupal_get_path('module', 'islandora'); drupal_add_js(array( 'islandora' => array( - 'print_img' => $path . '/images/print-icon.png'), + 'print_img' => $path . 'images/print-icon.png'), ), array( 'type' => 'setting')); drupal_add_js(array( 'islandora' => array( - 'print_link' => '/islandora/object/' . $object->id . '/print')), + 'print_link' => 'islandora/object/' . $object->id . '/print')), array('type' => 'setting')); drupal_add_js($path . '/js/add_print.js'); From 2dac96d31211274dda3832289aad2f4d3bf93f83 Mon Sep 17 00:00:00 2001 From: Christian Selig Date: Thu, 15 Aug 2013 13:47:11 +0000 Subject: [PATCH 3/3] Fixed link to print image not being formed correctly. --- islandora.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/islandora.module b/islandora.module index 11595b67..36c43313 100644 --- a/islandora.module +++ b/islandora.module @@ -796,7 +796,7 @@ function islandora_view_object(AbstractObject $object) { $path = drupal_get_path('module', 'islandora'); drupal_add_js(array( 'islandora' => array( - 'print_img' => $path . 'images/print-icon.png'), + 'print_img' => $path . '/images/print-icon.png'), ), array( 'type' => 'setting'));