diff --git a/css/islandora.theme.css b/css/islandora.theme.css index 764ed690..ad0ae79d 100644 --- a/css/islandora.theme.css +++ b/css/islandora.theme.css @@ -5,4 +5,78 @@ Purpose of the stylesheet follows. */ +/* + * Thumbnails float optionally to the left or right of descriptive lists. + */ +.islandora-object-thumb img { + max-width: 100%; + *width: 100%; +} + +dl.islandora-object-thumb { + float: left; + width: 15%; + margin: 0.75em auto; +} + +.islandora-object-thumb dt, +.islandora-object-thumb dd { + margin: 0; +} + +/* + * These rules will display DTs/DDs as columns. + * Constructs must follow a key/value pair pattern. + * The three last declarations are meant to kill white space between DTs/DDs + * (result of inline-block styling) + */ +dl.islandora-object-fields { + float: right; + width:83%; + margin: 0.75em auto; + letter-spacing:-0.34em; + *letter-spacing:normal; + word-spacing:-0.44em; + border-top:3px solid #ddd; +} + +/* + * The width + left/right padding of DTs/DDs equals 88% when compensating for an image + */ +.islandora-object-fields dt { + margin-right:-1px; + width:22.5%; + font-weight: bold; +} + +.islandora-object-fields dd { + width:67%; +} + +/* + * In this rule, we reset the white-space (see hack above) + */ +.islandora-object-fields dt, +.islandora-object-fields dd { + display:inline-block; + *display:inline; + zoom:1; + letter-spacing:normal; + word-spacing:normal; + vertical-align:top; + padding:6px 2% 4px; + margin:0; + border-top:1px solid #ddd; + -ms-word-break: break-all; + word-break: break-all; + word-break: break-word; /* webkit */ +-webkit-hyphens: auto; + -moz-hyphens: auto; + hyphens: auto; +} + +.islandora-object-fields dt.first, +.islandora-object-fields dd.first { + border-top: 0; +} \ No newline at end of file diff --git a/islandora-object.tpl.php b/islandora-object.tpl.php index a89a755d..ca7a67ed 100644 --- a/islandora-object.tpl.php +++ b/islandora-object.tpl.php @@ -46,29 +46,48 @@ //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

'); +// $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).'
'; - } - } - } - } -} -if(isset($variables['islandora_thumbnail_url'])){ - print(''); -} -?> +// 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

+
+
+ + '); ?>
+ +
+
+
+ + $value): ?> +
+ +
+
+ +
+ + +
+
diff --git a/islandora.module b/islandora.module index 01f92abe..d94212af 100644 --- a/islandora.module +++ b/islandora.module @@ -579,6 +579,7 @@ function islandora_preprocess_islandora_default(&$variables) { } catch (Exception $e) { drupal_set_message(t('Error retrieving object %s %t', array('%s' => $islandora_object->id, '%t' => $e->getMessage())), 'error'); } + $variables['dc_array'] = $dc_object->as_formatted_array(); $variables['islandora_dublin_core'] = $dc_object; $variables['islandora_object_label'] = $islandora_object->label; global $base_url; diff --git a/islandora_basic_collection/css/islandora_basic_collection.theme.css b/islandora_basic_collection/css/islandora_basic_collection.theme.css index f7f2b6a0..e00d319c 100644 --- a/islandora_basic_collection/css/islandora_basic_collection.theme.css +++ b/islandora_basic_collection/css/islandora_basic_collection.theme.css @@ -5,32 +5,36 @@ Purpose of the stylesheet follows. */ -/* islandora-basic-collection STYLES*/ - .islandora-basic-collection { - margin: 2% auto; - overflow: hidden; - width: 96%; + margin: 1.5em auto; + overflow: hidden; + width: 96%; } dl.islandora-basic-collection-object { - float: left; - margin: 2% 2% 50px; - width: 20%; - height: 180px; + width: 20%; + min-width: 100px; + min-height: 180px; + display: -moz-inline-stack; + display: inline-block; + vertical-align: top; + margin: 1.5em 2%; + zoom: 1; + *display: inline; + _height: 180px; } .islandora-basic-collection-object dt img { - max-width: 100%; - *width: 100%; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + max-width: 100%; + *width: 100%; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } .islandora-basic-collection-object dd { - margin: 0; - padding: 0; -} \ No newline at end of file + margin: 0; + padding: 0; +} diff --git a/islandora_basic_collection/islandora-basic-collection.tpl.php b/islandora_basic_collection/islandora-basic-collection.tpl.php index 07f2a73d..da5de757 100644 --- a/islandora_basic_collection/islandora-basic-collection.tpl.php +++ b/islandora_basic_collection/islandora-basic-collection.tpl.php @@ -22,11 +22,14 @@ */ ?> label); ?> + +
$value): ?> -
-
-
+
+
+
+
\ No newline at end of file diff --git a/islandora_basic_image/islandora-basic-image--islandora-27.tpl.php b/islandora_basic_image/islandora-basic-image--islandora-27.tpl.php deleted file mode 100644 index 1ea742c9..00000000 --- a/islandora_basic_image/islandora-basic-image--islandora-27.tpl.php +++ /dev/null @@ -1,52 +0,0 @@ -. - */ -?> - - -
-
- -
-
-

-

-

-
-
-

Details

-
- - $value): ?> -
- -
- - - -
- -
- - -
-
-
diff --git a/islandora_basic_image/islandora_basic_image.module b/islandora_basic_image/islandora_basic_image.module index 0ad069e4..d889da88 100644 --- a/islandora_basic_image/islandora_basic_image.module +++ b/islandora_basic_image/islandora_basic_image.module @@ -77,7 +77,7 @@ function islandora_basic_image_menu() { * @param string $object_id * @return string */ -/** +/* function islandora_basic_image_manage_object($object_id){ return 'Image CModel edit function '.$object_id; }*/