Merge 2dac96d312 into 764b699cdc

islandora.module

@@ -802,7 +802,7 @@ function islandora_view_object(AbstractObject $object) {
 
   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');
 

js/add_print.js

@@ -8,11 +8,11 @@
 */
 (function ($) {
   $(document).ready(function() {
-    $('.tabs .primary').append('<img id="print_btn" title="Print" src="/' + Drupal.settings.islandora.print_img + '"></img>');
+    $('.tabs .primary').append('<img id="print_btn" title="Print" src="' + Drupal.settings.basePath + Drupal.settings.islandora.print_img + '"></img>');
     $('#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);
+