Version Notes
- Added built-in support of world's best selling Magento themes: Ultimo, Shopper, Fortis, Acumen
- Added "Callback URL" auto-generation for each social network, to help admin while creating application
- Modified Twitter and Facebook login buttons display logic
- Modified commands for adding social login buttons and customer photo from social network in any place of the template (more information can be found in Plumrocket Wiki)
- Added integration with Plumrocket Popup Login Magento Extension
- Fixed bug with displaying incorrect date of customer registration in Magento backend
- Fixed bug with impossibility to login if “Require Emails Confirmation” option was not enabled in the backend. Now after registration user's default status is changed to be "Confirmed"
- Fixed bug with closing Facebook popup
Download this release
Release Info
| Developer | Plumrocket Team |
| Extension | Plumrocket_Twitter_Facebook_Login |
| Version | 1.1.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.1 to 1.1.0
- app/code/community/Plumrocket/SocialLogin/Block/Buttons.php +5 -73
- app/code/community/Plumrocket/SocialLogin/Block/General.php +8 -1
- app/code/community/Plumrocket/SocialLogin/Block/System/Config/Callbackurl.php +37 -0
- app/code/community/Plumrocket/SocialLogin/Block/System/Config/Comingsoon.php +31 -0
- app/code/community/Plumrocket/SocialLogin/Block/System/Config/Sortable.php +3 -57
- app/code/community/Plumrocket/SocialLogin/Helper/Data.php +141 -1
- app/code/community/Plumrocket/SocialLogin/Model/Account.php +74 -18
- app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php +5 -0
- app/code/community/Plumrocket/SocialLogin/etc/config.xml +1 -1
- app/code/community/Plumrocket/SocialLogin/etc/system.xml +98 -70
- app/design/adminhtml/default/default/layout/pslogin.xml +1 -1
- app/design/frontend/base/default/layout/pslogin.xml +14 -1
- app/design/frontend/base/default/template/pslogin/checkout/onepage/login.phtml +12 -1
- app/design/frontend/base/default/template/pslogin/customer/form/edit/fake_email.phtml +2 -0
- app/design/frontend/base/default/template/pslogin/customer/form/login.phtml +13 -1
- app/design/frontend/base/default/template/pslogin/customer/form/login/buttons.phtml +31 -42
- app/design/frontend/base/default/template/pslogin/customer/form/register.phtml +12 -1
- app/design/frontend/base/default/template/pslogin/customer/form/register/buttons.phtml +37 -47
- app/design/frontend/base/default/template/pslogin/page/html/welcome.phtml +5 -4
- app/design/frontend/fortis/default/template/pslogin/checkout/onepage/login.phtml +168 -0
- app/design/frontend/fortis/default/template/pslogin/customer/form/login.phtml +109 -0
- app/design/frontend/fortis/default/template/pslogin/customer/form/register.phtml +204 -0
- app/design/frontend/gravdept/acumen/template/pslogin/checkout/onepage/login.phtml +145 -0
- app/design/frontend/gravdept/acumen/template/pslogin/customer/form/login.phtml +95 -0
- app/design/frontend/gravdept/acumen/template/pslogin/customer/form/register.phtml +225 -0
- app/design/frontend/shopper/default/template/pslogin/checkout/onepage/login.phtml +177 -0
- app/design/frontend/shopper/default/template/pslogin/customer/form/login.phtml +118 -0
- app/design/frontend/shopper/default/template/pslogin/customer/form/register.phtml +271 -0
- app/design/frontend/ultimo/default/template/pslogin/checkout/onepage/login.phtml +173 -0
- app/design/frontend/ultimo/default/template/pslogin/customer/form/login.phtml +100 -0
- app/design/frontend/ultimo/default/template/pslogin/customer/form/register.phtml +204 -0
- app/etc/modules/Plumrocket_SocialLogin.xml +1 -1
- package.xml +12 -5
- skin/adminhtml/default/default/css/plumrocket/pslogin/pslogin.css +29 -4
- skin/adminhtml/default/default/images/plumrocket/pslogin/social_admin.png +0 -0
- skin/adminhtml/default/default/js/plumrocket/{jquery-1.10.2.min.js → pslogin/jquery-1.10.2.min.js} +0 -0
- skin/adminhtml/default/default/js/plumrocket/pslogin/pslogin.js +44 -0
- skin/frontend/base/default/css/plumrocket/pslogin/pslogin-custom.css +0 -0
- skin/frontend/base/default/css/plumrocket/pslogin/pslogin.css +507 -146
- skin/frontend/base/default/images/plumrocket/pslogin/social.png +0 -0
- skin/frontend/base/default/images/plumrocket/pslogin/social_retina.png +0 -0
- skin/frontend/base/default/js/plumrocket/{jquery-1.10.2.min.js → pslogin/jquery-1.10.2.min.js} +0 -0
- skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js +13 -4
- skin/frontend/shopper/default/css/plumrocket/pslogin/pslogin-custom.css +33 -0
app/code/community/Plumrocket/SocialLogin/Block/Buttons.php
CHANGED
|
@@ -18,74 +18,11 @@
|
|
| 18 |
|
| 19 |
class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
|
| 20 |
{
|
| 21 |
-
protected $_buttons = null;
|
| 22 |
-
protected $_buttonsPrepared = null;
|
| 23 |
protected $_loaderImg = 'loader.gif';
|
| 24 |
|
| 25 |
-
public function getButtons()
|
| 26 |
-
{
|
| 27 |
-
if (is_null($this->_buttons)) {
|
| 28 |
-
$types = Mage::helper('pslogin')->getTypes();
|
| 29 |
-
|
| 30 |
-
$this->_buttons = array();
|
| 31 |
-
foreach ($types as $type) {
|
| 32 |
-
$type = Mage::getSingleton("pslogin/$type");
|
| 33 |
-
if($type->enabled()) {
|
| 34 |
-
$button = $type->getButton();
|
| 35 |
-
$this->_buttons[ $button['type'] ] = $button;
|
| 36 |
-
}
|
| 37 |
-
}
|
| 38 |
-
}
|
| 39 |
-
return $this->_buttons;
|
| 40 |
-
}
|
| 41 |
-
|
| 42 |
public function getPreparedButtons($part = null)
|
| 43 |
{
|
| 44 |
-
|
| 45 |
-
$this->_buttonsPrepared = array(
|
| 46 |
-
'visible' => array(),
|
| 47 |
-
'hidden' => array()
|
| 48 |
-
);
|
| 49 |
-
$buttons = $this->getButtons();
|
| 50 |
-
|
| 51 |
-
$sortableString = Mage::getStoreConfig('pslogin/general/sortable');
|
| 52 |
-
$sortable = null;
|
| 53 |
-
parse_str($sortableString, $sortable);
|
| 54 |
-
|
| 55 |
-
if(is_array($sortable)) {
|
| 56 |
-
foreach ($sortable as $partName => $partButtons) {
|
| 57 |
-
foreach ($partButtons as $button) {
|
| 58 |
-
if(isset($buttons[$button])) {
|
| 59 |
-
$this->_buttonsPrepared[$partName][] = $buttons[$button];
|
| 60 |
-
unset($buttons[$button]);
|
| 61 |
-
}
|
| 62 |
-
}
|
| 63 |
-
}
|
| 64 |
-
|
| 65 |
-
// If has not sortabled enabled buttons.
|
| 66 |
-
if(!empty($buttons)) {
|
| 67 |
-
if(empty($this->_buttonsPrepared['visible'])) {
|
| 68 |
-
$this->_buttonsPrepared['visible'] = array();
|
| 69 |
-
}
|
| 70 |
-
$this->_buttonsPrepared['visible'] = array_merge($this->_buttonsPrepared['visible'], $buttons);
|
| 71 |
-
}
|
| 72 |
-
|
| 73 |
-
// If visible list is empty.
|
| 74 |
-
if(empty($this->_buttonsPrepared['visible'])) {
|
| 75 |
-
$this->_buttonsPrepared['visible'] = $this->_buttonsPrepared['hidden'];
|
| 76 |
-
$this->_buttonsPrepared['hidden'] = array();
|
| 77 |
-
}
|
| 78 |
-
|
| 79 |
-
// Set visible.
|
| 80 |
-
foreach($this->_buttonsPrepared['visible'] as &$btn) {
|
| 81 |
-
$btn['visible'] = true;
|
| 82 |
-
}
|
| 83 |
-
}
|
| 84 |
-
}
|
| 85 |
-
|
| 86 |
-
return isset($this->_buttonsPrepared[$part]) ?
|
| 87 |
-
$this->_buttonsPrepared[$part] :
|
| 88 |
-
array_merge($this->_buttonsPrepared['visible'], $this->_buttonsPrepared['hidden']);
|
| 89 |
}
|
| 90 |
|
| 91 |
public function hasButtons()
|
|
@@ -101,18 +38,13 @@ class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
|
|
| 101 |
|
| 102 |
public function showRegisterFullButtons()
|
| 103 |
{
|
| 104 |
-
|
| 105 |
-
return count($all) <= 6;
|
| 106 |
-
}
|
| 107 |
-
|
| 108 |
-
public function enableForLogin()
|
| 109 |
-
{
|
| 110 |
-
return Mage::helper('pslogin')->moduleEnabled() && Mage::helper('pslogin')->forLoginEnabled();
|
| 111 |
}
|
| 112 |
|
| 113 |
-
public function
|
| 114 |
{
|
| 115 |
-
|
|
|
|
| 116 |
}
|
| 117 |
|
| 118 |
public function getLoaderUrl()
|
| 18 |
|
| 19 |
class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
|
| 20 |
{
|
|
|
|
|
|
|
| 21 |
protected $_loaderImg = 'loader.gif';
|
| 22 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
public function getPreparedButtons($part = null)
|
| 24 |
{
|
| 25 |
+
return Mage::helper('pslogin')->getPreparedButtons($part);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 26 |
}
|
| 27 |
|
| 28 |
public function hasButtons()
|
| 38 |
|
| 39 |
public function showRegisterFullButtons()
|
| 40 |
{
|
| 41 |
+
return $this->showFullButtons();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
}
|
| 43 |
|
| 44 |
+
public function showFullButtons()
|
| 45 |
{
|
| 46 |
+
$all = $this->getPreparedButtons();
|
| 47 |
+
return count($all) <= 6;
|
| 48 |
}
|
| 49 |
|
| 50 |
public function getLoaderUrl()
|
app/code/community/Plumrocket/SocialLogin/Block/General.php
CHANGED
|
@@ -20,9 +20,16 @@ class Plumrocket_SocialLogin_Block_General extends Mage_Core_Block_Template
|
|
| 20 |
{
|
| 21 |
protected function _toHtml()
|
| 22 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
// Set referer.
|
| 24 |
if(!$customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
|
| 25 |
-
$moduleName = $this->getRequest()->getModuleName();
|
| 26 |
$skipModules = Mage::helper('pslogin')->getRefererLinkSkipModules();
|
| 27 |
if( ($moduleName != 'cms' && $this->getRequest()->getActionName() != 'noRoute') && !in_array($moduleName, $skipModules)) {
|
| 28 |
$referer = $this->helper('core/url')->getCurrentBase64Url();
|
| 20 |
{
|
| 21 |
protected function _toHtml()
|
| 22 |
{
|
| 23 |
+
$moduleName = $this->getRequest()->getModuleName();
|
| 24 |
+
|
| 25 |
+
// Set current store.
|
| 26 |
+
if($moduleName != 'pslogin') {
|
| 27 |
+
$currentStoreId = Mage::app()->getStore()->getId();
|
| 28 |
+
Mage::helper('pslogin')->refererStore($currentStoreId);
|
| 29 |
+
}
|
| 30 |
+
|
| 31 |
// Set referer.
|
| 32 |
if(!$customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
|
|
|
|
| 33 |
$skipModules = Mage::helper('pslogin')->getRefererLinkSkipModules();
|
| 34 |
if( ($moduleName != 'cms' && $this->getRequest()->getActionName() != 'noRoute') && !in_array($moduleName, $skipModules)) {
|
| 35 |
$referer = $this->helper('core/url')->getCurrentBase64Url();
|
app/code/community/Plumrocket/SocialLogin/Block/System/Config/Callbackurl.php
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Plumrocket Inc.
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the End-user License Agreement
|
| 8 |
+
* that is available through the world-wide-web at this URL:
|
| 9 |
+
* http://wiki.plumrocket.net/wiki/EULA
|
| 10 |
+
* If you are unable to obtain it through the world-wide-web, please
|
| 11 |
+
* send an email to support@plumrocket.com so we can send you a copy immediately.
|
| 12 |
+
*
|
| 13 |
+
* @package Plumrocket_SocialLogin
|
| 14 |
+
* @copyright Copyright (c) 2014 Plumrocket Inc. (http://www.plumrocket.com)
|
| 15 |
+
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
| 16 |
+
*/
|
| 17 |
+
|
| 18 |
+
|
| 19 |
+
class Plumrocket_SocialLogin_Block_System_Config_Callbackurl extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 20 |
+
{
|
| 21 |
+
/*public function render(Varien_Data_Form_Element_Abstract $element)
|
| 22 |
+
{
|
| 23 |
+
// $moduleNode = Mage::getConfig()->getNode('modules/Plumrocket_SocialLogin');
|
| 24 |
+
// $name = $moduleNode->name;
|
| 25 |
+
// $version = $moduleNode->version;
|
| 26 |
+
// $wiki = $moduleNode->wiki;
|
| 27 |
+
|
| 28 |
+
$path = Mage::helper('pslogin')->getCallbackURL('_PROVIDER_');
|
| 29 |
+
return '<tr id="row_pslogin_facebook_callbackurl"><td class="label">Callback URL</td><td class="value"><input id="pslogin_facebook_callbackurl" type="text" name="" value="'. $path .'" class="input-text pslogin-callbackurl-autofocus" readonly="readonly" /></td><td></td><td></td></tr>';
|
| 30 |
+
}*/
|
| 31 |
+
|
| 32 |
+
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
|
| 33 |
+
{
|
| 34 |
+
$url = Mage::helper('pslogin')->getCallbackURL('_PROVIDER_');
|
| 35 |
+
return '<input id="'. $element->getHtmlId() .'" type="text" name="" value="'. $url .'" class="input-text pslogin-callbackurl-autofocus" style="background-color: #EEE; color: #999;" readonly="readonly" />';
|
| 36 |
+
}
|
| 37 |
+
}
|
app/code/community/Plumrocket/SocialLogin/Block/System/Config/Comingsoon.php
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Plumrocket Inc.
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the End-user License Agreement
|
| 8 |
+
* that is available through the world-wide-web at this URL:
|
| 9 |
+
* http://wiki.plumrocket.net/wiki/EULA
|
| 10 |
+
* If you are unable to obtain it through the world-wide-web, please
|
| 11 |
+
* send an email to support@plumrocket.com so we can send you a copy immediately.
|
| 12 |
+
*
|
| 13 |
+
* @package Plumrocket_SocialLogin
|
| 14 |
+
* @copyright Copyright (c) 2014 Plumrocket Inc. (http://www.plumrocket.com)
|
| 15 |
+
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
| 16 |
+
*/
|
| 17 |
+
|
| 18 |
+
|
| 19 |
+
class Plumrocket_SocialLogin_Block_System_Config_Comingsoon extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 20 |
+
{
|
| 21 |
+
public function render(Varien_Data_Form_Element_Abstract $element)
|
| 22 |
+
{
|
| 23 |
+
// $moduleNode = Mage::getConfig()->getNode('modules/Plumrocket_SocialLogin');
|
| 24 |
+
// $name = $moduleNode->name;
|
| 25 |
+
// $url = 'https://store.plumrocket.com/magento-extensions/social-login-pro-magento-extension.html';
|
| 26 |
+
|
| 27 |
+
return '<div style="padding:10px;background-color:#fff;color:#d83820;border:1px solid #ddd;margin-bottom:7px;">'.
|
| 28 |
+
$this->__('This network is coming soon. It will be available via free update.')
|
| 29 |
+
.'</div>';
|
| 30 |
+
}
|
| 31 |
+
}
|
app/code/community/Plumrocket/SocialLogin/Block/System/Config/Sortable.php
CHANGED
|
@@ -18,9 +18,7 @@
|
|
| 18 |
|
| 19 |
class Plumrocket_SocialLogin_Block_System_Config_Sortable extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 20 |
{
|
| 21 |
-
|
| 22 |
-
protected $_buttonsPrepared = null;
|
| 23 |
-
|
| 24 |
public function _construct() {
|
| 25 |
parent::_construct();
|
| 26 |
$this->setTemplate('pslogin/system/config/sortable.phtml');
|
|
@@ -36,64 +34,12 @@ class Plumrocket_SocialLogin_Block_System_Config_Sortable extends Mage_Adminhtml
|
|
| 36 |
|
| 37 |
public function getButtons()
|
| 38 |
{
|
| 39 |
-
|
| 40 |
-
$types = Mage::helper('pslogin')->getTypes();
|
| 41 |
-
|
| 42 |
-
$this->_buttons = array();
|
| 43 |
-
foreach ($types as $type) {
|
| 44 |
-
$type = Mage::getSingleton("pslogin/$type");
|
| 45 |
-
if($type->enabled()) {
|
| 46 |
-
$button = $type->getButton();
|
| 47 |
-
$this->_buttons[ $button['type'] ] = $button;
|
| 48 |
-
}
|
| 49 |
-
}
|
| 50 |
-
}
|
| 51 |
-
return $this->_buttons;
|
| 52 |
}
|
| 53 |
|
| 54 |
public function getPreparedButtons($part)
|
| 55 |
{
|
| 56 |
-
|
| 57 |
-
$this->_buttonsPrepared = array(
|
| 58 |
-
'visible' => array(),
|
| 59 |
-
'hidden' => array()
|
| 60 |
-
);
|
| 61 |
-
$buttons = $this->getButtons();
|
| 62 |
-
|
| 63 |
-
$storeName = $this->getRequest()->getParam('store');
|
| 64 |
-
$sortableString = Mage::getStoreConfig('pslogin/general/sortable', $storeName);
|
| 65 |
-
$sortable = null;
|
| 66 |
-
parse_str($sortableString, $sortable);
|
| 67 |
-
|
| 68 |
-
if(is_array($sortable)) {
|
| 69 |
-
foreach ($sortable as $partName => $partButtons) {
|
| 70 |
-
foreach ($partButtons as $button) {
|
| 71 |
-
if(isset($buttons[$button])) {
|
| 72 |
-
$this->_buttonsPrepared[$partName][] = $buttons[$button];
|
| 73 |
-
unset($buttons[$button]);
|
| 74 |
-
}
|
| 75 |
-
}
|
| 76 |
-
}
|
| 77 |
-
|
| 78 |
-
// If has not sortabled enabled buttons.
|
| 79 |
-
if(!empty($buttons)) {
|
| 80 |
-
if(empty($this->_buttonsPrepared['visible'])) {
|
| 81 |
-
$this->_buttonsPrepared['visible'] = array();
|
| 82 |
-
}
|
| 83 |
-
$this->_buttonsPrepared['visible'] = array_merge($this->_buttonsPrepared['visible'], $buttons);
|
| 84 |
-
}
|
| 85 |
-
|
| 86 |
-
// If visible list is empty.
|
| 87 |
-
if(empty($this->_buttonsPrepared['visible'])) {
|
| 88 |
-
$this->_buttonsPrepared['visible'] = $this->_buttonsPrepared['hidden'];
|
| 89 |
-
$this->_buttonsPrepared['hidden'] = array();
|
| 90 |
-
}
|
| 91 |
-
|
| 92 |
-
|
| 93 |
-
}
|
| 94 |
-
}
|
| 95 |
-
|
| 96 |
-
return isset($this->_buttonsPrepared[$part])? $this->_buttonsPrepared[$part] : array();
|
| 97 |
}
|
| 98 |
|
| 99 |
}
|
| 18 |
|
| 19 |
class Plumrocket_SocialLogin_Block_System_Config_Sortable extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 20 |
{
|
| 21 |
+
|
|
|
|
|
|
|
| 22 |
public function _construct() {
|
| 23 |
parent::_construct();
|
| 24 |
$this->setTemplate('pslogin/system/config/sortable.phtml');
|
| 34 |
|
| 35 |
public function getButtons()
|
| 36 |
{
|
| 37 |
+
return Mage::helper('pslogin')->getButtons();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 38 |
}
|
| 39 |
|
| 40 |
public function getPreparedButtons($part)
|
| 41 |
{
|
| 42 |
+
return Mage::helper('pslogin')->getPreparedButtons($part);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
}
|
| 44 |
|
| 45 |
}
|
app/code/community/Plumrocket/SocialLogin/Helper/Data.php
CHANGED
|
@@ -19,11 +19,15 @@
|
|
| 19 |
class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
|
| 20 |
{
|
| 21 |
const REFERER_QUERY_PARAM_NAME = 'pslogin_referer';
|
|
|
|
| 22 |
const SHOW_POPUP_PARAM_NAME = 'pslogin_show_popup';
|
| 23 |
const FAKE_EMAIL_PREFIX = 'temp-email-ps';
|
| 24 |
const TIME_TO_EDIT = 300;
|
| 25 |
const DEBUG_MODE = false;
|
| 26 |
|
|
|
|
|
|
|
|
|
|
| 27 |
public function moduleEnabled()
|
| 28 |
{
|
| 29 |
return (bool)Mage::getStoreConfig('pslogin/general/enable');
|
|
@@ -59,6 +63,35 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 59 |
return $this->moduleEnabled() && Mage::getStoreConfig('pslogin/general/enable_photo');
|
| 60 |
}
|
| 61 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 62 |
public function getPhotoPath($checkIsEnabled = true)
|
| 63 |
{
|
| 64 |
if($checkIsEnabled && !$this->photoEnabled()) {
|
|
@@ -95,6 +128,22 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 95 |
);
|
| 96 |
}
|
| 97 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 98 |
public function getTypes($onlyEnabled = true)
|
| 99 |
{
|
| 100 |
$groups = Mage::getStoreConfig('pslogin');
|
|
@@ -114,9 +163,75 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 114 |
return $types;
|
| 115 |
}
|
| 116 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 117 |
public function refererLink($value = false)
|
| 118 |
{
|
| 119 |
-
Mage::log(base64_decode($value), null, 'pslogin_referer', true);
|
| 120 |
// Core session.
|
| 121 |
$session = Mage::getSingleton('core/session');
|
| 122 |
$prevValueByCore = $session->getLoginMainRedirectUrl();
|
|
@@ -140,6 +255,31 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 140 |
return $prevValueByCore? $prevValueByCore : $prevValueByCustomer;
|
| 141 |
}
|
| 142 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 143 |
public function getRefererLinkSkipModules()
|
| 144 |
{
|
| 145 |
return array('customer', /*'checkout',*/ 'pslogin');
|
| 19 |
class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
|
| 20 |
{
|
| 21 |
const REFERER_QUERY_PARAM_NAME = 'pslogin_referer';
|
| 22 |
+
const REFERER_STORE_PARAM_NAME = 'pslogin_referer_store';
|
| 23 |
const SHOW_POPUP_PARAM_NAME = 'pslogin_show_popup';
|
| 24 |
const FAKE_EMAIL_PREFIX = 'temp-email-ps';
|
| 25 |
const TIME_TO_EDIT = 300;
|
| 26 |
const DEBUG_MODE = false;
|
| 27 |
|
| 28 |
+
protected $_buttons = null;
|
| 29 |
+
protected $_buttonsPrepared = null;
|
| 30 |
+
|
| 31 |
public function moduleEnabled()
|
| 32 |
{
|
| 33 |
return (bool)Mage::getStoreConfig('pslogin/general/enable');
|
| 63 |
return $this->moduleEnabled() && Mage::getStoreConfig('pslogin/general/enable_photo');
|
| 64 |
}
|
| 65 |
|
| 66 |
+
|
| 67 |
+
public function modulePositionEnabled($position)
|
| 68 |
+
{
|
| 69 |
+
$enabled = true;
|
| 70 |
+
|
| 71 |
+
$this->moduleEnabled() or $enabled = false;
|
| 72 |
+
|
| 73 |
+
switch($position) {
|
| 74 |
+
case 'login':
|
| 75 |
+
$this->forLoginEnabled() or $enabled = false;
|
| 76 |
+
break;
|
| 77 |
+
|
| 78 |
+
case 'register':
|
| 79 |
+
$this->forRegisterEnabled() or $enabled = false;
|
| 80 |
+
break;
|
| 81 |
+
}
|
| 82 |
+
|
| 83 |
+
return $enabled;
|
| 84 |
+
}
|
| 85 |
+
|
| 86 |
+
public function hasButtons()
|
| 87 |
+
{
|
| 88 |
+
if($customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
|
| 89 |
+
return false;
|
| 90 |
+
}
|
| 91 |
+
|
| 92 |
+
return (bool)$this->getPreparedButtons();
|
| 93 |
+
}
|
| 94 |
+
|
| 95 |
public function getPhotoPath($checkIsEnabled = true)
|
| 96 |
{
|
| 97 |
if($checkIsEnabled && !$this->photoEnabled()) {
|
| 128 |
);
|
| 129 |
}
|
| 130 |
|
| 131 |
+
public function getCallbackURL($provider)
|
| 132 |
+
{
|
| 133 |
+
$defaultStoreId = Mage::app()
|
| 134 |
+
->getWebsite(true)
|
| 135 |
+
->getDefaultGroup()
|
| 136 |
+
->getDefaultStoreId();
|
| 137 |
+
|
| 138 |
+
$url = Mage::app()->getStore($defaultStoreId)->getUrl('pslogin/account/login', array('type' => $provider, '_nosid' => true));
|
| 139 |
+
|
| 140 |
+
if(false !== ($length = stripos($url, '?'))) {
|
| 141 |
+
$url = substr($url, 0, $length);
|
| 142 |
+
}
|
| 143 |
+
|
| 144 |
+
return $url;
|
| 145 |
+
}
|
| 146 |
+
|
| 147 |
public function getTypes($onlyEnabled = true)
|
| 148 |
{
|
| 149 |
$groups = Mage::getStoreConfig('pslogin');
|
| 163 |
return $types;
|
| 164 |
}
|
| 165 |
|
| 166 |
+
public function getButtons()
|
| 167 |
+
{
|
| 168 |
+
if (is_null($this->_buttons)) {
|
| 169 |
+
$types = $this->getTypes();
|
| 170 |
+
|
| 171 |
+
$this->_buttons = array();
|
| 172 |
+
foreach ($types as $type) {
|
| 173 |
+
$type = Mage::getSingleton("pslogin/$type");
|
| 174 |
+
if($type->enabled()) {
|
| 175 |
+
$button = $type->getButton();
|
| 176 |
+
$this->_buttons[ $button['type'] ] = $button;
|
| 177 |
+
}
|
| 178 |
+
}
|
| 179 |
+
}
|
| 180 |
+
return $this->_buttons;
|
| 181 |
+
}
|
| 182 |
+
|
| 183 |
+
public function getPreparedButtons($part = null)
|
| 184 |
+
{
|
| 185 |
+
if(is_null($this->_buttonsPrepared)) {
|
| 186 |
+
$this->_buttonsPrepared = array(
|
| 187 |
+
'visible' => array(),
|
| 188 |
+
'hidden' => array()
|
| 189 |
+
);
|
| 190 |
+
$buttons = $this->getButtons();
|
| 191 |
+
|
| 192 |
+
$storeName = Mage::app()->getRequest()->getParam('store');
|
| 193 |
+
$sortableString = Mage::getStoreConfig('pslogin/general/sortable', $storeName);
|
| 194 |
+
$sortable = null;
|
| 195 |
+
parse_str($sortableString, $sortable);
|
| 196 |
+
|
| 197 |
+
if(is_array($sortable)) {
|
| 198 |
+
foreach ($sortable as $partName => $partButtons) {
|
| 199 |
+
foreach ($partButtons as $button) {
|
| 200 |
+
if(isset($buttons[$button])) {
|
| 201 |
+
$this->_buttonsPrepared[$partName][] = $buttons[$button];
|
| 202 |
+
unset($buttons[$button]);
|
| 203 |
+
}
|
| 204 |
+
}
|
| 205 |
+
}
|
| 206 |
+
|
| 207 |
+
// If has not sortabled enabled buttons.
|
| 208 |
+
if(!empty($buttons)) {
|
| 209 |
+
if(empty($this->_buttonsPrepared['visible'])) {
|
| 210 |
+
$this->_buttonsPrepared['visible'] = array();
|
| 211 |
+
}
|
| 212 |
+
$this->_buttonsPrepared['visible'] = array_merge($this->_buttonsPrepared['visible'], $buttons);
|
| 213 |
+
}
|
| 214 |
+
|
| 215 |
+
// If visible list is empty.
|
| 216 |
+
if(empty($this->_buttonsPrepared['visible'])) {
|
| 217 |
+
$this->_buttonsPrepared['visible'] = $this->_buttonsPrepared['hidden'];
|
| 218 |
+
$this->_buttonsPrepared['hidden'] = array();
|
| 219 |
+
}
|
| 220 |
+
|
| 221 |
+
// Set visible.
|
| 222 |
+
foreach($this->_buttonsPrepared['visible'] as &$btn) {
|
| 223 |
+
$btn['visible'] = true;
|
| 224 |
+
}
|
| 225 |
+
}
|
| 226 |
+
}
|
| 227 |
+
|
| 228 |
+
return isset($this->_buttonsPrepared[$part]) ?
|
| 229 |
+
$this->_buttonsPrepared[$part] :
|
| 230 |
+
array_merge($this->_buttonsPrepared['visible'], $this->_buttonsPrepared['hidden']);
|
| 231 |
+
}
|
| 232 |
+
|
| 233 |
public function refererLink($value = false)
|
| 234 |
{
|
|
|
|
| 235 |
// Core session.
|
| 236 |
$session = Mage::getSingleton('core/session');
|
| 237 |
$prevValueByCore = $session->getLoginMainRedirectUrl();
|
| 255 |
return $prevValueByCore? $prevValueByCore : $prevValueByCustomer;
|
| 256 |
}
|
| 257 |
|
| 258 |
+
public function refererStore($value = false)
|
| 259 |
+
{
|
| 260 |
+
// Core session.
|
| 261 |
+
$session = Mage::getSingleton('core/session');
|
| 262 |
+
$prevValueByCore = $session->getData(self::REFERER_STORE_PARAM_NAME);
|
| 263 |
+
|
| 264 |
+
if($value) {
|
| 265 |
+
$session->setData(self::REFERER_STORE_PARAM_NAME, $value);
|
| 266 |
+
}elseif($value === null) {
|
| 267 |
+
$session->unsetData(self::REFERER_STORE_PARAM_NAME);
|
| 268 |
+
}
|
| 269 |
+
|
| 270 |
+
// Customer session.
|
| 271 |
+
$session = Mage::getSingleton('customer/session');
|
| 272 |
+
$prevValueByCustomer = $session->getData(self::REFERER_STORE_PARAM_NAME);
|
| 273 |
+
|
| 274 |
+
if($value) {
|
| 275 |
+
$session->setData(self::REFERER_STORE_PARAM_NAME, $value);
|
| 276 |
+
}elseif($value === null) {
|
| 277 |
+
$session->unsetData(self::REFERER_STORE_PARAM_NAME);
|
| 278 |
+
}
|
| 279 |
+
|
| 280 |
+
return $prevValueByCore? $prevValueByCore : $prevValueByCustomer;
|
| 281 |
+
}
|
| 282 |
+
|
| 283 |
public function getRefererLinkSkipModules()
|
| 284 |
{
|
| 285 |
return array('customer', /*'checkout',*/ 'pslogin');
|
app/code/community/Plumrocket/SocialLogin/Model/Account.php
CHANGED
|
@@ -40,7 +40,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 40 |
{
|
| 41 |
$this->_init('pslogin/account');
|
| 42 |
$this->_websiteId = Mage::app()->getStore()->getWebsiteId();
|
| 43 |
-
$this->_redirectUri = Mage::
|
| 44 |
$this->_photoDir = Mage::getBaseDir('media') . DS .'pslogin'. DS .'photo';
|
| 45 |
|
| 46 |
$this->_applicationId = trim(Mage::getStoreConfig('pslogin/'. $this->_type .'/application_id'));
|
|
@@ -132,6 +132,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 132 |
try{
|
| 133 |
$customer->setData($this->getUserData())
|
| 134 |
->setConfirmation($this->getUserData('password'))
|
|
|
|
| 135 |
->setData('is_active', 1)
|
| 136 |
->getGroupId();
|
| 137 |
|
|
@@ -146,6 +147,11 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 146 |
|
| 147 |
if( (empty($errors) || Mage::helper('pslogin')->validateIgnore()) && $correctEmail) {
|
| 148 |
$customerId = $customer->save()->getId();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 149 |
}
|
| 150 |
} catch (Exception $e) {
|
| 151 |
$errors[] = $e->getMessage();
|
|
@@ -198,22 +204,6 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 198 |
return $this->_userData;
|
| 199 |
}
|
| 200 |
|
| 201 |
-
protected function _call($url, $params = null)
|
| 202 |
-
{
|
| 203 |
-
$result = null;
|
| 204 |
-
if(is_array($params) && $params) {
|
| 205 |
-
$url = $url .'?'. urldecode(http_build_query($params));
|
| 206 |
-
}elseif($params) {
|
| 207 |
-
$url = $url .'?'. urldecode($params);
|
| 208 |
-
}
|
| 209 |
-
|
| 210 |
-
try {
|
| 211 |
-
$result = file_get_contents($url);
|
| 212 |
-
} catch (Exception $e) {}
|
| 213 |
-
|
| 214 |
-
return $result;
|
| 215 |
-
}
|
| 216 |
-
|
| 217 |
protected function _prepareData($data)
|
| 218 |
{
|
| 219 |
$_data = array();
|
|
@@ -296,7 +286,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 296 |
|
| 297 |
try{
|
| 298 |
$io->mkdir($this->_photoDir);
|
| 299 |
-
if($file =
|
| 300 |
if(file_put_contents($tmpPath, $file) > 0) {
|
| 301 |
|
| 302 |
$image = new Varien_Image($tmpPath);
|
|
@@ -316,6 +306,44 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 316 |
|
| 317 |
return $upload;
|
| 318 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 319 |
|
| 320 |
public function postToMail()
|
| 321 |
{
|
|
@@ -373,4 +401,32 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 373 |
return;
|
| 374 |
}
|
| 375 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 376 |
}
|
| 40 |
{
|
| 41 |
$this->_init('pslogin/account');
|
| 42 |
$this->_websiteId = Mage::app()->getStore()->getWebsiteId();
|
| 43 |
+
$this->_redirectUri = Mage::helper('pslogin')->getCallbackURL($this->_type);
|
| 44 |
$this->_photoDir = Mage::getBaseDir('media') . DS .'pslogin'. DS .'photo';
|
| 45 |
|
| 46 |
$this->_applicationId = trim(Mage::getStoreConfig('pslogin/'. $this->_type .'/application_id'));
|
| 132 |
try{
|
| 133 |
$customer->setData($this->getUserData())
|
| 134 |
->setConfirmation($this->getUserData('password'))
|
| 135 |
+
->setPasswordConfirmation($this->getUserData('password'))
|
| 136 |
->setData('is_active', 1)
|
| 137 |
->getGroupId();
|
| 138 |
|
| 147 |
|
| 148 |
if( (empty($errors) || Mage::helper('pslogin')->validateIgnore()) && $correctEmail) {
|
| 149 |
$customerId = $customer->save()->getId();
|
| 150 |
+
// Set email confirmation;
|
| 151 |
+
// $customer->setConfirmation(null)->save();
|
| 152 |
+
$customer->setConfirmation(null)
|
| 153 |
+
->getResource()->saveAttribute($customer, 'confirmation');
|
| 154 |
+
|
| 155 |
}
|
| 156 |
} catch (Exception $e) {
|
| 157 |
$errors[] = $e->getMessage();
|
| 204 |
return $this->_userData;
|
| 205 |
}
|
| 206 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 207 |
protected function _prepareData($data)
|
| 208 |
{
|
| 209 |
$_data = array();
|
| 286 |
|
| 287 |
try{
|
| 288 |
$io->mkdir($this->_photoDir);
|
| 289 |
+
if($file = $this->_loadFile($fileUrl)) {
|
| 290 |
if(file_put_contents($tmpPath, $file) > 0) {
|
| 291 |
|
| 292 |
$image = new Varien_Image($tmpPath);
|
| 306 |
|
| 307 |
return $upload;
|
| 308 |
}
|
| 309 |
+
|
| 310 |
+
protected function _loadFile($url, $count = 1) {
|
| 311 |
+
|
| 312 |
+
if ($count > 5) {
|
| 313 |
+
return false;
|
| 314 |
+
}
|
| 315 |
+
|
| 316 |
+
$ch = curl_init();
|
| 317 |
+
curl_setopt($ch, CURLOPT_HEADER, true);
|
| 318 |
+
curl_setopt($ch, CURLOPT_URL, $url);
|
| 319 |
+
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
| 320 |
+
$data = curl_exec($ch);
|
| 321 |
+
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
| 322 |
+
|
| 323 |
+
curl_close($ch);
|
| 324 |
+
|
| 325 |
+
if (!$data) {
|
| 326 |
+
return false;
|
| 327 |
+
}
|
| 328 |
+
|
| 329 |
+
$dataArray = explode("\r\n\r\n", $data, 2);
|
| 330 |
+
|
| 331 |
+
if (count($dataArray) != 2) {
|
| 332 |
+
return false;
|
| 333 |
+
}
|
| 334 |
+
|
| 335 |
+
list($header, $body) = $dataArray;
|
| 336 |
+
if ($httpCode == 301 || $httpCode == 302) {
|
| 337 |
+
$matches = array();
|
| 338 |
+
preg_match('/Location:(.*?)\n/', $header, $matches);
|
| 339 |
+
|
| 340 |
+
if (isset($matches[1])) {
|
| 341 |
+
return $this->_loadFile(trim($matches[1]), $count++);
|
| 342 |
+
}
|
| 343 |
+
} else {
|
| 344 |
+
return $body;
|
| 345 |
+
}
|
| 346 |
+
}
|
| 347 |
|
| 348 |
public function postToMail()
|
| 349 |
{
|
| 401 |
return;
|
| 402 |
}
|
| 403 |
|
| 404 |
+
protected function _call($url, $params = array(), $method = 'GET', $curlResource = null)
|
| 405 |
+
{
|
| 406 |
+
$result = null;
|
| 407 |
+
$paramsStr = is_array($params)? urlencode(http_build_query($params)) : urlencode($params);
|
| 408 |
+
if($paramsStr) {
|
| 409 |
+
$url .= '?'. urldecode($paramsStr);
|
| 410 |
+
}
|
| 411 |
+
|
| 412 |
+
$curl = is_resource($curlResource)? $curlResource : curl_init();
|
| 413 |
+
|
| 414 |
+
if($method == 'POST') {
|
| 415 |
+
// POST.
|
| 416 |
+
curl_setopt($curl, CURLOPT_URL, $url);
|
| 417 |
+
curl_setopt($curl, CURLOPT_POST, 1);
|
| 418 |
+
curl_setopt($curl, CURLOPT_POSTFIELDS, $paramsStr);
|
| 419 |
+
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
|
| 420 |
+
}else{
|
| 421 |
+
// GET.
|
| 422 |
+
curl_setopt($curl, CURLOPT_URL, $url);
|
| 423 |
+
}
|
| 424 |
+
|
| 425 |
+
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
|
| 426 |
+
$result = curl_exec($curl);
|
| 427 |
+
curl_close($curl);
|
| 428 |
+
|
| 429 |
+
return $result;
|
| 430 |
+
}
|
| 431 |
+
|
| 432 |
}
|
app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php
CHANGED
|
@@ -56,6 +56,11 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
|
|
| 56 |
// $this->_redirect('customer/account/login');
|
| 57 |
}
|
| 58 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 59 |
if($customerId = $model->getCustomerIdByUserId()) {
|
| 60 |
# Do auth.
|
| 61 |
$redirectUrl = $this->_getHelper()->getRedirectUrl();
|
| 56 |
// $this->_redirect('customer/account/login');
|
| 57 |
}
|
| 58 |
|
| 59 |
+
// Switch store.
|
| 60 |
+
if($storeId = Mage::helper('pslogin')->refererStore()) {
|
| 61 |
+
Mage::app()->setCurrentStore($storeId);
|
| 62 |
+
}
|
| 63 |
+
|
| 64 |
if($customerId = $model->getCustomerIdByUserId()) {
|
| 65 |
# Do auth.
|
| 66 |
$redirectUrl = $this->_getHelper()->getRedirectUrl();
|
app/code/community/Plumrocket/SocialLogin/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Plumrocket_SocialLogin>
|
| 5 |
-
<version>1.0
|
| 6 |
</Plumrocket_SocialLogin>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Plumrocket_SocialLogin>
|
| 5 |
+
<version>1.1.0</version>
|
| 6 |
</Plumrocket_SocialLogin>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
app/code/community/Plumrocket/SocialLogin/etc/system.xml
CHANGED
|
@@ -240,7 +240,7 @@
|
|
| 240 |
<comment>For configuration instructions, please <a href="http://wiki.plumrocket.com/wiki/Magento_Facebook_Login_Configuration" target="_blank">click here</a>.</comment>
|
| 241 |
</enable>
|
| 242 |
<application_id translate="label">
|
| 243 |
-
<label>
|
| 244 |
<frontend_type>text</frontend_type>
|
| 245 |
<sort_order>2</sort_order>
|
| 246 |
<show_in_default>1</show_in_default>
|
|
@@ -248,7 +248,7 @@
|
|
| 248 |
<show_in_store>1</show_in_store>
|
| 249 |
</application_id>
|
| 250 |
<secret translate="label">
|
| 251 |
-
<label>Secret
|
| 252 |
<frontend_type>obscure</frontend_type>
|
| 253 |
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 254 |
<sort_order>3</sort_order>
|
|
@@ -262,7 +262,7 @@
|
|
| 262 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 263 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 264 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 265 |
-
<sort_order>
|
| 266 |
<show_in_default>1</show_in_default>
|
| 267 |
<show_in_website>1</show_in_website>
|
| 268 |
<show_in_store>1</show_in_store>
|
|
@@ -273,7 +273,7 @@
|
|
| 273 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 274 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 275 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 276 |
-
<sort_order>
|
| 277 |
<show_in_default>1</show_in_default>
|
| 278 |
<show_in_website>1</show_in_website>
|
| 279 |
<show_in_store>1</show_in_store>
|
|
@@ -284,7 +284,7 @@
|
|
| 284 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 285 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 286 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 287 |
-
<sort_order>
|
| 288 |
<show_in_default>1</show_in_default>
|
| 289 |
<show_in_website>1</show_in_website>
|
| 290 |
<show_in_store>1</show_in_store>
|
|
@@ -293,7 +293,7 @@
|
|
| 293 |
<login_btn_text translate="label">
|
| 294 |
<label>Login Button Text</label>
|
| 295 |
<frontend_type>text</frontend_type>
|
| 296 |
-
<sort_order>
|
| 297 |
<show_in_default>1</show_in_default>
|
| 298 |
<show_in_website>1</show_in_website>
|
| 299 |
<show_in_store>1</show_in_store>
|
|
@@ -301,7 +301,7 @@
|
|
| 301 |
<register_btn_text translate="label">
|
| 302 |
<label>Registration Button Text</label>
|
| 303 |
<frontend_type>text</frontend_type>
|
| 304 |
-
<sort_order>
|
| 305 |
<show_in_default>1</show_in_default>
|
| 306 |
<show_in_website>1</show_in_website>
|
| 307 |
<show_in_store>1</show_in_store>
|
|
@@ -330,7 +330,7 @@
|
|
| 330 |
<comment>For configuration instructions, please <a href="http://wiki.plumrocket.com/wiki/Magento_Twitter_Login_Configuration" target="_blank">click here</a>.</comment>
|
| 331 |
</enable>
|
| 332 |
<application_id translate="label">
|
| 333 |
-
<label>Consumer
|
| 334 |
<frontend_type>text</frontend_type>
|
| 335 |
<sort_order>2</sort_order>
|
| 336 |
<show_in_default>1</show_in_default>
|
|
@@ -338,7 +338,7 @@
|
|
| 338 |
<show_in_store>1</show_in_store>
|
| 339 |
</application_id>
|
| 340 |
<secret translate="label">
|
| 341 |
-
<label>Consumer
|
| 342 |
<frontend_type>obscure</frontend_type>
|
| 343 |
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 344 |
<sort_order>3</sort_order>
|
|
@@ -346,13 +346,21 @@
|
|
| 346 |
<show_in_website>1</show_in_website>
|
| 347 |
<show_in_store>1</show_in_store>
|
| 348 |
</secret>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 349 |
<icon_btn translate="label">
|
| 350 |
<label>Small Icon Button</label>
|
| 351 |
<frontend_type>image</frontend_type>
|
| 352 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 353 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 354 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 355 |
-
<sort_order>
|
| 356 |
<show_in_default>1</show_in_default>
|
| 357 |
<show_in_website>1</show_in_website>
|
| 358 |
<show_in_store>1</show_in_store>
|
|
@@ -363,7 +371,7 @@
|
|
| 363 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 364 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 365 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 366 |
-
<sort_order>
|
| 367 |
<show_in_default>1</show_in_default>
|
| 368 |
<show_in_website>1</show_in_website>
|
| 369 |
<show_in_store>1</show_in_store>
|
|
@@ -374,7 +382,7 @@
|
|
| 374 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 375 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 376 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 377 |
-
<sort_order>
|
| 378 |
<show_in_default>1</show_in_default>
|
| 379 |
<show_in_website>1</show_in_website>
|
| 380 |
<show_in_store>1</show_in_store>
|
|
@@ -383,7 +391,7 @@
|
|
| 383 |
<login_btn_text translate="label">
|
| 384 |
<label>Login Button Text</label>
|
| 385 |
<frontend_type>text</frontend_type>
|
| 386 |
-
<sort_order>
|
| 387 |
<show_in_default>1</show_in_default>
|
| 388 |
<show_in_website>1</show_in_website>
|
| 389 |
<show_in_store>1</show_in_store>
|
|
@@ -391,7 +399,7 @@
|
|
| 391 |
<register_btn_text translate="label">
|
| 392 |
<label>Registration Button Text</label>
|
| 393 |
<frontend_type>text</frontend_type>
|
| 394 |
-
<sort_order>
|
| 395 |
<show_in_default>1</show_in_default>
|
| 396 |
<show_in_website>1</show_in_website>
|
| 397 |
<show_in_store>1</show_in_store>
|
|
@@ -899,28 +907,8 @@
|
|
| 899 |
</fields>
|
| 900 |
</steam>
|
| 901 |
|
| 902 |
-
<
|
| 903 |
-
<label>
|
| 904 |
-
<sort_order>320</sort_order>
|
| 905 |
-
<frontend_type>text</frontend_type>
|
| 906 |
-
<show_in_default>1</show_in_default>
|
| 907 |
-
<show_in_website>1</show_in_website>
|
| 908 |
-
<show_in_store>1</show_in_store>
|
| 909 |
-
|
| 910 |
-
<fields>
|
| 911 |
-
<version translate="label">
|
| 912 |
-
<frontend_type>text</frontend_type>
|
| 913 |
-
<frontend_model>pslogin/system_config_notinstalled</frontend_model>
|
| 914 |
-
<sort_order>1</sort_order>
|
| 915 |
-
<show_in_default>1</show_in_default>
|
| 916 |
-
<show_in_website>1</show_in_website>
|
| 917 |
-
<show_in_store>1</show_in_store>
|
| 918 |
-
</version>
|
| 919 |
-
</fields>
|
| 920 |
-
</hyves>
|
| 921 |
-
|
| 922 |
-
<stackexchange>
|
| 923 |
-
<label>StackExchange</label>
|
| 924 |
<sort_order>330</sort_order>
|
| 925 |
<frontend_type>text</frontend_type>
|
| 926 |
<show_in_default>1</show_in_default>
|
|
@@ -937,7 +925,7 @@
|
|
| 937 |
<show_in_store>1</show_in_store>
|
| 938 |
</version>
|
| 939 |
</fields>
|
| 940 |
-
</
|
| 941 |
|
| 942 |
<evernote>
|
| 943 |
<label>Evernote</label>
|
|
@@ -1180,7 +1168,7 @@
|
|
| 1180 |
</orange>
|
| 1181 |
|
| 1182 |
<persona>
|
| 1183 |
-
<label>Persona</label>
|
| 1184 |
<sort_order>460</sort_order>
|
| 1185 |
<frontend_type>text</frontend_type>
|
| 1186 |
<show_in_default>1</show_in_default>
|
|
@@ -1199,9 +1187,9 @@
|
|
| 1199 |
</fields>
|
| 1200 |
</persona>
|
| 1201 |
|
| 1202 |
-
<
|
| 1203 |
-
<label>
|
| 1204 |
-
<sort_order>
|
| 1205 |
<frontend_type>text</frontend_type>
|
| 1206 |
<show_in_default>1</show_in_default>
|
| 1207 |
<show_in_website>1</show_in_website>
|
|
@@ -1217,11 +1205,11 @@
|
|
| 1217 |
<show_in_store>1</show_in_store>
|
| 1218 |
</version>
|
| 1219 |
</fields>
|
| 1220 |
-
</
|
| 1221 |
|
| 1222 |
-
<
|
| 1223 |
-
<label>
|
| 1224 |
-
<sort_order>
|
| 1225 |
<frontend_type>text</frontend_type>
|
| 1226 |
<show_in_default>1</show_in_default>
|
| 1227 |
<show_in_website>1</show_in_website>
|
|
@@ -1237,11 +1225,11 @@
|
|
| 1237 |
<show_in_store>1</show_in_store>
|
| 1238 |
</version>
|
| 1239 |
</fields>
|
| 1240 |
-
</
|
| 1241 |
|
| 1242 |
-
<
|
| 1243 |
-
<label>
|
| 1244 |
-
<sort_order>
|
| 1245 |
<frontend_type>text</frontend_type>
|
| 1246 |
<show_in_default>1</show_in_default>
|
| 1247 |
<show_in_website>1</show_in_website>
|
|
@@ -1257,11 +1245,11 @@
|
|
| 1257 |
<show_in_store>1</show_in_store>
|
| 1258 |
</version>
|
| 1259 |
</fields>
|
| 1260 |
-
</
|
| 1261 |
|
| 1262 |
-
<
|
| 1263 |
-
<label>
|
| 1264 |
-
<sort_order>
|
| 1265 |
<frontend_type>text</frontend_type>
|
| 1266 |
<show_in_default>1</show_in_default>
|
| 1267 |
<show_in_website>1</show_in_website>
|
|
@@ -1277,11 +1265,11 @@
|
|
| 1277 |
<show_in_store>1</show_in_store>
|
| 1278 |
</version>
|
| 1279 |
</fields>
|
| 1280 |
-
</
|
| 1281 |
|
| 1282 |
-
<
|
| 1283 |
-
<label>
|
| 1284 |
-
<sort_order>
|
| 1285 |
<frontend_type>text</frontend_type>
|
| 1286 |
<show_in_default>1</show_in_default>
|
| 1287 |
<show_in_website>1</show_in_website>
|
|
@@ -1297,11 +1285,11 @@
|
|
| 1297 |
<show_in_store>1</show_in_store>
|
| 1298 |
</version>
|
| 1299 |
</fields>
|
| 1300 |
-
</
|
| 1301 |
|
| 1302 |
-
<
|
| 1303 |
-
<label>
|
| 1304 |
-
<sort_order>
|
| 1305 |
<frontend_type>text</frontend_type>
|
| 1306 |
<show_in_default>1</show_in_default>
|
| 1307 |
<show_in_website>1</show_in_website>
|
|
@@ -1317,11 +1305,11 @@
|
|
| 1317 |
<show_in_store>1</show_in_store>
|
| 1318 |
</version>
|
| 1319 |
</fields>
|
| 1320 |
-
</
|
| 1321 |
|
| 1322 |
-
<
|
| 1323 |
-
<label>
|
| 1324 |
-
<sort_order>
|
| 1325 |
<frontend_type>text</frontend_type>
|
| 1326 |
<show_in_default>1</show_in_default>
|
| 1327 |
<show_in_website>1</show_in_website>
|
|
@@ -1337,11 +1325,11 @@
|
|
| 1337 |
<show_in_store>1</show_in_store>
|
| 1338 |
</version>
|
| 1339 |
</fields>
|
| 1340 |
-
</
|
| 1341 |
|
| 1342 |
-
<
|
| 1343 |
-
<label>
|
| 1344 |
-
<sort_order>
|
| 1345 |
<frontend_type>text</frontend_type>
|
| 1346 |
<show_in_default>1</show_in_default>
|
| 1347 |
<show_in_website>1</show_in_website>
|
|
@@ -1357,7 +1345,47 @@
|
|
| 1357 |
<show_in_store>1</show_in_store>
|
| 1358 |
</version>
|
| 1359 |
</fields>
|
| 1360 |
-
</
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1361 |
|
| 1362 |
</groups>
|
| 1363 |
</pslogin>
|
| 240 |
<comment>For configuration instructions, please <a href="http://wiki.plumrocket.com/wiki/Magento_Facebook_Login_Configuration" target="_blank">click here</a>.</comment>
|
| 241 |
</enable>
|
| 242 |
<application_id translate="label">
|
| 243 |
+
<label>App ID</label>
|
| 244 |
<frontend_type>text</frontend_type>
|
| 245 |
<sort_order>2</sort_order>
|
| 246 |
<show_in_default>1</show_in_default>
|
| 248 |
<show_in_store>1</show_in_store>
|
| 249 |
</application_id>
|
| 250 |
<secret translate="label">
|
| 251 |
+
<label>App Secret</label>
|
| 252 |
<frontend_type>obscure</frontend_type>
|
| 253 |
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 254 |
<sort_order>3</sort_order>
|
| 262 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 263 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 264 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 265 |
+
<sort_order>5</sort_order>
|
| 266 |
<show_in_default>1</show_in_default>
|
| 267 |
<show_in_website>1</show_in_website>
|
| 268 |
<show_in_store>1</show_in_store>
|
| 273 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 274 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 275 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 276 |
+
<sort_order>6</sort_order>
|
| 277 |
<show_in_default>1</show_in_default>
|
| 278 |
<show_in_website>1</show_in_website>
|
| 279 |
<show_in_store>1</show_in_store>
|
| 284 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 285 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 286 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 287 |
+
<sort_order>7</sort_order>
|
| 288 |
<show_in_default>1</show_in_default>
|
| 289 |
<show_in_website>1</show_in_website>
|
| 290 |
<show_in_store>1</show_in_store>
|
| 293 |
<login_btn_text translate="label">
|
| 294 |
<label>Login Button Text</label>
|
| 295 |
<frontend_type>text</frontend_type>
|
| 296 |
+
<sort_order>8</sort_order>
|
| 297 |
<show_in_default>1</show_in_default>
|
| 298 |
<show_in_website>1</show_in_website>
|
| 299 |
<show_in_store>1</show_in_store>
|
| 301 |
<register_btn_text translate="label">
|
| 302 |
<label>Registration Button Text</label>
|
| 303 |
<frontend_type>text</frontend_type>
|
| 304 |
+
<sort_order>9</sort_order>
|
| 305 |
<show_in_default>1</show_in_default>
|
| 306 |
<show_in_website>1</show_in_website>
|
| 307 |
<show_in_store>1</show_in_store>
|
| 330 |
<comment>For configuration instructions, please <a href="http://wiki.plumrocket.com/wiki/Magento_Twitter_Login_Configuration" target="_blank">click here</a>.</comment>
|
| 331 |
</enable>
|
| 332 |
<application_id translate="label">
|
| 333 |
+
<label>Consumer Key (API Key)</label>
|
| 334 |
<frontend_type>text</frontend_type>
|
| 335 |
<sort_order>2</sort_order>
|
| 336 |
<show_in_default>1</show_in_default>
|
| 338 |
<show_in_store>1</show_in_store>
|
| 339 |
</application_id>
|
| 340 |
<secret translate="label">
|
| 341 |
+
<label>Consumer Secret (API Secret)</label>
|
| 342 |
<frontend_type>obscure</frontend_type>
|
| 343 |
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 344 |
<sort_order>3</sort_order>
|
| 346 |
<show_in_website>1</show_in_website>
|
| 347 |
<show_in_store>1</show_in_store>
|
| 348 |
</secret>
|
| 349 |
+
<callbackurl translate="label">
|
| 350 |
+
<label>Callback URL</label>
|
| 351 |
+
<frontend_type>text</frontend_type>
|
| 352 |
+
<frontend_model>pslogin/system_config_callbackurl</frontend_model>
|
| 353 |
+
<sort_order>4</sort_order>
|
| 354 |
+
<show_in_default>1</show_in_default>
|
| 355 |
+
<comment>This URL should be used while creating new social login application.</comment>
|
| 356 |
+
</callbackurl>
|
| 357 |
<icon_btn translate="label">
|
| 358 |
<label>Small Icon Button</label>
|
| 359 |
<frontend_type>image</frontend_type>
|
| 360 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 361 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 362 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 363 |
+
<sort_order>5</sort_order>
|
| 364 |
<show_in_default>1</show_in_default>
|
| 365 |
<show_in_website>1</show_in_website>
|
| 366 |
<show_in_store>1</show_in_store>
|
| 371 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 372 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 373 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 374 |
+
<sort_order>6</sort_order>
|
| 375 |
<show_in_default>1</show_in_default>
|
| 376 |
<show_in_website>1</show_in_website>
|
| 377 |
<show_in_store>1</show_in_store>
|
| 382 |
<backend_model>adminhtml/system_config_backend_image</backend_model>
|
| 383 |
<upload_dir config="system/filesystem/media" scope_info="1">pslogin</upload_dir>
|
| 384 |
<base_url type="media" scope_info="1">pslogin</base_url>
|
| 385 |
+
<sort_order>7</sort_order>
|
| 386 |
<show_in_default>1</show_in_default>
|
| 387 |
<show_in_website>1</show_in_website>
|
| 388 |
<show_in_store>1</show_in_store>
|
| 391 |
<login_btn_text translate="label">
|
| 392 |
<label>Login Button Text</label>
|
| 393 |
<frontend_type>text</frontend_type>
|
| 394 |
+
<sort_order>8</sort_order>
|
| 395 |
<show_in_default>1</show_in_default>
|
| 396 |
<show_in_website>1</show_in_website>
|
| 397 |
<show_in_store>1</show_in_store>
|
| 399 |
<register_btn_text translate="label">
|
| 400 |
<label>Registration Button Text</label>
|
| 401 |
<frontend_type>text</frontend_type>
|
| 402 |
+
<sort_order>9</sort_order>
|
| 403 |
<show_in_default>1</show_in_default>
|
| 404 |
<show_in_website>1</show_in_website>
|
| 405 |
<show_in_store>1</show_in_store>
|
| 907 |
</fields>
|
| 908 |
</steam>
|
| 909 |
|
| 910 |
+
<stackoverflow>
|
| 911 |
+
<label>Stackoverflow (StackExchange)</label>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 912 |
<sort_order>330</sort_order>
|
| 913 |
<frontend_type>text</frontend_type>
|
| 914 |
<show_in_default>1</show_in_default>
|
| 925 |
<show_in_store>1</show_in_store>
|
| 926 |
</version>
|
| 927 |
</fields>
|
| 928 |
+
</stackoverflow>
|
| 929 |
|
| 930 |
<evernote>
|
| 931 |
<label>Evernote</label>
|
| 1168 |
</orange>
|
| 1169 |
|
| 1170 |
<persona>
|
| 1171 |
+
<label>Persona / BrowserID</label>
|
| 1172 |
<sort_order>460</sort_order>
|
| 1173 |
<frontend_type>text</frontend_type>
|
| 1174 |
<show_in_default>1</show_in_default>
|
| 1187 |
</fields>
|
| 1188 |
</persona>
|
| 1189 |
|
| 1190 |
+
<bitbucket>
|
| 1191 |
+
<label>Bitbucket</label>
|
| 1192 |
+
<sort_order>500</sort_order>
|
| 1193 |
<frontend_type>text</frontend_type>
|
| 1194 |
<show_in_default>1</show_in_default>
|
| 1195 |
<show_in_website>1</show_in_website>
|
| 1205 |
<show_in_store>1</show_in_store>
|
| 1206 |
</version>
|
| 1207 |
</fields>
|
| 1208 |
+
</bitbucket>
|
| 1209 |
|
| 1210 |
+
<skyrock>
|
| 1211 |
+
<label>Skyrock</label>
|
| 1212 |
+
<sort_order>520</sort_order>
|
| 1213 |
<frontend_type>text</frontend_type>
|
| 1214 |
<show_in_default>1</show_in_default>
|
| 1215 |
<show_in_website>1</show_in_website>
|
| 1225 |
<show_in_store>1</show_in_store>
|
| 1226 |
</version>
|
| 1227 |
</fields>
|
| 1228 |
+
</skyrock>
|
| 1229 |
|
| 1230 |
+
<virgilioit>
|
| 1231 |
+
<label>Virgilio.it</label>
|
| 1232 |
+
<sort_order>530</sort_order>
|
| 1233 |
<frontend_type>text</frontend_type>
|
| 1234 |
<show_in_default>1</show_in_default>
|
| 1235 |
<show_in_website>1</show_in_website>
|
| 1245 |
<show_in_store>1</show_in_store>
|
| 1246 |
</version>
|
| 1247 |
</fields>
|
| 1248 |
+
</virgilioit>
|
| 1249 |
|
| 1250 |
+
<renren>
|
| 1251 |
+
<label>RenRen</label>
|
| 1252 |
+
<sort_order>540</sort_order>
|
| 1253 |
<frontend_type>text</frontend_type>
|
| 1254 |
<show_in_default>1</show_in_default>
|
| 1255 |
<show_in_website>1</show_in_website>
|
| 1265 |
<show_in_store>1</show_in_store>
|
| 1266 |
</version>
|
| 1267 |
</fields>
|
| 1268 |
+
</renren>
|
| 1269 |
|
| 1270 |
+
<bitly>
|
| 1271 |
+
<label>Bitly</label>
|
| 1272 |
+
<sort_order>550</sort_order>
|
| 1273 |
<frontend_type>text</frontend_type>
|
| 1274 |
<show_in_default>1</show_in_default>
|
| 1275 |
<show_in_website>1</show_in_website>
|
| 1285 |
<show_in_store>1</show_in_store>
|
| 1286 |
</version>
|
| 1287 |
</fields>
|
| 1288 |
+
</bitly>
|
| 1289 |
|
| 1290 |
+
<boxcom>
|
| 1291 |
+
<label>Box</label>
|
| 1292 |
+
<sort_order>560</sort_order>
|
| 1293 |
<frontend_type>text</frontend_type>
|
| 1294 |
<show_in_default>1</show_in_default>
|
| 1295 |
<show_in_website>1</show_in_website>
|
| 1305 |
<show_in_store>1</show_in_store>
|
| 1306 |
</version>
|
| 1307 |
</fields>
|
| 1308 |
+
</boxcom>
|
| 1309 |
|
| 1310 |
+
<vimeo>
|
| 1311 |
+
<label>Vimeo</label>
|
| 1312 |
+
<sort_order>570</sort_order>
|
| 1313 |
<frontend_type>text</frontend_type>
|
| 1314 |
<show_in_default>1</show_in_default>
|
| 1315 |
<show_in_website>1</show_in_website>
|
| 1325 |
<show_in_store>1</show_in_store>
|
| 1326 |
</version>
|
| 1327 |
</fields>
|
| 1328 |
+
</vimeo>
|
| 1329 |
|
| 1330 |
+
<reddit>
|
| 1331 |
+
<label>Reddit</label>
|
| 1332 |
+
<sort_order>580</sort_order>
|
| 1333 |
<frontend_type>text</frontend_type>
|
| 1334 |
<show_in_default>1</show_in_default>
|
| 1335 |
<show_in_website>1</show_in_website>
|
| 1345 |
<show_in_store>1</show_in_store>
|
| 1346 |
</version>
|
| 1347 |
</fields>
|
| 1348 |
+
</reddit>
|
| 1349 |
+
|
| 1350 |
+
<odesc>
|
| 1351 |
+
<label>oDesc</label>
|
| 1352 |
+
<sort_order>590</sort_order>
|
| 1353 |
+
<frontend_type>text</frontend_type>
|
| 1354 |
+
<show_in_default>1</show_in_default>
|
| 1355 |
+
<show_in_website>1</show_in_website>
|
| 1356 |
+
<show_in_store>1</show_in_store>
|
| 1357 |
+
|
| 1358 |
+
<fields>
|
| 1359 |
+
<version translate="label">
|
| 1360 |
+
<frontend_type>text</frontend_type>
|
| 1361 |
+
<frontend_model>pslogin/system_config_notinstalled</frontend_model>
|
| 1362 |
+
<sort_order>1</sort_order>
|
| 1363 |
+
<show_in_default>1</show_in_default>
|
| 1364 |
+
<show_in_website>1</show_in_website>
|
| 1365 |
+
<show_in_store>1</show_in_store>
|
| 1366 |
+
</version>
|
| 1367 |
+
</fields>
|
| 1368 |
+
</odesc>
|
| 1369 |
+
|
| 1370 |
+
<teamviewer>
|
| 1371 |
+
<label>TeamViewer</label>
|
| 1372 |
+
<sort_order>600</sort_order>
|
| 1373 |
+
<frontend_type>text</frontend_type>
|
| 1374 |
+
<show_in_default>1</show_in_default>
|
| 1375 |
+
<show_in_website>1</show_in_website>
|
| 1376 |
+
<show_in_store>1</show_in_store>
|
| 1377 |
+
|
| 1378 |
+
<fields>
|
| 1379 |
+
<version translate="label">
|
| 1380 |
+
<frontend_type>text</frontend_type>
|
| 1381 |
+
<frontend_model>pslogin/system_config_notinstalled</frontend_model>
|
| 1382 |
+
<sort_order>1</sort_order>
|
| 1383 |
+
<show_in_default>1</show_in_default>
|
| 1384 |
+
<show_in_website>1</show_in_website>
|
| 1385 |
+
<show_in_store>1</show_in_store>
|
| 1386 |
+
</version>
|
| 1387 |
+
</fields>
|
| 1388 |
+
</teamviewer>
|
| 1389 |
|
| 1390 |
</groups>
|
| 1391 |
</pslogin>
|
app/design/adminhtml/default/default/layout/pslogin.xml
CHANGED
|
@@ -8,7 +8,7 @@
|
|
| 8 |
<action method="addItem"><type>js_css</type><name>prototype/windows/themes/magento.css</name></action>
|
| 9 |
<action method="addCss"><stylesheet>lib/prototype/windows/themes/magento.css</stylesheet></action> -->
|
| 10 |
|
| 11 |
-
<action method="addItem"><type>skin_js</type><name>js/plumrocket/jquery-1.10.2.min.js</name></action>
|
| 12 |
<action method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/jquery-ui.min.js</name></action>
|
| 13 |
<action method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/pslogin.js</name></action>
|
| 14 |
|
| 8 |
<action method="addItem"><type>js_css</type><name>prototype/windows/themes/magento.css</name></action>
|
| 9 |
<action method="addCss"><stylesheet>lib/prototype/windows/themes/magento.css</stylesheet></action> -->
|
| 10 |
|
| 11 |
+
<action method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/jquery-1.10.2.min.js</name></action>
|
| 12 |
<action method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/jquery-ui.min.js</name></action>
|
| 13 |
<action method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/pslogin.js</name></action>
|
| 14 |
|
app/design/frontend/base/default/layout/pslogin.xml
CHANGED
|
@@ -4,7 +4,8 @@
|
|
| 4 |
<default>
|
| 5 |
<reference name="head">
|
| 6 |
<action ifconfig="pslogin/general/enable" method="addCss"><stylesheet>css/plumrocket/pslogin/pslogin.css</stylesheet></action>
|
| 7 |
-
<action ifconfig="pslogin/general/enable" method="
|
|
|
|
| 8 |
<action ifconfig="pslogin/general/enable" method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/pslogin.js</name></action>
|
| 9 |
</reference>
|
| 10 |
<reference name="after_body_start">
|
|
@@ -14,11 +15,23 @@
|
|
| 14 |
<reference name="popuplogin_form_login">
|
| 15 |
<block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
|
| 16 |
</reference>
|
|
|
|
|
|
|
|
|
|
| 17 |
<reference name="popuplogin_form_register">
|
| 18 |
<block type="pslogin/buttons" name="pslogin.customer.form.register.buttons" as="pslogin_buttons" template="pslogin/customer/form/register/buttons.phtml" />
|
| 19 |
</reference>
|
| 20 |
</default>
|
| 21 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 22 |
<customer_account_login translate="label">
|
| 23 |
<reference name="customer_form_login">
|
| 24 |
<action ifconfig="pslogin/general/replace_templates" method="setTemplate"><template>pslogin/customer/form/login.phtml</template></action>
|
| 4 |
<default>
|
| 5 |
<reference name="head">
|
| 6 |
<action ifconfig="pslogin/general/enable" method="addCss"><stylesheet>css/plumrocket/pslogin/pslogin.css</stylesheet></action>
|
| 7 |
+
<action ifconfig="pslogin/general/enable" method="addCss"><stylesheet>css/plumrocket/pslogin/pslogin-custom.css</stylesheet></action>
|
| 8 |
+
<action ifconfig="pslogin/general/enable" method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/jquery-1.10.2.min.js</name></action>
|
| 9 |
<action ifconfig="pslogin/general/enable" method="addItem"><type>skin_js</type><name>js/plumrocket/pslogin/pslogin.js</name></action>
|
| 10 |
</reference>
|
| 11 |
<reference name="after_body_start">
|
| 15 |
<reference name="popuplogin_form_login">
|
| 16 |
<block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
|
| 17 |
</reference>
|
| 18 |
+
<reference name="popup.login">
|
| 19 |
+
<block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
|
| 20 |
+
</reference>
|
| 21 |
<reference name="popuplogin_form_register">
|
| 22 |
<block type="pslogin/buttons" name="pslogin.customer.form.register.buttons" as="pslogin_buttons" template="pslogin/customer/form/register/buttons.phtml" />
|
| 23 |
</reference>
|
| 24 |
</default>
|
| 25 |
|
| 26 |
+
<cms_index_index>
|
| 27 |
+
<reference name="popuplogin_form_login">
|
| 28 |
+
<block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
|
| 29 |
+
</reference>
|
| 30 |
+
<reference name="popuplogin_form_register">
|
| 31 |
+
<block type="pslogin/buttons" name="pslogin.customer.form.register.buttons" as="pslogin_buttons" template="pslogin/customer/form/register/buttons.phtml" />
|
| 32 |
+
</reference>
|
| 33 |
+
</cms_index_index>
|
| 34 |
+
|
| 35 |
<customer_account_login translate="label">
|
| 36 |
<reference name="customer_form_login">
|
| 37 |
<action ifconfig="pslogin/general/replace_templates" method="setTemplate"><template>pslogin/customer/form/login.phtml</template></action>
|
app/design/frontend/base/default/template/pslogin/checkout/onepage/login.phtml
CHANGED
|
@@ -102,7 +102,18 @@
|
|
| 102 |
<div class="buttons-set">
|
| 103 |
<button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 104 |
</div>
|
| 105 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
</div>
|
| 107 |
</div>
|
| 108 |
|
| 102 |
<div class="buttons-set">
|
| 103 |
<button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 104 |
</div>
|
| 105 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 106 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 107 |
+
<table>
|
| 108 |
+
<tr>
|
| 109 |
+
<td><div class="pslogin-border"></div></td>
|
| 110 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 111 |
+
<td><div class="pslogin-border"></div></td>
|
| 112 |
+
</tr>
|
| 113 |
+
</table>
|
| 114 |
+
</div>
|
| 115 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 116 |
+
<?php endif; ?>
|
| 117 |
</div>
|
| 118 |
</div>
|
| 119 |
|
app/design/frontend/base/default/template/pslogin/customer/form/edit/fake_email.phtml
CHANGED
|
@@ -18,8 +18,10 @@
|
|
| 18 |
|
| 19 |
<?php if(Mage::helper('pslogin')->isFakeMail()) : ?>
|
| 20 |
<script type="text/javascript">
|
|
|
|
| 21 |
pjQuery_1_10_2(document).ready(function() {
|
| 22 |
customerEditFakeEmail();
|
| 23 |
});
|
|
|
|
| 24 |
</script>
|
| 25 |
<?php endif; ?>
|
| 18 |
|
| 19 |
<?php if(Mage::helper('pslogin')->isFakeMail()) : ?>
|
| 20 |
<script type="text/javascript">
|
| 21 |
+
//<![CDATA[
|
| 22 |
pjQuery_1_10_2(document).ready(function() {
|
| 23 |
customerEditFakeEmail();
|
| 24 |
});
|
| 25 |
+
//]]>
|
| 26 |
</script>
|
| 27 |
<?php endif; ?>
|
app/design/frontend/base/default/template/pslogin/customer/form/login.phtml
CHANGED
|
@@ -74,7 +74,19 @@
|
|
| 74 |
<div class="buttons-set">
|
| 75 |
<button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 76 |
</div>
|
| 77 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
</div>
|
| 79 |
</div>
|
| 80 |
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 74 |
<div class="buttons-set">
|
| 75 |
<button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 76 |
</div>
|
| 77 |
+
|
| 78 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 79 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 80 |
+
<table>
|
| 81 |
+
<tr>
|
| 82 |
+
<td><div class="pslogin-border"></div></td>
|
| 83 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 84 |
+
<td><div class="pslogin-border"></div></td>
|
| 85 |
+
</tr>
|
| 86 |
+
</table>
|
| 87 |
+
</div>
|
| 88 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 89 |
+
<?php endif; ?>
|
| 90 |
</div>
|
| 91 |
</div>
|
| 92 |
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
app/design/frontend/base/default/template/pslogin/customer/form/login/buttons.phtml
CHANGED
|
@@ -16,51 +16,34 @@
|
|
| 16 |
*/
|
| 17 |
?>
|
| 18 |
|
| 19 |
-
<?php if(
|
| 20 |
-
<div class="pslogin-
|
| 21 |
|
| 22 |
-
<div class="spacer pslogin-clearfix">
|
| 23 |
-
<
|
| 24 |
-
<tr>
|
| 25 |
-
<td><div class="border"></div></td>
|
| 26 |
-
<td class="w25 text_or"><?php echo $this->__('OR'); ?></td>
|
| 27 |
-
<td><div class="border"></div></td>
|
| 28 |
-
</tr>
|
| 29 |
-
</table>
|
| 30 |
-
<span class="xs"><?php echo $this->__('Login with your social account'); ?></span>
|
| 31 |
</div>
|
| 32 |
|
| 33 |
-
<div class="pslogin-buttons">
|
| 34 |
<ul class="pslogin-clearfix">
|
| 35 |
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 36 |
-
<li class="<?php echo $button['type']; ?> <?php echo empty($button['visible'])? 'pslogin-hidden' : 'pslogin-visible'; ?>" <?php echo empty($button['visible'])? 'style="display: none;"' : ''; ?> title="<?php echo $this->escapeHtml($button['login_text']); ?>">
|
| 37 |
-
<a rel="nofollow" href="<?php echo $button['href']; ?>" data-width="<?php echo $button['popup_width']; ?>" data-height="<?php echo $button['popup_height']; ?>" data-loader="<?php echo $this->getLoaderUrl(); ?>">
|
| 38 |
|
| 39 |
-
<?php if($this->showLoginFullButtons()) : ?>
|
| 40 |
-
<?php
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
</span>
|
| 52 |
-
<span class="soc-li-text"><?php echo $this->escapeHtml($button['login_text']); ?></span>
|
| 53 |
-
</span>
|
| 54 |
-
<?php endif; ?>
|
| 55 |
-
<?php else : ?>
|
| 56 |
-
<?php if(!empty($button['image']['icon'])) : ?>
|
| 57 |
-
<img src="<?php echo $this->escapeHtml($button['image']['icon']); ?>" />
|
| 58 |
-
<?php else : ?>
|
| 59 |
-
<span class="background">
|
| 60 |
-
<span class="soc-li-icon"></span>
|
| 61 |
-
<span class="soc-li-text text-hidden"><?php echo $this->escapeHtml($button['login_text']); ?></span>
|
| 62 |
</span>
|
| 63 |
-
|
|
|
|
| 64 |
<?php endif; ?>
|
| 65 |
</a>
|
| 66 |
</li>
|
|
@@ -68,12 +51,12 @@
|
|
| 68 |
</ul>
|
| 69 |
|
| 70 |
<?php if($this->getPreparedButtons('hidden')) : ?>
|
| 71 |
-
<div class="spacer pslogin-clearfix
|
| 72 |
<table>
|
| 73 |
<tr>
|
| 74 |
-
<td><div class="border"></div></td>
|
| 75 |
-
<td class="w100"><div
|
| 76 |
-
<td><div class="border"></div></td>
|
| 77 |
</tr>
|
| 78 |
</table>
|
| 79 |
</div>
|
|
@@ -82,4 +65,10 @@
|
|
| 82 |
|
| 83 |
</div>
|
| 84 |
<div style="clear: both;"></div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 85 |
<?php endif; ?>
|
| 16 |
*/
|
| 17 |
?>
|
| 18 |
|
| 19 |
+
<?php if(Mage::helper('pslogin')->hasButtons()) : ?>
|
| 20 |
+
<div class="pslogin-block pslogin-login">
|
| 21 |
|
| 22 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 23 |
+
<span class="pslogin-title" style="<?php echo $this->showLoginFullButtons()? 'display: none;' : ''; ?>"><?php echo $this->__('Login with your social account'); ?></span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
</div>
|
| 25 |
|
| 26 |
+
<div class="pslogin-buttons <?php echo $this->showLoginFullButtons()? 'pslogin-buttons-showfull' : ''; ?>">
|
| 27 |
<ul class="pslogin-clearfix">
|
| 28 |
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 29 |
+
<li class="pslogin-button <?php echo $button['type']; ?> <?php echo empty($button['visible'])? 'pslogin-hidden' : 'pslogin-visible'; ?>" <?php echo empty($button['visible'])? 'style="display: none;"' : ''; ?> title="<?php echo $this->escapeHtml($button['login_text']); ?>">
|
| 30 |
+
<a class="pslogin-button-link" rel="nofollow" href="<?php echo $button['href']; ?>" data-width="<?php echo $button['popup_width']; ?>" data-height="<?php echo $button['popup_height']; ?>" data-loader="<?php echo $this->getLoaderUrl(); ?>">
|
| 31 |
|
| 32 |
+
<?php if($this->showLoginFullButtons() && !empty($button['image']['login'])) : ?>
|
| 33 |
+
<img class="pslogin-button-image" src="<?php echo $this->escapeHtml($button['image']['login']); ?>" />
|
| 34 |
+
<?php endif; ?>
|
| 35 |
+
|
| 36 |
+
<?php if(!$this->showFullButtons() && !empty($button['image']['icon'])) : ?>
|
| 37 |
+
<img class="pslogin-button-icon-image" src="<?php echo $this->escapeHtml($button['image']['icon']); ?>" />
|
| 38 |
+
<?php endif; ?>
|
| 39 |
+
|
| 40 |
+
<?php if(empty($button['image']['login']) || empty($button['image']['icon'])) : ?>
|
| 41 |
+
<span class="pslogin-button-auto <?php echo !empty($button['image']['login'])? 'pslogin-has-button-image' : ''; ?> <?php echo !empty($button['image']['icon'])? 'pslogin-has-button-icon-image' : ''; ?>">
|
| 42 |
+
<span class="pslogin-button-icon">
|
| 43 |
+
<?php echo !empty($button['image']['icon'])? '<img class="pslogin-button-icon-image" src="'. $this->escapeHtml($button['image']['icon']) .'" />' : ''; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 44 |
</span>
|
| 45 |
+
<span class="pslogin-button-text"><?php echo $this->escapeHtml($button['login_text']); ?></span>
|
| 46 |
+
</span>
|
| 47 |
<?php endif; ?>
|
| 48 |
</a>
|
| 49 |
</li>
|
| 51 |
</ul>
|
| 52 |
|
| 53 |
<?php if($this->getPreparedButtons('hidden')) : ?>
|
| 54 |
+
<div class="pslogin-spacer pslogin-clearfix pslogin-showmore">
|
| 55 |
<table>
|
| 56 |
<tr>
|
| 57 |
+
<td><div class="pslogin-border"></div></td>
|
| 58 |
+
<td class="w100"><div class="pslogin-showmore-button pslogin-bordertext"><?php echo $this->__('show more'); ?></div></td>
|
| 59 |
+
<td><div class="pslogin-border"></div></td>
|
| 60 |
</tr>
|
| 61 |
</table>
|
| 62 |
</div>
|
| 65 |
|
| 66 |
</div>
|
| 67 |
<div style="clear: both;"></div>
|
| 68 |
+
|
| 69 |
+
<script type="text/javascript">
|
| 70 |
+
//<![CDATA[
|
| 71 |
+
var showFullButtonsAfterViewMore = <?php echo $this->showFullButtons()? 'true' : 'false'; ?>;
|
| 72 |
+
//]]>
|
| 73 |
+
</script>
|
| 74 |
<?php endif; ?>
|
app/design/frontend/base/default/template/pslogin/customer/form/register.phtml
CHANGED
|
@@ -21,7 +21,18 @@
|
|
| 21 |
<h1><?php echo $this->__('Create an Account') ?></h1>
|
| 22 |
</div>
|
| 23 |
<?php echo $this->getChildHtml('form_fields_before')?>
|
| 24 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 25 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 26 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate" class="scaffold-form" enctype="multipart/form-data">
|
| 27 |
<div class="fieldset">
|
| 21 |
<h1><?php echo $this->__('Create an Account') ?></h1>
|
| 22 |
</div>
|
| 23 |
<?php echo $this->getChildHtml('form_fields_before')?>
|
| 24 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 25 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 26 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 27 |
+
<table>
|
| 28 |
+
<tr>
|
| 29 |
+
<td><div class="pslogin-border"></div></td>
|
| 30 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 31 |
+
<td><div class="pslogin-border"></div></td>
|
| 32 |
+
</tr>
|
| 33 |
+
</table>
|
| 34 |
+
</div>
|
| 35 |
+
<?php endif; ?>
|
| 36 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 37 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate" class="scaffold-form" enctype="multipart/form-data">
|
| 38 |
<div class="fieldset">
|
app/design/frontend/base/default/template/pslogin/customer/form/register/buttons.phtml
CHANGED
|
@@ -16,57 +16,47 @@
|
|
| 16 |
*/
|
| 17 |
?>
|
| 18 |
|
| 19 |
-
<?php if(
|
| 20 |
-
<div class="pslogin-
|
| 21 |
|
| 22 |
-
<div class="pslogin-buttons">
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
<span class="soc-li-icon">
|
| 40 |
-
<?php echo !empty($button['image']['icon'])? '<img src="'. $this->escapeHtml($button['image']['icon']) .'" />' : ''; ?>
|
| 41 |
-
</span>
|
| 42 |
-
<span class="soc-li-text"><?php echo $this->escapeHtml($button['register_text']); ?></span>
|
| 43 |
-
</span>
|
| 44 |
-
<?php endif; ?>
|
| 45 |
<?php else : ?>
|
| 46 |
-
|
| 47 |
-
<
|
| 48 |
-
|
| 49 |
-
<span class="background">
|
| 50 |
-
<span class="soc-li-icon"></span>
|
| 51 |
-
<span class="soc-li-text text-hidden"><?php echo $this->escapeHtml($button['register_text']); ?></span>
|
| 52 |
</span>
|
| 53 |
-
|
|
|
|
| 54 |
<?php endif; ?>
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
</div>
|
| 69 |
-
|
| 70 |
</div>
|
| 71 |
|
| 72 |
</div>
|
| 16 |
*/
|
| 17 |
?>
|
| 18 |
|
| 19 |
+
<?php if(Mage::helper('pslogin')->hasButtons()) : ?>
|
| 20 |
+
<div class="pslogin-block pslogin-register">
|
| 21 |
|
| 22 |
+
<div class="pslogin-buttons <?php echo $this->showRegisterFullButtons()? 'pslogin-buttons-showfull' : ''; ?>">
|
| 23 |
+
|
| 24 |
+
<?php if(!$this->showRegisterFullButtons()) : ?>
|
| 25 |
+
<div class="pslogin-spacer">
|
| 26 |
+
<?php echo $this->__('Register with your social account'); ?>
|
| 27 |
+
</div>
|
| 28 |
+
<br />
|
| 29 |
+
<?php endif; ?>
|
| 30 |
+
|
| 31 |
+
<ul>
|
| 32 |
+
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 33 |
+
<li class="pslogin-button <?php echo $button['type']; ?>" title="<?php echo $this->escapeHtml($button['register_text']); ?>">
|
| 34 |
+
<a class="pslogin-button-link" rel="nofollow" href="<?php echo $button['href']; ?>" data-width="<?php echo $button['popup_width']; ?>" data-height="<?php echo $button['popup_height']; ?>" data-loader="<?php echo $this->getLoaderUrl(); ?>">
|
| 35 |
+
|
| 36 |
+
<?php if($this->showRegisterFullButtons()) : ?>
|
| 37 |
+
<?php if(!empty($button['image']['register'])) : ?>
|
| 38 |
+
<img class="pslogin-button-image" src="<?php echo $this->escapeHtml($button['image']['register']); ?>" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
<?php else : ?>
|
| 40 |
+
<span class="pslogin-button-auto">
|
| 41 |
+
<span class="pslogin-button-icon">
|
| 42 |
+
<?php echo !empty($button['image']['icon'])? '<img class="pslogin-button-icon-image" src="'. $this->escapeHtml($button['image']['icon']) .'" />' : ''; ?>
|
|
|
|
|
|
|
|
|
|
| 43 |
</span>
|
| 44 |
+
<span class="pslogin-button-text"><?php echo $this->escapeHtml($button['register_text']); ?></span>
|
| 45 |
+
</span>
|
| 46 |
<?php endif; ?>
|
| 47 |
+
<?php else : ?>
|
| 48 |
+
<?php if(!empty($button['image']['icon'])) : ?>
|
| 49 |
+
<img class="pslogin-button-image" src="<?php echo $this->escapeHtml($button['image']['icon']); ?>" />
|
| 50 |
+
<?php else : ?>
|
| 51 |
+
<span class="pslogin-button-auto">
|
| 52 |
+
<span class="pslogin-button-icon"></span>
|
| 53 |
+
</span>
|
| 54 |
+
<?php endif; ?>
|
| 55 |
+
<?php endif; ?>
|
| 56 |
+
</a>
|
| 57 |
+
</li>
|
| 58 |
+
<?php endforeach; ?>
|
| 59 |
+
</ul>
|
|
|
|
|
|
|
| 60 |
</div>
|
| 61 |
|
| 62 |
</div>
|
app/design/frontend/base/default/template/pslogin/page/html/welcome.phtml
CHANGED
|
@@ -15,10 +15,11 @@
|
|
| 15 |
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
| 16 |
*/
|
| 17 |
?>
|
|
|
|
| 18 |
<span class="pslogin-welcome-msg">
|
| 19 |
-
<?php if( ($image = $this->getPhotoPath()) && $this->photoEnabled() ) { ?>
|
| 20 |
-
|
| 21 |
-
<?php } ?>
|
| 22 |
|
| 23 |
-
<?php echo $this->getMessage(); ?>
|
| 24 |
</span>
|
| 15 |
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
| 16 |
*/
|
| 17 |
?>
|
| 18 |
+
|
| 19 |
<span class="pslogin-welcome-msg">
|
| 20 |
+
<?php if( ($image = $this->getPhotoPath()) && $this->photoEnabled() ) { ?>
|
| 21 |
+
<img src="<?php echo $image; ?>" />
|
| 22 |
+
<?php } ?>
|
| 23 |
|
| 24 |
+
<?php echo $this->getMessage(); ?>
|
| 25 |
</span>
|
app/design/frontend/fortis/default/template/pslogin/checkout/onepage/login.phtml
ADDED
|
@@ -0,0 +1,168 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Customer onepage checkout login form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/checkout/onepage/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
| 34 |
+
?>
|
| 35 |
+
<div class="col2-set">
|
| 36 |
+
<?php echo $this->getChildHtml('login_before')?>
|
| 37 |
+
<div class="col-1">
|
| 38 |
+
<h3><?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?><?php echo $this->__('Checkout as a Guest or Register') ?><?php else: ?><?php echo $this->__('Register to Create an Account') ?><?php endif; ?></h3>
|
| 39 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 40 |
+
<p><?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 41 |
+
<?php else: ?>
|
| 42 |
+
<p><strong><?php echo $this->__('Register and save time!') ?></strong><br />
|
| 43 |
+
<?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 44 |
+
<ul>
|
| 45 |
+
<li><?php echo $this->__('Fast and easy check out') ?></li>
|
| 46 |
+
<li><?php echo $this->__('Easy access to your order history and status') ?></li>
|
| 47 |
+
</ul>
|
| 48 |
+
<?php endif; ?>
|
| 49 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 50 |
+
<ul class="form-list">
|
| 51 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 52 |
+
<li class="control">
|
| 53 |
+
<input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo $this->__('Checkout as Guest') ?></label>
|
| 54 |
+
</li>
|
| 55 |
+
<?php endif; ?>
|
| 56 |
+
<li class="control">
|
| 57 |
+
<input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo $this->__('Register') ?></label>
|
| 58 |
+
</li>
|
| 59 |
+
</ul>
|
| 60 |
+
<h4><?php echo $this->__('Register and save time!') ?></h4>
|
| 61 |
+
<p><?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 62 |
+
<ul class="ul">
|
| 63 |
+
<li><?php echo $this->__('Fast and easy check out') ?></li>
|
| 64 |
+
<li><?php echo $this->__('Easy access to your order history and status') ?></li>
|
| 65 |
+
</ul>
|
| 66 |
+
<?php else: ?>
|
| 67 |
+
<input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
|
| 68 |
+
<?php endif; ?>
|
| 69 |
+
</div>
|
| 70 |
+
<div class="col-2">
|
| 71 |
+
<h3><?php echo $this->__('Login') ?></h3>
|
| 72 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 73 |
+
<form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
|
| 74 |
+
<fieldset>
|
| 75 |
+
<?php echo $this->getBlockHtml('formkey'); ?>
|
| 76 |
+
<h4><?php echo $this->__('Already registered?') ?></h4>
|
| 77 |
+
<p><?php echo $this->__('Please log in below:') ?></p>
|
| 78 |
+
<ul class="form-list">
|
| 79 |
+
<li>
|
| 80 |
+
<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 81 |
+
<div class="input-box">
|
| 82 |
+
<input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
|
| 83 |
+
</div>
|
| 84 |
+
</li>
|
| 85 |
+
<li>
|
| 86 |
+
<label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 87 |
+
<div class="input-box">
|
| 88 |
+
<input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
|
| 89 |
+
</div>
|
| 90 |
+
</li>
|
| 91 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 92 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 93 |
+
</ul>
|
| 94 |
+
<input name="context" type="hidden" value="checkout" />
|
| 95 |
+
</fieldset>
|
| 96 |
+
</form>
|
| 97 |
+
</div>
|
| 98 |
+
</div>
|
| 99 |
+
<div class="col2-set">
|
| 100 |
+
<div class="col-1">
|
| 101 |
+
<div class="buttons-set">
|
| 102 |
+
<p class="required"> </p>
|
| 103 |
+
<?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
|
| 104 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
| 105 |
+
<?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
|
| 106 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo $this->__('Register') ?></span></span></button>
|
| 107 |
+
<?php else: ?>
|
| 108 |
+
<form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
|
| 109 |
+
<button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
|
| 110 |
+
</form>
|
| 111 |
+
<?php endif; ?>
|
| 112 |
+
</div>
|
| 113 |
+
</div>
|
| 114 |
+
<div class="col-2">
|
| 115 |
+
<div class="buttons-set">
|
| 116 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 117 |
+
<a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo $this->__('Forgot your password?') ?></a>
|
| 118 |
+
<button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 119 |
+
</div>
|
| 120 |
+
|
| 121 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 122 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 123 |
+
<table>
|
| 124 |
+
<tr>
|
| 125 |
+
<td><div class="pslogin-border"></div></td>
|
| 126 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 127 |
+
<td><div class="pslogin-border"></div></td>
|
| 128 |
+
</tr>
|
| 129 |
+
</table>
|
| 130 |
+
</div>
|
| 131 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 132 |
+
<?php endif; ?>
|
| 133 |
+
</div>
|
| 134 |
+
</div>
|
| 135 |
+
<script type="text/javascript">
|
| 136 |
+
//<![CDATA[
|
| 137 |
+
var loginForm = new VarienForm('login-form', true);
|
| 138 |
+
$('login-email').observe('keypress', bindLoginPost);
|
| 139 |
+
$('login-password').observe('keypress', bindLoginPost);
|
| 140 |
+
function bindLoginPost(evt){
|
| 141 |
+
if (evt.keyCode == Event.KEY_RETURN) {
|
| 142 |
+
loginForm.submit();
|
| 143 |
+
}
|
| 144 |
+
}
|
| 145 |
+
function onepageLogin(button)
|
| 146 |
+
{
|
| 147 |
+
if(loginForm.validator && loginForm.validator.validate()){
|
| 148 |
+
button.disabled = true;
|
| 149 |
+
loginForm.submit();
|
| 150 |
+
}
|
| 151 |
+
}
|
| 152 |
+
//]]>
|
| 153 |
+
</script>
|
| 154 |
+
<?php
|
| 155 |
+
$registerParam = $this->getRequest()->getParam('register');
|
| 156 |
+
if ($registerParam || $registerParam === ''):
|
| 157 |
+
?>
|
| 158 |
+
<script type="text/javascript">
|
| 159 |
+
//<![CDATA[
|
| 160 |
+
document.observe("dom:loaded", function() {
|
| 161 |
+
if($('login:register')) {
|
| 162 |
+
$('login:register').checked = true;
|
| 163 |
+
checkout.setMethod();
|
| 164 |
+
}
|
| 165 |
+
})
|
| 166 |
+
//]]>
|
| 167 |
+
</script>
|
| 168 |
+
<?php endif; ?>
|
app/design/frontend/fortis/default/template/pslogin/customer/form/login.phtml
ADDED
|
@@ -0,0 +1,109 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Customer login form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/customer/form/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Login */
|
| 34 |
+
?>
|
| 35 |
+
<div class="account-login">
|
| 36 |
+
<div class="page-title">
|
| 37 |
+
<h1><?php echo $this->__('Login or Create an Account') ?></h1>
|
| 38 |
+
</div>
|
| 39 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 40 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
|
| 41 |
+
<?php echo $this->getBlockHtml('formkey'); ?>
|
| 42 |
+
<div class="col2-set">
|
| 43 |
+
<div class="col-1 new-users">
|
| 44 |
+
<div class="content">
|
| 45 |
+
<h2><?php echo $this->__('New Customers') ?></h2>
|
| 46 |
+
<p><?php echo $this->__('By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.') ?></p>
|
| 47 |
+
</div>
|
| 48 |
+
</div>
|
| 49 |
+
<div class="col-2 registered-users">
|
| 50 |
+
<div class="content">
|
| 51 |
+
<h2><?php echo $this->__('Registered Customers') ?></h2>
|
| 52 |
+
<p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
|
| 53 |
+
<ul class="form-list">
|
| 54 |
+
<li>
|
| 55 |
+
<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 56 |
+
<div class="input-box">
|
| 57 |
+
<input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
|
| 58 |
+
</div>
|
| 59 |
+
</li>
|
| 60 |
+
<li>
|
| 61 |
+
<label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 62 |
+
<div class="input-box">
|
| 63 |
+
<input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
|
| 64 |
+
</div>
|
| 65 |
+
</li>
|
| 66 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 67 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 68 |
+
</ul>
|
| 69 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 70 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 71 |
+
</div>
|
| 72 |
+
</div>
|
| 73 |
+
</div>
|
| 74 |
+
<div class="col2-set">
|
| 75 |
+
<div class="col-1 new-users">
|
| 76 |
+
<div class="buttons-set">
|
| 77 |
+
<button type="button" title="<?php echo $this->__('Create an Account') ?>" class="button" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
|
| 78 |
+
</div>
|
| 79 |
+
</div>
|
| 80 |
+
<div class="col-2 registered-users">
|
| 81 |
+
<div class="buttons-set">
|
| 82 |
+
<a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
|
| 83 |
+
<button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 84 |
+
</div>
|
| 85 |
+
|
| 86 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 87 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 88 |
+
<table>
|
| 89 |
+
<tr>
|
| 90 |
+
<td><div class="pslogin-border"></div></td>
|
| 91 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 92 |
+
<td><div class="pslogin-border"></div></td>
|
| 93 |
+
</tr>
|
| 94 |
+
</table>
|
| 95 |
+
</div>
|
| 96 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 97 |
+
<?php endif; ?>
|
| 98 |
+
</div>
|
| 99 |
+
</div>
|
| 100 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 101 |
+
<input name="context" type="hidden" value="checkout" />
|
| 102 |
+
<?php endif; ?>
|
| 103 |
+
</form>
|
| 104 |
+
<script type="text/javascript">
|
| 105 |
+
//<![CDATA[
|
| 106 |
+
var dataForm = new VarienForm('login-form', true);
|
| 107 |
+
//]]>
|
| 108 |
+
</script>
|
| 109 |
+
</div>
|
app/design/frontend/fortis/default/template/pslogin/customer/form/register.phtml
ADDED
|
@@ -0,0 +1,204 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Create account form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/customer/form/register.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Register */
|
| 34 |
+
?>
|
| 35 |
+
<div class="account-create">
|
| 36 |
+
<div class="page-title">
|
| 37 |
+
<h1><?php echo $this->__('Create an Account') ?></h1>
|
| 38 |
+
</div>
|
| 39 |
+
<?php echo $this->getChildHtml('form_fields_before')?>
|
| 40 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 41 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 42 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 43 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 44 |
+
<table>
|
| 45 |
+
<tr>
|
| 46 |
+
<td><div class="pslogin-border"></div></td>
|
| 47 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 48 |
+
<td><div class="pslogin-border"></div></td>
|
| 49 |
+
</tr>
|
| 50 |
+
</table>
|
| 51 |
+
</div>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
|
| 54 |
+
<div class="fieldset">
|
| 55 |
+
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 56 |
+
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 57 |
+
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
| 58 |
+
<ul class="form-list">
|
| 59 |
+
<li class="fields">
|
| 60 |
+
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
|
| 61 |
+
</li>
|
| 62 |
+
<li>
|
| 63 |
+
<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 64 |
+
<div class="input-box">
|
| 65 |
+
<input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
|
| 66 |
+
</div>
|
| 67 |
+
</li>
|
| 68 |
+
<?php if ($this->isNewsletterEnabled()): ?>
|
| 69 |
+
<li class="control">
|
| 70 |
+
<div class="input-box">
|
| 71 |
+
<input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
|
| 72 |
+
</div>
|
| 73 |
+
<label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
|
| 74 |
+
</li>
|
| 75 |
+
<?php endif ?>
|
| 76 |
+
<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
|
| 77 |
+
<?php if ($_dob->isEnabled()): ?>
|
| 78 |
+
<li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
|
| 79 |
+
<?php endif ?>
|
| 80 |
+
<?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
|
| 81 |
+
<?php if ($_taxvat->isEnabled()): ?>
|
| 82 |
+
<li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
|
| 83 |
+
<?php endif ?>
|
| 84 |
+
<?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
|
| 85 |
+
<?php if ($_gender->isEnabled()): ?>
|
| 86 |
+
<li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
|
| 87 |
+
<?php endif ?>
|
| 88 |
+
</ul>
|
| 89 |
+
</div>
|
| 90 |
+
<?php if($this->getShowAddressFields()): ?>
|
| 91 |
+
<div class="fieldset">
|
| 92 |
+
<input type="hidden" name="create_address" value="1" />
|
| 93 |
+
<h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
|
| 94 |
+
<ul class="form-list">
|
| 95 |
+
<li class="fields">
|
| 96 |
+
<div class="field">
|
| 97 |
+
<label for="company"><?php echo $this->__('Company') ?></label>
|
| 98 |
+
<div class="input-box">
|
| 99 |
+
<input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
|
| 100 |
+
</div>
|
| 101 |
+
</div>
|
| 102 |
+
<div class="field">
|
| 103 |
+
<label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
|
| 104 |
+
<div class="input-box">
|
| 105 |
+
<input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
|
| 106 |
+
</div>
|
| 107 |
+
</div>
|
| 108 |
+
</li>
|
| 109 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
| 110 |
+
<li class="wide">
|
| 111 |
+
<label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
|
| 112 |
+
<div class="input-box">
|
| 113 |
+
<input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
|
| 114 |
+
</div>
|
| 115 |
+
</li>
|
| 116 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
| 117 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
| 118 |
+
<li class="wide">
|
| 119 |
+
<div class="input-box">
|
| 120 |
+
<input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
| 121 |
+
</div>
|
| 122 |
+
</li>
|
| 123 |
+
<?php endfor; ?>
|
| 124 |
+
<li class="fields">
|
| 125 |
+
<div class="field">
|
| 126 |
+
<label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
| 127 |
+
<div class="input-box">
|
| 128 |
+
<input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
|
| 129 |
+
</div>
|
| 130 |
+
</div>
|
| 131 |
+
<div class="field">
|
| 132 |
+
<label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
| 133 |
+
<div class="input-box">
|
| 134 |
+
<select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
|
| 135 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
| 136 |
+
</select>
|
| 137 |
+
<script type="text/javascript">
|
| 138 |
+
//<![CDATA[
|
| 139 |
+
$('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
|
| 140 |
+
//]]>
|
| 141 |
+
</script>
|
| 142 |
+
<input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
| 143 |
+
</div>
|
| 144 |
+
</div>
|
| 145 |
+
</li>
|
| 146 |
+
<li class="fields">
|
| 147 |
+
<div class="field">
|
| 148 |
+
<label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
| 149 |
+
<div class="input-box">
|
| 150 |
+
<input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
|
| 151 |
+
</div>
|
| 152 |
+
</div>
|
| 153 |
+
<div class="field">
|
| 154 |
+
<label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
| 155 |
+
<div class="input-box">
|
| 156 |
+
<?php echo $this->getCountryHtmlSelect() ?>
|
| 157 |
+
</div>
|
| 158 |
+
</div>
|
| 159 |
+
</li>
|
| 160 |
+
</ul>
|
| 161 |
+
<input type="hidden" name="default_billing" value="1" />
|
| 162 |
+
<input type="hidden" name="default_shipping" value="1" />
|
| 163 |
+
</div>
|
| 164 |
+
<?php endif; ?>
|
| 165 |
+
<div class="fieldset">
|
| 166 |
+
<h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
|
| 167 |
+
<ul class="form-list">
|
| 168 |
+
<li class="fields">
|
| 169 |
+
<div class="field">
|
| 170 |
+
<label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 171 |
+
<div class="input-box">
|
| 172 |
+
<input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
|
| 173 |
+
</div>
|
| 174 |
+
</div>
|
| 175 |
+
<div class="field">
|
| 176 |
+
<label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
|
| 177 |
+
<div class="input-box">
|
| 178 |
+
<input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
|
| 179 |
+
</div>
|
| 180 |
+
</div>
|
| 181 |
+
</li>
|
| 182 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 183 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 184 |
+
</ul>
|
| 185 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 186 |
+
</div>
|
| 187 |
+
<div class="buttons-set">
|
| 188 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 189 |
+
<p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo $this->__('Back') ?></a></p>
|
| 190 |
+
<button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
|
| 191 |
+
</div>
|
| 192 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 193 |
+
<input name="context" type="hidden" value="checkout" />
|
| 194 |
+
<?php endif; ?>
|
| 195 |
+
</form>
|
| 196 |
+
<script type="text/javascript">
|
| 197 |
+
//<![CDATA[
|
| 198 |
+
var dataForm = new VarienForm('form-validate', true);
|
| 199 |
+
<?php if($this->getShowAddressFields()): ?>
|
| 200 |
+
new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
|
| 201 |
+
<?php endif; ?>
|
| 202 |
+
//]]>
|
| 203 |
+
</script>
|
| 204 |
+
</div>
|
app/design/frontend/gravdept/acumen/template/pslogin/checkout/onepage/login.phtml
ADDED
|
@@ -0,0 +1,145 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Acumen for Magento
|
| 4 |
+
* http://gravitydept.com/to/acumen-magento
|
| 5 |
+
*
|
| 6 |
+
* @author Brendan Falkowski
|
| 7 |
+
* @package gravdept_acumen
|
| 8 |
+
* @copyright Copyright 2012 Gravity Department http://gravitydept.com
|
| 9 |
+
* @license All rights reserved.
|
| 10 |
+
* @version 1.3.4
|
| 11 |
+
*/
|
| 12 |
+
?>
|
| 13 |
+
<?php
|
| 14 |
+
/**
|
| 15 |
+
* Customer onepage checkout login form template
|
| 16 |
+
*
|
| 17 |
+
* @see app/design/frontend/base/default/template/checkout/onepage/login.phtml
|
| 18 |
+
*/
|
| 19 |
+
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
| 20 |
+
?>
|
| 21 |
+
|
| 22 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 23 |
+
|
| 24 |
+
<div class="grid">
|
| 25 |
+
<div class="grid_4 alpha">
|
| 26 |
+
<h3><?php echo $this->__('Sign In') ?></h3>
|
| 27 |
+
|
| 28 |
+
<form id="login-form" class="stack-form" action="<?php echo $this->getPostAction() ?>" method="post">
|
| 29 |
+
<ul class="form-list">
|
| 30 |
+
<li>
|
| 31 |
+
<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email') ?></label>
|
| 32 |
+
|
| 33 |
+
<div class="input-box">
|
| 34 |
+
<input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" title="<?php echo $this->__('Email') ?>" />
|
| 35 |
+
</div>
|
| 36 |
+
</li>
|
| 37 |
+
|
| 38 |
+
<li>
|
| 39 |
+
<label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 40 |
+
|
| 41 |
+
<div class="input-box">
|
| 42 |
+
<input type="password" class="input-text required-entry" id="login-password" name="login[password]" title="<?php echo $this->__('Password') ?>" />
|
| 43 |
+
</div>
|
| 44 |
+
</li>
|
| 45 |
+
|
| 46 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 47 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 48 |
+
</ul>
|
| 49 |
+
|
| 50 |
+
<div class="buttons-set">
|
| 51 |
+
<button type="submit" class="button"><?php echo $this->__('Sign In') ?></button>
|
| 52 |
+
<a class="alt-action" href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>"><?php echo $this->__('Forgot Your Password?') ?></a>
|
| 53 |
+
</div>
|
| 54 |
+
|
| 55 |
+
<input name="context" type="hidden" value="checkout" />
|
| 56 |
+
</form>
|
| 57 |
+
|
| 58 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 59 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 60 |
+
<table>
|
| 61 |
+
<tr>
|
| 62 |
+
<td><div class="pslogin-border"></div></td>
|
| 63 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 64 |
+
<td><div class="pslogin-border"></div></td>
|
| 65 |
+
</tr>
|
| 66 |
+
</table>
|
| 67 |
+
</div>
|
| 68 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
</div>
|
| 71 |
+
|
| 72 |
+
<div class="grid_3 omega">
|
| 73 |
+
<h3><?php echo $this->__('Create An Account') ?></h3>
|
| 74 |
+
|
| 75 |
+
<div class="stack-form">
|
| 76 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 77 |
+
<ul class="form-list">
|
| 78 |
+
<li class="control">
|
| 79 |
+
<input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" />
|
| 80 |
+
<label for="login:register"><?php echo $this->__('Register and checkout together') ?></label>
|
| 81 |
+
</li>
|
| 82 |
+
</ul>
|
| 83 |
+
|
| 84 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 85 |
+
<h3><?php echo $this->__('Guest Checkout') ?></h3>
|
| 86 |
+
|
| 87 |
+
<ul class="form-list">
|
| 88 |
+
<li class="control">
|
| 89 |
+
<input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" />
|
| 90 |
+
<label for="login:guest"><?php echo $this->__('Checkout without registering') ?></label>
|
| 91 |
+
</li>
|
| 92 |
+
</ul>
|
| 93 |
+
<?php endif; ?>
|
| 94 |
+
<?php else: ?>
|
| 95 |
+
<input type="hidden" name="checkout_method" id="login:register" value="register" />
|
| 96 |
+
<?php endif; ?>
|
| 97 |
+
|
| 98 |
+
<div class="buttons-set">
|
| 99 |
+
<?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
|
| 100 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><?php echo $this->__('Continue') ?></button>
|
| 101 |
+
<?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
|
| 102 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><?php echo $this->__('Register') ?></button>
|
| 103 |
+
<?php else: ?>
|
| 104 |
+
<form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
|
| 105 |
+
<button id="onepage-guest-register-button" type="submit" class="button"><?php echo $this->__('Register') ?></button>
|
| 106 |
+
</form>
|
| 107 |
+
<?php endif; ?>
|
| 108 |
+
</div>
|
| 109 |
+
</div>
|
| 110 |
+
</div>
|
| 111 |
+
</div>
|
| 112 |
+
|
| 113 |
+
<script type="text/javascript">
|
| 114 |
+
//<![CDATA[
|
| 115 |
+
var loginForm = new VarienForm('login-form', true);
|
| 116 |
+
$('login-email').observe('keypress', bindLoginPost);
|
| 117 |
+
$('login-password').observe('keypress', bindLoginPost);
|
| 118 |
+
function bindLoginPost(evt){
|
| 119 |
+
if (evt.keyCode == Event.KEY_RETURN) {
|
| 120 |
+
loginForm.submit();
|
| 121 |
+
}
|
| 122 |
+
}
|
| 123 |
+
function onepageLogin(button)
|
| 124 |
+
{
|
| 125 |
+
if(loginForm.validator && loginForm.validator.validate()){
|
| 126 |
+
button.disabled = true;
|
| 127 |
+
loginForm.submit();
|
| 128 |
+
}
|
| 129 |
+
}
|
| 130 |
+
//]]>
|
| 131 |
+
</script>
|
| 132 |
+
|
| 133 |
+
<?php $registerParam = $this->getRequest()->getParam('register'); ?>
|
| 134 |
+
<?php if ($registerParam || $registerParam === ''): ?>
|
| 135 |
+
<script type="text/javascript">
|
| 136 |
+
//<![CDATA[
|
| 137 |
+
document.observe("dom:loaded", function() {
|
| 138 |
+
if($('login:register')) {
|
| 139 |
+
$('login:register').checked = true;
|
| 140 |
+
checkout.setMethod();
|
| 141 |
+
}
|
| 142 |
+
})
|
| 143 |
+
//]]>
|
| 144 |
+
</script>
|
| 145 |
+
<?php endif; ?>
|
app/design/frontend/gravdept/acumen/template/pslogin/customer/form/login.phtml
ADDED
|
@@ -0,0 +1,95 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Acumen for Magento
|
| 4 |
+
* http://gravitydept.com/to/acumen-magento
|
| 5 |
+
*
|
| 6 |
+
* @author Brendan Falkowski
|
| 7 |
+
* @package gravdept_acumen
|
| 8 |
+
* @copyright Copyright 2012 Gravity Department http://gravitydept.com
|
| 9 |
+
* @license All rights reserved.
|
| 10 |
+
* @version 1.3.4
|
| 11 |
+
*/
|
| 12 |
+
?>
|
| 13 |
+
<?php
|
| 14 |
+
/**
|
| 15 |
+
* Customer login form template
|
| 16 |
+
*
|
| 17 |
+
* @see app/design/frontend/base/default/template/customer/form/login.phtml
|
| 18 |
+
*/
|
| 19 |
+
/** @var $this Mage_Customer_Block_Form_Login */
|
| 20 |
+
?>
|
| 21 |
+
|
| 22 |
+
<div class="grid-block">
|
| 23 |
+
<h1><?php echo $this->__('Sign In') ?></h1>
|
| 24 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 25 |
+
</div>
|
| 26 |
+
|
| 27 |
+
<div id="account-login" class="grid">
|
| 28 |
+
<div class="grid_6 suffix_2">
|
| 29 |
+
<form id="login-form" class="scaffold-form" action="<?php echo $this->getPostActionUrl() ?>" method="post">
|
| 30 |
+
<ul class="form-list">
|
| 31 |
+
<li>
|
| 32 |
+
<label for="email" class="required"><em>*</em><?php echo $this->__('Email') ?></label>
|
| 33 |
+
|
| 34 |
+
<div class="input-box">
|
| 35 |
+
<input type="email" id="email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
|
| 36 |
+
</div>
|
| 37 |
+
</li>
|
| 38 |
+
|
| 39 |
+
<li>
|
| 40 |
+
<label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 41 |
+
|
| 42 |
+
<div class="input-box">
|
| 43 |
+
<input type="password" id="pass" name="login[password]" class="input-text required-entry validate-password" title="<?php echo $this->__('Password') ?>" />
|
| 44 |
+
</div>
|
| 45 |
+
</li>
|
| 46 |
+
|
| 47 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 48 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 49 |
+
</ul>
|
| 50 |
+
|
| 51 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 52 |
+
|
| 53 |
+
<div class="buttons-set">
|
| 54 |
+
<button type="submit" class="button"><?php echo $this->__('Sign In') ?></button>
|
| 55 |
+
<a class="alt-action" href="<?php echo $this->getForgotPasswordUrl() ?>"><?php echo $this->__('Forgot your password?') ?></a>
|
| 56 |
+
</div>
|
| 57 |
+
|
| 58 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 59 |
+
<input name="context" type="hidden" value="checkout" />
|
| 60 |
+
<?php endif; ?>
|
| 61 |
+
</form>
|
| 62 |
+
|
| 63 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 64 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 65 |
+
<table>
|
| 66 |
+
<tr>
|
| 67 |
+
<td><div class="pslogin-border"></div></td>
|
| 68 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 69 |
+
<td><div class="pslogin-border"></div></td>
|
| 70 |
+
</tr>
|
| 71 |
+
</table>
|
| 72 |
+
</div>
|
| 73 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
|
| 76 |
+
<script type="text/javascript">
|
| 77 |
+
//<![CDATA[
|
| 78 |
+
var dataForm = new VarienForm('login-form', true);
|
| 79 |
+
//]]>
|
| 80 |
+
</script>
|
| 81 |
+
</div>
|
| 82 |
+
|
| 83 |
+
<div class="grid_4 std">
|
| 84 |
+
<h2><?php echo $this->__('Register For An Account') ?></h2>
|
| 85 |
+
|
| 86 |
+
<ul>
|
| 87 |
+
<li><?php echo $this->__('Checkout faster') ?></li>
|
| 88 |
+
<li><?php echo $this->__('Store multiple shipping addresses') ?></li>
|
| 89 |
+
<li><?php echo $this->__('View and track orders') ?></li>
|
| 90 |
+
<li><?php echo $this->__('Save items to wishlist') ?></li>
|
| 91 |
+
</ul>
|
| 92 |
+
|
| 93 |
+
<a class="button" href="<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>"><?php echo $this->__('Register') ?></a>
|
| 94 |
+
</div>
|
| 95 |
+
</div>
|
app/design/frontend/gravdept/acumen/template/pslogin/customer/form/register.phtml
ADDED
|
@@ -0,0 +1,225 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Acumen for Magento
|
| 4 |
+
* http://gravitydept.com/to/acumen-magento
|
| 5 |
+
*
|
| 6 |
+
* @author Brendan Falkowski
|
| 7 |
+
* @package gravdept_acumen
|
| 8 |
+
* @copyright Copyright 2012 Gravity Department http://gravitydept.com
|
| 9 |
+
* @license All rights reserved.
|
| 10 |
+
* @version 1.3.4
|
| 11 |
+
*/
|
| 12 |
+
?>
|
| 13 |
+
<?php
|
| 14 |
+
/**
|
| 15 |
+
* Create account form template
|
| 16 |
+
*
|
| 17 |
+
* @see app/design/frontend/base/default/template/customer/form/register.phtml
|
| 18 |
+
*/
|
| 19 |
+
/** @var $this Mage_Customer_Block_Form_Register */
|
| 20 |
+
?>
|
| 21 |
+
|
| 22 |
+
<div class="grid-block">
|
| 23 |
+
<h1><?php echo $this->__('Create an Account') ?></h1>
|
| 24 |
+
|
| 25 |
+
<?php echo $this->getChildHtml('form_fields_before')?>
|
| 26 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 27 |
+
|
| 28 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 29 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 30 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 31 |
+
<table>
|
| 32 |
+
<tr>
|
| 33 |
+
<td><div class="pslogin-border"></div></td>
|
| 34 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 35 |
+
<td><div class="pslogin-border"></div></td>
|
| 36 |
+
</tr>
|
| 37 |
+
</table>
|
| 38 |
+
</div>
|
| 39 |
+
<?php endif; ?>
|
| 40 |
+
</div>
|
| 41 |
+
|
| 42 |
+
<div class="grid">
|
| 43 |
+
<div class="grid_7">
|
| 44 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="register-form" class="scaffold-form">
|
| 45 |
+
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 46 |
+
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 47 |
+
|
| 48 |
+
<div class="fieldset">
|
| 49 |
+
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
| 50 |
+
|
| 51 |
+
<ul class="form-list">
|
| 52 |
+
<li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->toHtml() ?></li>
|
| 53 |
+
|
| 54 |
+
<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
|
| 55 |
+
<?php if ($_dob->isEnabled()): ?>
|
| 56 |
+
<li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
|
| 57 |
+
<?php endif ?>
|
| 58 |
+
|
| 59 |
+
<?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
|
| 60 |
+
<?php if ($_taxvat->isEnabled()): ?>
|
| 61 |
+
<li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
|
| 62 |
+
<?php endif ?>
|
| 63 |
+
|
| 64 |
+
<?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
|
| 65 |
+
<?php if ($_gender->isEnabled()): ?>
|
| 66 |
+
<li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
|
| 67 |
+
<?php endif ?>
|
| 68 |
+
</ul>
|
| 69 |
+
</div>
|
| 70 |
+
|
| 71 |
+
<?php if($this->getShowAddressFields()): ?>
|
| 72 |
+
<div class="fieldset">
|
| 73 |
+
<input type="hidden" name="create_address" value="1" />
|
| 74 |
+
|
| 75 |
+
<h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
|
| 76 |
+
|
| 77 |
+
<ul class="form-list">
|
| 78 |
+
<li>
|
| 79 |
+
<label for="company"><?php echo $this->__('Company') ?></label>
|
| 80 |
+
|
| 81 |
+
<div class="input-box">
|
| 82 |
+
<input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
|
| 83 |
+
</div>
|
| 84 |
+
</li>
|
| 85 |
+
|
| 86 |
+
<li>
|
| 87 |
+
<label for="telephone" class="required"><em>*</em><?php echo $this->__('Phone') ?></label>
|
| 88 |
+
|
| 89 |
+
<div class="input-box">
|
| 90 |
+
<input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
|
| 91 |
+
</div>
|
| 92 |
+
</li>
|
| 93 |
+
|
| 94 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
| 95 |
+
<li>
|
| 96 |
+
<label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
|
| 97 |
+
|
| 98 |
+
<div class="input-box">
|
| 99 |
+
<input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
|
| 100 |
+
</div>
|
| 101 |
+
</li>
|
| 102 |
+
|
| 103 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
| 104 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
| 105 |
+
<li>
|
| 106 |
+
<label for="street_<?php echo $_i ?>"><?php echo $this->__('Street Address') ?> <?php echo $_i ?></label>
|
| 107 |
+
|
| 108 |
+
<div class="input-box">
|
| 109 |
+
<input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
| 110 |
+
</div>
|
| 111 |
+
</li>
|
| 112 |
+
<?php endfor; ?>
|
| 113 |
+
|
| 114 |
+
<li>
|
| 115 |
+
<label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
| 116 |
+
|
| 117 |
+
<div class="input-box">
|
| 118 |
+
<input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
|
| 119 |
+
</div>
|
| 120 |
+
</li>
|
| 121 |
+
|
| 122 |
+
<li>
|
| 123 |
+
<label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
| 124 |
+
|
| 125 |
+
<div class="input-box">
|
| 126 |
+
<select id="region_id" name="region_id" class="validate-select" style="display:none;">
|
| 127 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
| 128 |
+
</select>
|
| 129 |
+
|
| 130 |
+
<script type="text/javascript">
|
| 131 |
+
$('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
|
| 132 |
+
</script>
|
| 133 |
+
|
| 134 |
+
<input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
| 135 |
+
</div>
|
| 136 |
+
</li>
|
| 137 |
+
|
| 138 |
+
<li>
|
| 139 |
+
<label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
| 140 |
+
|
| 141 |
+
<div class="input-box">
|
| 142 |
+
<input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
|
| 143 |
+
</div>
|
| 144 |
+
</li>
|
| 145 |
+
|
| 146 |
+
<li>
|
| 147 |
+
<label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
| 148 |
+
|
| 149 |
+
<div class="input-box">
|
| 150 |
+
<?php echo $this->getCountryHtmlSelect() ?>
|
| 151 |
+
</div>
|
| 152 |
+
</li>
|
| 153 |
+
</ul>
|
| 154 |
+
|
| 155 |
+
<input type="hidden" name="default_billing" value="1" />
|
| 156 |
+
<input type="hidden" name="default_shipping" value="1" />
|
| 157 |
+
</div>
|
| 158 |
+
<?php endif; ?>
|
| 159 |
+
|
| 160 |
+
<div class="fieldset">
|
| 161 |
+
<h2 class="legend"><?php echo $this->__('Account Information') ?></h2>
|
| 162 |
+
|
| 163 |
+
<ul class="form-list">
|
| 164 |
+
<li>
|
| 165 |
+
<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email') ?></label>
|
| 166 |
+
|
| 167 |
+
<div class="input-box">
|
| 168 |
+
<input type="text" id="email_address" name="email" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" class="input-text validate-email required-entry" />
|
| 169 |
+
</div>
|
| 170 |
+
</li>
|
| 171 |
+
|
| 172 |
+
<li>
|
| 173 |
+
<label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 174 |
+
|
| 175 |
+
<div class="input-box">
|
| 176 |
+
<input type="password" id="password" name="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
|
| 177 |
+
</div>
|
| 178 |
+
</li>
|
| 179 |
+
|
| 180 |
+
<li>
|
| 181 |
+
<label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
|
| 182 |
+
|
| 183 |
+
<div class="input-box">
|
| 184 |
+
<input type="password" id="confirmation" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" class="input-text required-entry validate-cpassword" />
|
| 185 |
+
</div>
|
| 186 |
+
</li>
|
| 187 |
+
|
| 188 |
+
<?php if ($this->isNewsletterEnabled()): ?>
|
| 189 |
+
<li class="control">
|
| 190 |
+
<input type="checkbox" id="is_subscribed" name="is_subscribed" value="1" <?php if($this->getFormData()->getIsSubscribed()): ?>checked="checked"<?php endif; ?> class="checkbox" />
|
| 191 |
+
<label for="is_subscribed"><?php echo $this->__('Subscribe to the newsletter to receive store news and offers via email.') ?></label>
|
| 192 |
+
</li>
|
| 193 |
+
<?php endif ?>
|
| 194 |
+
|
| 195 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 196 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 197 |
+
</ul>
|
| 198 |
+
|
| 199 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 200 |
+
</div>
|
| 201 |
+
|
| 202 |
+
<div class="buttons-set">
|
| 203 |
+
<button type="submit" class="button"><?php echo $this->__('Register') ?></button>
|
| 204 |
+
</div>
|
| 205 |
+
|
| 206 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 207 |
+
<input name="context" type="hidden" value="checkout" />
|
| 208 |
+
<?php endif; ?>
|
| 209 |
+
</form>
|
| 210 |
+
|
| 211 |
+
<script type="text/javascript">
|
| 212 |
+
//<![CDATA[
|
| 213 |
+
var dataForm = new VarienForm('register-form', true);
|
| 214 |
+
<?php if($this->getShowAddressFields()): ?>
|
| 215 |
+
new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
|
| 216 |
+
<?php endif; ?>
|
| 217 |
+
//]]>
|
| 218 |
+
</script>
|
| 219 |
+
</div>
|
| 220 |
+
|
| 221 |
+
<div class="grid_4 prefix_1">
|
| 222 |
+
<h2><?php echo $this->__('Already registered?') ?></h2>
|
| 223 |
+
<a class="button" href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><?php echo $this->__('Sign In') ?></a>
|
| 224 |
+
</div>
|
| 225 |
+
</div>
|
app/design/frontend/shopper/default/template/pslogin/checkout/onepage/login.phtml
ADDED
|
@@ -0,0 +1,177 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Customer onepage checkout login form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/checkout/onepage/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
| 34 |
+
?>
|
| 35 |
+
<?php echo $this->getChildHtml('login_before')?>
|
| 36 |
+
|
| 37 |
+
<div class="block block-checkout-register">
|
| 38 |
+
<div class="block-title">
|
| 39 |
+
<strong><span><?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?><?php echo $this->__('Checkout as a Guest or Register') ?><?php else: ?><?php echo $this->__('Register to Create an Account') ?><?php endif; ?></span></strong>
|
| 40 |
+
</div>
|
| 41 |
+
<div class="block-content">
|
| 42 |
+
|
| 43 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 44 |
+
<p><?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 45 |
+
<?php else: ?>
|
| 46 |
+
<p><strong><?php echo $this->__('Register and save time!') ?></strong><br />
|
| 47 |
+
<?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 48 |
+
<ul>
|
| 49 |
+
<li><?php echo $this->__('Fast and easy check out') ?></li>
|
| 50 |
+
<li><?php echo $this->__('Easy access to your order history and status') ?></li>
|
| 51 |
+
</ul>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 54 |
+
<ul class="form-list">
|
| 55 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 56 |
+
<li class="control">
|
| 57 |
+
<input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo $this->__('Checkout as Guest') ?></label>
|
| 58 |
+
</li>
|
| 59 |
+
<?php endif; ?>
|
| 60 |
+
<li class="control">
|
| 61 |
+
<input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo $this->__('Register') ?></label>
|
| 62 |
+
</li>
|
| 63 |
+
</ul>
|
| 64 |
+
<h4><?php echo $this->__('Register and save time!') ?></h4>
|
| 65 |
+
<p><?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 66 |
+
<ul class="ul">
|
| 67 |
+
<li><?php echo $this->__('Fast and easy check out') ?></li>
|
| 68 |
+
<li><?php echo $this->__('Easy access to your order history and status') ?></li>
|
| 69 |
+
</ul>
|
| 70 |
+
<?php else: ?>
|
| 71 |
+
<input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
|
| 72 |
+
<?php endif; ?>
|
| 73 |
+
|
| 74 |
+
<div class="buttons-set">
|
| 75 |
+
<p class="required"> </p>
|
| 76 |
+
<?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
|
| 77 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
| 78 |
+
<?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
|
| 79 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo $this->__('Register') ?></span></span></button>
|
| 80 |
+
<?php else: ?>
|
| 81 |
+
<form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
|
| 82 |
+
<button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
|
| 83 |
+
</form>
|
| 84 |
+
<?php endif; ?>
|
| 85 |
+
</div>
|
| 86 |
+
|
| 87 |
+
</div>
|
| 88 |
+
</div>
|
| 89 |
+
|
| 90 |
+
<div class="block block-checkout-login">
|
| 91 |
+
<div class="block-title">
|
| 92 |
+
<strong><span><?php echo $this->__('Login') ?></span></strong>
|
| 93 |
+
</div>
|
| 94 |
+
<div class="block-content">
|
| 95 |
+
|
| 96 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 97 |
+
<form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
|
| 98 |
+
<fieldset>
|
| 99 |
+
<h4><?php echo $this->__('Already registered?') ?></h4>
|
| 100 |
+
<p><?php echo $this->__('Please log in below:') ?></p>
|
| 101 |
+
<ul class="form-list">
|
| 102 |
+
<li>
|
| 103 |
+
<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 104 |
+
<div class="input-box">
|
| 105 |
+
<input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" />
|
| 106 |
+
</div>
|
| 107 |
+
</li>
|
| 108 |
+
<li>
|
| 109 |
+
<label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 110 |
+
<div class="input-box">
|
| 111 |
+
<input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
|
| 112 |
+
</div>
|
| 113 |
+
</li>
|
| 114 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 115 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 116 |
+
</ul>
|
| 117 |
+
<input name="context" type="hidden" value="checkout" />
|
| 118 |
+
</fieldset>
|
| 119 |
+
</form>
|
| 120 |
+
|
| 121 |
+
<div class="buttons-set">
|
| 122 |
+
<button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 123 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 124 |
+
<a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo $this->__('Forgot your password?') ?></a>
|
| 125 |
+
</div>
|
| 126 |
+
|
| 127 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 128 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 129 |
+
<table>
|
| 130 |
+
<tr>
|
| 131 |
+
<td><div class="pslogin-border"></div></td>
|
| 132 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 133 |
+
<td><div class="pslogin-border"></div></td>
|
| 134 |
+
</tr>
|
| 135 |
+
</table>
|
| 136 |
+
</div>
|
| 137 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 138 |
+
<?php endif; ?>
|
| 139 |
+
</div>
|
| 140 |
+
</div>
|
| 141 |
+
|
| 142 |
+
<div class="clear"></div>
|
| 143 |
+
|
| 144 |
+
<script type="text/javascript">
|
| 145 |
+
//<![CDATA[
|
| 146 |
+
var loginForm = new VarienForm('login-form', true);
|
| 147 |
+
$('login-email').observe('keypress', bindLoginPost);
|
| 148 |
+
$('login-password').observe('keypress', bindLoginPost);
|
| 149 |
+
function bindLoginPost(evt){
|
| 150 |
+
if (evt.keyCode == Event.KEY_RETURN) {
|
| 151 |
+
loginForm.submit();
|
| 152 |
+
}
|
| 153 |
+
}
|
| 154 |
+
function onepageLogin(button)
|
| 155 |
+
{
|
| 156 |
+
if(loginForm.validator && loginForm.validator.validate()){
|
| 157 |
+
button.disabled = true;
|
| 158 |
+
loginForm.submit();
|
| 159 |
+
}
|
| 160 |
+
}
|
| 161 |
+
//]]>
|
| 162 |
+
</script>
|
| 163 |
+
<?php
|
| 164 |
+
$registerParam = $this->getRequest()->getParam('register');
|
| 165 |
+
if ($registerParam || $registerParam === ''):
|
| 166 |
+
?>
|
| 167 |
+
<script type="text/javascript">
|
| 168 |
+
//<![CDATA[
|
| 169 |
+
document.observe("dom:loaded", function() {
|
| 170 |
+
if($('login:register')) {
|
| 171 |
+
$('login:register').checked = true;
|
| 172 |
+
checkout.setMethod();
|
| 173 |
+
}
|
| 174 |
+
})
|
| 175 |
+
//]]>
|
| 176 |
+
</script>
|
| 177 |
+
<?php endif; ?>
|
app/design/frontend/shopper/default/template/pslogin/customer/form/login.phtml
ADDED
|
@@ -0,0 +1,118 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Customer login form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/customer/form/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Login */
|
| 34 |
+
?>
|
| 35 |
+
<div class="account-login">
|
| 36 |
+
|
| 37 |
+
<div class="block block-login">
|
| 38 |
+
<div class="block-slider">
|
| 39 |
+
<ul class="slides">
|
| 40 |
+
<li>
|
| 41 |
+
<div class="block-title">
|
| 42 |
+
<strong><span><?php echo $this->__('Sign In') ?></span></strong>
|
| 43 |
+
</div>
|
| 44 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 45 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 46 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 47 |
+
<table>
|
| 48 |
+
<tr>
|
| 49 |
+
<td><div class="pslogin-border"></div></td>
|
| 50 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 51 |
+
<td><div class="pslogin-border"></div></td>
|
| 52 |
+
</tr>
|
| 53 |
+
</table>
|
| 54 |
+
</div>
|
| 55 |
+
<?php endif; ?>
|
| 56 |
+
<div class="block-content">
|
| 57 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 58 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
|
| 59 |
+
<ul class="form-list">
|
| 60 |
+
<li>
|
| 61 |
+
<label for="email" class="required"><?php echo $this->__('Email Address') ?></label>
|
| 62 |
+
<div class="input-box">
|
| 63 |
+
<input type="text" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
|
| 64 |
+
</div>
|
| 65 |
+
</li>
|
| 66 |
+
<li>
|
| 67 |
+
<label for="pass" class="required"><?php echo $this->__('Password') ?></label>
|
| 68 |
+
<div class="input-box">
|
| 69 |
+
<input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
|
| 70 |
+
</div>
|
| 71 |
+
</li>
|
| 72 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 73 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 74 |
+
</ul>
|
| 75 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 76 |
+
<button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 77 |
+
<a href="<?php echo $this->getForgotPasswordUrl() ?>" class="forgot-password" id="forgot-password"><?php echo $this->__('Forgot Your Password?') ?></a>
|
| 78 |
+
|
| 79 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 80 |
+
<input name="context" type="hidden" value="checkout" />
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
</form>
|
| 83 |
+
</div>
|
| 84 |
+
</li>
|
| 85 |
+
<li>
|
| 86 |
+
<div class="block-title">
|
| 87 |
+
<strong><span><?php echo $this->__('Forgot Your Password?') ?></span></strong>
|
| 88 |
+
</div>
|
| 89 |
+
<div class="block-content">
|
| 90 |
+
<form action="<?php echo $this->getUrl('*/*/forgotpasswordpost') ?>" method="post" id="form-validate">
|
| 91 |
+
<ul class="form-list">
|
| 92 |
+
<li>
|
| 93 |
+
<label for="email" class="required"><?php echo $this->__('Email Address') ?></label>
|
| 94 |
+
<div class="input-box">
|
| 95 |
+
<input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->htmlEscape($this->getEmailValue()) ?>" />
|
| 96 |
+
</div>
|
| 97 |
+
</li>
|
| 98 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 99 |
+
</ul>
|
| 100 |
+
<button type="submit" class="button" title="<?php echo $this->__('Submit') ?>"><span><span><?php echo $this->__('Submit') ?></span></span></button>
|
| 101 |
+
<a href="<?php echo $this->getForgotPasswordUrl() ?>" class="forgot-password" id="back-login"><?php echo $this->__('Back to Login?'); ?></a>
|
| 102 |
+
</form>
|
| 103 |
+
</div>
|
| 104 |
+
</li>
|
| 105 |
+
</ul>
|
| 106 |
+
</div>
|
| 107 |
+
<div class="new-users">
|
| 108 |
+
<button type="button" title="<?php echo $this->__('Create an Account') ?>" class="button invert" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
|
| 109 |
+
</div>
|
| 110 |
+
</div>
|
| 111 |
+
|
| 112 |
+
<script type="text/javascript">
|
| 113 |
+
//<![CDATA[
|
| 114 |
+
var dataForm = new VarienForm('login-form', true);
|
| 115 |
+
var dataForgetForm = new VarienForm('form-validate', true);
|
| 116 |
+
//]]>
|
| 117 |
+
</script>
|
| 118 |
+
</div>
|
app/design/frontend/shopper/default/template/pslogin/customer/form/register.phtml
ADDED
|
@@ -0,0 +1,271 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Create account form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/customer/form/register.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Register */
|
| 34 |
+
?>
|
| 35 |
+
|
| 36 |
+
<div class="account-create">
|
| 37 |
+
|
| 38 |
+
<div class="block block-login">
|
| 39 |
+
<div class="block-title">
|
| 40 |
+
<strong><span><?php echo $this->__('Create an Account') ?></span></strong>
|
| 41 |
+
</div>
|
| 42 |
+
<div class="block-content">
|
| 43 |
+
<?php echo $this->getChildHtml('form_fields_before')?>
|
| 44 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 45 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 46 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 47 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 48 |
+
<table>
|
| 49 |
+
<tr>
|
| 50 |
+
<td><div class="pslogin-border"></div></td>
|
| 51 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 52 |
+
<td><div class="pslogin-border"></div></td>
|
| 53 |
+
</tr>
|
| 54 |
+
</table>
|
| 55 |
+
</div>
|
| 56 |
+
<?php endif; ?>
|
| 57 |
+
|
| 58 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
|
| 59 |
+
|
| 60 |
+
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>"/>
|
| 61 |
+
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>"/>
|
| 62 |
+
|
| 63 |
+
<h2 class="legend first"><?php echo $this->__('Personal Information') ?></h2>
|
| 64 |
+
<ul class="form-list">
|
| 65 |
+
<li class="fields">
|
| 66 |
+
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
|
| 67 |
+
</li>
|
| 68 |
+
<li>
|
| 69 |
+
<label for="email_address"
|
| 70 |
+
class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 71 |
+
|
| 72 |
+
<div class="input-box">
|
| 73 |
+
<input type="text" name="email" id="email_address"
|
| 74 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>"
|
| 75 |
+
title="<?php echo $this->__('Email Address') ?>"
|
| 76 |
+
class="input-text validate-email required-entry"/>
|
| 77 |
+
</div>
|
| 78 |
+
</li>
|
| 79 |
+
<?php if ($this->isNewsletterEnabled()): ?>
|
| 80 |
+
<li class="control">
|
| 81 |
+
<div class="input-box">
|
| 82 |
+
<input type="checkbox" name="is_subscribed"
|
| 83 |
+
title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1"
|
| 84 |
+
id="is_subscribed"<?php if ($this->getFormData()->getIsSubscribed()): ?>
|
| 85 |
+
checked="checked"<?php endif; ?> class="checkbox"/>
|
| 86 |
+
</div>
|
| 87 |
+
<label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
|
| 88 |
+
</li>
|
| 89 |
+
<?php endif ?>
|
| 90 |
+
<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
|
| 91 |
+
<?php if ($_dob->isEnabled()): ?>
|
| 92 |
+
<li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
|
| 93 |
+
<?php endif ?>
|
| 94 |
+
<?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
|
| 95 |
+
<?php if ($_taxvat->isEnabled()): ?>
|
| 96 |
+
<li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
|
| 97 |
+
<?php endif ?>
|
| 98 |
+
<?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
|
| 99 |
+
<?php if ($_gender->isEnabled()): ?>
|
| 100 |
+
<li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
|
| 101 |
+
<?php endif ?>
|
| 102 |
+
</ul>
|
| 103 |
+
|
| 104 |
+
<?php if ($this->getShowAddressFields()): ?>
|
| 105 |
+
|
| 106 |
+
<input type="hidden" name="create_address" value="1"/>
|
| 107 |
+
|
| 108 |
+
<h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
|
| 109 |
+
<ul class="form-list">
|
| 110 |
+
<li class="fields">
|
| 111 |
+
<div class="field">
|
| 112 |
+
<label for="company"><?php echo $this->__('Company') ?></label>
|
| 113 |
+
|
| 114 |
+
<div class="input-box">
|
| 115 |
+
<input type="text" name="company" id="company"
|
| 116 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>"
|
| 117 |
+
title="<?php echo $this->__('Company') ?>"
|
| 118 |
+
class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>"/>
|
| 119 |
+
</div>
|
| 120 |
+
</div>
|
| 121 |
+
<div class="field">
|
| 122 |
+
<label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?>
|
| 123 |
+
</label>
|
| 124 |
+
|
| 125 |
+
<div class="input-box">
|
| 126 |
+
<input type="text" name="telephone" id="telephone"
|
| 127 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>"
|
| 128 |
+
title="<?php echo $this->__('Telephone') ?>"
|
| 129 |
+
class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>"/>
|
| 130 |
+
</div>
|
| 131 |
+
</div>
|
| 132 |
+
</li>
|
| 133 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
| 134 |
+
<li class="wide">
|
| 135 |
+
<label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?>
|
| 136 |
+
</label>
|
| 137 |
+
|
| 138 |
+
<div class="input-box">
|
| 139 |
+
<input type="text" name="street[]"
|
| 140 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>"
|
| 141 |
+
title="<?php echo $this->__('Street Address') ?>" id="street_1"
|
| 142 |
+
class="input-text <?php echo $_streetValidationClass ?>"/>
|
| 143 |
+
</div>
|
| 144 |
+
</li>
|
| 145 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
| 146 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
| 147 |
+
<li class="wide">
|
| 148 |
+
<div class="input-box">
|
| 149 |
+
<input type="text" name="street[]"
|
| 150 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>"
|
| 151 |
+
title="<?php echo $this->__('Street Address %s', $_i) ?>"
|
| 152 |
+
id="street_<?php echo $_i ?>"
|
| 153 |
+
class="input-text <?php echo $_streetValidationClass ?>"/>
|
| 154 |
+
</div>
|
| 155 |
+
</li>
|
| 156 |
+
<?php endfor; ?>
|
| 157 |
+
<li class="fields">
|
| 158 |
+
<div class="field">
|
| 159 |
+
<label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
| 160 |
+
|
| 161 |
+
<div class="input-box">
|
| 162 |
+
<input type="text" name="city"
|
| 163 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>"
|
| 164 |
+
title="<?php echo $this->__('City') ?>"
|
| 165 |
+
class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>"
|
| 166 |
+
id="city"/>
|
| 167 |
+
</div>
|
| 168 |
+
</div>
|
| 169 |
+
<div class="field">
|
| 170 |
+
<label for="region_id"
|
| 171 |
+
class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
| 172 |
+
|
| 173 |
+
<div class="input-box">
|
| 174 |
+
<select id="region_id" name="region_id"
|
| 175 |
+
title="<?php echo $this->__('State/Province') ?>" class="validate-select"
|
| 176 |
+
style="display:none;">
|
| 177 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
| 178 |
+
</select>
|
| 179 |
+
<script type="text/javascript">
|
| 180 |
+
//<![CDATA[
|
| 181 |
+
$('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
|
| 182 |
+
//]]>
|
| 183 |
+
</script>
|
| 184 |
+
<input type="text" id="region" name="region"
|
| 185 |
+
value="<?php echo $this->escapeHtml($this->getRegion()) ?>"
|
| 186 |
+
title="<?php echo $this->__('State/Province') ?>"
|
| 187 |
+
class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>"
|
| 188 |
+
style="display:none;"/>
|
| 189 |
+
</div>
|
| 190 |
+
</div>
|
| 191 |
+
</li>
|
| 192 |
+
<li class="fields">
|
| 193 |
+
<div class="field">
|
| 194 |
+
<label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?>
|
| 195 |
+
</label>
|
| 196 |
+
|
| 197 |
+
<div class="input-box">
|
| 198 |
+
<input type="text" name="postcode"
|
| 199 |
+
value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>"
|
| 200 |
+
title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip"
|
| 201 |
+
class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>"/>
|
| 202 |
+
</div>
|
| 203 |
+
</div>
|
| 204 |
+
<div class="field">
|
| 205 |
+
<label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?>
|
| 206 |
+
</label>
|
| 207 |
+
|
| 208 |
+
<div class="input-box">
|
| 209 |
+
<?php echo $this->getCountryHtmlSelect() ?>
|
| 210 |
+
</div>
|
| 211 |
+
</div>
|
| 212 |
+
</li>
|
| 213 |
+
</ul>
|
| 214 |
+
<input type="hidden" name="default_billing" value="1"/>
|
| 215 |
+
<input type="hidden" name="default_shipping" value="1"/>
|
| 216 |
+
|
| 217 |
+
<?php endif; ?>
|
| 218 |
+
|
| 219 |
+
<h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
|
| 220 |
+
<ul class="form-list">
|
| 221 |
+
<li class="fields">
|
| 222 |
+
<div class="field">
|
| 223 |
+
<label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?>
|
| 224 |
+
</label>
|
| 225 |
+
|
| 226 |
+
<div class="input-box">
|
| 227 |
+
<input type="password" name="password" id="password"
|
| 228 |
+
title="<?php echo $this->__('Password') ?>"
|
| 229 |
+
class="input-text required-entry validate-password"/>
|
| 230 |
+
</div>
|
| 231 |
+
</div>
|
| 232 |
+
<div class="field">
|
| 233 |
+
<label for="confirmation"
|
| 234 |
+
class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
|
| 235 |
+
|
| 236 |
+
<div class="input-box">
|
| 237 |
+
<input type="password" name="confirmation"
|
| 238 |
+
title="<?php echo $this->__('Confirm Password') ?>" id="confirmation"
|
| 239 |
+
class="input-text required-entry validate-cpassword"/>
|
| 240 |
+
</div>
|
| 241 |
+
</div>
|
| 242 |
+
</li>
|
| 243 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 244 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 245 |
+
</ul>
|
| 246 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 247 |
+
|
| 248 |
+
<div class="buttons-set">
|
| 249 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 250 |
+
|
| 251 |
+
<button type="submit" title="<?php echo $this->__('Submit') ?>" class="button">
|
| 252 |
+
<span><span><?php echo $this->__('Submit') ?></span></span></button>
|
| 253 |
+
</div>
|
| 254 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 255 |
+
<input name="context" type="hidden" value="checkout"/>
|
| 256 |
+
<?php endif; ?>
|
| 257 |
+
</form>
|
| 258 |
+
<script type="text/javascript">
|
| 259 |
+
//<![CDATA[
|
| 260 |
+
var dataForm = new VarienForm('form-validate', true);
|
| 261 |
+
<?php if ($this->getShowAddressFields()): ?>
|
| 262 |
+
new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
|
| 263 |
+
<?php endif; ?>
|
| 264 |
+
//]]>
|
| 265 |
+
</script>
|
| 266 |
+
|
| 267 |
+
</div>
|
| 268 |
+
|
| 269 |
+
</div>
|
| 270 |
+
|
| 271 |
+
</div>
|
app/design/frontend/ultimo/default/template/pslogin/checkout/onepage/login.phtml
ADDED
|
@@ -0,0 +1,173 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Customer onepage checkout login form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/checkout/onepage/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Checkout_Block_Onepage_Login */
|
| 34 |
+
?>
|
| 35 |
+
<div class="">
|
| 36 |
+
<?php echo $this->getChildHtml('login_before')?>
|
| 37 |
+
<div class="grid12-6">
|
| 38 |
+
<h3><?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?><?php echo $this->__('Checkout as a Guest or Register') ?><?php else: ?><?php echo $this->__('Register to Create an Account') ?><?php endif; ?></h3>
|
| 39 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 40 |
+
<p><?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 41 |
+
<?php else: ?>
|
| 42 |
+
<p><strong><?php echo $this->__('Register and save time!') ?></strong><br />
|
| 43 |
+
<?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 44 |
+
<ul>
|
| 45 |
+
<li><?php echo $this->__('Fast and easy check out') ?></li>
|
| 46 |
+
<li><?php echo $this->__('Easy access to your order history and status') ?></li>
|
| 47 |
+
</ul>
|
| 48 |
+
<?php endif; ?>
|
| 49 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 50 |
+
<ul class="form-list">
|
| 51 |
+
<?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
|
| 52 |
+
<li class="control">
|
| 53 |
+
<input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo $this->__('Checkout as Guest') ?></label>
|
| 54 |
+
</li>
|
| 55 |
+
<?php endif; ?>
|
| 56 |
+
<li class="control">
|
| 57 |
+
<input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==Mage_Checkout_Model_Type_Onepage::METHOD_REGISTER || !$this->getQuote()->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo $this->__('Register') ?></label>
|
| 58 |
+
</li>
|
| 59 |
+
</ul>
|
| 60 |
+
<h4><?php echo $this->__('Register and save time!') ?></h4>
|
| 61 |
+
<p><?php echo $this->__('Register with us for future convenience:') ?></p>
|
| 62 |
+
<ul class="ul">
|
| 63 |
+
<li><?php echo $this->__('Fast and easy check out') ?></li>
|
| 64 |
+
<li><?php echo $this->__('Easy access to your order history and status') ?></li>
|
| 65 |
+
</ul>
|
| 66 |
+
<?php else: ?>
|
| 67 |
+
<input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
|
| 68 |
+
<?php endif; ?>
|
| 69 |
+
|
| 70 |
+
<div class="buttons-set">
|
| 71 |
+
<p class="required"> </p>
|
| 72 |
+
<?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
|
| 73 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
|
| 74 |
+
<?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
|
| 75 |
+
<button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo $this->__('Register') ?></span></span></button>
|
| 76 |
+
<?php else: ?>
|
| 77 |
+
<form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
|
| 78 |
+
<button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
|
| 79 |
+
</form>
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
</div>
|
| 82 |
+
|
| 83 |
+
</div>
|
| 84 |
+
<div class="grid12-6">
|
| 85 |
+
<h3><?php echo $this->__('Login') ?></h3>
|
| 86 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 87 |
+
<form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
|
| 88 |
+
<fieldset>
|
| 89 |
+
<?php echo $this->getBlockHtml('formkey'); ?>
|
| 90 |
+
<h4><?php echo $this->__('Already registered?') ?></h4>
|
| 91 |
+
<p><?php echo $this->__('Please log in below:') ?></p>
|
| 92 |
+
<ul class="form-list">
|
| 93 |
+
<li>
|
| 94 |
+
<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 95 |
+
<div class="input-box">
|
| 96 |
+
<input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
|
| 97 |
+
</div>
|
| 98 |
+
</li>
|
| 99 |
+
<li>
|
| 100 |
+
<label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 101 |
+
<div class="input-box">
|
| 102 |
+
<input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
|
| 103 |
+
</div>
|
| 104 |
+
</li>
|
| 105 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 106 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 107 |
+
</ul>
|
| 108 |
+
<input name="context" type="hidden" value="checkout" />
|
| 109 |
+
</fieldset>
|
| 110 |
+
</form>
|
| 111 |
+
|
| 112 |
+
<div class="buttons-set">
|
| 113 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 114 |
+
<a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo $this->__('Forgot your password?') ?></a>
|
| 115 |
+
<button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 116 |
+
</div>
|
| 117 |
+
|
| 118 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 119 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 120 |
+
<table>
|
| 121 |
+
<tr>
|
| 122 |
+
<td><div class="pslogin-border"></div></td>
|
| 123 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 124 |
+
<td><div class="pslogin-border"></div></td>
|
| 125 |
+
</tr>
|
| 126 |
+
</table>
|
| 127 |
+
</div>
|
| 128 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 129 |
+
<?php endif; ?>
|
| 130 |
+
</div>
|
| 131 |
+
</div>
|
| 132 |
+
<div class="col2-set">
|
| 133 |
+
<div class="col-1">
|
| 134 |
+
|
| 135 |
+
</div>
|
| 136 |
+
<div class="col-2">
|
| 137 |
+
|
| 138 |
+
</div>
|
| 139 |
+
</div>
|
| 140 |
+
<script type="text/javascript">
|
| 141 |
+
//<![CDATA[
|
| 142 |
+
var loginForm = new VarienForm('login-form', true);
|
| 143 |
+
$('login-email').observe('keypress', bindLoginPost);
|
| 144 |
+
$('login-password').observe('keypress', bindLoginPost);
|
| 145 |
+
function bindLoginPost(evt){
|
| 146 |
+
if (evt.keyCode == Event.KEY_RETURN) {
|
| 147 |
+
loginForm.submit();
|
| 148 |
+
}
|
| 149 |
+
}
|
| 150 |
+
function onepageLogin(button)
|
| 151 |
+
{
|
| 152 |
+
if(loginForm.validator && loginForm.validator.validate()){
|
| 153 |
+
button.disabled = true;
|
| 154 |
+
loginForm.submit();
|
| 155 |
+
}
|
| 156 |
+
}
|
| 157 |
+
//]]>
|
| 158 |
+
</script>
|
| 159 |
+
<?php
|
| 160 |
+
$registerParam = $this->getRequest()->getParam('register');
|
| 161 |
+
if ($registerParam || $registerParam === ''):
|
| 162 |
+
?>
|
| 163 |
+
<script type="text/javascript">
|
| 164 |
+
//<![CDATA[
|
| 165 |
+
document.observe("dom:loaded", function() {
|
| 166 |
+
if($('login:register')) {
|
| 167 |
+
$('login:register').checked = true;
|
| 168 |
+
checkout.setMethod();
|
| 169 |
+
}
|
| 170 |
+
})
|
| 171 |
+
//]]>
|
| 172 |
+
</script>
|
| 173 |
+
<?php endif; ?>
|
app/design/frontend/ultimo/default/template/pslogin/customer/form/login.phtml
ADDED
|
@@ -0,0 +1,100 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Customer login form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/customer/form/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Login */
|
| 34 |
+
?>
|
| 35 |
+
<div class="account-login clearer">
|
| 36 |
+
<div class="page-title">
|
| 37 |
+
<h1><?php echo $this->__('Login or Create an Account') ?></h1>
|
| 38 |
+
</div>
|
| 39 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 40 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
|
| 41 |
+
<?php echo $this->getBlockHtml('formkey'); ?>
|
| 42 |
+
<div class="new-users grid12-6">
|
| 43 |
+
<div class="content">
|
| 44 |
+
<h2><?php echo $this->__('New Customers') ?></h2>
|
| 45 |
+
<p><?php echo $this->__('By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.') ?></p>
|
| 46 |
+
</div>
|
| 47 |
+
<div class="buttons-set">
|
| 48 |
+
<button type="button" title="<?php echo $this->__('Create an Account') ?>" class="button" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
|
| 49 |
+
</div>
|
| 50 |
+
</div>
|
| 51 |
+
<div class="registered-users grid12-6">
|
| 52 |
+
<div class="content">
|
| 53 |
+
<h2><?php echo $this->__('Registered Customers') ?></h2>
|
| 54 |
+
<p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
|
| 55 |
+
<ul class="form-list">
|
| 56 |
+
<li>
|
| 57 |
+
<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 58 |
+
<div class="input-box">
|
| 59 |
+
<input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
|
| 60 |
+
</div>
|
| 61 |
+
</li>
|
| 62 |
+
<li>
|
| 63 |
+
<label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 64 |
+
<div class="input-box">
|
| 65 |
+
<input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
|
| 66 |
+
</div>
|
| 67 |
+
</li>
|
| 68 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 69 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 70 |
+
</ul>
|
| 71 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 72 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 73 |
+
</div>
|
| 74 |
+
<div class="buttons-set">
|
| 75 |
+
<a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
|
| 76 |
+
<button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 77 |
+
</div>
|
| 78 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 79 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 80 |
+
<table>
|
| 81 |
+
<tr>
|
| 82 |
+
<td><div class="pslogin-border"></div></td>
|
| 83 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 84 |
+
<td><div class="pslogin-border"></div></td>
|
| 85 |
+
</tr>
|
| 86 |
+
</table>
|
| 87 |
+
</div>
|
| 88 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 89 |
+
<?php endif; ?>
|
| 90 |
+
</div>
|
| 91 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 92 |
+
<input name="context" type="hidden" value="checkout" />
|
| 93 |
+
<?php endif; ?>
|
| 94 |
+
</form>
|
| 95 |
+
<script type="text/javascript">
|
| 96 |
+
//<![CDATA[
|
| 97 |
+
var dataForm = new VarienForm('login-form', true);
|
| 98 |
+
//]]>
|
| 99 |
+
</script>
|
| 100 |
+
</div>
|
app/design/frontend/ultimo/default/template/pslogin/customer/form/register.phtml
ADDED
|
@@ -0,0 +1,204 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package base_default
|
| 23 |
+
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* Create account form template
|
| 30 |
+
*
|
| 31 |
+
* @see app/design/frontend/base/default/template/customer/form/register.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Register */
|
| 34 |
+
?>
|
| 35 |
+
<div class="account-create">
|
| 36 |
+
<div class="page-title">
|
| 37 |
+
<h1><?php echo $this->__('Create an Account') ?></h1>
|
| 38 |
+
</div>
|
| 39 |
+
<?php echo $this->getChildHtml('form_fields_before')?>
|
| 40 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 41 |
+
<?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
|
| 42 |
+
<?php echo $this->getChildHtml('pslogin_buttons'); ?>
|
| 43 |
+
<div class="pslogin-spacer pslogin-clearfix">
|
| 44 |
+
<table>
|
| 45 |
+
<tr>
|
| 46 |
+
<td><div class="pslogin-border"></div></td>
|
| 47 |
+
<td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
|
| 48 |
+
<td><div class="pslogin-border"></div></td>
|
| 49 |
+
</tr>
|
| 50 |
+
</table>
|
| 51 |
+
</div>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
|
| 54 |
+
<div class="fieldset">
|
| 55 |
+
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 56 |
+
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 57 |
+
<h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
|
| 58 |
+
<ul class="form-list">
|
| 59 |
+
<li class="fields">
|
| 60 |
+
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
|
| 61 |
+
</li>
|
| 62 |
+
<li>
|
| 63 |
+
<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
|
| 64 |
+
<div class="input-box">
|
| 65 |
+
<input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
|
| 66 |
+
</div>
|
| 67 |
+
</li>
|
| 68 |
+
<?php if ($this->isNewsletterEnabled()): ?>
|
| 69 |
+
<li class="control">
|
| 70 |
+
<div class="input-box">
|
| 71 |
+
<input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
|
| 72 |
+
</div>
|
| 73 |
+
<label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
|
| 74 |
+
</li>
|
| 75 |
+
<?php endif ?>
|
| 76 |
+
<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
|
| 77 |
+
<?php if ($_dob->isEnabled()): ?>
|
| 78 |
+
<li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
|
| 79 |
+
<?php endif ?>
|
| 80 |
+
<?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
|
| 81 |
+
<?php if ($_taxvat->isEnabled()): ?>
|
| 82 |
+
<li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
|
| 83 |
+
<?php endif ?>
|
| 84 |
+
<?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
|
| 85 |
+
<?php if ($_gender->isEnabled()): ?>
|
| 86 |
+
<li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
|
| 87 |
+
<?php endif ?>
|
| 88 |
+
</ul>
|
| 89 |
+
</div>
|
| 90 |
+
<?php if($this->getShowAddressFields()): ?>
|
| 91 |
+
<div class="fieldset">
|
| 92 |
+
<input type="hidden" name="create_address" value="1" />
|
| 93 |
+
<h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
|
| 94 |
+
<ul class="form-list">
|
| 95 |
+
<li class="fields">
|
| 96 |
+
<div class="field">
|
| 97 |
+
<label for="company"><?php echo $this->__('Company') ?></label>
|
| 98 |
+
<div class="input-box">
|
| 99 |
+
<input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
|
| 100 |
+
</div>
|
| 101 |
+
</div>
|
| 102 |
+
<div class="field">
|
| 103 |
+
<label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
|
| 104 |
+
<div class="input-box">
|
| 105 |
+
<input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
|
| 106 |
+
</div>
|
| 107 |
+
</div>
|
| 108 |
+
</li>
|
| 109 |
+
<?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
|
| 110 |
+
<li class="wide">
|
| 111 |
+
<label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
|
| 112 |
+
<div class="input-box">
|
| 113 |
+
<input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
|
| 114 |
+
</div>
|
| 115 |
+
</li>
|
| 116 |
+
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
|
| 117 |
+
<?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
|
| 118 |
+
<li class="wide">
|
| 119 |
+
<div class="input-box">
|
| 120 |
+
<input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
|
| 121 |
+
</div>
|
| 122 |
+
</li>
|
| 123 |
+
<?php endfor; ?>
|
| 124 |
+
<li class="fields">
|
| 125 |
+
<div class="field">
|
| 126 |
+
<label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
|
| 127 |
+
<div class="input-box">
|
| 128 |
+
<input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
|
| 129 |
+
</div>
|
| 130 |
+
</div>
|
| 131 |
+
<div class="field">
|
| 132 |
+
<label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
|
| 133 |
+
<div class="input-box">
|
| 134 |
+
<select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
|
| 135 |
+
<option value=""><?php echo $this->__('Please select region, state or province') ?></option>
|
| 136 |
+
</select>
|
| 137 |
+
<script type="text/javascript">
|
| 138 |
+
//<![CDATA[
|
| 139 |
+
$('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
|
| 140 |
+
//]]>
|
| 141 |
+
</script>
|
| 142 |
+
<input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
|
| 143 |
+
</div>
|
| 144 |
+
</div>
|
| 145 |
+
</li>
|
| 146 |
+
<li class="fields">
|
| 147 |
+
<div class="field">
|
| 148 |
+
<label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
|
| 149 |
+
<div class="input-box">
|
| 150 |
+
<input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
|
| 151 |
+
</div>
|
| 152 |
+
</div>
|
| 153 |
+
<div class="field">
|
| 154 |
+
<label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
|
| 155 |
+
<div class="input-box">
|
| 156 |
+
<?php echo $this->getCountryHtmlSelect() ?>
|
| 157 |
+
</div>
|
| 158 |
+
</div>
|
| 159 |
+
</li>
|
| 160 |
+
</ul>
|
| 161 |
+
<input type="hidden" name="default_billing" value="1" />
|
| 162 |
+
<input type="hidden" name="default_shipping" value="1" />
|
| 163 |
+
</div>
|
| 164 |
+
<?php endif; ?>
|
| 165 |
+
<div class="fieldset">
|
| 166 |
+
<h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
|
| 167 |
+
<ul class="form-list">
|
| 168 |
+
<li class="fields">
|
| 169 |
+
<div class="field">
|
| 170 |
+
<label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
|
| 171 |
+
<div class="input-box">
|
| 172 |
+
<input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
|
| 173 |
+
</div>
|
| 174 |
+
</div>
|
| 175 |
+
<div class="field">
|
| 176 |
+
<label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
|
| 177 |
+
<div class="input-box">
|
| 178 |
+
<input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
|
| 179 |
+
</div>
|
| 180 |
+
</div>
|
| 181 |
+
</li>
|
| 182 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 183 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 184 |
+
</ul>
|
| 185 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 186 |
+
</div>
|
| 187 |
+
<div class="buttons-set">
|
| 188 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 189 |
+
<p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo $this->__('Back') ?></a></p>
|
| 190 |
+
<button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
|
| 191 |
+
</div>
|
| 192 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 193 |
+
<input name="context" type="hidden" value="checkout" />
|
| 194 |
+
<?php endif; ?>
|
| 195 |
+
</form>
|
| 196 |
+
<script type="text/javascript">
|
| 197 |
+
//<![CDATA[
|
| 198 |
+
var dataForm = new VarienForm('form-validate', true);
|
| 199 |
+
<?php if($this->getShowAddressFields()): ?>
|
| 200 |
+
new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
|
| 201 |
+
<?php endif; ?>
|
| 202 |
+
//]]>
|
| 203 |
+
</script>
|
| 204 |
+
</div>
|
app/etc/modules/Plumrocket_SocialLogin.xml
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
<Plumrocket_SocialLogin>
|
| 5 |
<active>true</active>
|
| 6 |
<codePool>community</codePool>
|
| 7 |
-
<version>1.0
|
| 8 |
<name>Twitter & Facebook Login</name>
|
| 9 |
<wiki>http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Extension</wiki>
|
| 10 |
<depends>
|
| 4 |
<Plumrocket_SocialLogin>
|
| 5 |
<active>true</active>
|
| 6 |
<codePool>community</codePool>
|
| 7 |
+
<version>1.1.0</version>
|
| 8 |
<name>Twitter & Facebook Login</name>
|
| 9 |
<wiki>http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Extension</wiki>
|
| 10 |
<depends>
|
package.xml
CHANGED
|
@@ -1,18 +1,25 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Plumrocket_Twitter_Facebook_Login</name>
|
| 4 |
-
<version>1.0
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Plumrocket Twitter & Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Offering facebook login or twitter login as registration options is a proven tool to increase the number of clients.</summary>
|
| 10 |
<description>Plumrocket Twitter & Facebook Login is a free magento extension that will let online store owners benefit from all the social media advantages. It helps to increase conversion rates by allowing your customers quickly login and place order.</description>
|
| 11 |
-
<notes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
|
| 13 |
-
<date>2014-12-
|
| 14 |
-
<time>09:
|
| 15 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min></min><max></max></package></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Plumrocket_Twitter_Facebook_Login</name>
|
| 4 |
+
<version>1.1.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Plumrocket Twitter & Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Offering facebook login or twitter login as registration options is a proven tool to increase the number of clients.</summary>
|
| 10 |
<description>Plumrocket Twitter & Facebook Login is a free magento extension that will let online store owners benefit from all the social media advantages. It helps to increase conversion rates by allowing your customers quickly login and place order.</description>
|
| 11 |
+
<notes>- Added built-in support of world's best selling Magento themes: Ultimo, Shopper, Fortis, Acumen
|
| 12 |
+
- Added "Callback URL" auto-generation for each social network, to help admin while creating application
|
| 13 |
+
- Modified Twitter and Facebook login buttons display logic
|
| 14 |
+
- Modified commands for adding social login buttons and customer photo from social network in any place of the template (more information can be found in Plumrocket Wiki)
|
| 15 |
+
- Added integration with Plumrocket Popup Login Magento Extension
|
| 16 |
+
- Fixed bug with displaying incorrect date of customer registration in Magento backend 
|
| 17 |
+
- Fixed bug with impossibility to login if “Require Emails Confirmation” option was not enabled in the backend. Now after registration user's default status is changed to be "Confirmed"
|
| 18 |
+
- Fixed bug with closing Facebook popup</notes>
|
| 19 |
<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
|
| 20 |
+
<date>2014-12-17</date>
|
| 21 |
+
<time>09:59:10</time>
|
| 22 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="8d0aba1bff8a9cd4a9792ef304389a2c"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="a00c67b87ad5e229d7a7d9b79b440365"/><file name="General.php" hash="0e739c18475699241fd08b0084026537"/><dir name="Page"><dir name="Html"><file name="Welcome.php" hash="af7adad8c6c05dc6b51eb40e7d345519"/></dir></dir><file name="Share.php" hash="8447182219873dee7caaf620950157e4"/><dir name="System"><dir name="Config"><file name="Callbackurl.php" hash="063915780877908f3eab496826812a51"/><file name="Comingsoon.php" hash="dd6c106da378297ab6dd6724fe014281"/><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="2ae8f2236270e459223e10a84e123e07"/><file name="Version.php" hash="335b5d09fe18e3e2a83869ef15a43e87"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="c70b487fb14e65865ec6ce1d85396fe4"/></dir><dir name="Model"><file name="Account.php" hash="2d07eb6281c4fd125716200dba63369f"/><file name="Facebook.php" hash="fb55c26c8a6d0506b7b68f3a3696000a"/><dir name="Mysql4"><dir name="Account"><file name="Collection.php" hash="ca4211392ef934ce33391408092a9737"/></dir><file name="Account.php" hash="3fd0a1c891d31577d873247e17ce01ce"/></dir><file name="Observer.php" hash="2becd4a67561bd4924e7c189783dca89"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Redirectto.php" hash="c2bcb34b36ae88ce3bfdfe242463ba9a"/><file name="Shareurl.php" hash="a28729927bf70baa36ebade8e3919d3b"/></dir></dir></dir><file name="Twitter.php" hash="29fe872e9e0055915c51b1331840b7c4"/></dir><dir name="controllers"><file name="AccountController.php" hash="5166f4d888e396ce2ded17e76ab4a92f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="ab5661fbc5908c0f47d377c80e857e91"/><file name="system.xml" hash="3668cf501606c10755c3a61d3cb42ebd"/></dir><dir name="sql"><dir name="pslogin_setup"><file name="install-1.0.0.php" hash="553fa30329657c4ae11cd85e8abd9784"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="7f6dface7e33a1e667a568deb5aea0ec"/></dir><dir name="template"><dir name="pslogin"><dir name="system"><dir name="config"><file name="sortable.phtml" hash="398697865280d2f7d516645d62b1569d"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="07ece1d1a1af6c9a1cef49d8222b7551"/></dir><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="562672a22d4f81e06938ca325a108596"/><dir name="message"><file name="fake_email.phtml" hash="4df9c4f220333606f758d730b9246942"/></dir></dir></dir><dir name="customer"><dir name="form"><dir name="edit"><file name="fake_email.phtml" hash="28e38c06e2d833ff469e2c50f89d922c"/></dir><dir name="login"><file name="buttons.phtml" hash="6c04ee4efa2f2d60ce2b5a9028022fe1"/></dir><file name="login.phtml" hash="8d95198607fdc776865eb0647d7743cd"/><dir name="register"><file name="buttons.phtml" hash="12dc2dbb351526c93ef83ceca6610531"/><file name="sharedata.phtml" hash="21e3d413a95289b676033f6ca254f018"/><file name="sharepopup.phtml" hash="834dd13f11319f5fc58931463fdbd4f0"/></dir><file name="register.phtml" hash="d914b51eae8a9bd78434db2405f09494"/></dir></dir><dir name="page"><dir name="html"><file name="welcome.phtml" hash="de89796d6555f732aaad8099c012d3bb"/></dir></dir></dir></dir></dir></dir><dir name="fortis"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="eab5eda2fa564092fa49b2bf587d0f97"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="249520a604a0220b6646506ebe573011"/><file name="register.phtml" hash="0cdc7384765164c7bff706c26807b76e"/></dir></dir></dir></dir></dir></dir><dir name="gravdept"><dir name="acumen"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="bc101f24339c14b985c8ab7db8ae4fac"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="bde5923d16bf48ca0aeb5a824ea6bbff"/><file name="register.phtml" hash="8700cdff2dc11a6dfa362f7aabf7d734"/></dir></dir></dir></dir></dir></dir><dir name="shopper"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="f997943ede058c7a674829c018fd5bb2"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="072d3a2449ca53d90153719ac01c8aae"/><file name="register.phtml" hash="43f21dc78b4881f46cb3cb933352fabc"/></dir></dir></dir></dir></dir></dir><dir name="ultimo"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="b32e87c2acc4789ebf81787a638bde04"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="cf337e019cbe443f9d1cd0dbe3a145ad"/><file name="register.phtml" hash="0cdc7384765164c7bff706c26807b76e"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_SocialLogin.csv" hash="7572e6085fbc927180c11c7fcb060389"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.css" hash="d6c959ea74e9b257a203e87dfd69face"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="0336b50ca3be7e204af952546ba625d5"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="config.js" hash="a2c074dcd3c228afc2f144b8de8103c8"/><file name="jquery-1.10.2.min.js" hash="0b211fb723c7e6cfa4da5ca4ee10a836"/><file name="jquery-ui.min.js" hash="a0e434a17ebc022fb565e08fd446baef"/><file name="pslogin.js" hash="b98e9d35db6b4e9b7b6ec2fa8439354b"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="pslogin.css" hash="0821a912e35a9da4fbac419ff8eda2dc"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="eddfee6ad694168cdf6ead5ed8a4c8ea"/><file name="social_retina.png" hash="4a4667f94669b66355c869a1381e9ab7"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="jquery-1.10.2.min.js" hash="0b211fb723c7e6cfa4da5ca4ee10a836"/><file name="pslogin.js" hash="ccf6d6550f8fa6886ba9322547ee04a7"/></dir></dir></dir></dir></dir><dir name="shopper"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="e61e9c6fe325061ba02a8217f85c45cf"/></dir></dir></dir></dir></dir></dir></target></contents>
|
| 23 |
<compatible/>
|
| 24 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min></min><max></max></package></required></dependencies>
|
| 25 |
</package>
|
skin/adminhtml/default/default/css/plumrocket/pslogin/pslogin.css
CHANGED
|
@@ -112,7 +112,7 @@
|
|
| 112 |
.pslogin-form ul li.hotmail .soc-li-icon { background-color: #f67d20; }
|
| 113 |
.pslogin-form ul li.hotmail .soc-li-icon { background-position: 0px -16px; }
|
| 114 |
|
| 115 |
-
.pslogin-form ul li.live .soc-li-icon { background-color: #
|
| 116 |
.pslogin-form ul li.live .soc-li-icon { background-position: -17px -102px; }
|
| 117 |
|
| 118 |
.pslogin-form ul li.pinterest .soc-li-icon { background-color: #cb2028; }
|
|
@@ -124,7 +124,7 @@
|
|
| 124 |
.pslogin-form ul li.aol .soc-li-icon { background-color: #008bd3; }
|
| 125 |
.pslogin-form ul li.aol .soc-li-icon { background-position: -51px -17px; }
|
| 126 |
|
| 127 |
-
.pslogin-form ul li.github .soc-li-icon { background-color:
|
| 128 |
.pslogin-form ul li.github .soc-li-icon { background-position: -68px -17px; }
|
| 129 |
|
| 130 |
.pslogin-form ul li.instagram .soc-li-icon { background-color: #9a6e51; }
|
|
@@ -181,8 +181,8 @@
|
|
| 181 |
.pslogin-form ul li.hyves .soc-li-icon { background-color: #ffca63; }
|
| 182 |
.pslogin-form ul li.hyves .soc-li-icon { background-position: -17px -69px; }
|
| 183 |
|
| 184 |
-
.pslogin-form ul li.
|
| 185 |
-
.pslogin-form ul li.
|
| 186 |
|
| 187 |
.pslogin-form ul li.evernote .soc-li-icon { background-color: #7ac141; }
|
| 188 |
.pslogin-form ul li.evernote .soc-li-icon { background-position: -51px -69px; }
|
|
@@ -221,6 +221,31 @@
|
|
| 221 |
.pslogin-form ul li.orange .soc-li-icon { background-position: -0px -102px; }
|
| 222 |
|
| 223 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 224 |
.entry-edit-head.pslogin-notinstalled-section {
|
| 225 |
background: #BDBDBD;
|
| 226 |
}
|
| 112 |
.pslogin-form ul li.hotmail .soc-li-icon { background-color: #f67d20; }
|
| 113 |
.pslogin-form ul li.hotmail .soc-li-icon { background-position: 0px -16px; }
|
| 114 |
|
| 115 |
+
.pslogin-form ul li.live .soc-li-icon { background-color: #0cb3ee; }
|
| 116 |
.pslogin-form ul li.live .soc-li-icon { background-position: -17px -102px; }
|
| 117 |
|
| 118 |
.pslogin-form ul li.pinterest .soc-li-icon { background-color: #cb2028; }
|
| 124 |
.pslogin-form ul li.aol .soc-li-icon { background-color: #008bd3; }
|
| 125 |
.pslogin-form ul li.aol .soc-li-icon { background-position: -51px -17px; }
|
| 126 |
|
| 127 |
+
.pslogin-form ul li.github .soc-li-icon { background-color: black; }
|
| 128 |
.pslogin-form ul li.github .soc-li-icon { background-position: -68px -17px; }
|
| 129 |
|
| 130 |
.pslogin-form ul li.instagram .soc-li-icon { background-color: #9a6e51; }
|
| 181 |
.pslogin-form ul li.hyves .soc-li-icon { background-color: #ffca63; }
|
| 182 |
.pslogin-form ul li.hyves .soc-li-icon { background-position: -17px -69px; }
|
| 183 |
|
| 184 |
+
.pslogin-form ul li.stackoverflow .soc-li-icon { background-color: #f95500; }
|
| 185 |
+
.pslogin-form ul li.stackoverflow .soc-li-icon { background-position: -34px -69px; }
|
| 186 |
|
| 187 |
.pslogin-form ul li.evernote .soc-li-icon { background-color: #7ac141; }
|
| 188 |
.pslogin-form ul li.evernote .soc-li-icon { background-position: -51px -69px; }
|
| 221 |
.pslogin-form ul li.orange .soc-li-icon { background-position: -0px -102px; }
|
| 222 |
|
| 223 |
|
| 224 |
+
|
| 225 |
+
.pslogin-form ul li.bitbucket .soc-li-icon { background-color: #013567; }
|
| 226 |
+
.pslogin-form ul li.bitbucket .soc-li-icon { background-position: -33px -102px; }
|
| 227 |
+
|
| 228 |
+
.pslogin-form ul li.bitly .soc-li-icon { background-color: #ed6022; }
|
| 229 |
+
.pslogin-form ul li.bitly .soc-li-icon { background-position: -50px -102px; }
|
| 230 |
+
|
| 231 |
+
.pslogin-form ul li.boxcom .soc-li-icon { background-color: #00b9f2; }
|
| 232 |
+
.pslogin-form ul li.boxcom .soc-li-icon { background-position: -67px -102px; }
|
| 233 |
+
|
| 234 |
+
.pslogin-form ul li.vimeo .soc-li-icon { background-color: #1fb9eb; }
|
| 235 |
+
.pslogin-form ul li.vimeo .soc-li-icon { background-position: -85px -102px; }
|
| 236 |
+
|
| 237 |
+
.pslogin-form ul li.reddit .soc-li-icon { background-color: #337fb9; }
|
| 238 |
+
.pslogin-form ul li.reddit .soc-li-icon { background-position: -102px -102px; }
|
| 239 |
+
|
| 240 |
+
.pslogin-form ul li.odesc .soc-li-icon { background-color: #7ac043; }
|
| 241 |
+
.pslogin-form ul li.odesc .soc-li-icon { background-position: -1px -119px; }
|
| 242 |
+
|
| 243 |
+
.pslogin-form ul li.teamviewer .soc-li-icon { background-color: #0171b9; }
|
| 244 |
+
.pslogin-form ul li.teamviewer .soc-li-icon { background-position: -17px -119px; }
|
| 245 |
+
|
| 246 |
+
.pslogin-form ul li.skyrock .soc-li-icon { background-color: #009afe; }
|
| 247 |
+
.pslogin-form ul li.skyrock .soc-li-icon { background-position: -34px -119px; }
|
| 248 |
+
|
| 249 |
.entry-edit-head.pslogin-notinstalled-section {
|
| 250 |
background: #BDBDBD;
|
| 251 |
}
|
skin/adminhtml/default/default/images/plumrocket/pslogin/social_admin.png
CHANGED
|
Binary file
|
skin/adminhtml/default/default/js/plumrocket/{jquery-1.10.2.min.js → pslogin/jquery-1.10.2.min.js}
RENAMED
|
File without changes
|
skin/adminhtml/default/default/js/plumrocket/pslogin/pslogin.js
CHANGED
|
@@ -16,6 +16,39 @@
|
|
| 16 |
|
| 17 |
pjQuery_1_10_2(document).ready(function() {
|
| 18 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
// Set Required fields.
|
| 20 |
// pjQuery_1_10_2('').addClass('validate-alphanum');
|
| 21 |
|
|
@@ -95,4 +128,15 @@ pjQuery_1_10_2(document).ready(function() {
|
|
| 95 |
$section.find('a').append('<span class="pslogin-notinstalled-title">(Not installed)</span>');
|
| 96 |
});
|
| 97 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 98 |
});
|
| 16 |
|
| 17 |
pjQuery_1_10_2(document).ready(function() {
|
| 18 |
|
| 19 |
+
|
| 20 |
+
if(pjQuery_1_10_2('#pslogin_general_enable').size()) {
|
| 21 |
+
// Disable empty image fields.
|
| 22 |
+
if(typeof varienGlobalEvents != undefined) {
|
| 23 |
+
varienGlobalEvents.attachEventHandler('formSubmit', function() {
|
| 24 |
+
pjQuery_1_10_2('[id$=icon_btn], [id$=login_btn], [id$=register_btn]').each(function() {
|
| 25 |
+
var $input = pjQuery_1_10_2(this);
|
| 26 |
+
var canDisable = true;
|
| 27 |
+
|
| 28 |
+
// If is new value.
|
| 29 |
+
if($input.val()) {
|
| 30 |
+
canDisable = false;
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
+
// If is set value and not checked "Delete Image".
|
| 34 |
+
var isImageDelete = pjQuery_1_10_2('#'+ $input.attr('id') +'_delete');
|
| 35 |
+
if(isImageDelete.size() != false) {
|
| 36 |
+
if(isImageDelete.is(':checked')) {
|
| 37 |
+
canDisable = false;
|
| 38 |
+
}else{
|
| 39 |
+
// Remove hidden field, to avoid notice after save.
|
| 40 |
+
isImageDelete.nextAll('input[type="hidden"]').remove();
|
| 41 |
+
}
|
| 42 |
+
}
|
| 43 |
+
|
| 44 |
+
if(canDisable) {
|
| 45 |
+
$input.attr('disabled', 'disabled');
|
| 46 |
+
}
|
| 47 |
+
});
|
| 48 |
+
});
|
| 49 |
+
}
|
| 50 |
+
}
|
| 51 |
+
|
| 52 |
// Set Required fields.
|
| 53 |
// pjQuery_1_10_2('').addClass('validate-alphanum');
|
| 54 |
|
| 128 |
$section.find('a').append('<span class="pslogin-notinstalled-title">(Not installed)</span>');
|
| 129 |
});
|
| 130 |
|
| 131 |
+
// Callback URL.
|
| 132 |
+
pjQuery_1_10_2('.pslogin-callbackurl-autofocus').on('focus click', function() {
|
| 133 |
+
var $this = pjQuery_1_10_2(this);
|
| 134 |
+
// Get provider name.
|
| 135 |
+
var name = $this.parents('tr').attr('id');
|
| 136 |
+
name = name.replace('row_pslogin_', '').replace('_callbackurl', '');
|
| 137 |
+
$this.val( $this.val().replace('_PROVIDER_', name) );
|
| 138 |
+
|
| 139 |
+
$this.select();
|
| 140 |
+
})
|
| 141 |
+
|
| 142 |
});
|
skin/frontend/base/default/css/plumrocket/pslogin/pslogin-custom.css
ADDED
|
File without changes
|
skin/frontend/base/default/css/plumrocket/pslogin/pslogin.css
CHANGED
|
@@ -50,7 +50,7 @@
|
|
| 50 |
box-sizing: border-box;
|
| 51 |
-moz-box-sizing: border-box;
|
| 52 |
-webkit-box-sizing: border-box;
|
| 53 |
-
z-index:
|
| 54 |
}
|
| 55 |
|
| 56 |
.pslogin-fake-email-message .content {
|
|
@@ -64,6 +64,7 @@
|
|
| 64 |
-moz-box-shadow: 0 2px 15px 0px rgba(0, 0, 0, 0.42);
|
| 65 |
font-size: 14px;
|
| 66 |
color: #636363;
|
|
|
|
| 67 |
}
|
| 68 |
|
| 69 |
.pslogin-fake-email-message p {
|
|
@@ -151,21 +152,25 @@
|
|
| 151 |
*/
|
| 152 |
|
| 153 |
/*form*/
|
| 154 |
-
.
|
| 155 |
-
.
|
| 156 |
|
| 157 |
-
.pslogin-
|
| 158 |
margin: 0;
|
| 159 |
}
|
| 160 |
|
| 161 |
-
.pslogin-form.
|
| 162 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 163 |
width: auto;
|
| 164 |
float: none;
|
| 165 |
}
|
| 166 |
|
| 167 |
-
.pslogin-
|
| 168 |
-
#checkout-step-login .pslogin-
|
| 169 |
float: none;
|
| 170 |
}
|
| 171 |
|
|
@@ -173,24 +178,24 @@
|
|
| 173 |
box-sizing: border-box;
|
| 174 |
}
|
| 175 |
|
| 176 |
-
.pslogin-
|
| 177 |
min-height: 40px;
|
| 178 |
}
|
| 179 |
|
| 180 |
-
.pslogin-
|
| 181 |
margin: 0;
|
| 182 |
}
|
| 183 |
|
| 184 |
-
.pslogin-
|
| 185 |
padding: 0;
|
| 186 |
}
|
| 187 |
|
| 188 |
-
.pslogin-
|
| 189 |
margin: 15px 0;
|
| 190 |
}
|
| 191 |
|
| 192 |
-
.pslogin-
|
| 193 |
-
.pslogin-
|
| 194 |
height: auto;
|
| 195 |
}
|
| 196 |
|
|
@@ -241,31 +246,30 @@
|
|
| 241 |
}
|
| 242 |
|
| 243 |
/* Buttons */
|
| 244 |
-
.pslogin-
|
| 245 |
width: 100%;
|
| 246 |
-
margin: 20px 0;
|
| 247 |
}
|
| 248 |
|
| 249 |
-
.pslogin-
|
| 250 |
box-sizing: border-box;
|
| 251 |
-moz-box-sizing: border-box;
|
| 252 |
-webkit-box-sizing: border-box;
|
| 253 |
}
|
| 254 |
|
| 255 |
-
.pslogin-
|
| 256 |
-
.pslogin-form-register.text-hidden1 .soc-li-text {
|
| 257 |
display: none!important;
|
| 258 |
}
|
| 259 |
|
| 260 |
-
.pslogin-
|
| 261 |
display: none!important;
|
| 262 |
}
|
| 263 |
|
| 264 |
-
.pslogin-
|
| 265 |
display: block;
|
| 266 |
}
|
| 267 |
|
| 268 |
-
.pslogin-
|
| 269 |
visibility: hidden;
|
| 270 |
display: block;
|
| 271 |
font-size: 0;
|
|
@@ -274,13 +278,13 @@
|
|
| 274 |
height: 0;
|
| 275 |
}
|
| 276 |
|
| 277 |
-
.pslogin-
|
| 278 |
text-align: center;
|
| 279 |
margin-bottom: 10px;
|
| 280 |
font-size: 12px;
|
| 281 |
}
|
| 282 |
|
| 283 |
-
.pslogin-
|
| 284 |
display: block;
|
| 285 |
margin: 10px auto;
|
| 286 |
position: relative;
|
|
@@ -295,26 +299,26 @@
|
|
| 295 |
font-size: 13px;
|
| 296 |
}
|
| 297 |
|
| 298 |
-
.pslogin-
|
| 299 |
width: 100%;
|
| 300 |
}
|
| 301 |
|
| 302 |
-
.pslogin-
|
| 303 |
vertical-align: middle;
|
| 304 |
}
|
| 305 |
|
| 306 |
-
.pslogin-
|
| 307 |
border-top: 1px solid #e5e2e2;
|
| 308 |
width: 100%;
|
| 309 |
}
|
| 310 |
|
| 311 |
-
.pslogin-
|
| 312 |
color: #b2b2b2;
|
| 313 |
text-align: center;
|
| 314 |
font-size: 11px;
|
| 315 |
}
|
| 316 |
|
| 317 |
-
.pslogin-
|
| 318 |
height: 20px;
|
| 319 |
line-height: 17px;
|
| 320 |
padding: 0;
|
|
@@ -324,12 +328,12 @@
|
|
| 324 |
-webkit-border-radius: 9px;
|
| 325 |
}
|
| 326 |
|
| 327 |
-
.pslogin-
|
| 328 |
color: #989898;
|
| 329 |
cursor: pointer;
|
| 330 |
}
|
| 331 |
|
| 332 |
-
.pslogin-
|
| 333 |
width: 90%;
|
| 334 |
height: 25px;
|
| 335 |
line-height: 22px;
|
|
@@ -340,48 +344,47 @@
|
|
| 340 |
background-color: #eeeeee;
|
| 341 |
}
|
| 342 |
|
| 343 |
-
.pslogin-
|
| 344 |
cursor: pointer;
|
| 345 |
background-color: #FAFAFA;
|
| 346 |
}
|
| 347 |
|
| 348 |
|
| 349 |
-
.pslogin-
|
| 350 |
margin-top: 20px;
|
| 351 |
}
|
| 352 |
|
| 353 |
-
.pslogin-
|
| 354 |
display: block;
|
| 355 |
}
|
| 356 |
|
| 357 |
-
.pslogin-
|
| 358 |
display: inline-block;
|
| 359 |
}
|
| 360 |
|
| 361 |
-
.pslogin-
|
| 362 |
display: inline-block;
|
| 363 |
line-height: normal;
|
| 364 |
-
margin-bottom: 5px;
|
| 365 |
list-style: none!important;
|
| 366 |
padding: 0!important;
|
| 367 |
background: none!important;
|
| 368 |
}
|
| 369 |
|
| 370 |
-
.pslogin-
|
| 371 |
background: none!important;
|
| 372 |
}
|
| 373 |
|
| 374 |
-
.pslogin-
|
| 375 |
opacity: 0.9;
|
| 376 |
filter: alpha(opacity=90);
|
| 377 |
}
|
| 378 |
|
| 379 |
-
.pslogin-
|
| 380 |
background-color: #3399cc;
|
| 381 |
display: inline-block;
|
| 382 |
}
|
| 383 |
|
| 384 |
-
.pslogin-
|
| 385 |
background: url('../../../images/plumrocket/pslogin/social.png');
|
| 386 |
display: block;
|
| 387 |
float: left;
|
|
@@ -392,169 +395,494 @@
|
|
| 392 |
box-sizing: border-box;
|
| 393 |
}
|
| 394 |
|
| 395 |
-
.pslogin-
|
| 396 |
width: 100%;
|
| 397 |
}
|
| 398 |
|
| 399 |
-
.pslogin-
|
| 400 |
|
| 401 |
}
|
| 402 |
|
| 403 |
-
.pslogin-
|
| 404 |
-
display:
|
| 405 |
float: left;
|
| 406 |
height: 32px;
|
| 407 |
line-height: 32px;
|
| 408 |
vertical-align: top;
|
| 409 |
padding: 0;
|
| 410 |
text-align: center;
|
| 411 |
-
min-width:
|
| 412 |
box-sizing: border-box;
|
| 413 |
font-size: 11px;
|
| 414 |
color: white;
|
| 415 |
background-color: rgba(255,255,255, 0.2);
|
| 416 |
}
|
| 417 |
|
| 418 |
-
.pslogin-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 419 |
display: none;
|
| 420 |
}
|
| 421 |
|
| 422 |
-
|
| 423 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 424 |
|
| 425 |
-
.pslogin-
|
| 426 |
-
.pslogin-
|
| 427 |
|
| 428 |
-
.pslogin-
|
| 429 |
-
.pslogin-
|
| 430 |
|
| 431 |
-
.pslogin-
|
| 432 |
-
.pslogin-
|
| 433 |
|
| 434 |
-
.pslogin-
|
| 435 |
-
.pslogin-
|
| 436 |
|
| 437 |
-
.pslogin-
|
| 438 |
-
.pslogin-
|
| 439 |
|
|
|
|
|
|
|
| 440 |
|
| 441 |
-
.pslogin-
|
| 442 |
-
.pslogin-
|
| 443 |
|
| 444 |
-
.pslogin-
|
| 445 |
-
.pslogin-
|
| 446 |
|
| 447 |
-
.pslogin-
|
| 448 |
-
.pslogin-
|
| 449 |
|
| 450 |
-
.pslogin-
|
| 451 |
-
.pslogin-
|
| 452 |
|
| 453 |
-
.pslogin-
|
| 454 |
-
.pslogin-
|
| 455 |
|
| 456 |
-
.pslogin-
|
| 457 |
-
.pslogin-
|
| 458 |
|
| 459 |
-
.pslogin-
|
| 460 |
-
.pslogin-
|
| 461 |
|
| 462 |
-
.pslogin-
|
| 463 |
-
.pslogin-
|
| 464 |
|
| 465 |
-
.pslogin-
|
| 466 |
-
.pslogin-
|
| 467 |
|
| 468 |
-
.pslogin-
|
| 469 |
-
.pslogin-
|
| 470 |
|
| 471 |
-
.pslogin-
|
| 472 |
-
.pslogin-
|
| 473 |
|
| 474 |
-
.pslogin-
|
| 475 |
-
.pslogin-
|
| 476 |
|
| 477 |
-
.pslogin-
|
| 478 |
-
.pslogin-
|
| 479 |
|
| 480 |
-
.pslogin-
|
| 481 |
-
.pslogin-
|
| 482 |
|
| 483 |
-
.pslogin-
|
| 484 |
-
.pslogin-
|
| 485 |
|
| 486 |
-
.pslogin-
|
| 487 |
-
.pslogin-
|
| 488 |
|
| 489 |
-
.pslogin-
|
| 490 |
-
.pslogin-
|
| 491 |
|
| 492 |
-
.pslogin-
|
| 493 |
-
.pslogin-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 494 |
|
| 495 |
-
.pslogin-form .pslogin-buttons ul li.yandex span.background { background-color: #dd0000; }
|
| 496 |
-
.pslogin-form .pslogin-buttons ul li.yandex .soc-li-icon { background-position: -102px -103px; }
|
| 497 |
|
| 498 |
-
|
| 499 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 500 |
|
| 501 |
-
|
| 502 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 503 |
|
| 504 |
-
|
| 505 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 506 |
|
| 507 |
-
|
| 508 |
-
|
|
|
|
|
|
|
| 509 |
|
| 510 |
-
|
| 511 |
-
|
|
|
|
|
|
|
|
|
|
| 512 |
|
| 513 |
-
|
| 514 |
-
.
|
|
|
|
|
|
|
|
|
|
| 515 |
|
| 516 |
-
.
|
| 517 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 518 |
|
| 519 |
-
.
|
| 520 |
-
|
|
|
|
| 521 |
|
| 522 |
-
.
|
| 523 |
-
|
|
|
|
| 524 |
|
| 525 |
-
.pslogin-
|
| 526 |
-
|
|
|
|
|
|
|
|
|
|
| 527 |
|
| 528 |
-
|
| 529 |
-
|
|
|
|
| 530 |
|
| 531 |
-
|
| 532 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 533 |
|
| 534 |
-
|
| 535 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 536 |
|
| 537 |
-
|
| 538 |
-
|
|
|
|
| 539 |
|
| 540 |
-
|
| 541 |
-
.
|
|
|
|
|
|
|
|
|
|
| 542 |
|
| 543 |
-
.
|
| 544 |
-
|
|
|
|
| 545 |
|
| 546 |
-
.
|
| 547 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 548 |
|
| 549 |
-
.
|
| 550 |
-
|
|
|
|
| 551 |
|
|
|
|
|
|
|
|
|
|
| 552 |
|
| 553 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 554 |
|
| 555 |
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
|
| 556 |
|
| 557 |
-
.pslogin-
|
| 558 |
background: url('../../../images/plumrocket/pslogin/social_retina.png');
|
| 559 |
background-size: 236px 272px;
|
| 560 |
-webkit-background-size: 236px 272px;
|
|
@@ -565,36 +893,69 @@
|
|
| 565 |
|
| 566 |
@media screen and ( max-width: 767px ) {
|
| 567 |
|
| 568 |
-
.pslogin-
|
| 569 |
width: 100%;
|
| 570 |
}
|
| 571 |
|
| 572 |
-
.pslogin-
|
| 573 |
-
display:
|
| 574 |
}
|
| 575 |
|
| 576 |
-
.pslogin-
|
| 577 |
-
display:
|
| 578 |
}
|
| 579 |
|
| 580 |
-
.pslogin-
|
| 581 |
-
|
| 582 |
}
|
| 583 |
|
| 584 |
-
|
| 585 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 586 |
}
|
| 587 |
|
| 588 |
-
.pslogin-
|
| 589 |
-
|
|
|
|
| 590 |
}
|
| 591 |
|
| 592 |
-
|
|
|
|
| 593 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 594 |
}
|
| 595 |
|
| 596 |
}
|
| 597 |
|
|
|
|
|
|
|
|
|
|
| 598 |
/*=== animate ===*/
|
| 599 |
#pslogin-pop-up-bg {
|
| 600 |
-webkit-animation-duration: 1s;
|
| 50 |
box-sizing: border-box;
|
| 51 |
-moz-box-sizing: border-box;
|
| 52 |
-webkit-box-sizing: border-box;
|
| 53 |
+
z-index: 9999;
|
| 54 |
}
|
| 55 |
|
| 56 |
.pslogin-fake-email-message .content {
|
| 64 |
-moz-box-shadow: 0 2px 15px 0px rgba(0, 0, 0, 0.42);
|
| 65 |
font-size: 14px;
|
| 66 |
color: #636363;
|
| 67 |
+
z-index: 9999;
|
| 68 |
}
|
| 69 |
|
| 70 |
.pslogin-fake-email-message p {
|
| 152 |
*/
|
| 153 |
|
| 154 |
/*form*/
|
| 155 |
+
.w25 { width: 25px!important; }
|
| 156 |
+
.w100 { width: 100px; }
|
| 157 |
|
| 158 |
+
.pslogin-block.account-login .content {
|
| 159 |
margin: 0;
|
| 160 |
}
|
| 161 |
|
| 162 |
+
.pslogin-form .registered-users .content {
|
| 163 |
+
margin: 0!important;
|
| 164 |
+
}
|
| 165 |
+
|
| 166 |
+
.pslogin-block.account-login .form-list label,
|
| 167 |
+
#checkout-step-login .pslogin-block .form-list label {
|
| 168 |
width: auto;
|
| 169 |
float: none;
|
| 170 |
}
|
| 171 |
|
| 172 |
+
.pslogin-block.account-login .form-list .input-box,
|
| 173 |
+
#checkout-step-login .pslogin-block .form-list .input-box {
|
| 174 |
float: none;
|
| 175 |
}
|
| 176 |
|
| 178 |
box-sizing: border-box;
|
| 179 |
}
|
| 180 |
|
| 181 |
+
.pslogin-block.account-login .buttons-set {
|
| 182 |
min-height: 40px;
|
| 183 |
}
|
| 184 |
|
| 185 |
+
.pslogin-block.col2-set {
|
| 186 |
margin: 0;
|
| 187 |
}
|
| 188 |
|
| 189 |
+
.pslogin-block.col2-set .buttons-set {
|
| 190 |
padding: 0;
|
| 191 |
}
|
| 192 |
|
| 193 |
+
.pslogin-block.col2-set .fieldset {
|
| 194 |
margin: 15px 0;
|
| 195 |
}
|
| 196 |
|
| 197 |
+
.pslogin-block button.button span,
|
| 198 |
+
.pslogin-block button.button span span {
|
| 199 |
height: auto;
|
| 200 |
}
|
| 201 |
|
| 246 |
}
|
| 247 |
|
| 248 |
/* Buttons */
|
| 249 |
+
.pslogin-block {
|
| 250 |
width: 100%;
|
| 251 |
+
margin: 0 0 20px 0;
|
| 252 |
}
|
| 253 |
|
| 254 |
+
.pslogin-block * {
|
| 255 |
box-sizing: border-box;
|
| 256 |
-moz-box-sizing: border-box;
|
| 257 |
-webkit-box-sizing: border-box;
|
| 258 |
}
|
| 259 |
|
| 260 |
+
.pslogin-block.pslogin-hidden-text .pslogin-button-text {
|
|
|
|
| 261 |
display: none!important;
|
| 262 |
}
|
| 263 |
|
| 264 |
+
.pslogin-block .pslogin-xs {
|
| 265 |
display: none!important;
|
| 266 |
}
|
| 267 |
|
| 268 |
+
.pslogin-block .pslogin-button-image {
|
| 269 |
display: block;
|
| 270 |
}
|
| 271 |
|
| 272 |
+
.pslogin-block .pslogin-clearfix:after {
|
| 273 |
visibility: hidden;
|
| 274 |
display: block;
|
| 275 |
font-size: 0;
|
| 278 |
height: 0;
|
| 279 |
}
|
| 280 |
|
| 281 |
+
.pslogin-block .title {
|
| 282 |
text-align: center;
|
| 283 |
margin-bottom: 10px;
|
| 284 |
font-size: 12px;
|
| 285 |
}
|
| 286 |
|
| 287 |
+
.pslogin-spacer {
|
| 288 |
display: block;
|
| 289 |
margin: 10px auto;
|
| 290 |
position: relative;
|
| 299 |
font-size: 13px;
|
| 300 |
}
|
| 301 |
|
| 302 |
+
.pslogin-spacer table {
|
| 303 |
width: 100%;
|
| 304 |
}
|
| 305 |
|
| 306 |
+
.pslogin-spacer table td {
|
| 307 |
vertical-align: middle;
|
| 308 |
}
|
| 309 |
|
| 310 |
+
.pslogin-spacer .pslogin-border {
|
| 311 |
border-top: 1px solid #e5e2e2;
|
| 312 |
width: 100%;
|
| 313 |
}
|
| 314 |
|
| 315 |
+
.pslogin-spacer .pslogin-bordertext {
|
| 316 |
color: #b2b2b2;
|
| 317 |
text-align: center;
|
| 318 |
font-size: 11px;
|
| 319 |
}
|
| 320 |
|
| 321 |
+
.pslogin-spacer.pslogin-showmore .pslogin-bordertext {
|
| 322 |
height: 20px;
|
| 323 |
line-height: 17px;
|
| 324 |
padding: 0;
|
| 328 |
-webkit-border-radius: 9px;
|
| 329 |
}
|
| 330 |
|
| 331 |
+
.pslogin-spacer.pslogin-showmore .pslogin-bordertext:hover {
|
| 332 |
color: #989898;
|
| 333 |
cursor: pointer;
|
| 334 |
}
|
| 335 |
|
| 336 |
+
.pslogin-spacer .circle {
|
| 337 |
width: 90%;
|
| 338 |
height: 25px;
|
| 339 |
line-height: 22px;
|
| 344 |
background-color: #eeeeee;
|
| 345 |
}
|
| 346 |
|
| 347 |
+
.pslogin-spacer .circle:hover {
|
| 348 |
cursor: pointer;
|
| 349 |
background-color: #FAFAFA;
|
| 350 |
}
|
| 351 |
|
| 352 |
|
| 353 |
+
.pslogin-block .pslogin-showmore {
|
| 354 |
margin-top: 20px;
|
| 355 |
}
|
| 356 |
|
| 357 |
+
.pslogin-block.pslogin-login .pslogin-buttons {
|
| 358 |
display: block;
|
| 359 |
}
|
| 360 |
|
| 361 |
+
.pslogin-block.pslogin-register .pslogin-buttons {
|
| 362 |
display: inline-block;
|
| 363 |
}
|
| 364 |
|
| 365 |
+
.pslogin-block .pslogin-buttons ul li {
|
| 366 |
display: inline-block;
|
| 367 |
line-height: normal;
|
|
|
|
| 368 |
list-style: none!important;
|
| 369 |
padding: 0!important;
|
| 370 |
background: none!important;
|
| 371 |
}
|
| 372 |
|
| 373 |
+
.pslogin-block .pslogin-buttons ul li.show-button-image {
|
| 374 |
background: none!important;
|
| 375 |
}
|
| 376 |
|
| 377 |
+
.pslogin-block .pslogin-buttons ul li:hover {
|
| 378 |
opacity: 0.9;
|
| 379 |
filter: alpha(opacity=90);
|
| 380 |
}
|
| 381 |
|
| 382 |
+
.pslogin-block .pslogin-buttons ul li span.pslogin-button-auto {
|
| 383 |
background-color: #3399cc;
|
| 384 |
display: inline-block;
|
| 385 |
}
|
| 386 |
|
| 387 |
+
.pslogin-block .pslogin-buttons ul li .pslogin-button-icon {
|
| 388 |
background: url('../../../images/plumrocket/pslogin/social.png');
|
| 389 |
display: block;
|
| 390 |
float: left;
|
| 395 |
box-sizing: border-box;
|
| 396 |
}
|
| 397 |
|
| 398 |
+
.pslogin-block .pslogin-buttons ul li .pslogin-button-icon img {
|
| 399 |
width: 100%;
|
| 400 |
}
|
| 401 |
|
| 402 |
+
.pslogin-block .pslogin-buttons ul li a>img {
|
| 403 |
|
| 404 |
}
|
| 405 |
|
| 406 |
+
.pslogin-block .pslogin-buttons ul li .pslogin-button-text {
|
| 407 |
+
display: none;
|
| 408 |
float: left;
|
| 409 |
height: 32px;
|
| 410 |
line-height: 32px;
|
| 411 |
vertical-align: top;
|
| 412 |
padding: 0;
|
| 413 |
text-align: center;
|
| 414 |
+
min-width: 144px;
|
| 415 |
box-sizing: border-box;
|
| 416 |
font-size: 11px;
|
| 417 |
color: white;
|
| 418 |
background-color: rgba(255,255,255, 0.2);
|
| 419 |
}
|
| 420 |
|
| 421 |
+
.pslogin-block .pslogin-buttons.pslogin-buttons-showfull .pslogin-button-auto .pslogin-button-text {
|
| 422 |
+
display: inline-block;
|
| 423 |
+
}
|
| 424 |
+
|
| 425 |
+
.pslogin-block .pslogin-buttons .pslogin-button-image {
|
| 426 |
+
display: none;
|
| 427 |
+
}
|
| 428 |
+
|
| 429 |
+
.pslogin-block .pslogin-buttons.pslogin-buttons-showfull .pslogin-button-image {
|
| 430 |
+
display: inline-block;
|
| 431 |
+
}
|
| 432 |
+
|
| 433 |
+
.pslogin-block .pslogin-buttons .pslogin-button-icon-image {
|
| 434 |
+
display: inline-block;
|
| 435 |
+
}
|
| 436 |
+
|
| 437 |
+
.pslogin-block .pslogin-buttons.pslogin-buttons-showfull .pslogin-button-icon-image {
|
| 438 |
+
display: none;
|
| 439 |
+
}
|
| 440 |
+
|
| 441 |
+
.pslogin-block .pslogin-buttons.pslogin-buttons-showfull .pslogin-button-auto.pslogin-has-button-image {
|
| 442 |
display: none;
|
| 443 |
}
|
| 444 |
|
| 445 |
+
.pslogin-block .pslogin-buttons.pslogin-buttons-showfull .pslogin-button-auto.pslogin-has-button-icon-image {
|
| 446 |
+
display: inline-block;
|
| 447 |
+
}
|
| 448 |
+
|
| 449 |
+
.pslogin-block .pslogin-buttons .pslogin-button-auto.pslogin-has-button-icon-image {
|
| 450 |
+
display: none;
|
| 451 |
+
}
|
| 452 |
+
|
| 453 |
+
.pslogin-block .pslogin-buttons .pslogin-button-auto .pslogin-button-icon-image {
|
| 454 |
+
display: inline-block;
|
| 455 |
+
width: 32px;
|
| 456 |
+
height: 32px;
|
| 457 |
+
}
|
| 458 |
+
|
| 459 |
+
.pslogin-block .pslogin-buttons ul li.facebook span.pslogin-button-auto { background-color: #1e4389; }
|
| 460 |
+
.pslogin-block .pslogin-buttons ul li.facebook .pslogin-button-icon { background-position: 0px 0px; }
|
| 461 |
+
|
| 462 |
+
.pslogin-block .pslogin-buttons ul li.twitter span.pslogin-button-auto { background-color: #28a9e2; }
|
| 463 |
+
.pslogin-block .pslogin-buttons ul li.twitter .pslogin-button-icon { background-position: -34px 0px; }
|
| 464 |
+
|
| 465 |
+
.pslogin-block .pslogin-buttons ul li.linkedin span.pslogin-button-auto { background-color: #11669c; }
|
| 466 |
+
.pslogin-block .pslogin-buttons ul li.linkedin .pslogin-button-icon { background-position: -168px 0px; }
|
| 467 |
+
|
| 468 |
+
.pslogin-block .pslogin-buttons ul li.yahoo span.pslogin-button-auto { background-color: #85228f; }
|
| 469 |
+
.pslogin-block .pslogin-buttons ul li.yahoo .pslogin-button-icon { background-position: -204px 0px; }
|
| 470 |
+
|
| 471 |
+
.pslogin-block .pslogin-buttons ul li.vkontakte span.pslogin-button-auto { background-color: #3f658c; }
|
| 472 |
+
.pslogin-block .pslogin-buttons ul li.vkontakte .pslogin-button-icon { background-position: -68px 0px; }
|
| 473 |
+
|
| 474 |
+
.pslogin-block .pslogin-buttons ul li.googleplus span.pslogin-button-auto { background-color: #df4b38; }
|
| 475 |
+
.pslogin-block .pslogin-buttons ul li.googleplus .pslogin-button-icon { background-position: -135px 0px; }
|
| 476 |
+
|
| 477 |
+
|
| 478 |
+
.pslogin-block .pslogin-buttons ul li.hotmail span.pslogin-button-auto { background-color: #f67d20; }
|
| 479 |
+
.pslogin-block .pslogin-buttons ul li.hotmail .pslogin-button-icon { background-position: 0px -34px; }
|
| 480 |
+
|
| 481 |
+
.pslogin-block .pslogin-buttons ul li.live span.pslogin-button-auto { background-color: #0cb3ee; }
|
| 482 |
+
.pslogin-block .pslogin-buttons ul li.live .pslogin-button-icon { background-position: -35px -205px; }
|
| 483 |
+
|
| 484 |
+
.pslogin-block .pslogin-buttons ul li.pinterest span.pslogin-button-auto { background-color: #cb2028; }
|
| 485 |
+
.pslogin-block .pslogin-buttons ul li.pinterest .pslogin-button-icon { background-position: -34px -34px; }
|
| 486 |
+
|
| 487 |
+
.pslogin-block .pslogin-buttons ul li.amazon span.pslogin-button-auto { background-color: #ff8e2e; }
|
| 488 |
+
.pslogin-block .pslogin-buttons ul li.amazon .pslogin-button-icon { background-position: -68px -34px; }
|
| 489 |
+
|
| 490 |
+
.pslogin-block .pslogin-buttons ul li.aol span.pslogin-button-auto { background-color: #008bd3; }
|
| 491 |
+
.pslogin-block .pslogin-buttons ul li.aol .pslogin-button-icon { background-position: -102px -34px; }
|
| 492 |
+
|
| 493 |
+
.pslogin-block .pslogin-buttons ul li.github span.pslogin-button-auto { background-color: black; }
|
| 494 |
+
.pslogin-block .pslogin-buttons ul li.github .pslogin-button-icon { background-position: -135px -35px; }
|
| 495 |
+
|
| 496 |
+
.pslogin-block .pslogin-buttons ul li.instagram span.pslogin-button-auto { background-color: #9a6e51; }
|
| 497 |
+
.pslogin-block .pslogin-buttons ul li.instagram .pslogin-button-icon { background-position: -168px -34px; }
|
| 498 |
+
|
| 499 |
+
.pslogin-block .pslogin-buttons ul li.foursquare span.pslogin-button-auto { background-color: #3472ad; }
|
| 500 |
+
.pslogin-block .pslogin-buttons ul li.foursquare .pslogin-button-icon { background-position: -203px -34px; }
|
| 501 |
+
|
| 502 |
+
.pslogin-block .pslogin-buttons ul li.dropbox span.pslogin-button-auto { background-color: #008bd3; }
|
| 503 |
+
.pslogin-block .pslogin-buttons ul li.dropbox .pslogin-button-icon { background-position: -0px -68px; }
|
| 504 |
+
|
| 505 |
+
.pslogin-block .pslogin-buttons ul li.disqus span.pslogin-button-auto { background-color: #3d7198; }
|
| 506 |
+
.pslogin-block .pslogin-buttons ul li.disqus .pslogin-button-icon { background-position: -32px -69px; }
|
| 507 |
+
|
| 508 |
+
.pslogin-block .pslogin-buttons ul li.livejournal span.pslogin-button-auto { background-color: #104378; }
|
| 509 |
+
.pslogin-block .pslogin-buttons ul li.livejournal .pslogin-button-icon { background-position: -66px -69px; }
|
| 510 |
+
|
| 511 |
+
.pslogin-block .pslogin-buttons ul li.tumblr span.pslogin-button-auto { background-color: #304e6c; }
|
| 512 |
+
.pslogin-block .pslogin-buttons ul li.tumblr .pslogin-button-icon { background-position: -102px -69px; }
|
| 513 |
+
|
| 514 |
+
.pslogin-block .pslogin-buttons ul li.openid span.pslogin-button-auto { background-color: #f8931f; }
|
| 515 |
+
.pslogin-block .pslogin-buttons ul li.openid .pslogin-button-icon { background-position: -135px -69px; }
|
| 516 |
+
|
| 517 |
+
.pslogin-block .pslogin-buttons ul li.flickr span.pslogin-button-auto { background-color: #ff0084; }
|
| 518 |
+
.pslogin-block .pslogin-buttons ul li.flickr .pslogin-button-icon { background-position: -169px -69px; }
|
| 519 |
+
|
| 520 |
+
.pslogin-block .pslogin-buttons ul li.wordpress span.pslogin-button-auto { background-color: #1b3f57; }
|
| 521 |
+
.pslogin-block .pslogin-buttons ul li.wordpress .pslogin-button-icon { background-position: -204px -69px; }
|
| 522 |
|
| 523 |
+
.pslogin-block .pslogin-buttons ul li.blogger span.pslogin-button-auto { background-color: #ec7825; }
|
| 524 |
+
.pslogin-block .pslogin-buttons ul li.blogger .pslogin-button-icon { background-position: 0px -103px; }
|
| 525 |
|
| 526 |
+
.pslogin-block .pslogin-buttons ul li.odnoklassniki span.pslogin-button-auto { background-color: #ee6600; }
|
| 527 |
+
.pslogin-block .pslogin-buttons ul li.odnoklassniki .pslogin-button-icon { background-position: -34px -103px; }
|
| 528 |
|
| 529 |
+
.pslogin-block .pslogin-buttons ul li.mailru span.pslogin-button-auto { background-color: #168de2; }
|
| 530 |
+
.pslogin-block .pslogin-buttons ul li.mailru .pslogin-button-icon { background-position: -67px -103px; }
|
| 531 |
|
| 532 |
+
.pslogin-block .pslogin-buttons ul li.yandex span.pslogin-button-auto { background-color: #dd0000; }
|
| 533 |
+
.pslogin-block .pslogin-buttons ul li.yandex .pslogin-button-icon { background-position: -102px -103px; }
|
| 534 |
|
| 535 |
+
.pslogin-block .pslogin-buttons ul li.paypal span.pslogin-button-auto { background-color: #195d82; }
|
| 536 |
+
.pslogin-block .pslogin-buttons ul li.paypal .pslogin-button-icon { background-position: -134px -103px; }
|
| 537 |
|
| 538 |
+
.pslogin-block .pslogin-buttons ul li.myspace span.pslogin-button-auto { background-color: #0022a0;}
|
| 539 |
+
.pslogin-block .pslogin-buttons ul li.myspace .pslogin-button-icon { background-position: -169px -103px; }
|
| 540 |
|
| 541 |
+
.pslogin-block .pslogin-buttons ul li.salesforce span.pslogin-button-auto { background-color: #00a0de; }
|
| 542 |
+
.pslogin-block .pslogin-buttons ul li.salesforce .pslogin-button-icon { background-position: -203px -103px; }
|
| 543 |
|
| 544 |
+
.pslogin-block .pslogin-buttons ul li.steamcommunity span.pslogin-button-auto { background-color: #282828; }
|
| 545 |
+
.pslogin-block .pslogin-buttons ul li.steamcommunity .pslogin-button-icon { background-position: -1px -137px; }
|
| 546 |
|
| 547 |
+
.pslogin-block .pslogin-buttons ul li.hyves span.pslogin-button-auto { background-color: #ffca63; }
|
| 548 |
+
.pslogin-block .pslogin-buttons ul li.hyves .pslogin-button-icon { background-position: -33px -137px; }
|
| 549 |
|
| 550 |
+
.pslogin-block .pslogin-buttons ul li.stackoverflow span.pslogin-button-auto { background-color: #e6eef1; }
|
| 551 |
+
.pslogin-block .pslogin-buttons ul li.stackoverflow .pslogin-button-icon { background-position: -67px -137px; }
|
| 552 |
|
| 553 |
+
.pslogin-block .pslogin-buttons ul li.evernote span.pslogin-button-auto { background-color: #7ac141; }
|
| 554 |
+
.pslogin-block .pslogin-buttons ul li.evernote .pslogin-button-icon { background-position: -101px -137px; }
|
| 555 |
|
| 556 |
+
.pslogin-block .pslogin-buttons ul li.mixi span.pslogin-button-auto { background-color: #d1ac5b; }
|
| 557 |
+
.pslogin-block .pslogin-buttons ul li.mixi .pslogin-button-icon { background-position: -135px -137px; }
|
| 558 |
|
| 559 |
+
.pslogin-block .pslogin-buttons ul li.mydigipass span.pslogin-button-auto { background-color: #49bbeb; }
|
| 560 |
+
.pslogin-block .pslogin-buttons ul li.mydigipass .pslogin-button-icon { background-position: -169px -137px; }
|
| 561 |
|
| 562 |
+
.pslogin-block .pslogin-buttons ul li.netlog span.pslogin-button-auto { background-color: #bb2026; }
|
| 563 |
+
.pslogin-block .pslogin-buttons ul li.netlog .pslogin-button-icon { background-position: -203px -137px; }
|
| 564 |
|
| 565 |
+
.pslogin-block .pslogin-buttons ul li.qq span.pslogin-button-auto { background-color: #c46f1c; }
|
| 566 |
+
.pslogin-block .pslogin-buttons ul li.qq .pslogin-button-icon { background-position: 0px -171px; }
|
| 567 |
|
| 568 |
+
.pslogin-block .pslogin-buttons ul li.sinaweibo span.pslogin-button-auto { background-color: #bd4342; }
|
| 569 |
+
.pslogin-block .pslogin-buttons ul li.sinaweibo .pslogin-button-icon { background-position: -34px -171px; }
|
| 570 |
|
| 571 |
+
.pslogin-block .pslogin-buttons ul li.soundcloud span.pslogin-button-auto { background-color: #ff5419; }
|
| 572 |
+
.pslogin-block .pslogin-buttons ul li.soundcloud .pslogin-button-icon { background-position: -66px -171px; }
|
| 573 |
|
| 574 |
+
.pslogin-block .pslogin-buttons ul li.tencentweibo span.pslogin-button-auto { background-color: #28a4e4; }
|
| 575 |
+
.pslogin-block .pslogin-buttons ul li.tencentweibo .pslogin-button-icon { background-position: -100px -171px; }
|
| 576 |
|
| 577 |
+
.pslogin-block .pslogin-buttons ul li.verisign span.pslogin-button-auto { background-color: #b22253; }
|
| 578 |
+
.pslogin-block .pslogin-buttons ul li.verisign .pslogin-button-icon { background-position: -134px -171px; }
|
| 579 |
|
| 580 |
+
.pslogin-block .pslogin-buttons ul li.xing span.pslogin-button-auto { background-color: #005d5e;}
|
| 581 |
+
.pslogin-block .pslogin-buttons ul li.xing .pslogin-button-icon { background-position: -168px -171px; }
|
| 582 |
|
| 583 |
+
.pslogin-block .pslogin-buttons ul li.kaixin span.pslogin-button-auto { background-color: #e2332e; }
|
| 584 |
+
.pslogin-block .pslogin-buttons ul li.kaixin .pslogin-button-icon { background-position: -203px -171px; }
|
| 585 |
|
| 586 |
+
.pslogin-block .pslogin-buttons ul li.orange span.pslogin-button-auto { background-color: #ff6600; }
|
| 587 |
+
.pslogin-block .pslogin-buttons ul li.orange .pslogin-button-icon { background-position: -1px -205px; }
|
| 588 |
|
| 589 |
+
.pslogin-block .pslogin-buttons ul li.bitbucket span.pslogin-button-auto { background-color: #013567; }
|
| 590 |
+
.pslogin-block .pslogin-buttons ul li.bitbucket .pslogin-button-icon { background-position: -67px -205px; }
|
| 591 |
|
| 592 |
+
.pslogin-block .pslogin-buttons ul li.bitly span.pslogin-button-auto { background-color: #ed6022; }
|
| 593 |
+
.pslogin-block .pslogin-buttons ul li.bitly .pslogin-button-icon { background-position: -101px -205px; }
|
| 594 |
+
|
| 595 |
+
.pslogin-block .pslogin-buttons ul li.boxcom span.pslogin-button-auto { background-color: #00b9f2; }
|
| 596 |
+
.pslogin-block .pslogin-buttons ul li.boxcom .pslogin-button-icon { background-position: -135px -205px; }
|
| 597 |
+
|
| 598 |
+
.pslogin-block .pslogin-buttons ul li.vimeo span.pslogin-button-auto { background-color: #1fb9eb; }
|
| 599 |
+
.pslogin-block .pslogin-buttons ul li.vimeo .pslogin-button-icon { background-position: -170px -205px; }
|
| 600 |
+
|
| 601 |
+
.pslogin-block .pslogin-buttons ul li.reddit span.pslogin-button-auto { background-color: #337fb9; }
|
| 602 |
+
.pslogin-block .pslogin-buttons ul li.reddit .pslogin-button-icon { background-position: -203px -205px; }
|
| 603 |
+
|
| 604 |
+
.pslogin-block .pslogin-buttons ul li.odesc span.pslogin-button-auto { background-color: #7ac043; }
|
| 605 |
+
.pslogin-block .pslogin-buttons ul li.odesc .pslogin-button-icon { background-position: -1px -239px; }
|
| 606 |
+
|
| 607 |
+
.pslogin-block .pslogin-buttons ul li.teamviewer span.pslogin-button-auto { background-color: #0171b9; }
|
| 608 |
+
.pslogin-block .pslogin-buttons ul li.teamviewer .pslogin-button-icon { background-position: -34px -239px; }
|
| 609 |
+
|
| 610 |
+
.pslogin-block .pslogin-buttons ul li.skyrock span.pslogin-button-auto { background-color: #009afe; }
|
| 611 |
+
.pslogin-block .pslogin-buttons ul li.skyrock .pslogin-button-icon { background-position: -67px -239px; }
|
| 612 |
|
|
|
|
|
|
|
| 613 |
|
| 614 |
+
/*======= social buttons =======*/
|
| 615 |
+
#prpop-pop-up-bg .pslogin-block {
|
| 616 |
+
text-align: center;
|
| 617 |
+
clear: both;
|
| 618 |
+
margin-bottom: 5px;
|
| 619 |
+
}
|
| 620 |
|
| 621 |
+
#prpop-pop-up-bg .prpop-account-create .pslogin-block {
|
| 622 |
+
display: none;
|
| 623 |
+
}
|
| 624 |
+
|
| 625 |
+
#prpop-pop-up-bg .pslogin-block .pslogin-buttons.pslogin-buttons-showfull {
|
| 626 |
+
width: 100%;
|
| 627 |
+
}
|
| 628 |
|
| 629 |
+
#prpop-pop-up-bg .pslogin-block li a span.pslogin-button-auto {
|
| 630 |
+
width: 100%;
|
| 631 |
+
position: relative;
|
| 632 |
+
display: block;
|
| 633 |
+
height: 32px;
|
| 634 |
+
}
|
| 635 |
|
| 636 |
+
#prpop-pop-up-bg .pslogin-block li a span.pslogin-button-icon {
|
| 637 |
+
position: absolute;
|
| 638 |
+
background-color: inherit;
|
| 639 |
+
}
|
| 640 |
|
| 641 |
+
#prpop-pop-up-bg .pslogin-block li a span.pslogin-button-text {
|
| 642 |
+
width: 100%;
|
| 643 |
+
padding-left: 32px;
|
| 644 |
+
font-size: 12px;
|
| 645 |
+
}
|
| 646 |
|
| 647 |
+
/*=== modern blue ===*/
|
| 648 |
+
#prpop-pop-up-bg.prpop-default .pslogin-spacer {
|
| 649 |
+
margin: 0 auto 10px;
|
| 650 |
+
width: 100%;
|
| 651 |
+
}
|
| 652 |
|
| 653 |
+
#prpop-pop-up-bg.prpop-default .pslogin-spacer:before {
|
| 654 |
+
display: block;
|
| 655 |
+
content: "";
|
| 656 |
+
clear: both;
|
| 657 |
+
width: 100%;
|
| 658 |
+
}
|
| 659 |
|
| 660 |
+
#prpop-pop-up-bg.prpop-default .pslogin-spacer table {
|
| 661 |
+
margin-top: 15px;
|
| 662 |
+
}
|
| 663 |
|
| 664 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block {
|
| 665 |
+
margin-top: 10px;
|
| 666 |
+
}
|
| 667 |
|
| 668 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons {
|
| 669 |
+
width: 100%;
|
| 670 |
+
margin: 0 auto;
|
| 671 |
+
text-align: center;
|
| 672 |
+
}
|
| 673 |
|
| 674 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block li a span.pslogin-button-auto {
|
| 675 |
+
min-width: 32px;
|
| 676 |
+
}
|
| 677 |
|
| 678 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li {
|
| 679 |
+
width: 70%;
|
| 680 |
+
min-height: 32px;
|
| 681 |
+
margin-bottom: 5px;
|
| 682 |
+
vertical-align: inherit;
|
| 683 |
+
}
|
| 684 |
|
| 685 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons li {
|
| 686 |
+
width: auto;
|
| 687 |
+
min-height: 32px;
|
| 688 |
+
margin-bottom: 5px;
|
| 689 |
+
vertical-align: middle;
|
| 690 |
+
}
|
| 691 |
|
| 692 |
+
#prpop-pop-up-bg.prpop-default .pslogin-buttons .pslogin-spacer {
|
| 693 |
+
width: 100%;
|
| 694 |
+
}
|
| 695 |
|
| 696 |
+
/*=== glamour gray ===*/
|
| 697 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-spacer {
|
| 698 |
+
margin: 0 auto 10px;
|
| 699 |
+
width: 100%;
|
| 700 |
+
}
|
| 701 |
|
| 702 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-spacer.pslogin-showmore .pslogin-bordertext:hover {
|
| 703 |
+
color: white;
|
| 704 |
+
}
|
| 705 |
|
| 706 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-spacer:before {
|
| 707 |
+
display: block;
|
| 708 |
+
content: "";
|
| 709 |
+
clear: both;
|
| 710 |
+
width: 100%;
|
| 711 |
+
}
|
| 712 |
|
| 713 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-spacer table {
|
| 714 |
+
margin-top: 15px;
|
| 715 |
+
}
|
| 716 |
|
| 717 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block {
|
| 718 |
+
margin-top: 10px;
|
| 719 |
+
}
|
| 720 |
|
| 721 |
|
| 722 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons {
|
| 723 |
+
width: 100%;
|
| 724 |
+
margin: 0 auto;
|
| 725 |
+
text-align: center;
|
| 726 |
+
}
|
| 727 |
+
|
| 728 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li {
|
| 729 |
+
width: 70%;
|
| 730 |
+
min-height: 32px;
|
| 731 |
+
margin-bottom: 5px;
|
| 732 |
+
}
|
| 733 |
+
|
| 734 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons li {
|
| 735 |
+
width: auto;
|
| 736 |
+
min-height: 32px;
|
| 737 |
+
margin: 0 0 5px 0;
|
| 738 |
+
vertical-align: middle;
|
| 739 |
+
}
|
| 740 |
+
|
| 741 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block li a span.pslogin-button-auto {
|
| 742 |
+
border-radius: 3px;
|
| 743 |
+
-webkit-border-radius: 3px;
|
| 744 |
+
-moz-border-radius: 3px;
|
| 745 |
+
min-width: 32px;
|
| 746 |
+
}
|
| 747 |
+
|
| 748 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block li a span.pslogin-button-text {
|
| 749 |
+
border-radius: 3px;
|
| 750 |
+
-webkit-border-radius: 3px;
|
| 751 |
+
-moz-border-radius: 3px;
|
| 752 |
+
}
|
| 753 |
+
|
| 754 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block li a span.pslogin-button-icon {
|
| 755 |
+
border-radius: 3px;
|
| 756 |
+
-webkit-border-radius: 3px;
|
| 757 |
+
-moz-border-radius: 3px;
|
| 758 |
+
}
|
| 759 |
+
|
| 760 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-buttons.pslogin-buttons-showfull li a span.pslogin-button-icon {
|
| 761 |
+
border-radius: 3px 0 0 3px;
|
| 762 |
+
-webkit-border-radius: 3px 0 0 3px;
|
| 763 |
+
-moz-border-radius: 3px 0 0 3px;
|
| 764 |
+
}
|
| 765 |
+
|
| 766 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-buttons .pslogin-spacer {
|
| 767 |
+
width: 100%;
|
| 768 |
+
}
|
| 769 |
+
|
| 770 |
+
|
| 771 |
+
/*=== light silver ===*/
|
| 772 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-spacer {
|
| 773 |
+
margin: 10px auto;
|
| 774 |
+
width: 70%;
|
| 775 |
+
}
|
| 776 |
+
|
| 777 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-border {
|
| 778 |
+
border-top: 1px solid #A5A5A5;
|
| 779 |
+
}
|
| 780 |
+
|
| 781 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-bordertext {
|
| 782 |
+
color: #444;
|
| 783 |
+
}
|
| 784 |
+
|
| 785 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-spacer {
|
| 786 |
+
width: 70%;
|
| 787 |
+
|
| 788 |
+
}
|
| 789 |
+
|
| 790 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons .pslogin-spacer:before {
|
| 791 |
+
display: none;
|
| 792 |
+
}
|
| 793 |
+
|
| 794 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-spacer .pslogin-border {
|
| 795 |
+
border-top: 1px solid #A5A5A5;
|
| 796 |
+
}
|
| 797 |
+
|
| 798 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-spacer.pslogin-showmore .pslogin-bordertext {
|
| 799 |
+
border: 1px solid #A5A5A5;
|
| 800 |
+
color: #444;
|
| 801 |
+
}
|
| 802 |
+
|
| 803 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-spacer.pslogin-showmore .pslogin-bordertext:hover {
|
| 804 |
+
color: black;
|
| 805 |
+
}
|
| 806 |
+
|
| 807 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons {
|
| 808 |
+
width: 70%;
|
| 809 |
+
margin: 0 auto;
|
| 810 |
+
text-align: center;
|
| 811 |
+
}
|
| 812 |
+
|
| 813 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li {
|
| 814 |
+
width: 100%;
|
| 815 |
+
min-width: 32px;
|
| 816 |
+
min-height: 34px;
|
| 817 |
+
margin-bottom: 5px;
|
| 818 |
+
}
|
| 819 |
+
|
| 820 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons li {
|
| 821 |
+
width: auto;
|
| 822 |
+
min-width: 34px;
|
| 823 |
+
height: 34px;
|
| 824 |
+
margin: 0 0 5px 0;
|
| 825 |
+
}
|
| 826 |
+
|
| 827 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons ul li a {
|
| 828 |
+
display: inline-block;
|
| 829 |
+
width: 100%;
|
| 830 |
+
}
|
| 831 |
+
|
| 832 |
+
|
| 833 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block li a span.pslogin-button-auto {
|
| 834 |
+
border-radius: 5px;
|
| 835 |
+
-webkit-border-radius: 5px;
|
| 836 |
+
-moz-border-radius: 5px;
|
| 837 |
+
-webkit-box-shadow: 0px 1px 1px 0px rgba(31, 31, 31, 0.47),inset 0px 1px 0px 0px rgba(255, 255, 255, 0.33);
|
| 838 |
+
-moz-box-shadow: 0px 1px 1px 0px rgba(31, 31, 31, 0.47),inset 0px 1px 0px 0px rgba(255, 255, 255, 0.33);
|
| 839 |
+
box-shadow: 0px 1px 1px 0px rgba(31, 31, 31, 0.47),inset 0px 1px 0px 0px rgba(255, 255, 255, 0.33);
|
| 840 |
+
|
| 841 |
+
}
|
| 842 |
+
|
| 843 |
+
|
| 844 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li a span.pslogin-button-auto {
|
| 845 |
+
border: 1px solid rgba(0, 0, 0, 0.09);
|
| 846 |
+
height: 34px;
|
| 847 |
+
}
|
| 848 |
+
|
| 849 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block li a span.pslogin-button-text {
|
| 850 |
+
height: 34px;
|
| 851 |
+
}
|
| 852 |
+
|
| 853 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block li a span.pslogin-button-icon {
|
| 854 |
+
box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.33);
|
| 855 |
+
}
|
| 856 |
+
|
| 857 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li a span.pslogin-button-icon {
|
| 858 |
+
border: none;
|
| 859 |
+
border-radius: 5px 0 0 5px;
|
| 860 |
+
-webkit-border-radius: 5px 0 0 5px;
|
| 861 |
+
-moz-border-radius: 5px 0 0 5px;
|
| 862 |
+
}
|
| 863 |
+
|
| 864 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li a span.pslogin-button-icon {
|
| 865 |
+
height: 32px;
|
| 866 |
+
width: 32px;
|
| 867 |
+
}
|
| 868 |
+
|
| 869 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block li a span.pslogin-button-icon {
|
| 870 |
+
border: 1px solid rgba(0, 0, 0, 0.09);
|
| 871 |
+
border-radius: 5px;
|
| 872 |
+
-webkit-border-radius: 5px;
|
| 873 |
+
-moz-border-radius: 5px;
|
| 874 |
+
height: 34px;
|
| 875 |
+
width: 34px;
|
| 876 |
+
}
|
| 877 |
+
|
| 878 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-buttons .pslogin-spacer {
|
| 879 |
+
width: 100%;
|
| 880 |
+
}
|
| 881 |
+
|
| 882 |
|
| 883 |
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
|
| 884 |
|
| 885 |
+
.pslogin-block .pslogin-buttons ul li .pslogin-button-icon {
|
| 886 |
background: url('../../../images/plumrocket/pslogin/social_retina.png');
|
| 887 |
background-size: 236px 272px;
|
| 888 |
-webkit-background-size: 236px 272px;
|
| 893 |
|
| 894 |
@media screen and ( max-width: 767px ) {
|
| 895 |
|
| 896 |
+
.pslogin-block .pslogin-buttons {
|
| 897 |
width: 100%;
|
| 898 |
}
|
| 899 |
|
| 900 |
+
.pslogin-block .pslogin-buttons.show-button-text ul li .pslogin-button-text {
|
| 901 |
+
display: inline-block;
|
| 902 |
}
|
| 903 |
|
| 904 |
+
.pslogin-block .pslogin-xs {
|
| 905 |
+
display: inline-block!important;
|
| 906 |
}
|
| 907 |
|
| 908 |
+
.pslogin-block .pslogin-spacer .pslogin-bordertext {
|
| 909 |
+
|
| 910 |
}
|
| 911 |
|
| 912 |
+
}
|
| 913 |
+
|
| 914 |
+
|
| 915 |
+
@media screen and (max-width: 640px) {
|
| 916 |
+
|
| 917 |
+
/*=== social login ===*/
|
| 918 |
+
#prpop-pop-up-bg.prpop-default .pslogin-spacer,
|
| 919 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons {
|
| 920 |
+
width: 60%;
|
| 921 |
+
}
|
| 922 |
+
|
| 923 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-spacer,
|
| 924 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons {
|
| 925 |
+
width: 60%;
|
| 926 |
}
|
| 927 |
|
| 928 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li,
|
| 929 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li {
|
| 930 |
+
width: 100%;
|
| 931 |
}
|
| 932 |
|
| 933 |
+
}
|
| 934 |
+
|
| 935 |
|
| 936 |
+
@media screen and (max-width: 480px) {
|
| 937 |
+
|
| 938 |
+
/*=== social buttons ===*/
|
| 939 |
+
#prpop-pop-up-bg.prpop-default .pslogin-spacer,
|
| 940 |
+
#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons {
|
| 941 |
+
width: 100%;
|
| 942 |
+
}
|
| 943 |
+
|
| 944 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-spacer,
|
| 945 |
+
#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons {
|
| 946 |
+
width: 100%;
|
| 947 |
+
}
|
| 948 |
+
|
| 949 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-spacer,
|
| 950 |
+
#prpop-pop-up-bg.simple-form-logo .pslogin-block .pslogin-buttons {
|
| 951 |
+
width: 100%;
|
| 952 |
}
|
| 953 |
|
| 954 |
}
|
| 955 |
|
| 956 |
+
|
| 957 |
+
|
| 958 |
+
|
| 959 |
/*=== animate ===*/
|
| 960 |
#pslogin-pop-up-bg {
|
| 961 |
-webkit-animation-duration: 1s;
|
skin/frontend/base/default/images/plumrocket/pslogin/social.png
CHANGED
|
Binary file
|
skin/frontend/base/default/images/plumrocket/pslogin/social_retina.png
CHANGED
|
Binary file
|
skin/frontend/base/default/js/plumrocket/{jquery-1.10.2.min.js → pslogin/jquery-1.10.2.min.js}
RENAMED
|
File without changes
|
skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js
CHANGED
|
@@ -13,13 +13,22 @@
|
|
| 13 |
* @copyright Copyright (c) 2014 Plumrocket Inc. (http://www.plumrocket.com)
|
| 14 |
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
| 15 |
*/
|
| 16 |
-
|
|
|
|
|
|
|
|
|
|
| 17 |
pjQuery_1_10_2(document).ready(function() {
|
| 18 |
|
| 19 |
// Show/Hide button.
|
| 20 |
-
pjQuery_1_10_2('
|
| 21 |
-
pjQuery_1_10_2('.pslogin-buttons
|
| 22 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
});
|
| 24 |
|
| 25 |
// Open login window.
|
| 13 |
* @copyright Copyright (c) 2014 Plumrocket Inc. (http://www.plumrocket.com)
|
| 14 |
* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
|
| 15 |
*/
|
| 16 |
+
|
| 17 |
+
|
| 18 |
+
var showFullButtonsAfterViewMore = false;
|
| 19 |
+
|
| 20 |
pjQuery_1_10_2(document).ready(function() {
|
| 21 |
|
| 22 |
// Show/Hide button.
|
| 23 |
+
pjQuery_1_10_2('.pslogin-showmore-button').on('click', function() {
|
| 24 |
+
var $buttons = pjQuery_1_10_2(this).parents('div.pslogin-buttons');
|
| 25 |
+
$buttons.find('.pslogin-hidden').fadeToggle(275);
|
| 26 |
+
pjQuery_1_10_2(this).parents('div.pslogin-showmore').hide();
|
| 27 |
+
|
| 28 |
+
if(showFullButtonsAfterViewMore != true) {
|
| 29 |
+
$buttons.removeClass('pslogin-buttons-showfull');
|
| 30 |
+
$buttons.parents('div.pslogin-block.pslogin-login').find('.pslogin-title').show();
|
| 31 |
+
}
|
| 32 |
});
|
| 33 |
|
| 34 |
// Open login window.
|
skin/frontend/shopper/default/css/plumrocket/pslogin/pslogin-custom.css
ADDED
|
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
.w25 { width: 25px; }
|
| 2 |
+
|
| 3 |
+
.pslogin-addedoverlay,
|
| 4 |
+
.pslogin-pop-up-form,
|
| 5 |
+
.pslogin-fake-email-message {
|
| 6 |
+
z-index: 15000;
|
| 7 |
+
}
|
| 8 |
+
|
| 9 |
+
.notice-msg a {
|
| 10 |
+
color: #97d2c9;
|
| 11 |
+
}
|
| 12 |
+
|
| 13 |
+
.pslogin-block {
|
| 14 |
+
width: 100%;
|
| 15 |
+
margin: 0;
|
| 16 |
+
padding: 0 50px;
|
| 17 |
+
box-sizing: border-box;
|
| 18 |
+
}
|
| 19 |
+
|
| 20 |
+
.account-create .pslogin-spacer,
|
| 21 |
+
.pslogin-buttons .pslogin-spacer {
|
| 22 |
+
padding: 0;
|
| 23 |
+
}
|
| 24 |
+
|
| 25 |
+
.pslogin-buttons .pslogin-border {
|
| 26 |
+
border: 0px;
|
| 27 |
+
}
|
| 28 |
+
|
| 29 |
+
.pslogin-spacer {
|
| 30 |
+
width: 100%;
|
| 31 |
+
padding: 0 50px;
|
| 32 |
+
box-sizing: border-box;
|
| 33 |
+
}
|
