? INSTALL_5.txt ? admin-theme_5.patch ? admin_theme_default.patch ? fix_signatures_5.patch ? forum_22.patch ? help_message.patch ? sites/localhost Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.364 diff -u -p -r1.364 system.module --- modules/system/system.module 2 Sep 2006 08:02:05 -0000 1.364 +++ modules/system/system.module 4 Sep 2006 21:48:35 -0000 @@ -285,7 +285,7 @@ function system_menu($may_cache) { */ if (arg(0) == 'admin') { global $custom_theme; - $custom_theme = variable_get('admin_theme', 'bluemarine'); + $custom_theme = variable_get('admin_theme', '0'); drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'core'); } @@ -406,7 +406,7 @@ function system_admin_theme_settings() { '#options' => $options, '#title' => t('Administration theme'), '#description' => t('Choose which theme the administration pages should display in. If you choose "System default" the administration pages theme will display in the same theme the rest of the site uses.'), - '#default_value' => variable_get('admin_theme', 'bluemarine'), + '#default_value' => variable_get('admin_theme', '0'), ); // In order to give it our own submit, we have to give it the default submit @@ -420,7 +420,7 @@ function system_admin_theme_settings() { function system_admin_theme_submit($form_id, $form_values) { // If we're changing themes, make sure the theme has its blocks initialized. - if ($form_values['admin_theme'] != variable_get('admin_theme', 'bluemarine')) { + if ($form_values['admin_theme'] != variable_get('admin_theme', '0')) { $result = db_query("SELECT status FROM {blocks} WHERE theme = '%s'", $form_values['admin_theme']); if (!db_num_rows($result)) { system_initialize_theme_blocks($form_values['admin_theme']); @@ -1182,7 +1182,6 @@ function theme_system_themes($form) { function system_themes_submit($form_id, $values) { - db_query("UPDATE {system} SET status = 0 WHERE type = 'theme'"); if ($_POST['op'] == t('Save configuration')) { @@ -1198,6 +1197,13 @@ function system_themes_submit($form_id, } } } + if (($admin_theme = variable_get('admin_theme', '0')) != '0') { + drupal_set_message(t('Please take note that the administration theme is still set to the %admin_theme theme. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array( + '!admin_theme_page' => url('admin/settings/admin'), + '%admin_theme' => $admin_theme, + '%selected_theme' => $values['theme_default'], + ))); + } variable_set('theme_default', $values['theme_default']); } else { @@ -1232,7 +1238,8 @@ function system_modules() { // Handle status checkboxes, including overriding the generated // checkboxes for required modules. - $form['status'] = array('#type' => 'checkboxes', '#default_value' => $status, '#options' => $options); + $form['status'] = array('#type' => 'checkboxes', '#default_value' => $status, '#options' => $options, '#attributes' => array( + 'onmouseover' => "alert(this.html());")); $required = array('block', 'filter', 'node', 'system', 'user', 'watchdog'); foreach ($required as $require) { $form['status'][$require] = array('#type' => 'hidden', '#value' => 1, '#suffix' => t('required'));