Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions template.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,15 @@ function kalatheme_process_page(&$variables) {
if (!kalatheme_use_libraries()) {
$library = theme_get_setting('bootstrap_library');
if ($library !== 'none' && !empty($library)) {
// Add the JS
drupal_add_js($base['scheme'] . ":" . KALATHEME_BOOTSTRAP_JS, 'external');
// Add the JS. Note that we have to put Bootstrap after jQuery, but before jQuery UI.
$url = $base['scheme'] . ":" . KALATHEME_BOOTSTRAP_JS;
$jquery_ui_library = drupal_get_library('system', 'ui');
$jquery_ui_js = reset($jquery_ui_library['js']);
drupal_add_js($url, array(
'type' => 'external',
'group' => JS_LIBRARY,
'weight' => $jquery_ui_js['weight'] - 1,
));

// Add the CSS
if ($library == 'default') {
Expand Down