-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #187 from mageplaza/develop
Develop
- Loading branch information
Showing
7 changed files
with
201 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,86 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * 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_SocialLogin | ||
| * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/) | ||
| * @license https://www.mageplaza.com/LICENSE.txt | ||
| */ | ||
| --> | ||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd"> | ||
| <default> | ||
| <sociallogin> | ||
| <module> | ||
| <type>1</type> | ||
| </module> | ||
| <general> | ||
| <enabled>0</enabled> | ||
| <link_trigger>.header.links, .section-item-content .header.links</link_trigger> | ||
| <send_password>1</send_password> | ||
| <social_display>1,2,3,4</social_display> | ||
| <popup_login>popup_slide</popup_login> | ||
| <authentication_popup>1</authentication_popup> | ||
| <popup_effect>mfp-move-from-top</popup_effect> | ||
| <style_management>#6e716e</style_management> | ||
| <require_more_info>2</require_more_info> | ||
| <information_require>email,name,password</information_require> | ||
| </general> | ||
| <facebook> | ||
| <sort_order>10</sort_order> | ||
| </facebook> | ||
| <google> | ||
| <sort_order>20</sort_order> | ||
| </google> | ||
| <amazon> | ||
| <sort_order>30</sort_order> | ||
| </amazon> | ||
| <twitter> | ||
| <sort_order>40</sort_order> | ||
| </twitter> | ||
| <linkedin> | ||
| <sort_order>50</sort_order> | ||
| </linkedin> | ||
| <yahoo> | ||
| <sort_order>60</sort_order> | ||
| </yahoo> | ||
| <foursquare> | ||
| <sort_order>70</sort_order> | ||
| </foursquare> | ||
| <instagram> | ||
| <sort_order>80</sort_order> | ||
| </instagram> | ||
| <vkontakte> | ||
| <sort_order>90</sort_order> | ||
| </vkontakte> | ||
| <github> | ||
| <sort_order>100</sort_order> | ||
| </github> | ||
| <live> | ||
| <sort_order>110</sort_order> | ||
| </live> | ||
| </sociallogin> | ||
| </default> | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * 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_SocialLogin | ||
| * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/) | ||
| * @license https://www.mageplaza.com/LICENSE.txt | ||
| */ | ||
| --> | ||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd"> | ||
| <default> | ||
| <sociallogin> | ||
| <module> | ||
| <type>1</type> | ||
| </module> | ||
| <general> | ||
| <enabled>0</enabled> | ||
| <link_trigger>.header.links, .section-item-content .header.links</link_trigger> | ||
| <send_password>1</send_password> | ||
| <social_display>1,2,3,4</social_display> | ||
| <popup_login>popup_slide</popup_login> | ||
| <authentication_popup>1</authentication_popup> | ||
| <popup_effect>mfp-move-from-top</popup_effect> | ||
| <style_management>#6e716e</style_management> | ||
| <require_more_info>2</require_more_info> | ||
| <information_require>email,name,password</information_require> | ||
| <custom_css> | ||
| #bnt-social-login-fake-email { | ||
| background-color: grey !important; | ||
| border: grey !important; | ||
| } | ||
|
|
||
| #request-popup .social-login-title { | ||
| background-color: grey !important; | ||
| } | ||
| </custom_css> | ||
| </general> | ||
| <facebook> | ||
| <sort_order>10</sort_order> | ||
| </facebook> | ||
| <google> | ||
| <sort_order>20</sort_order> | ||
| </google> | ||
| <amazon> | ||
| <sort_order>30</sort_order> | ||
| </amazon> | ||
| <twitter> | ||
| <sort_order>40</sort_order> | ||
| </twitter> | ||
| <linkedin> | ||
| <sort_order>50</sort_order> | ||
| </linkedin> | ||
| <yahoo> | ||
| <sort_order>60</sort_order> | ||
| </yahoo> | ||
| <foursquare> | ||
| <sort_order>70</sort_order> | ||
| </foursquare> | ||
| <instagram> | ||
| <sort_order>80</sort_order> | ||
| </instagram> | ||
| <vkontakte> | ||
| <sort_order>90</sort_order> | ||
| </vkontakte> | ||
| <github> | ||
| <sort_order>100</sort_order> | ||
| </github> | ||
| <live> | ||
| <sort_order>110</sort_order> | ||
| </live> | ||
| </sociallogin> | ||
| </default> | ||
| </config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,54 @@ | ||
| <?php | ||
| /** | ||
| * 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_SocialLogin | ||
| * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/) | ||
| * @license https://www.mageplaza.com/LICENSE.txt | ||
| */ | ||
| ?> | ||
| <div class="social-login block-container forgot" style="display:none"> | ||
| <div class="social-login-title"> | ||
| <h2 class="forgot-pass-title"><?= __('Forgot Password') ?></h2> | ||
| </div> | ||
| <div class="block col-mp mp-12"> | ||
| <div class="block-content"> | ||
| <form class="form-password-forget" id="social-form-password-forget" data-mage-init='{"validation":{}}'> | ||
| <fieldset class="fieldset" data-hasrequired="<?= __('* Required Fields') ?>"> | ||
| <div class="field note"><?= __('Please enter your email address below to receive a password reset link.') ?></div> | ||
| <div class="field email required"> | ||
| <label for="email_address" class="label"><span><?= __('Email') ?></span></label> | ||
| <div class="control"> | ||
| <input type="email" name="email" alt="email" id="email_address_forgot" class="input-text" | ||
| value="<?= $block->escapeHtml($block->getEmailValue()) ?>" | ||
| data-validate="{required:true, 'validate-email':true}"/> | ||
| </div> | ||
| </div> | ||
| <?= $block->getChildHtml('form_additional_info') ?> | ||
| </fieldset> | ||
| <div class="actions-toolbar"> | ||
| <div class="primary"> | ||
| <button type="button" id="bnt-social-login-forgot" class="action send primary"> | ||
| <span><?= __('Submit') ?></span> | ||
| </button> | ||
| <div class="secondary"> | ||
| <a class="action back" href="#"><span><?= __('Back') ?></span></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <?php | ||
| /** | ||
| * 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_SocialLogin | ||
| * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/) | ||
| * @license https://www.mageplaza.com/LICENSE.txt | ||
| */ | ||
| ?> | ||
| <div class="social-login block-container forgot" style="display:none"> | ||
| <div class="social-login-title"> | ||
| <h2 class="forgot-pass-title"><?= __('Forgot Password') ?></h2> | ||
| </div> | ||
| <div class="block col-mp mp-12"> | ||
| <div class="block-content"> | ||
| <form class="form-password-forget" id="social-form-password-forget" data-mage-init='{"validation":{}}'> | ||
| <fieldset class="fieldset" data-hasrequired="<?= __('* Required Fields') ?>"> | ||
| <div class="field note"><?= __('Please enter your email address below to receive a password reset link.') ?></div> | ||
| <div class="field email required"> | ||
| <label for="email_address" class="label"><span><?= __('Email') ?></span></label> | ||
| <div class="control"> | ||
| <input type="email" name="email" alt="email" id="email_address_forgot" class="input-text" | ||
| value="<?= $block->escapeHtml($block->getEmailValue()) ?>" | ||
| data-validate="{required:true, 'validate-email':true}"/> | ||
| </div> | ||
| </div> | ||
| <?= $block->getChildHtml('form_additional_info') ?> | ||
| </fieldset> | ||
| <div class="actions-toolbar"> | ||
| <div class="primary"> | ||
| <button type="button" id="bnt-social-login-forgot" class="action send primary"> | ||
| <span><?= __('Submit') ?></span> | ||
| </button> | ||
| <div class="secondary"> | ||
| <a class="action back" href="#"><span><?= __('Back') ?></span></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters