Skip to content

Commit b9a5ed1

Browse files
chuccvchuccv
authored
Merge pull request #374 from mageplaza/2.4-develop
2.4 develop
2 parents c2f0e4f + ad81e84 commit b9a5ed1

File tree

7 files changed

+146
-69
lines changed

7 files changed

+146
-69
lines changed

‎view/frontend/layout/hyva_catalog_product_view.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Mageplaza
5+
*
6+
* NOTICE OF LICENSE
7+
*
8+
* This source file is subject to the Mageplaza.com license that is
9+
* available through the world-wide-web at this URL:
10+
* https://www.mageplaza.com/LICENSE.txt
11+
*
12+
* DISCLAIMER
13+
*
14+
* Do not edit or add to this file if you wish to upgrade this extension to newer
15+
* version in the future.
16+
*
17+
* @category Mageplaza
18+
* @package Mageplaza_Blog
19+
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
20+
* @license https://www.mageplaza.com/LICENSE.txt
21+
*/
22+
-->
23+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
24+
<head>
25+
<script src="Mageplaza_Blog::js/splide.min.js" />
26+
<css src="Mageplaza_Blog::css/splide.min.css" />
27+
</head>
28+
<body>
29+
<referenceBlock name="related.post.tab" >
30+
<action method="setTemplate">
31+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/post/relatedpost.phtml</argument>
32+
</action>
33+
</referenceBlock>
34+
</body>
35+
</page>

‎view/frontend/layout/hyva_default.xml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -21,70 +21,14 @@
2121
*/
2222
-->
2323
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
24-
<head>
25-
<script src="Mageplaza_Blog::js/ckeditor.js" />
26-
<script src="Mageplaza_Blog::js/splide.min.js" />
27-
<css src="Mageplaza_Blog::css/splide.min.css" />
2824

29-
<script src="Mageplaza_Blog::js/treeselectjs.umd.js" />
30-
<css src="Mageplaza_Blog::css/treeselectjs.css" />
31-
</head>
32-
<update handle="hyva_form_validation"/>
3325
<body>
34-
<referenceBlock name="mpblog.sidebar.category">
35-
<action method="setTemplate">
36-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/category/widget.phtml</argument>
37-
</action>
38-
</referenceBlock>
39-
40-
<referenceBlock name="mpblog.design">
41-
<action method="setTemplate">
42-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/design.phtml</argument>
43-
</action>
44-
</referenceBlock>
45-
46-
<referenceBlock name="mpblog.sidebar.search" >
47-
<action method="setTemplate" ifconfig="blog/sidebar/search/enable_search">
48-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/sidebar/search.phtml</argument>
49-
</action>
50-
</referenceBlock>
51-
52-
53-
<referenceBlock name="mpblog.sidebar.mostview" >
54-
<action method="setTemplate">
55-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/sidebar/mostview.phtml</argument>
56-
</action>
57-
</referenceBlock>
58-
59-
60-
<referenceBlock name="mpblog.post.view" >
61-
<action method="setTemplate" >
62-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/post/view.phtml</argument>
63-
</action>
64-
</referenceBlock>
65-
66-
6726
<referenceBlock name="footer-static-links">
6827
<action method="setTemplate">
6928
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/html/footer/links.phtml</argument>
7029
</action>
7130
<block class="Mageplaza\Blog\Block\Html\Footer" name="mp_blog_footer_link" template="Mageplaza_Blog::hyva/html/footer.phtml" after="-" ifconfig="blog/general/enabled"/>
7231
</referenceBlock>
73-
74-
<referenceBlock name="related.category.products">
75-
<action method="setTemplate" >
76-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/product/list.phtml</argument>
77-
</action>
78-
</referenceBlock>
79-
80-
81-
<referenceBlock name="related.post.tab" >
82-
<action method="setTemplate">
83-
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/post/relatedpost.phtml</argument>
84-
</action>
85-
</referenceBlock>
86-
87-
8832
</body>
8933
</page>
9034

‎view/frontend/layout/hyva_mpblog_author.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,20 @@
2525
<css src="Mageplaza_Core::css/font-awesome.min.css"/>
2626
<css src="Mageplaza_Blog::css/hyvaManagePost.css"/>
2727
<css src="Mageplaza_Blog::css/hyvaBlog.css"/>
28+
29+
<script src="Mageplaza_Blog::js/ckeditor.js" />
30+
31+
<script src="Mageplaza_Blog::js/treeselectjs.umd.js" />
32+
<css src="Mageplaza_Blog::css/treeselectjs.css" />
2833
</head>
34+
<update handle="hyva_form_validation"/>
35+
2936
<body>
37+
<referenceBlock name="mpblog.design">
38+
<action method="setTemplate">
39+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/design.phtml</argument>
40+
</action>
41+
</referenceBlock>
3042

3143
</body>
3244
</page>

‎view/frontend/layout/hyva_mpblog_design.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,30 @@
2424
<head>
2525
<css src="Mageplaza_Core::css/grid-mageplaza.css"/>
2626
<css src="Mageplaza_Core::css/font-awesome.min.css"/>
27-
<css src="Mageplaza_Core::css/owl.carousel.css"/>
28-
<css src="Mageplaza_Core::css/owl.theme.css"/>
2927
<css src="Mageplaza_Blog::css/hyvaBlog.css"/>
28+
29+
<script src="Mageplaza_Blog::js/splide.min.js" />
30+
<css src="Mageplaza_Blog::css/splide.min.css" />
3031
</head>
3132
<body>
3233
<referenceContainer name="columns">
3334
<container name="div.sidebar.main" htmlTag="div" htmlClass="sidebar sidebar-main" before="main">
3435
<container name="blog.sidebar.main" as="sidebar_main" label="Sidebar Main">
35-
<block class="Mageplaza\Blog\Block\Sidebar\Search" name="mpblog.sidebar.search" template="Mageplaza_Blog::sidebar/search.phtml" ifconfig="blog/sidebar/search/enable_search"/>
36-
<block class="Mageplaza\Blog\Block\Sidebar\MostView" name="mpblog.sidebar.mostview" template="Mageplaza_Blog::sidebar/mostview.phtml" ifconfig="blog/sidebar/recent_post/enable_widget"/>
37-
<block class="Mageplaza\Blog\Block\Category\Widget" name="mpblog.sidebar.category" template="Mageplaza_Blog::category/widget.phtml"/>
36+
<block class="Mageplaza\Blog\Block\Sidebar\Search" name="mpblog.sidebar.search" template="Mageplaza_Blog::hyva/sidebar/search.phtml" ifconfig="blog/sidebar/search/enable_search"/>
37+
<block class="Mageplaza\Blog\Block\Sidebar\MostView" name="mpblog.sidebar.mostview" template="Mageplaza_Blog::hyva/sidebar/mostview.phtml" ifconfig="blog/sidebar/recent_post/enable_widget"/>
38+
<block class="Mageplaza\Blog\Block\Category\Widget" name="mpblog.sidebar.category" template="Mageplaza_Blog::hyva/category/widget.phtml"/>
3839
<block class="Mageplaza\Blog\Block\MonthlyArchive\Widget" name="mpblog.sidebar.monthly" template="Mageplaza_Blog::monthly/widget.phtml"/>
3940
<block class="Mageplaza\Blog\Block\Topic\Widget" name="mpblog.sidebar.topic" template="Mageplaza_Blog::topic/widget.phtml"/>
4041
<block class="Mageplaza\Blog\Block\Tag\Widget" name="mpblog.sidebar.tag" template="Mageplaza_Blog::tag/widget.phtml"/>
4142
</container>
4243
</container>
4344
</referenceContainer>
4445

46+
<referenceBlock name="mpblog.design">
47+
<action method="setTemplate">
48+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/design.phtml</argument>
49+
</action>
50+
</referenceBlock>
51+
4552
</body>
4653
</page>

‎view/frontend/layout/hyva_mpblog_post_preview.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Mageplaza
5+
*
6+
* NOTICE OF LICENSE
7+
*
8+
* This source file is subject to the Mageplaza.com license that is
9+
* available through the world-wide-web at this URL:
10+
* https://www.mageplaza.com/LICENSE.txt
11+
*
12+
* DISCLAIMER
13+
*
14+
* Do not edit or add to this file if you wish to upgrade this extension to newer
15+
* version in the future.
16+
*
17+
* @category Mageplaza
18+
* @package Mageplaza_Blog
19+
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
20+
* @license https://www.mageplaza.com/LICENSE.txt
21+
*/
22+
-->
23+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
24+
<body>
25+
<referenceBlock name="mpblog.post.view" >
26+
<action method="setTemplate" >
27+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/post/view.phtml</argument>
28+
</action>
29+
</referenceBlock>
30+
31+
<referenceBlock name="related.category.products">
32+
<action method="setTemplate" >
33+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/product/list.phtml</argument>
34+
</action>
35+
</referenceBlock>
36+
</body>
37+
</page>

‎view/frontend/layout/hyva_mpblog_post_view.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Mageplaza
5+
*
6+
* NOTICE OF LICENSE
7+
*
8+
* This source file is subject to the Mageplaza.com license that is
9+
* available through the world-wide-web at this URL:
10+
* https://www.mageplaza.com/LICENSE.txt
11+
*
12+
* DISCLAIMER
13+
*
14+
* Do not edit or add to this file if you wish to upgrade this extension to newer
15+
* version in the future.
16+
*
17+
* @category Mageplaza
18+
* @package Mageplaza_Blog
19+
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
20+
* @license https://www.mageplaza.com/LICENSE.txt
21+
*/
22+
-->
23+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
24+
<body>
25+
<referenceBlock name="mpblog.post.view" >
26+
<action method="setTemplate" >
27+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/post/view.phtml</argument>
28+
</action>
29+
</referenceBlock>
30+
31+
<referenceBlock name="related.category.products">
32+
<action method="setTemplate" >
33+
<argument name="template" xsi:type="string">Mageplaza_Blog::hyva/product/list.phtml</argument>
34+
</action>
35+
</referenceBlock>
36+
</body>
37+
</page>

‎view/frontend/templates/hyva/post/author_post.phtml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ HTML
119119
</div>
120120
<div class="post-info-action" data-postId="<?= $escaper->escapeHtml($post->getId()); ?>">
121121
<div class="mpblog-post-duplicate"
122-
onclick='handleDuplicate(this,<?= /** @noEscape */ json_encode($post->getData()) ?>)'
122+
onclick='handleDuplicate(this,<?= /** @noEscape */ $post->getId() ?>, "<?= /** @noEscape */ $post->getImage() ?>")'
123123
>
124124
<img
125125
src="<?= $escaper->escapeUrl($block->getViewFileUrl('Mageplaza_Blog::media/images/duplicate.svg')) ?>"
@@ -129,7 +129,8 @@ HTML
129129
/>
130130
</div>
131131
<div class="mpblog-post-edit"
132-
onclick='handleEdit(this,<?= /** @noEscape */ json_encode($post->getData()) ?>)'>
132+
onclick='handleEdit(this,<?= /** @noEscape */ $post->getId() ?>, "<?= /** @noEscape */ $post->getImage() ?>")'
133+
>
133134
<img src="<?= $escaper->escapeUrl($block->getViewFileUrl('Mageplaza_Blog::media/images/writing.svg')) ?>"
134135
align="middle"
135136
alt="<?= $escaper->escapeHtmlAttr(__('Edit')); ?>"
@@ -203,10 +204,10 @@ HTML
203204
openDialogNewPost();
204205
}
205206
// open modal edit new post
206-
function handleEdit (e, data) {
207+
function handleEdit (e, post_id, image) {
207208
resetFormModal();
208209
let listData = <?php echo /** @noEscape */ json_decode($jsonData) ?>;
209-
let dataSelect = listData[data?.post_id];
210+
let dataSelect = listData[post_id];
210211
name.value = dataSelect?.name;
211212
post_id.value = dataSelect?.post_id;
212213
short_description.value = dataSelect?.short_description;
@@ -217,16 +218,16 @@ HTML
217218

218219
treeselectTags.updateValue(dataSelect?.tag_ids);
219220
treeselectTopics.updateValue(dataSelect?.topic_ids);
220-
addPreviewImg(data?.image);
221+
addPreviewImg(image);
221222

222223
title.innerText = 'Edit Post';
223224
openDialogNewPost()
224225
}
225226
// open modal duplicate new post
226-
function handleDuplicate (e, data) {
227+
function handleDuplicate (e, post_id, image) {
227228
resetFormModal();
228229
let listData = <?php echo /** @noEscape */ json_decode($jsonData) ?>;
229-
let dataSelect = listData[data?.post_id];
230+
let dataSelect = listData[post_id];
230231
name.value = dataSelect?.name;
231232
short_description.value = dataSelect?.short_description;
232233
editor.setData(dataSelect?.post_content ?? "");
@@ -235,7 +236,7 @@ HTML
235236
treeselectCategories.updateValue(dataSelect?.category_ids);
236237
treeselectTags.updateValue(dataSelect?.tag_ids);
237238
treeselectTopics.updateValue(dataSelect?.topic_ids);
238-
addPreviewImg(data?.image);
239+
addPreviewImg(image);
239240
title.innerText = 'Duplicate Post';
240241
openDialogNewPost()
241242
}
@@ -254,6 +255,10 @@ HTML
254255
if (element) {
255256
element.parentNode.removeChild(element);
256257
}
258+
let messagesError = document.querySelectorAll('#mp-blog-new-post-popup form .messages');
259+
messagesError.forEach(mess => {
260+
mess.remove()
261+
})
257262
}
258263
// add preview image when open modal edit and duplicate modal
259264
function addPreviewImg (value) {

0 commit comments

Comments
 (0)