updated basic image display

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:
+    Description: The basic image page is a simple flexible layout page
-        Purpose of the stylesheet follows.
+    that breaks down to two columns when 2 sidebars are visible
 */
 
-.islandora-basic-image-content,
+.islandora-basic-image-content {
-.islandora-basic-image-sidebar {
+  background-color: #F2F2F2;
-  display: inline;
+  border: 1px solid #ddd;
-  position: relative;
+  -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%;
+    width: 65%;
-    padding: 0 20px 0 0;
     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;
   }
   

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">
+  <div class="islandora-basic-image-content-wrapper clearfix">
-    <?php if(isset($islandora_full_url)): ?>
+    <?php if(isset($islandora_medium_img)): ?>
-      <?php print l($islandora_medium_img, $islandora_full_url, array('html' => TRUE)); ?>
+      <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">