Plumrocket_Twitter_Facebook_Login - Version 1.2.2

Version Notes

- Improved extension to support scenario when customer is forwarded to login page using direct link (without using standard popup window)
- Fixed error with generating incorrect Callback URL for moltiple websites with different domains
- Minor design fixes for integration with Popup Login extension

Download this release

Release Info

Developer Plumrocket Team
Extension Plumrocket_Twitter_Facebook_Login
Version 1.2.2
Comparing to
See all releases


Code changes from version 1.2.1 to 1.2.2

Files changed (9) hide show
  1. app/code/community/Plumrocket/SocialLogin/Block/System/Config/Callbackurl.php +1 -1
  2. app/code/community/Plumrocket/SocialLogin/Helper/Data.php +5 -2
  3. app/code/community/Plumrocket/SocialLogin/Helper/Main.php +4 -4
  4. app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php +1 -1
  5. app/code/community/Plumrocket/SocialLogin/etc/config.xml +1 -1
  6. app/code/community/Plumrocket/SocialLogin/etc/system.xml +1 -0
  7. app/etc/modules/Plumrocket_SocialLogin.xml +1 -1
  8. package.xml +8 -6
  9. skin/frontend/base/default/css/plumrocket/pslogin/pslogin.css +5 -0
app/code/community/Plumrocket/SocialLogin/Block/System/Config/Callbackurl.php CHANGED
@@ -38,7 +38,7 @@ class Plumrocket_SocialLogin_Block_System_Config_Callbackurl extends Mage_Adminh
38
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
39
  {
40
  $providerName = str_replace(array('pslogin_', '_callbackurl'), '', $element->getHtmlId());
41
- $url = Mage::helper('pslogin')->getCallbackURL($providerName);
42
  return '<input id="'. $element->getHtmlId() .'" type="text" name="" value="'. $url .'" class="input-text pslogin-callbackurl-autofocus" style="background-color: #EEE; color: #999;" readonly="readonly" />';
43
  }
44
 
38
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
39
  {
40
  $providerName = str_replace(array('pslogin_', '_callbackurl'), '', $element->getHtmlId());
41
+ $url = Mage::helper('pslogin')->getCallbackURL($providerName, true);
42
  return '<input id="'. $element->getHtmlId() .'" type="text" name="" value="'. $url .'" class="input-text pslogin-callbackurl-autofocus" style="background-color: #EEE; color: #999;" readonly="readonly" />';
43
  }
44
 
app/code/community/Plumrocket/SocialLogin/Helper/Data.php CHANGED
@@ -132,10 +132,13 @@ class Plumrocket_SocialLogin_Helper_Data extends Plumrocket_SocialLogin_Helper_M
132
  );
133
  }
134
 
135
- public function getCallbackURL($provider)
136
  {
 
 
 
137
  $defaultStoreId = Mage::app()
138
- ->getWebsite(true)
139
  ->getDefaultGroup()
140
  ->getDefaultStoreId();
141
 
132
  );
133
  }
134
 
135
+ public function getCallbackURL($provider, $byRequest = false)
136
  {
137
+ $request = Mage::app()->getRequest();
138
+ $websiteCode = $request->getParam('website');
139
+
140
  $defaultStoreId = Mage::app()
141
+ ->getWebsite( $byRequest? $websiteCode : null )
142
  ->getDefaultGroup()
143
  ->getDefaultStoreId();
144
 
app/code/community/Plumrocket/SocialLogin/Helper/Main.php CHANGED
@@ -11,7 +11,7 @@
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) 2015 Plumrocket Inc. (http://www.plumrocket.com)
15
  * @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
16
  */
17
 
@@ -19,7 +19,7 @@
19
  class Plumrocket_SocialLogin_Helper_Main extends Mage_Core_Helper_Abstract
20
  {
21
 
22
- public function getAjaxUrl($route, $params = array())
23
  {
24
  $url = Mage::getUrl($route, $params);
25
  if (Mage::app()->getStore()->isCurrentlySecure()) {
@@ -111,5 +111,5 @@ class Plumrocket_SocialLogin_Helper_Main extends Mage_Core_Helper_Abstract
111
 
112
  return $this;
113
  }
114
-
115
- };
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
 
19
  class Plumrocket_SocialLogin_Helper_Main extends Mage_Core_Helper_Abstract
20
  {
21
 
22
+ public function getAjaxUrl($route, $params = array())
23
  {
24
  $url = Mage::getUrl($route, $params);
25
  if (Mage::app()->getStore()->isCurrentlySecure()) {
111
 
112
  return $this;
113
  }
114
+
115
+ }
app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php CHANGED
@@ -181,7 +181,7 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
181
  'redirectUrl' => $redirectUrl
182
  )));
183
  }else{
184
- $this->getResponse()->setBody('<script type="text/javascript">window.close(); window.opener.location.href = "'.$redirectUrl.'";</script>');
185
  }
186
  }
187
 
181
  'redirectUrl' => $redirectUrl
182
  )));
183
  }else{
184
+ $this->getResponse()->setBody('<script type="text/javascript">if(window.opener && window.opener.location && !window.opener.closed) { window.close(); window.opener.location.href = "'.$redirectUrl.'"; }else{ window.location.href = "'.$redirectUrl.'"; }</script>');
185
  }
186
  }
187
 
app/code/community/Plumrocket/SocialLogin/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Plumrocket_SocialLogin>
5
- <version>1.2.1</version>
6
  </Plumrocket_SocialLogin>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Plumrocket_SocialLogin>
5
+ <version>1.2.2</version>
6
  </Plumrocket_SocialLogin>
7
  </modules>
8
  <frontend>
app/code/community/Plumrocket/SocialLogin/etc/system.xml CHANGED
@@ -352,6 +352,7 @@
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">
352
  <frontend_model>pslogin/system_config_callbackurl</frontend_model>
353
  <sort_order>4</sort_order>
354
  <show_in_default>1</show_in_default>
355
+ <show_in_website>1</show_in_website>
356
  <comment>This URL should be used while creating new social login application.</comment>
357
  </callbackurl>
358
  <icon_btn translate="label">
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.2.1</version>
8
  <name>Twitter &amp; 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.2.2</version>
8
  <name>Twitter &amp; 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,20 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Twitter_Facebook_Login</name>
4
- <version>1.2.1</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 &amp; Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Increase sales, allow clients to use Magento Facebook Login &amp; Twitter Login free to quickly register &amp; place order.</summary>
10
  <description>Plumrocket Twitter &amp; 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>Improved integration with other Plumrocket Extensions</notes>
 
 
12
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
13
- <date>2015-02-11</date>
14
- <time>10:00:46</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="a9198cc0f09dd8881911d04c61f7f703"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="01e4058d3a9d2886d3d299108df5e39e"/><file name="General.php" hash="f06dce2297aa0707ddf4653da38ccf74"/><dir name="Page"><dir name="Html"><file name="Header.php" hash="8d7513864ffa02b4b5c888fd11de9ebb"/><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="82d17657149500480e76b9b7a771afc1"/><file name="Comingsoon.php" hash="dd6c106da378297ab6dd6724fe014281"/><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="2ae8f2236270e459223e10a84e123e07"/><file name="Version.php" hash="dcbf01e3752a5beb030b3aec752af6dd"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="b117bedbd81baf82837a2e0bc483126c"/><file name="Main.php" hash="63672ae5826e740102399afc4c3d945a"/></dir><dir name="Model"><file name="Account.php" hash="4108cb38a670f1181f5814c2eb612cf5"/><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="1edb8fc92e3db12f7869eb102cb3d75e"/><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="3dec05ac8d4ace4c9b0f57779c6b7b82"/></dir><dir name="controllers"><file name="AccountController.php" hash="aec871efe59f91de088e8304f87e2525"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="617b48a145bfad224321e1fb04710382"/><file name="system.xml" hash="4846657801d87f7d9e19978ef092080d"/></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="180b5cc113f7d0e813de3752e55f8128"/></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><file name="js.phtml" hash="4f1716f6f3b5401a6b29865a189b4aec"/><dir name="page"><dir name="html"><file name="welcome.phtml" hash="de89796d6555f732aaad8099c012d3bb"/></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 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="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="default"><dir name="blanco"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="34ffb2d3f9f0de19bd57f4627e2ff822"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir><dir name="buyshop"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="59890e19c4c8871e12ed8674c3733e55"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="1f7c8854dba5149030bc61b14d644614"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir><dir name="milano"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="34ffb2d3f9f0de19bd57f4627e2ff822"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></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="blacknwhite"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="customer"><dir name="form"><file name="login.phtml" hash="ef1349603e09651ac66755546dab3116"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir><dir name="onepagecheckout"><file name="login.phtml" hash="d304d5fc8e6201fc308f44dcd801199c"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="83264c009f73da95a42965308edff8a4"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="e5f3a79f1cc36d88807561bdd3461a8c"/><file name="register.phtml" hash="55b4cf0a29a95ea89751a1aa99008fb0"/></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="95705a45617d301f3fb6b98559375512"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="66f08533a09ac02e7fcaf7042cfb66c8"/></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="4770ef59857cd6eca2534d74e1dcf67c"/></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="259f74735eb20a501e2ec41a4472eae5"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="7f9ce7fa30dde5dbb53b469eb0f300f6"/><file name="social_retina.png" hash="89e0ccef83342de0f100c22b740619e0"/></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="421205296335865138a00a7b56464ad9"/></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="56be3d4ce52002b666072f42515b12d8"/></dir></dir></dir></dir></dir><dir name="default"><dir name="buyshop"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="08ae88742d436464733e060c95e50569"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="2f95248995f04c7b831fd81bcc16b6d8"/></dir></dir></dir></dir></dir></dir></target></contents>
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>1.0.3</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.2.2</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 &amp; Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Increase sales, allow clients to use Magento Facebook Login &amp; Twitter Login free to quickly register &amp; place order.</summary>
10
  <description>Plumrocket Twitter &amp; 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>- Improved extension to support scenario when customer is forwarded to login page using direct link (without using standard popup window)&#xD;
12
+ - Fixed error with generating incorrect Callback URL for moltiple websites with different domains&#xD;
13
+ - Minor design fixes for integration with Popup Login extension</notes>
14
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
15
+ <date>2015-03-11</date>
16
+ <time>09:55:56</time>
17
+ <contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="a9b7ebe4120bac61ac1c6a3d809f2274"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="01e4058d3a9d2886d3d299108df5e39e"/><file name="General.php" hash="f06dce2297aa0707ddf4653da38ccf74"/><dir name="Page"><dir name="Html"><file name="Header.php" hash="8d7513864ffa02b4b5c888fd11de9ebb"/><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="65ff6c59a2650702ef693276aa4416c6"/><file name="Comingsoon.php" hash="dd6c106da378297ab6dd6724fe014281"/><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="2ae8f2236270e459223e10a84e123e07"/><file name="Version.php" hash="dcbf01e3752a5beb030b3aec752af6dd"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="b58c65927d2cfe9358e4134c252c624a"/><file name="Main.php" hash="91b6f4aec64610bca0254a3bf196f208"/></dir><dir name="Model"><file name="Account.php" hash="4108cb38a670f1181f5814c2eb612cf5"/><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="1edb8fc92e3db12f7869eb102cb3d75e"/><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="3dec05ac8d4ace4c9b0f57779c6b7b82"/></dir><dir name="controllers"><file name="AccountController.php" hash="5de1ccc2d1fe9658a6ccab26e78bec72"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="a09698ca39eb82a34c33725685f8618a"/><file name="system.xml" hash="262ab66a67b0516eacff9222f3581c74"/></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="180b5cc113f7d0e813de3752e55f8128"/></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><file name="js.phtml" hash="4f1716f6f3b5401a6b29865a189b4aec"/><dir name="page"><dir name="html"><file name="welcome.phtml" hash="de89796d6555f732aaad8099c012d3bb"/></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 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="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="default"><dir name="blanco"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="34ffb2d3f9f0de19bd57f4627e2ff822"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir><dir name="buyshop"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="59890e19c4c8871e12ed8674c3733e55"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="1f7c8854dba5149030bc61b14d644614"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir><dir name="milano"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="34ffb2d3f9f0de19bd57f4627e2ff822"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></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="blacknwhite"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="customer"><dir name="form"><file name="login.phtml" hash="ef1349603e09651ac66755546dab3116"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir><dir name="onepagecheckout"><file name="login.phtml" hash="d304d5fc8e6201fc308f44dcd801199c"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="83264c009f73da95a42965308edff8a4"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="e5f3a79f1cc36d88807561bdd3461a8c"/><file name="register.phtml" hash="55b4cf0a29a95ea89751a1aa99008fb0"/></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="95705a45617d301f3fb6b98559375512"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="66f08533a09ac02e7fcaf7042cfb66c8"/></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="4770ef59857cd6eca2534d74e1dcf67c"/></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="2289d637dce2618814c6b5c1b15fad45"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="7f9ce7fa30dde5dbb53b469eb0f300f6"/><file name="social_retina.png" hash="89e0ccef83342de0f100c22b740619e0"/></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="421205296335865138a00a7b56464ad9"/></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="56be3d4ce52002b666072f42515b12d8"/></dir></dir></dir></dir></dir><dir name="default"><dir name="buyshop"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="08ae88742d436464733e060c95e50569"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="2f95248995f04c7b831fd81bcc16b6d8"/></dir></dir></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
+ <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>
20
  </package>
skin/frontend/base/default/css/plumrocket/pslogin/pslogin.css CHANGED
@@ -741,6 +741,7 @@
741
  #prpop-pop-up-bg.glamour-grey .pslogin-spacer {
742
  margin: 0 auto 10px;
743
  width: 100%;
 
744
  }
745
 
746
  #prpop-pop-up-bg.glamour-grey .pslogin-spacer.pslogin-showmore .pslogin-bordertext:hover {
@@ -1048,6 +1049,10 @@
1048
  width: 60%;
1049
  }
1050
 
 
 
 
 
1051
  #prpop-pop-up-bg.glamour-grey .pslogin-spacer,
1052
  #prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons {
1053
  width: 60%;
741
  #prpop-pop-up-bg.glamour-grey .pslogin-spacer {
742
  margin: 0 auto 10px;
743
  width: 100%;
744
+ float: left;
745
  }
746
 
747
  #prpop-pop-up-bg.glamour-grey .pslogin-spacer.pslogin-showmore .pslogin-bordertext:hover {
1049
  width: 60%;
1050
  }
1051
 
1052
+ #prpop-pop-up-bg.glamour-grey .pslogin-spacer {
1053
+ float: none;
1054
+ }
1055
+
1056
  #prpop-pop-up-bg.glamour-grey .pslogin-spacer,
1057
  #prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons {
1058
  width: 60%;