antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict site_mobile css

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-02 15:23:47 +02:00
commit 73ceb55254
5 changed files with 93 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
adm/tabs/AdminProducts.php
View File

@ -1397,10 +1397,12 @@ class AdminProducts extends AdminTab
VALUES (
'.(int) $object->id.',
"'.pSQL(Tools::getValue('nc8')).'",
"'.pSQL(Tools::getValue('id_country')).'"
"'.pSQL(Tools::getValue('id_country')).'",
"'.pSQL(Tools::getValue('videos')).'"
)
ON DUPLICATE KEY UPDATE `nc8` = "'.pSQL(Tools::getValue('nc8')).'",
`id_country` = "'.pSQL(Tools::getValue('id_country')).'"
`id_country` = "'.pSQL(Tools::getValue('id_country')).'",
`videos` = "'.pSQL(Tools::getValue('videos')).'"
');
if (Validate::isLoadedObject($object))
@ -3272,11 +3274,23 @@ class AdminProducts extends AdminTab
</td>
</tr>';
echo '</td></tr></table>
</div>
</td></tr>
</div>';
echo '</td></tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>
<tr>
<td class="col-left">'.$this->l('More description:').'<br /><br /><i>('.$this->l('appears in the product lists and on the top of the product page').')</i></td>
<td class="col-left">'.$this->l('Videos :').'</td>
<td style="padding-bottom:5px;" class="translatable">';
foreach ($this->_languages as $language)
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class="rte" cols="100" rows="10" id="videos_'.$language['id_lang'].'" name="videos_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'videos', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>';
echo '</td></tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>
<tr>
<td class="col-left">'.$this->l('More description:').'<br /><br /></td>
<td style="padding-bottom:5px;" class="translatable">';
foreach ($this->_languages as $language)
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">

14
override/classes/Product.php
View File

@ -1,8 +1,8 @@
<?php
class Product extends ProductCore
{
/** @var string More description */
public $description_more;
public $videos;
/**
* @Override
@ -11,7 +11,7 @@ class Product extends ProductCore
'meta_description' => 'isGenericName', 'meta_keywords' => 'isGenericName',
'meta_title' => 'isGenericName', 'link_rewrite' => 'isLinkRewrite', 'name' => 'isCatalogName',
'description' => 'isString', 'description_short' => 'isString', 'available_now' => 'isGenericName', 'available_later' => 'IsGenericName',
'description_more' => 'isString');
'description_more' => 'isString','videos' => 'isString');
/**
* @Override
@ -34,6 +34,7 @@ class Product extends ProductCore
$fields[$language['id_lang']]['description'] = (isset($this->description[$language['id_lang']])) ? pSQL($this->description[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['description_short'] = (isset($this->description_short[$language['id_lang']])) ? pSQL($this->description_short[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['description_more'] = (isset($this->description_more[$language['id_lang']])) ? pSQL($this->description_more[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['videos'] = (isset($this->videos[$language['id_lang']])) ? pSQL($this->videos[$language['id_lang']], true) : '';
foreach ($fieldsArray as $field)
{
if (!Validate::isTableOrIdentifier($field))
@ -54,6 +55,15 @@ class Product extends ProductCore
return $fields;
}
public function getCustomFields() {
$customs_data = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`
FROM `'._DB_PREFIX_.'product_customs`
WHERE id_product = '.(int)$this->id
);
return $customs_data;
}
/**
* @Override
* Admin panel product search

11
themes/site/product.tpl
View File

@ -425,13 +425,13 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<!-- description and features -->
{if $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
{if $product->videos || $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
<div id="more_info_block" class="clear">
<ul id="more_info_tabs" class="idTabs idTabsShort">
{if !empty($product->description_short)}<li><a id="more_info_tab_data_sheet" href="#idTab1">{l s='Description'}</a></li>{/if}
{if !empty($product->description)}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Good to know'}</a></li>{/if}
{*if $product->buy_guide}<li><a id="more_info_tab_data_sheet" href="#idTab3">{l s='Buy guide'}</a></li>{/if*}
{*if $product->videos}<li><a id="more_info_tab_data_sheet" href="#idTab4">{l s='Videos'}</a></li>{/if*}
{if !empty($product->videos)}<li><a id="more_info_tab_data_sheet" href="#idTab4">{l s='Videos'}</a></li>{/if}
<li><a id="more_info_tab_data_sheet" href="#idTab5">{l s='Shipping'}</a></li>
{*{if $features}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Data sheet'}</a></li>{/if}
{if $attachments}<li><a id="more_info_tab_attachments" href="#idTab9">{l s='Download'}</a></li>{/if}
@ -453,8 +453,11 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if}
<div id="idTab3" class="rte">
</div>
{if !empty($product->videos)}
<div id="idTab4" class="rte">
{$product->videos}
</div>
{/if}
<div id="idTab5" class="rte product_info">
<div class="info info_1">
{if $sale->delivery_delay == 2
@ -483,7 +486,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</div>
{if $features}
<!-- product's features -->
<ul id="idTab2" class="bullet">
<ul id="idTab8" class="bullet">
{foreach from=$features item=feature}
<li><span>{$feature.name|escape:'htmlall':'UTF-8'}</span> {$feature.value|escape:'htmlall':'UTF-8'}</li>
{/foreach}
@ -498,7 +501,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if}
{if isset($accessories) AND $accessories}
<!-- accessories -->
<ul id="idTab4" class="bullet">
<ul id="idTab7" class="bullet">
<div class="block products_block accessories_block clearfix">
<div class="block_content">
<ul>

31
themes/site_mobile/css/style.css
View File

@ -4576,4 +4576,35 @@ body#index .jqibuttons span.gradient{
font-family: georgia, times new roman, serif;
font-style: italic;
font-size: 13px;
}
#product #more_info_tabs {
background: #FFF;
}
#product .idTabs {
margin: 0px;
list-style: none outside;
overflow: auto;
}
.block_hidden_only_for_screen {
display: none;
}
#product #more_info_block .idTabs li {
position: relative;
margin-left: 1px;
line-height: 12px;
}
#product #more_info_block .idTabs li a {
background: #fb66a9;
color: #fff;
display: block;
text-decoration: none;
padding: 20px 15px;
font-size: 17px;
text-align: center;
}
#product #more_info_block .idTabs li a.selected {
font-weight: bold;
background: #F3F3F3;
color: #fb66a9;
}

37
themes/site_mobile/product.tpl
View File

@ -391,10 +391,10 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<!-- left infos-->
<div id="pb-left-column">
{if $product->description_short OR $packItems|@count > 0}
{if $product->description_more OR $packItems|@count > 0}
<div id="short_description_block">
{if $product->description_short}
<div id="short_description_content" class="rte align_justify">{$product->description_short}</div>
{if $product->description_more}
<div id="short_description_content" class="rte align_justify">{$product->description_more}</div>
{/if}
{*{if $product->description}
<p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p>
@ -417,24 +417,35 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if}
<!-- description and features -->
{if $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
{if $product->videos || $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
<div id="more_info_block" class="clear">
{*<ul id="more_info_tabs" class="idTabs idTabsShort">
{if $product->description}<li><a id="more_info_tab_more_info" href="#idTab1" {if !$features && !$attachments && !(isset($accessories) && $accessories)} style="cursor: default !important;"{/if}>{l s='More info'}</a></li>{/if}
{if $features}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Data sheet'}</a></li>{/if}
{if $attachments}<li><a id="more_info_tab_attachments" href="#idTab9">{l s='Download'}</a></li>{/if}
{if isset($accessories) AND $accessories}<li><a href="#idTab4">{l s='Accessories'}</a></li>{/if}
<ul id="more_info_tabs" class="idTabs idTabsShort">
{if $product->description_short}<li><a id="more_info_tab_more_info" href="#idTab1" style="cursor: default !important;">{l s='Description'}</a></li>{/if}
{if $product->description}<li><a id="more_info_tab_more_info" href="#idTab2" style="">{l s='Good to know'}</a></li>{/if}
{*if $product->buy_guide}<li><a id="more_info_tab_data_sheet" href="#idTab3">{l s='Buy guide'}</a></li>{/if*}
{if $product->videos}<li><a id="more_info_tab_more_info" href="#idTab4" style="">{l s='Videos'}</a></li>{/if}
{*if $features}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Data sheet'}</a></li>{/if*}
{*if $attachments}<li><a id="more_info_tab_attachments" href="#idTab9">{l s='Download'}</a></li>{/if*}
{*if isset($accessories) AND $accessories}<li><a href="#idTab4">{l s='Accessories'}</a></li>{/if*}
{$HOOK_PRODUCT_TAB}
</ul>*}
</ul>
<div id="more_info_sheets" class="sheets align_justify">
{if $product->description_short}
<!-- full description_short -->
<div id="idTab1" class="rte">{$product->description_short}</div>
{/if}
{if $product->description}
<!-- full description -->
<div id="idTab1" class="rte">{$product->description}</div>
<div id="idTab2" class="rte">{$product->description}</div>
{/if}
{if $product->videos}
<!-- full videos -->
<div id="idTab4" class="rte">{$product->videos}</div>
{/if}
{if $features}
<!-- product's features -->
<ul id="idTab2" class="bullet">
<ul id="idTab8" class="bullet">
{foreach from=$features item=feature}
<li><span>{$feature.name|escape:'htmlall':'UTF-8'}</span> {$feature.value|escape:'htmlall':'UTF-8'}</li>
{/foreach}
@ -449,7 +460,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if}
{if isset($accessories) AND $accessories}
<!-- accessories -->
<ul id="idTab4" class="bullet">
<ul id="idTab7" class="bullet">
<div class="block products_block accessories_block clearfix">
<div class="block_content">
<ul>