diff options
| -rw-r--r-- | install.php | 12 | ||||
| -rw-r--r-- | modules/system/system.js | 18 |
2 files changed, 7 insertions, 23 deletions
diff --git a/install.php b/install.php index f154de33a..807453111 100644 --- a/install.php +++ b/install.php @@ -727,7 +727,7 @@ function install_tasks($profile, $task) { drupal_add_js('misc/timezone.js'); // We add these strings as settings because JavaScript translation does not // work on install time. - drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail')), 'cleanURL' => array('success' => st('Your server has been successfully tested to support this feature.'), 'failure' => st('Your system configuration does not currently support this feature. The <a href="http://drupal.org/node/15365">handbook page on Clean URLs</a> has additional troubleshooting information.'), 'testing' => st('Testing clean URLs...'))), 'setting'); + drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting'); drupal_add_js(' // Global Killswitch if (Drupal.jsEnabled) { @@ -1042,15 +1042,9 @@ function install_configure_form(&$form_state, $url) { ); $form['server_settings']['clean_url'] = array( - '#type' => 'radios', - '#title' => st('Clean URLs'), + '#type' => 'hidden', '#default_value' => 0, - '#options' => array(0 => st('Disabled'), 1 => st('Enabled')), - '#description' => st('This option makes Drupal emit "clean" URLs (i.e. without <code>?q=</code> in the URL).'), - '#disabled' => TRUE, - '#prefix' => '<div id="clean-url" class="install">', - '#suffix' => '</div>', - '#weight' => 10, + '#attributes' => array('class' => 'install'), ); $form['server_settings']['update_status_module'] = array( diff --git a/modules/system/system.js b/modules/system/system.js index c6b6fc4ee..3015a2a8a 100644 --- a/modules/system/system.js +++ b/modules/system/system.js @@ -13,7 +13,7 @@ Drupal.behaviors.cleanURLsSettingsCheck = { // This behavior attaches by ID, so is only valid once on a page. // Also skip if we are on an install page, as Drupal.cleanURLsInstallCheck will handle // the processing. - if ($("#clean-url.clean-url-processed, #clean-url.install").size()) { + if ($(".clean-url-processed, #edit-clean-url.install").size()) { return; } var url = settings.basePath +"admin/settings/clean-urls/check"; @@ -47,8 +47,6 @@ Drupal.behaviors.cleanURLsSettingsCheck = { */ Drupal.cleanURLsInstallCheck = function() { var url = location.protocol +"//"+ location.host + Drupal.settings.basePath +"admin/settings/clean-urls/check"; - $("#clean-url .description").append('<span><div id="testing">'+ Drupal.settings.cleanURL.testing +"</div></span>"); - $("#clean-url.install").css("display", "block"); // Submit a synchronous request to avoid database errors associated with // concurrent requests during install. $.ajax({ @@ -57,18 +55,10 @@ Drupal.cleanURLsInstallCheck = function() { dataType: 'json', success: function () { // Check was successful. - $("#clean-url input.form-radio").attr("disabled", false); - $("#clean-url input.form-radio").attr("checked", 1); - $("#clean-url .description span").append('<div class="ok">'+ Drupal.settings.cleanURL.success +"</div>"); - $("#testing").hide(); + $("#edit-clean-url").attr("value", 1); }, - error: function() { - // Check failed. - $("#clean-url .description span").append('<div class="warning">'+ Drupal.settings.cleanURL.failure +"</div>"); - $("#testing").hide(); - } }); - $("#clean-url").addClass('clean-url-processed'); + $("#edit-clean-url").addClass('clean-url-processed'); }; /** @@ -134,4 +124,4 @@ Drupal.behaviors.poweredByPreview = { } }; -})(jQuery);
\ No newline at end of file +})(jQuery); |