dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
rGaillard
2013-11-18 17:46:20 +01:00
parent 5c1f8871fc 57b329ca74
commit 7755cd8d3e
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/themeconfigurator/themeconfigurator.php
+3 -5
View File
@@ -80,7 +80,7 @@ class ThemeConfigurator extends Module
!$this->registerHook('displayBackOfficeHeader') || !$this->registerHook('displayBackOfficeHeader') ||
!Configuration::updateValue('PS_TC_THEMES', serialize($themes_colors)) || !Configuration::updateValue('PS_TC_THEMES', serialize($themes_colors)) ||
!Configuration::updateValue('PS_TC_THEMES_FONTS', serialize($themes_fonts))) !Configuration::updateValue('PS_TC_FONTS', serialize($themes_fonts)))
return false; return false;
return true; return true;
@@ -147,9 +147,7 @@ class ThemeConfigurator extends Module
if (Tools::isSubmit('submitLiveConfigurator')) if (Tools::isSubmit('submitLiveConfigurator'))
{ {
Configuration::updateValue('PS_TC_THEME', Tools::getValue('theme')); Configuration::updateValue('PS_TC_THEME', Tools::getValue('theme'));
Configuration::updateValue('PS_TC_TEXT_PAGE_FONT', Tools::getValue('text-page-font')); Configuration::updateValue('PS_TC_FONT', Tools::getValue('font'));
Configuration::updateValue('PS_TC_TEXT_MENU_FONT', Tools::getValue('text-menu-font'));
Configuration::updateValue('PS_TC_PRODUCT_NAME_FONT', Tools::getValue('product-name-font'));
} }
$this->context->controller->addCSS($this->_path.'css/live_configurator.css'); $this->context->controller->addCSS($this->_path.'css/live_configurator.css');
@@ -157,7 +155,7 @@ class ThemeConfigurator extends Module
$this->smarty->assign(array( $this->smarty->assign(array(
'themes' => unserialize(Configuration::get('PS_TC_THEMES')), 'themes' => unserialize(Configuration::get('PS_TC_THEMES')),
'themes_fonts' => unserialize(Configuration::get('PS_TC_THEMES_FONTS')), 'fonts' => unserialize(Configuration::get('PS_TC_FONTS')),
'advertisement_image' => $this->_path.'/img/'.$this->context->language->iso_code.'/advertisement.png', 'advertisement_image' => $this->_path.'/img/'.$this->context->language->iso_code.'/advertisement.png',
'advertisement_text' => $this->l('Over 500+ PrestaShop Premium Templates! Browse Now!') 'advertisement_text' => $this->l('Over 500+ PrestaShop Premium Templates! Browse Now!')
)); ));
modules/themeconfigurator/views/templates/hook/live_configurator.tpl
+2 -2
View File
@@ -61,8 +61,8 @@
</div> </div>
<div id="font-box"> <div id="font-box">
<p>{l s='Global' mod='themeconfigurator'}</p> <p>{l s='Global' mod='themeconfigurator'}</p>
<select name="text-page-font" class="font-list"> <select name="font" class="font-list">
{foreach $themes_fonts as $key => $font} {foreach $fonts as $key => $font}
<option value="{$key}">{$font}</option> <option value="{$key}">{$font}</option>
{/foreach} {/foreach}
</select> </select>