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

includes/ingest.form.inc

@@ -799,7 +799,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
         WATCHDOG_ERROR
       );
       drupal_set_message(
-        t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.',
+        t('A problem occured while ingesting "@label" (ID: @pid), please notify the administrator.',
         array('@label' => $object->label, '@pid' => $object->id)),
         'error'
       );

includes/mime_detect.inc

@@ -222,6 +222,7 @@ class MimeDetect {
     "tar" => "application/x-tar",
     "gtar" => "application/x-gtar",
     "zip" => "application/x-zip",
+    "dat" => "application/octet-stream",
     // others:
     'bin' => 'application/octet-stream',
     // Web Archives:

islandora.module

@@ -1511,6 +1511,14 @@ function islandora_entity_info() {
       'label' => 'label',
     ),
   );
+  $entities['islandora_datastream'] = array(
+    'label' => t('Islandora Datastream'),
+    'fieldable' => FALSE,
+    'entity keys' => array(
+      'id' => 'id',
+      'label' => 'label',
+    ),
+  );
 
   return $entities;
 }
@@ -1523,39 +1531,56 @@ function islandora_entity_info() {
 function islandora_entity_property_info() {
   $info = array();
 
-  $p = &$info['islandora_object']['properties'];
+  $object_properties = &$info['islandora_object']['properties'];
+  $datastream_properties = &$info['islandora_datastream']['properties'];
 
-  $p['id'] = array(
+  $object_properties['id'] = array(
     'type' => 'text',
     'label' => t('ID'),
     'description' => t('The identifier of the object.'),
   );
-  $p['label'] = array(
+  $object_properties['label'] = array(
     'type' => 'text',
     'label' => t('Object Label'),
     'description' => t('The label of the object.'),
   );
-  $p['owner'] = array(
+  $object_properties['owner'] = array(
     'type' => 'text',
     'label' => t('Object Owner'),
     'description' => t('The name of the owner of the object.'),
   );
-  $p['state'] = array(
+  $object_properties['state'] = array(
     'type' => 'text',
     'label' => t('Object State'),
     'description' => t('An initial representing the state of the object.'),
   );
-  $p['models'] = array(
+  $object_properties['models'] = array(
     'type' => 'list<text>',
     'label' => t('Content Models'),
     'description' => t('The list of content models which the object has.'),
   );
-  $p['createdDate'] = array(
+  $object_properties['createdDate'] = array(
     'type' => 'text',
     'label' => t('Created Date'),
     'description' => t('When the object was created.'),
   );
 
+  $datastream_properties['id'] = array(
+    'type' => 'text',
+    'label' => t('ID'),
+    'description' => t('The identifier of the datastream.'),
+  );
+  $datastream_properties['label'] = array(
+    'type' => 'text',
+    'label' => t('Datastream Label'),
+    'description' => t('The label of the datastream.'),
+  );
+  $datastream_properties['mimetype'] = array(
+    'type' => 'text',
+    'label' => t('MIME type'),
+    'description' => t('Content type of the datastream.'),
+  );
+
   return $info;
 }
 
@@ -1982,6 +2007,8 @@ function islandora_menu_local_tasks_alter(&$data, $router_item, $root_path) {
         if ($tab['#link']['path'] == 'islandora/object/%/print_object') {
           if ($root_path == 'islandora/object/%') {
             $islandora_path = drupal_get_path('module', 'islandora');
+            $tab['#prefix'] = '<li>';
+            $tab['#suffix'] = '</li>';
             $tab['#theme'] = 'link';
             $tab['#text'] = theme('image', array(
               'path' => "$islandora_path/images/print-icon.png",

tests/scripts/travis_setup.sh

@@ -39,7 +39,7 @@ mv sites/all/modules/islandora/tests/travis.test_config.ini sites/all/modules/is
 mkdir sites/all/libraries
 ln -s $HOME/tuque sites/all/libraries/tuque
 drush dl --yes coder
-drush dl --yes potx
+drush dl --yes potx-7.x-1.0
 drush en --yes coder_review
 drush en --yes simpletest
 drush en --yes potx