| @@ -25,8 +25,15 @@ | ||
| 25 | 25 | // get the current page and root URIs |
| 26 | 26 | $vbo_page_uri = htmlspecialchars((string) JUri::getInstance(), ENT_QUOTES); |
| 27 | 27 | $root_uri = htmlspecialchars(JUri::root(), ENT_QUOTES); |
| 28 | 28 | |
| 29 | +/** | |
| 30 | + * We allow to sort the admin widgets. | |
| 31 | + * | |
| 32 | + * @since 1.16.10 (J) - 1.6.10 (WP) | |
| 33 | + */ | |
| 34 | +JHtml::fetch('script', VBO_SITE_URI.'resources/jquery-ui.sortable.min.js'); | |
| 35 | + | |
| 29 | 36 | // get admin widgets helper |
| 30 | 37 | $widgets_helper = VikBooking::getAdminWidgetsInstance(); |
| 31 | 38 | |
| 32 | 39 | // get all widgets by preloading their assets (if any) |
| @@ -165,8 +172,19 @@ | ||
| 165 | 172 | } |
| 166 | 173 | ?> |
| 167 | 174 | </div> |
| 168 | 175 | |
| 176 | + <div class="vbo-sidepanel-shortcut" style="<?php echo $active_widgets ? 'display: none;' : ''; ?>"> | |
| 177 | + <div class="shortcut-keys"> | |
| 178 | + <span class="mod"></span> | |
| 179 | + <span class="key">⏎</span> | |
| 180 | + </div> | |
| 181 | + <div class="shortcut-desc"> | |
| 182 | + <?php echo JText::translate('VBO_KEYBOARD_SHORTCUT'); ?> | |
| 183 | + </div> | |
| 184 | + <div class="shortcut-subdesc"></div> | |
| 185 | + </div> | |
| 186 | + | |
| 169 | 187 | <div class="vbo-sidepanel-edit-widgets"> |
| 170 | 188 | <div class="vbo-sidepanel-edit-widgets-wrap"> |
| 171 | 189 | <button class="btn btn-small vbo-sidepanel-edit-widgets-trig" style="<?php echo !count($active_widgets) ? 'display: none;' : ''; ?>"><?php echo JText::translate('VBO_WIDGETS_CUSTWIDGETS'); ?></button> |
| 172 | 190 | </div> |
| @@ -258,8 +276,9 @@ | ||
| 258 | 276 | let set_mode = jQuery(this).attr('data-scheme'); |
| 259 | 277 | |
| 260 | 278 | let vbo_css_base_uri = '<?php echo VBO_ADMIN_URI . (VBOPlatformDetection::isWordPress() ? 'resources/' : '') . 'vbo-appearance-%s.css'; ?>'; |
| 261 | 279 | let vbo_css_base_id = 'vbo-css-appearance-'; |
| 280 | + let vcm_css_base_id = 'vcm-css-appearance-'; | |
| 262 | 281 | let vbo_css_modes = { |
| 263 | 282 | auto: vbo_css_base_uri.replace('%s', 'auto'), |
| 264 | 283 | dark: vbo_css_base_uri.replace('%s', 'dark'), |
| 265 | 284 | light: null, |
| @@ -303,8 +322,15 @@ | ||
| 303 | 322 | } else if (jQuery('link#' + vbo_css_base_id + app_mode + '-css').length) { |
| 304 | 323 | // WP framework may add "-css" as suffix to the given ID |
| 305 | 324 | jQuery('link#' + vbo_css_base_id + app_mode + '-css').remove(); |
| 306 | 325 | } |
| 326 | + // check if the VCM related CSS file should be unset too | |
| 327 | + if (jQuery('link#' + vcm_css_base_id + app_mode).length) { | |
| 328 | + jQuery('link#' + vcm_css_base_id + app_mode).remove(); | |
| 329 | + } else if (jQuery('link#' + vcm_css_base_id + app_mode + '-css').length) { | |
| 330 | + // WP framework may add "-css" as suffix to the given ID | |
| 331 | + jQuery('link#' + vcm_css_base_id + app_mode + '-css').remove(); | |
| 332 | + } | |
| 307 | 333 | } |
| 308 | 334 | } |
| 309 | 335 | |
| 310 | 336 | // close menu-list |
| @@ -333,6 +359,10 @@ | ||
| 333 | 359 | jQuery('.vbo-sidepanel-colorscheme-list-show').removeClass('vbo-sidepanel-colorscheme-list-show'); |
| 334 | 360 | } |
| 335 | 361 | }); |
| 336 | 362 | |
| 363 | + // dinamycally change the shortcut modifier depending on the OS | |
| 364 | + const isMacOs = navigator.platform.toUpperCase().indexOf('MAC') === 0; | |
| 365 | + jQuery('.vbo-sidepanel-shortcut .shortcut-keys .mod').text(isMacOs ? '⌘' : '⌃'); | |
| 366 | + jQuery('.vbo-sidepanel-shortcut .shortcut-subdesc').text(isMacOs ? '(CMD + ENTER)' : '(CTRL + ENTER)'); | |
| 337 | 367 | }); |
| 338 | 368 | </script> |
