Skip to content

Commit

Permalink
Merge pull request ymcatwincities#975 from kolesnikoff/feature/ckedit…
Browse files Browse the repository at this point in the history
…or_bootstrap_buttons

Add CKEditor Bootstrap Buttons module.
  • Loading branch information
podarok authored Mar 23, 2018
2 parents c51e1b5 + 9156df1 commit 3ef9011
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 7 deletions.
17 changes: 16 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,19 @@
"type": "zip"
}
}
},
{
"type": "package",
"package": {
"name": "library-smonetti/btbutton",
"version": "1.0.1",
"type": "drupal-library",
"source": {
"url": "https://github.com/smonetti/btbutton",
"type": "git",
"reference": "1620254d294a209bdf18cc0bc7b131d2ffaa10db"
}
}
}
],
"scripts": {
Expand Down Expand Up @@ -201,6 +214,7 @@
"library-gdsmith/jquery.easing": "1.4.1",
"library-ckeditor/panelbutton": "4.7.0",
"library-ckeditor/colorbutton": "4.7.0",
"library-smonetti/btbutton": "1.0.1",
"drupal/slick_views": "1.0-rc2",
"drupal/libraries": "3.x-dev",
"drupal/datalayer": "1.x-dev",
Expand Down Expand Up @@ -228,6 +242,7 @@
"drupal/focal_point": "1.0-beta5",
"drupal/media_entity_video": "1.0-beta2",
"drupal/video": "1.2",
"drupal/easy_breadcrumb": "^1.6"
"drupal/easy_breadcrumb": "^1.6",
"drupal/ckeditor_bootstrap_buttons": "^1.1"
}
}
70 changes: 64 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ projects[focal_point] = 1.0-beta5
projects[media_entity_video] = 1.0-beta2
projects[video] = 1.2
projects[easy_breadcrumb] = 1.6
projects[ckeditor_bootstrap_buttons] = 1.1
libraries[dropzone][type] = library
libraries[dropzone][download][type] = get
libraries[dropzone][download][url] = https://github.com/enyo/dropzone/archive/v4.3.0.zip
Expand Down Expand Up @@ -96,3 +97,7 @@ libraries[colorbutton][type] = library
libraries[colorbutton][download][type] = get
libraries[colorbutton][download][url] = http://download.ckeditor.com/colorbutton/releases/colorbutton_4.7.0.zip
libraries[colorbutton][destination] = libraries
libraries[btbutton][type] = library
libraries[btbutton][download][type] = get
libraries[btbutton][download][url] = https://github.com/smonetti/btbutton/archive/1620254d294a209bdf18cc0bc7b131d2ffaa10db.zip
libraries[btbutton][destination] = libraries
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ settings:
- SpecialChar
- Maximize
- Language
- btbutton
plugins:
language:
language_list: un
Expand Down
1 change: 1 addition & 0 deletions openy.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ dependencies:
- video
- media_entity_video
- easy_breadcrumb
- ckeditor_bootstrap_buttons
# OpenY features.
- openy_svg_formatter
- openy_media_image
Expand Down
12 changes: 12 additions & 0 deletions openy.install
Original file line number Diff line number Diff line change
Expand Up @@ -590,3 +590,15 @@ function openy_update_8046() {
]);
}
}

/**
* Enable CKEditor Bootstrap Buttons module and import the settings.
*/
function openy_update_8047() {
// Enable CKEditor Bootstrap Buttons module.
\Drupal::service('module_installer')->install(['ckeditor_bootstrap_buttons'], TRUE);

$config = drupal_get_path('profile', 'openy') . '/config/install/editor.editor.full_html.yml';
$config_importer = \Drupal::service('openy_upgrade_tool.param_updater');
$config_importer->update($config, 'editor.editor.full_html', 'settings.toolbar');
}

0 comments on commit 3ef9011

Please sign in to comment.