OneID - Version 1.0.4

Version Notes

Fix the login page

Download this release

Release Info

Developer OneID
Extension OneID
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (15) hide show
  1. app/design/frontend/base/default/template/oneid/checkout/cart.phtml +0 -26
  2. app/design/frontend/base/default/template/oneid/checkout/onepage.phtml +0 -26
  3. app/design/frontend/base/default/template/oneid/checkout/onepage/billing.phtml +0 -26
  4. app/design/frontend/base/default/template/oneid/checkout/onepage/link.phtml +0 -26
  5. app/design/frontend/base/default/template/oneid/checkout/onepage/login.phtml +0 -26
  6. app/design/frontend/base/default/template/oneid/checkout/onepage/payment.phtml +0 -26
  7. app/design/frontend/base/default/template/oneid/checkout/onepage/shipping.phtml +0 -26
  8. app/design/frontend/base/default/template/oneid/checkout/success.phtml +0 -26
  9. app/design/frontend/base/default/template/oneid/customer/account/dashboard.phtml +0 -26
  10. app/design/frontend/base/default/template/oneid/customer/form/edit.phtml +0 -26
  11. app/design/frontend/base/default/template/oneid/customer/form/forgotpassword.phtml +0 -26
  12. app/design/frontend/base/default/template/oneid/form/login.phtml +41 -67
  13. app/design/frontend/base/default/template/oneid/form/traditional_login.phtml +1 -36
  14. app/design/frontend/base/default/template/oneid/oneid/signin.phtml +6 -0
  15. package.xml +5 -5
app/design/frontend/base/default/template/oneid/checkout/cart.phtml CHANGED
@@ -1,30 +1,4 @@
1
  <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
- <?php
28
  /**
29
  * Shopping cart template
30
  *
1
  <?php
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  /**
3
  * Shopping cart template
4
  *
app/design/frontend/base/default/template/oneid/checkout/onepage.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <div class="opc-wrapper">
28
  <div class="page-title">
29
  <?php echo $this->getChildHtml('checkoutCallout') ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="opc-wrapper">
2
  <div class="page-title">
3
  <?php echo $this->getChildHtml('checkoutCallout') ?>
app/design/frontend/base/default/template/oneid/checkout/onepage/billing.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <form id="co-billing-form" action="">
28
  <fieldset>
29
  <ul class="form-list">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <form id="co-billing-form" action="">
2
  <fieldset>
3
  <ul class="form-list">
app/design/frontend/base/default/template/oneid/checkout/onepage/link.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <?php if ($this->isPossibleOnepageCheckout()):?>
28
  <button type="button" title="<?php echo $this->__('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
29
  <br/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <?php if ($this->isPossibleOnepageCheckout()):?>
2
  <button type="button" title="<?php echo $this->__('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
3
  <br/>
app/design/frontend/base/default/template/oneid/checkout/onepage/login.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <?php echo $this->getChildHtml('login_before')?>
28
  <div class="col2-set<?php if (!$this->helper('customer')->isRegistrationAllowed() && !$this->getQuote()->isAllowedGuestCheckout()) echo ' login-only' ?>">
29
  <div class="col-1">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <?php echo $this->getChildHtml('login_before')?>
2
  <div class="col2-set<?php if (!$this->helper('customer')->isRegistrationAllowed() && !$this->getQuote()->isAllowedGuestCheckout()) echo ' login-only' ?>">
3
  <div class="col-1">
app/design/frontend/base/default/template/oneid/checkout/onepage/payment.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <script type="text/javascript">
28
  //<![CDATA[
29
  var quoteBaseGrandTotal = <?php echo (float)$this->getQuoteBaseGrandTotal(); ?>;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <script type="text/javascript">
2
  //<![CDATA[
3
  var quoteBaseGrandTotal = <?php echo (float)$this->getQuoteBaseGrandTotal(); ?>;
app/design/frontend/base/default/template/oneid/checkout/onepage/shipping.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <form action="" id="co-shipping-form">
28
  <fieldset>
29
  <ul class="form-list">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <form action="" id="co-shipping-form">
2
  <fieldset>
3
  <ul class="form-list">
app/design/frontend/base/default/template/oneid/checkout/success.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <div class="page-title">
28
  <h1><?php echo $this->__('Your order has been received') ?></h1>
29
  </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="page-title">
2
  <h1><?php echo $this->__('Your order has been received') ?></h1>
3
  </div>
app/design/frontend/base/default/template/oneid/customer/account/dashboard.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <div class="dashboard">
28
  <div class="page-title">
29
  <h1><?php echo $this->__('My Dashboard') ?></h1>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="dashboard">
2
  <div class="page-title">
3
  <h1><?php echo $this->__('My Dashboard') ?></h1>
app/design/frontend/base/default/template/oneid/customer/form/edit.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <div class="page-title">
28
  <h1><?php echo $this->__('Edit Account Information') ?></h1>
29
  </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="page-title">
2
  <h1><?php echo $this->__('Edit Account Information') ?></h1>
3
  </div>
app/design/frontend/base/default/template/oneid/customer/form/forgotpassword.phtml CHANGED
@@ -1,29 +1,3 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
  <div class="page-title">
28
  <h1><?php echo $this->__('Forgot Your Password?') ?></h1>
29
  </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="page-title">
2
  <h1><?php echo $this->__('Forgot Your Password?') ?></h1>
3
  </div>
app/design/frontend/base/default/template/oneid/form/login.phtml CHANGED
@@ -1,88 +1,62 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
- <?php
28
- /**
29
- * Customer login form template
30
- *
31
- * @see Mage_Customer_Block_Form_Login
32
- */
33
- ?>
34
-
35
-
36
- <div class="account-login<?php if (!$this->helper('customer')->isRegistrationAllowed()) echo ' login-only' ?>">
37
  <div class="page-title">
38
- <h1><?php if ($this->helper('customer')->isRegistrationAllowed()): ?>
39
- <?php echo $this->__('Login or Create an Account') ?>
40
- <?php else: ?>
41
- <?php echo $this->__('Login'); ?>
42
- <?php endif; ?></h1>
43
  </div>
44
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
 
45
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
46
- <div class="fieldset">
47
- <div class="col2-set">
48
- <div class="col-1 registered-users">
49
- <h2 class="legend"><?php echo $this->__('Registered Customers') ?></h2>
50
- <p><?php echo $this->__('If you have an account with us, log in using your email address.') ?></p>
 
 
 
 
 
 
51
  <ul class="form-list">
52
  <li>
53
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
54
  <div class="input-box">
55
- <input name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" id="email" type="text" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
56
  </div>
57
  </li>
58
  <li>
59
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
60
  <div class="input-box">
61
- <input name="login[password]" type="password" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
62
  </div>
63
  </li>
 
 
 
 
 
 
 
 
 
64
  </ul>
65
- <div class="buttons-set form-buttons btn-only">
66
- <div id="oneid-login-form-button" class="oneid-only oneid-login-container" style="float: left; margin-top: -7px; margin-right: 5px; display: block;" ></div>
67
- <script type="text/javascript">
68
- OneIdExtern.registerApiReadyFunction(function(){
69
- OneId.loginButton(OneId.$("#oneid-login-form-button"), { "challenge" : <?php echo $this->helper("OneID")->getLoginCHALJ() ?> });
70
- });
71
- </script>
72
- <button type="submit" class="button" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
73
- <a href="<?php echo $this->getForgotPasswordUrl() ?>"><?php echo $this->__('Forgot Your Password?') ?></a>
74
- </div>
75
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
76
  </div>
77
- <?php if ($this->helper('customer')->isRegistrationAllowed()): ?>
78
- <div class="col-2 new-users">
79
- <h2 class="legend"><?php echo $this->__('New Customers') ?></h2>
80
- <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>
81
- <div class="buttons-set">
82
- <button type="button" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><span><span><?php echo $this->__('Register') ?></span></span></button>
83
- </div>
 
 
 
 
 
84
  </div>
85
- <?php endif; ?>
86
  </div>
87
  </div>
88
  </form>
@@ -91,4 +65,4 @@
91
  var dataForm = new VarienForm('login-form', true);
92
  //]]>
93
  </script>
94
- </div>
1
+ <div class="account-login">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <div class="page-title">
3
+ <h1><?php echo $this->__('Login or Create an Account') ?></h1>
 
 
 
 
4
  </div>
5
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
6
+ <?php /* Extensions placeholder */ ?>
7
+ <?php echo $this->getChildHtml('customer.form.login.extra')?>
8
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
9
+ <div class="col2-set">
10
+ <div class="col-1 new-users">
11
+ <div class="content">
12
+ <h2><?php echo $this->__('New Customers') ?></h2>
13
+ <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>
14
+ </div>
15
+ </div>
16
+ <div class="col-2 registered-users">
17
+ <div class="content">
18
+ <h2><?php echo $this->__('Registered Customers') ?></h2>
19
+ <p><?php echo $this->__('If you have an account with us, please log in.') ?></p>
20
  <ul class="form-list">
21
  <li>
22
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
23
  <div class="input-box">
24
+ <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') ?>" />
25
  </div>
26
  </li>
27
  <li>
28
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
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
  </li>
33
+ <li>
34
+ <div id="oneid-login-form-button" class="oneid-only oneid-login-container" style="float: left; margin-top: -7px; margin-right: 5px; display: block;" ></div>
35
+ <script type="text/javascript">
36
+ OneIdExtern.registerApiReadyFunction(function(){
37
+ OneId.loginButton(OneId.$("#oneid-login-form-button"), { "challenge" : <?php echo $this->helper("OneID")->getLoginCHALJ() ?> });
38
+ });
39
+ </script>
40
+ </li>
41
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
42
  </ul>
43
+
 
 
 
 
 
 
 
 
 
44
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
45
  </div>
46
+ </div>
47
+ </div>
48
+ <div class="col2-set">
49
+ <div class="col-1 new-users">
50
+ <div class="buttons-set">
51
+ <button type="button" title="<?php echo $this->__('Create an Account') ?>" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
52
+ </div>
53
+ </div>
54
+ <div class="col-2 registered-users">
55
+ <div class="buttons-set">
56
+ <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
57
+ <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
58
  </div>
59
+
60
  </div>
61
  </div>
62
  </form>
65
  var dataForm = new VarienForm('login-form', true);
66
  //]]>
67
  </script>
68
+ </div>
app/design/frontend/base/default/template/oneid/form/traditional_login.phtml CHANGED
@@ -1,39 +1,4 @@
1
- <?php
2
- /**
3
- * Magento Enterprise Edition
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Magento Enterprise Edition License
8
- * that is bundled with this package in the file LICENSE_EE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://www.magentocommerce.com/license/enterprise-edition
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 enterprise_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://www.magentocommerce.com/license/enterprise-edition
25
- */
26
- ?>
27
- <?php
28
- /**
29
- * Customer login form template
30
- *
31
- * @see Mage_Customer_Block_Form_Login
32
- */
33
- ?>
34
-
35
-
36
- <div class="account-login login-only">
37
  <div class="page-title">
38
  <h1>
39
  <?php echo $this->__('Login to complete OneID link.') ?>
1
+ <div class="account-login login-only">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <div class="page-title">
3
  <h1>
4
  <?php echo $this->__('Login to complete OneID link.') ?>
app/design/frontend/base/default/template/oneid/oneid/signin.phtml ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <div id="oneid-login-form-button" class="oneid-only oneid-login-container" style="float: left; margin-top: -7px; margin-right: 5px; display: block;" ></div>
2
+ <script type="text/javascript">
3
+ OneIdExtern.registerApiReadyFunction(function(){
4
+ OneId.loginButton(OneId.$("#oneid-login-form-button"), { "challenge" : <?php echo $this->helper("OneID")->getLoginCHALJ() ?> });
5
+ });
6
+ </script>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>OneID</name>
4
- <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license>Apache Software License (ASL)</license>
7
  <channel>community</channel>
@@ -21,11 +21,11 @@ Privacy: OneID does not track any user behavior &#x2013; and certainly won&#x201
21
  Security: OneID secures customer information using three separate cryptographic combinations across multiple devices.&#xD;
22
  Convenience: OneID removes the hassle of having to remember user names and passwords.&#xD;
23
  And along with all those great benefits to you and your users, with this plugin you'll also get to use OneID to log into and administer your WordPress site using your OneID.</description>
24
- <notes>Deployment issues</notes>
25
  <authors><author><name>OneID</name><user>bpk_oneid</user><email>bpk@oneid.com</email></author></authors>
26
- <date>2013-01-17</date>
27
- <time>20:30:08</time>
28
- <contents><target name="magelocal"><dir name="OneID"><dir name="Connector"><dir name="Block"><dir name="Checkout"><dir name="Onepage"><file name="Success.php" hash="94f38f858a45304c10138c3a1b265490"/></dir></dir><file name="Login.php" hash="3cb291ca3f4700f279735fdeb544a8b3"/></dir><dir name="Helper"><file name="Data.php" hash="6d702e8fcf10c58de1ce6aa457dca427"/></dir><dir name="controllers"><file name="AccountController.php" hash="2401a0a519aac21bebeee77233fd0b03"/><file name="ConnectorController.php" hash="ea726d60099a66c2e63ad27fa1af5b8c"/><file name="OnepageController.php" hash="78d2dbae1606057fb3544296351898d8"/></dir><dir name="etc"><file name="config.xml" hash="cd1e65278f1c6a46103e68ff054ccaaa"/><file name="system.xml" hash="d47ac462cf6efd529aca557fad1b890e"/></dir><dir name="sql"><dir name="oneid_connector_setup"><file name="mysql4-install-0.1.0.php" hash="cad7569ee96103d087bf077661c1cafe"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="OneID.xml" hash=""/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="oneid"><dir name="block"><file name="login.phtml" hash="787f58873550105c3318baa8b0b77ded"/><dir name="page"><dir name="html"><file name="footer.phtml" hash="c4059028bd7db7b0f0d3b157157cea60"/><file name="head.phtml" hash="9dd7e46b5c3ce6eb4e92ef6738d55dc6"/><file name="newjavascript.js" hash="c9e0fa9a4851c0070614f605ebac8257"/></dir></dir></dir><dir name="checkout"><file name="cart.phtml" hash="e5432a7db576f10b3db7f0fbf4a8ad78"/><dir name="onepage"><file name="billing.phtml" hash="d80ce52901d86da87d3c602830d52513"/><file name="link.phtml" hash="504d5a93296a4da2e243261ac7b6793d"/><file name="login.phtml" hash="0a2414f1d6828b55f0a1dc840b81c75f"/><file name="payment.phtml" hash="3b40fd7ef0091e7f7e304aac4b79e950"/><dir name="review"><file name="button.phtml" hash="7646991c5b937654771fa78627e49c95"/></dir><file name="shipping.phtml" hash="73b243968ad4c1abace6a92acf2b1ada"/></dir><file name="onepage.phtml" hash="5629b4c56a420eeb122d321404e8d0c9"/><file name="success.phtml" hash="51e94568aa6f86e1080fd0995412e8b5"/></dir><dir name="customer"><dir name="account"><file name="dashboard.phtml" hash="bfc5cfa1f832004a10fa46f0dc110116"/></dir><dir name="form"><file name="edit.phtml" hash="5bad31a618e58da3ccad097655c9bdab"/><file name="forgotpassword.phtml" hash="a4bb8bf03b907a0e8cbb2b86a45950ae"/></dir></dir><dir name="form"><file name="login.phtml" hash="9f6d54bc1628d0b58c1b68284d52aac4"/><file name="traditional_login.phtml" hash="cd9a54a89a9408ac40f460df55bc20fc"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="oneid.css" hash="ab21ae320804ed42baaa587d9ad1804d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oneid_Connector.xml" hash="436ae58c4d1a855c664ab921b7b0ad44"/></dir></target></contents>
29
  <compatible/>
30
  <dependencies><required><php><min>5.0.0</min><max>5.4.10</max></php></required></dependencies>
31
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>OneID</name>
4
+ <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license>Apache Software License (ASL)</license>
7
  <channel>community</channel>
21
  Security: OneID secures customer information using three separate cryptographic combinations across multiple devices.&#xD;
22
  Convenience: OneID removes the hassle of having to remember user names and passwords.&#xD;
23
  And along with all those great benefits to you and your users, with this plugin you'll also get to use OneID to log into and administer your WordPress site using your OneID.</description>
24
+ <notes>Fix the login page</notes>
25
  <authors><author><name>OneID</name><user>bpk_oneid</user><email>bpk@oneid.com</email></author></authors>
26
+ <date>2013-01-18</date>
27
+ <time>22:13:33</time>
28
+ <contents><target name="magelocal"><dir name="OneID"><dir name="Connector"><dir name="Block"><dir name="Checkout"><dir name="Onepage"><file name="Success.php" hash="94f38f858a45304c10138c3a1b265490"/></dir></dir><file name="Login.php" hash="3cb291ca3f4700f279735fdeb544a8b3"/></dir><dir name="Helper"><file name="Data.php" hash="6d702e8fcf10c58de1ce6aa457dca427"/></dir><dir name="controllers"><file name="AccountController.php" hash="2401a0a519aac21bebeee77233fd0b03"/><file name="ConnectorController.php" hash="ea726d60099a66c2e63ad27fa1af5b8c"/><file name="OnepageController.php" hash="78d2dbae1606057fb3544296351898d8"/></dir><dir name="etc"><file name="config.xml" hash="cd1e65278f1c6a46103e68ff054ccaaa"/><file name="system.xml" hash="d47ac462cf6efd529aca557fad1b890e"/></dir><dir name="sql"><dir name="oneid_connector_setup"><file name="mysql4-install-0.1.0.php" hash="cad7569ee96103d087bf077661c1cafe"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="OneID.xml" hash=""/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="oneid"><dir name="block"><file name="login.phtml" hash="787f58873550105c3318baa8b0b77ded"/><dir name="page"><dir name="html"><file name="footer.phtml" hash="c4059028bd7db7b0f0d3b157157cea60"/><file name="head.phtml" hash="9dd7e46b5c3ce6eb4e92ef6738d55dc6"/><file name="newjavascript.js" hash="c9e0fa9a4851c0070614f605ebac8257"/></dir></dir></dir><dir name="checkout"><file name="cart.phtml" hash="4b02b99a1bbc8ad14a4452775df49ef2"/><dir name="onepage"><file name="billing.phtml" hash="db33088fbf7c82e54359f6b47f9782bd"/><file name="link.phtml" hash="c38a01ac21b86b2cd2b923f99b0d32f9"/><file name="login.phtml" hash="14a18316708340b2cb9d40d8c00a1050"/><file name="payment.phtml" hash="9b984eb3b27d9d522a5233a8be59f28f"/><dir name="review"><file name="button.phtml" hash="7646991c5b937654771fa78627e49c95"/></dir><file name="shipping.phtml" hash="ecc2387a24237e4b7021779578a2d942"/></dir><file name="onepage.phtml" hash="26399371e208ecb11bf0cda67621bcee"/><file name="success.phtml" hash="1bd4d74a04b4166aa8ce08b581d01fa0"/></dir><dir name="customer"><dir name="account"><file name="dashboard.phtml" hash="55b1ec9a6860486943e2e4fb8d81aede"/></dir><dir name="form"><file name="edit.phtml" hash="23eea7e7e29cb36c3c5885d7775de528"/><file name="forgotpassword.phtml" hash="cd02367e8214930140d80a7834e0f4a4"/></dir></dir><dir name="form"><file name="login.phtml" hash="3c58f25d91d404b002e53ebc10f71095"/><file name="traditional_login.phtml" hash="597e5d7b99eb7dcfb8f5a63185ce5e38"/></dir><dir name="oneid"><file name="signin.phtml" hash="1aeb1ac58db061d9649b92ee25b2ed20"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="oneid.css" hash="ab21ae320804ed42baaa587d9ad1804d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oneid_Connector.xml" hash="436ae58c4d1a855c664ab921b7b0ad44"/></dir></target></contents>
29
  <compatible/>
30
  <dependencies><required><php><min>5.0.0</min><max>5.4.10</max></php></required></dependencies>
31
  </package>