Browse Source

moved files from utils directory to includes changed also changed edit tab to say manage

pull/109/merge
Paul Pound 13 years ago
parent
commit
e32291abfb
  1. 0
      includes/MimeClass.inc
  2. 0
      includes/datastream.inc
  3. 0
      includes/islandora_dublin_core.inc
  4. 10
      islandora.module
  5. 2
      islandora_basic_collection/islandora_basic_collection.module
  6. 2
      islandora_basic_image/islandora_basic_image.module

0
utils/MimeClass.inc → includes/MimeClass.inc

0
utils/datastream.inc → includes/datastream.inc

0
utils/islandora_dublin_core.inc → includes/islandora_dublin_core.inc

10
islandora.module

@ -117,7 +117,7 @@ function islandora_menu() {
); );
$items['islandora/object/%/edit'] = array( $items['islandora/object/%/edit'] = array(
'title' => 'Edit', 'title' => 'Manage',
'page callback' => 'islandora_edit_object', 'page callback' => 'islandora_edit_object',
'page arguments' => array(2), 'page arguments' => array(2),
'type' => MENU_LOCAL_TASK, 'type' => MENU_LOCAL_TASK,
@ -137,7 +137,7 @@ function islandora_menu() {
'page callback' => 'islandora_datastream_as_attachment', 'page callback' => 'islandora_datastream_as_attachment',
'page arguments' => array(2, 4), 'page arguments' => array(2, 4),
'type' => MENU_CALLBACK, 'type' => MENU_CALLBACK,
'file' => 'utils/datastream.inc', 'file' => 'includes/datastream.inc',
'access arguments' => array(FEDORA_VIEW), 'access arguments' => array(FEDORA_VIEW),
); );
@ -146,7 +146,7 @@ function islandora_menu() {
'page callback' => 'islandora_datastream_as_attachment', 'page callback' => 'islandora_datastream_as_attachment',
'page arguments' => array(2, 4), 'page arguments' => array(2, 4),
'type' => MENU_CALLBACK, 'type' => MENU_CALLBACK,
'file' => 'utils/datastream.inc', 'file' => 'includes/datastream.inc',
'access arguments' => array(FEDORA_VIEW), 'access arguments' => array(FEDORA_VIEW),
); );
@ -155,7 +155,7 @@ function islandora_menu() {
'page callback' => 'islandora_datastream_as_attachment', 'page callback' => 'islandora_datastream_as_attachment',
'page arguments' => array(2, 4), 'page arguments' => array(2, 4),
'type' => MENU_CALLBACK, 'type' => MENU_CALLBACK,
'file' => 'utils/datastream.inc', 'file' => 'includes/datastream.inc',
'access arguments' => array(FEDORA_VIEW), 'access arguments' => array(FEDORA_VIEW),
); );
@ -513,7 +513,7 @@ function islandora_add_datastream($object_id) {
function islandora_preprocess_islandora_default(&$variables) { function islandora_preprocess_islandora_default(&$variables) {
$islandora_object = $variables['islandora_object']; $islandora_object = $variables['islandora_object'];
module_load_include('inc', 'islandora', 'utils/islandora_dublin_core'); module_load_include('inc', 'islandora', 'includes/islandora_dublin_core');
try { try {
$dc = $islandora_object['DC']->content; $dc = $islandora_object['DC']->content;
//$dc_xml = simplexml_load_string($dc); //$dc_xml = simplexml_load_string($dc);

2
islandora_basic_collection/islandora_basic_collection.module

@ -88,7 +88,7 @@ function islandora_basic_collection_islandora_view_object($object, $user, $page_
*/ */
function islandora_basic_collection_preprocess_islandora_basic_collection(&$variables) { function islandora_basic_collection_preprocess_islandora_basic_collection(&$variables) {
$islandora_object = $variables['islandora_object']; $islandora_object = $variables['islandora_object'];
module_load_include('inc', 'islandora', 'utils/islandora_dublin_core'); module_load_include('inc', 'islandora', 'includes/islandora_dublin_core');
try { try {
$dc = $islandora_object['DC']->content; $dc = $islandora_object['DC']->content;
$dc_object = Dublin_Core::import_from_xml_string($dc); $dc_object = Dublin_Core::import_from_xml_string($dc);

2
islandora_basic_image/islandora_basic_image.module

@ -91,7 +91,7 @@ function islandora_basic_image_islandora_view_object($object, $user, $page_numbe
*/ */
function islandora_basic_image_preprocess_islandora_basic_image(&$variables) { function islandora_basic_image_preprocess_islandora_basic_image(&$variables) {
$islandora_object = $variables['islandora_object']; $islandora_object = $variables['islandora_object'];
module_load_include('inc', 'islandora', 'utils/islandora_dublin_core'); module_load_include('inc', 'islandora', 'includes/islandora_dublin_core');
try { try {
$dc = $islandora_object['DC']->content; $dc = $islandora_object['DC']->content;
$dc_object = Dublin_Core::import_from_xml_string($dc); $dc_object = Dublin_Core::import_from_xml_string($dc);

Loading…
Cancel
Save