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

islandora.module

@@ -351,6 +351,12 @@ function islandora_get_types() {
   return module_invoke_all('islandora_get_types');
 }
 
+function islandora_init() {
+  if (path_is_admin(current_path())) {
+    drupal_add_css(drupal_get_path('module', 'islandora') . '/css/islandora.admin.css');
+  }
+}
+
 /**
  * a function to call other modules edit page.  If there are not any modules
  * that handle this function this module will build a default page.

islandora_basic_collection/islandora_basic_collection.module

@@ -61,22 +61,28 @@ function islandora_basic_collection_menu() {
   return $items;
 }
 
+function islandora_basic_collection_init() {
+  if (path_is_admin(current_path())) {
+    drupal_add_css(drupal_get_path('module', 'islandora_basic_collection') . '/css/islandora_basic_collection.admin.css');
+  }
+}
+
 /**
  * Implements hook_menu_local_tasks_alter().
  */
 function islandora_basic_collection_menu_local_tasks_alter(&$data, $router_item, $root_path) {
-    // Add action link 
-    if ($root_path == 'islandora/object/%/manage/collection') {
-      $object_id = $router_item['page_arguments'][0];
-      $item = menu_get_item("islandora/ingest/$object_id");
-      $item['title'] = 'Add a repository item';
-      if ($item['access']) {
-        $data['actions']['output'][] = array(
-          '#theme' => 'menu_local_action',
-          '#link' => $item,
-        );
-      }
+  // Add action link 
+  if ($root_path == 'islandora/object/%/manage/collection') {
+    $object_id = $router_item['page_arguments'][0];
+    $item = menu_get_item("islandora/ingest/$object_id");
+    $item['title'] = 'Add a repository item';
+    if ($item['access']) {
+      $data['actions']['output'][] = array(
+        '#theme' => 'menu_local_action',
+        '#link' => $item,
+      );
     }
+  }
 }
 
 /**

islandora_basic_image/islandora_basic_image.module

@@ -132,6 +132,12 @@ function islandora_basic_image_access($object_id) {
   return FALSE;
 }
 
+function islandora_basic_image_init() {
+  if (path_is_admin(current_path())) {
+    drupal_add_css(drupal_get_path('module', 'islandora_basic_image') . '/css/islandora_basic_image.admin.css');
+  }
+}
+
 /**
  * Theme registry function
  * We supply a pattern so we can overide templates at the theme level if needed.