diff --git a/islandora-object.tpl.php b/islandora-object.tpl.php index 614d72b1..4a50d07f 100644 --- a/islandora-object.tpl.php +++ b/islandora-object.tpl.php @@ -75,30 +75,7 @@ * */ -//dsm($object); drupal_set_title($islandora_object->label); -// $dublin_core = $variables['islandora_dublin_core']; -// print($islandora_object->label . ' ' . $islandora_object->id); -// print ('

datastreams

'); -// foreach ($islandora_object as $ds) { -// print $ds->label . '
'; -// //do something -// } -// print('

Dublin Core

'); - -// foreach ($dublin_core as $element) { -// if (!empty($element)) { -// // print($element); -// foreach ($element as $key => $value) { -// foreach($value as $v){ -// if(!empty($v)){ -// print ''.($key).': ';print($v).'
'; -// } -// } -// } -// } -// } - ?>

Details

@@ -120,6 +97,12 @@ drupal_set_title($islandora_object->label); +
Collections
+
+ $value): ?> +
+ +
- diff --git a/islandora.module b/islandora.module index 7d029a27..df7644ef 100644 --- a/islandora.module +++ b/islandora.module @@ -600,16 +600,18 @@ function islandora_preprocess_islandora_default(&$variables) { module_load_include('inc', 'islandora', 'includes/islandora_dublin_core'); module_load_include('inc', 'islandora', 'includes/utilities'); - $variables['parent_collections'] = array(); + $parent_collections = array(); $collections = $islandora_object->relationships->get(FEDORA_RELS_EXT_URI, 'isMemberOfCollection'); foreach($collections as $collection) { $pid = $collection['object']['value']; $object = $repository->getObject($collection['object']['value']); - $variables['parent_collections'][$pid] = array(); - $variables['parent_collections'][$pid]['object'] = $object; - $variables['parent_collections'][$pid]['label'] = $object->label; - $variables['parent_collections'][$pid]['url'] = url('islandora/object/' . $object->id); + $parent_collections[$pid] = array(); + $parent_collections[$pid]['object'] = $object; + $parent_collections[$pid]['url'] = 'islandora/object/' . $object->id; + $parent_collections[$pid]['label'] = $object->label; + $parent_collections[$pid]['label_link'] = l($parent_collections[$pid]['label'], $parent_collections[$pid]['url']); } + $variables['parent_collections'] = $parent_collections; $datastreams = array(); foreach ($islandora_object as $ds) { $pid = $islandora_object->id; diff --git a/islandora_basic_image/css/islandora_basic_image.theme.css b/islandora_basic_image/css/islandora_basic_image.theme.css index e7b31c4d..93a8db89 100644 --- a/islandora_basic_image/css/islandora_basic_image.theme.css +++ b/islandora_basic_image/css/islandora_basic_image.theme.css @@ -56,6 +56,7 @@ body.two-sidebars .islandora-basic-image-sidebar { width: 60%; padding: 0 20px 0 0; float: left; /* LTR */ + margin-top: 1em; } body.no-sidebars .islandora-basic-image-sidebar { diff --git a/islandora_basic_image/islandora-basic-image.tpl.php b/islandora_basic_image/islandora-basic-image.tpl.php index a1a61da5..44228a7c 100644 --- a/islandora_basic_image/islandora-basic-image.tpl.php +++ b/islandora_basic_image/islandora-basic-image.tpl.php @@ -31,6 +31,14 @@

+
+

In Collections

+ +