diff --git a/formClass.inc b/formClass.inc index 69d721e8..c3a3e14e 100644 --- a/formClass.inc +++ b/formClass.inc @@ -213,7 +213,7 @@ class formClass { '#default_value' => variable_get('fedora_repository_name', 'Islandora demos collection'), '#description' => t('The Name of the Root Collection Object'), '#required' => TRUE, - '#weight' => -2 + '#weight' => 1 ); $form['fedora_repository_pid'] = array( '#type' => 'textfield', @@ -221,7 +221,7 @@ class formClass { '#default_value' => variable_get('fedora_repository_pid', 'islandora:root'), '#description' => t('The PID of the Root Collection Object'), '#required' => TRUE, - '#weight' => -2 + '#weight' => 2 ); $form['fedora_collection_model_pid'] = array( @@ -230,7 +230,7 @@ class formClass { '#default_value' => variable_get('fedora_collection_model_pid', 'islandora:collectionCModel'), '#description' => t('The PID of the Root Collection Model Object'), '#required' => TRUE, - '#weight' => -2 + '#weight' => 3 ); $form['fedora_content_model_collection_pid'] = array( @@ -239,7 +239,7 @@ class formClass { '#default_value' => variable_get('fedora_content_model_collection_pid', 'islandora:ContentModelCollection'), '#description' => t('The PID of the Content Model Collection Object'), '#required' => TRUE, - '#weight' => -2 + '#weight' => 4 ); $form['fedora_repository_url'] = array( @@ -247,7 +247,7 @@ class formClass { '#title' => t('Fedora RISearch URL'), '#default_value' => variable_get('fedora_repository_url', 'http://localhost:8080/fedora/risearch'), '#description' => t('The url of the Fedora server'), '#required' => TRUE, - '#weight' => 0 + '#weight' => 5 ); $form['fedora_base_url'] = array( @@ -256,15 +256,7 @@ class formClass { '#default_value' => variable_get('fedora_base_url', 'http://localhost:8080/fedora'), '#description' => t('The URL to use for REST-type connections'), '#required' => TRUE, - '#weight' => 0, - ); - - $form['fedora_soap_manage_url'] = array( - '#type' => 'textfield', - '#title' => t('Fedora SOAP management URL'), - '#default_value' => variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'), '#description' => t('The URL to use for SOAP API-M connections'), - '#required' => TRUE, - '#weight' => 0 + '#weight' => 6, ); $form['fedora_soap_url'] = array( @@ -273,10 +265,18 @@ class formClass { '#default_value' => variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'), '#description' => t('The URL to use for SOAP connections'), '#required' => TRUE, - '#weight' => 0, + '#weight' => 7, '#suffix' => '
' . (fedora_available() ? '' . t('Successfully connected to Fedora server at !fedora_soap_url', array('!fedora_soap_url' => variable_get('fedora_soap_url', ''))) : ' ' . t('Unable to connect to Fedora server at !fedora_soap_url
', array('!fedora_soap_url' => variable_get('fedora_soap_url', '')))), ); + $form['fedora_soap_manage_url'] = array( + '#type' => 'textfield', + '#title' => t('Fedora SOAP management URL'), + '#default_value' => variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'), '#description' => t('The URL to use for SOAP API-M connections'), + '#required' => TRUE, + '#weight' => 8 + ); + // will allow admin user to remove namepsace restrictions if not explicitly disallowed in settings.php if (variable_get('allow_open_namespace', TRUE)) { $form['fedora_namespace'] = array(