Ground0/Typesetter
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

unknown name and js shift

Browse source 
unknown var name and js shifted to settings because otherwise always present  if cajon installed(bigger cms-js)
This commit is contained in:
gtbu 2022-06-01 09:53:01 +02:00
parent 2dcd14b7f7
commit a77e638910
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
themes/Cajon_Scss/assets/php/theme.php
View file

@ -13,10 +13,10 @@ class ThemeCajon{
// enable FontAwesome everywhere
\gp\tool::LoadComponents('fontawesome');
// Cajon Parallax
// Cajon Parallax - js now in settings.php
$page->css_user[] = $addonRelativeCode . '/addons/CajonParallax/CajonParallax.css';
$page->head_js[] = $addonRelativeCode . '/addons/CajonParallax/CajonParallax.js';
$page->head_js[] = $addonRelativeCode . '/addons/CajonParallax/jquery.scrollspeed/jQuery.scrollSpeed.js';
//$page->head_js[] = $addonRelativeCode . '/addons/CajonParallax/CajonParallax.js';
//$page->head_js[] = $addonRelativeCode . '/addons/CajonParallax/jquery.scrollspeed/jQuery.scrollSpeed.js';
}

4
themes/Cajon_Scss/assets/theme_settings/settings.php
View file

@ -71,8 +71,8 @@ class ThemeCajon_Settings{
$layout = isset($page->TitleInfo['gpLayout']) ? $page->TitleInfo['gpLayout'] : 'default';
$layout = isset($page->gpLayout) ? $page->gpLayout : $layout;
$default_layout = $config['gpLayout'];
$gplayoutsvar1 = $gpLayouts[$default_layout]['name'];
$gplayoutsvar2 = $gpLayouts[$layout]['name'];
$gplayoutsvar1 = $gpLayouts[$default_layout]['name'] ?? 0;
$gplayoutsvar2 = $gpLayouts[$layout]['name'] ?? 0;
$current_theme_name = $layout == 'default' ? $gplayoutsvar1 : $gplayoutsvar2;
$is_current_theme = ($current_theme_name == $theme_name);
return $is_current_theme;

7
themes/Cajon_Scss/settings.php
View file

@ -4,4 +4,9 @@ $GP_GETALLGADGETS = true;
$link = common::Link('','%s');
gpOutput::Area('header','<h1>'.$link.'</h1>');
gpOutput::Area('link_label','<h3>%s</h3>');
*/
*/
global $page;
// moved from theme.php - otherwise always present
$page->head_js[] = dirname($page->theme_path) . '/addons/CajonParallax/CajonParallax.js';
$page->head_js[] = dirname($page->theme_path) . '/addons/CajonParallax/jquery.scrollspeed/jQuery.scrollSpeed.js';