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

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

@@ -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;
@@ -380,8 +368,7 @@ body {
margin-right: 25px;
}
.my_content_container {
}
.my_content_container {}
.my_box_container p {
color: #010101;
@@ -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;
@@ -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;
}
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
}
@@ -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;
@@ -5502,11 +5470,9 @@ body#cms.cms-id-23 {
}
}
.owl-prev {
}
.owl-prev {}
.owl-next {
}
.owl-next {}
}
}
}
@@ -5636,6 +5602,7 @@ body {
}
}
}
.zoomContainer {
border: none !important;
}