opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

Browse source
This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/modules/ckeditor/ckeditor.admin.inc
View file

@ -18,6 +18,10 @@ use Drupal\Core\Language\LanguageInterface;
* An associative array containing:
* - editor: An editor object.
* - plugins: A list of plugins.
* - active_buttons: A list of disabled buttons.
* - disabled_buttons: A list of disabled buttons.
* - multiple_buttons: A list of multiple buttons that may be added multiple
* times.
*/
function template_preprocess_ckeditor_settings_toolbar(&$variables) {
$language_interface = \Drupal::languageManager()->getCurrentLanguage();
@ -70,10 +74,10 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
elseif (isset($button['image_alternative'])) {
$value = $button['image_alternative'];
}
elseif (isset($button['image'])) {
elseif (isset($button['image']) || isset($button['image' . $rtl])) {
$value = array(
'#theme' => 'image',
'#uri' => $button['image' . $rtl],
'#uri' => isset($button['image' . $rtl]) ? $button['image' . $rtl] : $button['image'],
'#title' => $button['label'],
'#prefix' => '<a href="#" role="button" title="' . $button['label'] . '" aria-label="' . $button['label'] . '"><span class="cke_button_icon">',
'#suffix' => '</span></a>',
@ -113,6 +117,7 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
$variables['active_buttons'] = array();
foreach ($active_buttons as $row_number => $button_row) {
foreach ($button_groups[$row_number] as $group_name) {
$group_name = (string) $group_name;
$variables['active_buttons'][$row_number][$group_name] = array(
'group_name_class' => Html::getClass($group_name),
'buttons' => array(),