From a2c77819f3e2c52b69d4f34209e387192acd4d3f Mon Sep 17 00:00:00 2001 From: rin Date: Tue, 4 Jun 2024 17:22:42 +0700 Subject: [PATCH 01/22] fix: save blog category error --- view/adminhtml/web/category/edit.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/view/adminhtml/web/category/edit.js b/view/adminhtml/web/category/edit.js index e79742cb..569efb3c 100755 --- a/view/adminhtml/web/category/edit.js +++ b/view/adminhtml/web/category/edit.js @@ -20,7 +20,8 @@ define([ 'jquery', - 'prototype' + 'prototype', + 'extjs/ext-tree-checkbox' ], function (jQuery) { var categorySubmit = function (url, useAjax) { @@ -51,11 +52,11 @@ define([ // Make operations with Blog Category tree if (isCreating) { - if (!tree.currentNodeId) { + if (!Ext.tree.currentNodeId) { // First submit of form - select some node to be current - tree.currentNodeId = parentId; + Ext.tree.currentNodeId = parentId; } - tree.addNodeTo = parentId; + Ext.tree.addNodeTo = parentId; } // Submit form From 82f086ae35fdc2567c95d8e1dfc63d9cd9c4c68f Mon Sep 17 00:00:00 2001 From: rin Date: Wed, 5 Jun 2024 09:48:20 +0700 Subject: [PATCH 02/22] fix: save button post page error --- .../layout/mageplaza_blog_post_edit.xml | 3 +++ view/adminhtml/web/css/post.css | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) mode change 100644 => 100755 view/adminhtml/layout/mageplaza_blog_post_edit.xml create mode 100755 view/adminhtml/web/css/post.css diff --git a/view/adminhtml/layout/mageplaza_blog_post_edit.xml b/view/adminhtml/layout/mageplaza_blog_post_edit.xml old mode 100644 new mode 100755 index 15d3dc99..55879aff --- a/view/adminhtml/layout/mageplaza_blog_post_edit.xml +++ b/view/adminhtml/layout/mageplaza_blog_post_edit.xml @@ -22,6 +22,9 @@ --> + + + diff --git a/view/adminhtml/web/css/post.css b/view/adminhtml/web/css/post.css new file mode 100755 index 00000000..f3923daf --- /dev/null +++ b/view/adminhtml/web/css/post.css @@ -0,0 +1,23 @@ +/** + * Mageplaza + * + * NOTICE OF LICENSE + * + * This source file is subject to the Mageplaza.com license that is + * available through the world-wide-web at this URL: + * https://www.mageplaza.com/LICENSE.txt + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade this extension to newer + * version in the future. + * + * @category Mageplaza + * @package Mageplaza_Blog + * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/) + * @license https://www.mageplaza.com/LICENSE.txt + */ + +.page-actions { + overflow-x: visible !important; +} From 9fe3c5ff656cefcfbcc72533cfe6aade76cb2172 Mon Sep 17 00:00:00 2001 From: rin Date: Wed, 5 Jun 2024 10:03:19 +0700 Subject: [PATCH 03/22] fix: Post Hostory page error --- view/frontend/layout/mpblog_post_history.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/frontend/layout/mpblog_post_history.xml b/view/frontend/layout/mpblog_post_history.xml index a833e275..f1631833 100755 --- a/view/frontend/layout/mpblog_post_history.xml +++ b/view/frontend/layout/mpblog_post_history.xml @@ -24,7 +24,7 @@ - + From 9d465058361db19eadb82ede89e30b197454f697 Mon Sep 17 00:00:00 2001 From: rin Date: Wed, 5 Jun 2024 10:21:56 +0700 Subject: [PATCH 04/22] fix: css Voting Button error --- view/frontend/templates/design.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 view/frontend/templates/design.phtml diff --git a/view/frontend/templates/design.phtml b/view/frontend/templates/design.phtml old mode 100644 new mode 100755 index 8983e265..9ac67d6a --- a/view/frontend/templates/design.phtml +++ b/view/frontend/templates/design.phtml @@ -61,7 +61,7 @@ use Mageplaza\Blog\Block\Design; .mp-blog-like { background-color: #6AA84F; - left: 33%; + left: 27%; } .mp-blog-dislike { From 2961af25ef8b11f73c7862c32050c17b09861891 Mon Sep 17 00:00:00 2001 From: rin Date: Wed, 5 Jun 2024 10:41:20 +0700 Subject: [PATCH 05/22] fix: comment display error --- Block/Post/View.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Block/Post/View.php b/Block/Post/View.php index cd769a63..dae3d4cf 100755 --- a/Block/Post/View.php +++ b/Block/Post/View.php @@ -244,7 +244,7 @@ public function commentHtml($comment) { $html = ''; foreach (explode("\n", trim($comment)) as $value) { - $html .= '

' . $value . '

'; + $html .= '

' . $this->escapeHtml($value) . '

'; } return $html; @@ -285,7 +285,7 @@ public function getCommentsTree($comments, $cmtId) . $userName . '
- ' . $this->escapeHtml($this->commentHtml($comment['content'])) . ' + ' . $this->commentHtml($comment['content']) . '
From 2c199b34ce577abc1154553ccc7235f5958235b1 Mon Sep 17 00:00:00 2001 From: rin Date: Wed, 5 Jun 2024 09:48:20 +0700 Subject: [PATCH 06/22] fix: clean code --- view/adminhtml/layout/mageplaza_blog_post_edit.xml | 2 +- view/adminhtml/web/css/{ => post/edit}/post.css | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename view/adminhtml/web/css/{ => post/edit}/post.css (100%) diff --git a/view/adminhtml/layout/mageplaza_blog_post_edit.xml b/view/adminhtml/layout/mageplaza_blog_post_edit.xml index 55879aff..9a979d64 100755 --- a/view/adminhtml/layout/mageplaza_blog_post_edit.xml +++ b/view/adminhtml/layout/mageplaza_blog_post_edit.xml @@ -23,7 +23,7 @@ - + diff --git a/view/adminhtml/web/css/post.css b/view/adminhtml/web/css/post/edit/post.css similarity index 100% rename from view/adminhtml/web/css/post.css rename to view/adminhtml/web/css/post/edit/post.css From a7d37bcfbd58c54f988c98801f618de500f89eb7 Mon Sep 17 00:00:00 2001 From: rin Date: Tue, 11 Jun 2024 14:55:04 +0700 Subject: [PATCH 07/22] fix: clean code --- view/frontend/layout/catalog_product_view.xml | 2 +- view/frontend/layout/mpblog_post_editpost.xml | 2 +- view/frontend/layout/mpblog_post_history.xml | 4 ++-- .../templates/post/{authorPost.phtml => author_post.phtml} | 0 .../templates/post/{managePost.phtml => manage_post.phtml} | 0 .../templates/post/{relatedpost.phtml => related_post.phtml} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename view/frontend/templates/post/{authorPost.phtml => author_post.phtml} (100%) rename view/frontend/templates/post/{managePost.phtml => manage_post.phtml} (100%) rename view/frontend/templates/post/{relatedpost.phtml => related_post.phtml} (100%) diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml index 2ea1785a..946232b0 100644 --- a/view/frontend/layout/catalog_product_view.xml +++ b/view/frontend/layout/catalog_product_view.xml @@ -27,7 +27,7 @@ - + diff --git a/view/frontend/layout/mpblog_post_editpost.xml b/view/frontend/layout/mpblog_post_editpost.xml index 531861c1..4a3b4b4c 100644 --- a/view/frontend/layout/mpblog_post_editpost.xml +++ b/view/frontend/layout/mpblog_post_editpost.xml @@ -27,7 +27,7 @@ - + diff --git a/view/frontend/layout/mpblog_post_history.xml b/view/frontend/layout/mpblog_post_history.xml index f1631833..01281b4a 100755 --- a/view/frontend/layout/mpblog_post_history.xml +++ b/view/frontend/layout/mpblog_post_history.xml @@ -24,8 +24,8 @@ - - + + diff --git a/view/frontend/templates/post/authorPost.phtml b/view/frontend/templates/post/author_post.phtml similarity index 100% rename from view/frontend/templates/post/authorPost.phtml rename to view/frontend/templates/post/author_post.phtml diff --git a/view/frontend/templates/post/managePost.phtml b/view/frontend/templates/post/manage_post.phtml similarity index 100% rename from view/frontend/templates/post/managePost.phtml rename to view/frontend/templates/post/manage_post.phtml diff --git a/view/frontend/templates/post/relatedpost.phtml b/view/frontend/templates/post/related_post.phtml similarity index 100% rename from view/frontend/templates/post/relatedpost.phtml rename to view/frontend/templates/post/related_post.phtml From 5b040e1b05a1a9957f3507118ed8ddc3c4d1a3a5 Mon Sep 17 00:00:00 2001 From: rin Date: Tue, 11 Jun 2024 16:29:37 +0700 Subject: [PATCH 08/22] fix: EQP error --- view/frontend/templates/hyva/design.phtml | 2 +- view/frontend/templates/hyva/post/author_post.phtml | 12 ++++++------ view/frontend/templates/hyva/post/manage_post.phtml | 8 ++++---- view/frontend/templates/hyva/sidebar/search.phtml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/view/frontend/templates/hyva/design.phtml b/view/frontend/templates/hyva/design.phtml index ea14334e..29b385c8 100644 --- a/view/frontend/templates/hyva/design.phtml +++ b/view/frontend/templates/hyva/design.phtml @@ -35,7 +35,7 @@ use Mageplaza\Blog\Block\Design; columns.removeChild(sidebarMain); } } - var currentTheme = "getCurrentTheme(); ?>"; + var currentTheme = "getCurrentTheme(); ?>"; if (currentTheme === "Etheme/yourstore") { body.classList.add('mpblog-etheme-yourstore'); } diff --git a/view/frontend/templates/hyva/post/author_post.phtml b/view/frontend/templates/hyva/post/author_post.phtml index 37a47919..6d2feb3a 100644 --- a/view/frontend/templates/hyva/post/author_post.phtml +++ b/view/frontend/templates/hyva/post/author_post.phtml @@ -60,8 +60,8 @@ $jsonData = json_encode($postDatas);
- {$block->getChildHtml('mpblog_manage_post')} + + {$block->getChildHtml('mpblog_manage_post')}
HTML ) ?> @@ -117,7 +117,7 @@ HTML
@@ -211,7 +211,7 @@ $_helper = $block->getHelper(); isSaleable()) : ?> getAddToCartPostParams($_product); ?>
getHelper();
isAvailable()) : ?>
- escapeHtml(__('In stock')) ?> +
- escapeHtml(__('Out of stock')) ?> +
@@ -260,7 +260,7 @@ $_helper = $block->getHelper(); escapeHtml(__('Learn More')) ?> + class="action more"> diff --git a/view/frontend/templates/hyva/sidebar/mostview.phtml b/view/frontend/templates/hyva/sidebar/mostview.phtml index b32a2c67..33f44ff0 100755 --- a/view/frontend/templates/hyva/sidebar/mostview.phtml +++ b/view/frontend/templates/hyva/sidebar/mostview.phtml @@ -29,7 +29,7 @@ $postsRecent = $block->getRecentPost();
- escapeHtml($post->getName()) ?> + getName() ?> getPublishDate() - ? $block->escapeHtml($block->getDateFormat($post->getPublishDate())) : '' ?> + ? /** @noEscape */ $block->getDateFormat($post->getPublishDate()) : '' ?>
-
escapeHtml(__('No Posts')) ?>
+
@@ -76,18 +76,18 @@ $postsRecent = $block->getRecentPost();
- escapeHtml($post->getName()) ?> + getName() ?> getPublishDate() - ? $block->escapeHtml($block->getDateFormat($post->getPublishDate())) : '' ?> + ? /** @noEscape */ $block->getDateFormat($post->getPublishDate()) : '' ?>
-
escapeHtml(__('No Posts')) ?>
+
diff --git a/view/frontend/templates/hyva/sidebar/search.phtml b/view/frontend/templates/hyva/sidebar/search.phtml index 1c0103b3..3a98bc48 100644 --- a/view/frontend/templates/hyva/sidebar/search.phtml +++ b/view/frontend/templates/hyva/sidebar/search.phtml @@ -31,7 +31,7 @@ use Mageplaza\Blog\Block\Sidebar\Search;