From 5863c4d29227d85b073d6ce0bc928a04fcc6639a Mon Sep 17 00:00:00 2001
From: krisbulman <KrisBulman@190735.no-reply.drupal.org>
Date: Fri, 1 Jun 2012 16:17:36 -0300
Subject: [PATCH] updated conditionals and changed grid list titles

---
 .../theme/islandora-basic-collection.tpl.php              | 5 +++--
 .../theme/islandora_basic_collection.theme.inc            | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/islandora_basic_collection/theme/islandora-basic-collection.tpl.php b/islandora_basic_collection/theme/islandora-basic-collection.tpl.php
index 3a651041..d6e33c63 100644
--- a/islandora_basic_collection/theme/islandora-basic-collection.tpl.php
+++ b/islandora_basic_collection/theme/islandora-basic-collection.tpl.php
@@ -21,8 +21,9 @@
  * along with the program.  If not, see <http ://www.gnu.org/licenses/>.
  */
 ?>
-<?php if (isset(drupal_set_title($islandora_object->label))): ?>
-  <?php drupal_set_title($islandora_object->label); ?>
+
+<?php if(isset($islandora_object_label)): ?>
+  <?php drupal_set_title("$islandora_object_label"); ?>
 <?php endif; ?>
 
 <div class="islandora islandora-basic-collection">
diff --git a/islandora_basic_collection/theme/islandora_basic_collection.theme.inc b/islandora_basic_collection/theme/islandora_basic_collection.theme.inc
index 56932fd4..775e9294 100644
--- a/islandora_basic_collection/theme/islandora_basic_collection.theme.inc
+++ b/islandora_basic_collection/theme/islandora_basic_collection.theme.inc
@@ -23,21 +23,21 @@ function islandora_basic_collection_preprocess_islandora_basic_collection_wrappe
   global $base_url;
   if ($display == 'grid') {
     $query_params['display'] = 'list';
-     $list_link = array('title' => 'List View', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => 'islandora-view-list'),
+     $list_link = array('title' => 'List view', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => 'islandora-view-list'),
     'query' => $query_params);
      unset($query_params['display']);
      $query_params['display'] = 'grid';
-    $grid_link = array('title' => 'Grid View', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => array('islandora-view-grid', 'active')),
+    $grid_link = array('title' => 'Grid view', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => array('islandora-view-grid', 'active')),
     'query' => $query_params);
     $collection_content = theme('islandora_basic_collection_grid', array('islandora_object' => $islandora_object, 'collection_results' => $results));
   }
   else {
     $query_params['display'] = 'list';
-    $list_link = array('title' => 'List View', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => array('islandora-view-list', 'active')),
+    $list_link = array('title' => 'List view', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => array('islandora-view-list', 'active')),
     'query' => $query_params);
     unset($query_params['display']);
     $query_params['display'] = 'grid';
-    $grid_link = array('title' => 'Grid View', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => 'islandora-view-grid'),
+    $grid_link = array('title' => 'Grid view', 'href' => $base_url . '/islandora/object/' . $islandora_object->id, 'attributes' => array('class' => 'islandora-view-grid'),
     'query' => $query_params);
     $collection_content = theme('islandora_basic_collection', array('islandora_object' => $islandora_object, 'collection_results' => $results));
   }