diff --git a/css/views-admin.bartik.css b/css/views-admin.bartik.css index e8f7aef..3fd54a5 100644 --- a/css/views-admin.bartik.css +++ b/css/views-admin.bartik.css @@ -73,119 +73,7 @@ /* @group CTools */ -/* @group Buttons */ - -.ctools-button-processed { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(249, 249, 249, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - border-radius: 5px; - padding-bottom: 1px; - padding-top: 1px; -} - -.ctools-button-processed:hover { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0, - #f1f1f1 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(241, 241, 241, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0, - #f1f1f1 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0, - #f1f1f1 100%); -} - -.ctools-button-processed li a, -.views-ui-display-tab-actions .ctools-button-processed input { - padding-left: 9px; - padding-right: 9px; -} - -.ctools-content ul.actions { - padding-bottom: 0; -} - -.ctools-dropbutton-processed.open:hover { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(249, 249, 249, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); -} - -.ctools-dropbutton-processed.open { - -moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); - -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); - box-shadow: 1px 1px 2px rgba(0,0,0,0.25); -} - -.ctools-twisty { - top: 0.6667em; -} - -.ctools-dropbutton-processed.open .ctools-twisty { - top: 0.3333em; -} - -.ctools-dropbutton-processed li a, -.views-ui-display-tab-actions .ctools-dropbutton-processed input { - padding-right: 7px; -} - -.views-ui-display-tab-actions .ctools-button-processed input.form-submit { +.views-ui-display-tab-actions .dropbutton input.form-submit { margin-right: 0; margin-top: 0; } @@ -224,12 +112,12 @@ color: #018FE2; } -.views-ui-display-tab-actions .ctools-button input { +.views-ui-display-tab-actions .dropbutton input { color: #0071B3; } -.views-ui-display-tab-actions .ctools-button input:hover, -.views-ui-display-tab-actions .ctools-button input:focus { +.views-ui-display-tab-actions .dropbutton input:hover, +.views-ui-display-tab-actions .dropbutton input:focus { color: #018FE2; } diff --git a/css/views-admin.css b/css/views-admin.css index d740d45..f19e355 100644 --- a/css/views-admin.css +++ b/css/views-admin.css @@ -374,3 +374,20 @@ html.js span.js-only { } /* @end */ + +.dropbutton, +.dropbutton input { + text-transform: lowercase; +} +.dropbutton-multiple { + position: absolute; +} +.dropbutton-multiple .dropbutton-widget { + position: relative; +} +.dropbutton-content { + font-size: 11px; +} +.dropbutton-content li > * { + margin: 0; +} diff --git a/css/views-admin.ctools-rtl.css b/css/views-admin.ctools-rtl.css index c8adea2..f42cc81 100644 --- a/css/views-admin.ctools-rtl.css +++ b/css/views-admin.ctools-rtl.css @@ -1,35 +1,3 @@ -/* @group Buttons */ - -.ctools-dropbutton .ctools-content { - border-left: 1px solid #e8e8e8; -} - -.ctools-content ul.actions { - padding-left: auto; - padding-right: 0; -} - -.ctools-dropbutton .ctools-link { - border-right: 1px solid #ffffff; -} - -.ctools-dropbutton li { - padding-left: 9px; - padding-left: auto; -} - -.views-display-top .ctools-button { - left: 12px; - right: auto; -} - -.views-ui-display-tab-bucket .ctools-button { - left: 5px; - right: auto; -} - -/* @end */ - /* @group Export */ /* Override for filter button on the views list screen */ diff --git a/css/views-admin.ctools.css b/css/views-admin.ctools.css index ff402d4..4a920bf 100644 --- a/css/views-admin.ctools.css +++ b/css/views-admin.ctools.css @@ -1,124 +1,3 @@ -/* @group Buttons */ - -.ctools-button-processed { - background-color: #ffffff; - border-color: #cccccc; - font-size: 11px; - padding-bottom: 2px; - padding-top: 2px; -} - -.ctools-button-processed, -.ctools-button-processed input { - text-transform: lowercase; -} - -.ctools-button-processed:hover { - border-color: #b8b8b8; -} - -.ctools-button-processed:active { - border-color: #a0a0a0; -} - -.ctools-button-processed .ctools-content { - padding-bottom: 0; - padding-top: 0; -} - -.ctools-dropbutton-processed { - position: absolute; -} - -.ctools-dropbutton-processed .ctools-content { - border-right: 1px solid #e8e8e8; -} - -.ctools-dropbutton-processed .ctools-content ul { - margin: 0; - padding: 0; -} - -.ctools-content ul.actions { - margin-top: 0; - margin-bottom: 0; - padding-left: 0; -} - -.ctools-button-processed .ctools-content a { - background-image: none; - border: medium none; -} - -.ctools-dropbutton-processed.open:hover { - border-color: #D0D0D0; -} - -.ctools-dropbutton-processed.open { - z-index: 100; -} - -.ctools-dropbutton-processed .ctools-link { - border-left: 1px solid #ffffff; -} - -.ctools-dropbutton-processed.open .ctools-content { - padding-bottom: 4px; -} - -.ctools-dropbutton-processed li a, -.ctools-dropbutton-processed li input { - padding-right: 9px; -} - -.ctools-dropbutton-processed.open li + li { - border-top: 1px solid #efefef; - margin-top: 4px; - padding-bottom: 0; - padding-top: 4px; -} - -.ctools-twisty:focus { - outline: medium none; -} - -.ctools-no-js .ctools-content ul { - margin-bottom: 0; - margin-top: 0; - padding-left: 0; -} - -.views-display-top .ctools-button-processed { - font-size: 12px; - position: absolute; - right: 12px; - top: 7px; -} - -.views-ui-display-tab-bucket .ctools-button-processed { - position: absolute; - right: 5px; - top: 4px; -} - -.views-ui-display-tab-actions .ctools-button-processed li a, -.views-ui-display-tab-actions .ctools-button-processed input { - background: none; - border: medium; - font-family: inherit; - font-size: 12px; - padding-bottom: 0; - padding-left: 12px; - padding-top: 0; - margin-bottom: 0; -} - -.views-ui-display-tab-actions .ctools-button-processed input:hover { - background: none; -} - -/* @end */ - /* @group Export */ /* Override for filter button on the views list screen */ diff --git a/css/views-admin.seven.css b/css/views-admin.seven.css index 58ce631..fc73911 100644 --- a/css/views-admin.seven.css +++ b/css/views-admin.seven.css @@ -183,28 +183,6 @@ fieldset.fieldset-no-legend { /* @end */ -/* @group Buttons */ - -.ctools-button-processed ul { - margin: 0; -} - -/* Override for input elements that are themed like ctools-buttons */ -.ctools-button-processed input.form-submit:hover { - background-image: none; - color: #0074BD; - text-shadow: none; -} - -.ctools-button-processed input.form-submit:active { - background: none; - border: medium none; - color: #0074BD; - text-shadow: none; -} - -/* @end */ - /* @group Tables */ table td, @@ -401,93 +379,6 @@ table th { /* @end */ -/* @group CTools */ - -/* @group Buttons */ - -.ctools-button-processed { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(249, 249, 249, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - border-radius: 11px; -} - -.ctools-button-processed:hover { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0, - #f1f1f1 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(241, 241, 241, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0, - #f1f1f1 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0, - #f1f1f1 100%); -} - -.ctools-dropbutton-processed.open:hover { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(249, 249, 249, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0, - #f9f9f9 100%); -} - -.ctools-dropbutton-processed.open { - -moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); - -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); - box-shadow: 1px 1px 2px rgba(0,0,0,0.25); +.views-ui-display-tab-actions .dropbutton input { + color: #0074BD; } - -/* @end */ diff --git a/css/views-admin.theme-rtl.css b/css/views-admin.theme-rtl.css index b2656f1..99c8c42 100644 --- a/css/views-admin.theme-rtl.css +++ b/css/views-admin.theme-rtl.css @@ -205,4 +205,16 @@ div.form-item-displays-live-preview { /* @end */ +/* @group Buttons */ + +.no-js .views-display-top .dropbutton { + left: 12px; + right: auto; +} + +.views-ui-display-tab-bucket .dropbutton { + left: 5px; + right: auto; +} + /* @end */ diff --git a/css/views-admin.theme.css b/css/views-admin.theme.css index 44750d7..9e53c4d 100644 --- a/css/views-admin.theme.css +++ b/css/views-admin.theme.css @@ -1100,3 +1100,35 @@ div.messages { } /* @end */ + +/* @group Buttons */ + +.views-display-top .dropbutton { + font-size: 12px; + position: absolute; + right: 12px; + top: 7px; +} + +.views-ui-display-tab-bucket .dropbutton { + position: absolute; + right: 5px; + top: 4px; +} + +.views-ui-display-tab-actions .dropbutton li a, +.views-ui-display-tab-actions .dropbutton input { + background: none; + border: medium; + font-family: inherit; + font-size: 12px; + padding-left: 12px; + margin-bottom: 0; +} + +.views-ui-display-tab-actions .dropbutton input:hover { + background: none; + border: none; +} + +/* @end */ diff --git a/includes/admin.inc b/includes/admin.inc index 6321f28..a8ee978 100644 --- a/includes/admin.inc +++ b/includes/admin.inc @@ -1157,7 +1157,7 @@ function views_ui_render_display_top($view, $display_id) { // Extra actions for the display $element['extra_actions'] = array( - '#theme' => 'links__ctools_dropbutton', + '#theme' => 'dropbutton', '#attributes' => array( 'id' => 'views-display-extra-actions', 'class' => array( @@ -1482,25 +1482,14 @@ function views_ui_get_display_tab_details($view, $display) { '#attributes' => array('id' => 'edit-display-settings-details'), ); - // The following is for display purposes only. We need to determine if there is more than one button and wrap - // the buttons in a .ctools-dropbutton class if more than one is present. Otherwise, we'll just wrap the - // actions in the .ctools-button class. $is_display_deleted = !empty($display->deleted); // The master display cannot be cloned. $is_default = $display->id == 'default'; // @todo: Figure out why getOption doesn't work here. $is_enabled = $display->handler->getOption('enabled'); - if (!$is_display_deleted && !$is_default) { - $prefix = '
open
'; - $item_element = 'li'; - } - else { - $prefix = '
'; - $item_element = 'li'; - } + $prefix = ''; if ($display->id != 'default') { $build['top']['#theme_wrappers'] = array('container'); @@ -1509,8 +1498,8 @@ function views_ui_get_display_tab_details($view, $display) { // The Delete, Duplicate and Undo Delete buttons. $build['top']['actions'] = array( - '#prefix' => $prefix, - '#suffix' => $suffix, + '#prefix' => '', ); if (!$is_display_deleted) { @@ -1520,8 +1509,8 @@ function views_ui_get_display_tab_details($view, $display) { '#value' => t('enable @display_title', array('@display_title' => $display_title)), '#limit_validation_errors' => array(), '#submit' => array('views_ui_edit_form_submit_enable_display', 'views_ui_edit_form_submit_delay_destination'), - '#prefix' => '<' . $item_element . ' class="enable">', - "#suffix" => '', + '#prefix' => '
  • ', + '#suffix' => '
    • ', ); } // Add a link to view the page. @@ -1533,8 +1522,8 @@ function views_ui_get_display_tab_details($view, $display) { '#title' => t('view @display', array('@display' => $display->display_title)), '#options' => array('alt' => array(t("Go to the real page for this display"))), '#href' => $path, - '#prefix' => '<' . $item_element . ' class="view">', - "#suffix" => '', + '#prefix' => '
  • ', + '#suffix' => '
    • ', ); } } @@ -1544,8 +1533,8 @@ function views_ui_get_display_tab_details($view, $display) { '#value' => t('clone @display_title', array('@display_title' => $display_title)), '#limit_validation_errors' => array(), '#submit' => array('views_ui_edit_form_submit_duplicate_display', 'views_ui_edit_form_submit_delay_destination'), - '#prefix' => '<' . $item_element . ' class="duplicate">', - "#suffix" => '', + '#prefix' => '
  • ', + '#suffix' => '
    • ', ); } // Always allow a display to be deleted. @@ -1554,8 +1543,8 @@ function views_ui_get_display_tab_details($view, $display) { '#value' => t('delete @display_title', array('@display_title' => $display_title)), '#limit_validation_errors' => array(), '#submit' => array('views_ui_edit_form_submit_delete_display', 'views_ui_edit_form_submit_delay_destination'), - '#prefix' => '<' . $item_element . ' class="delete">', - "#suffix" => '', + '#prefix' => '
  • ', + '#suffix' => '
    • ', ); if ($is_enabled) { $build['top']['actions']['disable'] = array( @@ -1563,8 +1552,8 @@ function views_ui_get_display_tab_details($view, $display) { '#value' => t('disable @display_title', array('@display_title' => $display_title)), '#limit_validation_errors' => array(), '#submit' => array('views_ui_edit_form_submit_disable_display', 'views_ui_edit_form_submit_delay_destination'), - '#prefix' => '<' . $item_element . ' class="disable">', - "#suffix" => '', + '#prefix' => '
  • ', + '#suffix' => '
    • ', ); } } @@ -1574,8 +1563,8 @@ function views_ui_get_display_tab_details($view, $display) { '#value' => t('undo delete of @display_title', array('@display_title' => $display_title)), '#limit_validation_errors' => array(), '#submit' => array('views_ui_edit_form_submit_undo_delete_display', 'views_ui_edit_form_submit_delay_destination'), - '#prefix' => '<' . $item_element . ' class="undo-delete">', - "#suffix" => '', + '#prefix' => '
  • ', + '#suffix' => '
    • ', ); } @@ -2160,7 +2149,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) { } // Render the array of links - $build['#actions'] = theme('links__ctools_dropbutton', + $build['#actions'] = theme('dropbutton', array( 'links' => $actions, 'attributes' => array( diff --git a/js/views-admin.js b/js/views-admin.js index ccddc5e..1d226c4 100644 --- a/js/views-admin.js +++ b/js/views-admin.js @@ -914,11 +914,8 @@ else if (($row).hasClass('draggable') && $row.is(':visible')) { "use strict"; - jQuery('.ctools-button', context).once('RemoveIconClass', function () { - var $ = jQuery; - var $this = $(this); - $('.icon', $this).removeClass('icon'); - $('.horizontal', $this).removeClass('horizontal'); + jQuery(context).find('.dropbutton').once('dropbutton-icon', function () { + jQuery(this).find('.icon').removeClass('icon'); }); }; diff --git a/lib/Drupal/views/ViewListController.php b/lib/Drupal/views/ViewListController.php index c3c7231..88346b1 100644 --- a/lib/Drupal/views/ViewListController.php +++ b/lib/Drupal/views/ViewListController.php @@ -77,7 +77,7 @@ public function getList() { */ public function getRowData(EntityInterface $view) { $operations = $this->buildActionLinks($view); - $operations['#theme'] = 'links__ctools_dropbutton'; + $operations['#theme'] = 'dropbutton'; return array( 'data' => array( 'view_name' => theme('views_ui_view_info', array('view' => $view)),