From 230c149122e6c78ed302bfff03100a0af98e0c36 Mon Sep 17 00:00:00 2001 From: rwincewicz Date: Fri, 1 Jun 2012 15:18:44 -0300 Subject: [PATCH] Changed wording for menus and admin screens --- islandora.module | 36 +++++++++---------- .../islandora_basic_collection.install | 22 ++++++------ .../islandora_basic_collection.module | 4 +-- .../islandora_basic_image.install | 24 ++++++------- .../islandora_basic_image.module | 4 +-- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/islandora.module b/islandora.module index 1a6f33ca..cee00703 100644 --- a/islandora.module +++ b/islandora.module @@ -43,14 +43,14 @@ function islandora_menu() { $items = array(); $items['admin/islandora'] = array( - 'title' => 'Islandora Configuration', - 'description' => "Configure Islandora's interaction with Fedora", + 'title' => 'Islandora', + 'description' => "Configure settings associated with Islandora.", 'access arguments' => array('administer site configuration'), 'type' => MENU_NORMAL_ITEM, ); $items['admin/islandora/configure'] = array( - 'title' => 'Islandora Configuration', - 'description' => 'Enter the Islandora collection information here.', + 'title' => 'Configuration', + 'description' => 'Configure settings for Islandora.', 'page callback' => 'drupal_get_form', 'page arguments' => array('islandora_repository_admin'), 'file' => 'admin/islandora.admin.inc', @@ -390,32 +390,32 @@ function islandora_theme() { function islandora_permission() { return array( FEDORA_VIEW => array( - 'title' => t('View Fedora Repository objects and datastreams'), - 'description' => t('Users with this permission will be allowed to view Fedora objects and datastreams. Unless Fedora XACML security policies limits this functionality to certain objects.') + 'title' => t('View repository objects and datastreams'), + 'description' => t('View objects in the repository and their associated datastreams. Note: Fedora XACML security policies may override this permission.') ), FEDORA_ADD_DS => array( - 'title' => t('Add Fedora streams to Fedora objects'), - 'description' => t('Users with this permission will be allowed to add datastreams to Fedora objects. Unless Fedora XACML security policies limits this functionality to certain objects.') + 'title' => t('Add datastreams to repository objects'), + 'description' => t('Add datastreams to objects in the repository. Note: Fedora XACML security policies may override this position.') ), FEDORA_METADATA_EDIT => array( - 'title' => t('Edit Fedora Metadata'), - 'description' => t('Users with this permission will be allowed to edit Fedora Metadata streams') + 'title' => t('Edit metadata'), + 'description' => t('Edit metadata for objects in the repository.') ), FEDORA_INGEST => array( - 'title' => t('Create new Fedora objects'), - 'description' => t('Users with this permission will be allowed to create new objects in the Fedora repository') + 'title' => t('Create new repository objects'), + 'description' => t('Create new objects in the repository.') ), FEDORA_PURGE => array( - 'title' => t('Permanently remove objects from the Fedora repository'), - 'description' => t('Users with this permission will be allowed to Permantly remove objects from the Fedora repository.') + 'title' => t('Permanently remove objects from the repository'), + 'description' => t('Permanently remove objects from the repository.') ), FEDORA_MODIFY_STATE => array( - 'title' => t('Change a Fedora objects state'), - 'description' => t('Users with this permission will be allowed to change a Fedora objects state.') + 'title' => t('Change repository object states'), + 'description' => t('Change the state of objects in the repository (e.g. from Active to Inactive).') ), FEDORA_MANAGE => array( - 'title' => t('View Fedora Manage tabs'), - 'description' => t('Users with this permission will be allowed to view fedora manage manage tabs.') + 'title' => t('View object management tabs'), + 'description' => t('View tabs that provide object management functions.') ) ); } diff --git a/islandora_basic_collection/islandora_basic_collection.install b/islandora_basic_collection/islandora_basic_collection.install index eb9f1efe..ebc3c18e 100644 --- a/islandora_basic_collection/islandora_basic_collection.install +++ b/islandora_basic_collection/islandora_basic_collection.install @@ -24,10 +24,10 @@ function islandora_basic_collection_install() { drupal_set_message(st('Unable to install content models %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(st('Content models installed!')); + drupal_set_message(st('Content models for the basic collection module installed!')); } else { - drupal_set_message(st('Content models already exist!'), 'warning'); + drupal_set_message(st('Content models for the basic collection module already exist!'), 'warning'); } $collection_query = $rest_connection->api->a->findObjects('query', 'pid=islandora:root'); @@ -43,13 +43,13 @@ function islandora_basic_collection_install() { $datastream->setContentFromUrl($file_path); $fedora_object->ingestDatastream($datastream); } catch (Exception $e) { - drupal_set_message(st('Unable to install collections %e', array('%e' => $e)), 'error'); + drupal_set_message(st('Unable to install collections for the basic collection module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(st('Collections installed!')); + drupal_set_message(st('Collections installed for the basic collection module!')); } else { - drupal_set_message(st('Collections already exist!'), 'warning'); + drupal_set_message(st('Collections already exist for the basic collection module!'), 'warning'); } } @@ -67,13 +67,13 @@ function islandora_basic_collection_uninstall() { try { $rest_connection->repository->purgeObject('islandora:collectionCModel'); } catch (Exception $e) { - drupal_set_message(st('Unable to purge content models %e', array('%e' => $e)), 'error'); + drupal_set_message(st('Unable to purge content models for the basic collection module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(st('Content models purged!')); + drupal_set_message(st('Content models for the basic collection module purged!')); } else { - drupal_set_message(st('Content models don\'t exist!'), 'warning'); + drupal_set_message(st('Content models for the basic collection module don\'t exist!'), 'warning'); } $collection_query = $rest_connection->api->a->findObjects('query', 'pid=islandora:root'); @@ -81,12 +81,12 @@ function islandora_basic_collection_uninstall() { try { $rest_connection->repository->purgeObject('islandora:root'); } catch (Exception $e) { - drupal_set_message(st('Unable to purge collections %e', array('%e' => $e)), 'error'); + drupal_set_message(st('Unable to purge collections for the basic collection module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(st('Collections purged!')); + drupal_set_message(st('Collections for the basic collection module purged!')); } else { - drupal_set_message(st('Collections don\'t exist!'), 'warning'); + drupal_set_message(st('Collections for the basic collection module don\'t exist!'), 'warning'); } } \ No newline at end of file diff --git a/islandora_basic_collection/islandora_basic_collection.module b/islandora_basic_collection/islandora_basic_collection.module index 2a2eb7f8..59f60b58 100644 --- a/islandora_basic_collection/islandora_basic_collection.module +++ b/islandora_basic_collection/islandora_basic_collection.module @@ -39,8 +39,8 @@ function islandora_basic_collection_menu() { ); $items['admin/islandora/basic_collection'] = array( - 'title' => 'Islandora basic collection', - 'description' => 'Configure the basic Collection solution pack.', + 'title' => 'Core collection', + 'description' => 'Configure the core Islandora collection functionality.', 'page callback' => 'drupal_get_form', 'access arguments' => array('administer site configuration'), 'page arguments' => array('islandora_basic_collection_admin'), diff --git a/islandora_basic_image/islandora_basic_image.install b/islandora_basic_image/islandora_basic_image.install index 2ab629d9..8ab9c87a 100644 --- a/islandora_basic_image/islandora_basic_image.install +++ b/islandora_basic_image/islandora_basic_image.install @@ -25,13 +25,13 @@ function islandora_basic_image_install() { $xml = file_get_contents(drupal_get_path('module', 'islandora_basic_image') . '/xml/simple_islandora_basic_imageCM.xml'); $restConnection->api->m->ingest(array('string' => $xml)); } catch (Exception $e) { - drupal_set_message(t('Unable to install content models %e', array('%e' => $e)), 'error'); + drupal_set_message(t('Unable to install content models for the basic image module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(t('Content models installed!')); + drupal_set_message(t('Content models for the basic image module installed!')); } else { - drupal_set_message(t('Content models already exist!'), 'warning'); + drupal_set_message(t('Content models for the basic image module already exist!'), 'warning'); } $collection_query = $restConnection->api->a->findObjects('query', 'pid=islandora:sp_basic_image_collection'); @@ -48,13 +48,13 @@ function islandora_basic_image_install() { $fedora_object->ingestDatastream($datastream); } catch (Exception $e) { - drupal_set_message(t('Unable to install collections %e', array('%e' => $e)), 'error'); + drupal_set_message(t('Unable to install collections for the basic image module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(t('Collections installed!')); + drupal_set_message(t('Collections for the basic image module installed!')); } else { - drupal_set_message(t('Collections already exist!'), 'warning'); + drupal_set_message(t('Collections for the basic image module already exist!'), 'warning'); } } @@ -77,13 +77,13 @@ function islandora_basic_image_uninstall() { try { $restConnection->repository->purgeObject('islandora:sp_basic_image'); } catch (Exception $e) { - drupal_set_message(t('Unable to purge content models %e', array('%e' => $e)), 'error'); + drupal_set_message(t('Unable to purge content models for the basic image module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(t('Content models purged!')); + drupal_set_message(t('Content models for the basic image module purged!')); } else { - drupal_set_message(t('Content models don\'t exist!'), 'warning'); + drupal_set_message(t('Content models for the basic image module don\'t exist!'), 'warning'); } $collection_query = $restConnection->api->a->findObjects('query', 'pid=islandora:sp_basic_image_collection'); @@ -91,12 +91,12 @@ function islandora_basic_image_uninstall() { try { $restConnection->repository->purgeObject('islandora:sp_basic_image_collection'); } catch (Exception $e) { - drupal_set_message(t('Unable to purge collections %e', array('%e' => $e)), 'error'); + drupal_set_message(t('Unable to purge collections for the basic image module %e', array('%e' => $e)), 'error'); return; } - drupal_set_message(t('Collections purged!')); + drupal_set_message(t('Collections for the basic image module purged!')); } else { - drupal_set_message(t('Collections don\'t exist!'), 'warning'); + drupal_set_message(t('Collections for the basic image module don\'t exist!'), 'warning'); } } \ No newline at end of file diff --git a/islandora_basic_image/islandora_basic_image.module b/islandora_basic_image/islandora_basic_image.module index 885d5ba8..dd1b0bab 100644 --- a/islandora_basic_image/islandora_basic_image.module +++ b/islandora_basic_image/islandora_basic_image.module @@ -31,8 +31,8 @@ function islandora_basic_image_menu() { $items = array(); $items['admin/islandora/basic_image'] = array( - 'title' => 'Islandora Basic Image', - 'description' => 'Configure the basic image solution pack.', + 'title' => 'Basic Image collection', + 'description' => 'Configure the Basic Image solution pack.', 'page callback' => 'drupal_get_form', 'access arguments' => array('administer site configuration'), 'page arguments' => array('islandora_basic_image_admin'),