Project-Pro/drmaterac.pl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor CMS page template for improved readability and consistency

Browse Source 
- Adjusted indentation and spacing for better code structure in page.tpl
- Ensured consistent use of block syntax and formatting
- Maintained functionality of the Paypo iframe integration and CMS content display
This commit is contained in:
Jacek Pyziak
2025-04-09 23:17:52 +02:00
parent 9a626b304e
commit 709798f77c
17 changed files with 4489 additions and 4486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1181
.vscode/ftp-kr.sync.cache.json vendored
View File

File diff suppressed because it is too large Load Diff

6
classes/controller/AdminController.php
View File

@@ -2687,7 +2687,7 @@ class AdminControllerCore extends Controller
$this->addJqueryPlugin(['scrollTo', 'alerts', 'chosen', 'autosize', 'fancybox']);
$this->addJqueryPlugin('growl', null, false);
$this->addJqueryUI(['ui.slider', 'ui.datepicker']);
$this->addJqueryUI(['ui.core', 'ui.widget', 'ui.mouse', 'ui.draggable', 'ui.sortable','ui.datepicker','ui.slider']);
$this->addJS(__PS_BASE_URI__ . $this->admin_webpath . '/themes/' . $this->bo_theme . '/js/vendor/bootstrap.min.js');
$this->addJS(__PS_BASE_URI__ . $this->admin_webpath . '/themes/' . $this->bo_theme . '/js/vendor/modernizr.min.js');
@@ -2717,6 +2717,10 @@ class AdminControllerCore extends Controller
// Specific Admin Theme
$this->addCSS(__PS_BASE_URI__ . $this->admin_webpath . '/themes/' . $this->bo_theme . '/css/overrides.css', 'all', PHP_INT_MAX);
$this->context->controller->addJs(apPageHelper::getJsAdminDir().'admin/form.js');
}
$this->addJS([

2
config/defines.inc.php
View File

@@ -235,7 +235,7 @@ define('_PS_SMARTY_CONSOLE_OPEN_BY_URL_', 1);
define('_PS_SMARTY_CONSOLE_OPEN_', 2);
if (!defined('_PS_JQUERY_VERSION_')) {
define('_PS_JQUERY_VERSION_', '3.4.1');
define('_PS_JQUERY_VERSION_', '1.12.4');
}
define('_PS_CACHE_CA_CERT_FILE_', _PS_CACHE_DIR_.'cacert.pem');

1
modules/appagebuilder/appagebuilder.php
View File

@@ -1926,6 +1926,7 @@ class APPageBuilder extends Module
$cache_id = $this->getCacheId('apshortcode', $shortcode_key);
if ($disable_cache || !$this->isCached($this->templateFile, $cache_id)) {
$shortcode_html = '';
$shortcode_obj = ApPageBuilderShortcodeModel::getShortCode($shortcode_key);
if (isset($shortcode_obj['id_appagebuilder']) && $shortcode_obj['id_appagebuilder'] != '' && $shortcode_obj['id_appagebuilder'] != 0) {

1
modules/appagebuilder/controllers/admin/AdminApPageBuilderProfiles.php
View File

@@ -112,7 +112,6 @@ class AdminApPageBuilderProfilesController extends ModuleAdminControllerCore
public function initPageHeaderToolbar()
{
$this->context->controller->addJs(apPageHelper::getJsAdminDir().'admin/form.js');
$this->page_header_toolbar_btn['SaveAndStay'] = array(
'href' => 'javascript:void(0);',

7
modules/appagebuilder/views/js/admin/home.js
View File

@@ -506,10 +506,9 @@ function htmlentitiesDecode(str) {
//edit group
$(document).on("click", ".btn-edit", function () {
if ($(this).data('type' == undefined) && $(this).data('type') == undefined) {
var type = $(this).closest('.widget-row').data("type");
} else
var type = $(this).data("type");
var type = $(this).data('type') !== undefined
? $(this).data('type')
: $(this).closest('.widget-row').data('type');
if (type.indexOf("apSub") == 0) {
if (type == "apSubAccordions") {

2
modules/ps_emailsubscription/views/js/ps_emailsubscription.js
View File

@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
$(document).ready(function () {
$('.block_newsletter form').on('submit', function () {
$('.my_row.newsletter form').on('submit', function () {
var psemailsubscriptionForm = $(this);
if (typeof psemailsubscription_subscription === 'undefined') {
return true;

2
themes/leo_gstore/assets/css/dr_materac.css
View File

File diff suppressed because one or more lines are too long

2
themes/leo_gstore/assets/css/dr_materac.css.map
View File

File diff suppressed because one or more lines are too long

203
themes/leo_gstore/assets/css/dr_materac.scss
View File

@@ -33,7 +33,7 @@ body {
color: #010101;
}
.leo-megamenu .navbar-nav > li > a {
.leo-megamenu .navbar-nav>li>a {
padding: 0;
font-size: 15px;
font-weight: 400;
@@ -155,10 +155,7 @@ body {
border-radius: 0;
}
#leo_search_block_top
.block_content
.leoproductsearch-result
input[type='text'] {
#leo_search_block_top .block_content .leoproductsearch-result input[type='text'] {
padding: 0 5px;
text-align: left;
height: 30px;
@@ -167,28 +164,19 @@ body {
color: #010101;
}
#leo_search_block_top
.block_content
.leoproductsearch-result
input[type='text']::-webkit-input-placeholder {
#leo_search_block_top .block_content .leoproductsearch-result input[type='text']::-webkit-input-placeholder {
color: #010101;
font-size: 14px;
line-height: 21px;
}
#leo_search_block_top
.block_content
.leoproductsearch-result
input[type='text']:-ms-input-placeholder {
#leo_search_block_top .block_content .leoproductsearch-result input[type='text']:-ms-input-placeholder {
color: #010101;
font-size: 14px;
line-height: 21px;
}
#leo_search_block_top
.block_content
.leoproductsearch-result
input[type='text']::placeholder {
#leo_search_block_top .block_content .leoproductsearch-result input[type='text']::placeholder {
color: #010101;
font-size: 14px;
line-height: 21px;
@@ -268,7 +256,7 @@ body {
margin-bottom: 0px;
}
.nav.megamenu.horizontal > li > a {
.nav.megamenu.horizontal>li>a {
padding-bottom: 24px;
}
@@ -325,9 +313,9 @@ body {
color: #fff !important;
}
.leo-megamenu .navbar-nav > li.active > a,
.leo-megamenu .navbar-nav > li:hover > a,
.leo-megamenu .navbar-nav > li:focus > a {
.leo-megamenu .navbar-nav>li.active>a,
.leo-megamenu .navbar-nav>li:hover>a,
.leo-megamenu .navbar-nav>li:focus>a {
color: #34d6ad;
}
@@ -380,8 +368,7 @@ body {
margin-right: 25px;
}
.my_content_container {
}
.my_content_container {}
.my_box_container p {
color: #010101;
@@ -569,16 +556,16 @@ body {
justify-content: center;
}
.navbar-nav > li > a:hover {
.navbar-nav>li>a:hover {
font-weight: 700;
}
.box-ptabs .nav-tabs .nav-item a:hover,
.box-cate .widget-category_image a:hover,
.thumbnail-container .product-title a:hover,
.leo-megamenu .navbar-nav > li > a:hover,
.leo-megamenu .navbar-nav > li > a:focus,
.leo-megamenu .navbar-nav > li > a:active {
.leo-megamenu .navbar-nav>li>a:hover,
.leo-megamenu .navbar-nav>li>a:focus,
.leo-megamenu .navbar-nav>li>a:active {
color: #34d6ad !important;
}
@@ -847,7 +834,7 @@ article.product-miniature:hover {
padding: 20px;
}
.latest-blogs .blog-meta > span {
.latest-blogs .blog-meta>span {
display: inline-block;
vertical-align: top;
margin: 0;
@@ -949,7 +936,7 @@ article.product-miniature:hover {
margin: 0;
}
.row.footer_inside_row > div {
.row.footer_inside_row>div {
padding: 0;
}
@@ -1030,7 +1017,7 @@ article.product-miniature:hover {
transform: scale(0.9);
}
.my_footer_content > a {
.my_footer_content>a {
display: block;
margin-bottom: 3px;
line-height: 20px;
@@ -1094,8 +1081,7 @@ article.product-miniature:hover {
padding-right: 158px;
}
#cta_row .content_cta {
}
#cta_row .content_cta {}
#cta_row h3 {
color: #ffffff;
@@ -1107,6 +1093,7 @@ article.product-miniature:hover {
}
@-webkit-keyframes bounceIn {
from,
20%,
40%,
@@ -1152,6 +1139,7 @@ article.product-miniature:hover {
}
@keyframes bounceIn {
from,
20%,
40%,
@@ -1223,8 +1211,7 @@ article.product-miniature:hover {
align-items: center;
}
#cta_row .links_cta a {
}
#cta_row .links_cta a {}
#cta_row .links_cta p {
animation: none;
@@ -1369,34 +1356,34 @@ article.product-miniature:hover {
display: none;
}
.products-selection .display > div a {
.products-selection .display>div a {
height: 33px;
display: flex;
align-items: center;
justify-content: center;
}
.products-selection .display > div a[title='Grid'] {
.products-selection .display>div a[title='Grid'] {
width: 36px;
}
.products-selection .display > div a[title='List'] {
.products-selection .display>div a[title='List'] {
width: 43px;
}
.products-selection .display > div {
.products-selection .display>div {
margin-right: 13px;
}
.products-selection .display > div#list {
.products-selection .display>div#list {
margin-right: 0;
}
.products-selection .display > div a img {
.products-selection .display>div a img {
transition: filter 0.2s ease-in;
}
.products-selection .display > div a:hover img {
.products-selection .display>div a:hover img {
filter: grayscale(1);
}
@@ -1631,7 +1618,7 @@ button[aria-expanded='true'] .chevron_sort_container img {
transition: opacity 0.2s ease-in;
}
.PM_ASForm input:checked + label::before {
.PM_ASForm input:checked+label::before {
opacity: 1;
}
@@ -1796,16 +1783,12 @@ html[lang='pl'] .ApColumn .block.day_hit::after {
padding-right: 0;
}
.product-detail.product-thumbs-bottom
.product-thumb-images
.slick-arrow.slick-prev {
.product-detail.product-thumbs-bottom .product-thumb-images .slick-arrow.slick-prev {
left: 0;
border-radius: 5px 0 0 5px;
}
.product-detail.product-thumbs-bottom
.product-thumb-images
.slick-arrow.slick-next {
.product-detail.product-thumbs-bottom .product-thumb-images .slick-arrow.slick-next {
right: 0;
border-radius: 0 5px 5px 0;
}
@@ -1816,8 +1799,8 @@ html[lang='pl'] .ApColumn .block.day_hit::after {
}
}
.slick-list:hover + .slick-arrows .slick-next,
.slick-list:hover + .slick-arrows .slick-prev,
.slick-list:hover+.slick-arrows .slick-next,
.slick-list:hover+.slick-arrows .slick-prev,
.slick-arrows .slick-next.slick-disabled:hover,
.slick-arrows .slick-prev.slick-disabled:hover {
background-color: rgba(52, 214, 173, 0.5);
@@ -1836,16 +1819,16 @@ html[lang='pl'] .ApColumn .block.day_hit::after {
margin-bottom: 44px;
}
.product-detail > .row {
.product-detail>.row {
margin: 0;
}
.product-detail > .row > div[class^='col-'] {
.product-detail>.row>div[class^='col-'] {
padding-left: 15px;
padding-right: 15px;
}
.product-detail > .row > div.col-form_id-form_9367402777406408 {
.product-detail>.row>div.col-form_id-form_9367402777406408 {
width: calc(50% + 58px);
}
@@ -2016,14 +1999,14 @@ div.star.star_hover:before {
margin-left: 0;
}
.product-variants > .product-variants-item {
.product-variants>.product-variants-item {
display: flex;
align-items: center;
justify-content: space-between;
margin: 0 0 8px;
}
.product-variants > .product-variants-item select {
.product-variants>.product-variants-item select {
min-height: 34px;
max-width: 419px;
}
@@ -2032,7 +2015,7 @@ select.form-control:not([size]):not([multiple]) {
height: calc(2.5rem - 6px);
}
.product-detail > .row > div.col-form_id-form_15874367062488778 {
.product-detail>.row>div.col-form_id-form_15874367062488778 {
padding-left: 15px;
width: calc(50% - 58px);
}
@@ -2046,7 +2029,7 @@ select.form-control:not([size]):not([multiple]) {
}
.product-quantity #quantity_wanted,
.product-variants > .product-variants-item select {
.product-variants>.product-variants-item select {
background-color: #f0f0f0;
width: 419px;
height: 34px;
@@ -2163,7 +2146,7 @@ select.form-control:not([size]):not([multiple]) {
}
}
.raty_boxes_container > div {
.raty_boxes_container>div {
border-radius: 4px;
display: flex;
align-items: center;
@@ -2183,7 +2166,7 @@ select.form-control:not([size]):not([multiple]) {
}
}
.raty_boxes_container > div.santander {
.raty_boxes_container>div.santander {
border: none;
align-items: center;
justify-content: center;
@@ -2202,7 +2185,7 @@ select.form-control:not([size]):not([multiple]) {
margin: 0;
}
.botton_product_container > div {
.botton_product_container>div {
display: flex;
}
@@ -2269,13 +2252,13 @@ a:hover,
margin: 0 0 40px;
}
.product-features > dl.data-sheet {
.product-features>dl.data-sheet {
margin-bottom: 0;
// border-bottom: 1px solid #33d5ad;
}
.product-features > dl.data-sheet dd.value,
.product-features > dl.data-sheet dt.name {
.product-features>dl.data-sheet dd.value,
.product-features>dl.data-sheet dt.name {
padding: 0;
margin: 0;
font-size: 12px;
@@ -2290,12 +2273,12 @@ a:hover,
align-items: center;
}
.product-features > dl.data-sheet dd.value,
.product-features > dl.data-sheet dd.value:nth-of-type(even) {
.product-features>dl.data-sheet dd.value,
.product-features>dl.data-sheet dd.value:nth-of-type(even) {
background-color: #f5fafe;
}
.product-features > dl.data-sheet dt.name:nth-of-type(even) {
.product-features>dl.data-sheet dt.name:nth-of-type(even) {
background-color: #fff;
}
@@ -2373,7 +2356,7 @@ a:hover,
background-color: #34d6ad;
}
.custom-radio input[type='radio']:checked + span {
.custom-radio input[type='radio']:checked+span {
background-color: #34d6ad;
}
@@ -2420,7 +2403,7 @@ body#checkout [data-action='show-password'],
body#checkout [data-action='show-password']:hover,
.btn-primary:active,
.btn-primary.active,
.open > .btn-primary.dropdown-toggle,
.open>.btn-primary.dropdown-toggle,
.btn-primary:focus,
.btn-primary.focus,
#authentication [data-action='show-password']:hover {
@@ -2539,8 +2522,7 @@ body#checkout #order-summary-content .order-confirmation-table {
min-height: 470px;
}
#cms .content-wrapper h2 {
}
#cms .content-wrapper h2 {}
#cms #content-wrapper p,
#cms #content-wrapper li {
@@ -2635,7 +2617,7 @@ body#checkout #order-summary-content .order-confirmation-table {
margin-bottom: 0;
}
.mini-navbar .nav.megamenu.horizontal > li > a {
.mini-navbar .nav.megamenu.horizontal>li>a {
padding-bottom: 10px;
}
@@ -2828,7 +2810,7 @@ body#checkout #order-summary-content .order-confirmation-table {
}
#blog-category .panel.panel-default,
.latest-blogs .blog-meta > span.icon-calendar,
.latest-blogs .blog-meta>span.icon-calendar,
#module-leoblog-blog .social-share,
.blog-description h1,
#module-leoblog-category .panel.panel-defaul,
@@ -2867,9 +2849,9 @@ body#checkout #order-summary-content .order-confirmation-table {
.btn-primary.active:hover,
.btn-primary.active:focus,
.btn-primary.active.focus,
.open > .btn-primary.dropdown-toggle:hover,
.open > .btn-primary.dropdown-toggle:focus,
.open > .btn-primary.dropdown-toggle.focus {
.open>.btn-primary.dropdown-toggle:hover,
.open>.btn-primary.dropdown-toggle:focus,
.open>.btn-primary.dropdown-toggle.focus {
background-color: #24b28c;
}
@@ -3079,6 +3061,10 @@ body#checkout section.checkout-step .delivery-option {
line-height: 19px;
}
footer .block_newsletter {
display: none;
}
// .block_newsletter .col-12 label::before,
// .block_newsletter .col-12 label::after {
// position: absolute;
@@ -3155,7 +3141,7 @@ body#checkout .condition-label label a {
padding-left: 30px;
}
#checkout .modal-content ol + p {
#checkout .modal-content ol+p {
margin-top: 20px;
}
@@ -3340,21 +3326,11 @@ body#checkout .modal-content li {
font-weight: 500;
}
#cms
#content-wrapper
.sinlge_row_salon
.contett_wrapper
.bottom_wrapper
p:last-child {
#cms #content-wrapper .sinlge_row_salon .contett_wrapper .bottom_wrapper p:last-child {
margin-bottom: 0;
}
#cms
#content-wrapper
.sinlge_row_salon
.contett_wrapper
.bottom_wrapper
p.label {
#cms #content-wrapper .sinlge_row_salon .contett_wrapper .bottom_wrapper p.label {
color: #b8b3ae;
text-align: left;
font-weight: 400;
@@ -3437,11 +3413,11 @@ body#checkout .modal-content li {
}
.product-quantity #quantity_wanted,
.product-variants > .product-variants-item select {
.product-variants>.product-variants-item select {
width: 272px;
}
.leo-megamenu .navbar-nav > li > a {
.leo-megamenu .navbar-nav>li>a {
font-size: 12px;
line-height: 20px;
}
@@ -3622,7 +3598,7 @@ body#checkout .modal-content li {
margin-top: 12px;
}
.product-variants > .product-variants-item,
.product-variants>.product-variants-item,
.product-add-to-cart .product-quantity .qty {
justify-content: flex-start;
}
@@ -3749,8 +3725,8 @@ body#checkout .modal-content li {
margin-bottom: 40px;
}
.product-detail > .row > div.col-form_id-form_9367402777406408,
.product-detail > .row > div.col-form_id-form_15874367062488778 {
.product-detail>.row>div.col-form_id-form_9367402777406408,
.product-detail>.row>div.col-form_id-form_15874367062488778 {
width: 100%;
margin-bottom: 20px;
}
@@ -3786,7 +3762,7 @@ body#checkout .modal-content li {
display: initial;
}
.raty_boxes_container > div img {
.raty_boxes_container>div img {
width: 100%;
}
@@ -3904,10 +3880,7 @@ body#checkout .modal-content li {
}
#category .thumbnail-container .product-meta a,
#module-pm_advancedsearch4-searchresults
.thumbnail-container
.product-meta
a {
#module-pm_advancedsearch4-searchresults .thumbnail-container .product-meta a {
font-size: 14px;
line-height: 26px;
}
@@ -3983,10 +3956,7 @@ body#checkout .modal-content li {
right: 0;
}
#leo_search_block_top
.block_content
.leoproductsearch-result
input[type='text'] {
#leo_search_block_top .block_content .leoproductsearch-result input[type='text'] {
text-align: left;
height: 50px;
}
@@ -4332,7 +4302,7 @@ body#checkout .modal-content li {
}
.product-quantity #quantity_wanted,
.product-variants > .product-variants-item select {
.product-variants>.product-variants-item select {
max-width: 190px;
}
}
@@ -4452,7 +4422,7 @@ body#checkout .modal-content li {
}
#smartsupp-widget-container {
> div {
>div {
z-index: 9999 !important;
}
}
@@ -4681,10 +4651,10 @@ body#cms.cms-id-23 {
}
.popup-body-top {
> p {
>p {
color: #34d6ad;
> a {
>a {
color: #34d6ad;
text-decoration: underline;
}
@@ -4901,8 +4871,7 @@ body#cms.cms-id-23 {
transform: translateY(-50%);
width: 20px;
height: 20px;
background: url('/img/cms/franczyza/el_check.svg') no-repeat
center center;
background: url('/img/cms/franczyza/el_check.svg') no-repeat center center;
background-size: cover;
}
}
@@ -5176,8 +5145,7 @@ body#cms.cms-id-23 {
}
}
.box-3 {
}
.box-3 {}
.box-4 {
margin-top: 75px;
@@ -5196,7 +5164,7 @@ body#cms.cms-id-23 {
box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1),
0px 0px 2px 0px rgba(0, 0, 0, 0.2);
> li {
>li {
&:not(:last-child) {
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
}
@@ -5502,18 +5470,16 @@ body#cms.cms-id-23 {
}
}
.owl-prev {
}
.owl-prev {}
.owl-next {
}
.owl-next {}
}
}
}
}
body {
> div[class^='htmlboxpro'] {
>div[class^='htmlboxpro'] {
margin-left: auto;
margin-right: auto;
padding-left: 15px;
@@ -5595,11 +5561,11 @@ body {
padding: 25px 0;
}
.tabs-content > div {
.tabs-content>div {
display: none;
}
.tabs-content > div.active {
.tabs-content>div.active {
display: block;
}
}
@@ -5636,6 +5602,7 @@ body {
}
}
}
.zoomContainer {
border: none !important;
}

10
themes/leo_gstore/templates/cms/page.tpl
View File

@@ -22,13 +22,13 @@
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{extends file='page.tpl'}
{extends file='page.tpl'}
{block name='page_title'}
{block name='page_title'}
{$cms.meta_title}
{/block}
{/block}
{block name='page_content_container'}
{block name='page_content_container'}
<section id="content" class="page-content page-cms page-cms-{$cms.id}">
{if $cms.id == 61}
<iframe id="paypoIframe" src="https://start.paypo.pl" width="100%" frameborder="no"></iframe>
@@ -67,4 +67,4 @@
{/block}
</section>
{/block}
{/block}