Version Notes
1.6.0.0
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Interface_Frontend_Default_Iphone |
| Version | 1.6.0.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.5.1.0 to 1.6.0.0
- app/design/frontend/default/iphone/etc/widget.xml +1 -1
- app/design/frontend/default/iphone/layout/catalog.xml +12 -4
- app/design/frontend/default/iphone/layout/checkout.xml +1 -1
- app/design/frontend/default/iphone/layout/cms.xml +1 -1
- app/design/frontend/default/iphone/layout/customer.xml +1 -3
- app/design/frontend/default/iphone/layout/page.xml +1 -3
- app/design/frontend/default/iphone/layout/persistent.xml +59 -0
- app/design/frontend/default/iphone/layout/review.xml +10 -2
- app/design/frontend/default/iphone/layout/tag.xml +1 -1
- app/design/frontend/default/iphone/template/catalog/product/list/toolbar.phtml +1 -1
- app/design/frontend/default/iphone/template/catalog/product/view/addtowishlist.phtml +31 -0
- app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml +1 -1
- app/design/frontend/default/iphone/template/checkout/cart.phtml +1 -1
- app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml +34 -7
- app/design/frontend/default/iphone/template/customer/form/forgotpassword.phtml +1 -1
- app/design/frontend/default/iphone/template/customer/form/login.phtml +1 -1
- app/design/frontend/default/iphone/template/page/1column.phtml +1 -1
- app/design/frontend/default/iphone/template/page/html/footer.phtml +1 -1
- app/design/frontend/default/iphone/template/page/html/head.phtml +1 -1
- app/design/frontend/default/iphone/template/page/html/header.phtml +1 -1
- app/design/frontend/default/iphone/template/page/one-column.phtml +1 -1
- app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml +72 -0
- app/design/frontend/default/iphone/template/sales/order/history.phtml +1 -1
- app/design/frontend/default/iphone/template/sales/order/recent.phtml +1 -1
- app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml +1 -1
- app/design/frontend/default/iphone/template/wishlist/view.phtml +1 -1
- package.xml +6 -6
- skin/frontend/default/iphone/css/iphone.css +1 -1
- skin/frontend/default/iphone/images/bkg_rating.gif +0 -0
- skin/frontend/default/iphone/js/opcheckout.js +2 -1
- skin/frontend/default/iphone/js/search.js +1 -1
app/design/frontend/default/iphone/etc/widget.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
-->
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
-->
|
app/design/frontend/default/iphone/layout/catalog.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
|
@@ -80,7 +80,7 @@ Category default layout
|
|
| 80 |
<block type="catalog/category_view" name="category.products" template="catalog/category/view.phtml">
|
| 81 |
<block type="catalog/product_list" name="product_list" template="catalog/product/list.phtml">
|
| 82 |
<block type="catalog/product_list_toolbar" name="product_list_toolbar" template="catalog/product/list/toolbar.phtml">
|
| 83 |
-
<block type="
|
| 84 |
<!-- The following code shows how to set your own pager increments -->
|
| 85 |
<!--
|
| 86 |
<action method="setDefaultListPerPage"><limit>4</limit></action>
|
|
@@ -118,7 +118,7 @@ Category layered navigation layout
|
|
| 118 |
<block type="catalog/product_list" name="product_list" template="catalog/product/list.phtml">
|
| 119 |
<!-- <action method="addReviewSummaryTemplate"><type>default</type><template>review/helper/su.phtml</template></action> -->
|
| 120 |
<block type="catalog/product_list_toolbar" name="product_list_toolbar" template="catalog/product/list/toolbar.phtml">
|
| 121 |
-
<block type="
|
| 122 |
<!-- The following code shows how to set your own pager increments -->
|
| 123 |
<!--
|
| 124 |
<action method="setDefaultListPerPage"><limit>4</limit></action>
|
|
@@ -225,7 +225,9 @@ Product view
|
|
| 225 |
<action method="addToParentGroup"><group>detailed_info</group></action>
|
| 226 |
</block>
|
| 227 |
<block type="catalog/product_view" name="product.info.addto" as="addto" template="catalog/product/view/addto.phtml"/>
|
| 228 |
-
<block type="catalog/product_view" name="product.info.addtocart" as="addtocart" template="catalog/product/view/addtocart.phtml"
|
|
|
|
|
|
|
| 229 |
|
| 230 |
<block type="core/text_list" name="product.info.extrahint" as="extrahint" translate="label">
|
| 231 |
<label>Product View Extra Hint</label>
|
|
@@ -377,6 +379,9 @@ SEO Site Map
|
|
| 377 |
|
| 378 |
<catalog_seo_sitemap_category translate="label">
|
| 379 |
<label>Catalog Seo Sitemap (Category List)</label>
|
|
|
|
|
|
|
|
|
|
| 380 |
<update handle="catalog_seo_sitemap" />
|
| 381 |
<reference name="seo.sitemap.container">
|
| 382 |
<action method="setTitle" translate="title" module="catalog"><title>Categories</title></action>
|
|
@@ -408,6 +413,9 @@ SEO Site Map
|
|
| 408 |
|
| 409 |
<catalog_seo_sitemap_product translate="label">
|
| 410 |
<label>Catalog Seo Sitemap (Product List)</label>
|
|
|
|
|
|
|
|
|
|
| 411 |
<update handle="catalog_seo_sitemap" />
|
| 412 |
<reference name="seo.sitemap.container">
|
| 413 |
<action method="setTitle" translate="title" module="catalog"><title>Products</title></action>
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
| 80 |
<block type="catalog/category_view" name="category.products" template="catalog/category/view.phtml">
|
| 81 |
<block type="catalog/product_list" name="product_list" template="catalog/product/list.phtml">
|
| 82 |
<block type="catalog/product_list_toolbar" name="product_list_toolbar" template="catalog/product/list/toolbar.phtml">
|
| 83 |
+
<block type="page/html_pager" name="product_list_toolbar_pager"/>
|
| 84 |
<!-- The following code shows how to set your own pager increments -->
|
| 85 |
<!--
|
| 86 |
<action method="setDefaultListPerPage"><limit>4</limit></action>
|
| 118 |
<block type="catalog/product_list" name="product_list" template="catalog/product/list.phtml">
|
| 119 |
<!-- <action method="addReviewSummaryTemplate"><type>default</type><template>review/helper/su.phtml</template></action> -->
|
| 120 |
<block type="catalog/product_list_toolbar" name="product_list_toolbar" template="catalog/product/list/toolbar.phtml">
|
| 121 |
+
<block type="page/html_pager" name="product_list_toolbar_pager"/>
|
| 122 |
<!-- The following code shows how to set your own pager increments -->
|
| 123 |
<!--
|
| 124 |
<action method="setDefaultListPerPage"><limit>4</limit></action>
|
| 225 |
<action method="addToParentGroup"><group>detailed_info</group></action>
|
| 226 |
</block>
|
| 227 |
<block type="catalog/product_view" name="product.info.addto" as="addto" template="catalog/product/view/addto.phtml"/>
|
| 228 |
+
<block type="catalog/product_view" name="product.info.addtocart" as="addtocart" template="catalog/product/view/addtocart.phtml">
|
| 229 |
+
<block type="catalog/product_view" name="product.info.addtowishlist" as="addto_wishlist" template="catalog/product/view/addtowishlist.phtml" />
|
| 230 |
+
</block>
|
| 231 |
|
| 232 |
<block type="core/text_list" name="product.info.extrahint" as="extrahint" translate="label">
|
| 233 |
<label>Product View Extra Hint</label>
|
| 379 |
|
| 380 |
<catalog_seo_sitemap_category translate="label">
|
| 381 |
<label>Catalog Seo Sitemap (Category List)</label>
|
| 382 |
+
<reference name="head">
|
| 383 |
+
<action method="setTitle" translate="title" module="catalog"><title>Site Map</title></action>
|
| 384 |
+
</reference>
|
| 385 |
<update handle="catalog_seo_sitemap" />
|
| 386 |
<reference name="seo.sitemap.container">
|
| 387 |
<action method="setTitle" translate="title" module="catalog"><title>Categories</title></action>
|
| 413 |
|
| 414 |
<catalog_seo_sitemap_product translate="label">
|
| 415 |
<label>Catalog Seo Sitemap (Product List)</label>
|
| 416 |
+
<reference name="head">
|
| 417 |
+
<action method="setTitle" translate="title" module="catalog"><title>Site Map</title></action>
|
| 418 |
+
</reference>
|
| 419 |
<update handle="catalog_seo_sitemap" />
|
| 420 |
<reference name="seo.sitemap.container">
|
| 421 |
<action method="setTitle" translate="title" module="catalog"><title>Products</title></action>
|
app/design/frontend/default/iphone/layout/checkout.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
app/design/frontend/default/iphone/layout/cms.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
-->
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
-->
|
app/design/frontend/default/iphone/layout/customer.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
|
@@ -74,7 +74,6 @@ Load this update on every page when customer is logged out
|
|
| 74 |
<reference name="account.links">
|
| 75 |
<action method="addLink" translate="label title" module="customer"><label>Log In</label><url helper="customer/getLoginUrl"/><title>Log In</title><prepare/><urlParams/><position>100</position></action>
|
| 76 |
</reference>
|
| 77 |
-
<remove name="wishlist_sidebar"></remove>
|
| 78 |
<remove name="reorder"></remove>
|
| 79 |
</customer_logged_out>
|
| 80 |
|
|
@@ -211,7 +210,6 @@ Customer account pages, rendered for all tabs in dashboard
|
|
| 211 |
<action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/cart/sidebar/default.phtml</template></action>
|
| 212 |
</block>
|
| 213 |
<block type="catalog/product_compare_sidebar" name="catalog.compare.sidebar" template="catalog/product/compare/sidebar.phtml"/>
|
| 214 |
-
<block type="sales/reorder_sidebar" name="sale.reorder.sidebar" as="reorder" template="sales/reorder/sidebar.phtml"/>
|
| 215 |
<remove name="tags_popular"/>
|
| 216 |
|
| 217 |
</reference>
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
| 74 |
<reference name="account.links">
|
| 75 |
<action method="addLink" translate="label title" module="customer"><label>Log In</label><url helper="customer/getLoginUrl"/><title>Log In</title><prepare/><urlParams/><position>100</position></action>
|
| 76 |
</reference>
|
|
|
|
| 77 |
<remove name="reorder"></remove>
|
| 78 |
</customer_logged_out>
|
| 79 |
|
| 210 |
<action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/cart/sidebar/default.phtml</template></action>
|
| 211 |
</block>
|
| 212 |
<block type="catalog/product_compare_sidebar" name="catalog.compare.sidebar" template="catalog/product/compare/sidebar.phtml"/>
|
|
|
|
| 213 |
<remove name="tags_popular"/>
|
| 214 |
|
| 215 |
</reference>
|
app/design/frontend/default/iphone/layout/page.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
-->
|
|
@@ -35,7 +35,6 @@ Default layout, loads most of the pages
|
|
| 35 |
<block type="page/html" name="root" output="toHtml" template="page/1column.phtml">
|
| 36 |
<block type="page/html_head" name="head" as="head">
|
| 37 |
<action method="addJs"><script>prototype/prototype.js</script></action>
|
| 38 |
-
<action method="addJs" ifconfig="dev/js/deprecation"><script>prototype/deprecation.js</script></action>
|
| 39 |
<action method="addJs"><script>lib/ccard.js</script></action>
|
| 40 |
<action method="addJs"><script>prototype/validation.js</script></action>
|
| 41 |
<action method="addJs"><script>scriptaculous/builder.js</script></action>
|
|
@@ -47,7 +46,6 @@ Default layout, loads most of the pages
|
|
| 47 |
<action method="addJs"><script>varien/form.js</script></action>
|
| 48 |
<action method="addJs"><script>mage/translate.js</script></action>
|
| 49 |
<action method="addJs"><script>mage/cookies.js</script></action>
|
| 50 |
-
|
| 51 |
<action method="addCss"><stylesheet>css/iphone.css</stylesheet></action>
|
| 52 |
</block>
|
| 53 |
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
-->
|
| 35 |
<block type="page/html" name="root" output="toHtml" template="page/1column.phtml">
|
| 36 |
<block type="page/html_head" name="head" as="head">
|
| 37 |
<action method="addJs"><script>prototype/prototype.js</script></action>
|
|
|
|
| 38 |
<action method="addJs"><script>lib/ccard.js</script></action>
|
| 39 |
<action method="addJs"><script>prototype/validation.js</script></action>
|
| 40 |
<action method="addJs"><script>scriptaculous/builder.js</script></action>
|
| 46 |
<action method="addJs"><script>varien/form.js</script></action>
|
| 47 |
<action method="addJs"><script>mage/translate.js</script></action>
|
| 48 |
<action method="addJs"><script>mage/cookies.js</script></action>
|
|
|
|
| 49 |
<action method="addCss"><stylesheet>css/iphone.css</stylesheet></action>
|
| 50 |
</block>
|
| 51 |
|
app/design/frontend/default/iphone/layout/persistent.xml
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design
|
| 23 |
+
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
-->
|
| 28 |
+
<layout version="0.1.0">
|
| 29 |
+
<customer_logged_out_psc_handle>
|
| 30 |
+
<reference name="account.links">
|
| 31 |
+
<action method="addLink" translate="label title" module="persistent"><label helper="persistent/getPersistentName"/><url helper="persistent/getUnsetCookieUrl"/><title helper="persistent/getPersistentName"/><prepare/><urlParams/><position>9</position></action>
|
| 32 |
+
<action method="removeLinkByUrl"><url helper="customer/getLoginUrl"/></action>
|
| 33 |
+
</reference>
|
| 34 |
+
</customer_logged_out_psc_handle>
|
| 35 |
+
|
| 36 |
+
<customer_account_login>
|
| 37 |
+
<reference name="customer_form_login">
|
| 38 |
+
<action method="setTemplate"><template>persistent/customer/form/login.phtml</template></action>
|
| 39 |
+
<block type="persistent/form_remember" name="persistent.remember.me" template="persistent/remember_me.phtml" />
|
| 40 |
+
<block type="core/template" name="persistent.remember.me.tooltip" template="persistent/remember_me_tooltip.phtml" />
|
| 41 |
+
</reference>
|
| 42 |
+
</customer_account_login>
|
| 43 |
+
|
| 44 |
+
<customer_account_create>
|
| 45 |
+
<reference name="customer_form_register">
|
| 46 |
+
<action method="setTemplate"><template>persistent/customer/form/register.phtml</template></action>
|
| 47 |
+
<block type="persistent/form_remember" name="persistent.remember.me" template="persistent/remember_me.phtml" />
|
| 48 |
+
<block type="core/template" name="persistent.remember.me.tooltip" template="persistent/remember_me_tooltip.phtml" />
|
| 49 |
+
</reference>
|
| 50 |
+
</customer_account_create>
|
| 51 |
+
|
| 52 |
+
<checkout_onepage_index>
|
| 53 |
+
<reference name="checkout.onepage.login">
|
| 54 |
+
<action method="setTemplate"><template>persistent/checkout/onepage/login.phtml</template></action>
|
| 55 |
+
<block type="persistent/form_remember" name="persistent.remember.me" template="persistent/remember_me.phtml" />
|
| 56 |
+
<block type="core/template" name="persistent.remember.me.tooltip" template="persistent/remember_me_tooltip.phtml" />
|
| 57 |
+
</reference>
|
| 58 |
+
</checkout_onepage_index>
|
| 59 |
+
</layout>
|
app/design/frontend/default/iphone/layout/review.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
|
@@ -81,7 +81,15 @@ Product reviews page
|
|
| 81 |
<action method="disableGallery"/>
|
| 82 |
</block>
|
| 83 |
<block type="catalog/product_view" name="product.info.addto" as="addto" template="catalog/product/view/addto.phtml"/>
|
| 84 |
-
<block type="catalog/product_view" name="product.info.addtocart" as="addtocart" template="catalog/product/view/addtocart.phtml"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 85 |
<block type="catalog/product_view" name="product.tierprices" as="tierprices" template="catalog/product/view/tierprices.phtml"/>
|
| 86 |
<block type="core/template" name="product.info.other" as="other" template="review/product/view/other.phtml"/>
|
| 87 |
<block type="page/html_pager" name="product_review_list.toolbar" />
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
| 81 |
<action method="disableGallery"/>
|
| 82 |
</block>
|
| 83 |
<block type="catalog/product_view" name="product.info.addto" as="addto" template="catalog/product/view/addto.phtml"/>
|
| 84 |
+
<block type="catalog/product_view" name="product.info.addtocart" as="addtocart" template="catalog/product/view/addtocart.phtml">
|
| 85 |
+
<!-- workaround: a better place for this code is in paypal.xml -->
|
| 86 |
+
<block type="page/html_wrapper" name="review.product.info.addtocart.paypal.wrapper" translate="label" module="paypal">
|
| 87 |
+
<label>PayPal Express Checkout Shortcut Wrapper</label>
|
| 88 |
+
<block type="paypal/express_shortcut" name="review.product.info.addtocart.paypal" template="paypal/express/shortcut.phtml">
|
| 89 |
+
<action method="setIsInCatalogProduct"><value>1</value></action>
|
| 90 |
+
</block>
|
| 91 |
+
</block>
|
| 92 |
+
</block>
|
| 93 |
<block type="catalog/product_view" name="product.tierprices" as="tierprices" template="catalog/product/view/tierprices.phtml"/>
|
| 94 |
<block type="core/template" name="product.info.other" as="other" template="review/product/view/other.phtml"/>
|
| 95 |
<block type="page/html_pager" name="product_review_list.toolbar" />
|
app/design/frontend/default/iphone/layout/tag.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
| 21 |
*
|
| 22 |
* @category design
|
| 23 |
* @package default_iphone
|
| 24 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
*/
|
| 27 |
|
app/design/frontend/default/iphone/template/catalog/product/list/toolbar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/catalog/product/view/addtowishlist.phtml
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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 default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 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 |
+
/** @var $this Mage_Catalog_Block_Product_View */
|
| 28 |
+
?>
|
| 29 |
+
<?php $_product = $this->getProduct(); ?>
|
| 30 |
+
<?php $_wishlistSubmitUrl = $this->helper('wishlist')->getAddUrl($_product); ?>
|
| 31 |
+
<a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, '<?php echo $_wishlistSubmitUrl ?>'); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a>
|
app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/checkout/cart.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml
CHANGED
|
@@ -20,11 +20,12 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem()?>
|
|
|
|
| 28 |
<tr>
|
| 29 |
<td class="a-center">
|
| 30 |
<a href="<?php echo $this->getDeleteUrl() ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php echo $this->__('Remove item')?>" /></a>
|
|
@@ -67,6 +68,21 @@
|
|
| 67 |
<td class="a-center">
|
| 68 |
<a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
|
| 69 |
</td>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 70 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 71 |
<td class="a-right">
|
| 72 |
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
|
@@ -148,6 +164,9 @@
|
|
| 148 |
<?php endif; ?>
|
| 149 |
</td>
|
| 150 |
<?php endif; ?>
|
|
|
|
|
|
|
|
|
|
| 151 |
<td class="a-center">
|
| 152 |
<input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
|
| 153 |
</td>
|
|
@@ -159,10 +178,14 @@
|
|
| 159 |
<span class="cart-price">
|
| 160 |
<?php endif; ?>
|
| 161 |
|
| 162 |
-
<?php if (
|
| 163 |
-
|
| 164 |
<?php else: ?>
|
| 165 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
| 166 |
<?php endif; ?>
|
| 167 |
|
| 168 |
</span>
|
|
@@ -201,10 +224,14 @@
|
|
| 201 |
<span class="cart-price">
|
| 202 |
<?php endif; ?>
|
| 203 |
|
| 204 |
-
<?php if (
|
| 205 |
-
|
| 206 |
<?php else: ?>
|
| 207 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
| 208 |
<?php endif; ?>
|
| 209 |
|
| 210 |
</span>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 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 $_item = $this->getItem()?>
|
| 28 |
+
<?php $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM); ?>
|
| 29 |
<tr>
|
| 30 |
<td class="a-center">
|
| 31 |
<a href="<?php echo $this->getDeleteUrl() ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php echo $this->__('Remove item')?>" /></a>
|
| 68 |
<td class="a-center">
|
| 69 |
<a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
|
| 70 |
</td>
|
| 71 |
+
|
| 72 |
+
<?php if ($canApplyMsrp): ?>
|
| 73 |
+
<td class="a-right"<?php if ($this->helper('tax')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
|
| 74 |
+
<span class="cart-price">
|
| 75 |
+
<span class="cart-msrp-unit"><?php echo $this->__('See price before order confirmation.'); ?></span>
|
| 76 |
+
<?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
|
| 77 |
+
<a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
|
| 78 |
+
<script type="text/javascript">
|
| 79 |
+
Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What's this?") ?>");
|
| 80 |
+
</script>
|
| 81 |
+
</span>
|
| 82 |
+
</td>
|
| 83 |
+
<?php else: ?>
|
| 84 |
+
|
| 85 |
+
|
| 86 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 87 |
<td class="a-right">
|
| 88 |
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 164 |
<?php endif; ?>
|
| 165 |
</td>
|
| 166 |
<?php endif; ?>
|
| 167 |
+
|
| 168 |
+
<?php endif; //Can apply MSRP ?>
|
| 169 |
+
|
| 170 |
<td class="a-center">
|
| 171 |
<input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
|
| 172 |
</td>
|
| 178 |
<span class="cart-price">
|
| 179 |
<?php endif; ?>
|
| 180 |
|
| 181 |
+
<?php if ($canApplyMsrp): ?>
|
| 182 |
+
<span class="cart-msrp-subtotal">--</span>
|
| 183 |
<?php else: ?>
|
| 184 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 185 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 186 |
+
<?php else: ?>
|
| 187 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
|
| 188 |
+
<?php endif; ?>
|
| 189 |
<?php endif; ?>
|
| 190 |
|
| 191 |
</span>
|
| 224 |
<span class="cart-price">
|
| 225 |
<?php endif; ?>
|
| 226 |
|
| 227 |
+
<?php if ($canApplyMsrp): ?>
|
| 228 |
+
<span class="cart-msrp-subtotal">--</span>
|
| 229 |
<?php else: ?>
|
| 230 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 231 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 232 |
+
<?php else: ?>
|
| 233 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 234 |
+
<?php endif; ?>
|
| 235 |
<?php endif; ?>
|
| 236 |
|
| 237 |
</span>
|
app/design/frontend/default/iphone/template/customer/form/forgotpassword.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/customer/form/login.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/page/1column.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/page/html/footer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/page/html/head.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/page/html/header.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
/**
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
/**
|
app/design/frontend/default/iphone/template/page/one-column.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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 default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 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/default/iphone/template/customer/form/login.phtml
|
| 32 |
+
*/
|
| 33 |
+
/** @var $this Mage_Customer_Block_Form_Login */
|
| 34 |
+
?>
|
| 35 |
+
<div class="account-login">
|
| 36 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 37 |
+
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
|
| 38 |
+
<div class="registered-users">
|
| 39 |
+
<h1><?php echo $this->__('Registered Customers') ?></h1>
|
| 40 |
+
<ul class="form-list">
|
| 41 |
+
<li>
|
| 42 |
+
<label for="email" class="required"><?php echo $this->__('Email Address') ?></label>
|
| 43 |
+
<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') ?>" />
|
| 44 |
+
</li>
|
| 45 |
+
<li>
|
| 46 |
+
<label for="pass" class="required"><?php echo $this->__('Password') ?></label>
|
| 47 |
+
<input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
|
| 48 |
+
</li>
|
| 49 |
+
<?php echo $this->getChildHtml('persistent.remember.me'); ?>
|
| 50 |
+
</ul>
|
| 51 |
+
<?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
|
| 52 |
+
<div class="buttons-set">
|
| 53 |
+
<a href="<?php echo $this->getForgotPasswordUrl() ?>"><?php echo $this->__('Forgot Your Password?') ?></a>
|
| 54 |
+
<button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
|
| 55 |
+
</div>
|
| 56 |
+
</div>
|
| 57 |
+
<?php if (Mage::helper('checkout')->isContextCheckout()): ?>
|
| 58 |
+
<input name="context" type="hidden" value="checkout" />
|
| 59 |
+
<?php endif; ?>
|
| 60 |
+
<div class="new-users">
|
| 61 |
+
<h1><?php echo $this->__('New Customers') ?></h1>
|
| 62 |
+
<div class="buttons-set">
|
| 63 |
+
<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>
|
| 64 |
+
</div>
|
| 65 |
+
</div>
|
| 66 |
+
</form>
|
| 67 |
+
<script type="text/javascript">
|
| 68 |
+
//<![CDATA[
|
| 69 |
+
var dataForm = new VarienForm('login-form', true);
|
| 70 |
+
//]]>
|
| 71 |
+
</script>
|
| 72 |
+
</div>
|
app/design/frontend/default/iphone/template/sales/order/history.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/sales/order/recent.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
?>
|
app/design/frontend/default/iphone/template/wishlist/view.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
/* @var $this Mage_Wishlist_Block_Customer_Wishlist */
|
| 20 |
*
|
| 21 |
* @category design
|
| 22 |
* @package default_iphone
|
| 23 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
*/
|
| 26 |
/* @var $this Mage_Wishlist_Block_Customer_Wishlist */
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Interface_Frontend_Default_Iphone</name>
|
| 4 |
-
<version>1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>This is a new iPhone optimized theme to the Magento default interface.</summary>
|
| 10 |
<description>This is a new iPhone optimized theme to the Magento default interface.</description>
|
| 11 |
-
<notes>1.
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
-
<date>2011-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="etc"><file name="widget.xml" hash="
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Interface_Frontend_Default_Iphone</name>
|
| 4 |
+
<version>1.6.0.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>This is a new iPhone optimized theme to the Magento default interface.</summary>
|
| 10 |
<description>This is a new iPhone optimized theme to the Magento default interface.</description>
|
| 11 |
+
<notes>1.6.0.0</notes>
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
+
<date>2011-08-18</date>
|
| 14 |
+
<time>08:29:32</time>
|
| 15 |
+
<contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="etc"><file name="widget.xml" hash="9c4d18745a41198c0f5538a7c505a8fe"/></dir><dir name="layout"><file name="catalog.xml" hash="52c60a7c46de252922c5245e0ce9104b"/><file name="checkout.xml" hash="8211471c2e269b008772b7fc0a2d1c17"/><file name="cms.xml" hash="40c5f912a988752195255c26f03e8f16"/><file name="customer.xml" hash="8e8b63bf7b6d78376ca346b407e89510"/><file name="page.xml" hash="496c1783b825d3035d1475046daab470"/><file name="persistent.xml" hash="6dbc1c3d5127ec4e2bff0853a6b60f69"/><file name="review.xml" hash="20cb9a1113b35fc73f44e94b272ef801"/><file name="tag.xml" hash="f611b05cabc69fa43ce045ac36171a49"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="eaac56acd7b5e71edab1ba5a394d9e9d"/></dir></dir><dir name="template"><dir name="catalog"><dir name="product"><dir name="list"><file name="toolbar.phtml" hash="ee74304e1563c74c4849909bd1654546"/></dir><dir name="view"><file name="addtowishlist.phtml" hash="03c5754e47c30882f099b4039b226821"/></dir></dir></dir><dir name="catalogsearch"><file name="form.mini.phtml" hash="9f1f066d285a83ee94425a55c1c826a1"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ef5787335c3d2556703bbcf50f740832"/></dir></dir><file name="cart.phtml" hash="7fdd29bff24ec35741bae1b444380ed8"/></dir><dir name="customer"><dir name="form"><file name="forgotpassword.phtml" hash="44ae15314a2e802b04afd3967a08e3b6"/><file name="login.phtml" hash="3204574bb4ae2e1dce87e50c595c884b"/></dir></dir><dir name="page"><file name="1column.phtml" hash="aebc45a22f043560a85cdeb1a6804394"/><dir name="html"><file name="footer.phtml" hash="6a5a95192399e6d7d77051c5c8d9e801"/><file name="head.phtml" hash="91afb60b9b7e0cdd5e245fc64fadfdc0"/><file name="header.phtml" hash="9cf699f5b61cf5f45d722688b012bdcb"/></dir><file name="one-column.phtml" hash="4bd291aa5dbdbd576fcb9d7fce6a096e"/></dir><dir name="persistent"><dir name="customer"><dir name="form"><file name="login.phtml" hash="eb27e391405e0fce209ad2687bcb7482"/></dir></dir></dir><dir name="sales"><dir name="order"><file name="history.phtml" hash="2a8b3addaf9a5f36d1dab52ca379f098"/><file name="recent.phtml" hash="280232aaa354ce5980584e625502d531"/></dir></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="popup.phtml" hash="1656b2ddc9e15023d54b016f7c83c100"/></dir></dir><dir name="wishlist"><file name="view.phtml" hash="280f609e38b4d03ff359b64a9606ad7f"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="css"><file name="iphone.css" hash="eebec6803fcc6dbbd2296f01d0475f8e"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="bkg_rating.gif" hash="f9d0374fd12e2e7c91c280d565dcdccd"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_place_order.gif" hash="d35219f86ae2c983ee1a31557e37b612"/><file name="btn_proceed_to_checkout.gif" hash="4daac687b514fecfd1068539500ac3d7"/><file name="btn_proceed_to_checkout.png" hash="a65868bfdf37e6c9bc8651fc402c43b3"/><file name="btn_proceed_to_checkout_bg.gif" hash="d1f61b4cd9db50e0322d23b291f1f4c4"/><file name="btn_proceed_to_checkout_rad.gif" hash="ee0f96c5b22aab80149238c210d1bf95"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="chart_remove.gif" hash="234bddc4c5878c5ef16407a944824236"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="footer-bg.gif" hash="7c474892fe9d3afbe9fc11415ec4d9b9"/><file name="free_shipping_callout.jpg" hash="cbf2e494ef7ca50acf8826321d739559"/><file name="gift-message-close.gif" hash="346e26eece27449a2f224aef76ae372e"/><file name="header-bg.gif" hash="d661bbd09fe352388114770522ab2c55"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="link_separator.gif" hash="0995b801ce2a89ed32fddd91831d5d15"/><file name="list_remove_btn.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="logo.gif" hash="2ad825be80e0cbff4d5669607d8f89cd"/><file name="logo_email.gif" hash="6b5211b7de79a89b162de049b224e56a"/><file name="logo_print.gif" hash="6b5211b7de79a89b162de049b224e56a"/><file name="menu-arrow.gif" hash="7a86f6b349c436db0d43fa2ebafadf86"/><file name="menu-bg.gif" hash="216ac10d06b04fcacb8e0d98db74e539"/><file name="np_cart_thumb.gif" hash="e9fdd943e0947e15f0638506f477e358"/><file name="np_more_img.gif" hash="ace357bfe3e81ffb62137cd5b25ae5e1"/><file name="np_product_main.gif" hash="d0cccda76de50efa025215ce85dacb1c"/><file name="np_thumb.gif" hash="e46270c89358ecc8341d1565c14644b8"/><file name="np_thumb2.gif" hash="8502866cdabc5c74aca7d7bd32a06a03"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="opc_off_head_bg.gif" hash="f69b40b5331ab3760f54d038daf287eb"/><file name="opc_on_box_bg.gif" hash="065d507000e7d0b887fcb324bb9d5995"/><file name="page-bg.gif" hash="3f018fdfa3c3c67c3f536d09e843c20a"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="pager_bg.gif" hash="e6967716de8c4bc4c96c206a0dbd2c5f"/><file name="ph.gif" hash="77d96eebccea5801290ad68b3ccb4199"/><file name="place_order_container_bg.gif" hash="8eebd513ac0d9c02cc566cff649799ce"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="search-bg.gif" hash="254aed2532aba555b56fd70ee48a4f41"/><file name="search-close-but.gif" hash="52516dcd783c5447bb88b2a65f8fbcfc"/><file name="search-end.gif" hash="cab21c2667c72cf78d5379073f7268fe"/><file name="search-go-but.gif" hash="a07b060825a1463eb2a44053081d3cb7"/><file name="search-md.gif" hash="5875a13f1b8aa787b48bf9047c545a38"/><file name="search-st.gif" hash="4b82821fac3dc5073af9ceb297dc4e61"/><file name="search_criteria.gif" hash="cf67b9cc5c311ae3f99e68cd29ae17be"/><file name="shipping_method_pointer.gif" hash="17d68b5449adaa87dafc62ae0afa1b9a"/><file name="sort_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="sort_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><dir name="js"><file name="opcheckout.js" hash="bdaabef11172e39cb9225509024ce5e2"/><file name="search.js" hash="6ded108069efcb147cd5efb380a18d48"/></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.6.0.0</min><max>1.6.1.0</max></package></required></dependencies>
|
| 18 |
</package>
|
skin/frontend/default/iphone/css/iphone.css
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
*
|
| 20 |
* @category design
|
| 21 |
* @package default_iphone
|
| 22 |
-
* @copyright Copyright (c)
|
| 23 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
*/
|
| 25 |
|
| 19 |
*
|
| 20 |
* @category design
|
| 21 |
* @package default_iphone
|
| 22 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 23 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
*/
|
| 25 |
|
skin/frontend/default/iphone/images/bkg_rating.gif
ADDED
|
Binary file
|
skin/frontend/default/iphone/js/opcheckout.js
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
*
|
| 20 |
* @category design
|
| 21 |
* @package default_iphone
|
| 22 |
-
* @copyright Copyright (c)
|
| 23 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
*/
|
| 25 |
|
|
@@ -839,6 +839,7 @@ Review.prototype = {
|
|
| 839 |
response = {};
|
| 840 |
}
|
| 841 |
if (response.redirect) {
|
|
|
|
| 842 |
location.href = response.redirect;
|
| 843 |
return;
|
| 844 |
}
|
| 19 |
*
|
| 20 |
* @category design
|
| 21 |
* @package default_iphone
|
| 22 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 23 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
*/
|
| 25 |
|
| 839 |
response = {};
|
| 840 |
}
|
| 841 |
if (response.redirect) {
|
| 842 |
+
this.isSuccess = true;
|
| 843 |
location.href = response.redirect;
|
| 844 |
return;
|
| 845 |
}
|
skin/frontend/default/iphone/js/search.js
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
*
|
| 20 |
* @category design
|
| 21 |
* @package default_iphone
|
| 22 |
-
* @copyright Copyright (c)
|
| 23 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
*/
|
| 25 |
function showSearchForm(a)
|
| 19 |
*
|
| 20 |
* @category design
|
| 21 |
* @package default_iphone
|
| 22 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 23 |
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
*/
|
| 25 |
function showSearchForm(a)
|
