Commit 6522e7ee authored by webchick's avatar webchick

Issue #1831668 by tim.plunkett, Bojhan: Remove custom admin theme for just views.

parent 6399141c
......@@ -43,7 +43,6 @@ function views_update_8000() {
'views_ui_show_master_display' => 'ui.show.master_display',
'views_ui_show_advanced_column' => 'ui.show.advanced_column',
'views_ui_display_embed' => 'ui.show.display_embed',
'views_ui_custom_theme' => 'ui.custom_theme',
'views_exposed_filter_any_label' => 'exposed_filter_any_label',
'views_ui_always_live_preview' => 'ui.always_live_preview',
'views_ui_always_live_preview_button' => 'ui.always_live_preview_button',
......
......@@ -1855,14 +1855,6 @@ function views_ui_admin_settings_basic($form, &$form_state) {
'#default_value' => $config->get('ui.show.display_embed'),
);
$form['basic']['ui_custom_theme'] = array(
'#type' => 'select',
'#title' => t('Custom admin theme for the Views UI'),
'#options' => array('_default' => t('- Use default -')) + $options,
'#default_value' => $config->get('ui.custom_theme'),
'#description' => t('In some cases you might want to select a different admin theme for the Views UI.')
);
$form['basic']['ui_exposed_filter_any_label'] = array(
'#type' => 'select',
'#title' => t('Label for "Any" value on non-required single-select exposed filters'),
......@@ -1937,7 +1929,6 @@ function views_ui_admin_settings_basic_submit(&$form, &$form_state) {
->set('ui.show.master_display', $form_state['values']['ui_show_master_display'])
->set('ui.show.advanced_column', $form_state['values']['ui_show_advanced_column'])
->set('ui.show.display_embed', $form_state['values']['ui_show_display_embed'])
->set('ui.custom_theme', $form_state['values']['ui_custom_theme'])
->set('ui.exposed_filter_any_label', $form_state['values']['ui_exposed_filter_any_label'])
->set('ui.always_live_preview', $form_state['values']['ui_always_live_preview'])
->set('ui.show.preview_information', $form_state['values']['ui_show_preview_information'])
......
......@@ -285,21 +285,6 @@ function views_ui_theme() {
);
}
/**
* Impements hook_custom_theme()
*/
function views_ui_custom_theme() {
$theme = config('views.settings')->get('ui.custom_theme');
if ($theme != '_default') {
$available = list_themes();
if (isset($available[$theme]) && $available[$theme]->status && preg_match('/^admin\/structure\/views/', current_path())) {
return $theme;
}
}
}
/**
* Page title callback for the Edit View page.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment