From 1fa7d0790fa9eeb12385309c156666f38189d4a7 Mon Sep 17 00:00:00 2001
From: Jordan Dukart <jordan@discoverygarden.ca>
Date: Fri, 2 Aug 2013 17:59:32 +0000
Subject: [PATCH] Actually use the fieldset that's defined.

---
 includes/add_datastream.form.inc | 72 ++++++++++++++++----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/includes/add_datastream.form.inc b/includes/add_datastream.form.inc
index 62490c9a..2a215478 100644
--- a/includes/add_datastream.form.inc
+++ b/includes/add_datastream.form.inc
@@ -40,44 +40,44 @@ function islandora_add_datastream_form(array $form, array &$form_state, Abstract
       '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)),
+        '#type' => 'textfield',
+        '#size' => 64,
+        '#maxlength' => 64,
+        '#required' => TRUE,
+        '#element_validate' => array(
+          'islandora_add_datastream_form_field_is_not_an_existing_datastream_id',
+          'islandora_add_datastream_form_field_starts_with_a_letter',
+          'islandora_add_datastream_form_field_is_valid_dsid',
+        ),
+        '#autocomplete_path' => "islandora/object/{$object->id}/manage/datastreams/add/autocomplete",
       ),
-      '#type' => 'textfield',
-      '#size' => 64,
-      '#maxlength' => 64,
-      '#required' => TRUE,
-      '#element_validate' => array(
-        'islandora_add_datastream_form_field_is_not_an_existing_datastream_id',
-        'islandora_add_datastream_form_field_starts_with_a_letter',
-        'islandora_add_datastream_form_field_is_valid_dsid',
+      'label' => array(
+        '#title' => 'Datastream Label',
+        '#required' => TRUE,
+        '#size' => 64,
+        '#maxlength' => 64,
+        '#description' => t('A human-readable label'),
+        '#type' => 'textfield',
+        '#element_validate' => array('islandora_add_datastream_form_field_does_not_contain_a_forward_slash'),
       ),
-      '#autocomplete_path' => "islandora/object/{$object->id}/manage/datastreams/add/autocomplete",
-    ),
-    'label' => array(
-      '#title' => 'Datastream Label',
-      '#required' => TRUE,
-      '#size' => 64,
-      '#maxlength' => 64,
-      '#description' => t('A human-readable label'),
-      '#type' => 'textfield',
-      '#element_validate' => array('islandora_add_datastream_form_field_does_not_contain_a_forward_slash'),
-    ),
-    'file' => array(
-      '#type' => 'managed_file',
-      '#required' => TRUE,
-      '#title' => t('Upload Document'),
-      '#size' => 48,
-      '#description' => t('Select a file to upload.<br/>Files must be less than <b>@size MB.</b>', array('@size' => $upload_size)),
-      '#default_value' => isset($form_state['values']['files']) ? $form_state['values']['files'] : NULL,
-      '#upload_location' => 'temporary://',
-      '#upload_validators' => array(
-        'file_validate_extensions' => array(NULL),
-        // Assume its specified in MB.
-        'file_validate_size' => array($upload_size * 1024 * 1024),
+      'file' => array(
+        '#type' => 'managed_file',
+        '#required' => TRUE,
+        '#title' => t('Upload Document'),
+        '#size' => 48,
+        '#description' => t('Select a file to upload.<br/>Files must be less than <b>@size MB.</b>', array('@size' => $upload_size)),
+        '#default_value' => isset($form_state['values']['files']) ? $form_state['values']['files'] : NULL,
+        '#upload_location' => 'temporary://',
+        '#upload_validators' => array(
+          'file_validate_extensions' => array(NULL),
+          // Assume its specified in MB.
+          'file_validate_size' => array($upload_size * 1024 * 1024),
+        ),
+      ),
+      'submit' => array(
+        '#type' => 'submit',
+        '#value' => t('Add Datastream'),
       ),
-    ),
-    'submit' => array(
-      '#type' => 'submit',
-      '#value' => t('Add Datastream'),
     ),
   );
 }
@@ -148,7 +148,7 @@ function islandora_add_datastream_form_field_does_not_contain_a_forward_slash(ar
 }
 
 /**
- * Checks if the given datastream requires the upload to be a certian MIME type.
+ * Checks if the given datastream requires the upload to be a certain MIME type.
  *
  * @param array $form
  *   The Drupal form.