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

[*] FO : Move header modules to new hook, first part 1/2

Browse Source
This commit is contained in:
gRoussac
2013-12-10 20:52:22 +01:00
parent 78df7f52f4
commit 1dcc5e288c
41 changed files with 306 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
-1
View File
@@ -435,7 +435,6 @@ class FrontControllerCore extends Controller
$this->context->smarty->assign(array(
'HOOK_HEADER' => Hook::exec('displayHeader'),
'HOOK_TOP' => Hook::exec('displayTop'),
'HOOK_TOP_COLUMN' => ($this->display_column_left ? Hook::exec('displayTopColumn') : ''),
'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''),
'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''),
));
modules/blockbanner/blockbanner.php
+14 -3
View File
@@ -33,7 +33,7 @@ class BlockBanner extends Module
{
$this->name = 'blockbanner';
$this->tab = 'other';
$this->version = 1.0;
$this->version = 1.1;
$this->author = 'PrestaShop';
$this->need_instance = 0;
@@ -49,7 +49,7 @@ class BlockBanner extends Module
Configuration::updateValue('BLOCKBANNER_IMG', 'sale70.gif');
Configuration::updateValue('BLOCKBANNER_LINK', '');
Configuration::updateValue('BLOCKBANNER_DESC', '');
return parent::install() && $this->registerHook('displayTop') && $this->registerHook('header');
return parent::install() && $this->registerHook('displayBanner') && $this->registerHook('displayHeader');
}
public function uninstall()
@@ -76,10 +76,21 @@ class BlockBanner extends Module
if ($total <= 0)
return;
}
return $this->display(__FILE__, 'blockbanner.tpl', $this->getCacheId());
}
public function hookHeader($params)
public function hookDisplayBanner($params)
{
return $this->hookDisplayTop($params);
}
public function hookDisplayFooter($params)
{
return $this->hookDisplayTop($params);
}
public function hookDisplayHeader($params)
{
$this->context->controller->addCSS($this->_path.'blockbanner.css', 'all');
}
modules/blockbanner/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>blockbanner</name>
<displayName><![CDATA[Banner block]]></displayName>
<version><![CDATA[1]]></version>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Displays banner at the top of the store.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[other]]></tab>
modules/blockbanner/upgrade/install-1.1.php
+9
View File
@@ -0,0 +1,9 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
function upgrade_module_1_1($object)
{
return ($object->registerHook('displayBanner') && $object->unregisterHook('displayTop'));
}
modules/blockcurrencies/blockcurrencies.css
+3 -3
View File
@@ -1,5 +1,5 @@
/* block top currencies */
#header_right #currencies_block_top {
#currencies_block_top {
float:right;
margin: 0 6px 0 0;
padding: 2px 6px;
@@ -11,7 +11,7 @@
border-bottom-left-radius: 3px;
background: none repeat scroll 0 0 #000;
}
#header_right #currencies_block_top p {
#currencies_block_top p {
clear: left;
padding-right:16px;
font: 11px Arial,Verdana,sans-serif;
@@ -57,4 +57,4 @@
width: auto;
background:#000000;
}
#setCurrency .currencies_ul_hover a {color:#fff;}
#setCurrency .currencies_ul_hover a {color:#fff;}
modules/blocklanguages/blocklanguages.css
+2 -2
View File
@@ -1,5 +1,5 @@
/* block top languages */
#header_right #languages_block_top {
#languages_block_top {
float:right;
margin: 0;
padding:2px 6px 1px 6px;
@@ -11,7 +11,7 @@
border-bottom-left-radius: 3px;
background: none repeat scroll 0 0 #000;
}
#header_right #languages_block_top p {
#languages_block_top p {
clear: left;
padding-right:20px;
font: 11px Arial,Verdana,sans-serif;
modules/blockuserinfo/blockuserinfo.css
+8 -8
View File
@@ -1,12 +1,12 @@
/* block top user information */
#header_right #header_user {
#header_user {
clear:both;
float: right;
margin-top:8px;
}
#header_right #header_user.header_user_catalog {
#header_user.header_user_catalog {
margin-top: 15px;
min-height: 60px;
}
@@ -36,26 +36,26 @@
#header_user #your_account a { background-image: url('img/icon/my-account.gif') }
/* user infos */
#header_user_info {
.header_user_info {
clear:both;
float:right;
margin-top:10px;
padding:0;
font-size:12px
}
#header_user_info a {
.header_user_info a {
display:inline-block;
margin:0 0 0 10px;
padding:3px 0 0 34px;
line-height: 11px;
border-left:1px solid #000
}
#header_user_info a.account {
.header_user_info a.account {
border: none;
display: inline;
margin: 0;
padding: 0;
}
*:first-child+html #header_user_info a {line-height:14px;}
#header_user_info a.login {background: url('img/icon/login.gif') no-repeat 10px 0}
#header_user_info a.logout {background: url('img/icon/logout.png') no-repeat 10px -1px}
*:first-child+html .header_user_info a {line-height:14px;}
.header_user_info a.login {background: url('img/icon/login.gif') no-repeat 10px 0}
.header_user_info a.logout {background: url('img/icon/logout.png') no-repeat 10px -1px}
modules/blockuserinfo/blockuserinfo.php
+9 -6
View File
@@ -33,7 +33,7 @@ class BlockUserInfo extends Module
{
$this->name = 'blockuserinfo';
$this->tab = 'front_office_features';
$this->version = 0.1;
$this->version = 0.2;
$this->author = 'PrestaShop';
$this->need_instance = 0;
@@ -45,7 +45,7 @@ class BlockUserInfo extends Module
public function install()
{
return (parent::install() AND $this->registerHook('top') AND $this->registerHook('header'));
return (parent::install() && $this->registerHook('displayNav') && $this->registerHook('displayNav') && $this->registerHook('displayHeader'));
}
/**
@@ -54,7 +54,7 @@ class BlockUserInfo extends Module
* @param array $params Parameters
* @return string Content
*/
public function hookTop($params)
public function hookDisplayTop($params)
{
if (!$this->active)
return;
@@ -71,10 +71,13 @@ class BlockUserInfo extends Module
return $this->display(__FILE__, 'blockuserinfo.tpl');
}
public function hookHeader($params)
public function hookDisplayHeader($params)
{
$this->context->controller->addCSS(($this->_path).'blockuserinfo.css', 'all');
}
}
public function hookDisplayNav($params)
{
return $this->display(__FILE__, 'nav.tpl');
}
}
modules/blockuserinfo/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>blockuserinfo</name>
<displayName><![CDATA[User info block]]></displayName>
<version><![CDATA[0.1]]></version>
<version><![CDATA[0.2]]></version>
<description><![CDATA[Adds a block that displays information about the customer.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
modules/blockuserinfo/nav.tpl
+14
View File
@@ -0,0 +1,14 @@
<!-- Block user information module NAV -->
{if $logged}
<div class="header_user_info">
<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}" class="account" rel="nofollow"><span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span></a>
</div>
{/if}
<div class="header_user_info">
{if $logged}
<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
{else}
<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
{/if}
</div>
<!-- /Block user information module NAV -->
modules/blockuserinfo/upgrade/install-0.2.php
+9
View File
@@ -0,0 +1,9 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
function upgrade_module_0_2($object)
{
return ($object->registerHook('displayNav'));
}
modules/homeslider/homeslider.php
+14 -5
View File
@@ -60,7 +60,7 @@ class HomeSlider extends Module
public function install()
{
/* Adds Module */
if (parent::install() && $this->registerHook('displayTopColumn') && $this->registerHook('actionShopDataDuplication'))
if (parent::install() && $this->registerHook('displayHeader') && $this->registerHook('displayTopColumn') && $this->registerHook('actionShopDataDuplication'))
{
/* Sets up configuration */
$res = Configuration::updateValue('HOMESLIDER_WIDTH', '779');
@@ -660,16 +660,25 @@ class HomeSlider extends Module
return true;
}
public function hookdisplayTopColumn()
public function hookdisplayHeader($params)
{
$this->context->controller->addJS($this->_path.'js/jquery.bxSlider.min.js');
$this->context->controller->addCSS($this->_path.'bx_styles.css');
$this->context->controller->addJS($this->_path.'js/homeslider.js');
}
public function hookdisplayTop($params)
{
return $this->hookdisplayTopColumn();
}
public function hookdisplayTopColumn($params)
{
if ($this->context->smarty->tpl_vars['page_name'] != 'index' || $this->context->getMobileDevice() != false)
return false;
if(!$this->_prepareHook())
return false;
$this->context->controller->addJS($this->_path.'js/jquery.bxSlider.min.js');
$this->context->controller->addCSS($this->_path.'bx_styles.css');
$this->context->controller->addJS($this->_path.'js/homeslider.js');
return $this->display(__FILE__, 'homeslider.tpl', $this->getCacheId());
}
modules/homeslider/upgrade/install-1.2.3.php
+1 -1
View File
@@ -5,5 +5,5 @@ if (!defined('_PS_VERSION_'))
function upgrade_module_1_2_3($object)
{
return ($object->unregisterHook('displayHome') && $object->registerHook('displayTopColumn'));
return ($object->unregisterHook('displayHome') && $object->registerHook('displayHeader') && $object->registerHook('displayTopColumn'));
}
modules/themeconfigurator/sass/theme-style1.scss
+3 -3
View File
@@ -24,13 +24,13 @@ body{background:#282828}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#c6c6c6;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -74,7 +74,7 @@ body{background:#282828}
background:$color1-style1}
}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
&:after{color:white}
modules/themeconfigurator/sass/theme-style2.scss
+3 -3
View File
@@ -25,13 +25,13 @@ body{background:#232323}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#656565;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:white;
&:hover, &.active {
@@ -84,7 +84,7 @@ body{background:#232323}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
&:after{color:white}
modules/themeconfigurator/sass/theme-style3.scss
+3 -3
View File
@@ -23,13 +23,13 @@ body{background:$color1-style1}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:white;
&:hover, &.active {
@@ -86,7 +86,7 @@ body{background:$color1-style1}
#search_block_top #search_query_top{color:#686666}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
text-shadow:0 1px #567931;
modules/themeconfigurator/sass/theme-style8.scss
+3 -3
View File
@@ -26,13 +26,13 @@ body{background:#282828}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -76,7 +76,7 @@ body{background:#282828}
background:$color2-style1}
}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
&:after{color:white}
modules/themeconfigurator/sass/theme2.scss
+3 -3
View File
@@ -24,13 +24,13 @@ body{background:#282828}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#c6c6c6;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -74,7 +74,7 @@ body{background:#282828}
background:$color1-style1}
}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
&:after{color:white}
modules/themeconfigurator/sass/theme3.scss
+3 -3
View File
@@ -28,13 +28,13 @@ body{background:#3c281c}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#656565;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:#fff;
&:hover, &.active {
@@ -94,7 +94,7 @@ body{background:#3c281c}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color1-style1;
color:white;
&:after{color:white}
modules/themeconfigurator/sass/theme4.scss
+3 -3
View File
@@ -29,13 +29,13 @@ body{background:#1b1b1b}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#656565;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -100,7 +100,7 @@ body{background:#1b1b1b}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
&:after{color:white}
modules/themeconfigurator/sass/theme5.scss
+3 -3
View File
@@ -28,13 +28,13 @@ body{background:#181212}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -100,7 +100,7 @@ body{background:#181212}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
text-shadow:$color-shadow;
modules/themeconfigurator/sass/theme6.scss
+3 -3
View File
@@ -25,13 +25,13 @@ $color-shadow: 0 1px #567931;
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:white;
&:hover, &.active {
@@ -87,7 +87,7 @@ $color-shadow: 0 1px #567931;
#search_block_top #search_query_top{color:#686666}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
text-shadow:$color-shadow;
modules/themeconfigurator/sass/theme7.scss
+3 -3
View File
@@ -28,13 +28,13 @@ body{background:#282828}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -95,7 +95,7 @@ body{background:#282828}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
text-shadow:$color-shadow;
modules/themeconfigurator/sass/theme8.scss
+3 -3
View File
@@ -28,14 +28,14 @@ body{background:#282828}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -101,7 +101,7 @@ body{background:#282828}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
text-shadow:$color-shadow;
modules/themeconfigurator/sass/theme9.scss
+3 -3
View File
@@ -28,14 +28,14 @@ body{background:#282828}
}
#currencies-block-top,
#languages-block-top,
.header-row #header_user_info{
.header-row .header_user_info{
border-color:#515151;
}
#currencies-block-top div.current,
#languages-block-top div.current,
.header-row #header_user_info a
.header-row .header_user_info a
{
color:$color1-style1;
&:hover, &.active {
@@ -101,7 +101,7 @@ body{background:#282828}
#header_right #header_user #shopping_cart a{
#header_user #shopping_cart a{
background:$color-style1;
color:white;
text-shadow:$color-shadow;
modules/themeconfigurator/themeconfigurator.php
+6 -1
View File
@@ -203,7 +203,12 @@ class ThemeConfigurator extends Module
}
}
public function hookdisplayTopColumn()
public function hookdisplayTopColumn($params)
{
return $this->hookdisplayTop($params);
}
public function hookdisplayTop($params)
{
if ((int)Tools::getValue('live_configurator', 0) == 1)
{
themes/default-bootstrap/css/global.css
+11 -10
View File
@@ -5295,6 +5295,7 @@ div.star a:hover {
background: white; }
#header .header-row {
background: #333333; }
#header .header-row.container {background:none; position:relative; z-index:1;}
#header .header-row .shop-phone {
display: block;
padding: 5px 0 10px; }
@@ -5308,21 +5309,23 @@ div.star a:hover {
padding-right: 7px; }
#header .header-row .shop-phone strong {
color: white; }
#header .header-row #header_user_info {
float: right;
#header .header-row nav {
float: right; }
#header .header-row .header_user_info {
float: left;
border-left: 1px solid #515151;
border-right: 1px solid #515151; }
@media (max-width: 479px) {
#header .header-row #header_user_info {
#header .header-row .header_user_info {
width: 25%;
text-align: center; } }
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
font-weight: bold;
display: block;
padding: 8px 9px 11px 8px; }
@media (max-width: 479px) {
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
font-size: 11px; } }
#header .header-row-2 {
position: relative;
@@ -5347,8 +5350,6 @@ div.star a:hover {
left: 50%;
margin-left: -100px;
top: 20px; } }
#header #header_right {
position: relative; }
#header #currencies-block-top,
#header #languages-block-top {
float: right;
@@ -5440,13 +5441,13 @@ div.star a:hover {
padding-left: 5px;
padding-right: 5px; } }
#header #contact-link a,
#header .header-row #header_user_info a,
#header .header-row .header_user_info a,
#header #currencies-block-top div.current,
#header #languages-block-top div.current {
cursor: pointer; }
#header #contact-link a:hover, #header #contact-link a.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active,
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active,
#header #currencies-block-top div.current:hover,
#header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css
+10 -10
View File
@@ -1,16 +1,16 @@
/* block top user information */
#header_right #header_user {
#header_user {
clear: both;
float: right;
margin-top: 50px;
}
@media (min-width: 480px) and (max-width: 767px) {
#header_right #header_user {
#header_user {
margin-top: 25px;
}
}
@media (max-width: 479px) {
#header_right #header_user {
#header_user {
float: none;
margin-left: auto;
margin-right: auto;
@@ -18,7 +18,7 @@
width: 270px;
}
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
padding: 7px 10px 14px 16px;
background: #333333;
width: 270px;
@@ -29,21 +29,21 @@
overflow: hidden;
}
@media (min-width: 768px) and (max-width: 991px) {
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
width: 190px;
}
}
@media (min-width: 768px) and (max-width: 991px) {
#header_right #header_user #shopping_cart a span.ajax_cart_product_txt, #header_right #header_user #shopping_cart a span.ajax_cart_product_txt_s {
#header_user #shopping_cart a span.ajax_cart_product_txt, #header_user #shopping_cart a span.ajax_cart_product_txt_s {
display: none !important;
}
}
#header_right #header_user #shopping_cart a b {
#header_user #shopping_cart a b {
color: white;
font: 600 18px/22px "Open Sans", sans-serif;
padding-right: 5px;
}
#header_right #header_user #shopping_cart a:before {
#header_user #shopping_cart a:before {
content: "";
font-family: "FontAwesome";
display: inline-block;
@@ -52,7 +52,7 @@
color: white;
padding-right: 15px;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
content: "";
font-family: "FontAwesome";
display: inline-block;
@@ -61,6 +61,6 @@
color: #686666;
padding: 6px 0 0 0;
}
#header_right #header_user #shopping_cart .ajax_cart_total {
#header_user #shopping_cart .ajax_cart_total {
display: none !important;
}
themes/default-bootstrap/css/theme2.css
+7 -7
View File
@@ -22,19 +22,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #c6c6c6;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: #333333;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #b7b7b7;
color: white;
}
@@ -69,14 +69,14 @@ body {
background: #333333;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #f44051;
color: white;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
background: #333333;
}
themes/default-bootstrap/css/theme3.css
+7 -7
View File
@@ -23,19 +23,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #656565;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: #fff;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #878872;
color: white;
}
@@ -84,14 +84,14 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #878872;
color: white;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
text-shadow: 0 1px #333;
background: #333333;
themes/default-bootstrap/css/theme4.css
+7 -7
View File
@@ -23,19 +23,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #656565;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #eac12d;
color: white;
}
@@ -89,14 +89,14 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #eac12d;
color: white;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
background: #333;
}
themes/default-bootstrap/css/theme5.css
+7 -7
View File
@@ -22,19 +22,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #515151;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #b04445;
color: white;
}
@@ -90,15 +90,15 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #b04445;
color: white;
text-shadow: 0 1px #8b3637;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
text-shadow: 0 1px #333;
background: #333333;
themes/default-bootstrap/css/theme6.css
+7 -7
View File
@@ -22,19 +22,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #515151;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #2b2b2b;
color: white;
}
@@ -78,15 +78,15 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #719f41;
color: white;
text-shadow: 0 1px #567931;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
text-shadow: 0 1px #333;
background: #333333;
themes/default-bootstrap/css/theme7.css
+7 -7
View File
@@ -22,19 +22,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #515151;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #327082;
color: white;
}
@@ -85,15 +85,15 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #327082;
color: white;
text-shadow: 0 1px #265563;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
text-shadow: 0 1px #333;
background: #333333;
themes/default-bootstrap/css/theme8.css
+7 -7
View File
@@ -22,19 +22,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #515151;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #2b2b2b;
color: white;
}
@@ -85,15 +85,15 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #43bebd;
color: white;
text-shadow: 0 1px #379c9c;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
text-shadow: 0 1px #333;
background: #333333;
themes/default-bootstrap/css/theme9.css
+7 -7
View File
@@ -22,19 +22,19 @@ body {
}
#header #currencies-block-top,
#header #languages-block-top,
#header .header-row #header_user_info {
#header .header-row .header_user_info {
border-color: #515151;
}
#header #currencies-block-top div.current,
#header #languages-block-top div.current,
#header .header-row #header_user_info a {
#header .header-row .header_user_info a {
color: white;
}
#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
#header #languages-block-top div.current:hover,
#header #languages-block-top div.current.active,
#header .header-row #header_user_info a:hover,
#header .header-row #header_user_info a.active {
#header .header-row .header_user_info a:hover,
#header .header-row .header_user_info a.active {
background: #2b2b2b;
color: white;
}
@@ -85,15 +85,15 @@ body {
color: #686666;
}
#header_right #header_user #shopping_cart a {
#header_user #shopping_cart a {
background: #eea200;
color: white;
text-shadow: 0 1px #b57b00;
}
#header_right #header_user #shopping_cart a:after {
#header_user #shopping_cart a:after {
color: white;
}
#header_right #header_user #shopping_cart a:hover {
#header_user #shopping_cart a:hover {
color: white;
text-shadow: 0 1px #333;
background: #333333;
themes/default-bootstrap/header.tpl
+16 -94
View File
@@ -46,7 +46,6 @@
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<!-- <link rel="stylesheet" href="{$css_dir}highdpi.css" type="text/css" media="screen" /> -->
<link rel="stylesheet" href="{$css_dir}jquery/uniform.default.css" type="text/css" media="all" />
<link rel="stylesheet" href="{$css_dir}jquery/footable.core.css" type="text/css" media="all" />
<link rel="stylesheet" href="{$css_dir}jquery/jquery.bxslider.css" type="text/css" media="all" />
@@ -104,98 +103,21 @@
<div class="header-container">
<header id="header">
<div class="header-row">
<nav class="container clearfix">
<div id="header_user_info">
{if $logged}
<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
{else}
<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
{/if}
</div> <!-- #header_user_info -->
{if count($languages) > 1}
<div id="languages-block-top">
<div id="countries">
{foreach from=$languages key=k item=language name="languages"}
{if $language.iso_code == $lang_iso}
<div class="current">
<span>{$language.name}</span>
</div>
{/if}
{/foreach}
<ul id="first-languages" class="countries_ul toogle_content">
{foreach from=$languages key=k item=language name="languages"}
<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
{if $language.iso_code != $lang_iso}
{assign var=indice_lang value=$language.id_lang}
{if isset($lang_rewrite_urls.$indice_lang)}
<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
{else}
<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
{/if}
{/if}
<span>{$language.name}</span>
{if $language.iso_code != $lang_iso}
</a>
{/if}
</li>
{/foreach}
</ul>
</div>
</div> <!-- #languages-block-top -->
<script type="text/javascript">
$(document).ready(function(){
$('#countries .current span, #countries .countries_ul li span').each(function() {
var h = $(this).html();
var index = h.indexOf(' ');
if(index == -1) {
index = h.length;
}
$(this).html('<span class="firstWord">'+ h.substring(index, h.length) + '</span>' + h.substring(0, index));
});
});
</script>
{/if}
{if count($currencies) > 1}
<div id="currencies-block-top">
<form id="setCurrency" action="{$request_uri}" method="post">
<div class="current">
<input type="hidden" name="id_currency" id="id_currency" value=""/>
<input type="hidden" name="SubmitCurrency" value="" />
<span class="cur-label">{l s='Currency'} :</span>
{foreach from=$currencies key=k item=f_currency}
{if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
{/foreach}
</div>
<ul id="first-currencies" class="currencies_ul toogle_content">
{foreach from=$currencies key=k item=f_currency}
<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
<a href="javascript:setCurrency({$f_currency.id_currency});" rel="nofollow" title="{$f_currency.name}">{$f_currency.name}</a>
</li>
{/foreach}
</ul>
</form>
</div> <!-- #currencies-block-top -->
{/if}
<div id="contact-link">
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
</div>
{if $shop_phone}
<span class="shop-phone">
<i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong>
</span>
{/if}
</nav>
</div> <!-- .header-row -->
<div class="container header-row-2">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
</a>
<div id="header_right">
{$HOOK_TOP}
{hook h="displayBanner"}
<div class="container">
<nav>
{hook h="displayNav"}
</nav>
</div>
</div> <!-- .header-row-2 -->
</div>
<div class="container header-row">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}"{if $logo_image_width} width="{$logo_image_width}"{/if}{if $logo_image_height} height="{$logo_image_height}"{/if}/>
</a>
{if isset($HOOK_TOP)}{$HOOK_TOP}{/if}
</div>
</header>
</div> <!-- .header-container -->
</div>
<div class="columns-container">
<div id="columns" class="container">
{if $page_name !='index' && $page_name !='pagenotfound'}
@@ -203,14 +125,14 @@
{/if}
<div class="row">
<div id="top_column" class="center_column col-xs-12 col-sm-12">
{$HOOK_TOP_COLUMN}
{hook h="displayTopColumn"}
</div>
</div>
<div class="row">
{if isset($left_column_size) && !empty($left_column_size)}
<!-- Left -->
<div id="left_column" class="column col-xs-12 col-sm-3">
{$HOOK_LEFT_COLUMN}
</div>
{/if}
<!-- Center -->
<div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
{/if}
themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
+4 -4
View File
@@ -726,23 +726,23 @@ $(document).ready(function()
$("#shopping_cart a:first").hover(
function() {
if (ajaxCart.nb_total_products > 0 || cart_qty > 0)
$("#header_right #cart_block").stop(true, true).slideDown(450);
$("#header #cart_block").stop(true, true).slideDown(450);
},
function() {
setTimeout(function() {
if (!shopping_cart.isHoveringOver() && !cart_block.isHoveringOver())
$("#header_right #cart_block").stop(true, true).slideUp(450);
$("#header #cart_block").stop(true, true).slideUp(450);
}, 200);
}
);
$("#header_right #cart_block").hover(
$("#header #cart_block").hover(
function() {
},
function() {
setTimeout(function() {
if (!shopping_cart.isHoveringOver())
$("#header_right #cart_block").stop(true, true).slideUp(450);
$("#header #cart_block").stop(true, true).slideUp(450);
}, 200);
}
);
themes/default-bootstrap/modules/blockuserinfo/nav.tpl
+14
View File
@@ -0,0 +1,14 @@
<!-- Block user information module NAV -->
{if $logged}
<div class="header_user_info">
<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}" class="account" rel="nofollow"><span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span></a>
</div>
{/if}
<div class="header_user_info">
{if $logged}
<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
{else}
<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
{/if}
</div>
<!-- /Block usmodule NAV -->
themes/default-bootstrap/sass/global.scss
+8 -7
View File
@@ -1648,6 +1648,8 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
.header-row {
background:$dark-background;
.container {background:none; position:relative; z-index:1;}
.shop-phone {
display:block;
@@ -1665,9 +1667,12 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
strong {color:$light-text-color;}
}
.header-row nav {
float: right; }
#header_user_info {
float:right;
.header_user_info {
float:left;
border-left:1px solid #515151;
border-right:1px solid #515151;
@media (max-width: $screen-xs - 1) { // max 479px
@@ -1685,7 +1690,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
}
}
.header-row-2 { position:relative; z-index:1;}
#header_logo {
position: absolute;
left:0;
@@ -1707,9 +1711,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
top:20px;
}
}
#header_right {
position:relative;
}
/* languages/currencies */
#currencies-block-top, #languages-block-top {
float:right;
@@ -1803,7 +1804,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
}
}
#contact-link a, .header-row #header_user_info a, #currencies-block-top div.current, #languages-block-top div.current {
#contact-link a, .header-row .header_user_info a, #currencies-block-top div.current, #languages-block-top div.current {
cursor:pointer;
&:hover, &.active {
themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
+60 -62
View File
@@ -1,71 +1,69 @@
@import '../../_theme_variables';
/* block top user information */
#header_right {
#header_user {
#header_user {
clear:both;
float: right;
margin-top:50px;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:25px;
}
@media (max-width: $screen-xs - 1) { // max 479px
float: none;
margin-left: auto;
margin-right: auto;
margin-top: 95px;
width: 270px;
}
#shopping_cart {
clear:both;
float: right;
margin-top:50px;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:25px;
}
@media (max-width: $screen-xs - 1) { // max 479px
float: none;
margin-left: auto;
margin-right: auto;
margin-top: 95px;
width: 270px;
}
#shopping_cart {
a {
padding:7px 10px 14px 16px;
background:$dark-background;
width: 270px;
display:block;
font-weight:bold;
color:#777777;
text-shadow:1px 1px rgba(0,0,0,0.2);
overflow:hidden;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:190px;
}
span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
display:none !important;
}
}
b {
color:$light-text-color;
font:600 18px/22px $font-custom;
padding-right:5px;
}
&:before {
content:"";
font-family:$font-icon;
display:inline-block;
font-size:23px;
line-height:23px;
color:$light-text-color;
padding-right:15px;
}
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
float:right;
font-size:18px;
color:#686666;
padding:6px 0 0 0;
}
a {
padding:7px 10px 14px 16px;
background:$dark-background;
width: 270px;
display:block;
font-weight:bold;
color:#777777;
text-shadow:1px 1px rgba(0,0,0,0.2);
overflow:hidden;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:190px;
}
span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
display:none !important;
}
}
.ajax_cart_total { display:none !important; }
b {
color:$light-text-color;
font:600 18px/22px $font-custom;
padding-right:5px;
}
&:before {
content:"";
font-family:$font-icon;
display:inline-block;
font-size:23px;
line-height:23px;
color:$light-text-color;
padding-right:15px;
}
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
float:right;
font-size:18px;
color:#686666;
padding:6px 0 0 0;
}
}
.ajax_cart_total { display:none !important; }
}
}