Skip to content

Commit ea3bf90

Browse files
Shinichi69Shinichi69
authored
Merge pull request #5 from mageplaza/2.3-develop
2.3 develop
2 parents 7594173 + 0fb9109 commit ea3bf90

File tree

3 files changed

+130
-113
lines changed

3 files changed

+130
-113
lines changed

‎composer.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
{
2-
"name": "mageplaza/module-twitter-widget",
3-
"description": "Magento 2 Twitter Widget Extension",
4-
"require": {
5-
"mageplaza/module-core": "^1.4.5"
6-
},
7-
"type": "magento2-module",
8-
"version": "1.0.1",
9-
"license": "proprietary",
10-
"authors": [
11-
{
12-
"name": "Mageplaza",
13-
"email": "[email protected]",
14-
"homepage": "https://www.mageplaza.com",
15-
"role": "Technical Support"
16-
}
17-
],
18-
"autoload": {
19-
"files": [
20-
"registration.php"
21-
],
22-
"psr-4": {
23-
"Mageplaza\\TwitterWidget\\": ""
24-
}
25-
}
26-
}
1+
{
2+
"name": "mageplaza/module-twitter-widget",
3+
"description": "Magento 2 Twitter Widget Extension",
4+
"require": {
5+
"mageplaza/module-core": "^1.4.5"
6+
},
7+
"type": "magento2-module",
8+
"version": "1.0.2",
9+
"license": "proprietary",
10+
"authors": [
11+
{
12+
"name": "Mageplaza",
13+
"email": "[email protected]",
14+
"homepage": "https://www.mageplaza.com",
15+
"role": "Technical Support"
16+
}
17+
],
18+
"autoload": {
19+
"files": [
20+
"registration.php"
21+
],
22+
"psr-4": {
23+
"Mageplaza\\TwitterWidget\\": ""
24+
}
25+
}
26+
}

‎etc/adminhtml/system.xml‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
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_TwitterWidget
19-
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
20-
* @license https://www.mageplaza.com/LICENSE.txt
21-
*/
22-
-->
23-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
24-
<system>
25-
<section id="mptwitterwidget" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
26-
<class>separator-top</class>
27-
<label>Twitter Widget</label>
28-
<tab>mageplaza</tab>
29-
<resource>Mageplaza_TwitterWidget::configuration</resource>
30-
<group id="general" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
31-
<label>General</label>
32-
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
33-
<label>Enable</label>
34-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
35-
<comment><![CDATA[Select <b>Yes</b> to enable this module.<br />
36-
1. It helps to reduce abandonment cart with <a href="https://www.mageplaza.com/magento-2-one-step-checkout-extension/" target="_blank">One Step Checkout</a>. <br />
37-
2. <a href="https://pages.mageplaza.com/abandoned-cart-email-templates-for-magento/?utm_source=configuration&utm_campaign=m2-emailattachment" target="_blank">How to setup abandoned cart email series</a>]]></comment>
38-
</field>
39-
<field id="follow_btn" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
40-
<label>Show Follow Button</label>
41-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
42-
</field>
43-
<field id="username" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
44-
<label>Username</label>
45-
<comment>The Twitter username of the account you would like the viewer to follow</comment>
46-
<depends>
47-
<field id="follow_btn">1</field>
48-
</depends>
49-
</field>
50-
</group>
51-
<group id="display" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
52-
<label>Display</label>
53-
<field id="theme" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
54-
<label>Theme</label>
55-
<source_model>Mageplaza\TwitterWidget\Model\Config\Source\Theme</source_model>
56-
</field>
57-
<field id="border_color" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
58-
<label>Border color</label>
59-
<comment>Color of border surrounding a Twitter widget.</comment>
60-
<validate>jscolor {hash:true,refine:false} required-entry</validate>
61-
</field>
62-
<field id="width" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
63-
<label>Widget width</label>
64-
<validate>validate-zero-or-greater validate-number</validate>
65-
<comment>Set the maximum width of the widget. Minimum: 180, maximum: 1200. If empty, auto width will be use</comment>
66-
</field>
67-
<field id="height" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
68-
<label>Widget height</label>
69-
<comment>Set the maximum height of the widget. Must be greater than 200</comment>
70-
<validate>validate-zero-or-greater validate-number</validate>
71-
</field>
72-
</group>
73-
<group id="snippet" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
74-
<label>Snippet Code</label>
75-
<field id="snippet_code" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
76-
<label>Example</label>
77-
<frontend_model>Mageplaza\TwitterWidget\Block\Adminhtml\System\Snippet</frontend_model>
78-
</field>
79-
</group>
80-
</section>
81-
</system>
82-
</config>
1+
<?xml version="1.0" encoding="UTF-8"?>
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_TwitterWidget
19+
* @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
20+
* @license https://www.mageplaza.com/LICENSE.txt
21+
*/
22+
-->
23+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
24+
<system>
25+
<section id="mptwitterwidget" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
26+
<class>separator-top</class>
27+
<label>Twitter Widget</label>
28+
<tab>mageplaza</tab>
29+
<resource>Mageplaza_TwitterWidget::configuration</resource>
30+
<group id="general" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
31+
<label>General</label>
32+
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
33+
<label>Enable</label>
34+
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
35+
<comment><![CDATA[Select <b>Yes</b> to enable this module.<br />
36+
1. It helps to reduce abandonment cart with <a href="https://www.mageplaza.com/magento-2-one-step-checkout-extension/" target="_blank">One Step Checkout</a>. <br />
37+
2. <a href="https://pages.mageplaza.com/abandoned-cart-email-templates-for-magento/?utm_source=configuration&utm_campaign=m2-emailattachment" target="_blank">How to setup abandoned cart email series</a>]]></comment>
38+
</field>
39+
<field id="follow_btn" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
40+
<label>Show Follow Button</label>
41+
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
42+
</field>
43+
<field id="username" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
44+
<label>Username</label>
45+
<comment>The Twitter username of the account you would like the viewer to follow</comment>
46+
<depends>
47+
<field id="follow_btn">1</field>
48+
</depends>
49+
</field>
50+
</group>
51+
<group id="display" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
52+
<label>Display</label>
53+
<field id="theme" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
54+
<label>Theme</label>
55+
<source_model>Mageplaza\TwitterWidget\Model\Config\Source\Theme</source_model>
56+
</field>
57+
<field id="border_color" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
58+
<label>Border color</label>
59+
<comment>Color of border surrounding a Twitter widget.</comment>
60+
<validate>jscolor {hash:true,refine:false} required-entry</validate>
61+
</field>
62+
<field id="width" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
63+
<label>Widget width</label>
64+
<validate>validate-zero-or-greater validate-number validate-digits validate-digits-range digits-range-180-1200</validate>
65+
<comment>Set the maximum width of the widget. Minimum: 180, maximum: 1200. If empty, auto width will be use</comment>
66+
</field>
67+
<field id="height" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
68+
<label>Widget height</label>
69+
<comment>Set the maximum height of the widget. Must be greater than 200</comment>
70+
<validate>validate-zero-or-greater validate-number</validate>
71+
</field>
72+
</group>
73+
<group id="snippet" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
74+
<label>Snippet Code</label>
75+
<field id="snippet_code" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
76+
<label>Example</label>
77+
<frontend_model>Mageplaza\TwitterWidget\Block\Adminhtml\System\Snippet</frontend_model>
78+
</field>
79+
</group>
80+
</section>
81+
</system>
82+
</config>

‎view/frontend/templates/twitter.phtml‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,34 @@
2121

2222
/** @var Mageplaza\TwitterWidget\Block\Widget $block */
2323
if ($block->isEnable()) :
24+
$helper = $this->helper(\Mageplaza\TwitterWidget\Helper\Data::class);
2425
$widgetId = uniqid();
2526
$options = $block->getAllOptions();
2627
$url = $block->getData('tweet_url') ?: $block->getData('timeline_url');
28+
$width = (float) $helper->getWidth();
29+
$height = (float) $helper->getHeight();
2730
?>
2831

2932
<div class="mptwitterwidget-container">
3033
<div class="mptwitterwidget-header">
3134
<h3><?= $block->escapeHtml(__($block->getData('title'))) ?></h3>
3235
<div><?= $block->escapeHtml(__($block->getData('description'))) ?></div>
3336
</div>
34-
<div id="mptwitterwidget-block-<?= /* @noEscape */ $widgetId ?>">
35-
<div id="mptwitterwidget-follow-btn-<?= /* @noEscape */ $widgetId ?>"></div>
36-
<div id="mptwitterwidget-load-<?= /* @noEscape */ $widgetId ?>"
37-
style="font-size: medium;"><?= /* @noEscape */ __('Loading...') ?></div>
38-
</div>
37+
<?php if ($height > 0 && $width > 0) : ?>
38+
<div id="mptwitterwidget-block-<?= /* @noEscape */ $widgetId ?>"
39+
style='height: <?= /* @noEscape */ $height ?>px; width: <?= /* @noEscape */ $width+10 ?>px; overflow: overlay;'>
40+
41+
<div id="mptwitterwidget-follow-btn-<?= /* @noEscape */ $widgetId ?>"></div>
42+
<div id="mptwitterwidget-load-<?= /* @noEscape */ $widgetId ?>"
43+
style="font-size: medium;"><?= $block->escapeHtml(__('Loading...')) ?></div>
44+
</div>
45+
<?php else : ?>
46+
<div id="mptwitterwidget-block-<?= /* @noEscape */ $widgetId ?>">
47+
<div id="mptwitterwidget-follow-btn-<?= /* @noEscape */ $widgetId ?>"></div>
48+
<div id="mptwitterwidget-load-<?= /* @noEscape */ $widgetId ?>"
49+
style="font-size: medium;"><?= $block->escapeHtml(__('Loading...')) ?></div>
50+
</div>
51+
<?php endif ?>
3952
</div>
4053
<script type="text/x-magento-init">
4154
{
@@ -60,5 +73,9 @@ if ($block->isEnable()) :
6073
width: auto;
6174
}
6275
}
76+
77+
#mptwitterwidget-block-<?= /* @noEscape */ $widgetId ?>::-webkit-scrollbar {width: 6px;}
78+
#mptwitterwidget-block-<?= /* @noEscape */ $widgetId ?>::-webkit-scrollbar-track {box-shadow: inset 0 0 1px #33333359;}
79+
#mptwitterwidget-block-<?= /* @noEscape */ $widgetId ?>::-webkit-scrollbar-thumb {background: #33333359; border-radius: 10px;}
6380
</style>
6481
<?php endif; ?>

0 commit comments

Comments
 (0)