From 0f82c3348dccbc9f3ce5023e14d042a4113232ac Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:37:04 -0400 Subject: [PATCH] [frio] Rename bgcolor to background-color --- view/theme/frio/config.php | 8 ++++---- view/theme/frio/css/style.css | 2 +- view/theme/frio/style.php | 8 ++++---- view/theme/frio/templates/theme_settings.tpl | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index a3d8d94bd..591901780 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -59,7 +59,7 @@ function theme_content(App $a) $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg'); $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color'); - $arr['bgcolor'] = PConfig::get(local_user(), 'frio', 'background_color'); + $arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color'); $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp'); $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image'); $arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option'); @@ -78,12 +78,12 @@ function theme_admin(App $a) $arr['nav_bg'] = Config::get('frio', 'nav_bg'); $arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color'); $arr['link_color'] = Config::get('frio', 'link_color'); - $arr['bgcolor'] = Config::get('frio', 'background_color'); + $arr['background_color'] = Config::get('frio', 'background_color'); $arr['contentbg_transp'] = Config::get('frio', 'contentbg_transp'); $arr['background_image'] = Config::get('frio', 'background_image'); $arr['bg_image_option'] = Config::get('frio', 'bg_image_option'); $arr['login_bg_image'] = Config::get('frio', 'login_bg_image'); - $arr['login_bg_color'] = Config::get('frio', 'login_bg_color'); + $arr['login_bg_color'] = Config::get('frio', 'login_bg_color'); return frio_form($arr); } @@ -122,7 +122,7 @@ function frio_form($arr) '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], - '$bgcolor' => array_key_exists('bgcolor', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false], + '$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['background_color'], '', false], '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ((isset($arr['contentbg_transp']) && $arr['contentbg_transp'] != '') ? $arr['contentbg_transp'] : 100), ''], '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], '$bg_image_options' => Image::get_options($arr), diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 8a3ca8629..839aa9ac3 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -24,7 +24,7 @@ and open the template in the editor. body { padding-top: 110px; - background-color: $bgcolor; + background-color: $background_color; background-image: url("$background_image"); background-size: $background_size_img; background-attachment: fixed; diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php index f032b89cc..811db092a 100644 --- a/view/theme/frio/style.php +++ b/view/theme/frio/style.php @@ -23,7 +23,7 @@ if ($a->module !== 'install') { $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); $nav_icon_color = PConfig::get($uid, 'frio', 'nav_icon_color'); $link_color = PConfig::get($uid, 'frio', 'link_color'); - $bgcolor = PConfig::get($uid, 'frio', 'background_color'); + $background_color = PConfig::get($uid, 'frio', 'background_color'); $contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp'); $background_image = PConfig::get($uid, 'frio', 'background_image'); $bg_image_option = PConfig::get($uid, 'frio', 'bg_image_option'); @@ -42,7 +42,7 @@ if ($a->module !== 'install') { $nav_bg = Config::get('frio', 'nav_bg'); $nav_icon_color = Config::get('frio', 'nav_icon_color'); $link_color = Config::get('frio', 'link_color'); - $bgcolor = Config::get('frio', 'background_color'); + $background_color = Config::get('frio', 'background_color'); $contentbg_transp = Config::get('frio', 'contentbg_transp'); $background_image = Config::get('frio', 'background_image'); $bg_image_option = Config::get('frio', 'bg_image_option'); @@ -99,7 +99,7 @@ if (!$scheme) { $nav_bg = (empty($nav_bg) ? '#708fa0' : $nav_bg); $nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color); $link_color = (empty($link_color) ? '#6fdbe8' : $link_color); -$bgcolor = (empty($bgcolor) ? '#ededed' : $bgcolor); +$background_color = (empty($background_color) ? '#ededed' : $background_color); // The background image can not be empty. So we use a dummy jpg if no image was set. $background_image = (empty($background_image) ? 'img/none.jpg' : $background_image); $modified = (empty($modified) ? time() : $modified); @@ -183,7 +183,7 @@ $options = [ '$menu_background_hover_color' => $menu_background_hover_color, '$btn_primary_color' => $nav_icon_color, '$btn_primary_hover_color' => $menu_background_hover_color, - '$bgcolor' => $bgcolor, + '$background_color' => $background_color, '$contentbg_transp' => $contentbg_transp, '$background_image' => $background_image, '$background_size_img' => $background_size_img, diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index c88641e74..f524dd6e0 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -10,7 +10,7 @@ {{if $nav_icon_color}}{{include file="field_colorinput.tpl" field=$nav_icon_color}}{{/if}} {{if $link_color}}{{include file="field_colorinput.tpl" field=$link_color}}{{/if}} -{{if $bgcolor}}{{include file="field_colorinput.tpl" field=$bgcolor}}{{/if}} +{{if $background_color}}{{include file="field_colorinput.tpl" field=$background_color}}{{/if}} {{* The slider for the content opacity - We use no template for this since it is only used at this page *}} {{if $contentbg_transp}}