Merge a5af26c3ce into 0fabd10b5c

includes/add_datastream.form.inc

@@ -43,7 +43,7 @@ function islandora_add_datastream_form(array $form, array &$form_state, Abstract
       '#collapsed' => FALSE,
       'dsid' => array(
         '#title' => 'Datastream ID',
-        '#description' => t("An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters, dashes and underscores. The following datastreams are defined by this content model but don't currently exist: <b>@unused_dsids</b>.", array('@unused_dsids' => $unused_datastreams)),
+        '#description' => t("An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters, dashes and underscores. The following datastreams are defined by this content model but don't currently exist: <strong>@unused_dsids</strong>.", array('@unused_dsids' => $unused_datastreams)),
         '#type' => 'textfield',
         '#size' => 64,
         '#maxlength' => 64,

includes/admin.form.inc

@@ -93,7 +93,7 @@ function islandora_repository_admin(array $form, array &$form_state) {
         'islandora_pids_allowed' => array(
           '#type' => 'textarea',
           '#title' => t('PID namespaces allowed in this Drupal install'),
-          '#description' => t('A list of PID namespaces, separated by spaces, that users are permitted to access from this Drupal installation. <br /> This could be more than a simple namespace, e.g. <b>demo:mydemos</b>. <br /> The namespace <b>islandora:</b> is reserved, and is always allowed.'),
+          '#description' => t('A list of PID namespaces, separated by spaces, that users are permitted to access from this Drupal installation. <br /> This could be more than a simple namespace, e.g. <strong>demo:mydemos</strong>. <br /> The namespace <strong>islandora:</strong> is reserved, and is always allowed.'),
           '#default_value' => variable_get('islandora_pids_allowed', 'default: demo: changeme: ilives: islandora-book: books: newspapers: '),
           '#states' => array(
             'invisible' => array(

includes/utilities.inc

@@ -86,16 +86,16 @@ function islandora_temp_file_entry($file_uri, $mime = NULL) {
 function islandora_control_group_to_human_readable($control_group) {
   switch ($control_group) {
     case 'M':
-      return '<b>M</b>anaged';
+      return '<strong>M</strong>anaged';
 
     case 'X':
-      return 'Inline <b>X</b>ML';
+      return 'Inline <strong>X</strong>ML';
 
     case 'R':
-      return '<b>R</b>edirect';
+      return '<strong>R</strong>edirect';
 
     case 'E':
-      return '<b>E</b>xternally Referenced';
+      return '<strong>E</strong>xternally Referenced';
 
     default:
       return $control_group;

islandora.api.php

@@ -245,7 +245,7 @@ function hook_cmodel_pid_islandora_object_ingested(AbstractObject $object) {
  * modifications, where as manipulating an object's datstreams are not.
  *
  * @param AbstractObject $object
- *   The object that was modified.
+ *   The object that was ingested.
  *
  * @todo We should also include what changes were made in a additional
  *   parameter.
@@ -254,7 +254,7 @@ function hook_islandora_object_modified(AbstractObject $object) {
 }
 
 /**
- * Notify modules that the given object was modified.
+ * Notify modules that the given object was ingested.
  *
  * @see hook_islandora_object_modified()
  */
@@ -361,22 +361,9 @@ function hook_cmodel_pid_islandora_datastream_purged(AbstractObject $object, $ds
  * @param AbstractObject $object
  *   The object to check.
  * @param string $dsid
- *   A string indicating the datastream for which to get the registry.
- *
- * @return array
- *   An array of associative arrays, each mapping:
- *   - name: A string containg a human-readable name for the entry.
- *   - url: A string containing the URL to which to the user will be routed.
+ *   todo
  */
 function hook_islandora_edit_datastream_registry($object, $dsid) {
-  $routes = array();
-
-  $routes[] = array(
-    'name' => t('My Awesome Edit Route'),
-    'url' => "go/edit/here/{$object->id}/{$dsid}",
-  );
-
-  return $routes;
 }
 
 /**
@@ -623,7 +610,12 @@ function hook_islandora_overview_object_alter(AbstractObject &$object, &$output)
  * Content model specific.
  */
 function hook_cmodel_pid_islandora_overview_object_alter(AbstractObject &$object, &$output) {
-  $output = $output . drupal_render(drupal_get_form('some_form', $object));
+  $view = views_embed_view('usage_collection');
+  $form['islandora_manage_overview_object'] = array(
+    '#type' => 'item',
+    '#markup' => $view,
+  );
+  $output = $output . $form . drupal_render(drupal_get_form('some_form', $object));
 }
 
 /**

islandora.module

@@ -1819,14 +1819,14 @@ function islandora_form_simpletest_test_form_alter(array &$form) {
   $filter_status = is_writable($filter_path);
   if ($filter_status) {
     $filter_status_message = theme_image(array('path' => 'misc/watchdog-ok.png', 'attributes' => array())) . " ";
-    $filter_status_message .= t("Drupal filter at <b>!filter_path</b> is writable by the server.", array(
-      '!filter_path' => $filter_path,
+    $filter_status_message .= t("Drupal filter at <strong>@filter_path</strong> is writable by the server.", array(
+      '@filter_path' => $filter_path,
     ));
   }
   else {
     $filter_status_message = theme_image(array('path' => 'misc/watchdog-error.png', 'attributes' => array())) . " ";
-    $filter_status_message .= t("Drupal filter at <b>!filter_path</b> is not writable by the server. Please make sure your webserver has permission to write to the Drupal filter. If the path given is incorrect, you will need to change it in your server's test config file, located in the Islandora module's 'tests' folder as test_config.ini or default.test_config.ini.", array(
-      '!filter_path' => $filter_path,
+    $filter_status_message .= t("Drupal filter at <strong>@filter_path</strong> is not writable by the server. Please make sure your webserver has permission to write to the Drupal filter. If the path given is incorrect, you will need to change it in your server's test config file, located in the Islandora module's 'tests' folder as test_config.ini or default.test_config.ini.", array(
+      '@filter_path' => $filter_path,
     ));
   }