Merge branch '7.x' of github.com:Islandora/islandora into 7.x

13 years ago · aa6682cacc
9 changed files with 154 additions and 141 deletions
--- a/islandora_basic_collection/css/islandora_basic_collection.base.css
+++ b/islandora_basic_collection/css/islandora_basic_collection.base.css
@ -1,8 +1,51 @@
 /* 
    Document   : islandora_basic_collection.base.css
    Created on : May 23, 2012, 11:22:04 AM
-    Description:
-        Purpose of the stylesheet follows.
+    Description: Base css, for structural layout, 
+    positioning, and to generally make things function in
+    the most basic form. 
 */

+/* List - Displays lists using a dt on the left and dd on the right */

+.islandora-basic-collection-list-item {
+  clear: both;
+  width: 100%;
+}
+
+.islandora-basic-collection-list-item dl dt {
+  clear: left;
+  float: left;
+  padding: 3px 0 0;
+  text-align: center;
+  width: 100px;
+}
+
+.islandora-basic-collection-list-item dl dd {
+  margin: 0 0 0 130px;
+}
+
+/* Grid - Displays grid using dl formatted inline */
+.islandora-basic-collection-grid dl
+{
+  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-grid dd
+{
+  margin: 0;
+  padding: 0;
+}
+
+.islandora-basic-collection-display-switch {
+  float: right;
+}
--- a/islandora_basic_collection/css/islandora_basic_collection.theme.css
+++ b/islandora_basic_collection/css/islandora_basic_collection.theme.css
@ -1,86 +1,46 @@
 /* 
    Document   : islandora_basic_collection.theme
    Created on : May 23, 2012, 11:23:56 AM
-    Description:
-        Purpose of the stylesheet follows.
+    Description: Theme css, like margins, padding, borders, colors, etc
 */

+/* Make flexible and assure content doesn't go off the page */
 .islandora-basic-collection {
  overflow: hidden;
  width: 100%;
  margin: 0 auto;
 }

-.islandora-basic-collection-object {
-  margin: 1.5em auto 3em;
-}
-
-.islandora-basic-collection-grid dl.islandora-basic-collection-object
-{
-  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-grid .islandora-basic-collection-object dt img {
-  max-width: 100%;
-  *width: 100%;
+/* Round borders on images */
+.islandora-basic-collection-object dt img {
  -webkit-border-radius: 5px;
  -moz-border-radius: 5px;
  border-radius: 5px;
 }

-.islandora-basic-collection-grid .islandora-basic-collection-object dd
-{
-  margin: 0;
-  padding: 0;
+/* Set space between objects */
+.islandora-basic-collection-object {
+  margin: 1.5em auto;
 }

-/* to be moved to admin when it is added */
-#islandora-collection-deletion-form table th.select-all,
-#islandora-collection-migrate-form table th.select-all {
-  width: 20px;
+/* Set space between dd items */
+.islandora-basic-collection-object dd {
+  padding-top: 2px;
+  padding-bottom: 2px;
 }

-/* the base css for lists is set in islandora, just adding details */
-
-dl.islandora-basic-collection-thumb
-{
-  float: left;
-  width: 15%;
-  margin: 0;
-}
+/* LIST VIEW */

-.islandora-basic-collection-thumb dt,
-.islandora-basic-collection-thumb dd
-{
-  margin: 0;
+/* Borders to seperate collection objects */
+.islandora-basic-collection-list-item {
+  padding-bottom: 1.5em;
+  border-bottom: 1px solid #ddd;
 }

-dl.islandora-basic-collection-fields
-{
-  float: right;
-  width: 83%;
-  border-top: 0px solid #ddd;
-  padding-left: 10px;
-} 
-
-.islandora-basic-collection-fields dt,
-.islandora-basic-collection-fields dd
-{
-  border-top: 1px solid #ddd;
-}

-.islandora-basic-collection-fields dt.first,
-.islandora-basic-collection-fields dd.first
-{
-  border-top: 1px solid #ddd;
+/* to be moved to admin when it is added */
+#islandora-collection-deletion-form table th.select-all,
+#islandora-collection-migrate-form table th.select-all {
+  width: 20px;
 }

--- a/islandora_basic_collection/includes/delete_collection.inc
+++ b/islandora_basic_collection/includes/delete_collection.inc
@ -21,7 +21,7 @@ function islandora_collection_deletion_form($form, &$form_state, $object) {
  $submit_text_message = ($table) ? "Delete selected objects" : "Delete collection";

  $form = array();
-  
+
  $form['collection_delete']['titlebox'] = array(
    '#type' => 'item',
    '#title' => t("Delete objects from @collection_pid", array('@collection_pid' => $pid)),
@ -113,7 +113,7 @@ function islandora_collection_deletion_form_submit($form, &$form_state) {
 * @param string $pid
 */
 function delete_root_collection($object) {
-
+  $pid = $object->id;
  try {
    $object->repository->purgeObject($object->id);
  } catch (RepositoryException $e) {
--- a/islandora_basic_collection/includes/manage_policies.inc
+++ b/islandora_basic_collection/includes/manage_policies.inc
@ -27,8 +27,9 @@ function islandora_manage_policies_form($form, &$form_state, $collection_object)
        $item = $repository->getObject($content_model);
        $cm_name = $item->Label;
        $cm_options[$content_model] = $cm_name;
+      } catch (RepositoryException $e) {
+        
      }
-      catch(RepositoryException $e) {}
    }
  }

@ -71,36 +72,43 @@ function islandora_manage_policies_form($form, &$form_state, $collection_object)
    '#title' => t("Manage collection policy for @collection_title", array('@collection_title' => $collection_object->label)),
  );

-  $form ['manage_collection_policy']['add']['content_model_to_add'] = array(
-    '#title' => "Choose content model",
-    '#type' => 'select',
-    '#options' => $new_options,
-    '#description' => t("Choose content model to add to this collection policy."),
-  );
+  if (count($new_content_models) > 0) {
+    $form ['manage_collection_policy']['add']['content_model_to_add'] = array(
+      '#title' => "Choose content model",
+      '#type' => 'select',
+      '#options' => $new_options,
+      '#description' => t("Choose content model to add to this collection policy."),
+    );

-  $form ['manage_collection_policy']['add']['new_cp_namespace'] = array(
-    '#title' => "Choose namespace",
-    '#type' => 'textfield',
-    '#size' => 15,
-    '#default_value' => $namespace,
-    '#description' => t("Choose namespace for objects in this collection associated with this content model"),
-  );
+    $form['manage_collection_policy']['add']['new_cp_namespace'] = array(
+      '#title' => "Choose namespace",
+      '#type' => 'textfield',
+      '#size' => 15,
+      '#default_value' => $namespace,
+      '#description' => t("Choose namespace for objects in this collection associated with this content model"),
+    );

-  $form['parent_collection'] = array(
-    '#type' => 'hidden',
-    '#value' => $collection_object->id,
-  );
+    $form['parent_collection'] = array(
+      '#type' => 'hidden',
+      '#value' => $collection_object->id,
+    );

-  $form['collection_pid'] = array(
-    '#type' => 'hidden',
-    '#value' => $collection_object->id,
-  );
+    $form['collection_pid'] = array(
+      '#type' => 'hidden',
+      '#value' => $collection_object->id,
+    );

-  $form['manage_collection_policy']['add']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Add content model to collection policy'),
-    '#id' => 'add_cm'
-  );
+    $form['manage_collection_policy']['add']['submit'] = array(
+      '#type' => 'submit',
+      '#value' => t('Add content model to collection policy'),
+      '#id' => 'add_cm'
+    );
+  }
+  else {
+    $form['manage_collection_policy']['no_content_models'] = array(
+      '#markup' => t('No content models available to add!'),
+    );
+  }

  if (count($current_models_in_policy) > 0) {
    $form['manage_collection_policy']['remove'] = array(
@ -140,7 +148,7 @@ function islandora_manage_policies_form_submit($form, &$form_state) {
  module_load_include('module', 'islandora', 'islandora');
  $collection_pid = $form_state['values']['parent_collection'];
  $collection_object = islandora_object_load($collection_pid);
-  
+
  $policy = $collection_object->getDatastream(variable_get('Islandora_Collection_Policy_DSID', 'COLLECTION_POLICY'));
  $collection_policy = '<?xml version="1.0" encoding="UTF-8"?>
 <collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
--- a/islandora_basic_collection/theme/islandora-basic-collection-grid.tpl.php
+++ b/islandora_basic_collection/theme/islandora-basic-collection-grid.tpl.php
@ -23,7 +23,7 @@
 ?>


-<div class="islandora-basic-collection-wrapper">
+<div class="islandora islandora-basic-collection">
  <div class="islandora-basic-collection-grid clearfix">
  <?php foreach($associated_objects_array as $key => $value): ?>
    <dl class="islandora-basic-collection-object <?php print $value['class']; ?>">
--- a/islandora_basic_collection/theme/islandora-basic-collection-wrapper.tpl.php
+++ b/islandora_basic_collection/theme/islandora-basic-collection-wrapper.tpl.php
@ -24,10 +24,10 @@
 <?php drupal_set_title($islandora_object->label); ?>

 <div class="islandora-basic-collection-wrapper">
-<div class="islandora-basic-collection clearfix">
-  <?php print ($switch_view_link) ?>
-  <?php print($collection_pager); ?>
-  <?php print ($collection_content); ?>
-  <?php print($collection_pager); ?>
-</div>
+  <div class="islandora-basic-collection clearfix">
+    <span class="islandora-basic-collection-display-switch"><?php print $switch_view_link; ?></span>
+    <?php print $collection_pager; ?>
+    <?php print $collection_content; ?>
+    <?php print $collection_pager; ?>
+  </div>
 </div>
--- a/islandora_basic_collection/theme/islandora-basic-collection.tpl.php
+++ b/islandora_basic_collection/theme/islandora-basic-collection.tpl.php
@ -23,31 +23,24 @@
 ?>
 <?php drupal_set_title($islandora_object->label); ?>

-<div class="islandora islandora-basic-collection-wrapper">
+<div class="islandora islandora-basic-collection">
    <?php $row_field = 0; ?>
    <?php foreach($associated_objects_array as $associated_object): ?>
-      <div class="islandora-basic-collection-object clearfix"> 
-        <dl class="islandora-basic-collection-thumb <?php print $associated_object['class']; ?>">
-            <dt><?php print $associated_object['thumb_link']; ?></dt>
-            <dd></dd>
-        </dl>
-        <dl class="islandora-inline-metadata islandora-basic-collection-fields">
-          <dt class="collection-label <?php print $associated_object['dc_array']['dc:title']['class']; ?> <?php print $row_field == 0 ? ' first' : ''; ?>">
-            <?php print $associated_object['dc_array']['dc:title']['label']; ?>
-          </dt>
-          <dd class="collection-value <?php print $associated_object['dc_array']['dc:title']['class']; ?> <?php print $row_field == 0 ? ' first' : ''; ?>">
-            <?php print $associated_object['title_link']; ?>
-          </dd>
-          <?php if ($associated_object['dc_array']['dc:description']['value']): ?>
-            <dt class="collection-label <?php print $associated_object['dc_array']['dc:description']['class']; ?>">
-              <?php print $associated_object['dc_array']['dc:description']['label']; ?>
+      <div class="islandora-basic-collection-object islandora-basic-collection-list-item clearfix"> 
+        <dl class="<?php print $associated_object['class']; ?>">
+            <dt>
+              <?php print $associated_object['thumb_link']; ?>
            </dt>
-            <dd class="collection-value <?php print $associated_object['dc_array']['dc:description']['class']; ?>">
-              <?php print $associated_object['dc_array']['dc:description']['value']; ?>
+            <dd class="collection-value <?php print $associated_object['dc_array']['dc:title']['class']; ?> <?php print $row_field == 0 ? ' first' : ''; ?>">
+              <strong><?php print $associated_object['title_link']; ?></strong>
            </dd>
-        <?php $row_field++; ?>
-        <?php endif; ?>
+            <?php if ($associated_object['dc_array']['dc:description']['value']): ?>
+              <dd class="collection-value <?php print $associated_object['dc_array']['dc:description']['class']; ?>">
+                <?php print $associated_object['dc_array']['dc:description']['value']; ?>
+              </dd>
+            <?php endif; ?>
        </dl>
      </div>
+    <?php $row_field++; ?>
    <?php endforeach; ?>
 </div>
--- a/islandora_basic_image/css/islandora_basic_image.theme.css
+++ b/islandora_basic_image/css/islandora_basic_image.theme.css
@ -1,14 +1,22 @@
 /* 
    Document   : islandora_basic_collection.theme
    Created on : May 23, 2012, 11:23:56 AM
-    Description:
-        Purpose of the stylesheet follows.
+    Description: The basic image page is a simple flexible layout page
+    that breaks down to two columns when 2 sidebars are visible
 */

-.islandora-basic-image-content,
-.islandora-basic-image-sidebar {
-  display: inline;
-  position: relative;
+.islandora-basic-image-content {
+  background-color: #F2F2F2;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding: 15px;
+}
+
+.islandora-basic-image-content img {
+  margin: 0;
+  display: block;
 }

 .islandora-basic-image-metadata {
@ -42,9 +50,6 @@ dl.islandora-basic-image-fields {
  border-top:0;
 }

-.islandora-basic-image-sidebar,
-.islandora-basic-image-sidebar,
-body.one-sidebar .islandora-basic-image-sidebar,
 body.two-sidebars .islandora-basic-image-sidebar {
    clear: both;
    width: 100%;
@ -53,15 +58,17 @@ body.two-sidebars .islandora-basic-image-sidebar {
@media all and (min-width: 768px) {

  body.no-sidebars .islandora-basic-image-content {
-    width: 60%;
-    padding: 0 20px 0 0;
+    width: 65%;
    float: left; /* LTR */
-    margin-top: 1em;
+  }
+
+  body.no-sidebars .islandora-basic-image-sidebar {
+    padding-left: 20px;
  }

  body.no-sidebars .islandora-basic-image-sidebar {
    float: right; /* LTR */
-    width: 40%;
+    width: 35%;
    clear: none;
  }
  
--- a/islandora_basic_image/islandora-basic-image.tpl.php
+++ b/islandora_basic_image/islandora-basic-image.tpl.php
@ -26,22 +26,24 @@
 <?php endif; ?>

 <div class="islandora-basic-image-object islandora">
-  <div class="islandora-basic-image-content clearfix">
-    <?php if(isset($islandora_full_url)): ?>
-      <?php print l($islandora_medium_img, $islandora_full_url, array('html' => TRUE)); ?>
+  <div class="islandora-basic-image-content-wrapper clearfix">
+    <?php if(isset($islandora_medium_img)): ?>
+      <div class="islandora-basic-image-content">
+      <?php if(isset($islandora_full_url)): ?>
+        <?php print l($islandora_medium_img, $islandora_full_url, array('html' => TRUE)); ?>
      <?php elseif(isset($islandora_medium_img)): ?>
        <?php print $islandora_medium_img; ?>
-      <?php else: ?>
+      <?php endif; ?>
+      </div>
    <?php endif; ?>
-  </div>
  <div class="islandora-basic-image-sidebar">
    <?php if($dc_array['dc:description']['value']): ?>
-      <h3><?php print $dc_array['dc:description']['label']; ?></h3>
+      <h2><?php print $dc_array['dc:description']['label']; ?></h2>
      <p><?php print $dc_array['dc:description']['value']; ?></p>
    <?php endif; ?>
-    <?php if(empty($parent_collections)): ?>
+    <?php if($parent_collections): ?>
      <div>
-        <h3>In Collections</h3>
+        <h2>In Collections</h2>
        <ul>
          <?php foreach($parent_collections as $key => $value): ?>
            <li><?php print $value['label_link'] ?></li>
@ -50,7 +52,7 @@
      </div>
    <?php endif; ?>
  </div>
-
+  </div>
  <fieldset class="collapsible collapsed islandora-basic-image-metadata">
  <legend><span class="fieldset-legend">Extended Details</span></legend>
    <div class="fieldset-wrapper">