Plumrocket_Twitter_Facebook_Login

Version Notes

- Added built-in support of world's best selling Magento themes: Blanco, BuyShop, Milano, Black&White, Venedor
- Improved authorization and registration process, now page with social login buttons loads faster
- Improved display of customers photo from social networks in Magento CE version 1.8.1 and lower, as well as on some third party themes
- Fixed issue with displaying incorrect gender data after registration

Download this release

Release Info

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

Code changes from version 1.1.0 to 1.2.0

Files changed (38) hide show

app/code/community/Plumrocket/SocialLogin/Block/Buttons.php +12 -2
app/code/community/Plumrocket/SocialLogin/Block/Page/Html/Header.php +43 -0
app/code/community/Plumrocket/SocialLogin/Block/System/Config/Callbackurl.php +2 -1
app/code/community/Plumrocket/SocialLogin/Helper/Data.php +5 -1
app/code/community/Plumrocket/SocialLogin/Model/Account.php +27 -8
app/code/community/Plumrocket/SocialLogin/Model/Observer.php +10 -0
app/code/community/Plumrocket/SocialLogin/Model/Twitter.php +5 -1
app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php +57 -6
app/code/community/Plumrocket/SocialLogin/etc/config.xml +24 -1
app/code/community/Plumrocket/SocialLogin/etc/system.xml +166 -186
app/design/frontend/base/default/layout/pslogin.xml +9 -0
app/design/frontend/blacknwhite/default/template/pslogin/customer/form/login.phtml +86 -0
app/design/frontend/blacknwhite/default/template/pslogin/customer/form/register.phtml +206 -0
app/design/frontend/blacknwhite/default/template/pslogin/onepagecheckout/login.phtml +62 -0
app/design/frontend/default/blanco/template/pslogin/checkout/onepage/login.phtml +169 -0
app/design/frontend/default/blanco/template/pslogin/customer/form/login.phtml +110 -0
app/design/frontend/default/blanco/template/pslogin/customer/form/register.phtml +206 -0
app/design/frontend/default/buyshop/template/pslogin/checkout/onepage/login.phtml +169 -0
app/design/frontend/default/buyshop/template/pslogin/customer/form/login.phtml +109 -0
app/design/frontend/default/buyshop/template/pslogin/customer/form/register.phtml +206 -0
app/design/frontend/default/milano/template/pslogin/checkout/onepage/login.phtml +169 -0
app/design/frontend/default/milano/template/pslogin/customer/form/login.phtml +110 -0
app/design/frontend/default/milano/template/pslogin/customer/form/register.phtml +206 -0
app/design/frontend/venedor/default/template/pslogin/checkout/onepage/login.phtml +141 -0
app/design/frontend/venedor/default/template/pslogin/customer/form/login.phtml +109 -0
app/design/frontend/venedor/default/template/pslogin/customer/form/register.phtml +213 -0
app/etc/modules/Plumrocket_SocialLogin.xml +1 -1
package.xml +9 -13
skin/adminhtml/default/default/css/plumrocket/pslogin/pslogin.css +32 -4
skin/adminhtml/default/default/images/plumrocket/pslogin/social_admin.png +0 -0
skin/adminhtml/default/default/js/plumrocket/pslogin/pslogin.js +8 -2
skin/frontend/base/default/css/plumrocket/pslogin/pslogin.css +140 -12
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/pslogin/pslogin.js +8 -4
skin/frontend/default/buyshop/css/plumrocket/pslogin/pslogin-custom.css +3 -0
skin/frontend/shopper/default/css/plumrocket/pslogin/pslogin-custom.css +18 -0
skin/frontend/venedor/default/css/plumrocket/pslogin/pslogin-custom.css +15 -0

app/code/community/Plumrocket/SocialLogin/Block/Buttons.php CHANGED Viewed

	@@ -19,6 +19,7 @@
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	{
	@@ -33,7 +34,7 @@ class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
33	public function showLoginFullButtons()
34	{
35	$visible = $this->getPreparedButtons('visible');
36	- return count($visible) <= 6;
37	}
38
39	public function showRegisterFullButtons()
	@@ -44,11 +45,20 @@ class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
44	public function showFullButtons()
45	{
46	$all = $this->getPreparedButtons();
47	- return count($all) <= 6;
48	}
49
50	public function getLoaderUrl()
51	{
52	return Mage::getDesign()->getSkinUrl('images/plumrocket/pslogin/'. $this->_loaderImg);
53	}









54	}


19	class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
20	{
21	protected $_loaderImg = 'loader.gif';
22	+ protected $_countFullButtons = 6;
23
24	public function getPreparedButtons($part = null)
25	{

34	public function showLoginFullButtons()
35	{
36	$visible = $this->getPreparedButtons('visible');
37	+ return count($visible) <= $this->_countFullButtons;
38	}
39
40	public function showRegisterFullButtons()

45	public function showFullButtons()
46	{
47	$all = $this->getPreparedButtons();
48	+ return count($all) <= $this->_countFullButtons;
49	}
50
51	public function getLoaderUrl()
52	{
53	return Mage::getDesign()->getSkinUrl('images/plumrocket/pslogin/'. $this->_loaderImg);
54	}
55	+
56	+ public function setFullButtonsCount($count)
57	+ {
58	+ if(is_numeric($count) && $count >= 0) {
59	+ $this->_countFullButtons = $count;
60	+ }
61	+ return $this;
62	+ }
63	+
64	}

app/code/community/Plumrocket/SocialLogin/Block/Page/Html/Header.php ADDED Viewed

	@@ -0,0 +1,43 @@


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_Page_Html_Header extends Mage_Page_Block_Html_Header
20	+ {
21	+
22	+ public function getWelcome()
23	+ {
24	+ $this->setTemplate('pslogin/page/html/welcome.phtml');
25	+ return Mage_Page_Block_Html_Header::_toHtml();
26	+ }
27	+
28	+ public function getMessage()
29	+ {
30	+ return parent::getWelcome();
31	+ }
32	+
33	+ public function photoEnabled()
34	+ {
35	+ return Mage::helper('pslogin')->photoEnabled();
36	+ }
37	+
38	+ public function getPhotoPath()
39	+ {
40	+ return Mage::helper('pslogin')->getPhotoPath(false);
41	+ }
42	+
43	+ }

app/code/community/Plumrocket/SocialLogin/Block/System/Config/Callbackurl.php CHANGED Viewed

	@@ -31,7 +31,8 @@ class Plumrocket_SocialLogin_Block_System_Config_Callbackurl extends Mage_Adminh
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	}


31
32	protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
33	{
34	+ $providerName = str_replace(array('pslogin_', '_callbackurl'), '', $element->getHtmlId());
35	+ $url = Mage::helper('pslogin')->getCallbackURL($providerName);
36	return '<input id="'. $element->getHtmlId() .'" type="text" name="" value="'. $url .'" class="input-text pslogin-callbackurl-autofocus" style="background-color: #EEE; color: #999;" readonly="readonly" />';
37	}
38	}

app/code/community/Plumrocket/SocialLogin/Helper/Data.php CHANGED Viewed

	@@ -85,11 +85,15 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
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)


85
86	public function hasButtons()
87	{
88	+ if(!$this->moduleEnabled()) {
89	+ return false;
90	+ }
91	+
92	if($customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
93	return false;
94	}
95
96	+ return (bool)$this->getButtons();
97	}
98
99	public function getPhotoPath($checkIsEnabled = true)

app/code/community/Plumrocket/SocialLogin/Model/Account.php CHANGED Viewed

	@@ -21,6 +21,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
21	const PHOTO_FILE_EXT = 'png';
22
23	protected $_type = null;

24	protected $_websiteId = null;
25	protected $_redirectUri = null;
26	protected $_userData = array();
	@@ -60,7 +61,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
60	'customer_id' => $customerId
61	);
62
63	- $this->~~setData~~($data)->save();
64	return $this;
65	}
66
	@@ -223,9 +224,10 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
223
224	// Convert gender.
225	if(!empty($_data['gender'])) {

226	switch($_data['gender']) {
227	- case $this->_gender[0]: $_data['gender'] = 1; break;
228	- case $this->_gender[1]: $_data['gender'] = 2; break;
229	default: $_data['gender'] = 0;
230	}
231	}
	@@ -356,14 +358,13 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
356
357	public function getButton()
358	{
359	- ~~if(empty($this->_applicationId)~~ ~~\|\| empty($this->_secret)) {~~

360	$uri = null;
361	- }elseif(is_array($this->_buttonLinkParams)) {
362	- $uri = $this->_url .'?'. urldecode(http_build_query($this->_buttonLinkParams));
363	}else{
364	- $uri = $this->~~_buttonLinkParams~~;
365	}
366	-
367	// Images.
368	$image = array();
369	$media = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) .'pslogin/';
	@@ -391,11 +392,29 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
391	);
392	}
393













394	public function getProvider()
395	{
396	return $this->_type;
397	}
398





399	public function _setLog($data, $append = false)
400	{
401	return;


21	const PHOTO_FILE_EXT = 'png';
22
23	protected $_type = null;
24	+ protected $_protocol = 'OAuth';
25	protected $_websiteId = null;
26	protected $_redirectUri = null;
27	protected $_userData = array();

61	'customer_id' => $customerId
62	);
63
64	+ $this->addData($data)->save();
65	return $this;
66	}
67

224
225	// Convert gender.
226	if(!empty($_data['gender'])) {
227	+ $options = Mage::getResourceSingleton('customer/customer')->getAttribute('gender')->getSource()->getAllOptions(false);
228	switch($_data['gender']) {
229	+ case $this->_gender[0]: $_data['gender'] = $options[0]['value']; break;
230	+ case $this->_gender[1]: $_data['gender'] = $options[1]['value']; break;
231	default: $_data['gender'] = 0;
232	}
233	}

358
359	public function getButton()
360	{
361	+ // Href.
362	+ if($this->getProtocol() == 'OAuth' && (empty($this->_applicationId) \|\| empty($this->_secret))) {
363	$uri = null;


364	}else{
365	+ $uri = Mage::getUrl('pslogin/account/use', array('type' => $this->_type));
366	}
367	+
368	// Images.
369	$image = array();
370	$media = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) .'pslogin/';

392	);
393	}
394
395	+ public function getProviderLink()
396	+ {
397	+ if(empty($this->_applicationId) \|\| empty($this->_secret)) {
398	+ $uri = null;
399	+ }elseif(is_array($this->_buttonLinkParams)) {
400	+ $uri = $this->_url .'?'. urldecode(http_build_query($this->_buttonLinkParams));
401	+ }else{
402	+ $uri = $this->_buttonLinkParams;
403	+ }
404	+
405	+ return $uri;
406	+ }
407	+
408	public function getProvider()
409	{
410	return $this->_type;
411	}
412
413	+ public function getProtocol()
414	+ {
415	+ return $this->_protocol;
416	+ }
417	+
418	public function _setLog($data, $append = false)
419	{
420	return;

app/code/community/Plumrocket/SocialLogin/Model/Observer.php CHANGED Viewed

@@ -105,4 +105,14 @@ class Plumrocket_SocialLogin_Model_Observer
                     Mage::app()->getRequest()->setParam(Mage_Core_Controller_Varien_Action::PARAM_NAME_SUCCESS_URL, $redirectUrl);
+                }
+            }


105	Mage::app()->getRequest()->setParam(Mage_Core_Controller_Varien_Action::PARAM_NAME_SUCCESS_URL, $redirectUrl);
106	}
107
108	+ public function httpResponseSendBefore($observer)
109	+ {
110	+
111	+ }
112	+
113	+ public function customerLogout()
114	+ {
115	+
116	+ }
117	+
118	}

app/code/community/Plumrocket/SocialLogin/Model/Twitter.php CHANGED Viewed

	@@ -43,12 +43,16 @@ class Plumrocket_SocialLogin_Model_Twitter extends Plumrocket_SocialLogin_Model_
43
44	public function _construct()
45	{
46	- parent::_construct();

47


48	$token = $this->_getStartToken();
49	if(!empty($token['oauth_token'])) {
50	$this->_buttonLinkParams = self::URL_AUTHORIZE .'?oauth_token='. $token['oauth_token'];
51	}

52	}
53
54	// Step 2.


43
44	public function _construct()
45	{
46	+ parent::_construct();
47	+ }
48
49	+ public function getProviderLink()
50	+ {
51	$token = $this->_getStartToken();
52	if(!empty($token['oauth_token'])) {
53	$this->_buttonLinkParams = self::URL_AUTHORIZE .'?oauth_token='. $token['oauth_token'];
54	}
55	+ return parent::getProviderLink();
56	}
57
58	// Step 2.

app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php CHANGED Viewed

@@ -18,6 +18,43 @@
             class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Front_Action
+            {
                 public function loginAction()
+                {
@@ -28,7 +65,7 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
+                    }
                     $type = $this->getRequest()->getParam('type');
-            -
                    $className = "Plumrocket_SocialLogin_Model_$type";
                     if(!$type || !class_exists($className)) {
                         return $this->_windowClose();
                         // $this->_redirect('customer/account/login');
@@ -91,11 +128,11 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
+                                }
+                            }
-            -
                            // Remember customer.
-            -
                            $model->setCustomerIdByUserId($customerId);
-            -
                             // Dispatch event.
                             $this->_dispatchRegisterSuccess($model->getCustomer());
                             // Post mail.
                             $model->postToMail();
@@ -138,12 +175,26 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
                         $this->_getHelper()->refererLink(null);
+                    }
-            -
                    $this->getResponse()->setBody('<script type="text/javascript">window.close(); window.opener.location.href = "'.$redirectUrl.'";</script>');
+                }
                 protected function _windowClose()
+                {
-            -
                    $this->getResponse()->setBody('<script type="text/javascript">window.close();</script>');
                     // $this->getResponse()->setBody('<script type="text/javascript">if(window.name == "pslogin_popup") { window.close(); }</script>');
                     return true;
+                }


18
19	class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Front_Action
20	{
21	+
22	+ public function useAction()
23	+ {
24	+ $session = $this->_getSession();
25	+ if ($session->isLoggedIn()) {
26	+ return $this->_windowClose();
27	+ }
28	+
29	+ $type = $this->getRequest()->getParam('type');
30	+ $className = 'Plumrocket_SocialLogin_Model_'. ucfirst($type);
31	+ if(!$type \|\| !class_exists($className)) {
32	+ return $this->_windowClose();
33	+ }
34	+ $model = Mage::getSingleton("pslogin/$type");
35	+
36	+ if(!$this->_getHelper()->moduleEnabled() \|\| !$model->enabled()) {
37	+ return $this->_windowClose();
38	+ }
39	+
40	+ $link = null;
41	+ switch($model->getProtocol()) {
42	+
43	+ case 'OAuth':
44	+ if($link = $model->getProviderLink()) {
45	+ $this->_redirectUrl($link);
46	+ }else{
47	+ $this->getResponse()->setBody($this->__('This Login Application was not configured correctly. Please contact our customer support.'));
48	+ }
49	+ break;
50	+
51	+ case 'OpenID':
52	+ case 'BrowserID':
53	+ default:
54	+ return $this->_windowClose();
55	+ }
56	+
57	+ }
58
59	public function loginAction()
60	{

65	}
66
67	$type = $this->getRequest()->getParam('type');
68	+ $className = 'Plumrocket_SocialLogin_Model_'. ucfirst($type);
69	if(!$type \|\| !class_exists($className)) {
70	return $this->_windowClose();
71	// $this->_redirect('customer/account/login');

128	}
129	}
130



131	// Dispatch event.
132	$this->_dispatchRegisterSuccess($model->getCustomer());
133	+
134	+ // Remember customer.
135	+ $model->setCustomerIdByUserId($customerId);
136
137	// Post mail.
138	$model->postToMail();

175	$this->_getHelper()->refererLink(null);
176	}
177
178	+ if($this->getRequest()->isXmlHttpRequest()) {
179	+ $this->getResponse()->clearHeaders()->setHeader('Content-type', 'application/json', true);
180	+ $this->getResponse()->setBody(json_encode(array(
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
188	protected function _windowClose()
189	{
190	+ if($this->getRequest()->isXmlHttpRequest()) {
191	+ $this->getResponse()->clearHeaders()->setHeader('Content-type', 'application/json', true);
192	+ $this->getResponse()->setBody(json_encode(array(
193	+ 'windowClose' => true
194	+ )));
195	+ }else{
196	+ $this->getResponse()->setBody('<script type="text/javascript">window.close();</script>');
197	+ }
198	// $this->getResponse()->setBody('<script type="text/javascript">if(window.name == "pslogin_popup") { window.close(); }</script>');
199	return true;
200	}

app/code/community/Plumrocket/SocialLogin/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<Plumrocket_SocialLogin>
5	- <version>1.1.0</version>
6	</Plumrocket_SocialLogin>
7	</modules>
8	<frontend>
	@@ -78,6 +78,11 @@
78	<rewrite>
79	<html_welcome>Plumrocket_SocialLogin_Block_Page_Html_Welcome</html_welcome>
80	</rewrite>





81	</page>
82	</blocks>
83	<resources>
	@@ -115,6 +120,24 @@
115	</pslogin_observer>
116	</observers>
117	</customer_register_success>


















118	</events>
119	</global>
120	<default>


2	<config>
3	<modules>
4	<Plumrocket_SocialLogin>
5	+ <version>1.2.0</version>
6	</Plumrocket_SocialLogin>
7	</modules>
8	<frontend>

78	<rewrite>
79	<html_welcome>Plumrocket_SocialLogin_Block_Page_Html_Welcome</html_welcome>
80	</rewrite>
81	+ </page>
82	+ <page>
83	+ <rewrite>
84	+ <html_header>Plumrocket_SocialLogin_Block_Page_Html_Header</html_header>
85	+ </rewrite>
86	</page>
87	</blocks>
88	<resources>

120	</pslogin_observer>
121	</observers>
122	</customer_register_success>
123	+ <http_response_send_before>
124	+ <observers>
125	+ <pslogin_observer>
126	+ <type>singleton</type>
127	+ <class>pslogin/observer</class>
128	+ <method>httpResponseSendBefore</method>
129	+ </pslogin_observer>
130	+ </observers>
131	+ </http_response_send_before>
132	+ <customer_logout>
133	+ <observers>
134	+ <pslogin_observer>
135	+ <type>singleton</type>
136	+ <class>pslogin/observer</class>
137	+ <method>customerLogout</method>
138	+ </pslogin_observer>
139	+ </observers>
140	+ </customer_logout>
141	</events>
142	</global>
143	<default>

app/code/community/Plumrocket/SocialLogin/etc/system.xml CHANGED Viewed

	@@ -487,29 +487,9 @@
487	</fields>
488	</live>
489
490	- <pinterest>
491	- <label>Pinterest</label>
492	- <sort_order>110</sort_order>
493	- <frontend_type>text</frontend_type>
494	- <show_in_default>1</show_in_default>
495	- <show_in_website>1</show_in_website>
496	- <show_in_store>1</show_in_store>
497	-
498	- <fields>
499	- <version translate="label">
500	- <frontend_type>text</frontend_type>
501	- <frontend_model>pslogin/system_config_notinstalled</frontend_model>
502	- <sort_order>1</sort_order>
503	- <show_in_default>1</show_in_default>
504	- <show_in_website>1</show_in_website>
505	- <show_in_store>1</show_in_store>
506	- </version>
507	- </fields>
508	- </pinterest>
509	-
510	<amazon>
511	<label>Amazon</label>
512	- <sort_order>~~120~~</sort_order>
513	<frontend_type>text</frontend_type>
514	<show_in_default>1</show_in_default>
515	<show_in_website>1</show_in_website>
	@@ -529,7 +509,7 @@
529
530	<aol>
531	<label>AOL.</label>
532	- <sort_order>~~130~~</sort_order>
533	<frontend_type>text</frontend_type>
534	<show_in_default>1</show_in_default>
535	<show_in_website>1</show_in_website>
	@@ -549,7 +529,7 @@
549
550	<github>
551	<label>GitHub</label>
552	- <sort_order>~~140~~</sort_order>
553	<frontend_type>text</frontend_type>
554	<show_in_default>1</show_in_default>
555	<show_in_website>1</show_in_website>
	@@ -569,7 +549,7 @@
569
570	<instagram>
571	<label>Instagram</label>
572	- <sort_order>~~150~~</sort_order>
573	<frontend_type>text</frontend_type>
574	<show_in_default>1</show_in_default>
575	<show_in_website>1</show_in_website>
	@@ -589,7 +569,7 @@
589
590	<foursquare>
591	<label>Foursquare</label>
592	- <sort_order>~~160~~</sort_order>
593	<frontend_type>text</frontend_type>
594	<show_in_default>1</show_in_default>
595	<show_in_website>1</show_in_website>
	@@ -609,7 +589,7 @@
609
610	<dropbox>
611	<label>Dropbox</label>
612	- <sort_order>~~170~~</sort_order>
613	<frontend_type>text</frontend_type>
614	<show_in_default>1</show_in_default>
615	<show_in_website>1</show_in_website>
	@@ -626,10 +606,10 @@
626	</version>
627	</fields>
628	</dropbox>
629	-
630	<disqus>
631	<label>Disqus</label>
632	- <sort_order>~~180~~</sort_order>
633	<frontend_type>text</frontend_type>
634	<show_in_default>1</show_in_default>
635	<show_in_website>1</show_in_website>
	@@ -649,7 +629,7 @@
649
650	<livejournal>
651	<label>LiveJournal</label>
652	- <sort_order>~~190~~</sort_order>
653	<frontend_type>text</frontend_type>
654	<show_in_default>1</show_in_default>
655	<show_in_website>1</show_in_website>
	@@ -669,7 +649,7 @@
669
670	<tumblr>
671	<label>Tumblr</label>
672	- <sort_order>~~200~~</sort_order>
673	<frontend_type>text</frontend_type>
674	<show_in_default>1</show_in_default>
675	<show_in_website>1</show_in_website>
	@@ -687,8 +667,28 @@
687	</fields>
688	</tumblr>
689
690	- <~~openid~~>
691	- <label>~~OpenID~~</label>




















692	<sort_order>210</sort_order>
693	<frontend_type>text</frontend_type>
694	<show_in_default>1</show_in_default>
	@@ -705,10 +705,10 @@
705	<show_in_store>1</show_in_store>
706	</version>
707	</fields>
708	- </~~openid~~>
709
710	- <~~flickr~~>
711	- <label>~~Flickr~~</label>
712	<sort_order>220</sort_order>
713	<frontend_type>text</frontend_type>
714	<show_in_default>1</show_in_default>
	@@ -725,10 +725,10 @@
725	<show_in_store>1</show_in_store>
726	</version>
727	</fields>
728	- </~~flickr~~>
729
730	- <~~wordpress~~>
731	- <label>~~WordPress~~</label>
732	<sort_order>230</sort_order>
733	<frontend_type>text</frontend_type>
734	<show_in_default>1</show_in_default>
	@@ -745,10 +745,10 @@
745	<show_in_store>1</show_in_store>
746	</version>
747	</fields>
748	- </~~wordpress~~>
749
750	- <~~vkontakte~~>
751	- <label>~~Vkontakte~~</label>
752	<sort_order>240</sort_order>
753	<frontend_type>text</frontend_type>
754	<show_in_default>1</show_in_default>
	@@ -765,10 +765,10 @@
765	<show_in_store>1</show_in_store>
766	</version>
767	</fields>
768	- </~~vkontakte~~>
769
770	- <~~odnoklassniki~~>
771	- <label>~~Odnoklassniki~~</label>
772	<sort_order>250</sort_order>
773	<frontend_type>text</frontend_type>
774	<show_in_default>1</show_in_default>
	@@ -785,10 +785,10 @@
785	<show_in_store>1</show_in_store>
786	</version>
787	</fields>
788	- </~~odnoklassniki~~>
789
790	- <~~mailru~~>
791	- <label>~~Mail.ru~~</label>
792	<sort_order>260</sort_order>
793	<frontend_type>text</frontend_type>
794	<show_in_default>1</show_in_default>
	@@ -805,10 +805,10 @@
805	<show_in_store>1</show_in_store>
806	</version>
807	</fields>
808	- </~~mailru~~>
809
810	- <~~yandex~~>
811	- <label>~~Yandex~~</label>
812	<sort_order>270</sort_order>
813	<frontend_type>text</frontend_type>
814	<show_in_default>1</show_in_default>
	@@ -825,10 +825,10 @@
825	<show_in_store>1</show_in_store>
826	</version>
827	</fields>
828	- </~~yandex~~>
829
830	- <~~paypal~~>
831	- <label>~~PayPal~~</label>
832	<sort_order>280</sort_order>
833	<frontend_type>text</frontend_type>
834	<show_in_default>1</show_in_default>
	@@ -845,10 +845,10 @@
845	<show_in_store>1</show_in_store>
846	</version>
847	</fields>
848	- </~~paypal~~>
849
850	- <~~myspace~~>
851	- <label>~~MySpace~~</label>
852	<sort_order>290</sort_order>
853	<frontend_type>text</frontend_type>
854	<show_in_default>1</show_in_default>
	@@ -865,10 +865,10 @@
865	<show_in_store>1</show_in_store>
866	</version>
867	</fields>
868	- </~~myspace~~>
869
870	- <~~salesforce~~>
871	- <label>~~Salesforce~~</label>
872	<sort_order>300</sort_order>
873	<frontend_type>text</frontend_type>
874	<show_in_default>1</show_in_default>
	@@ -885,10 +885,10 @@
885	<show_in_store>1</show_in_store>
886	</version>
887	</fields>
888	- </~~salesforce~~>
889
890	- <~~steam~~>
891	- <label>~~Steam Community~~</label>
892	<sort_order>310</sort_order>
893	<frontend_type>text</frontend_type>
894	<show_in_default>1</show_in_default>
	@@ -905,11 +905,11 @@
905	<show_in_store>1</show_in_store>
906	</version>
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>
915	<show_in_website>1</show_in_website>
	@@ -924,12 +924,12 @@
924	<show_in_website>1</show_in_website>
925	<show_in_store>1</show_in_store>
926	</version>
927	- </fields>
928	- </~~stackoverflow~~>
929
930	- <~~evernote~~>
931	- <label>~~Evernote~~</label>
932	- <sort_order>~~340~~</sort_order>
933	<frontend_type>text</frontend_type>
934	<show_in_default>1</show_in_default>
935	<show_in_website>1</show_in_website>
	@@ -944,11 +944,11 @@
944	<show_in_website>1</show_in_website>
945	<show_in_store>1</show_in_store>
946	</version>
947	- </fields>
948	- </~~evernote~~>
949
950	- <~~mixi~~>
951	- <label>~~Mixi~~</label>
952	<sort_order>350</sort_order>
953	<frontend_type>text</frontend_type>
954	<show_in_default>1</show_in_default>
	@@ -964,11 +964,11 @@
964	<show_in_website>1</show_in_website>
965	<show_in_store>1</show_in_store>
966	</version>
967	- </fields>
968	- </~~mixi~~>
969
970	- <~~mydigipass~~>
971	- <label>~~MYDIGIPASS.COM~~</label>
972	<sort_order>360</sort_order>
973	<frontend_type>text</frontend_type>
974	<show_in_default>1</show_in_default>
	@@ -984,11 +984,11 @@
984	<show_in_website>1</show_in_website>
985	<show_in_store>1</show_in_store>
986	</version>
987	- </fields>
988	- </~~mydigipass~~>
989
990	- <~~netlog~~>
991	- <label>~~Netlog~~</label>
992	<sort_order>370</sort_order>
993	<frontend_type>text</frontend_type>
994	<show_in_default>1</show_in_default>
	@@ -1004,11 +1004,11 @@
1004	<show_in_website>1</show_in_website>
1005	<show_in_store>1</show_in_store>
1006	</version>
1007	- </fields>
1008	- </~~netlog~~>
1009
1010	- <qq>
1011	- <label>QQ</label>
1012	<sort_order>380</sort_order>
1013	<frontend_type>text</frontend_type>
1014	<show_in_default>1</show_in_default>
	@@ -1024,11 +1024,11 @@
1024	<show_in_website>1</show_in_website>
1025	<show_in_store>1</show_in_store>
1026	</version>
1027	- </fields>
1028	- </qq>
1029
1030	- <~~sinaweibo~~>
1031	- <label>~~Sina~~ ~~Weibo~~</label>
1032	<sort_order>390</sort_order>
1033	<frontend_type>text</frontend_type>
1034	<show_in_default>1</show_in_default>
	@@ -1044,11 +1044,11 @@
1044	<show_in_website>1</show_in_website>
1045	<show_in_store>1</show_in_store>
1046	</version>
1047	- </fields>
1048	- </~~sinaweibo~~>
1049
1050	- <~~soundcloud~~>
1051	- <label>~~SoundCloud~~</label>
1052	<sort_order>400</sort_order>
1053	<frontend_type>text</frontend_type>
1054	<show_in_default>1</show_in_default>
	@@ -1064,11 +1064,11 @@
1064	<show_in_website>1</show_in_website>
1065	<show_in_store>1</show_in_store>
1066	</version>
1067	- </fields>
1068	- </~~soundcloud~~>
1069
1070	- <~~tencentweibo~~>
1071	- <label>~~Tencent Weibo~~</label>
1072	<sort_order>410</sort_order>
1073	<frontend_type>text</frontend_type>
1074	<show_in_default>1</show_in_default>
	@@ -1084,11 +1084,11 @@
1084	<show_in_website>1</show_in_website>
1085	<show_in_store>1</show_in_store>
1086	</version>
1087	- </fields>
1088	- </~~tencentweibo~~>
1089
1090	- <~~verisign~~>
1091	- <label>~~Verisign~~</label>
1092	<sort_order>420</sort_order>
1093	<frontend_type>text</frontend_type>
1094	<show_in_default>1</show_in_default>
	@@ -1104,11 +1104,11 @@
1104	<show_in_website>1</show_in_website>
1105	<show_in_store>1</show_in_store>
1106	</version>
1107	- </fields>
1108	- </~~verisign~~>
1109
1110	- <~~xing~~>
1111	- <label>~~XING~~</label>
1112	<sort_order>430</sort_order>
1113	<frontend_type>text</frontend_type>
1114	<show_in_default>1</show_in_default>
	@@ -1124,11 +1124,11 @@
1124	<show_in_website>1</show_in_website>
1125	<show_in_store>1</show_in_store>
1126	</version>
1127	- </fields>
1128	- </~~xing~~>
1129
1130	- <~~kaixin~~>
1131	- <label>~~Kaixin~~</label>
1132	<sort_order>440</sort_order>
1133	<frontend_type>text</frontend_type>
1134	<show_in_default>1</show_in_default>
	@@ -1144,11 +1144,11 @@
1144	<show_in_website>1</show_in_website>
1145	<show_in_store>1</show_in_store>
1146	</version>
1147	- </fields>
1148	- </~~kaixin~~>
1149
1150	- <~~orange~~>
1151	- <label>~~Orange~~</label>
1152	<sort_order>450</sort_order>
1153	<frontend_type>text</frontend_type>
1154	<show_in_default>1</show_in_default>
	@@ -1164,11 +1164,11 @@
1164	<show_in_website>1</show_in_website>
1165	<show_in_store>1</show_in_store>
1166	</version>
1167	- </fields>
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>
	@@ -1184,32 +1184,12 @@
1184	<show_in_website>1</show_in_website>
1185	<show_in_store>1</show_in_store>
1186	</version>
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>
1196	- <show_in_store>1</show_in_store>
1197	-
1198	- <fields>
1199	- <version translate="label">
1200	- <frontend_type>text</frontend_type>
1201	- <frontend_model>pslogin/system_config_notinstalled</frontend_model>
1202	- <sort_order>1</sort_order>
1203	- <show_in_default>1</show_in_default>
1204	- <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>
	@@ -1224,12 +1204,12 @@
1224	<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>
	@@ -1244,12 +1224,12 @@
1244	<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>
	@@ -1264,12 +1244,12 @@
1264	<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>
	@@ -1284,12 +1264,12 @@
1284	<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>
	@@ -1304,12 +1284,12 @@
1304	<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>
	@@ -1324,12 +1304,12 @@
1324	<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>
	@@ -1344,12 +1324,12 @@
1344	<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>
	@@ -1364,12 +1344,12 @@
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>
	@@ -1384,8 +1364,8 @@
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>


487	</fields>
488	</live>
489




















490	<amazon>
491	<label>Amazon</label>
492	+ <sort_order>110</sort_order>
493	<frontend_type>text</frontend_type>
494	<show_in_default>1</show_in_default>
495	<show_in_website>1</show_in_website>

509
510	<aol>
511	<label>AOL.</label>
512	+ <sort_order>120</sort_order>
513	<frontend_type>text</frontend_type>
514	<show_in_default>1</show_in_default>
515	<show_in_website>1</show_in_website>

529
530	<github>
531	<label>GitHub</label>
532	+ <sort_order>130</sort_order>
533	<frontend_type>text</frontend_type>
534	<show_in_default>1</show_in_default>
535	<show_in_website>1</show_in_website>

549
550	<instagram>
551	<label>Instagram</label>
552	+ <sort_order>140</sort_order>
553	<frontend_type>text</frontend_type>
554	<show_in_default>1</show_in_default>
555	<show_in_website>1</show_in_website>

569
570	<foursquare>
571	<label>Foursquare</label>
572	+ <sort_order>150</sort_order>
573	<frontend_type>text</frontend_type>
574	<show_in_default>1</show_in_default>
575	<show_in_website>1</show_in_website>

589
590	<dropbox>
591	<label>Dropbox</label>
592	+ <sort_order>160</sort_order>
593	<frontend_type>text</frontend_type>
594	<show_in_default>1</show_in_default>
595	<show_in_website>1</show_in_website>

606	</version>
607	</fields>
608	</dropbox>
609	+
610	<disqus>
611	<label>Disqus</label>
612	+ <sort_order>170</sort_order>
613	<frontend_type>text</frontend_type>
614	<show_in_default>1</show_in_default>
615	<show_in_website>1</show_in_website>

629
630	<livejournal>
631	<label>LiveJournal</label>
632	+ <sort_order>180</sort_order>
633	<frontend_type>text</frontend_type>
634	<show_in_default>1</show_in_default>
635	<show_in_website>1</show_in_website>

649
650	<tumblr>
651	<label>Tumblr</label>
652	+ <sort_order>190</sort_order>
653	<frontend_type>text</frontend_type>
654	<show_in_default>1</show_in_default>
655	<show_in_website>1</show_in_website>

667	</fields>
668	</tumblr>
669
670	+ <flickr>
671	+ <label>Flickr</label>
672	+ <sort_order>200</sort_order>
673	+ <frontend_type>text</frontend_type>
674	+ <show_in_default>1</show_in_default>
675	+ <show_in_website>1</show_in_website>
676	+ <show_in_store>1</show_in_store>
677	+
678	+ <fields>
679	+ <version translate="label">
680	+ <frontend_type>text</frontend_type>
681	+ <frontend_model>pslogin/system_config_notinstalled</frontend_model>
682	+ <sort_order>1</sort_order>
683	+ <show_in_default>1</show_in_default>
684	+ <show_in_website>1</show_in_website>
685	+ <show_in_store>1</show_in_store>
686	+ </version>
687	+ </fields>
688	+ </flickr>
689	+
690	+ <wordpress>
691	+ <label>WordPress</label>
692	<sort_order>210</sort_order>
693	<frontend_type>text</frontend_type>
694	<show_in_default>1</show_in_default>

705	<show_in_store>1</show_in_store>
706	</version>
707	</fields>
708	+ </wordpress>
709
710	+ <vkontakte>
711	+ <label>Vkontakte</label>
712	<sort_order>220</sort_order>
713	<frontend_type>text</frontend_type>
714	<show_in_default>1</show_in_default>

725	<show_in_store>1</show_in_store>
726	</version>
727	</fields>
728	+ </vkontakte>
729
730	+ <odnoklassniki>
731	+ <label>Odnoklassniki</label>
732	<sort_order>230</sort_order>
733	<frontend_type>text</frontend_type>
734	<show_in_default>1</show_in_default>

745	<show_in_store>1</show_in_store>
746	</version>
747	</fields>
748	+ </odnoklassniki>
749
750	+ <mailru>
751	+ <label>Mail.ru</label>
752	<sort_order>240</sort_order>
753	<frontend_type>text</frontend_type>
754	<show_in_default>1</show_in_default>

765	<show_in_store>1</show_in_store>
766	</version>
767	</fields>
768	+ </mailru>
769
770	+ <yandex>
771	+ <label>Yandex</label>
772	<sort_order>250</sort_order>
773	<frontend_type>text</frontend_type>
774	<show_in_default>1</show_in_default>

785	<show_in_store>1</show_in_store>
786	</version>
787	</fields>
788	+ </yandex>
789
790	+ <paypal>
791	+ <label>PayPal</label>
792	<sort_order>260</sort_order>
793	<frontend_type>text</frontend_type>
794	<show_in_default>1</show_in_default>

805	<show_in_store>1</show_in_store>
806	</version>
807	</fields>
808	+ </paypal>
809
810	+ <salesforce>
811	+ <label>Salesforce</label>
812	<sort_order>270</sort_order>
813	<frontend_type>text</frontend_type>
814	<show_in_default>1</show_in_default>

825	<show_in_store>1</show_in_store>
826	</version>
827	</fields>
828	+ </salesforce>
829
830	+ <stackoverflow>
831	+ <label>Stackoverflow (StackExchange)</label>
832	<sort_order>280</sort_order>
833	<frontend_type>text</frontend_type>
834	<show_in_default>1</show_in_default>

845	<show_in_store>1</show_in_store>
846	</version>
847	</fields>
848	+ </stackoverflow>
849
850	+ <evernote>
851	+ <label>Evernote</label>
852	<sort_order>290</sort_order>
853	<frontend_type>text</frontend_type>
854	<show_in_default>1</show_in_default>

865	<show_in_store>1</show_in_store>
866	</version>
867	</fields>
868	+ </evernote>
869
870	+ <mixi>
871	+ <label>Mixi</label>
872	<sort_order>300</sort_order>
873	<frontend_type>text</frontend_type>
874	<show_in_default>1</show_in_default>

885	<show_in_store>1</show_in_store>
886	</version>
887	</fields>
888	+ </mixi>
889
890	+ <mydigipass>
891	+ <label>MYDIGIPASS.COM</label>
892	<sort_order>310</sort_order>
893	<frontend_type>text</frontend_type>
894	<show_in_default>1</show_in_default>

905	<show_in_store>1</show_in_store>
906	</version>
907	</fields>
908	+ </mydigipass>
909
910	+ <qq>
911	+ <label>QQ</label>
912	+ <sort_order>320</sort_order>
913	<frontend_type>text</frontend_type>
914	<show_in_default>1</show_in_default>
915	<show_in_website>1</show_in_website>

924	<show_in_website>1</show_in_website>
925	<show_in_store>1</show_in_store>
926	</version>
927	+ </fields>
928	+ </qq>
929
930	+ <sinaweibo>
931	+ <label>Sina Weibo</label>
932	+ <sort_order>330</sort_order>
933	<frontend_type>text</frontend_type>
934	<show_in_default>1</show_in_default>
935	<show_in_website>1</show_in_website>

944	<show_in_website>1</show_in_website>
945	<show_in_store>1</show_in_store>
946	</version>
947	+ </fields>
948	+ </sinaweibo>
949
950	+ <soundcloud>
951	+ <label>SoundCloud</label>
952	<sort_order>350</sort_order>
953	<frontend_type>text</frontend_type>
954	<show_in_default>1</show_in_default>

964	<show_in_website>1</show_in_website>
965	<show_in_store>1</show_in_store>
966	</version>
967	+ </fields>
968	+ </soundcloud>
969
970	+ <verisign>
971	+ <label>Verisign</label>
972	<sort_order>360</sort_order>
973	<frontend_type>text</frontend_type>
974	<show_in_default>1</show_in_default>

984	<show_in_website>1</show_in_website>
985	<show_in_store>1</show_in_store>
986	</version>
987	+ </fields>
988	+ </verisign>
989
990	+ <xing>
991	+ <label>XING</label>
992	<sort_order>370</sort_order>
993	<frontend_type>text</frontend_type>
994	<show_in_default>1</show_in_default>

1004	<show_in_website>1</show_in_website>
1005	<show_in_store>1</show_in_store>
1006	</version>
1007	+ </fields>
1008	+ </xing>
1009
1010	+ <kaixin001>
1011	+ <label>Kaixin001</label>
1012	<sort_order>380</sort_order>
1013	<frontend_type>text</frontend_type>
1014	<show_in_default>1</show_in_default>

1024	<show_in_website>1</show_in_website>
1025	<show_in_store>1</show_in_store>
1026	</version>
1027	+ </fields>
1028	+ </kaixin001>
1029
1030	+ <persona>
1031	+ <label>Persona / BrowserID</label>
1032	<sort_order>390</sort_order>
1033	<frontend_type>text</frontend_type>
1034	<show_in_default>1</show_in_default>

1044	<show_in_website>1</show_in_website>
1045	<show_in_store>1</show_in_store>
1046	</version>
1047	+ </fields>
1048	+ </persona>
1049
1050	+ <bitbucket>
1051	+ <label>Bitbucket</label>
1052	<sort_order>400</sort_order>
1053	<frontend_type>text</frontend_type>
1054	<show_in_default>1</show_in_default>

1064	<show_in_website>1</show_in_website>
1065	<show_in_store>1</show_in_store>
1066	</version>
1067	+ </fields>
1068	+ </bitbucket>
1069
1070	+ <skyrock>
1071	+ <label>Skyrock</label>
1072	<sort_order>410</sort_order>
1073	<frontend_type>text</frontend_type>
1074	<show_in_default>1</show_in_default>

1084	<show_in_website>1</show_in_website>
1085	<show_in_store>1</show_in_store>
1086	</version>
1087	+ </fields>
1088	+ </skyrock>
1089
1090	+ <renren>
1091	+ <label>Renren</label>
1092	<sort_order>420</sort_order>
1093	<frontend_type>text</frontend_type>
1094	<show_in_default>1</show_in_default>

1104	<show_in_website>1</show_in_website>
1105	<show_in_store>1</show_in_store>
1106	</version>
1107	+ </fields>
1108	+ </renren>
1109
1110	+ <bitly>
1111	+ <label>Bitly</label>
1112	<sort_order>430</sort_order>
1113	<frontend_type>text</frontend_type>
1114	<show_in_default>1</show_in_default>

1124	<show_in_website>1</show_in_website>
1125	<show_in_store>1</show_in_store>
1126	</version>
1127	+ </fields>
1128	+ </bitly>
1129
1130	+ <boxcom>
1131	+ <label>Box.com</label>
1132	<sort_order>440</sort_order>
1133	<frontend_type>text</frontend_type>
1134	<show_in_default>1</show_in_default>

1144	<show_in_website>1</show_in_website>
1145	<show_in_store>1</show_in_store>
1146	</version>
1147	+ </fields>
1148	+ </boxcom>
1149
1150	+ <vimeo>
1151	+ <label>Vimeo</label>
1152	<sort_order>450</sort_order>
1153	<frontend_type>text</frontend_type>
1154	<show_in_default>1</show_in_default>

1164	<show_in_website>1</show_in_website>
1165	<show_in_store>1</show_in_store>
1166	</version>
1167	+ </fields>
1168	+ </vimeo>
1169
1170	+ <reddit>
1171	+ <label>Reddit</label>
1172	<sort_order>460</sort_order>
1173	<frontend_type>text</frontend_type>
1174	<show_in_default>1</show_in_default>

1184	<show_in_website>1</show_in_website>
1185	<show_in_store>1</show_in_store>
1186	</version>
1187	+ </fields>
1188	+ </reddit>




















1189
1190	+ <odesk>
1191	+ <label>oDesk</label>
1192	+ <sort_order>470</sort_order>
1193	<frontend_type>text</frontend_type>
1194	<show_in_default>1</show_in_default>
1195	<show_in_website>1</show_in_website>

1204	<show_in_website>1</show_in_website>
1205	<show_in_store>1</show_in_store>
1206	</version>
1207	+ </fields>
1208	+ </odesk>
1209
1210	+ <teamviewer>
1211	+ <label>TeamViewer</label>
1212	+ <sort_order>480</sort_order>
1213	<frontend_type>text</frontend_type>
1214	<show_in_default>1</show_in_default>
1215	<show_in_website>1</show_in_website>

1224	<show_in_website>1</show_in_website>
1225	<show_in_store>1</show_in_store>
1226	</version>
1227	+ </fields>
1228	+ </teamviewer>
1229
1230	+ <etsy>
1231	+ <label>Etsy</label>
1232	+ <sort_order>490</sort_order>
1233	<frontend_type>text</frontend_type>
1234	<show_in_default>1</show_in_default>
1235	<show_in_website>1</show_in_website>

1244	<show_in_website>1</show_in_website>
1245	<show_in_store>1</show_in_store>
1246	</version>
1247	+ </fields>
1248	+ </etsy>
1249
1250	+ <imgur>
1251	+ <label>Imgur</label>
1252	+ <sort_order>500</sort_order>
1253	<frontend_type>text</frontend_type>
1254	<show_in_default>1</show_in_default>
1255	<show_in_website>1</show_in_website>

1264	<show_in_website>1</show_in_website>
1265	<show_in_store>1</show_in_store>
1266	</version>
1267	+ </fields>
1268	+ </imgur>
1269
1270	+ <intuit>
1271	+ <label>Intuit</label>
1272	+ <sort_order>510</sort_order>
1273	<frontend_type>text</frontend_type>
1274	<show_in_default>1</show_in_default>
1275	<show_in_website>1</show_in_website>

1284	<show_in_website>1</show_in_website>
1285	<show_in_store>1</show_in_store>
1286	</version>
1287	+ </fields>
1288	+ </intuit>
1289
1290	+ <mailchimp>
1291	+ <label>MailChimp</label>
1292	+ <sort_order>520</sort_order>
1293	<frontend_type>text</frontend_type>
1294	<show_in_default>1</show_in_default>
1295	<show_in_website>1</show_in_website>

1304	<show_in_website>1</show_in_website>
1305	<show_in_store>1</show_in_store>
1306	</version>
1307	+ </fields>
1308	+ </mailchimp>
1309
1310	+ <dribbble>
1311	+ <label>Dribbble</label>
1312	+ <sort_order>530</sort_order>
1313	<frontend_type>text</frontend_type>
1314	<show_in_default>1</show_in_default>
1315	<show_in_website>1</show_in_website>

1324	<show_in_website>1</show_in_website>
1325	<show_in_store>1</show_in_store>
1326	</version>
1327	+ </fields>
1328	+ </dribbble>
1329
1330	+ <goodreads>
1331	+ <label>Goodreads</label>
1332	+ <sort_order>540</sort_order>
1333	<frontend_type>text</frontend_type>
1334	<show_in_default>1</show_in_default>
1335	<show_in_website>1</show_in_website>

1344	<show_in_website>1</show_in_website>
1345	<show_in_store>1</show_in_store>
1346	</version>
1347	+ </fields>
1348	+ </goodreads>
1349
1350	+ <lastfm>
1351	+ <label>Last.fm</label>
1352	+ <sort_order>550</sort_order>
1353	<frontend_type>text</frontend_type>
1354	<show_in_default>1</show_in_default>
1355	<show_in_website>1</show_in_website>

1364	<show_in_website>1</show_in_website>
1365	<show_in_store>1</show_in_store>
1366	</version>
1367	+ </fields>
1368	+ </lastfm>
1369
1370	</groups>
1371	</pslogin>

app/design/frontend/base/default/layout/pslogin.xml CHANGED Viewed

@@ -77,4 +77,13 @@
                         <action ifconfig="pslogin/general/enable" method="setTemplate"><template>pslogin/customer/form/register/sharedata.phtml</template></action>
                     </reference>
                 </pslogin_account_sharedata> -->
             </layout>


77	<action ifconfig="pslogin/general/enable" method="setTemplate"><template>pslogin/customer/form/register/sharedata.phtml</template></action>
78	</reference>
79	</pslogin_account_sharedata> -->
80	+
81	+ <!-- Theme Black&White -->
82	+ <onepagecheckout_index_index>
83	+ <reference name="customer.login">
84	+ <action ifconfig="pslogin/general/replace_templates" method="setTemplate"><template>pslogin/onepagecheckout/login.phtml</template></action>
85	+ <block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
86	+ </reference>
87	+ </onepagecheckout_index_index>
88	+
89	</layout>

app/design/frontend/blacknwhite/default/template/pslogin/customer/form/login.phtml ADDED Viewed

	@@ -0,0 +1,86 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * @category design
6	+ * @package meigeetheme_default
7	+ * @copyright Copyright (c) 2012 MeigeeTeam. (http://www.meigeeteam.com)
8	+ */
9	+ ?>
10	+ <?php
11	+ /**
12	+ * Customer login form template
13	+ *
14	+ * @see app/design/frontend/base/default/template/customer/form/login.phtml
15	+ */
16	+ /** @var $this Mage_Customer_Block_Form_Login */
17	+ ?>
18	+ <div class="account-login">
19	+ <div class="page-title">
20	+ <h1><?php echo $this->__('Login or Create an Account') ?></h1>
21	+ </div>
22	+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
23	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
24	+ <?php echo $this->getBlockHtml('formkey'); ?>
25	+ <div class="grid_6 alpha new-users">
26	+ <div class="content">
27	+ <h2><?php echo $this->__('New Customers') ?></h2>
28	+ <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>
29	+ </div>
30	+ <div class="buttons-set">
31	+ <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>
32	+ </div>
33	+ </div>
34	+ <div class="grid_6 omega registered-users">
35	+ <div class="content">
36	+ <h2><?php echo $this->__('Registered Customers') ?></h2>
37	+ <p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
38	+ <ul class="form-list">
39	+ <li>
40	+ <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
41	+ <div class="input-box">
42	+ <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') ?>" />
43	+ </div>
44	+ </li>
45	+ <li>
46	+ <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
47	+ <div class="input-box">
48	+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
49	+ </div>
50	+ </li>
51	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
52	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
53	+ </ul>
54	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
55	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
56	+ </div>
57	+ <div class="buttons-set">
58	+ <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
59	+ <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
60	+ </div>
61	+
62	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
63	+ <div class="pslogin-spacer pslogin-clearfix">
64	+ <table>
65	+ <tr>
66	+ <td><div class="pslogin-border"></div></td>
67	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
68	+ <td><div class="pslogin-border"></div></td>
69	+ </tr>
70	+ </table>
71	+ </div>
72	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
73	+ <?php endif; ?>
74	+
75	+ </div>
76	+ <div class="clear"></div>
77	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
78	+ <input name="context" type="hidden" value="checkout" />
79	+ <?php endif; ?>
80	+ </form>
81	+ <script type="text/javascript">
82	+ //<![CDATA[
83	+ var dataForm = new VarienForm('login-form', true);
84	+ //]]>
85	+ </script>
86	+ </div>

app/design/frontend/blacknwhite/default/template/pslogin/customer/form/register.phtml ADDED Viewed

	@@ -0,0 +1,206 @@


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	+
42	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
43	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
44	+ <div class="pslogin-spacer pslogin-clearfix">
45	+ <table>
46	+ <tr>
47	+ <td><div class="pslogin-border"></div></td>
48	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
49	+ <td><div class="pslogin-border"></div></td>
50	+ </tr>
51	+ </table>
52	+ </div>
53	+ <?php endif; ?>
54	+
55	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
56	+ <div class="fieldset">
57	+ <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
58	+ <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
59	+ <h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
60	+ <ul class="form-list">
61	+ <li class="fields">
62	+ <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
63	+ </li>
64	+ <li>
65	+ <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
66	+ <div class="input-box">
67	+ <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" />
68	+ </div>
69	+ </li>
70	+ <?php if ($this->isNewsletterEnabled()): ?>
71	+ <li class="control">
72	+ <div class="input-box">
73	+ <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" />
74	+ </div>
75	+ <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
76	+ </li>
77	+ <?php endif ?>
78	+ <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
79	+ <?php if ($_dob->isEnabled()): ?>
80	+ <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
81	+ <?php endif ?>
82	+ <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
83	+ <?php if ($_taxvat->isEnabled()): ?>
84	+ <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
85	+ <?php endif ?>
86	+ <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
87	+ <?php if ($_gender->isEnabled()): ?>
88	+ <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
89	+ <?php endif ?>
90	+ </ul>
91	+ </div>
92	+ <?php if($this->getShowAddressFields()): ?>
93	+ <div class="fieldset">
94	+ <input type="hidden" name="create_address" value="1" />
95	+ <h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
96	+ <ul class="form-list">
97	+ <li class="fields">
98	+ <div class="field">
99	+ <label for="company"><?php echo $this->__('Company') ?></label>
100	+ <div class="input-box">
101	+ <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') ?>" />
102	+ </div>
103	+ </div>
104	+ <div class="field">
105	+ <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
106	+ <div class="input-box">
107	+ <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') ?>" />
108	+ </div>
109	+ </div>
110	+ </li>
111	+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
112	+ <li class="wide">
113	+ <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
114	+ <div class="input-box">
115	+ <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 ?>" />
116	+ </div>
117	+ </li>
118	+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
119	+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
120	+ <li class="wide">
121	+ <div class="input-box">
122	+ <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 ?>" />
123	+ </div>
124	+ </li>
125	+ <?php endfor; ?>
126	+ <li class="fields">
127	+ <div class="field">
128	+ <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
129	+ <div class="input-box">
130	+ <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" />
131	+ </div>
132	+ </div>
133	+ <div class="field">
134	+ <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
135	+ <div class="input-box">
136	+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
137	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
138	+ </select>
139	+ <script type="text/javascript">
140	+ //<![CDATA[
141	+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
142	+ //]]>
143	+ </script>
144	+ <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;" />
145	+ </div>
146	+ </div>
147	+ </li>
148	+ <li class="fields">
149	+ <div class="field">
150	+ <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
151	+ <div class="input-box">
152	+ <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') ?>" />
153	+ </div>
154	+ </div>
155	+ <div class="field">
156	+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
157	+ <div class="input-box">
158	+ <?php echo $this->getCountryHtmlSelect() ?>
159	+ </div>
160	+ </div>
161	+ </li>
162	+ </ul>
163	+ <input type="hidden" name="default_billing" value="1" />
164	+ <input type="hidden" name="default_shipping" value="1" />
165	+ </div>
166	+ <?php endif; ?>
167	+ <div class="fieldset">
168	+ <h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
169	+ <ul class="form-list">
170	+ <li class="fields">
171	+ <div class="field">
172	+ <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
173	+ <div class="input-box">
174	+ <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
175	+ </div>
176	+ </div>
177	+ <div class="field">
178	+ <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
179	+ <div class="input-box">
180	+ <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
181	+ </div>
182	+ </div>
183	+ </li>
184	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
185	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
186	+ </ul>
187	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
188	+ </div>
189	+ <div class="buttons-set">
190	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
191	+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo $this->__('Back') ?></a></p>
192	+ <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
193	+ </div>
194	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
195	+ <input name="context" type="hidden" value="checkout" />
196	+ <?php endif; ?>
197	+ </form>
198	+ <script type="text/javascript">
199	+ //<![CDATA[
200	+ var dataForm = new VarienForm('form-validate', true);
201	+ <?php if($this->getShowAddressFields()): ?>
202	+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
203	+ <?php endif; ?>
204	+ //]]>
205	+ </script>
206	+ </div>

app/design/frontend/blacknwhite/default/template/pslogin/onepagecheckout/login.phtml ADDED Viewed

	@@ -0,0 +1,62 @@


1	+ <?php if (!Mage::getSingleton('customer/session')->isLoggedIn()){?>
2	+ <div id="onepagecheckout_loginbox" style="display: none;" class='op_login_area'>
3	+ <div class='close_la' onclick='close_login();'><i class="fa fa-times"></i></div>
4	+ <div class="page-title">
5	+ <h2><?php echo $this->__('Login to your Account') ?></h2>
6	+ </div>
7	+ <?php
8	+ $login_url = $this->getUrl('//login', array('_secure'=>(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS']==='on')));
9	+ $http_mode = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS']==='on');
10	+ if($http_mode)
11	+ $login_url = str_replace('http:', 'https:', $login_url);
12	+ ?>
13	+ <form method="post" id="login-form" action="<?php echo $login_url ?>" autocomplete="on">
14	+ <div class="boxcontent form_fields">
15	+ <div class='full'>
16	+ <label>
17	+ <?php echo $this->__('Email Address') ?>
18	+ </label>
19	+ <sup>*</sup>
20	+ <div class="data_area">
21	+ <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') ?>" />
22	+ </div>
23	+ </div>
24	+ <div class='full'>
25	+ <label>
26	+ <?php echo $this->__('Password') ?>
27	+ </label>
28	+ <sup>*</sup>
29	+ <div class="input-box">
30	+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
31	+ </div>
32	+ </div>
33	+ </div>
34	+ <div class="buttons-set">
35	+ <a href="javascript:void(0);" class="f-left onepagecheckout_forgotlink" onclick='open_forgot();'><?php echo $this->__('Forgot Your Password?') ?></a>
36	+ <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
37	+ <span class="please-wait" id="login-please-wait" style="display:none;">
38	+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt=""/>
39	+ </span>
40	+ </div>
41	+
42	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
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 echo $this->getChildHtml('pslogin_buttons'); ?>
53	+ <?php endif; ?>
54	+
55	+ </form>
56	+ <script type="text/javascript">
57	+ //<![CDATA[
58	+ var loginForm = new VarienForm('login-form', true);
59	+ //]]>
60	+ </script>
61	+ </div>
62	+ <?php }?>

app/design/frontend/default/blanco/template/pslogin/checkout/onepage/login.phtml ADDED Viewed

	@@ -0,0 +1,169 @@


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	+
134	+ </div>
135	+ </div>
136	+ <script type="text/javascript">
137	+ //<![CDATA[
138	+ var loginForm = new VarienForm('login-form', true);
139	+ $('login-email').observe('keypress', bindLoginPost);
140	+ $('login-password').observe('keypress', bindLoginPost);
141	+ function bindLoginPost(evt){
142	+ if (evt.keyCode == Event.KEY_RETURN) {
143	+ loginForm.submit();
144	+ }
145	+ }
146	+ function onepageLogin(button)
147	+ {
148	+ if(loginForm.validator && loginForm.validator.validate()){
149	+ button.disabled = true;
150	+ loginForm.submit();
151	+ }
152	+ }
153	+ //]]>
154	+ </script>
155	+ <?php
156	+ $registerParam = $this->getRequest()->getParam('register');
157	+ if ($registerParam \|\| $registerParam === ''):
158	+ ?>
159	+ <script type="text/javascript">
160	+ //<![CDATA[
161	+ document.observe("dom:loaded", function() {
162	+ if($('login:register')) {
163	+ $('login:register').checked = true;
164	+ checkout.setMethod();
165	+ }
166	+ })
167	+ //]]>
168	+ </script>
169	+ <?php endif; ?>

app/design/frontend/default/blanco/template/pslogin/customer/form/login.phtml ADDED Viewed

	@@ -0,0 +1,110 @@


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	+
99	+ </div>
100	+ </div>
101	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
102	+ <input name="context" type="hidden" value="checkout" />
103	+ <?php endif; ?>
104	+ </form>
105	+ <script type="text/javascript">
106	+ //<![CDATA[
107	+ var dataForm = new VarienForm('login-form', true);
108	+ //]]>
109	+ </script>
110	+ </div>

app/design/frontend/default/blanco/template/pslogin/customer/form/register.phtml ADDED Viewed

	@@ -0,0 +1,206 @@


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	+
42	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
43	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
44	+ <div class="pslogin-spacer pslogin-clearfix">
45	+ <table>
46	+ <tr>
47	+ <td><div class="pslogin-border"></div></td>
48	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
49	+ <td><div class="pslogin-border"></div></td>
50	+ </tr>
51	+ </table>
52	+ </div>
53	+ <?php endif; ?>
54	+
55	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
56	+ <div class="fieldset">
57	+ <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
58	+ <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
59	+ <h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
60	+ <ul class="form-list">
61	+ <li class="fields">
62	+ <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
63	+ </li>
64	+ <li>
65	+ <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
66	+ <div class="input-box">
67	+ <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" />
68	+ </div>
69	+ </li>
70	+ <?php if ($this->isNewsletterEnabled()): ?>
71	+ <li class="control">
72	+ <div class="input-box">
73	+ <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" />
74	+ </div>
75	+ <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
76	+ </li>
77	+ <?php endif ?>
78	+ <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
79	+ <?php if ($_dob->isEnabled()): ?>
80	+ <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
81	+ <?php endif ?>
82	+ <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
83	+ <?php if ($_taxvat->isEnabled()): ?>
84	+ <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
85	+ <?php endif ?>
86	+ <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
87	+ <?php if ($_gender->isEnabled()): ?>
88	+ <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
89	+ <?php endif ?>
90	+ </ul>
91	+ </div>
92	+ <?php if($this->getShowAddressFields()): ?>
93	+ <div class="fieldset">
94	+ <input type="hidden" name="create_address" value="1" />
95	+ <h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
96	+ <ul class="form-list">
97	+ <li class="fields">
98	+ <div class="field">
99	+ <label for="company"><?php echo $this->__('Company') ?></label>
100	+ <div class="input-box">
101	+ <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') ?>" />
102	+ </div>
103	+ </div>
104	+ <div class="field">
105	+ <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
106	+ <div class="input-box">
107	+ <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') ?>" />
108	+ </div>
109	+ </div>
110	+ </li>
111	+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
112	+ <li class="wide">
113	+ <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
114	+ <div class="input-box">
115	+ <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 ?>" />
116	+ </div>
117	+ </li>
118	+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
119	+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
120	+ <li class="wide">
121	+ <div class="input-box">
122	+ <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 ?>" />
123	+ </div>
124	+ </li>
125	+ <?php endfor; ?>
126	+ <li class="fields">
127	+ <div class="field">
128	+ <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
129	+ <div class="input-box">
130	+ <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" />
131	+ </div>
132	+ </div>
133	+ <div class="field">
134	+ <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
135	+ <div class="input-box">
136	+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
137	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
138	+ </select>
139	+ <script type="text/javascript">
140	+ //<![CDATA[
141	+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
142	+ //]]>
143	+ </script>
144	+ <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;" />
145	+ </div>
146	+ </div>
147	+ </li>
148	+ <li class="fields">
149	+ <div class="field">
150	+ <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
151	+ <div class="input-box">
152	+ <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') ?>" />
153	+ </div>
154	+ </div>
155	+ <div class="field">
156	+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
157	+ <div class="input-box">
158	+ <?php echo $this->getCountryHtmlSelect() ?>
159	+ </div>
160	+ </div>
161	+ </li>
162	+ </ul>
163	+ <input type="hidden" name="default_billing" value="1" />
164	+ <input type="hidden" name="default_shipping" value="1" />
165	+ </div>
166	+ <?php endif; ?>
167	+ <div class="fieldset">
168	+ <h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
169	+ <ul class="form-list">
170	+ <li class="fields">
171	+ <div class="field">
172	+ <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
173	+ <div class="input-box">
174	+ <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
175	+ </div>
176	+ </div>
177	+ <div class="field">
178	+ <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
179	+ <div class="input-box">
180	+ <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
181	+ </div>
182	+ </div>
183	+ </li>
184	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
185	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
186	+ </ul>
187	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
188	+ </div>
189	+ <div class="buttons-set">
190	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
191	+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo $this->__('Back') ?></a></p>
192	+ <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
193	+ </div>
194	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
195	+ <input name="context" type="hidden" value="checkout" />
196	+ <?php endif; ?>
197	+ </form>
198	+ <script type="text/javascript">
199	+ //<![CDATA[
200	+ var dataForm = new VarienForm('form-validate', true);
201	+ <?php if($this->getShowAddressFields()): ?>
202	+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
203	+ <?php endif; ?>
204	+ //]]>
205	+ </script>
206	+ </div>

app/design/frontend/default/buyshop/template/pslogin/checkout/onepage/login.phtml ADDED Viewed

	@@ -0,0 +1,169 @@


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	+ <div class="pull-left">
37	+ <!--<form id="form-checkout">-->
38	+
39	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
40	+ <p><strong><?php echo $this->__('CHECKOUT AS A GUEST OR REGISTER') ?></strong></p>
41	+ <?php else: ?>
42	+ <p><strong><?php echo $this->__('Register to Create an Account') ?></strong></p>
43	+ <?php endif; ?>
44	+
45	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
46	+ <p><strong><?php echo $this->__('Register with us for future convenience:') ?></strong></p>
47	+ <?php else: ?>
48	+ <p><strong><?php echo $this->__('Register and save time!') ?></strong><br />
49	+ <?php echo $this->__('Register with us for future convenience:') ?></p>
50	+ <ul>
51	+ <li><?php echo $this->__('Fast and easy check out') ?></li>
52	+ <li><?php echo $this->__('Easy access to your order history and status') ?></li>
53	+ </ul>
54	+ <?php endif; ?>
55	+
56	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
57	+
58	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
59	+
60	+ <div class="wrapper">
61	+ <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="pull-left" />
62	+ <label for="radio">  <strong><?php echo $this->__('Checkout as Guest') ?></strong></label>
63	+ </div>
64	+ <?php endif; ?>
65	+ <div class="wrapper">
66	+ <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="pull-left" />
67	+ <label for="radio">  <strong><?php echo $this->__('Register') ?></strong></label>
68	+ </div>
69	+
70	+ <p><strong><?php echo $this->__('Register and save time!') ?></strong><br>
71	+ <?php echo $this->__('Register with us for future convenience') ?>:</p>
72	+ <p> <?php echo $this->__('Fast and easy check out') ?><br><?php echo $this->__('Easy access to your order history and status') ?></p>
73	+
74	+ <?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
75	+ <button id="onepage-guest-register-button" type="button" class="button-2x" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
76	+ <?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
77	+ <button id="onepage-guest-register-button" type="button" class="button-2x" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo $this->__('Register') ?></span></span></button>
78	+ <?php else: ?>
79	+ <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
80	+ <button id="onepage-guest-register-button" type="submit" class="button-2x"><span><span><?php echo $this->__('Register') ?></span></span></button>
81	+ </form>
82	+ <?php endif; ?>
83	+
84	+
85	+ <?php else: ?>
86	+ <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
87	+ <?php endif; ?>
88	+
89	+
90	+
91	+
92	+
93	+ <!--</form>-->
94	+ </div>
95	+
96	+
97	+ <div class="pull-right">
98	+ <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
99	+ <p><strong><?php echo $this->__('LOGIN') ?></strong></p>
100	+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
101	+ <p> <a href="#"><strong><?php echo $this->__('Already registered?') ?></strong></a> <br>
102	+ <?php echo $this->__('Please log in below') ?>:</p>
103	+ <p><strong><?php echo $this->__('EMAIL ADDRESS') ?>*</strong></p>
104	+ <input type="text" class="required-entry validate-email input-xlarge" id="login-email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" />
105	+ <p><strong><?php echo $this->__('PASSWORD') ?>*</strong></p>
106	+ <input type="password" class="input-xlarge required-entry" id="login-password" name="login[password]" />
107	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
108	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
109	+ <div class="wrapper">
110	+
111	+ <div class="pull-left"> * <?php echo $this->__('Required Fields') ?><br>
112	+ <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="underline"><?php echo $this->__('Forgot your password') ?>? </a>  </div>
113	+ <div class="pull-right">
114	+ <button type="submit" class="button-2x" onclick="onepageLogin(this)"><?php echo $this->__('LOGIN') ?></button>
115	+ </div>
116	+ </div>
117	+ <input name="context" type="hidden" value="checkout" />
118	+
119	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
120	+ <div class="pslogin-spacer pslogin-clearfix">
121	+ <table>
122	+ <tr>
123	+ <td><div class="pslogin-border"></div></td>
124	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
125	+ <td><div class="pslogin-border"></div></td>
126	+ </tr>
127	+ </table>
128	+ </div>
129	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
130	+ <?php endif; ?>
131	+
132	+ </form>
133	+ </div>
134	+ <div class="clearfix"></div>
135	+
136	+ <script type="text/javascript">
137	+ //<![CDATA[
138	+ var loginForm = new VarienForm('login-form', true);
139	+ $('login-email').observe('keypress', bindLoginPost);
140	+ $('login-password').observe('keypress', bindLoginPost);
141	+ function bindLoginPost(evt){
142	+ if (evt.keyCode == Event.KEY_RETURN) {
143	+ loginForm.submit();
144	+ }
145	+ }
146	+ function onepageLogin(button)
147	+ {
148	+ if(loginForm.validator && loginForm.validator.validate()){
149	+ button.disabled = true;
150	+ loginForm.submit();
151	+ }
152	+ }
153	+ //]]>
154	+ </script>
155	+ <?php
156	+ $registerParam = $this->getRequest()->getParam('register');
157	+ if ($registerParam \|\| $registerParam === ''):
158	+ ?>
159	+ <script type="text/javascript">
160	+ //<![CDATA[
161	+ document.observe("dom:loaded", function() {
162	+ if($('login:register')) {
163	+ $('login:register').checked = true;
164	+ checkout.setMethod();
165	+ }
166	+ })
167	+ //]]>
168	+ </script>
169	+ <?php endif; ?>

app/design/frontend/default/buyshop/template/pslogin/customer/form/login.phtml ADDED Viewed

	@@ -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) 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	+
36	+ <div class="row">
37	+ <div class="span12">
38	+ <div class="wrapper">
39	+ <h2 class="nopadding"><?php echo $this->__('Login or Create an Account') ?></h2>
40	+ </div>
41	+ </div>
42	+ </div>
43	+
44	+ <div class="row">
45	+ <div class="span12"><div class="wrapper"> <?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div></div>
46	+ </div>
47	+
48	+ <div class="row">
49	+ <div class="span6">
50	+ <div class="box-wrapper">
51	+ <div class="inside min-height">
52	+ <h4><?php echo $this->__('NEW CUSTOMERS') ?></h4>
53	+ <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>
54	+ </div>
55	+ <div class="line"></div>
56	+ <div class="inside">
57	+ <div class="wrapper">
58	+ <div class="pull-right"><a href="<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>" class="button button-2x dark"><?php echo $this->__('CREATE AN ACCOUNT') ?></a></div>
59	+ </div>
60	+ </div>
61	+ </div>
62	+ </div>
63	+ <div class="span6">
64	+ <div class="box-wrapper">
65	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form" class="margin-2">
66	+ <div class="inside min-height">
67	+ <h4><?php echo $this->__('REGISTERED CUSTOMERS') ?></h4>
68	+ <p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
69	+
70	+ <p><?php echo $this->__('Email Address') ?> *</p>
71	+ <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') ?>" class="input-xlarge">
72	+ <p><?php echo $this->__('Password') ?> *</p>
73	+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" class="input-xlarge">
74	+ <p> * <?php echo $this->__('Required Fields') ?></p>
75	+
76	+
77	+ </div>
78	+ <div class="line"></div>
79	+ <div class="inside">
80	+ <div class="wrapper">
81	+ <div class="pull-left margin-2"><a href="<?php echo $this->getForgotPasswordUrl() ?>" class="custom_color"><?php echo $this->__('Forgot Your Password?') ?></a></div>
82	+ <div class="pull-right"><button name="send" type="submit" class="button button-2x"><?php echo $this->__('Login') ?></button></div>
83	+ </div>
84	+
85	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
86	+ <div class="pslogin-spacer pslogin-clearfix">
87	+ <table>
88	+ <tr>
89	+ <td><div class="pslogin-border"></div></td>
90	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
91	+ <td><div class="pslogin-border"></div></td>
92	+ </tr>
93	+ </table>
94	+ </div>
95	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
96	+ <?php endif; ?>
97	+ </div>
98	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
99	+ <input name="context" type="hidden" value="checkout" />
100	+ <?php endif; ?>
101	+ </form>
102	+ </div>
103	+ </div>
104	+ </div>
105	+ <script type="text/javascript">
106	+ //<![CDATA[
107	+ var dataForm = new VarienForm('login-form', true);
108	+ //]]>
109	+ </script>

app/design/frontend/default/buyshop/template/pslogin/customer/form/register.phtml ADDED Viewed

	@@ -0,0 +1,206 @@


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	+
42	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
43	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
44	+ <div class="pslogin-spacer pslogin-clearfix">
45	+ <table>
46	+ <tr>
47	+ <td><div class="pslogin-border"></div></td>
48	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
49	+ <td><div class="pslogin-border"></div></td>
50	+ </tr>
51	+ </table>
52	+ </div>
53	+ <?php endif; ?>
54	+
55	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
56	+ <div class="fieldset">
57	+ <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
58	+ <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
59	+ <h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
60	+ <ul class="form-list">
61	+ <li class="fields">
62	+ <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
63	+ </li>
64	+ <li>
65	+ <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
66	+ <div class="input-box">
67	+ <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" />
68	+ </div>
69	+ </li>
70	+ <?php if ($this->isNewsletterEnabled()): ?>
71	+ <li class="control">
72	+ <div class="input-box">
73	+ <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" />
74	+ </div>
75	+ <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
76	+ </li>
77	+ <?php endif ?>
78	+ <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
79	+ <?php if ($_dob->isEnabled()): ?>
80	+ <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
81	+ <?php endif ?>
82	+ <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
83	+ <?php if ($_taxvat->isEnabled()): ?>
84	+ <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
85	+ <?php endif ?>
86	+ <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
87	+ <?php if ($_gender->isEnabled()): ?>
88	+ <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
89	+ <?php endif ?>
90	+ </ul>
91	+ </div>
92	+ <?php if($this->getShowAddressFields()): ?>
93	+ <div class="fieldset">
94	+ <input type="hidden" name="create_address" value="1" />
95	+ <h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
96	+ <ul class="form-list">
97	+ <li class="fields">
98	+ <div class="field">
99	+ <label for="company"><?php echo $this->__('Company') ?></label>
100	+ <div class="input-box">
101	+ <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') ?>" />
102	+ </div>
103	+ </div>
104	+ <div class="field">
105	+ <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
106	+ <div class="input-box">
107	+ <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') ?>" />
108	+ </div>
109	+ </div>
110	+ </li>
111	+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
112	+ <li class="wide">
113	+ <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
114	+ <div class="input-box">
115	+ <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 ?>" />
116	+ </div>
117	+ </li>
118	+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
119	+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
120	+ <li class="wide">
121	+ <div class="input-box">
122	+ <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 ?>" />
123	+ </div>
124	+ </li>
125	+ <?php endfor; ?>
126	+ <li class="fields">
127	+ <div class="field">
128	+ <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
129	+ <div class="input-box">
130	+ <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" />
131	+ </div>
132	+ </div>
133	+ <div class="field">
134	+ <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
135	+ <div class="input-box">
136	+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
137	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
138	+ </select>
139	+ <script type="text/javascript">
140	+ //<![CDATA[
141	+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
142	+ //]]>
143	+ </script>
144	+ <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;" />
145	+ </div>
146	+ </div>
147	+ </li>
148	+ <li class="fields">
149	+ <div class="field">
150	+ <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
151	+ <div class="input-box">
152	+ <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') ?>" />
153	+ </div>
154	+ </div>
155	+ <div class="field">
156	+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
157	+ <div class="input-box">
158	+ <?php echo $this->getCountryHtmlSelect() ?>
159	+ </div>
160	+ </div>
161	+ </li>
162	+ </ul>
163	+ <input type="hidden" name="default_billing" value="1" />
164	+ <input type="hidden" name="default_shipping" value="1" />
165	+ </div>
166	+ <?php endif; ?>
167	+ <div class="fieldset">
168	+ <h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
169	+ <ul class="form-list">
170	+ <li class="fields">
171	+ <div class="field">
172	+ <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
173	+ <div class="input-box">
174	+ <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
175	+ </div>
176	+ </div>
177	+ <div class="field">
178	+ <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
179	+ <div class="input-box">
180	+ <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
181	+ </div>
182	+ </div>
183	+ </li>
184	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
185	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
186	+ </ul>
187	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
188	+ </div>
189	+ <div class="buttons-set">
190	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
191	+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo $this->__('Back') ?></a></p>
192	+ <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
193	+ </div>
194	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
195	+ <input name="context" type="hidden" value="checkout" />
196	+ <?php endif; ?>
197	+ </form>
198	+ <script type="text/javascript">
199	+ //<![CDATA[
200	+ var dataForm = new VarienForm('form-validate', true);
201	+ <?php if($this->getShowAddressFields()): ?>
202	+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
203	+ <?php endif; ?>
204	+ //]]>
205	+ </script>
206	+ </div>

app/design/frontend/default/milano/template/pslogin/checkout/onepage/login.phtml ADDED Viewed

	@@ -0,0 +1,169 @@


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	+
134	+ </div>
135	+ </div>
136	+ <script type="text/javascript">
137	+ //<![CDATA[
138	+ var loginForm = new VarienForm('login-form', true);
139	+ $('login-email').observe('keypress', bindLoginPost);
140	+ $('login-password').observe('keypress', bindLoginPost);
141	+ function bindLoginPost(evt){
142	+ if (evt.keyCode == Event.KEY_RETURN) {
143	+ loginForm.submit();
144	+ }
145	+ }
146	+ function onepageLogin(button)
147	+ {
148	+ if(loginForm.validator && loginForm.validator.validate()){
149	+ button.disabled = true;
150	+ loginForm.submit();
151	+ }
152	+ }
153	+ //]]>
154	+ </script>
155	+ <?php
156	+ $registerParam = $this->getRequest()->getParam('register');
157	+ if ($registerParam \|\| $registerParam === ''):
158	+ ?>
159	+ <script type="text/javascript">
160	+ //<![CDATA[
161	+ document.observe("dom:loaded", function() {
162	+ if($('login:register')) {
163	+ $('login:register').checked = true;
164	+ checkout.setMethod();
165	+ }
166	+ })
167	+ //]]>
168	+ </script>
169	+ <?php endif; ?>

app/design/frontend/default/milano/template/pslogin/customer/form/login.phtml ADDED Viewed

	@@ -0,0 +1,110 @@


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	+
99	+ </div>
100	+ </div>
101	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
102	+ <input name="context" type="hidden" value="checkout" />
103	+ <?php endif; ?>
104	+ </form>
105	+ <script type="text/javascript">
106	+ //<![CDATA[
107	+ var dataForm = new VarienForm('login-form', true);
108	+ //]]>
109	+ </script>
110	+ </div>

app/design/frontend/default/milano/template/pslogin/customer/form/register.phtml ADDED Viewed

	@@ -0,0 +1,206 @@


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	+
42	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
43	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
44	+ <div class="pslogin-spacer pslogin-clearfix">
45	+ <table>
46	+ <tr>
47	+ <td><div class="pslogin-border"></div></td>
48	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
49	+ <td><div class="pslogin-border"></div></td>
50	+ </tr>
51	+ </table>
52	+ </div>
53	+ <?php endif; ?>
54	+
55	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
56	+ <div class="fieldset">
57	+ <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
58	+ <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
59	+ <h2 class="legend"><?php echo $this->__('Personal Information') ?></h2>
60	+ <ul class="form-list">
61	+ <li class="fields">
62	+ <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
63	+ </li>
64	+ <li>
65	+ <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
66	+ <div class="input-box">
67	+ <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" />
68	+ </div>
69	+ </li>
70	+ <?php if ($this->isNewsletterEnabled()): ?>
71	+ <li class="control">
72	+ <div class="input-box">
73	+ <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" />
74	+ </div>
75	+ <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
76	+ </li>
77	+ <?php endif ?>
78	+ <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
79	+ <?php if ($_dob->isEnabled()): ?>
80	+ <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
81	+ <?php endif ?>
82	+ <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
83	+ <?php if ($_taxvat->isEnabled()): ?>
84	+ <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
85	+ <?php endif ?>
86	+ <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
87	+ <?php if ($_gender->isEnabled()): ?>
88	+ <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
89	+ <?php endif ?>
90	+ </ul>
91	+ </div>
92	+ <?php if($this->getShowAddressFields()): ?>
93	+ <div class="fieldset">
94	+ <input type="hidden" name="create_address" value="1" />
95	+ <h2 class="legend"><?php echo $this->__('Address Information') ?></h2>
96	+ <ul class="form-list">
97	+ <li class="fields">
98	+ <div class="field">
99	+ <label for="company"><?php echo $this->__('Company') ?></label>
100	+ <div class="input-box">
101	+ <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') ?>" />
102	+ </div>
103	+ </div>
104	+ <div class="field">
105	+ <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
106	+ <div class="input-box">
107	+ <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') ?>" />
108	+ </div>
109	+ </div>
110	+ </li>
111	+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
112	+ <li class="wide">
113	+ <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
114	+ <div class="input-box">
115	+ <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 ?>" />
116	+ </div>
117	+ </li>
118	+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
119	+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
120	+ <li class="wide">
121	+ <div class="input-box">
122	+ <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 ?>" />
123	+ </div>
124	+ </li>
125	+ <?php endfor; ?>
126	+ <li class="fields">
127	+ <div class="field">
128	+ <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
129	+ <div class="input-box">
130	+ <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" />
131	+ </div>
132	+ </div>
133	+ <div class="field">
134	+ <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
135	+ <div class="input-box">
136	+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
137	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
138	+ </select>
139	+ <script type="text/javascript">
140	+ //<![CDATA[
141	+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
142	+ //]]>
143	+ </script>
144	+ <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;" />
145	+ </div>
146	+ </div>
147	+ </li>
148	+ <li class="fields">
149	+ <div class="field">
150	+ <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
151	+ <div class="input-box">
152	+ <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') ?>" />
153	+ </div>
154	+ </div>
155	+ <div class="field">
156	+ <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
157	+ <div class="input-box">
158	+ <?php echo $this->getCountryHtmlSelect() ?>
159	+ </div>
160	+ </div>
161	+ </li>
162	+ </ul>
163	+ <input type="hidden" name="default_billing" value="1" />
164	+ <input type="hidden" name="default_shipping" value="1" />
165	+ </div>
166	+ <?php endif; ?>
167	+ <div class="fieldset">
168	+ <h2 class="legend"><?php echo $this->__('Login Information') ?></h2>
169	+ <ul class="form-list">
170	+ <li class="fields">
171	+ <div class="field">
172	+ <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
173	+ <div class="input-box">
174	+ <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
175	+ </div>
176	+ </div>
177	+ <div class="field">
178	+ <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
179	+ <div class="input-box">
180	+ <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
181	+ </div>
182	+ </div>
183	+ </li>
184	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
185	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
186	+ </ul>
187	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
188	+ </div>
189	+ <div class="buttons-set">
190	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
191	+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo $this->__('Back') ?></a></p>
192	+ <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
193	+ </div>
194	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
195	+ <input name="context" type="hidden" value="checkout" />
196	+ <?php endif; ?>
197	+ </form>
198	+ <script type="text/javascript">
199	+ //<![CDATA[
200	+ var dataForm = new VarienForm('form-validate', true);
201	+ <?php if($this->getShowAddressFields()): ?>
202	+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
203	+ <?php endif; ?>
204	+ //]]>
205	+ </script>
206	+ </div>

app/design/frontend/venedor/default/template/pslogin/checkout/onepage/login.phtml ADDED Viewed

	@@ -0,0 +1,141 @@


1	+ <?php
2	+ /**
3	+ * @category design
4	+ * @package base_default
5	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
6	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7	+ */
8	+ ?>
9	+ <?php
10	+ /**
11	+ * Customer onepage checkout login form template
12	+ *
13	+ * @see app/design/frontend/base/default/template/checkout/onepage/login.phtml
14	+ */
15	+ /** @var $this Mage_Checkout_Block_Onepage_Login */
16	+ ?>
17	+ <?php
18	+ $venedor = $this->helper('venedor');
19	+ $rowClass = $venedor->getRowClass();
20	+ $spanClass = $venedor->getSpanClass();
21	+ ?>
22	+ <?php echo $this->getChildHtml('login_before')?>
23	+ <div class="<?php echo $rowClass ?>">
24	+ <div class="<?php echo $spanClass ?>6">
25	+ <h3><?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?><?php echo $this->__('New Customer') ?><?php else: ?><?php echo $this->__('New Customer') ?><?php endif; ?></h3>
26	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
27	+ <p><?php echo $this->__('Register with us for future convenience:') ?></p>
28	+ <?php else: ?>
29	+ <p><?php echo $this->__('Register with us for future convenience:') ?></p>
30	+ <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>
31	+ <?php endif; ?>
32	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
33	+ <ul class="form-list">
34	+ <?php if( $this->getQuote()->isAllowedGuestCheckout() ): ?>
35	+ <li class="control">
36	+ <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>
37	+ </li>
38	+ <?php endif; ?>
39	+ <li class="control">
40	+ <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>
41	+ </li>
42	+ </ul>
43	+ <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>
44	+ <?php else: ?>
45	+ <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
46	+ <?php endif; ?>
47	+
48	+ <div class="buttons-set">
49	+ <br/>
50	+ <?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
51	+ <button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
52	+ <?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
53	+ <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>
54	+ <?php else: ?>
55	+ <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
56	+ <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
57	+ </form>
58	+ <?php endif; ?>
59	+ </div>
60	+ </div>
61	+ <div class="<?php echo $spanClass ?>6">
62	+ <h3><?php echo $this->__('Registered Customers') ?></h3>
63	+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
64	+ <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
65	+ <fieldset>
66	+ <?php echo $this->getBlockHtml('formkey'); ?>
67	+ <p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
68	+ <ul class="form-list">
69	+ <li>
70	+ <label for="login-email" class="required"><i class="icon-email"></i><?php echo $this->__('Email') ?><em>*</em></label>
71	+ <div class="input-box">
72	+ <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" />
73	+ </div>
74	+ </li>
75	+ <li>
76	+ <label for="login-password" class="required"><i class="icon-password"></i><?php echo $this->__('Password') ?><em>*</em></label>
77	+ <div class="input-box">
78	+ <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
79	+ </div>
80	+ <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-right forgot-password"><?php echo $this->__('Forgot your password?') ?></a>
81	+ </li>
82	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
83	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
84	+ </ul>
85	+ <input name="context" type="hidden" value="checkout" />
86	+ </fieldset>
87	+ </form>
88	+ <div class="buttons-set">
89	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
90	+ <button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
91	+ </div>
92	+
93	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
94	+ <div class="pslogin-spacer pslogin-clearfix">
95	+ <table>
96	+ <tr>
97	+ <td><div class="pslogin-border"></div></td>
98	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
99	+ <td><div class="pslogin-border"></div></td>
100	+ </tr>
101	+ </table>
102	+ </div>
103	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
104	+ <?php endif; ?>
105	+
106	+ </div>
107	+ </div>
108	+ <script type="text/javascript">
109	+ //<![CDATA[
110	+ var loginForm = new VarienForm('login-form', true);
111	+ $('login-email').observe('keypress', bindLoginPost);
112	+ $('login-password').observe('keypress', bindLoginPost);
113	+ function bindLoginPost(evt){
114	+ if (evt.keyCode == Event.KEY_RETURN) {
115	+ loginForm.submit();
116	+ }
117	+ }
118	+ function onepageLogin(button)
119	+ {
120	+ if(loginForm.validator && loginForm.validator.validate()){
121	+ button.disabled = true;
122	+ loginForm.submit();
123	+ }
124	+ }
125	+ //]]>
126	+ </script>
127	+ <?php
128	+ $registerParam = $this->getRequest()->getParam('register');
129	+ if ($registerParam \|\| $registerParam === ''):
130	+ ?>
131	+ <script type="text/javascript">
132	+ //<![CDATA[
133	+ document.observe("dom:loaded", function() {
134	+ if($('login:register')) {
135	+ $('login:register').checked = true;
136	+ checkout.setMethod();
137	+ }
138	+ })
139	+ //]]>
140	+ </script>
141	+ <?php endif; ?>

app/design/frontend/venedor/default/template/pslogin/customer/form/login.phtml ADDED Viewed

	@@ -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) 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	+ <?php
36	+ $venedor = $this->helper('venedor');
37	+ $rowClass = $venedor->getRowClass();
38	+ $spanClass = $venedor->getSpanClass();
39	+ ?>
40	+ <div class="account-login">
41	+ <div class="page-title">
42	+ <h1><?php echo $this->__('Login or Create an Account') ?></h1>
43	+ </div>
44	+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
45	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
46	+ <?php echo $this->getBlockHtml('formkey'); ?>
47	+ <div class="<?php echo $rowClass ?>">
48	+ <div class="<?php echo $spanClass ?>6 new-users">
49	+ <div class="content clearfix">
50	+ <h2><?php echo $this->__('New Customers') ?></h2>
51	+ <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>
52	+ </div>
53	+ <div class="buttons-set">
54	+ <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>
55	+ </div>
56	+ </div>
57	+ <div class="<?php echo $spanClass ?>6 registered-users">
58	+ <div class="content clearfix">
59	+ <h2><?php echo $this->__('Registered Customers') ?></h2>
60	+ <p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
61	+ <ul class="form-list">
62	+ <li>
63	+ <label for="email" class="required"><i class="icon-email"></i><?php echo $this->__('Email') ?><em>*</em></label>
64	+ <div class="input-box">
65	+ <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') ?>" />
66	+ </div>
67	+ </li>
68	+ <li>
69	+ <label for="pass" class="required"><i class="icon-password"></i><?php echo $this->__('Password') ?><em>*</em></label>
70	+ <div class="input-box">
71	+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
72	+ </div>
73	+ <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left forgot-password"><?php echo $this->__('Forgot your password?') ?></a>
74	+ </li>
75	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
76	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
77	+ </ul>
78	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
79	+ </div>
80	+ <div class="buttons-set">
81	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
82	+ <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
83	+ </div>
84	+
85	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('login') && Mage::helper('pslogin')->hasButtons()) : ?>
86	+ <div class="pslogin-spacer pslogin-clearfix">
87	+ <table>
88	+ <tr>
89	+ <td><div class="pslogin-border"></div></td>
90	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
91	+ <td><div class="pslogin-border"></div></td>
92	+ </tr>
93	+ </table>
94	+ </div>
95	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
96	+ <?php endif; ?>
97	+
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/venedor/default/template/pslogin/customer/form/register.phtml ADDED Viewed

	@@ -0,0 +1,213 @@


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	+ <?php
36	+ $venedor = $this->helper('venedor');
37	+ $rowClass = $venedor->getRowClass();
38	+ $spanClass = $venedor->getSpanClass();
39	+ ?>
40	+ <div class="account-create">
41	+ <div class="page-title">
42	+ <h1><?php echo $this->__('Create an Account') ?></h1>
43	+ </div>
44	+ <?php echo $this->getChildHtml('form_fields_before')?>
45	+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
46	+
47	+ <?php if(Mage::helper('pslogin')->modulePositionEnabled('register') && Mage::helper('pslogin')->hasButtons()) : ?>
48	+ <?php echo $this->getChildHtml('pslogin_buttons'); ?>
49	+ <div class="pslogin-spacer pslogin-clearfix">
50	+ <table>
51	+ <tr>
52	+ <td><div class="pslogin-border"></div></td>
53	+ <td class="pslogin-bordertext w25"><?php echo $this->__('OR'); ?></td>
54	+ <td><div class="pslogin-border"></div></td>
55	+ </tr>
56	+ </table>
57	+ </div>
58	+ <?php endif; ?>
59	+
60	+ <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
61	+ <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
62	+ <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
63	+ <div class="<?php echo $rowClass ?>">
64	+ <div class="<?php if($this->getShowAddressFields()) echo $spanClass.'6'; else echo $spanClass.'12'; ?>">
65	+ <h2><?php echo $this->__('Your Personal Details') ?></h2>
66	+ <ul class="form-list">
67	+ <li class="fields">
68	+ <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
69	+ </li>
70	+ <li>
71	+ <label for="email_address" class="required"><i class="icon-email"></i><?php echo $this->__('Email') ?><em>*</em></label>
72	+ <div class="input-box">
73	+ <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" />
74	+ </div>
75	+ </li>
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	+ <h2><?php echo $this->__('Your Password') ?></h2>
90	+ <ul class="form-list">
91	+ <li class="fields">
92	+ <div class="field">
93	+ <label for="password" class="required"><i class="icon-password"></i><?php echo $this->__('Password') ?><em>*</em></label>
94	+ <div class="input-box">
95	+ <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
96	+ </div>
97	+ </div>
98	+ <div class="field">
99	+ <label for="confirmation" class="required"><i class="icon-password"></i><?php echo $this->__('Re Password') ?><em>*</em></label>
100	+ <div class="input-box">
101	+ <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
102	+ </div>
103	+ </div>
104	+ </li>
105	+ <?php echo $this->getChildHtml('form.additional.info'); ?>
106	+ <?php echo $this->getChildHtml('persistent.remember.me'); ?>
107	+ <?php if ($this->isNewsletterEnabled()): ?>
108	+ <h2><?php echo $this->__('Newsletter') ?></h2>
109	+ <li class="control">
110	+ <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" />
111	+ <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
112	+ </li>
113	+ <?php endif ?>
114	+ </ul>
115	+ <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
116	+ </div>
117	+ <?php if($this->getShowAddressFields()): ?>
118	+ <div class="<?php echo $spanClass ?>6">
119	+ <input type="hidden" name="create_address" value="1" />
120	+ <h2><?php echo $this->__('Your Address') ?></h2>
121	+ <ul class="form-list">
122	+ <li class="fields">
123	+ <div class="field">
124	+ <label for="company"><i class="icon-company"></i><?php echo $this->__('Company') ?></label>
125	+ <div class="input-box">
126	+ <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') ?>" />
127	+ </div>
128	+ </div>
129	+ <div class="field">
130	+ <label for="telephone" class="required"><i class="icon-phone"></i><?php echo $this->__('Telephone') ?><em>*</em></label>
131	+ <div class="input-box">
132	+ <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') ?>" />
133	+ </div>
134	+ </div>
135	+ </li>
136	+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
137	+ <li class="wide">
138	+ <label for="street_1" class="required"><i class="icon-address"></i><?php echo $this->__('Address') ?><?php echo $this->helper('customer/address')->getStreetLines() > 1 ? ' 1' : '' ?><em>*</em></label>
139	+ <div class="input-box">
140	+ <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 ?>" />
141	+ </div>
142	+ </li>
143	+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
144	+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
145	+ <li class="wide">
146	+ <label for="street_<?php echo $_i ?>"><i class="icon-address"></i><?php echo $this->__('Address') . ' ' . $_i ?></label>
147	+ <div class="input-box">
148	+ <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 ?>" />
149	+ </div>
150	+ </li>
151	+ <?php endfor; ?>
152	+ <li class="fields">
153	+ <div class="field">
154	+ <label for="city" class="required"><i class="icon-city"></i><?php echo $this->__('City') ?><em>*</em></label>
155	+ <div class="input-box">
156	+ <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" />
157	+ </div>
158	+ </div>
159	+ </li>
160	+ <li class="fields">
161	+ <div class="field">
162	+ <label for="region_id" class="required"><i class="icon-state"></i><?php echo $this->__('State/Province') ?><em>*</em></label>
163	+ <div class="input-box">
164	+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
165	+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
166	+ </select>
167	+ <script type="text/javascript">
168	+ //<![CDATA[
169	+ $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
170	+ //]]>
171	+ </script>
172	+ <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;" />
173	+ </div>
174	+ </div>
175	+ </li>
176	+ <li class="fields">
177	+ <div class="field">
178	+ <label for="zip" class="required"><i class="icon-zipcode"></i><?php echo $this->__('Zip/Postal Code') ?><em>*</em></label>
179	+ <div class="input-box">
180	+ <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') ?>" />
181	+ </div>
182	+ </div>
183	+ <div class="field">
184	+ <label for="country" class="required"><i class="icon-country"></i><?php echo $this->__('Country') ?><em>*</em></label>
185	+ <div class="input-box">
186	+ <?php echo $this->getCountryHtmlSelect() ?>
187	+ </div>
188	+ </div>
189	+ </li>
190	+ </ul>
191	+ <input type="hidden" name="default_billing" value="1" />
192	+ <input type="hidden" name="default_shipping" value="1" />
193	+ </div>
194	+ <?php endif; ?>
195	+ </div>
196	+ <div class="buttons-set">
197	+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
198	+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo $this->__('Back') ?></a></p>
199	+ <button type="submit" title="<?php echo $this->__('Create My Account') ?>" class="button"><span><span><?php echo $this->__('Create My Account') ?></span></span></button>
200	+ </div>
201	+ <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
202	+ <input name="context" type="hidden" value="checkout" />
203	+ <?php endif; ?>
204	+ </form>
205	+ <script type="text/javascript">
206	+ //<![CDATA[
207	+ var dataForm = new VarienForm('form-validate', true);
208	+ <?php if($this->getShowAddressFields()): ?>
209	+ new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
210	+ <?php endif; ?>
211	+ //]]>
212	+ </script>
213	+ </div>

app/etc/modules/Plumrocket_SocialLogin.xml CHANGED Viewed

	@@ -4,7 +4,7 @@
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>


4	<Plumrocket_SocialLogin>
5	<active>true</active>
6	<codePool>community</codePool>
7	+ <version>1.2.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 Viewed

	@@ -1,25 +1,21 @@
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>


1	<?xml version="1.0"?>
2	<package>
3	<name>Plumrocket_Twitter_Facebook_Login</name>
4	+ <version>1.2.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. Increase sales, allow clients to use Magento Facebook Login & Twitter Login free to quickly register & place order.</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: Blanco, BuyShop, Milano, Black&White, Venedor
12	+ - Improved authorization and registration process, now page with social login buttons loads faster
13	+ - Improved display of customers photo from social networks in Magento CE version 1.8.1 and lower, as well as on some third party themes
14	+ - Fixed issue with displaying incorrect gender data after registration</notes>




15	<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
16	+ <date>2015-01-27</date>
17	+ <time>10:24:17</time>
18	+ <contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="81d64b4e7ad04c86866aaa73d3f60f77"/></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="0e739c18475699241fd08b0084026537"/><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="b1d43510d21b1996de05bea197958c88"/><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="f6c124f08b3b9edd167e689dcd7c72b0"/></dir><dir name="Model"><file name="Account.php" hash="d8650a8b4ba0c626b02418f9256e7d53"/><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="5b2cc21e71ac1f053baaa976c1f1128d"/><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="7efb30ba9ecfe9cdb6c482441b60531a"/><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="4e0da5c53e0ab09f61f9b520c37e54bf"/></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="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>
19	<compatible/>
20	<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>
21	</package>

skin/adminhtml/default/default/css/plumrocket/pslogin/pslogin.css CHANGED Viewed

@@ -214,8 +214,8 @@
             .pslogin-form ul li.xing .soc-li-icon { background-color: #005d5e;}
             .pslogin-form ul li.xing .soc-li-icon { background-position: -84px -85px; }
-            -
            .pslogin-form ul li.kaixin .soc-li-icon { background-color: #e2332e; }
-            -
            .pslogin-form ul li.kaixin .soc-li-icon { background-position: -102px -85px; }
             .pslogin-form ul li.orange .soc-li-icon { background-color: #ff6600; }
             .pslogin-form ul li.orange .soc-li-icon { background-position: -0px -102px; }
@@ -237,8 +237,8 @@
             .pslogin-form ul li.reddit .soc-li-icon { background-color: #337fb9; }
             .pslogin-form ul li.reddit .soc-li-icon { background-position: -102px -102px; }
-            -
            .pslogin-form ul li.odesc .soc-li-icon { background-color: #7ac043; }
-            -
            .pslogin-form ul li.odesc .soc-li-icon { background-position: -1px -119px; }
             .pslogin-form ul li.teamviewer .soc-li-icon { background-color: #0171b9; }
             .pslogin-form ul li.teamviewer .soc-li-icon { background-position: -17px -119px; }
@@ -246,6 +246,34 @@
             .pslogin-form ul li.skyrock .soc-li-icon { background-color: #009afe; }
             .pslogin-form ul li.skyrock .soc-li-icon { background-position: -34px -119px; }
             .entry-edit-head.pslogin-notinstalled-section {
             	background: #BDBDBD;
+            }


214	.pslogin-form ul li.xing .soc-li-icon { background-color: #005d5e;}
215	.pslogin-form ul li.xing .soc-li-icon { background-position: -84px -85px; }
216
217	+ .pslogin-form ul li.kaixin001 .soc-li-icon { background-color: #e2332e; }
218	+ .pslogin-form ul li.kaixin001 .soc-li-icon { background-position: -102px -85px; }
219
220	.pslogin-form ul li.orange .soc-li-icon { background-color: #ff6600; }
221	.pslogin-form ul li.orange .soc-li-icon { background-position: -0px -102px; }

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.odesk .soc-li-icon { background-color: #7ac043; }
241	+ .pslogin-form ul li.odesk .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; }

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	+ .pslogin-form ul li.renren .soc-li-icon { background-color: #153765; }
250	+ .pslogin-form ul li.renren .soc-li-icon { background-position: -51px -119px; }
251	+
252	+
253	+ .pslogin-form ul li.etsy .soc-li-icon { background-color: #ee5931; }
254	+ .pslogin-form ul li.etsy .soc-li-icon { background-position: -68px -119px; }
255	+
256	+ .pslogin-form ul li.imgur .soc-li-icon { background-color: #312e2f; }
257	+ .pslogin-form ul li.imgur .soc-li-icon { background-position: -84px -119px; }
258	+
259	+ .pslogin-form ul li.intuit .soc-li-icon { background-color: #B8B8B8; }
260	+ .pslogin-form ul li.intuit .soc-li-icon { background-position: -102px -119px; }
261	+
262	+ .pslogin-form ul li.mailchimp .soc-li-icon { background-color: #73cff4; }
263	+ .pslogin-form ul li.mailchimp .soc-li-icon { background-position: -1px -136px; }
264	+
265	+ .pslogin-form ul li.persona .soc-li-icon { background-color: #ee5931; }
266	+ .pslogin-form ul li.persona .soc-li-icon { background-position: -17px -136px; }
267	+
268	+ .pslogin-form ul li.dribbble .soc-li-icon { background-color: #f26798; }
269	+ .pslogin-form ul li.dribbble .soc-li-icon { background-position: -34px -136px; }
270	+
271	+ .pslogin-form ul li.goodreads .soc-li-icon { background-color: #743900; }
272	+ .pslogin-form ul li.goodreads .soc-li-icon { background-position: -51px -136px; }
273	+
274	+ .pslogin-form ul li.lastfm .soc-li-icon { background-color: #c02c0c; }
275	+ .pslogin-form ul li.lastfm .soc-li-icon { background-position: -68px -136px; }
276	+
277	.entry-edit-head.pslogin-notinstalled-section {
278	background: #BDBDBD;
279	}

skin/adminhtml/default/default/images/plumrocket/pslogin/social_admin.png CHANGED Viewed

Binary file

skin/adminhtml/default/default/js/plumrocket/pslogin/pslogin.js CHANGED Viewed

	@@ -131,12 +131,18 @@ pjQuery_1_10_2(document).ready(function() {
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	});


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	+ .each(function(n, item) {
142	+ var $item = pjQuery_1_10_2(item);
143	+ if($item.val().indexOf('http://') >= 0) {
144	+ $item.next('p.note').find('span span').css('color', 'red');
145	+ }
146	+ });
147
148	});

skin/frontend/base/default/css/plumrocket/pslogin/pslogin.css CHANGED Viewed

@@ -362,12 +362,19 @@
             	display: inline-block;
+            }
             	.pslogin-block .pslogin-buttons ul li {
-            -
            		display: inline-block;
             		line-height: normal;
             		list-style: none!important;
             		padding: 0!important;
             		background: none!important;
+            	}
             	.pslogin-block .pslogin-buttons ul li.show-button-image {
@@ -489,6 +496,7 @@
             	.pslogin-block .pslogin-buttons ul li.aol span.pslogin-button-auto { background-color: #008bd3; }
             	.pslogin-block .pslogin-buttons ul li.aol .pslogin-button-icon { background-position: -102px -34px; }
             	.pslogin-block .pslogin-buttons ul li.github span.pslogin-button-auto { background-color: black; }
             	.pslogin-block .pslogin-buttons ul li.github .pslogin-button-icon { background-position: -135px -35px; }
@@ -507,6 +515,7 @@
             	.pslogin-block .pslogin-buttons ul li.livejournal span.pslogin-button-auto { background-color: #104378; }
             	.pslogin-block .pslogin-buttons ul li.livejournal .pslogin-button-icon { background-position: -66px -69px; }
             	.pslogin-block .pslogin-buttons ul li.tumblr span.pslogin-button-auto { background-color: #304e6c; }
             	.pslogin-block .pslogin-buttons ul li.tumblr .pslogin-button-icon { background-position: -102px -69px; }
@@ -526,7 +535,7 @@
             	.pslogin-block .pslogin-buttons ul li.odnoklassniki span.pslogin-button-auto { background-color: #ee6600; }
             	.pslogin-block .pslogin-buttons ul li.odnoklassniki .pslogin-button-icon { background-position: -34px -103px; }
-            -
            	.pslogin-block .pslogin-buttons ul li.mailru span.pslogin-button-auto { background-color: #168de2; }
             	.pslogin-block .pslogin-buttons ul li.mailru .pslogin-button-icon { background-position: -67px -103px; }
             	.pslogin-block .pslogin-buttons ul li.yandex span.pslogin-button-auto { background-color: #dd0000; }
@@ -576,12 +585,13 @@
             	.pslogin-block .pslogin-buttons ul li.verisign span.pslogin-button-auto { background-color: #b22253; }
             	.pslogin-block .pslogin-buttons ul li.verisign .pslogin-button-icon { background-position: -134px -171px; }
             	.pslogin-block .pslogin-buttons ul li.xing span.pslogin-button-auto { background-color: #005d5e;}
             	.pslogin-block .pslogin-buttons ul li.xing .pslogin-button-icon { background-position: -168px -171px; }
-            -
            	.pslogin-block .pslogin-buttons ul li.kaixin span.pslogin-button-auto { background-color: #e2332e; }
-            -
            	.pslogin-block .pslogin-buttons ul li.kaixin .pslogin-button-icon { background-position: -203px -171px; }
             	.pslogin-block .pslogin-buttons ul li.orange span.pslogin-button-auto { background-color: #ff6600; }
             	.pslogin-block .pslogin-buttons ul li.orange .pslogin-button-icon { background-position: -1px -205px; }
@@ -601,8 +611,9 @@
             	.pslogin-block .pslogin-buttons ul li.reddit span.pslogin-button-auto { background-color: #337fb9; }
             	.pslogin-block .pslogin-buttons ul li.reddit .pslogin-button-icon { background-position: -203px -205px; }
-            -
            	.pslogin-block .pslogin-buttons ul li.odesc span.pslogin-button-auto { background-color: #7ac043; }
-            -
            	.pslogin-block .pslogin-buttons ul li.odesc .pslogin-button-icon { background-position: -1px -239px; }
             	.pslogin-block .pslogin-buttons ul li.teamviewer span.pslogin-button-auto { background-color: #0171b9; }
             	.pslogin-block .pslogin-buttons ul li.teamviewer .pslogin-button-icon { background-position: -34px -239px; }
@@ -610,6 +621,37 @@
             	.pslogin-block .pslogin-buttons ul li.skyrock span.pslogin-button-auto { background-color: #009afe; }
             	.pslogin-block .pslogin-buttons ul li.skyrock .pslogin-button-icon { background-position: -67px -239px; }
             /*======= social buttons =======*/
             #prpop-pop-up-bg .pslogin-block {
@@ -678,8 +720,10 @@
             		#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li {
             			width: 70%;
             			min-height: 32px;
-            -
            			margin-bottom: 5px;
             			vertical-align: inherit;
+            		}
             		#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons li {
@@ -734,7 +778,7 @@
             	#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons li {
             		width: auto;
             		min-height: 32px;
-            -
            		margin: 0 0 5px 0;
             		vertical-align: middle;
+            	}
@@ -879,14 +923,98 @@
             			width: 100%;
+            		}
             @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
             	.pslogin-block .pslogin-buttons ul li .pslogin-button-icon {
             		background: url('../../../images/plumrocket/pslogin/social_retina.png');
-            -
            		background-size: 236px 272px;
-            -
            		-webkit-background-size: 236px 272px;
-            -
            		-moz-background-size: 236px 272px;
+            	}
+            }
@@ -1599,4 +1727,4 @@
 % {
                 opacity: 0.6;
+              }
-            -
            }


362	display: inline-block;
363	}
364
365	+ .pslogin-block .pslogin-buttons ul {
366	+ padding: 0;
367	+ }
368	+
369	.pslogin-block .pslogin-buttons ul li {
370	+ display: block;
371	+ float: left;
372	line-height: normal;
373	list-style: none!important;
374	padding: 0!important;
375	background: none!important;
376	+ height: 32px;
377	+ margin: 0 3px 3px 0;
378	}
379
380	.pslogin-block .pslogin-buttons ul li.show-button-image {

496
497	.pslogin-block .pslogin-buttons ul li.aol span.pslogin-button-auto { background-color: #008bd3; }
498	.pslogin-block .pslogin-buttons ul li.aol .pslogin-button-icon { background-position: -102px -34px; }
499	+ .pslogin-openid.aol input[type=submit] { background-color: #008bd3; -webkit-appearance: none; }
500
501	.pslogin-block .pslogin-buttons ul li.github span.pslogin-button-auto { background-color: black; }
502	.pslogin-block .pslogin-buttons ul li.github .pslogin-button-icon { background-position: -135px -35px; }

515
516	.pslogin-block .pslogin-buttons ul li.livejournal span.pslogin-button-auto { background-color: #104378; }
517	.pslogin-block .pslogin-buttons ul li.livejournal .pslogin-button-icon { background-position: -66px -69px; }
518	+ .pslogin-openid.livejournal input[type=submit] { background-color: #104378; -webkit-appearance: none; }
519
520	.pslogin-block .pslogin-buttons ul li.tumblr span.pslogin-button-auto { background-color: #304e6c; }
521	.pslogin-block .pslogin-buttons ul li.tumblr .pslogin-button-icon { background-position: -102px -69px; }

535	.pslogin-block .pslogin-buttons ul li.odnoklassniki span.pslogin-button-auto { background-color: #ee6600; }
536	.pslogin-block .pslogin-buttons ul li.odnoklassniki .pslogin-button-icon { background-position: -34px -103px; }
537
538	+ .pslogin-block .pslogin-buttons ul li.mailru span.pslogin-button-auto { background-color: #00468c; }
539	.pslogin-block .pslogin-buttons ul li.mailru .pslogin-button-icon { background-position: -67px -103px; }
540
541	.pslogin-block .pslogin-buttons ul li.yandex span.pslogin-button-auto { background-color: #dd0000; }

585
586	.pslogin-block .pslogin-buttons ul li.verisign span.pslogin-button-auto { background-color: #b22253; }
587	.pslogin-block .pslogin-buttons ul li.verisign .pslogin-button-icon { background-position: -134px -171px; }
588	+ .pslogin-openid.verisign input[type=submit] { background-color: #b22253; -webkit-appearance: none; }
589
590	.pslogin-block .pslogin-buttons ul li.xing span.pslogin-button-auto { background-color: #005d5e;}
591	.pslogin-block .pslogin-buttons ul li.xing .pslogin-button-icon { background-position: -168px -171px; }
592
593	+ .pslogin-block .pslogin-buttons ul li.kaixin001 span.pslogin-button-auto { background-color: #e2332e; }
594	+ .pslogin-block .pslogin-buttons ul li.kaixin001 .pslogin-button-icon { background-position: -203px -171px; }
595
596	.pslogin-block .pslogin-buttons ul li.orange span.pslogin-button-auto { background-color: #ff6600; }
597	.pslogin-block .pslogin-buttons ul li.orange .pslogin-button-icon { background-position: -1px -205px; }

611	.pslogin-block .pslogin-buttons ul li.reddit span.pslogin-button-auto { background-color: #337fb9; }
612	.pslogin-block .pslogin-buttons ul li.reddit .pslogin-button-icon { background-position: -203px -205px; }
613
614	+ .pslogin-block .pslogin-buttons ul li.odesk span.pslogin-button-auto { background-color: #7ac043; }
615	+ .pslogin-block .pslogin-buttons ul li.odesk .pslogin-button-icon { background-position: -1px -239px; }
616	+ .pslogin-block .pslogin-buttons ul li.odesk .pslogin-button-text { color: #000000; }
617
618	.pslogin-block .pslogin-buttons ul li.teamviewer span.pslogin-button-auto { background-color: #0171b9; }
619	.pslogin-block .pslogin-buttons ul li.teamviewer .pslogin-button-icon { background-position: -34px -239px; }

621	.pslogin-block .pslogin-buttons ul li.skyrock span.pslogin-button-auto { background-color: #009afe; }
622	.pslogin-block .pslogin-buttons ul li.skyrock .pslogin-button-icon { background-position: -67px -239px; }
623
624	+ .pslogin-block .pslogin-buttons ul li.renren span.pslogin-button-auto { background-color: #153765; }
625	+ .pslogin-block .pslogin-buttons ul li.renren .pslogin-button-icon { background-position: -101px -239px; }
626	+
627	+
628	+
629	+ .pslogin-block .pslogin-buttons ul li.etsy span.pslogin-button-auto { background-color: #ee5931; }
630	+ .pslogin-block .pslogin-buttons ul li.etsy .pslogin-button-icon { background-position: -134px -239px; }
631	+
632	+ .pslogin-block .pslogin-buttons ul li.imgur span.pslogin-button-auto { background-color: #312e2f; }
633	+ .pslogin-block .pslogin-buttons ul li.imgur .pslogin-button-icon { background-position: -170px -239px; }
634	+
635	+ .pslogin-block .pslogin-buttons ul li.intuit span.pslogin-button-auto { background-color: #B8B8B8; }
636	+ .pslogin-block .pslogin-buttons ul li.intuit .pslogin-button-icon { background-position: -204px -239px; }
637	+ .pslogin-block .pslogin-buttons ul li.intuit .pslogin-button-text { color: #000000; }
638	+
639	+ .pslogin-block .pslogin-buttons ul li.mailchimp span.pslogin-button-auto { background-color: #73cff4; }
640	+ .pslogin-block .pslogin-buttons ul li.mailchimp .pslogin-button-icon { background-position: 0px -273px; }
641	+ .pslogin-block .pslogin-buttons ul li.mailchimp .pslogin-button-text { color: #000000; }
642	+
643	+ .pslogin-block .pslogin-buttons ul li.persona span.pslogin-button-auto { background-color: #ee5931; }
644	+ .pslogin-block .pslogin-buttons ul li.persona .pslogin-button-icon { background-position: -34px -273px; }
645	+
646	+ .pslogin-block .pslogin-buttons ul li.dribbble span.pslogin-button-auto { background-color: #f26798; }
647	+ .pslogin-block .pslogin-buttons ul li.dribbble .pslogin-button-icon { background-position: -67px -273px; }
648	+
649	+ .pslogin-block .pslogin-buttons ul li.goodreads span.pslogin-button-auto { background-color: #743900; }
650	+ .pslogin-block .pslogin-buttons ul li.goodreads .pslogin-button-icon { background-position: -100px -273px; }
651	+
652	+ .pslogin-block .pslogin-buttons ul li.lastfm span.pslogin-button-auto { background-color: #c02c0c; }
653	+ .pslogin-block .pslogin-buttons ul li.lastfm .pslogin-button-icon { background-position: -135px -273px; }
654	+
655
656	/======= social buttons =======/
657	#prpop-pop-up-bg .pslogin-block {

720	#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons.pslogin-buttons-showfull li {
721	width: 70%;
722	min-height: 32px;
723	+ margin-bottom: 0px;
724	vertical-align: inherit;
725	+ display: inline-block;
726	+ float: none;
727	}
728
729	#prpop-pop-up-bg.prpop-default .pslogin-block .pslogin-buttons li {

778	#prpop-pop-up-bg.glamour-grey .pslogin-block .pslogin-buttons li {
779	width: auto;
780	min-height: 32px;
781	+ margin: 0 5px 5px 0;
782	vertical-align: middle;
783	}
784

923	width: 100%;
924	}
925
926	+ /=== open-id Page ===/
927	+ .pslogin-openid {
928	+ font-family: Arial, Helvetica, sans-serif;
929	+ font-size: 14px;
930	+ text-align: center;
931	+ padding: 20px;
932	+ }
933	+
934	+ .pslogin-openid .network-logo {
935	+ background: url('../../../images/plumrocket/pslogin/social_openid.png');
936	+ width: 180px;
937	+ height: 70px;
938	+ margin: 0 auto 15px auto;
939	+ }
940	+
941	+ .pslogin-openid.livejournal .network-logo { background-position: -180px 0; }
942	+ .pslogin-openid.verisign .network-logo { background-position: 0 -70px; }
943	+
944	+ .pslogin-openid input[type=submit] {
945	+ height: 32px;
946	+ line-height: 32px;
947	+ vertical-align: top;
948	+ padding: 0;
949	+ text-align: center;
950	+ min-width: 144px;
951	+ box-sizing: border-box;
952	+ font-size: 12px;
953	+ color: white;
954	+ border-radius: 0;
955	+ -moz-border-radius: 0;
956	+ -webkit-border-radius: 0;
957	+ border: 0px;
958	+ }
959	+
960	+ .pslogin-openid input[type=submit]:hover {
961	+ opacity: 0.8;
962	+ filter: alpha(opacity=80);
963	+ }
964	+
965	+ .pslogin-openid input[type=text] {
966	+ width: 100%;
967	+ border: 1px solid #D0D0D0;
968	+ height: 30px;
969	+ line-height: 25px;
970	+ margin-bottom: 5px;
971	+ margin-top: 10px;
972	+ padding: 2px;
973	+ box-sizing: border-box;
974	+ font-size: 14px;
975	+ }
976	+
977	+ .pslogin-openid .form-wrapper {
978	+ background-color: #f3f3f3;
979	+ color: #464646;
980	+ width: 300px;
981	+ margin: 0 auto;
982	+ padding: 25px;
983	+ box-shadow: 0px 2px 7px 0px #c1c1c1;
984	+ -moz-box-shadow: 0px 2px 7px 0px #c1c1c1;
985	+ -webkit-box-shadow: 0px 2px 7px 0px #c1c1c1;
986	+ border-radius: 15px;
987	+ font-size: 14px;
988	+ }
989	+
990	+ .pslogin-openid .ajax-loader {
991	+ width: 110px;
992	+ height: 14px;
993	+ margin: 0 auto 5px auto;
994	+ }
995	+
996	+ .pslogin-openid .ajax-loader .image-gif {
997	+ background: url('../../../images/plumrocket/pslogin/ajax-loader-h.gif');
998	+ width: 110px;
999	+ height: 14px;
1000	+ display: none;
1001	+ }
1002	+
1003	+ .pslogin-openid .ajax-loader .error-text {
1004	+ color: red;
1005	+ font-size: 11px;
1006	+ /display: none;/
1007	+ }
1008	+
1009	+
1010
1011	@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
1012
1013	.pslogin-block .pslogin-buttons ul li .pslogin-button-icon {
1014	background: url('../../../images/plumrocket/pslogin/social_retina.png');
1015	+ background-size: 236px 340px;
1016	+ -webkit-background-size: 236px 340px;
1017	+ -moz-background-size: 236px 340px;
1018	}
1019
1020	}

1727	100% {
1728	opacity: 0.6;
1729	}
1730	+ }

skin/frontend/base/default/images/plumrocket/pslogin/social.png CHANGED Viewed

Binary file

skin/frontend/base/default/images/plumrocket/pslogin/social_retina.png CHANGED Viewed

Binary file

skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js CHANGED Viewed

	@@ -14,8 +14,10 @@
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
	@@ -66,9 +68,11 @@ pjQuery_1_10_2(document).ready(function() {
66	if($link.data('loader')) {
67	pjQuery_1_10_2(win.document).ready(function() {
68
69	- var ~~html~~ = '~~<html style="height: 100%;"><head></head>~~';

70	html += '<body style="height: 100%; margin: 0; padding: 0;">';
71	- html += '<div style="text-align: center; height: 100%;"><img src="'+ $link.data('loader') +'" style="top: 50%; position: relative; margin-top: -64px;" /></div>';

72	html += '</body></html>';
73
74	pjQuery_1_10_2(win.document).contents().html(html);
	@@ -94,7 +98,7 @@ pjQuery_1_10_2(document).ready(function() {
94	// Fake email message.
95	pjQuery_1_10_2('.pslogin-fake-email-message .close-message').on('click', function() {
96	pjQuery_1_10_2(this).parent().hide();
97	- })
98
99	});
100


14	* @license http://wiki.plumrocket.net/wiki/EULA End-user License Agreement
15	*/
16
17	+ var psloginLoginPath = null;
18	+ var customerLogoutPath = null;
19	var showFullButtonsAfterViewMore = false;
20	+ var personaCurrentEmail = false;
21
22	pjQuery_1_10_2(document).ready(function() {
23

68	if($link.data('loader')) {
69	pjQuery_1_10_2(win.document).ready(function() {
70
71	+ var loaderText = 'Loading...';
72	+ var html = '<!DOCTYPE html><html style="height: 100%;"><head><meta name="viewport" content="width=device-width, initial-scale=1"><title>'+ loaderText +'</title></head>';
73	html += '<body style="height: 100%; margin: 0; padding: 0;">';
74	+ //html += '<div style="text-align: center; height: 100%;"><img src="'+ $link.data('loader') +'" alt="Please Wait" class="loader" style="top: 50%; position: relative; margin-top: -64px; display: none;" /></div>';
75	+ html += '<div style="text-align: center; height: 100%;"><div id="loader" style="top: 50%; position: relative; margin-top: -50px; color: #646464; height:25px; font-size: 25px; text-align: center; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;">'+ loaderText +'</div></div>';
76	html += '</body></html>';
77
78	pjQuery_1_10_2(win.document).contents().html(html);

98	// Fake email message.
99	pjQuery_1_10_2('.pslogin-fake-email-message .close-message').on('click', function() {
100	pjQuery_1_10_2(this).parent().hide();
101	+ });
102
103	});
104

skin/frontend/default/buyshop/css/plumrocket/pslogin/pslogin-custom.css ADDED Viewed

	@@ -0,0 +1,3 @@


1	+ #checkout-step-login .pull-right {
2	+ width: 285px;
3	+ }

skin/frontend/shopper/default/css/plumrocket/pslogin/pslogin-custom.css CHANGED Viewed

@@ -30,4 +30,22 @@
             	width: 100%;
             	padding: 0 50px;
             	box-sizing: border-box;
+            }


30	width: 100%;
31	padding: 0 50px;
32	box-sizing: border-box;
33	+ }
34	+
35	+ /* Popup login */
36	+ #prpop-pop-up-bg .pslogin-spacer {
37	+ padding: 0;
38	+ }
39	+
40	+ #prpop-pop-up-bg .pslogin-block {
41	+ padding: 0;
42	+ }
43	+
44	+ #prpop-pop-up-bg .pslogin-spacer .pslogin-border {
45	+ border-top: 1px solid #e5e2e2;
46	+ width: 100%;
47	+ }
48	+
49	+ #prpop-pop-up-bg.simple-form-logo .pslogin-spacer .pslogin-border {
50	+ border-top: 1px solid #A5A5A5;
51	}

skin/frontend/venedor/default/css/plumrocket/pslogin/pslogin-custom.css ADDED Viewed

	@@ -0,0 +1,15 @@


1	+ .pslogin-pop-up-form {
2	+ z-index: 11100;
3	+ }
4	+
5	+ .pslogin-addedoverlay {
6	+ z-index: 11000;
7	+ }
8	+
9	+ .pslogin-fake-email-message {
10	+ z-index: 11000;
11	+ }
12	+
13	+ #prpop-pop-up-bg .pslogin-block .pslogin-buttons ul {
14	+ padding: 0;
15	+ }

Plumrocket_Twitter_Facebook_Login - Version 1.2.0

Version Notes

Release Info

Code changes from version 1.1.0 to 1.2.0