diff --git a/core/modules/openid/openid.pages.inc b/core/modules/openid/openid.pages.inc index f54617c..1c73077 100644 --- a/core/modules/openid/openid.pages.inc +++ b/core/modules/openid/openid.pages.inc @@ -57,6 +57,9 @@ function openid_user_identities($account) { $links['delete'] = array( 'title' => t('Delete'), 'href' => 'user/' . $account->uid . '/openid/delete/' . $identity->aid, + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); $row[] = array( 'data' => array( diff --git a/core/modules/path/path.admin.inc b/core/modules/path/path.admin.inc index 0535454..293b249 100644 --- a/core/modules/path/path.admin.inc +++ b/core/modules/path/path.admin.inc @@ -64,6 +64,9 @@ function path_admin_overview($keys = NULL) { $operations['delete'] = array( 'title' => t('delete'), 'href' => "admin/config/search/path/delete/$data->pid", + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), 'query' => $destination, ); $row['data']['operations'] = array( @@ -187,6 +190,9 @@ function path_admin_form($form, &$form_state, $path = array('source' => '', 'ali $form['actions']['delete'] = array( '#type' => 'submit', '#value' => t('Delete'), + '#ajax' => array( + 'dialog' => array('modal' => TRUE), + ), '#submit' => array('path_admin_form_delete_submit'), ); } diff --git a/core/modules/search/search.admin.inc b/core/modules/search/search.admin.inc index ef70eb7..a85c463 100644 --- a/core/modules/search/search.admin.inc +++ b/core/modules/search/search.admin.inc @@ -63,7 +63,14 @@ function search_admin_settings($form, &$form_state) { $status = '

' . t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) . ' ' . $count . '

'; $form['status'] = array('#type' => 'details', '#title' => t('Indexing status')); $form['status']['status'] = array('#markup' => $status); - $form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'), '#submit' => array('search_admin_reindex_submit')); + $form['status']['wipe'] = array( + '#type' => 'submit', + '#value' => t('Re-index site'), + '#ajax' => array( + 'dialog' => array('modal' => TRUE), + ), + '#submit' => array('search_admin_reindex_submit'), + ); $items = drupal_map_assoc(array(10, 20, 50, 100, 200, 500)); diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc index 18ec1c3..c42f66b 100644 --- a/core/modules/shortcut/shortcut.admin.inc +++ b/core/modules/shortcut/shortcut.admin.inc @@ -176,6 +176,9 @@ function shortcut_set_admin() { $links['delete'] = array( 'title' => t('delete set'), 'href' => "admin/config/user-interface/shortcut/$set->set_name/delete", + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); } $row[] = array( @@ -290,6 +293,9 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) { $links['delete'] = array( 'title' => t('delete'), 'href' => "admin/config/user-interface/shortcut/link/$mlid/delete", + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); $form['shortcuts']['links'][$mlid]['operations'] = array( '#type' => 'operations', diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 46b4b9d..102f8c5 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1289,6 +1289,9 @@ function system_modules_uninstall($form, $form_state = NULL) { $form['actions']['submit'] = array( '#type' => 'submit', '#value' => t('Uninstall'), + '#ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); $form['#action'] = url('admin/modules/uninstall/confirm'); } @@ -2565,6 +2568,9 @@ function system_date_time_formats() { $links['delete'] = array( 'title' => t('delete'), 'href' => 'admin/config/regional/date-time/formats/' . $date_format_id . '/delete', + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); $row['operations'] = array('data' => array( '#type' => 'operations', @@ -2741,6 +2747,9 @@ function system_date_format_language_overview_page() { $links['reset'] = array( 'title' => t('reset'), 'href' => "admin/config/regional/date-time/locale/$langcode/reset", + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); $row[] = array( 'data' => array( diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 26fee90..3f99990 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -3314,6 +3314,9 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, '#type' => 'link', '#title' => $no ? $no : t('Cancel'), '#href' => $options['path'], + '#attributes' => array( + 'class' => array('dialog-cancel'), + ), '#options' => $options, ); // By default, render the form using theme_confirm_form(). diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc index 74af1d5..1cec614 100644 --- a/core/modules/taxonomy/taxonomy.admin.inc +++ b/core/modules/taxonomy/taxonomy.admin.inc @@ -286,7 +286,13 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) { } $operations = array( 'edit' => array('title' => t('edit'), 'href' => 'taxonomy/term/' . $term->tid . '/edit', 'query' => $destination), - 'delete' => array('title' => t('delete'), 'href' => 'taxonomy/term/' . $term->tid . '/delete', 'query' => $destination), + 'delete' => array( + 'title' => t('delete'), + 'href' => 'taxonomy/term/' . $term->tid . '/delete', + 'ajax' => array( + 'dialog' => array('modal' => TRUE), + ), + 'query' => $destination), ); if (module_invoke('translation_entity', 'translate_access', $term)) { $operations['translate'] = array( @@ -316,7 +322,10 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) { ); $form['actions']['reset_alphabetical'] = array( '#type' => 'submit', - '#value' => t('Reset to alphabetical') + '#value' => t('Reset to alphabetical'), + '#ajax' => array( + 'dialog' => array('modal' => TRUE), + ), ); $form_state['redirect'] = array(current_path(), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array())); } diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc index 3668aae..a2bdbd3 100644 --- a/core/modules/user/user.admin.inc +++ b/core/modules/user/user.admin.inc @@ -985,6 +985,9 @@ function user_admin_role($form, $form_state, $role) { '#type' => 'submit', '#value' => t('Delete role'), '#access' => !empty($role->rid) && !in_array($role->rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID)), + '#ajax' => array( + 'dialog' => array('modal' => TRUE), + ), '#submit' => array('user_admin_role_delete_submit'), );