diff --git a/core/modules/ckeditor/ckeditor.admin.inc b/core/modules/ckeditor/ckeditor.admin.inc index c77dda9..0dff9f5 100644 --- a/core/modules/ckeditor/ckeditor.admin.inc +++ b/core/modules/ckeditor/ckeditor.admin.inc @@ -113,11 +113,28 @@ function theme_ckeditor_settings_toolbar($variables) { // active or disabled list, as theme_item_list() will not print an empty UL. $output = ''; $output .= '
'; - $output .= '' . t('Button configuration') . ''; + $output .= '' . t('Toolbar configuration') . ''; + $output .= '
'; + // aria-live region for outputing aural information about the state of the // configuration. $output .= '
'; - $output .= '

' . t('Toolbar buttons may be moved by drag and drop or with the keyboard arrow keys. Move a button up into the active toolbar to enable it, or down into the available buttons list to disable it. Dividers are available to create logical button groups.') . '

'; + + $output .= '
' . t('Move a button into the Active toolbar to enable it, or into the list of Available buttons to disable it. Use dividers to create button groups. Buttons may be moved with the mouse or keyboard arrow keys.') . '
'; + + $output .= '
'; + $output .= '
'; + $output .= ''; + $output .= '
    '; + $output .= $print_buttons($multiple_buttons); + $output .= '
'; + $output .= '
'; + $output .= ''; + $output .= '
    '; + $output .= $print_buttons($disabled_buttons); + $output .= '
'; + $output .= '
'; + $output .= ''; $output .= '
'; @@ -138,15 +155,6 @@ function theme_ckeditor_settings_toolbar($variables) { $output .= '
'; - $output .= '
'; - $output .= ''; - $output .= '
    '; - $output .= $print_buttons($disabled_buttons); - $output .= '
'; - $output .= ''; - $output .= '
    '; - $output .= $print_buttons($multiple_buttons); - $output .= '
'; $output .= '
'; $output .= '
'; diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module index 6260835..6686dc3 100644 --- a/core/modules/ckeditor/ckeditor.module +++ b/core/modules/ckeditor/ckeditor.module @@ -92,19 +92,6 @@ function ckeditor_theme() { } /** - * Implements hook_page_build(). - */ -function ckeditor_page_build(&$page) { - // Add our CSS file that adds common needed classes, such as align-left, - // align-right, underline, indent, etc. - // @todo The CSS in this file needs to continue to be applied even after - // disabling ckeditor.module after CKEditor-edited content is saved, - // so move it to somewhere global, such as system.base.css: - // http://drupal.org/node/1904976. - $page['#attached']['library'][] = array('ckeditor', 'drupal.ckeditor.css'); -} - -/** * Retrieves the default theme's CKEditor stylesheets defined in the .info file. * * Themes may specify iframe-specific CSS files for use with CKEditor by diff --git a/core/modules/ckeditor/css/ckeditor-rtl.css b/core/modules/ckeditor/css/ckeditor-rtl.css index 59f97b8..ca1acf5 100644 --- a/core/modules/ckeditor/css/ckeditor-rtl.css +++ b/core/modules/ckeditor/css/ckeditor-rtl.css @@ -7,12 +7,15 @@ .align-right { text-align: left; } -.indent1 { - margin: 0 40px 0 0; +img.align-left { + float: right; } -.indent2 { - margin: 0 80px 0 0; +img.align-right { + float: left; } -.indent3 { - margin: 0 120px 0 0; +.caption-left { + float: right; +} +.caption-right { + float: left; } diff --git a/core/modules/ckeditor/css/ckeditor.admin.css b/core/modules/ckeditor/css/ckeditor.admin.css index 0900b2a..aa88cdf 100644 --- a/core/modules/ckeditor/css/ckeditor.admin.css +++ b/core/modules/ckeditor/css/ckeditor.admin.css @@ -20,14 +20,22 @@ margin: 5px 0; overflow: nowrap; } +.ckeditor-toolbar-active > ul { + clear: left; /* RTL */ + float: left; /* RTL */ +} +#ckeditor-button-description { + margin-bottom: 1em; +} +.ckeditor-toolbar-dividers { + float: right; +} .ckeditor-toolbar-disabled ul.ckeditor-buttons { border: 0; } - .ckeditor-toolbar-disabled ul.ckeditor-buttons li { - margin: 5px; + margin: 2px; } - .ckeditor-toolbar-disabled ul.ckeditor-buttons li a, ul.ckeditor-buttons { border: 1px solid #a6a6a6; @@ -40,9 +48,6 @@ ul.ckeditor-buttons { min-height: 26px; min-width: 26px; list-style: none; - - float: left; /* LTR */ - clear: left; /* LTR */ padding: 0; margin: 0 6px 5px 0; border: 1px solid #a6a6a6; @@ -67,7 +72,6 @@ ul.ckeditor-buttons li a { text-decoration: none; text-shadow: 0 1px 0 rgba(255,255,255,.5); color: #474747; - background: #e4e4e4; background-image: -webkit-gradient(linear,left top,left bottom,from(white),to(#e4e4e4)); background-image: -moz-linear-gradient(top,white,#e4e4e4); diff --git a/core/modules/ckeditor/css/ckeditor.css b/core/modules/ckeditor/css/ckeditor.css index d7ca147..5528ccf 100644 --- a/core/modules/ckeditor/css/ckeditor.css +++ b/core/modules/ckeditor/css/ckeditor.css @@ -28,18 +28,6 @@ img.full-width { width: 100%; height: auto; } -.underline { - text-decoration: underline; -} -.indent1 { - margin: 0 0 0 40px; /* RTL */ -} -.indent2 { - margin: 0 0 0 80px; /* RTL */ -} -.indent3 { - margin: 0 0 0 120px; /* RTL */ -} .caption-left { float: left; /* RTL */ } diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/ckeditor/plugin/StylesCombo.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/ckeditor/plugin/StylesCombo.php index f810cbb..1c10fc7 100644 --- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/ckeditor/plugin/StylesCombo.php +++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/ckeditor/plugin/StylesCombo.php @@ -83,7 +83,7 @@ public function settingsForm(array $form, array &$form_state, Editor $editor) { '#title_display' => 'invisible', '#type' => 'textarea', '#default_value' => $config['styles'], - '#description' => t('A list of classes that will be provided in the "Styles" dropdown. Enter one class on each line in the format: label|element.class. Example: title|h1.title.
These styles should be available in your theme\'s CKEditor stylesheets as well as in your theme\'s main CSS file.'), + '#description' => t('A list of classes that will be provided in the "Styles" dropdown. Enter one class on each line in the format: Label|element.class. Example: Title|h1.title.
These styles should be available in your theme\'s CSS file.'), '#attached' => array( 'library' => array(array('ckeditor', 'drupal.ckeditor.stylescombo.admin')), ), diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php index df34b05..84dc8e1 100644 --- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php +++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php @@ -75,7 +75,6 @@ public function settingsForm(array $form, array &$form_state, Editor $editor) { // CKEditor plugin settings, if any. $form['plugin_settings'] = array( '#type' => 'vertical_tabs', - '#title' => t('Optional settings'), ); $manager->injectPluginSettingsForm($form, $form_state, $editor); if (count(element_children($form['plugins'])) === 0) { diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index 89fd11b..6db6210 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -119,15 +119,13 @@ function editor_form_filter_admin_format_form_alter(&$form, &$form_state) { // Associate a text editor with this text format. $editor_options = $manager->listOptions(); $form['editor'] = array( - '#type' => 'fieldset', - '#title' => t('Text editor'), // Position the editor selection before the filter settings (weight of 0), // but after the filter label and name (weight of -20). '#weight' => -9, ); $form['editor']['editor'] = array( '#type' => 'select', - '#title' => t('Current text editor'), + '#title' => t('Text editor'), '#options' => $editor_options, '#empty_option' => t('None'), '#default_value' => $editor ? $editor->editor : '',