From 5987a08c292e2fcbcf3bee9769b193199667eb39 Mon Sep 17 00:00:00 2001
From: mroy <umroymr@cc.umanitoba.ca>
Date: Wed, 15 Dec 2010 18:36:19 -0600
Subject: [PATCH] Added markup field type. Updated form builder to accept the
 new markup element type.

---
 .../islandora_content_modeller.module           | 10 ++++++----
 plugins/FormBuilder.inc                         | 17 +++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/content_modeller/islandora_content_modeller.module b/content_modeller/islandora_content_modeller.module
index 8d64e84e..4c1a4b6a 100644
--- a/content_modeller/islandora_content_modeller.module
+++ b/content_modeller/islandora_content_modeller.module
@@ -2684,8 +2684,9 @@ function icm_model_add_ingestFormElement(&$form_state,$params=null)
                        'other_select'=>t('Select (with \'other\' option)'),
                        'datepicker'=>t('Datepicker'),
                        'copyright'=>t('Creative-Commons Copyright Chooser'),
-											 'hidden'=>t('Hidden'),
-								       'file'=>t('File Upload (browse)'),
+                       'hidden'=>t('Hidden'),
+                       'file'=>t('File Upload (browse)'),
+                       'markup'=>t('HTML Markup (no field)'),
                        ),
     '#description'=> t('The type of form element to display.')
   ); 
@@ -2849,8 +2850,9 @@ function icm_model_edit_ingestFormElement(&$form_state,$params=null)
                              'other_select'=>t('Select (with \'other\' option)'),
                              'datepicker'=>t('Datepicker'),
                              'copyright'=>t('Creative-Commons Copyright Chooser'),
-														 'hidden'=>t('Hidden'),
-			     'file'=>t('File Upload (browse)'),
+                             'hidden'=>t('Hidden'),
+                             'file'=>t('File Upload (browse)'),
+                             'markup'=>t('HTML Markup (no field)'),
                              ),
           '#description'=> t('The type of form element to display. <br/><b>Warning:</b> Changing the type from "Select" or "Radio" to anything else will cause any authoritative list to be permanently removed.')
         ); 
diff --git a/plugins/FormBuilder.inc b/plugins/FormBuilder.inc
index 7cb8acdc..dbedda75 100644
--- a/plugins/FormBuilder.inc
+++ b/plugins/FormBuilder.inc
@@ -312,12 +312,17 @@ class FormBuilder {
     );
     
     foreach ($elements as $element) {
-        $el = array(
-          '#title' => $element['label'],
-          '#required' => ($element['required'] ? 1 : 0),
-          '#description' => $element['description'],
-          '#type' => $element['type']
-        );
+      
+        if ($element['type'] == 'markup') {
+          $el = array('#value'=> $element['description']);
+        } else {
+          $el = array(
+            '#title' => $element['label'],
+            '#required' => ($element['required'] ? 1 : 0),
+            '#description' => $element['description'],
+            '#type' => $element['type']
+          );
+        }
 
         $name = explode('][', $element['name']);
         $elLocation = &$form['indicator2'];