Skip to content

Commit 865dc7d

Browse files
committed
Update for Shopversion 2.0.6.0
1 parent c154dff commit 865dc7d

File tree

83 files changed

+369
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+369
-540
lines changed

CHANGELOG.MD

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
UNRELEASED
22

3-
- jquery.cookieconsent-oil.css angepasst
3+
1.1.0 [15.04.2021]
4+
5+
- Updates für Shopversion 2.0.6.0
46

57
1.0.0 [16.11.2020]
68

README.MD

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Bootstrap3 für Modified Shop 2.0 - freies responsive Template
22

3-
Das Template basiert auf dem Bootstrap-Framework 3 und wurde zuletzt angepasst und getestet mit der **Modified Shopversion 2.0.5.1**.
3+
Das Template basiert auf dem Bootstrap-Framework 3 und wurde zuletzt angepasst und getestet mit der **Modified Shopversion 2.0.6.0**.
44

55
![](images/screenshot_1.png)
66

77
## Eigenschaften:
88
- responsive Template für PC, Tablet, Smartphone
99
- unterstützt alle Neuerungen der Shopversion 2.0 (z.B. Komprimierung, Filter).
10-
- EU-Cookie-Hinweis - **jetzt mit Vorbereitung für das MODUL: OIL.js Cookie Consent Management (Anleitung im Anhang)**
10+
- EU-Cookie-Hinweis - **das System-Modul "Cookie Consent" (ab Shopversion 2.0.6.0 Standard) muss dazu im Adminbereich installiert werden**
1111
- Bilderslider auf der Startseite
1212
- Slider im Banner-Manager befüllbar
1313
- Cloud-Zoom-Vergrößerung in der Produktdetailansicht
@@ -55,6 +55,7 @@ Karl<br />
5555
## Anhang
5656

5757
### Einbau - MODUL: OIL.js Cookie Consent Management
58+
#### (Achtung: Diese Anleitung gilt nur für ältere Shopversionen - ab Shopversion 2.0.6.0 ist dieses Modul Standard!)
5859

5960
Wer das neue Modul bereits nutzen will, der muss darauf achten, von hier
6061

shoproot/lang/english/extra/bs3_template.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

shoproot/lang/german/extra/bs3_template.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

shoproot/templates/bootstrap3/admin/mail/english/change_order_mail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<tr>
1212
<td>
1313
<br />
14-
<font size="2" face="Tahoma, Verdana, sans-serif"><b>{if $GENDER == $smarty.const.MALE}Dear Mr.{elseif $GENDER == $smarty.const.FEMALE}Dear Ms./Mrs.{else}Hello{/if} {$NAME},</b>
14+
<font size="2" face="Tahoma, Verdana, sans-serif"><b>{if $GENDER == 'm'}Dear Mr.{elseif $GENDER == 'f'}Dear Ms./Mrs.{else}Hello{/if} {$NAME},</b>
1515
<br /><br />
1616
The status of your order {if $ORDER_NR}No. {$ORDER_NR}{/if} {if $ORDER_DATE}from {$ORDER_DATE}{/if} has been changed.
1717

shoproot/templates/bootstrap3/admin/mail/english/change_order_mail.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
{if $GENDER == $smarty.const.MALE}Dear Mr.{elseif $GENDER == $smarty.const.FEMALE}Dear Ms./Mrs.{else}Hello{/if} {$NAME},
2+
{if $GENDER == 'm'}Dear Mr.{elseif $GENDER == 'f'}Dear Ms./Mrs.{else}Hello{/if} {$NAME},
33

44
The status of your order {if $ORDER_NR}No. {$ORDER_NR}{/if} {if $ORDER_DATE}from {$ORDER_DATE}{/if} has been changed.
55

shoproot/templates/bootstrap3/admin/mail/english/create_account_mail.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
32
{if $GENDER == 'm'}Dear Mr.{elseif $GENDER == 'f'}Dear Ms./Mrs.{else}Hello{/if} {$NAME},
43

54
we just created your customer account.

shoproot/templates/bootstrap3/admin/mail/german/change_order_mail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<tr>
1212
<td>
1313
<br />
14-
<font size="2" face="Tahoma, Verdana, sans-serif"><b>{if $GENDER == $smarty.const.MALE}Sehr geehrter Herr{elseif $GENDER == $smarty.const.FEMALE}Sehr geehrte Frau{else}Hallo{/if} {$NAME},</b>
14+
<font size="2" face="Tahoma, Verdana, sans-serif"><b>{if $GENDER == 'm'}Sehr geehrter Herr{elseif $GENDER == 'f'}Sehr geehrte Frau{else}Hallo{/if} {$NAME},</b>
1515
<br /><br />
1616
Der Status Ihrer Bestellung {if $ORDER_NR}Nr. {$ORDER_NR}{/if} {if $ORDER_DATE}vom {$ORDER_DATE}{/if} wurde ge&auml;ndert.
1717

shoproot/templates/bootstrap3/admin/mail/german/change_order_mail.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
{if $GENDER == $smarty.const.MALE}Sehr geehrter Herr{elseif $GENDER == $smarty.const.FEMALE}Sehr geehrte Frau{else}Hallo{/if} {$NAME},
2+
{if $GENDER == 'm'}Sehr geehrter Herr{elseif $GENDER == 'f'}Sehr geehrte Frau{else}Hallo{/if} {$NAME},
33

4-
Der Status Ihrer Bestellung {if $ORDER_NR}Nr. {$ORDER_NR}{/if} {if $ORDER_DATE}vom {$ORDER_DATE}{/if} wurde ge�ndert.
4+
Der Status Ihrer Bestellung {if $ORDER_NR}Nr. {$ORDER_NR}{/if} {if $ORDER_DATE}vom {$ORDER_DATE}{/if} wurde geändert.
55

66
{if $ORDER_LINK}Link zur Bestellung:
77
{$ORDER_LINK} {/if}
@@ -13,7 +13,7 @@ Neuer Status: {$ORDER_STATUS}
1313

1414
{if $PARCEL_COUNT > 0}
1515
Die Sendung besteht aus {$PARCEL_COUNT} Paket(en).
16-
Sie k�nnen sich �ber den Zustellstatus durch einen Klick auf die nachstende(n) Paketnummer(n) informieren:
16+
Sie können sich über den Zustellstatus durch einen Klick auf die nachstende(n) Paketnummer(n) informieren:
1717
{foreach name=aussen item=tracking_data from=$PARCEL_ARRAY}
1818
{$tracking_data.tracking_link}
1919
{/foreach}{/if}

shoproot/templates/bootstrap3/admin/mail/german/create_account_mail.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11

2-
32
{if $GENDER == 'm'}Sehr geehrter Herr{elseif $GENDER == 'f'}Sehr geehrte Frau{else}Hallo{/if} {$NAME},
43

5-
es wurde ein Account f�r Sie eingerichtet, Sie k�nnen sich mit folgenden Daten in unseren Shop einloggen.
4+
es wurde ein Account für Sie eingerichtet, Sie können sich mit folgenden Daten in unseren Shop einloggen.
65

76
{if $COMMENTS} Anmerkungen: {$COMMENTS}{/if}
87

9-
Ihre Logindaten f�r unseren Shop:
8+
Ihre Logindaten für unseren Shop:
109

1110
E-Mail: {$EMAIL}
1211

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
{if $GENDER == 'm'}Sehr geehrter Herr{elseif $GENDER == 'f'}Sehr geehrte Frau{else}Hallo{/if} {$NAME},
33

4-
Sie haben k�rzlich in unserem Online-Shop einen Gutschein bestellt,
5-
welcher aus Sicherheitsgr�nden nicht sofort freigeschaltet wurde.
6-
Dieses Guthaben steht Ihnen nun zur Verf�gung.
7-
Sie k�nnen Ihren Gutschein verbuchen und per E-Mail versenden. Der von Ihnen bestellte Gutschein hat einen Wert von {$AMMOUNT}.
4+
Sie haben kürzlich in unserem Online-Shop einen Gutschein bestellt,
5+
welcher aus Sicherheitsgründen nicht sofort freigeschaltet wurde.
6+
Dieses Guthaben steht Ihnen nun zur Verfügung.
7+
Sie können Ihren Gutschein verbuchen und per E-Mail versenden. Der von Ihnen bestellte Gutschein hat einen Wert von {$AMMOUNT}.
88

99
[SIGNATUR]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{$MESSAGE}
22

3-
Sie k�nnen den Coupon bei Ihrer Bestellung einl�sen. Geben Sie daf�r Ihren Coupon-Code in das Feld f�r Gutschein-/Couponcodes ein.
3+
Sie können den Coupon bei Ihrer Bestellung einlösen. Geben Sie dafür Ihren Coupon-Code in das Feld für Gutschein-/Couponcodes ein.
44

55
Ihr Coupon-Code lautet: {$COUPON_ID}
66

7-
Heben Sie Ihren Coupon-Code gut auf, nur so k�nnen Sie von diesem Angebot profitieren
8-
wenn Sie uns das n�chste mal unter {$WEBSITE} besuchen.
7+
Heben Sie Ihren Coupon-Code gut auf, nur so können Sie von diesem Angebot profitieren
8+
wenn Sie uns das nächste mal unter {$WEBSITE} besuchen.
99

1010
[SIGNATUR]

shoproot/templates/bootstrap3/admin/print_order.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<div class="hr_15"></div>
4545
<div class="clearfix">
4646
<div class="printColumsLeft">
47-
<strong>{if isset($SHIPPING_CLASS) && strstr($SHIPPING_CLASS, 'selfpickup')}{#pickup_address#}{else}{#shipping_address#}{/if}</strong><br />{$address_label_shipping}
47+
<strong>{if isset($SHIPPING_CLASS) && strpos($SHIPPING_CLASS, 'selfpickup')}{#pickup_address#}{else}{#shipping_address#}{/if}</strong><br />{$address_label_shipping}
4848
</div>
4949
<div class="printColumsRight">
5050
{if $address_label_payment}<strong>{#payment_address#}</strong>{/if}<br />{$address_label_payment}
@@ -61,7 +61,7 @@
6161
<th class="ord_table_right">{#head_price#}</th>
6262
</tr>
6363
{foreach name=aussen item=order_values from=$order_data}
64-
<tr class="mainrow">
64+
<tr class="mainrow" style="page-break-inside: avoid;">
6565
<td class="ord_table_left ord_width40">{$order_values.PRODUCTS_QTY}&nbsp;x</td>
6666
<td class="ord_table_left">
6767
<strong>{$order_values.PRODUCTS_NAME}</strong>
@@ -81,7 +81,7 @@
8181
</table>
8282
<div class="hr_5"></div>
8383
{if sizeof($order_total) > 0}
84-
<div class="total_table_right">
84+
<div class="total_table_right" style="page-break-inside: avoid;">
8585
<table class="total_table">
8686
{foreach name=aussen item=order_total_values from=$order_total}
8787
<tr>
@@ -93,9 +93,9 @@
9393
</div>
9494
{/if}
9595
</div>
96-
{if isset($vat_info)}
96+
{if isset($vat_info) && $vat_info != 0}
9797
<br />
98-
{#vat_info#}
98+
{if $vat_info == 2}{#vat_info_2#}{else}{#vat_info#}{/if}
9999
<br class="clearfix" />
100100
{/if}
101101
{if $COMMENTS}
@@ -106,7 +106,7 @@
106106
{$COMMENTS}
107107
</div>
108108
{/if}
109-
{if count($PAYMENT_INFO) > 0}
109+
{if is_array($PAYMENT_INFO) && count($PAYMENT_INFO) > 0}
110110
<br /><br />
111111
<div class="panel panel-default clearfix">
112112
{foreach name=aussen item=data from=$PAYMENT_INFO}

shoproot/templates/bootstrap3/admin/print_packingslip.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<div class="hr_15"></div>
4141
<div class="clearfix">
4242
<div class="printColumsLeft">
43-
<strong>{if isset($SHIPPING_CLASS) && strstr($SHIPPING_CLASS, 'selfpickup')}{#pickup_address#}{else}{#shipping_address#}{/if}</strong><br />{$address_label_shipping}
43+
<strong>{if isset($SHIPPING_CLASS) && strpos($SHIPPING_CLASS, 'selfpickup')}{#pickup_address#}{else}{#shipping_address#}{/if}</strong><br />{$address_label_shipping}
4444
</div>
4545
<div class="printColumsRight">
4646
{if $address_label_payment}<strong>{#payment_address#}</strong>{/if}<br />{$address_label_payment}

shoproot/templates/bootstrap3/boxes/box_categories.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
{$BOX_CONTENT}
1010
{if $smarty.const.SPECIALS_CATEGORIES === true}
1111
{if $smarty.const.SPECIALS_EXISTS === true}
12-
<li class="list-group-item level1{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} active{/if}"><a class="list-group-item{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}">{#heading_specials#}</a></li>
12+
<li class="list-group-item level1{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} active{/if}"><a class="list-group-item{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}">{#heading_specials#}</a></li>
1313
{/if}
1414
{/if}
1515
{if $smarty.const.WHATSNEW_CATEGORIES === true}
1616
{*if $smarty.const.WHATSNEW_EXISTS === true*}
17-
<li class="list-group-item level1{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} active{/if}"><a class="list-group-item{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}">{#heading_whatsnew#}</a></li>
17+
<li class="list-group-item level1{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} active{/if}"><a class="list-group-item{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}">{#heading_whatsnew#}</a></li>
1818
{*/if*}
1919
{/if}
2020
</ul>

shoproot/templates/bootstrap3/boxes/box_categories_mmenu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
{$BOX_CONTENT3}
55
{if $smarty.const.SPECIALS_CATEGORIES === true}
66
{if $smarty.const.SPECIALS_EXISTS === true}
7-
<li class="{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} Selected{/if}"><a href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_specials#}</a></li>
7+
<li class="{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} Selected{/if}"><a href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_specials#}</a></li>
88
{/if}
99
{/if}
1010
{if $smarty.const.WHATSNEW_CATEGORIES === true}
1111
{*if $smarty.const.WHATSNEW_EXISTS === true*}
12-
<li class="{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} Selected{/if}"><a href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_whatsnew#}</a></li>
12+
<li class="{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} Selected{/if}"><a href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_whatsnew#}</a></li>
1313
{*/if*}
1414
{/if}
1515
</ul>

shoproot/templates/bootstrap3/boxes/box_categories_responsivemenu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
{$BOX_CONTENT2}
1111
{if $smarty.const.SPECIALS_CATEGORIES === true}
1212
{if $smarty.const.SPECIALS_EXISTS === true}
13-
<li class="men level1{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} selected active{/if}"><a class="{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)}active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}">{#heading_specials#}</a></li>
13+
<li class="men level1{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} selected active{/if}"><a class="{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)}active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}">{#heading_specials#}</a></li>
1414
{/if}
1515
{/if}
1616
{if $smarty.const.WHATSNEW_CATEGORIES === true}
1717
{*if $smarty.const.WHATSNEW_EXISTS === true*}
18-
<li class="men level1{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} selected active{/if}"><a class="{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)}active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}">{#heading_whatsnew#}</a></li>
18+
<li class="men level1{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} selected active{/if}"><a class="{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)}active{/if}{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} up{/if}" href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}">{#heading_whatsnew#}</a></li>
1919
{*/if*}
2020
{/if}
2121
</ul>

shoproot/templates/bootstrap3/boxes/box_categories_superfish.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
{$BOX_CONTENT}
44
{if $smarty.const.SPECIALS_CATEGORIES === true}
55
{if $smarty.const.SPECIALS_EXISTS === true}
6-
<li class="men level1{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} active{/if}"><a href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_specials#}</a></li>
6+
<li class="men level1{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_SPECIALS)} active{/if}"><a href="{$smarty.const.FILENAME_SPECIALS|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_specials#}</a></li>
77
{/if}
88
{/if}
99
{if $smarty.const.WHATSNEW_CATEGORIES === true}
1010
{*if $smarty.const.WHATSNEW_EXISTS === true*}
11-
<li class="men level1{if strstr($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} active{/if}"><a href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_whatsnew#}</a></li>
11+
<li class="men level1{if strpos($smarty.server.PHP_SELF, $smarty.const.FILENAME_PRODUCTS_NEW)} active{/if}"><a href="{$smarty.const.FILENAME_PRODUCTS_NEW|xtc_href_link}"{if $smarty.const.WHATSNEW_SPECIALS_UPPERCASE === true} class="up"{/if}>{#heading_whatsnew#}</a></li>
1212
{*/if*}
1313
{/if}
1414
</ul>{/if}

shoproot/templates/bootstrap3/config/config.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
// logo
1919
define('SHOP_LOGO', 'img/logo_head.png'); // Dieses Logo wird im Template gezeigt z.B. shoproot/templates/bootstrap3/img/logo_head.png -> 'img/logo_head.png'
2020

21-
// EU-Cookie
22-
define('EU_COOKIE_PLACE', 'default'); // Wo EU-COOKIE anzeigen? 'default' = unten volle Breite, 'bottom-right' = klein rechts unten, 'bottom-left' = klein links unten
23-
define('EU_COOKIE_CONTENT', 2); // coID des Contentmanger-Textes der beim Klick auf "Mehr Informationen" angezeigt werden soll (normalerweise "2" für "Privatshäre und Datenschutz").
24-
2521
// Javascript im Browser deaktiviert
2622
define('SHOW_JS_DISABLED', true); // Hinweis anzeigen = true, ansonsten false
2723

shoproot/templates/bootstrap3/css/general.css.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@
2929
$css_array[] = DIR_TMPL_CSS.'bootstrap/theme.min.css';
3030
}
3131

32-
if (defined('MODULE_COOKIE_CONSENT_STATUS') && strtolower(MODULE_COOKIE_CONSENT_STATUS) == 'true') {
33-
$css_array[] = DIR_TMPL_CSS.'jquery.cookieconsent-oil.css';
34-
}
35-
else {
36-
$css_array[] = DIR_TMPL_CSS.'jquery.cookieconsent.css';
37-
}
32+
$css_array[] = DIR_TMPL_CSS.'cookieconsent.css';
3833

3934
// Cloud Zoom
4035
if (USE_CLOUD_ZOOM === true) {

0 commit comments

Comments
 (0)