From 6e24c0b89d2c9265f667a200a9a2131fbb3292db Mon Sep 17 00:00:00 2001 From: mage2-team Date: Fri, 29 Nov 2013 09:20:29 -0800 Subject: [PATCH] 2.0.0.0-dev54 * Modularity improvements: * Breakdown of the Adminhtml module: * Moved Newsletter, Report logic to the respective modules * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules * Removed application dependencies from the library * Move Magento\Core common blocks in the library * Application areas rework: * Areas are independent from Store * Removed deprecated annotation from the getArea methods * GitHub requests: * [#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws in core URL helper * [#247](https://github.com/magento/magento2/pull/247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage * [#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is supported for Turkish members. * [#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php * [#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed typos * [#382](https://github.com/magento/magento2/pull/382) -- [Magento/Core] Fixed typos * [#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous closing " * [#323](https://github.com/magento/magento2/pull/323) -- InstanceController.php - made setBody protected * [#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog menu declaration into Mage_Catalog module. * [#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php * [#271](https://github.com/magento/magento2/pull/271) -- Check Data should validate gallery information * [#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up nested quotes * [#352](https://github.com/magento/magento2/pull/352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration * [#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is locale aware and should not * [#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for required_options column * [#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix & partial invoice credit memo divide by zero warning * Themes update: * Old frontend (magento_demo) and backend (magento_basic) themes are removed * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules * Fixed bugs: * Fixed the error when Magento cannot be reinstalled to the same database with table prefix * Fixed report Products in Cart * Fixed error on attempt to insert image to CMS pages under version control * Fixed order status grid so that you can assign state, edit, and view custom order status * Fixed Related Products Rule page so that category can be selected on conditions tab * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled * Fixed the bug with international DHL quotes --- CHANGELOG.md | 47 +- .../Magento/AdminNotification/Model/Feed.php | 16 +- .../Model/System/Message/Security.php | 12 +- .../Model/Newsletter/Renderer/Text.php | 51 - .../Adminhtml/etc/adminhtml/events.xml | 30 - .../Magento/Adminhtml/etc/adminhtml/menu.xml | 54 - app/code/Magento/Adminhtml/etc/config.xml | 78 - app/code/Magento/Adminhtml/etc/di.xml | 42 - app/code/Magento/Adminhtml/etc/module.xml | 19 - app/code/Magento/Adminhtml/etc/sales.xml | 33 - .../view/adminhtml/layout/default.xml | 301 --- .../view/adminhtml/urlrewrite/selector.phtml | 2 +- .../Authorizenet/Directpost/Payment.php | 2 +- .../Controller/Directpost/Payment.php | 4 +- .../Magento/Authorizenet/Helper/Backend.php | 102 + app/code/Magento/Authorizenet/Helper/Data.php | 54 +- .../Helper/HelperInterface.php} | 29 +- .../Magento/Authorizenet/etc/adminhtml/di.xml | 1 + .../Magento/Authorizenet/etc/frontend/di.xml | 1 + .../view/adminhtml/directpost/iframe.phtml | 2 +- .../view/adminhtml/directpost/info.phtml | 2 +- .../view/frontend/directpost/iframe.phtml | 2 +- .../Backend/App/Area/FrontNameResolver.php | 10 +- app/code/Magento/Backend/App/Config.php | 88 + .../Magento/Backend/App/ConfigInterface.php | 61 + app/code/Magento/Backend/App/DefaultPath.php | 8 +- .../Backend/App/Router/DefaultRouter.php | 66 +- .../Block/Admin/Formkey.php | 6 +- .../{Adminhtml => Backend}/Block/Cache.php | 4 +- .../Block/Cache/Additional.php | 10 +- app/code/Magento/Backend/Block/Dashboard.php | 4 +- .../Searches/Renderer/Searchquery.php | 2 +- .../Block/Dashboard/Tab/Customers/Newest.php | 4 +- .../{Adminhtml => Backend}/Block/Denied.php | 6 +- .../Block/Media/Uploader.php | 36 +- .../{Adminhtml => Backend}/Block/Page.php | 8 +- .../Block/Page/Footer.php | 8 +- .../Block/Page/Head.php | 6 +- .../Block/Page/Header.php | 8 +- .../Block/Page/Notices.php | 8 +- .../Block/Page/System/Config/Robots/Reset.php | 6 +- .../Magento/Backend/Block/System/Design.php | 2 +- .../Block/System/Store/Delete/Group.php | 2 +- .../Block/System/Store/Delete/Website.php | 2 +- .../Magento/Backend/Block/System/Variable.php | 2 +- .../Block/Text/ListText.php | 6 +- .../Backend/Block/Widget/Grid/Extended.php | 4 +- .../Block/Widget/Grid/Massaction/Item.php | 6 +- .../Controller/Adminhtml/System/Config.php | 4 +- .../Magento/Backend/Model/Auth/Session.php | 31 +- .../Template.php => Backend/Model/Cookie.php} | 26 +- .../Model/Menu/Builder/AbstractCommand.php | 2 +- .../Backend/Model/Resource/Translate.php | 20 +- .../Model/Resource/Translate/String.php | 44 + .../Model/Search/Catalog.php | 12 +- .../Model/Search/Customer.php | 14 +- .../Model/Search/Order.php | 14 +- app/code/Magento/Backend/Model/Session.php | 21 + .../Model/Translate/Inline.php} | 21 +- .../Backend/Model/Translate/Inline/Config.php | 57 + .../Model/Translate/Inline/ConfigFactory.php | 66 + app/code/Magento/Backend/Model/Url.php | 66 +- .../etc/adminhtml/acl.xml | 0 app/code/Magento/Backend/etc/adminhtml/di.xml | 15 +- .../Magento/Backend/etc/adminhtml/events.xml | 3 + .../Magento/Backend/etc/adminhtml/menu.xml | 17 + app/code/Magento/Backend/etc/config.xml | 58 + app/code/Magento/Backend/etc/di.xml | 11 +- .../{Adminhtml => Backend}/etc/events.xml | 5 +- .../Magento/Backend/etc/install/di.xml} | 6 +- .../view/adminhtml/admin/access_denied.phtml | 2 +- .../view/adminhtml/admin/formkey.phtml | 0 .../view/adminhtml/admin/overlay_popup.phtml | 0 .../view/adminhtml/admin/page.phtml | 2 +- .../view/adminhtml/admin/popup.phtml | 4 +- .../layout/adminhtml_cache_index.xml | 4 +- .../adminhtml/layout/adminhtml_denied.xml | 2 +- .../adminhtml/layout/adminhtml_noroute.xml | 0 .../Backend/view/adminhtml/layout/default.xml | 278 ++- .../view/adminhtml/layout/editor.xml | 0 .../view/adminhtml/layout/empty.xml | 0 .../view/adminhtml/layout/formkey.xml | 2 +- .../view/adminhtml/layout/overlay_popup.xml | 0 .../view/adminhtml/layout/popup.xml | 0 .../view/adminhtml/media/uploader.phtml | 2 +- .../view/adminhtml/page/footer.phtml | 0 .../view/adminhtml/page/head.phtml | 2 +- .../view/adminhtml/page/header.phtml | 2 +- .../view/adminhtml/page/js/calendar.phtml | 0 .../view/adminhtml/page/js/components.phtml | 0 .../view/adminhtml/page/js/translate.phtml | 0 .../view/adminhtml/page/notices.phtml | 0 .../page/system/config/robots/reset.phtml | 2 +- .../adminhtml/store/switcher/enhanced.phtml | 0 .../view/adminhtml/system/shipping/ups.phtml | 2 +- .../Block/Adminhtml}/Backup.php | 14 +- .../Block/Adminhtml}/Dialogs.php | 6 +- .../Grid/Column/Renderer/Download.php | 2 +- .../Controller/Adminhtml/Index.php} | 18 +- app/code/Magento/Backup/Helper/Data.php | 61 +- app/code/Magento/Backup/Model/Observer.php | 2 +- app/code/Magento/Backup/Model/Resource/Db.php | 2 +- .../Magento/Backup/etc/adminhtml/menu.xml | 2 +- .../Magento/Backup/etc/adminhtml/routes.xml} | 10 +- .../view/adminhtml/backup/dialogs.phtml | 9 +- .../view/adminhtml/backup/left.phtml | 0 .../view/adminhtml/backup/list.phtml | 0 .../adminhtml/layout/backup_index_block.xml} | 0 .../adminhtml/layout/backup_index_grid.xml} | 2 +- .../adminhtml/layout/backup_index_index.xml} | 4 +- .../Product/Edit/Tab/Bundle/Option.php | 4 +- .../Edit/Tab/Bundle/Option/Selection.php | 38 +- .../Magento/Bundle/Model/Product/Type.php | 2 +- .../Model/Resource/Option/Collection.php | 2 +- .../Magento/Bundle/view/frontend/bundle.js | 4 +- .../view/frontend/catalog/product/price.phtml | 276 ++- .../catalog/product/view/backbutton.phtml | 6 +- .../catalog/product/view/customize.phtml | 7 +- .../catalog/product/view/options/notice.phtml | 2 - .../frontend/catalog/product/view/price.phtml | 2 - .../catalog/product/view/summary.phtml | 30 +- .../catalog/product/view/tierprices.phtml | 6 +- .../catalog/product/view/type/bundle.phtml | 49 +- .../view/type/bundle/option/checkbox.phtml | 52 +- .../view/type/bundle/option/multi.phtml | 48 +- .../view/type/bundle/option/radio.phtml | 88 +- .../view/type/bundle/option/select.phtml | 65 +- .../product/view/type/bundle/options.phtml | 46 +- .../Magento/Bundle/view/frontend/js/float.js | 2 - .../view/frontend/js/product-summary.js | 2 - .../Magento/Bundle/view/frontend/js/slide.js | 29 +- .../catalog_product_view_type_bundle.xml | 40 +- .../frontend/layout/checkout_cart_index.xml | 2 +- .../Bundle/view/frontend/layout/default.xml | 11 +- .../frontend/rss/catalog/product/price.phtml | 4 +- .../order/creditmemo/items/renderer.phtml | 329 ++- .../sales/order/invoice/items/renderer.phtml | 361 ++-- .../frontend/sales/order/items/renderer.phtml | 463 ++-- .../sales/order/shipment/items/renderer.phtml | 138 +- .../Adminhtml/Captcha/DefaultCaptcha.php | 82 + .../Captcha/Block/Captcha/DefaultCaptcha.php | 11 +- .../Magento/Captcha/Helper/Adminhtml/Data.php | 88 + app/code/Magento/Captcha/Helper/Data.php | 25 +- app/code/Magento/Captcha/Model/Cron.php | 144 ++ app/code/Magento/Captcha/Model/Observer.php | 48 - app/code/Magento/Captcha/etc/adminhtml/di.xml | 4 + app/code/Magento/Captcha/etc/crontab.xml | 4 +- .../etc/crontab/di.xml} | 6 +- .../Catalog/Block/Adminhtml/Category/Tree.php | 4 +- .../Form/Renderer/Fieldset/Element.php | 2 +- .../Product/Attribute/Edit/Tab/Front.php | 10 +- .../Product/Attribute/Edit/Tab/Main.php | 6 - .../Attribute/Set/Main/Tree/Attribute.php | 2 +- .../Product/Attribute/Set/Main/Tree/Group.php | 2 +- .../Product/Attribute/Set/Toolbar/Add.php | 2 +- .../Composite/Fieldset/Configurable.php | 2 +- .../Edit/Action/Attribute/Tab/Attributes.php | 32 +- .../Block/Adminhtml/Product/Edit/Js.php | 2 +- .../Adminhtml/Product/Edit/Tab/Alerts.php | 2 +- .../Product/Edit/Tab/Attributes/Create.php | 2 +- .../Product/Edit/Tab/Options/Option.php | 42 +- .../Edit/Tab/Options/Type/AbstractType.php | 24 +- .../Adminhtml/Product/Edit/Tab/Reviews.php | 2 +- .../Catalog/Block/Adminhtml/Product/Grid.php | 3 +- .../Adminhtml/Product/Helper/Form/Gallery.php | 2 +- .../Product/Helper/Form/Gallery/Content.php | 30 +- .../Product/Widget/Chooser/Container.php | 2 +- app/code/Magento/Catalog/Block/Navigation.php | 3 +- .../Magento/Catalog/Block/Product/Gallery.php | 14 +- .../Block/Product/ProductList/Toolbar.php | 2 +- .../Block/Product/View/AbstractView.php | 2 +- .../Block/Product/View/Type/Configurable.php | 2 +- .../Catalog/Controller/Adminhtml/Product.php | 2 +- .../Adminhtml/Product/Action/Attribute.php | 2 +- .../Adminhtml/Product/Attribute.php | 2 +- .../Controller/Adminhtml/Product/Review.php | 16 +- .../Magento/Catalog/Helper/Category/Flat.php | 10 +- .../Catalog/Helper/Flat/AbstractFlat.php | 16 +- .../Catalog/Helper/Product/Compare.php | 4 +- .../Helper/Product/Edit/Action/Attribute.php | 2 +- .../Magento/Catalog/Helper/Product/Flat.php | 10 +- .../Magento/Catalog/Model/AbstractModel.php | 6 - .../Attribute/Backend/Customlayoutupdate.php | 8 +- app/code/Magento/Catalog/Model/Category.php | 2 +- app/code/Magento/Catalog/Model/Product.php | 8 +- .../Model/Product/Attribute/Backend/Media.php | 4 +- .../Model/Product/Media/ConfigInterface.php | 8 +- .../Model/Product/Type/Configurable.php | 2 +- .../Catalog/Model/Product/Type/Grouped.php | 12 +- .../Model/Product/Type/Grouped/Backend.php | 44 + .../Model/Resource/AbstractResource.php | 2 +- .../Model/Resource/Category/Collection.php | 2 +- .../Catalog/Model/Resource/Category/Flat.php | 14 +- .../Resource/Category/Indexer/Product.php | 2 +- .../Catalog/Model/Resource/Category/Tree.php | 2 +- .../Collection/AbstractCollection.php | 2 +- .../Product/Attribute/Backend/Media.php | 4 +- .../Model/Resource/Product/Collection.php | 16 +- .../Model/Resource/Product/Flat/Indexer.php | 2 +- .../Resource/Product/Indexer/Eav/Decimal.php | 4 +- .../Resource/Product/Indexer/Eav/Source.php | 4 +- .../Catalog/Model/Resource/Product/Option.php | 16 +- .../Resource/Product/Option/Collection.php | 4 +- .../Model/Resource/Product/Option/Value.php | 12 +- .../Product/Option/Value/Collection.php | 8 +- .../Catalog/Model/Resource/Product/Status.php | 8 +- .../Resource/Product/Type/Configurable.php | 2 +- app/code/Magento/Catalog/etc/adminhtml/di.xml | 6 + .../Magento/Catalog/etc/adminhtml/menu.xml | 2 + .../catalog/product/attribute/labels.phtml | 2 +- .../catalog/product/attribute/options.phtml | 2 +- .../layout/catalog_product_attribute_edit.xml | 2 +- .../view/adminhtml/product/product.css | 14 +- .../Catalog/view/frontend/category/view.phtml | 44 +- .../category/widget/link/link_block.phtml | 4 +- .../category/widget/link/link_inline.phtml | 4 +- .../view/frontend/images/i_asc_arrow.gif | Bin 115 -> 0 bytes .../view/frontend/images/i_desc_arrow.gif | Bin 114 -> 0 bytes .../view/frontend/images/i_widget-link.gif | Bin 57 -> 0 bytes .../view/frontend/images/i_widget-new.gif | Bin 545 -> 0 bytes .../images/media/col_left_callout.jpg | Bin 19102 -> 0 bytes .../images/media/col_right_callout.jpg | Bin 14703 -> 0 bytes .../Catalog/view/frontend/js/configurable.js | 6 +- .../Magento/Catalog/view/frontend/js/list.js | 55 +- .../Catalog/view/frontend/layer/filter.phtml | 28 +- .../Catalog/view/frontend/layer/state.phtml | 43 +- .../Catalog/view/frontend/layer/view.phtml | 36 +- .../frontend/layout/catalog_category_view.xml | 68 +- .../catalog_category_view_type_default.xml | 2 +- .../catalog_category_view_type_layered.xml | 2 +- .../layout/catalog_product_compare_index.xml | 14 +- .../frontend/layout/catalog_product_view.xml | 144 +- ...catalog_product_view_type_configurable.xml | 12 +- .../catalog_product_view_type_grouped.xml | 9 +- .../catalog_product_view_type_simple.xml | 9 +- .../catalog_product_view_type_virtual.xml | 9 +- .../Catalog/view/frontend/layout/default.xml | 30 +- .../Catalog/view/frontend/msrp/popup.phtml | 53 +- .../view/frontend/navigation/left.phtml | 45 +- .../view/frontend/navigation/top.phtml | 6 +- .../view/frontend}/product/compare/link.phtml | 1 - .../view/frontend/product/compare/list.phtml | 239 +-- .../frontend/product/compare/sidebar.phtml | 60 +- .../view/frontend/product/gallery.phtml | 8 +- .../Catalog/view/frontend/product/image.phtml | 8 +- .../frontend/product/image_with_borders.phtml | 22 +- .../Catalog/view/frontend/product/list.phtml | 200 +- .../view/frontend}/product/list/items.phtml | 38 +- .../view/frontend/product/list/related.phtml | 63 - .../view/frontend/product/list/toolbar.phtml | 101 +- .../view/frontend/product/list/upsell.phtml | 52 - .../view/frontend}/product/listing.phtml | 3 - .../Catalog/view/frontend/product/new.phtml | 63 - .../view/frontend/product/price_msrp.phtml | 8 +- .../frontend/product/price_msrp_item.phtml | 8 +- .../Catalog/view/frontend/product/view.phtml | 132 -- .../frontend/product/view/additional.phtml | 2 - .../view/frontend/product/view/addto.phtml | 33 +- .../frontend/product/view/addtocart.phtml | 85 +- .../frontend}/product/view/attribute.phtml | 4 +- .../frontend/product/view/attributes.phtml | 13 +- .../frontend/product/view/base-image.phtml | 137 +- .../frontend/product/view/description.phtml | 11 +- .../view/frontend}/product/view/details.phtml | 0 .../view/frontend}/product/view/form.phtml | 9 +- .../view/frontend/product/view/gallery.phtml | 41 - .../view/frontend}/product/view/mailto.phtml | 4 +- .../view/frontend/product/view/options.phtml | 9 +- .../frontend/product/view/options/js.phtml | 106 +- .../product/view/options/type/date.phtml | 95 +- .../product/view/options/type/default.phtml | 8 +- .../product/view/options/type/file.phtml | 46 +- .../product/view/options/type/select.phtml | 19 +- .../product/view/options/type/text.phtml | 72 +- .../product/view/options/wrapper.phtml | 18 +- .../product/view/options/wrapper/bottom.phtml | 4 +- .../view/frontend}/product/view/price.phtml | 0 .../frontend/product/view/price_clone.phtml | 2 - .../view/frontend}/product/view/rating.phtml | 1 - .../frontend/product/view/tierprices.phtml | 290 ++- .../frontend/product/view/type/default.phtml | 12 +- .../frontend/product/view/type/grouped.phtml | 68 +- .../view/type/options/configurable.phtml | 29 +- .../product/widget/link/link_block.phtml | 6 +- .../product/widget/link/link_inline.phtml | 8 +- .../widget/new/column/new_default_list.phtml | 69 +- .../widget/new/column/new_images_list.phtml | 30 +- .../widget/new/column/new_names_list.phtml | 30 +- .../product/widget/new/content/new_grid.phtml | 134 +- .../product/widget/new/content/new_list.phtml | 125 +- .../view/frontend/rss/product/price.phtml | 4 +- .../Magento/Catalog/view/frontend/widgets.css | 30 - .../Magento/Catalog/view/frontend/zoom.css | 2 - .../Model/Adminhtml/Stock/Item.php | 64 + .../Magento/CatalogInventory/Model/Stock.php | 2 +- .../CatalogInventory/Model/Stock/Item.php | 37 +- .../CatalogInventory/etc/adminhtml/di.xml} | 6 +- .../view/frontend/qtyincrements.phtml | 5 +- .../view/frontend/stockqty/composite.phtml | 57 +- .../view/frontend/stockqty/default.phtml | 9 +- .../Block/Adminhtml/Promo/Catalog/Edit/Js.php | 2 +- .../CatalogRule/Model/Resource/Rule.php | 15 +- .../view/frontend/advanced/form.phtml | 167 +- .../view/frontend/advanced/result.phtml | 54 +- .../CatalogSearch/view/frontend/form-mini.js | 2 - .../view/frontend/form.mini.phtml | 63 +- .../layout/catalogsearch_advanced_index.xml | 6 +- .../layout/catalogsearch_advanced_result.xml | 27 +- .../layout/catalogsearch_result_index.xml | 37 +- .../layout/catalogsearch_term_popular.xml | 8 +- .../CatalogSearch/view/frontend/result.phtml | 44 +- .../CatalogSearch/view/frontend/term.phtml | 18 +- app/code/Magento/Centinel/Model/Service.php | 51 +- .../Magento/Centinel/etc/adminhtml/di.xml | 10 +- .../Checkout/Controller/Multishipping.php | 22 +- app/code/Magento/Checkout/Helper/Cart.php | 4 +- .../Checkout/Model/Type/Multishipping.php | 4 +- .../view/frontend/onepage/login.phtml | 2 +- .../Wysiwyg/Images/Content/Files.php | 2 +- .../Wysiwyg/Images/Content/Newfolder.php | 2 +- .../Wysiwyg/Images/Content/Uploader.php | 2 +- .../Block/Adminhtml/Wysiwyg/Images/Tree.php | 2 +- .../Magento/Cms/Controller/Adminhtml/Page.php | 4 +- app/code/Magento/Cms/Model/Resource/Block.php | 4 +- .../Cms/Model/Resource/Block/Collection.php | 2 +- app/code/Magento/Cms/Model/Resource/Page.php | 8 +- .../Cms/Model/Resource/Page/Collection.php | 2 +- .../Extension/Custom/Edit/Tab/Load.php | 2 +- .../Core/App/Request/PathInfoProcessor.php | 4 +- app/code/Magento/Core/Helper/Url.php | 29 +- app/code/Magento/Core/Model/AbstractModel.php | 15 +- app/code/Magento/Core/Model/App.php | 4 +- app/code/Magento/Core/Model/App/Emulation.php | 16 +- app/code/Magento/Core/Model/AppInterface.php | 6 - app/code/Magento/Core/Model/Context.php | 1 - app/code/Magento/Core/Model/Cookie.php | 6 +- app/code/Magento/Core/Model/EntityFactory.php | 2 +- app/code/Magento/Core/Model/File/Storage.php | 2 +- app/code/Magento/Core/Model/Layout.php | 1 - .../Model/Layout/Argument/AbstractHandler.php | 2 +- .../Layout/Argument/Handler/ArrayHandler.php | 2 +- app/code/Magento/Core/Model/Layout/Merge.php | 39 +- .../Model/Layout/Update}/Validator.php | 8 +- app/code/Magento/Core/Model/Locale.php | 4 +- .../Magento/Core/Model/LocaleInterface.php | 6 +- .../Core/Model/Resource/Config/Data.php | 2 +- .../Core/Model/Resource/Db/AbstractDb.php | 2 +- .../Magento/Core/Model/Resource/Setup.php | 2 +- .../Magento/Core/Model/Resource/Store.php | 2 +- .../Core/Model/Resource/Transaction.php | 2 +- .../Magento/Core/Model/Resource/Translate.php | 15 +- .../Core/Model/Resource/Translate/String.php | 18 +- .../Core/Model/Resource/Url/Rewrite.php | 4 +- .../Magento/Core/Model/Resource/Variable.php | 6 +- .../Model/Resource/Variable/Collection.php | 2 +- .../Core/Model/Session/AbstractSession.php | 23 +- app/code/Magento/Core/Model/Store.php | 65 +- app/code/Magento/Core/Model/Store/Group.php | 2 +- .../Model/Store/Storage/DefaultStorage.php | 2 +- app/code/Magento/Core/Model/Template.php | 4 +- app/code/Magento/Core/Model/Theme.php | 1 - app/code/Magento/Core/Model/Translate.php | 1 + .../Magento/Core/Model/Translate/Inline.php | 54 +- .../Core/Model/Translate/Inline/Config.php | 60 + .../Model/Translate/Inline/ConfigFactory.php | 58 + .../Translate/Inline/ConfigInterface.php} | 22 +- app/code/Magento/Core/Model/Url.php | 57 +- .../Magento/Core/Model/Variable/Config.php | 2 +- app/code/Magento/Core/Model/View/Design.php | 1 - app/code/Magento/Core/Model/Website.php | 2 +- app/code/Magento/Core/etc/config.xml | 2 +- app/code/Magento/Core/etc/di.xml | 14 +- app/code/Magento/Core/i18n/fr_FR.csv | 4 +- .../System/Currency/Rate/Services.php | 24 +- .../Customer/Block/Account/Dashboard.php | 2 +- .../Address/Renderer/RendererInterface.php | 2 +- .../Tab/Newsletter/Grid/Renderer/Action.php | 2 +- .../Block/Adminhtml/Edit/Tab/Reviews.php | 2 +- .../Block/Adminhtml/Edit/Tab/View.php | 2 +- .../Customer/Block/Adminhtml/Online.php | 2 +- .../Magento/Customer/Controller/Address.php | 23 + .../Model/Backend/Customer.php} | 25 +- app/code/Magento/Customer/Model/Customer.php | 13 +- app/code/Magento/Customer/Model/Observer.php | 29 +- .../Address/Attribute/Source/Country.php | 2 +- .../Address/Attribute/Source/Region.php | 2 +- .../Model/Resource/Customer/Collection.php | 17 +- .../Model/Resource/Group/Collection.php | 4 +- .../Magento/Customer/Model/Resource/Setup.php | 2 +- .../Magento/Customer/etc/adminhtml/di.xml | 6 + .../adminhtml/layout/customer_index_edit.xml | 4 +- .../Customer/view/email/account_new.html | 8 +- .../view/email/account_new_confirmed.html | 2 +- .../frontend/account/dashboard/address.phtml | 4 +- .../view/frontend/account/navigation.phtml | 4 +- app/code/Magento/Directory/Helper/Url.php | 2 +- .../adminhtml/js/optional_zip_countries.phtml | 2 +- .../Product/Edit/Tab/Downloadable/Links.php | 48 +- .../Downloadable/etc/adminhtml/menu.xml | 2 +- .../view/frontend/catalog/product/links.phtml | 66 +- .../frontend/catalog/product/samples.phtml | 12 +- .../view/frontend/catalog/product/type.phtml | 15 +- .../frontend/checkout/cart/item/default.phtml | 476 +++-- .../multishipping/item/downloadable.phtml | 59 +- .../checkout/onepage/review/item.phtml | 243 ++- .../view/frontend/checkout/success.phtml | 2 - .../frontend/customer/products/list.phtml | 68 +- .../view/frontend/downloadable.js | 2 - ...catalog_product_view_type_downloadable.xml | 4 +- .../frontend/layout/checkout_cart_index.xml | 2 +- .../view/frontend/layout/default.xml} | 4 +- .../items/renderer/downloadable.phtml | 419 ++-- .../invoice/items/renderer/downloadable.phtml | 441 ++-- .../order/items/renderer/downloadable.phtml | 450 ++-- .../Eav/Block/Adminhtml/Attribute/Edit/Js.php | 2 +- .../Attribute/Edit/Options/Options.php | 2 +- .../Eav/Model/Entity/AbstractEntity.php | 8 +- .../Magento/Eav/Model/Entity/Attribute.php | 12 +- .../Attribute/Frontend/AbstractFrontend.php | 6 +- .../Entity/Attribute/Frontend/Datetime.php | 2 +- .../Entity/Collection/AbstractCollection.php | 6 +- app/code/Magento/Eav/Model/Entity/Type.php | 16 +- .../Eav/Model/Resource/Entity/Attribute.php | 2 +- .../Model/Resource/Entity/Attribute/Group.php | 2 +- .../Resource/Entity/Attribute/Option.php | 2 +- .../Resource/Form/Attribute/Collection.php | 20 +- .../Email/Block/Adminhtml/Template.php | 2 +- .../Email/Block/Adminhtml/Template/Edit.php | 4 +- .../Magento/Email/Model/Resource/Template.php | 8 +- .../Magento/Email/Model/Template/Mailer.php | 4 +- .../Adminhtml/Sales/Order/Create/Form.php | 2 +- .../Sales/Order/Create/Giftoptions.php | 2 +- .../Adminhtml/Sales/Order/Create/Items.php | 2 +- .../Sales/Order/View/Giftoptions.php | 2 +- .../Adminhtml/Sales/Order/View/Items.php | 16 +- .../Magento/GiftMessage/Helper/Message.php | 12 +- app/code/Magento/GiftMessage/Helper/Url.php | 8 +- .../Magento/GiftMessage/Model/Observer.php | 2 +- .../Model}/Save.php | 18 +- .../layout/sales_order_create_index.xml | 2 +- .../sales_order_create_load_block_data.xml | 2 +- .../sales_order_create_load_block_items.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../Block/Adminhtml/Captcha.php | 2 +- .../Block/Adminhtml/Store/Switcher.php | 2 +- .../Block/Adminhtml/Types/Edit/Attributes.php | 28 +- .../Block/Adminhtml/Types/Edit/Select.php | 2 +- .../Block/Adminhtml/Import/Frame/Result.php | 2 +- .../Model/Export/Entity/AbstractEav.php | 2 +- .../Model/Export/Entity/AbstractEntity.php | 2 +- .../Model/Export/Entity/Eav/Customer.php | 2 +- .../Model/Export/Entity/Product.php | 2 +- .../Entity/Product/Type/AbstractType.php | 2 +- .../Export/Entity/Product/Type/Simple.php | 2 +- .../Model/Import/Entity/AbstractEav.php | 2 +- .../Model/Import/Entity/AbstractEntity.php | 2 +- .../Model/Import/Entity/Product.php | 41 +- .../Model/Import/Entity/Product/Option.php | 21 +- .../Import/Entity/Product/Type/Grouped.php | 2 +- .../layout/adminhtml_export_getfilter.xml | 2 +- .../layout/adminhtml_export_index.xml | 2 +- .../Block/Adminhtml}/Problem.php | 14 +- .../Problem/Grid/Filter/Checkbox.php | 10 +- .../Problem/Grid/Renderer/Checkbox.php | 10 +- .../Block/Adminhtml}/Queue/Edit.php | 18 +- .../Block/Adminhtml}/Queue/Edit/Form.php | 10 +- .../Adminhtml}/Queue/Grid/Renderer/Action.php | 18 +- .../Block/Adminhtml}/Queue/Preview.php | 8 +- .../Block/Adminhtml}/Queue/Preview/Form.php | 8 +- .../Block/Adminhtml}/Subscriber.php | 14 +- .../Block/Adminhtml}/Subscriber/Grid.php | 8 +- .../Subscriber/Grid/Filter/Checkbox.php | 10 +- .../Subscriber/Grid/Filter/Website.php | 6 +- .../Subscriber/Grid/Renderer/Checkbox.php | 10 +- .../Block/Adminhtml}/Template.php | 16 +- .../Block/Adminhtml}/Template/Edit.php | 22 +- .../Block/Adminhtml}/Template/Edit/Form.php | 12 +- .../Block/Adminhtml}/Template/Grid.php | 14 +- .../Template/Grid/Renderer/Action.php | 12 +- .../Template/Grid/Renderer/Sender.php | 8 +- .../Block/Adminhtml}/Template/Preview.php | 8 +- .../Adminhtml}/Template/Preview/Form.php | 8 +- .../Controller/Adminhtml}/Problem.php | 8 +- .../Controller/Adminhtml}/Queue.php | 34 +- .../Controller/Adminhtml}/Subscriber.php | 12 +- .../Controller/Adminhtml}/Template.php | 20 +- .../Magento/Newsletter/Model/Subscriber.php | 2 +- .../Magento/Newsletter/etc/adminhtml/menu.xml | 8 +- .../etc/adminhtml/routes.xml} | 10 +- .../layout/newsletter_problem_block.xml} | 4 +- .../layout/newsletter_problem_grid.xml} | 2 +- .../layout/newsletter_problem_index.xml} | 4 +- .../layout/newsletter_queue_edit.xml} | 2 +- ...eue_grid.xml => newsletter_queue_grid.xml} | 2 +- ...ck.xml => newsletter_queue_grid_block.xml} | 2 +- ...e_index.xml => newsletter_queue_index.xml} | 2 +- .../layout/newsletter_queue_preview.xml} | 6 +- .../newsletter_queue_preview_popup.xml} | 6 +- .../layout/newsletter_subscriber_block.xml} | 10 +- .../newsletter_subscriber_exportcsv.xml} | 2 +- .../newsletter_subscriber_exportxml.xml} | 2 +- .../layout/newsletter_subscriber_grid.xml} | 2 +- .../layout/newsletter_subscriber_index.xml} | 4 +- .../layout/newsletter_template_edit.xml} | 2 +- .../layout/newsletter_template_preview.xml} | 6 +- .../newsletter_template_preview_popup.xml} | 6 +- .../view/adminhtml/layout/preview.xml | 4 +- .../adminhtml}/preview/iframeswitcher.phtml | 2 +- .../view/adminhtml}/preview/store.phtml | 0 .../view/adminhtml}/problem/list.phtml | 0 .../view/adminhtml}/queue/edit.phtml | 2 +- .../view/adminhtml}/queue/preview.phtml | 0 .../view/adminhtml}/subscriber/list.phtml | 0 .../view/adminhtml}/template/edit.phtml | 2 +- .../view/adminhtml}/template/list.phtml | 0 .../view/adminhtml}/template/preview.phtml | 0 .../Newsletter/view/frontend/newsletter.js | 2 - .../Newsletter/view/frontend/subscribe.phtml | 27 +- app/code/Magento/Page/Block/Html/Header.php | 7 +- .../Magento/Page/etc/adminhtml/system.xml | 2 +- .../Magento/Page/view/frontend/1column.phtml | 11 +- .../Page/view/frontend/2columns-left.phtml | 11 +- .../Page/view/frontend/2columns-right.phtml | 11 +- .../Magento/Page/view/frontend/3columns.phtml | 11 +- .../Magento/Page/view/frontend/empty.phtml | 11 +- .../Page/view/frontend/html/title.phtml | 4 +- .../Magento/Page/view/frontend/page.phtml | 11 +- .../Magento/Page/view/frontend/popup.phtml | 11 +- .../Magento/Page/view/frontend/print.phtml | 5 +- .../Paygate/Block/Authorizenet/Form/Cc.php | 2 +- app/code/Magento/Payment/Block/Form/Cc.php | 2 +- app/code/Magento/Payment/Block/Info.php | 4 +- .../Model/Billing/AbstractAgreement.php | 4 +- app/code/Magento/Paypal/Model/Api/Nvp.php | 2 +- app/code/Magento/Paypal/Model/Config.php | 3 + .../Magento/Paypal/Model/Express/Checkout.php | 10 +- .../ProductAlert/Block/Email/Price.php | 2 +- .../ProductAlert/Block/Email/Stock.php | 2 +- .../view/frontend/product/view.phtml | 4 +- .../Magento/Rating/Block/Adminhtml/Edit.php | 2 +- .../Rating/Block/Adminhtml/Edit/Form.php | 2 +- .../Rating/Block/Adminhtml/Edit/Tab/Form.php | 2 +- .../Block/Adminhtml/Edit/Tab/Options.php | 2 +- .../Rating/Block/Adminhtml/Edit/Tabs.php | 2 +- .../Magento/Rating/Block/Adminhtml/Rating.php | 2 +- .../Rating/Controller/Adminhtml/Index.php | 2 +- .../Adminhtml}/Config/Form/Field/MtdStart.php | 6 +- .../Adminhtml}/Config/Form/Field/YtdStart.php | 6 +- .../Block/Adminhtml/Customer/Accounts.php | 3 +- .../Block/Adminhtml/Customer/Orders.php | 3 +- .../Block/Adminhtml/Customer/Totals.php | 3 +- .../Block/Adminhtml}/Filter/Form.php | 12 +- .../Block/Adminhtml}/Grid/AbstractGrid.php | 46 +- .../Grid/Column/Renderer/Blanknumber.php | 6 +- .../Grid/Column/Renderer/Currency.php | 6 +- .../Grid/Column/Renderer/Customer.php | 6 +- .../Grid/Column/Renderer/Product.php | 6 +- .../Block/Adminhtml}/Grid/Shopcart.php | 8 +- .../Block/Adminhtml}/Product.php | 9 +- .../Block/Adminhtml}/Product/Downloads.php | 11 +- .../Adminhtml}/Product/Downloads/Grid.php | 8 +- .../Product/Downloads/Renderer/Purchases.php | 6 +- .../Block/Adminhtml}/Product/Grid.php | 6 +- .../Block/Adminhtml}/Product/Lowstock.php | 11 +- .../Adminhtml}/Product/Lowstock/Grid.php | 6 +- .../Reports/Block/Adminhtml/Product/Sold.php | 3 +- .../Block/Adminhtml}/Product/Viewed.php | 11 +- .../Block/Adminhtml}/Product/Viewed/Grid.php | 13 +- .../Block/Adminhtml/Refresh/Statistics.php | 3 +- .../Block/Adminhtml}/Review/Customer.php | 9 +- .../Block/Adminhtml}/Review/Detail.php | 11 +- .../Block/Adminhtml}/Review/Detail/Grid.php | 6 +- .../Block/Adminhtml}/Review/Product.php | 9 +- .../Block/Adminhtml}/Sales/Bestsellers.php | 11 +- .../Adminhtml}/Sales/Bestsellers/Grid.php | 10 +- .../Block/Adminhtml}/Sales/Coupons.php | 11 +- .../Block/Adminhtml}/Sales/Coupons/Grid.php | 12 +- .../Sales/Grid/Column/Renderer/Date.php | 4 +- .../Block/Adminhtml}/Sales/Invoiced.php | 11 +- .../Block/Adminhtml}/Sales/Invoiced/Grid.php | 10 +- .../Block/Adminhtml}/Sales/Refunded.php | 11 +- .../Block/Adminhtml}/Sales/Refunded/Grid.php | 10 +- .../Block/Adminhtml}/Sales/Sales.php | 11 +- .../Block/Adminhtml}/Sales/Sales/Grid.php | 10 +- .../Block/Adminhtml}/Sales/Shipping.php | 11 +- .../Block/Adminhtml}/Sales/Shipping/Grid.php | 10 +- .../Block/Adminhtml}/Sales/Tax.php | 11 +- .../Block/Adminhtml}/Sales/Tax/Grid.php | 12 +- .../Block/Adminhtml}/Search.php | 9 +- .../Block/Adminhtml}/Shopcart/Abandoned.php | 11 +- .../Adminhtml}/Shopcart/Abandoned/Grid.php | 10 +- .../Block/Adminhtml}/Shopcart/Customer.php | 9 +- .../Adminhtml}/Shopcart/Customer/Grid.php | 10 +- .../Block/Adminhtml}/Shopcart/Product.php | 9 +- .../Adminhtml}/Shopcart/Product/Grid.php | 10 +- .../Block/Adminhtml}/Wishlist.php | 8 +- .../Block/Adminhtml}/Wishlist/Grid.php | 6 +- .../Controller/Adminhtml/Index.php} | 8 +- .../Adminhtml}/Report/AbstractReport.php | 18 +- .../Controller/Adminhtml}/Report/Customer.php | 6 +- .../Controller/Adminhtml}/Report/Product.php | 22 +- .../Controller/Adminhtml}/Report/Review.php | 12 +- .../Controller/Adminhtml}/Report/Sales.php | 56 +- .../Controller/Adminhtml}/Report/Shopcart.php | 24 +- .../Adminhtml}/Report/Statistics.php | 12 +- app/code/Magento/Reports/Helper/Data.php | 6 +- .../Model/Report => Reports/Model}/Item.php | 4 +- .../Model/Resource/Customer/Collection.php | 6 +- .../Model/Resource/Quote/Collection.php | 5 +- .../Report/Product/Viewed/Collection.php | 6 +- app/code/Magento/Reports/etc/adminhtml/di.xml | 5 + .../Magento/Reports/etc/adminhtml/menu.xml | 34 +- .../Magento/Reports/etc/adminhtml/routes.xml | 32 + .../Magento/Reports/etc/adminhtml/system.xml | 4 +- app/code/Magento/Reports/etc/module.xml | 1 - .../Magento/Reports/view/adminhtml/grid.phtml | 2 +- ...html_report_customer_exportaccountscsv.xml | 29 - ...ml_report_customer_exportaccountsexcel.xml | 29 - ...inhtml_report_customer_exportorderscsv.xml | 29 - ...html_report_customer_exportordersexcel.xml | 29 - .../adminhtml_report_product_lowstock.xml | 31 - .../adminhtml_report_review_customer.xml | 31 - ...inhtml_report_review_exportcustomercsv.xml | 29 - ...html_report_review_exportcustomerexcel.xml | 29 - .../layout/reports_index_exportsearchcsv.xml} | 2 +- .../reports_index_exportsearchexcel.xml} | 2 +- .../layout/reports_index_search.xml} | 4 +- .../layout/reports_index_search_block.xml} | 4 +- ...l => reports_report_customer_accounts.xml} | 2 +- ...reports_report_customer_accounts_grid.xml} | 2 +- ...rts_report_customer_exportaccountscsv.xml} | 2 +- ...s_report_customer_exportaccountsexcel.xml} | 2 +- ...ports_report_customer_exportorderscsv.xml} | 2 +- ...rts_report_customer_exportordersexcel.xml} | 2 +- ...eports_report_customer_exporttotalscsv.xml | 29 + ...orts_report_customer_exporttotalsexcel.xml | 29 + ...xml => reports_report_customer_orders.xml} | 2 +- ...> reports_report_customer_orders_grid.xml} | 2 +- ...xml => reports_report_customer_totals.xml} | 2 +- ...> reports_report_customer_totals_grid.xml} | 2 +- ...eport_grid.xml => reports_report_grid.xml} | 0 ...orts_report_product_exportlowstockcsv.xml} | 2 +- ...ts_report_product_exportlowstockexcel.xml} | 2 +- ... reports_report_product_exportsoldcsv.xml} | 2 +- ...eports_report_product_exportsoldexcel.xml} | 2 +- .../reports_report_product_lowstock.xml | 31 + ... reports_report_product_lowstock_grid.xml} | 2 +- ...ld.xml => reports_report_product_sold.xml} | 2 +- ...l => reports_report_product_sold_grid.xml} | 2 +- .../layout/reports_report_product_viewed.xml} | 4 +- ...xml => reports_report_review_customer.xml} | 4 +- ...> reports_report_review_customer_grid.xml} | 2 +- ...eports_report_review_exportcustomercsv.xml | 29 + ...orts_report_review_exportcustomerexcel.xml | 29 + ...reports_report_review_exportproductcsv.xml | 29 + ...ports_report_review_exportproductexcel.xml | 29 + .../layout/reports_report_review_product.xml} | 4 +- ...=> reports_report_review_product_grid.xml} | 2 +- .../reports_report_sales_bestsellers.xml} | 4 +- .../layout/reports_report_sales_coupons.xml} | 4 +- .../layout/reports_report_sales_invoiced.xml} | 4 +- .../layout/reports_report_sales_refunded.xml} | 4 +- .../layout/reports_report_sales_sales.xml} | 4 +- .../layout/reports_report_sales_shipping.xml} | 4 +- .../layout/reports_report_sales_tax.xml} | 4 +- ...ml => reports_report_statistics_index.xml} | 0 .../view/adminhtml/layout/reports_sales.xml} | 0 .../adminhtml/report/grid/container.phtml | 2 +- .../adminhtml/report/refresh/statistics.phtml | 2 +- .../view/adminhtml/report/wishlist.phtml | 2 +- .../view/adminhtml/store/switcher.phtml | 2 +- .../adminhtml/store/switcher/enhanced.phtml | 2 +- .../view/frontend/home_product_compared.phtml | 60 - .../view/frontend/home_product_viewed.phtml | 65 - .../view/frontend/images/i_widget-list.gif | Bin 600 -> 0 bytes .../Reports/view/frontend/layout/default.xml | 11 +- .../Reports/view/frontend/layout/print.xml | 10 +- .../view/frontend/product_compared.phtml | 31 +- .../view/frontend/product_viewed.phtml | 33 +- .../column/compared_default_list.phtml | 86 +- .../column/compared_images_list.phtml | 53 +- .../compared/column/compared_names_list.phtml | 35 +- .../compared/content/compared_grid.phtml | 136 +- .../compared/content/compared_list.phtml | 127 +- .../viewed/column/viewed_default_list.phtml | 87 +- .../viewed/column/viewed_images_list.phtml | 47 +- .../viewed/column/viewed_names_list.phtml | 37 +- .../widget/viewed/content/viewed_grid.phtml | 127 +- .../widget/viewed/content/viewed_list.phtml | 128 +- .../Magento/Reports/view/frontend/widgets.css | 42 - .../Review => Review/Block/Adminhtml}/Add.php | 9 +- .../Block/Adminhtml}/Add/Form.php | 10 +- .../Block/Adminhtml}/Edit.php | 7 +- .../Block/Adminhtml}/Edit/Form.php | 8 +- .../Block/Adminhtml}/Grid.php | 18 +- .../Block/Adminhtml}/Grid/Filter/Type.php | 8 +- .../Block/Adminhtml}/Grid/Renderer/Type.php | 10 +- .../Block/Adminhtml}/Main.php | 7 +- .../Block/Adminhtml}/Product/Grid.php | 6 +- .../Block/Adminhtml}/Rating/Detailed.php | 6 +- .../Block/Adminhtml}/Rating/Summary.php | 6 +- .../Resource/Review/Product/Collection.php | 8 +- .../Magento/Review/etc/adminhtml/menu.xml | 6 +- .../view/adminhtml}/add.phtml | 0 .../Condition/Product/AbstractProduct.php | 4 +- .../Adminhtml/Billing/Agreement/View/Form.php | 2 +- .../Adminhtml/Items/Column/DefaultColumn.php | 2 +- .../Block/Adminhtml/Order/Comments/View.php | 2 +- .../Adminhtml/Order/Create/Giftmessage.php | 36 +- .../Order/Create/Giftmessage/Form.php | 44 +- .../Adminhtml/Order/Create/Items/Grid.php | 46 +- .../Block/Adminhtml/Order/Create/Messages.php | 2 +- .../Order/Create/Sidebar/AbstractSidebar.php | 32 +- .../Adminhtml/Order/Create/Totals/Table.php | 2 +- .../Order/Creditmemo/Create/Adjustments.php | 2 +- .../Order/Creditmemo/View/Comments.php | 2 +- .../Order/Invoice/Create/Tracking.php | 2 +- .../Adminhtml/Order/Invoice/View/Comments.php | 2 +- .../Sales/Block/Adminhtml/Order/Payment.php | 2 +- .../Order/Shipment/Create/Tracking.php | 2 +- .../Adminhtml/Order/Shipment/Packaging.php | 2 +- .../Order/Shipment/Packaging/Grid.php | 2 +- .../Order/Shipment/Tracking/Info.php | 2 +- .../Order/Shipment/View/Comments.php | 2 +- .../Order/Shipment/View/Tracking.php | 30 +- .../Block/Adminhtml/Order/Status/Assign.php | 1 + .../Block/Adminhtml/Order/Status/Edit.php | 1 + .../Sales/Block/Adminhtml/Order/View/Form.php | 2 +- .../Adminhtml/Order/View/Giftmessage.php | 44 +- .../Block/Adminhtml/Order/View/History.php | 2 +- .../View/Items/Renderer/DefaultRenderer.php | 10 +- .../Block/Adminhtml/Order/View/Messages.php | 2 +- .../Adminhtml/Order/View/Tab/History.php | 2 +- .../Adminhtml/Recurring/Profile/Edit/Form.php | 24 +- .../Adminhtml/Recurring/Profile/View.php | 32 +- .../Block/Adminhtml/Report/Filter/Form.php | 2 +- .../Magento/Sales/Block/Order/Comments.php | 2 +- .../Sales/Block/Order/PrintOrder/Invoice.php | 2 +- .../Controller/Adminhtml/Order/Create.php | 4 +- .../Controller/Adminhtml/Order/Shipment.php | 2 +- .../Adminhtml/Order/View/Giftmessage.php | 4 +- app/code/Magento/Sales/Model/Order.php | 6 +- .../Magento/Sales/Model/Order/Creditmemo.php | 4 +- .../Sales/Model/Order/Creditmemo/Item.php | 2 +- .../Model/Order/Creditmemo/Total/Tax.php | 6 +- .../Magento/Sales/Model/Order/Invoice.php | 6 +- .../Model/Order/Invoice/Total/Discount.php | 10 +- .../Sales/Model/Order/Invoice/Total/Tax.php | 4 +- app/code/Magento/Sales/Model/Order/Item.php | 2 +- .../Magento/Sales/Model/Order/Payment.php | 6 +- .../Sales/Model/Order/Payment/Transaction.php | 2 +- .../Magento/Sales/Model/Order/Shipment.php | 4 +- app/code/Magento/Sales/Model/Order/Status.php | 11 +- app/code/Magento/Sales/Model/Quote.php | 2 +- .../Quote/Address/Total/AbstractTotal.php | 4 +- .../Model/Quote/Address/Total/Subtotal.php | 2 +- app/code/Magento/Sales/Model/Quote/Item.php | 6 +- .../Sales/Model/Quote/Item/AbstractItem.php | 2 +- .../Magento/Sales/Model/Recurring/Profile.php | 6 +- .../Collection/AbstractCollection.php | 2 +- .../Sales/Model/Resource/Order/Collection.php | 2 +- .../Shipment/Attribute/Backend/Child.php | 2 +- .../Quote/Address/Rate/Collection.php | 2 +- .../Model/Resource/Report/Bestsellers.php | 4 +- .../Report/Bestsellers/Collection.php | 4 +- .../Report/Collection/AbstractCollection.php | 2 +- .../Sales/Model/Resource/Report/Invoiced.php | 9 +- .../Model/Resource/Report/Order/Createdat.php | 2 +- .../Sales/Model/Resource/Report/Shipping.php | 10 +- .../Magento/Sales/Model/Resource/Setup.php | 2 +- .../Magento/Sales/Model/Service/Order.php | 4 +- app/code/Magento/Sales/etc/sales.xml | 6 + app/code/Magento/Sales/i18n/de_DE.csv | 2 +- app/code/Magento/Sales/i18n/en_US.csv | 2 +- app/code/Magento/Sales/i18n/es_ES.csv | 2 +- app/code/Magento/Sales/i18n/fr_FR.csv | 2 +- app/code/Magento/Sales/i18n/nl_NL.csv | 2 +- app/code/Magento/Sales/i18n/pt_BR.csv | 2 +- app/code/Magento/Sales/i18n/zh_CN.csv | 2 +- .../layout/sales_order_create_index.xml | 6 +- .../sales_order_create_load_block_data.xml | 2 +- .../layout/sales_order_status_index.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../Promo/Quote/Edit/Tab/Coupons.php | 2 +- .../layout/sales_rule_promo_quote_edit.xml | 2 +- .../layout/sendfriend_product_send.xml | 10 +- .../Sendfriend/view/frontend/send.phtml | 168 +- .../Adminhtml}/Carrier/Tablerate/Grid.php | 12 +- app/code/Magento/Shipping/Model/Shipping.php | 87 - .../Shipping/Model/Shipping/Labels.php | 153 ++ .../Magento/Shipping/etc/adminhtml/di.xml} | 10 +- .../Block/Adminhtml}/Edit.php | 5 +- .../Block/Adminhtml}/Edit/Form.php | 2 +- .../Block/Adminhtml}/Grid/Renderer/Action.php | 2 +- .../Block/Adminhtml}/Grid/Renderer/Link.php | 2 +- .../Block/Adminhtml}/Grid/Renderer/Time.php | 2 +- .../Block/Adminhtml}/Sitemap.php | 5 +- .../Sitemap/Controller/Adminhtml/Sitemap.php | 2 +- .../Model/Resource/Catalog/Product.php | 3 +- .../layout/adminhtml_sitemap_index.xml | 2 +- .../adminhtml_sitemap_index_grid_block.xml | 4 +- .../Tax/Block/Adminhtml/Rate/Toolbar/Add.php | 2 +- .../Tax/Block/Adminhtml/Rate/Toolbar/Save.php | 2 +- app/code/Magento/Tax/Helper/Data.php | 6 +- app/code/Magento/Tax/Model/Calculation.php | 35 +- app/code/Magento/Tax/Model/Config.php | 4 +- .../Tax/Model/Resource/Calculation.php | 2 +- .../Model/Resource/Report/Tax/Createdat.php | 2 +- .../Wysiwyg/Files/Content/Uploader.php | 4 +- .../Shipping/Carrier/Dhl/International.php | 4 +- app/code/Magento/User/Helper/Data.php | 15 +- app/code/Magento/User/Model/User.php | 20 +- app/code/Magento/Webhook/etc/module.xml | 1 - .../sql/webhook_setup/install-1.0.0.0.php | 8 +- ...dminhtml_webhook_registration_activate.xml | 2 +- .../adminhtml_webhook_registration_failed.xml | 2 +- ...minhtml_webhook_registration_succeeded.xml | 2 +- .../adminhtml_webhook_registration_user.xml | 2 +- .../Widget/Instance/Edit/Tab/Main/Layout.php | 2 +- .../Controller/Adminhtml/Widget/Instance.php | 2 +- .../layout/adminhtml_widget_instance_edit.xml | 2 +- .../Block/Customer/Wishlist/Items.php | 2 +- .../Model/Resource/Item/Collection.php | 16 +- .../Model/Resource/Item/Collection/Grid.php | 6 +- app/code/Magento/Wishlist/Model/Wishlist.php | 17 +- .../Magento/Wishlist/etc/adminhtml/di.xml | 5 + .../adminhtml/magento_backend/css/styles.css | 148 +- .../i18n/en_US.csv | 2 +- .../magento_backend/less/styles/admin.less | 18 +- .../magento_backend/less/styles/pages.less | 266 +-- .../Magento_Adminhtml/layout/default.xml | 87 - .../adminhtml/magento_basic/below_ie7.css | 57 - app/design/adminhtml/magento_basic/boxes.css | 1858 ----------------- app/design/adminhtml/magento_basic/custom.css | 22 - app/design/adminhtml/magento_basic/ie7.css | 27 - .../adminhtml/magento_basic/iestyles.css | 114 - .../magento_basic/images/accordion_close.gif | Bin 394 -> 0 bytes .../magento_basic/images/accordion_close.png | Bin 476 -> 0 bytes .../magento_basic/images/accordion_open.gif | Bin 627 -> 0 bytes .../magento_basic/images/accordion_open.png | Bin 548 -> 0 bytes .../images/add_btn_icon-disabled.gif | Bin 234 -> 0 bytes .../magento_basic/images/add_btn_icon.gif | Bin 344 -> 0 bytes .../magento_basic/images/address_list_li.gif | Bin 72 -> 0 bytes .../images/address_list_on_arrow.gif | Bin 185 -> 0 bytes .../images/address_list_over_arrow.gif | Bin 184 -> 0 bytes .../images/address_list_over_bg.gif | Bin 236 -> 0 bytes .../magento_basic/images/ajax-loader-tr.gif | Bin 2608 -> 0 bytes .../magento_basic/images/ajax-loader.gif | Bin 505 -> 0 bytes .../images/application_view_tile.gif | Bin 377 -> 0 bytes .../magento_basic/images/arrow_sort_move.gif | Bin 110 -> 0 bytes .../magento_basic/images/bg_collapse.gif | Bin 86 -> 0 bytes .../images/bg_create_order_totals.gif | Bin 141 -> 0 bytes .../magento_basic/images/bg_notifications.gif | Bin 1962 -> 0 bytes .../magento_basic/images/bg_window_mask.png | Bin 277 -> 0 bytes .../magento_basic/images/bkg_btn-close.gif | Bin 146 -> 0 bytes .../magento_basic/images/bkg_btn-close2.gif | Bin 356 -> 0 bytes .../images/bkg_search-magnifier.png | Bin 1352 -> 0 bytes .../adminhtml/magento_basic/images/blank.gif | Bin 43 -> 0 bytes .../adminhtml/magento_basic/images/box_bg.gif | Bin 217 -> 0 bytes .../magento_basic/images/breadcrumb_bg.gif | Bin 50 -> 0 bytes .../images/btn_add-image_icon.gif | Bin 71 -> 0 bytes .../images/btn_add-variable_icon.gif | Bin 80 -> 0 bytes .../images/btn_add-widget_icon.gif | Bin 540 -> 0 bytes .../images/btn_add-widget_icon2.gif | Bin 547 -> 0 bytes .../magento_basic/images/btn_back_bg.gif | Bin 147 -> 0 bytes .../magento_basic/images/btn_bare_bg.gif | Bin 1454 -> 0 bytes .../magento_basic/images/btn_bg-disabled.gif | Bin 148 -> 0 bytes .../adminhtml/magento_basic/images/btn_bg.png | Bin 1887 -> 0 bytes .../magento_basic/images/btn_cancel_bg.gif | Bin 147 -> 0 bytes .../magento_basic/images/btn_delete_bg.gif | Bin 173 -> 0 bytes .../adminhtml/magento_basic/images/btn_go.gif | Bin 204 -> 0 bytes .../magento_basic/images/btn_gr_bg.gif | Bin 148 -> 0 bytes .../magento_basic/images/btn_gr_on.gif | Bin 137 -> 0 bytes .../magento_basic/images/btn_gr_over.gif | Bin 147 -> 0 bytes .../magento_basic/images/btn_loading-icon.gif | Bin 847 -> 0 bytes .../magento_basic/images/btn_login.gif | Bin 1518 -> 0 bytes .../images/btn_show-hide_icon.gif | Bin 1014 -> 0 bytes .../magento_basic/images/btn_task_bg.gif | Bin 1735 -> 0 bytes .../magento_basic/images/button-close.png | Bin 410 -> 0 bytes .../images/cancel_btn_active_bg.gif | Bin 295 -> 0 bytes .../magento_basic/images/cancel_btn_bg.gif | Bin 147 -> 0 bytes .../magento_basic/images/cancel_btn_icon.gif | Bin 648 -> 0 bytes .../images/cancel_btn_over_bg.gif | Bin 149 -> 0 bytes .../magento_basic/images/cancel_icon.gif | Bin 600 -> 0 bytes .../magento_basic/images/config_tab_dt_bg.gif | Bin 383 -> 0 bytes .../magento_basic/images/dashboard-close.gif | Bin 373 -> 0 bytes .../magento_basic/images/db-graph-bg.gif | Bin 820 -> 0 bytes .../images/db-graph-bottom-bg.gif | Bin 823 -> 0 bytes .../magento_basic/images/db-graph-line-bg.gif | Bin 815 -> 0 bytes .../images/db-graph-line2-bg.gif | Bin 815 -> 0 bytes .../magento_basic/images/db-graph-x-bg.png | Bin 142 -> 0 bytes .../magento_basic/images/db-header-bg.png | Bin 1272 -> 0 bytes .../magento_basic/images/db-menu-bg-hov.gif | Bin 817 -> 0 bytes .../magento_basic/images/db-menu-bg-up.gif | Bin 821 -> 0 bytes .../magento_basic/images/db-menu-bg.gif | Bin 824 -> 0 bytes .../magento_basic/images/db-menu-sep-last.gif | Bin 826 -> 0 bytes .../magento_basic/images/db-menu-sep.gif | Bin 879 -> 0 bytes .../magento_basic/images/db-menu-start.gif | Bin 890 -> 0 bytes .../magento_basic/images/db-scroll-bg.gif | Bin 1551 -> 0 bytes .../images/db-scroll-but-bot-roll.png | Bin 565 -> 0 bytes .../images/db-scroll-but-bot.png | Bin 583 -> 0 bytes .../images/db-scroll-but-top-roll.png | Bin 610 -> 0 bytes .../images/db-scroll-but-top.png | Bin 631 -> 0 bytes .../magento_basic/images/db-scroll-roller.png | Bin 1258 -> 0 bytes .../images/db-tab-bottom-left-bg.gif | Bin 812 -> 0 bytes .../images/db-tab-bottom-mid-bg.gif | Bin 809 -> 0 bytes .../images/db-tab-bottom-right-bg.gif | Bin 812 -> 0 bytes .../magento_basic/images/db-tab-footer.gif | Bin 809 -> 0 bytes .../images/db-tab-header-sep.gif | Bin 832 -> 0 bytes .../magento_basic/images/db-tab-header.gif | Bin 809 -> 0 bytes .../magento_basic/images/db-tab-left.gif | Bin 808 -> 0 bytes .../magento_basic/images/db-tab-right.gif | Bin 808 -> 0 bytes .../images/dotted_divider_dark.gif | Bin 43 -> 0 bytes .../images/dotted_divider_light.gif | Bin 43 -> 0 bytes .../magento_basic/images/edit_icon.gif | Bin 561 -> 0 bytes .../images/entry_edit_head_arrow_down.gif | Bin 677 -> 0 bytes .../images/entry_edit_head_arrow_down2.gif | Bin 670 -> 0 bytes .../images/entry_edit_head_arrow_up.gif | Bin 637 -> 0 bytes .../images/entry_edit_head_bg.gif | Bin 43 -> 0 bytes .../magento_basic/images/error-msg.png | Bin 1411 -> 0 bytes .../magento_basic/images/fam_account.gif | Bin 358 -> 0 bytes .../images/fam_application_form_delete.png | Bin 605 -> 0 bytes .../images/fam_application_view_tile.gif | Bin 377 -> 0 bytes .../images/fam_asterisk_orange.gif | Bin 1019 -> 0 bytes .../magento_basic/images/fam_bin.gif | Bin 288 -> 0 bytes .../magento_basic/images/fam_bullet_disk.gif | Bin 542 -> 0 bytes .../magento_basic/images/fam_calendar.gif | Bin 1036 -> 0 bytes .../magento_basic/images/fam_cart.gif | Bin 257 -> 0 bytes .../magento_basic/images/fam_comment.gif | Bin 329 -> 0 bytes .../magento_basic/images/fam_creditcards.gif | Bin 599 -> 0 bytes .../images/fam_folder_database.gif | Bin 1043 -> 0 bytes .../images/fam_folder_palette.gif | Bin 1051 -> 0 bytes .../magento_basic/images/fam_folder_table.gif | Bin 1039 -> 0 bytes .../magento_basic/images/fam_group.gif | Bin 1014 -> 0 bytes .../magento_basic/images/fam_help.gif | Bin 1024 -> 0 bytes .../magento_basic/images/fam_house.gif | Bin 1024 -> 0 bytes .../magento_basic/images/fam_layout.gif | Bin 574 -> 0 bytes .../magento_basic/images/fam_leaf.png | Bin 3695 -> 0 bytes .../magento_basic/images/fam_link.gif | Bin 220 -> 0 bytes .../magento_basic/images/fam_lorry.gif | Bin 580 -> 0 bytes .../magento_basic/images/fam_money.gif | Bin 380 -> 0 bytes .../magento_basic/images/fam_money_add.gif | Bin 1034 -> 0 bytes .../magento_basic/images/fam_monitor.gif | Bin 1027 -> 0 bytes .../magento_basic/images/fam_newspaper.gif | Bin 606 -> 0 bytes .../images/fam_newspaper_delete.gif | Bin 639 -> 0 bytes .../images/fam_newspaper_error.gif | Bin 628 -> 0 bytes .../magento_basic/images/fam_newspaper_go.gif | Bin 1035 -> 0 bytes .../magento_basic/images/fam_package.gif | Bin 1054 -> 0 bytes .../magento_basic/images/fam_package_go.gif | Bin 645 -> 0 bytes .../magento_basic/images/fam_page_white.gif | Bin 379 -> 0 bytes .../images/fam_page_white_edit.gif | Bin 604 -> 0 bytes .../magento_basic/images/fam_rainbow.gif | Bin 644 -> 0 bytes .../magento_basic/images/fam_refresh.gif | Bin 324 -> 0 bytes .../images/fam_server_database.gif | Bin 1045 -> 0 bytes .../images/fam_status_online.gif | Bin 997 -> 0 bytes .../magento_basic/images/fam_tag_orange.gif | Bin 592 -> 0 bytes .../magento_basic/images/fam_user.gif | Bin 583 -> 0 bytes .../magento_basic/images/fam_user_comment.gif | Bin 606 -> 0 bytes .../magento_basic/images/fam_user_edit.gif | Bin 614 -> 0 bytes .../magento_basic/images/filter_row_bg.gif | Bin 111 -> 0 bytes .../magento_basic/images/footer_bg.gif | Bin 332 -> 0 bytes .../images/gift-message-collapse.gif | Bin 258 -> 0 bytes .../images/gift-message-expand.gif | Bin 152 -> 0 bytes .../images/gift-message-grid-column-bg.gif | Bin 42 -> 0 bytes .../magento_basic/images/grid-cal.gif | Bin 391 -> 0 bytes .../magento_basic/images/grid_sort_asc.gif | Bin 105 -> 0 bytes .../magento_basic/images/grid_sort_desc.gif | Bin 106 -> 0 bytes .../magento_basic/images/grid_th_bg.gif | Bin 49 -> 0 bytes .../images/grid_th_onclick_bg.gif | Bin 1242 -> 0 bytes .../images/grouped_to_order_icon.png | Bin 902 -> 0 bytes .../magento_basic/images/header_bg.gif | Bin 268 -> 0 bytes .../magento_basic/images/header_top_bg.gif | Bin 286 -> 0 bytes .../magento_basic/images/horiz_tabs_ul_bg.gif | Bin 50 -> 0 bytes .../magento_basic/images/i_notice.gif | Bin 802 -> 0 bytes .../magento_basic/images/i_question-mark.png | Bin 1654 -> 0 bytes .../magento_basic/images/ico_success.gif | Bin 338 -> 0 bytes .../magento_basic/images/icon-tooltip.png | Bin 1441 -> 0 bytes .../magento_basic/images/icon_btn_add.gif | Bin 344 -> 0 bytes .../magento_basic/images/icon_btn_back.gif | Bin 216 -> 0 bytes .../magento_basic/images/icon_btn_delete.gif | Bin 220 -> 0 bytes .../magento_basic/images/icon_btn_save.gif | Bin 203 -> 0 bytes .../images/icon_edit_address.gif | Bin 540 -> 0 bytes .../magento_basic/images/icon_export.gif | Bin 1022 -> 0 bytes .../magento_basic/images/icon_export.png | Bin 694 -> 0 bytes .../magento_basic/images/icon_feed.gif | Bin 351 -> 0 bytes .../magento_basic/images/icon_feed.png | Bin 530 -> 0 bytes .../magento_basic/images/icon_note_list.gif | Bin 189 -> 0 bytes .../images/icon_remove_address.gif | Bin 349 -> 0 bytes .../magento_basic/images/loader-small.gif | Bin 1849 -> 0 bytes .../magento_basic/images/login_box_bg.gif | Bin 23788 -> 0 bytes .../magento_basic/images/login_box_bg.jpg | Bin 23561 -> 0 bytes .../images/login_box_bg_auth.jpg | Bin 51012 -> 0 bytes .../magento_basic/images/login_box_bottom.jpg | Bin 1259 -> 0 bytes .../images/login_box_legal_bg.gif | Bin 884 -> 0 bytes .../magento_basic/images/login_logo.gif | Bin 816 -> 0 bytes .../magento_basic/images/logo-large.gif | Bin 5636 -> 0 bytes .../adminhtml/magento_basic/images/logo.gif | Bin 3144 -> 0 bytes .../magento_basic/images/massaction_bg.gif | Bin 151 -> 0 bytes .../images/massaction_button_bg.gif | Bin 87 -> 0 bytes .../images/massaction_links_delimiter.gif | Bin 57 -> 0 bytes .../magento_basic/images/middle_bg.gif | Bin 327 -> 0 bytes .../magento_basic/images/more_arrow.gif | Bin 90 -> 0 bytes .../magento_basic/images/nav1_active.gif | Bin 1315 -> 0 bytes .../magento_basic/images/nav1_bg.gif | Bin 50 -> 0 bytes .../magento_basic/images/nav1_off.gif | Bin 154 -> 0 bytes .../magento_basic/images/nav1_on.gif | Bin 1315 -> 0 bytes .../magento_basic/images/nav1_over.gif | Bin 368 -> 0 bytes .../magento_basic/images/nav1_sep.gif | Bin 154 -> 0 bytes .../magento_basic/images/nav2_last_li_bg.png | Bin 350 -> 0 bytes .../images/nav2_last_li_over_bg.png | Bin 351 -> 0 bytes .../magento_basic/images/nav2_li_bg.gif | Bin 75 -> 0 bytes .../magento_basic/images/nav2_li_bg.png | Bin 163 -> 0 bytes .../magento_basic/images/nav2_li_over_bg.png | Bin 162 -> 0 bytes .../magento_basic/images/nav2_link_bg.gif | Bin 43 -> 0 bytes .../images/nav2_parent_arrow.gif | Bin 84 -> 0 bytes .../magento_basic/images/nav3_bg.png | Bin 164 -> 0 bytes .../adminhtml/magento_basic/images/nav_bg.gif | Bin 50 -> 0 bytes .../magento_basic/images/nav_list_bg.gif | Bin 1514 -> 0 bytes .../magento_basic/images/nav_nest_link_bg.gif | Bin 43 -> 0 bytes .../images/nav_nest_link_over_bg.gif | Bin 328 -> 0 bytes .../magento_basic/images/nav_on_bg.gif | Bin 151 -> 0 bytes .../magento_basic/images/nav_parent_arrow.gif | Bin 240 -> 0 bytes .../magento_basic/images/note_bg.gif | Bin 107 -> 0 bytes .../magento_basic/images/note_cell_bg.gif | Bin 106 -> 0 bytes .../magento_basic/images/notice-msg.png | Bin 1375 -> 0 bytes .../magento_basic/images/pager_arrow_left.gif | Bin 334 -> 0 bytes .../images/pager_arrow_left_off.gif | Bin 218 -> 0 bytes .../images/pager_arrow_right.gif | Bin 332 -> 0 bytes .../images/pager_arrow_right_off.gif | Bin 219 -> 0 bytes .../magento_basic/images/process_spinner.gif | Bin 1849 -> 0 bytes .../images/product_rating_blank_star.gif | Bin 304 -> 0 bytes .../images/product_rating_full_star.gif | Bin 306 -> 0 bytes .../magento_basic/images/rule-ajax-loader.gif | Bin 1849 -> 0 bytes .../images/rule_chooser_trigger.gif | Bin 591 -> 0 bytes .../images/rule_component_add.gif | Bin 340 -> 0 bytes .../images/rule_component_apply.gif | Bin 1024 -> 0 bytes .../images/rule_component_remove.gif | Bin 343 -> 0 bytes .../magento_basic/images/save_btn_icon.gif | Bin 203 -> 0 bytes .../magento_basic/images/sec_nav_bg.gif | Bin 43 -> 0 bytes .../magento_basic/images/section_menu_bg.gif | Bin 49 -> 0 bytes .../images/section_menu_bottom.gif | Bin 1036 -> 0 bytes .../images/section_menu_link_bg.gif | Bin 43 -> 0 bytes .../images/section_menu_link_over_bg.gif | Bin 600 -> 0 bytes .../images/section_menu_over_span_bg.gif | Bin 316 -> 0 bytes .../images/section_menu_span_bg.gif | Bin 43 -> 0 bytes .../images/section_menu_ul_bg.gif | Bin 64 -> 0 bytes .../magento_basic/images/side_col_bg.gif | Bin 49 -> 0 bytes .../images/simple_container_bg.gif | Bin 49 -> 0 bytes .../magento_basic/images/sort-arrow-down.gif | Bin 117 -> 0 bytes .../magento_basic/images/sort-arrow-down.png | Bin 2944 -> 0 bytes .../magento_basic/images/sort-arrow-up.gif | Bin 117 -> 0 bytes .../magento_basic/images/sort-arrow-up.png | Bin 2940 -> 0 bytes .../magento_basic/images/sort_heading_bg.gif | Bin 55 -> 0 bytes .../magento_basic/images/sort_on_bg.gif | Bin 1244 -> 0 bytes .../magento_basic/images/sort_row_bg.gif | Bin 535 -> 0 bytes .../adminhtml/magento_basic/images/spacer.gif | Bin 43 -> 0 bytes .../magento_basic/images/sub_button_bg.gif | Bin 62 -> 0 bytes .../magento_basic/images/success-msg.png | Bin 1662 -> 0 bytes .../magento_basic/images/tabs_link_bg.gif | Bin 49 -> 0 bytes .../images/tabs_link_over_bg.gif | Bin 49 -> 0 bytes .../magento_basic/images/tabs_span_bg.gif | Bin 43 -> 0 bytes .../magento_basic/images/tag_blue_edit.gif | Bin 1021 -> 0 bytes .../magento_basic/images/tn_cancel_bg.gif | Bin 147 -> 0 bytes .../magento_basic/images/tooltip_bg.gif | Bin 294 -> 0 bytes .../magento_basic/images/tooltip_corner.gif | Bin 854 -> 0 bytes .../magento_basic/images/tooltip_top.gif | Bin 295 -> 0 bytes .../magento_basic/images/tree_icons/join.gif | Bin 69 -> 0 bytes .../images/tree_icons/joinbottom.gif | Bin 66 -> 0 bytes .../magento_basic/images/tree_icons/line.gif | Bin 66 -> 0 bytes .../magento_basic/images/tree_icons/minus.gif | Bin 86 -> 0 bytes .../images/tree_icons/minusbottom.gif | Bin 85 -> 0 bytes .../images/tree_icons/nolines_minus.gif | Bin 861 -> 0 bytes .../images/tree_icons/nolines_plus.gif | Bin 870 -> 0 bytes .../images/validation_advice_bg.gif | Bin 134 -> 0 bytes .../magento_basic/images/varien_logo.gif | Bin 403 -> 0 bytes .../magento_basic/images/window_close.png | Bin 872 -> 0 bytes .../magento_basic/images/window_content.png | Bin 158 -> 0 bytes .../magento_basic/images/window_top.png | Bin 166 -> 0 bytes .../adminhtml/magento_basic/media/editor.swf | Bin 266207 -> 0 bytes .../adminhtml/magento_basic/media/flex.swf | Bin 19507 -> 0 bytes .../magento_basic/media/uploader.swf | Bin 180912 -> 0 bytes .../magento_basic/media/uploaderSingle.swf | Bin 181368 -> 0 bytes app/design/adminhtml/magento_basic/menu.css | 99 - app/design/adminhtml/magento_basic/print.css | 41 - app/design/adminhtml/magento_basic/reset.css | 73 - .../magento_backup/Magento_Captcha/captcha.js | 71 - .../Magento_Captcha/default.phtml | 57 - .../override/base/checkout_onepage_index.xml | 75 - .../override/base/contacts_index_index.xml | 40 - .../override/base/customer_account_create.xml | 42 - .../base/customer_account_forgotpassword.xml | 42 - .../override/base/customer_account_login.xml | 42 - .../magento_backup/Magento_Captcha/onepage.js | 36 - .../magento_backup/Magento_Captcha/reload.png | Bin 1538 -> 0 bytes .../Magento_Checkout/cart.phtml | 172 -- .../Magento_Checkout/cart/coupon.phtml | 60 - .../Magento_Checkout/cart/crosssell.phtml | 59 - .../cart/item/configure/updatecart.phtml | 62 - .../Magento_Checkout/cart/item/default.phtml | 291 --- .../Magento_Checkout/cart/shipping.phtml | 127 -- .../Magento_Checkout/cart/sidebar.phtml | 96 - .../cart/sidebar/default.phtml | 145 -- .../Magento_Checkout/cart/totals.phtml | 48 - .../magento_backup/Magento_Checkout/cvv.gif | Bin 18112 -> 0 bytes .../Magento_Checkout/js/accordion.js | 58 - .../Magento_Checkout/js/components.phtml | 40 - .../Magento_Checkout/js/discount-codes.js | 47 - .../Magento_Checkout/js/multi-shipping.js | 63 - .../Magento_Checkout/js/opcheckout.js | 518 ----- .../Magento_Checkout/js/overview.js | 61 - .../js/payment-authentication.js | 49 - .../Magento_Checkout/js/payment.js | 133 -- .../Magento_Checkout/js/region-updater.js | 177 -- .../Magento_Checkout/js/shopping-cart.js | 41 - .../Magento_Checkout/js/sidebar.js | 44 - .../override/base/checkout_cart_configure.xml | 41 - .../override/base/checkout_cart_index.xml | 56 - .../override/base/checkout_multishipping.xml | 35 - ...kout_multishipping_address_editaddress.xml | 29 - ...kout_multishipping_address_editbilling.xml | 29 - ...out_multishipping_address_editshipping.xml | 29 - ...ckout_multishipping_address_newbilling.xml | 29 - ...kout_multishipping_address_newshipping.xml | 29 - .../checkout_multishipping_address_select.xml | 31 - ...ut_multishipping_address_selectbilling.xml | 31 - .../base/checkout_multishipping_addresses.xml | 35 - .../base/checkout_multishipping_billing.xml | 36 - ...heckout_multishipping_customer_address.xml | 30 - .../base/checkout_multishipping_login.xml | 28 - .../base/checkout_multishipping_overview.xml | 46 - .../base/checkout_multishipping_register.xml | 28 - .../base/checkout_multishipping_shipping.xml | 40 - .../base/checkout_multishipping_success.xml | 31 - .../base/checkout_onepage_additional.xml | 32 - .../base/checkout_onepage_failure.xml | 35 - .../override/base/checkout_onepage_index.xml | 61 - .../base/checkout_onepage_paymentmethod.xml | 33 - .../base/checkout_onepage_progress.xml | 35 - .../override/base/checkout_onepage_review.xml | 37 - .../base/checkout_onepage_shippingmethod.xml | 28 - .../base/checkout_onepage_success.xml | 35 - .../layout/override/base/default.xml | 46 - .../multishipping/address/select.phtml | 58 - .../multishipping/addresses.phtml | 93 - .../multishipping/agreements.phtml | 49 - .../multishipping/billing.phtml | 111 - .../multishipping/billing/items.phtml | 54 - .../multishipping/item/default.phtml | 45 - .../Magento_Checkout/multishipping/link.phtml | 27 - .../multishipping/overview.phtml | 217 -- .../multishipping/overview/item.phtml | 238 --- .../multishipping/shipping.phtml | 130 -- .../multishipping/state.phtml | 39 - .../multishipping/success.phtml | 50 - .../Magento_Checkout/onepage.phtml | 98 - .../Magento_Checkout/onepage/accordion.js | 112 - .../Magento_Checkout/onepage/agreements.phtml | 51 - .../Magento_Checkout/onepage/billing.phtml | 218 -- .../Magento_Checkout/onepage/failure.phtml | 32 - .../Magento_Checkout/onepage/link.phtml | 29 - .../Magento_Checkout/onepage/login.phtml | 120 -- .../Magento_Checkout/onepage/payment.phtml | 39 - .../onepage/payment/methods.phtml | 66 - .../Magento_Checkout/onepage/progress.phtml | 115 - .../Magento_Checkout/onepage/review.phtml | 29 - .../onepage/review/button.phtml | 27 - .../onepage/review/info.phtml | 74 - .../onepage/review/item.phtml | 239 --- .../onepage/review/totals.phtml | 47 - .../Magento_Checkout/onepage/shipping.phtml | 164 -- .../onepage/shipping_method.phtml | 41 - .../onepage/shipping_method/additional.phtml | 29 - .../onepage/shipping_method/available.phtml | 65 - .../Magento_Checkout/success.phtml | 64 - .../Magento_Checkout/total/default.phtml | 38 - .../Magento_Checkout/total/nominal.phtml | 56 - .../Magento_Checkout/total/tax.phtml | 68 - .../Magento_Cms/content_heading.phtml | 31 - .../Magento_Cms/images/i_widget-link.gif | Bin 57 -> 0 bytes .../Magento_Cms/layout/override/default.xml | 45 - .../Magento_Cms/layout/override/print.xml | 34 - .../widget/static_block/default.phtml | 27 - .../magento_backup/Magento_Cms/widgets.css | 37 - .../Magento_Contacts/form.phtml | 79 - .../Magento_Core/fam_book_open.png | Bin 622 -> 0 bytes .../Magento_Core/prototype/magento.css | 94 - .../Magento_Core/prototype/magento/btn_bg.gif | Bin 148 -> 0 bytes .../prototype/magento/content_bg.gif | Bin 283 -> 0 bytes .../Magento_Core/prototype/magento/top_bg.gif | Bin 154 -> 0 bytes .../prototype/magento/window_close.png | Bin 872 -> 0 bytes .../Magento_Core/translate_inline.phtml | 72 - .../Magento_Customer/account/dashboard.phtml | 45 - .../account/dashboard/address.phtml | 50 - .../account/dashboard/hello.phtml | 30 - .../account/dashboard/info.phtml | 64 - .../account/dashboard/newsletter.phtml | 31 - .../Magento_Customer/account/link/back.phtml | 29 - .../Magento_Customer/account/navigation.phtml | 36 - .../Magento_Customer/address.js | 73 - .../Magento_Customer/address.phtml | 96 - .../Magento_Customer/address/book.phtml | 105 - .../Magento_Customer/address/edit.phtml | 176 -- .../Magento_Customer/balance.phtml | 31 - .../Magento_Customer/form/address.phtml | 154 -- .../form/changepassword.phtml | 103 - .../Magento_Customer/form/confirmation.phtml | 61 - .../Magento_Customer/form/edit.phtml | 131 -- .../form/forgotpassword.phtml | 62 - .../Magento_Customer/form/login.phtml | 99 - .../Magento_Customer/form/mini.login.phtml | 40 - .../Magento_Customer/form/newsletter.phtml | 48 - .../Magento_Customer/form/register.phtml | 222 -- .../form/resetforgottenpassword.phtml | 66 - .../Magento_Customer/js/checkout-balance.js | 52 - .../layout/override/base/customer_account.xml | 60 - .../base/customer_account_confirmation.xml | 38 - .../override/base/customer_account_create.xml | 37 - .../base/customer_account_createpassword.xml | 43 - .../override/base/customer_account_edit.xml | 36 - .../base/customer_account_forgotpassword.xml | 43 - .../override/base/customer_account_index.xml | 42 - .../override/base/customer_account_login.xml | 35 - .../base/customer_account_logoutsuccess.xml | 35 - .../override/base/customer_address_form.xml | 31 - .../override/base/customer_address_index.xml | 31 - .../layout/override/base/default.xml | 35 - .../Magento_Customer/logout.phtml | 35 - .../Magento_Customer/set-password.js | 58 - .../Magento_Customer/widget/dob.phtml | 82 - .../Magento_Customer/widget/gender.phtml | 36 - .../Magento_Customer/widget/name.phtml | 101 - .../Magento_Customer/widget/taxvat.phtml | 30 - .../Magento_Directory/currency.phtml | 49 - .../Magento_Directory/currency/switch.phtml | 31 - .../js/optional_zip_countries.phtml | 34 - .../layout/override/catalog_category_view.xml | 30 - .../override/catalogsearch_advanced_index.xml | 30 - .../catalogsearch_advanced_result.xml | 30 - .../override/catalogsearch_result_index.xml | 30 - .../Magento_GiftMessage/gift-options.js | 95 - .../Magento_GiftMessage/inline.phtml | 252 --- .../layout/override/checkout_cart_index.xml | 33 - .../Magento_GoogleCheckout/link.phtml | 37 - .../layout/override/base/customer_account.xml | 36 - .../layout/override/base/default.xml | 30 - .../override/base/newsletter_manage_index.xml | 33 - .../Magento_Newsletter/newsletter.js | 47 - .../Magento_Newsletter/subscribe.phtml | 64 - .../magento_backup/Magento_Page/1column.phtml | 58 - .../Magento_Page/2columns-left.phtml | 59 - .../Magento_Page/2columns-right.phtml | 59 - .../Magento_Page/3columns.phtml | 62 - .../magento_backup/Magento_Page/empty.phtml | 46 - .../Magento_Page/html/breadcrumbs.phtml | 46 - .../Magento_Page/html/head.phtml | 40 - .../Magento_Page/html/header.phtml | 46 - .../Magento_Page/html/notices.phtml | 72 - .../Magento_Page/html/pager.phtml | 124 -- .../Magento_Page/html/topmenu.phtml | 48 - .../magento_backup/Magento_Page/js/menu.js | 71 - .../Magento_Page/js/popup-menu.js | 141 -- .../Magento_Page/js/row-builder.js | 222 -- .../Magento_Page/link/current.phtml | 40 - .../magento_backup/Magento_Page/popup.phtml | 45 - .../magento_backup/Magento_Page/print.phtml | 53 - .../Magento_Page/switch/languages.phtml | 44 - .../Magento_Page/switch/stores.phtml | 47 - .../product/view/profile/options.phtml | 41 - .../product/view/profile/schedule.phtml | 39 - .../magento_backup/Magento_Payment/cc-type.js | 52 - .../Magento_Payment/form/banktransfer.phtml | 35 - .../Magento_Payment/form/cashondelivery.phtml | 39 - .../Magento_Payment/form/cc.phtml | 134 -- .../Magento_Payment/form/ccsave.phtml | 131 -- .../Magento_Payment/form/checkmo.phtml | 44 - .../Magento_Payment/form/purchaseorder.phtml | 34 - .../Magento_Payment/info/checkmo.phtml | 38 - .../Magento_Payment/info/default.phtml | 49 - .../Magento_Payment/info/instructions.phtml | 41 - .../Magento_Payment/info/purchaseorder.phtml | 28 - .../layout/override/catalog_product_view.xml | 37 - .../Magento_Paypal/express/review.phtml | 115 - .../express/review/address.phtml | 155 -- .../express/review/details.phtml | 64 - .../express/review/shipping/method.phtml | 53 - .../Magento_Paypal/express/shortcut.phtml | 68 - .../Magento_Paypal/hss/form.phtml | 46 - .../Magento_Paypal/hss/iframe.phtml | 31 - .../Magento_Paypal/hss/info.phtml | 35 - .../Magento_Paypal/hss/js.phtml | 32 - .../Magento_Paypal/hss/redirect.phtml | 62 - .../Magento_Paypal/hss/review/button.phtml | 27 - .../Magento_Paypal/js/paypal-checkout.js | 50 - .../layout/override/SHORTCUT_popup.xml | 39 - .../layout/override/catalog_category_view.xml | 31 - .../layout/override/checkout_cart_index.xml | 42 - .../override/checkout_onepage_review.xml | 38 - .../override/checkout_onepage_success.xml | 28 - .../layout/override/cms_index_index.xml | 30 - .../layout/override/paypal_express_review.xml | 47 - .../paypal_express_review_details.xml | 33 - .../override/paypal_hostedpro_cancel.xml | 28 - .../override/paypal_payflow_cancelpayment.xml | 28 - .../layout/override/paypal_payflow_form.xml | 28 - .../override/paypal_payflow_returnurl.xml | 28 - .../paypal_payflowadvanced_cancelpayment.xml | 28 - .../override/paypal_payflowadvanced_form.xml | 28 - .../paypal_payflowadvanced_returnurl.xml | 28 - .../override/paypal_standard_redirect.xml | 28 - .../layout/override/tag_customer_view.xml | 28 - .../layout/override/tag_product_list.xml | 28 - .../layout/override/wishlist_index_index.xml | 28 - .../Magento_Paypal/order-review.js | 305 --- .../Magento_Paypal/partner/logo.phtml | 34 - .../Magento_Paypal/payflowadvanced/form.phtml | 46 - .../payflowadvanced/iframe.phtml | 31 - .../Magento_Paypal/payflowadvanced/info.phtml | 35 - .../payflowadvanced/redirect.phtml | 67 - .../Magento_Paypal/payflowlink/form.phtml | 46 - .../Magento_Paypal/payflowlink/iframe.phtml | 31 - .../Magento_Paypal/payflowlink/info.phtml | 35 - .../Magento_Paypal/payflowlink/redirect.phtml | 66 - .../Magento_Paypal/payment/mark.phtml | 36 - .../Magento_Paypal/payment/redirect.phtml | 41 - .../Magento_PaypalUk/express/review.phtml | 148 -- .../layput/override/SHORTCUT_uk_popup.xml | 39 - .../layput/override/catalog_category_view.xml | 28 - .../catalog_product_compare_index.xml | 28 - .../layput/override/catalog_product_view.xml | 37 - .../catalogsearch_advanced_result.xml | 28 - .../override/catalogsearch_result_index.xml | 28 - .../layput/override/checkout_cart_index.xml | 42 - .../override/checkout_onepage_failure.xml | 28 - .../override/checkout_onepage_success.xml | 28 - .../layput/override/default.xml | 30 - .../paypal_express_review_details.xml | 33 - .../override/paypaluk_express_review.xml | 46 - .../layput/override/review_product_list.xml | 28 - .../layput/override/tag_customer_view.xml | 28 - .../layput/override/tag_product_list.xml | 28 - .../layput/override/wishlist_index_index.xml | 28 - .../checkout/onepage/billing.phtml | 215 -- .../checkout/onepage/login.phtml | 136 -- .../customer/form/login.phtml | 103 - .../customer/form/register.phtml | 223 -- .../override/checkout_onepage_index.xml | 40 - .../override/customer_account_create.xml | 34 - .../override/customer_account_login.xml | 34 - .../Magento_Persistent/remember-me-popup.js | 106 - .../Magento_Persistent/remember_me.phtml | 41 - .../remember_me_tooltip.phtml | 59 - .../Magento_Persistent/splitbutton.js | 74 - .../Magento_ProductAlert/email/price.phtml | 50 - .../Magento_ProductAlert/email/stock.phtml | 50 - .../layout/override/catalog_product_view.xml | 49 - .../Magento_ProductAlert/product/view.phtml | 30 - .../Magento_Rating/detailed.phtml | 46 - .../Magento_Review/customer/list.phtml | 64 - .../Magento_Review/customer/recent.phtml | 54 - .../Magento_Review/customer/view.phtml | 75 - .../magento_backup/Magento_Review/form.phtml | 118 -- .../Magento_Review/helper/summary.phtml | 42 - .../Magento_Review/helper/summary_short.phtml | 38 - .../layout/override/review_product_view.xml | 35 - .../Magento_Review/product/view/list.phtml | 66 - .../magento_backup/Magento_Review/view.phtml | 72 - .../magento_backup/Magento_Rss/list.phtml | 68 - .../billing/agreement/view.phtml | 110 - .../Magento_Sales/billing/agreements.phtml | 99 - .../email/creditmemo/items.phtml | 51 - .../Magento_Sales/email/invoice/items.phtml | 51 - .../Magento_Sales/email/items.phtml | 74 - .../email/items/creditmemo/default.phtml | 124 -- .../email/items/invoice/default.phtml | 124 -- .../email/items/order/default.phtml | 140 -- .../email/items/shipment/default.phtml | 47 - .../Magento_Sales/email/shipment/items.phtml | 47 - .../Magento_Sales/email/shipment/track.phtml | 46 - .../Magento_Sales/gift-message.js | 74 - .../Magento_Sales/guest/form.phtml | 85 - .../override/checkout_onepage_index.xml | 28 - .../layout/override/customer_account.xml | 50 - .../sales_billing_agreement_index.xml | 36 - .../override/sales_billing_agreement_view.xml | 36 - .../sales_email_order_creditmemo_items.xml | 41 - .../sales_email_order_invoice_items.xml | 41 - .../override/sales_email_order_items.xml | 45 - .../sales_email_order_shipment_items.xml | 31 - .../override/sales_guest_creditmemo.xml | 54 - .../layout/override/sales_guest_form.xml | 35 - .../layout/override/sales_guest_invoice.xml | 54 - .../layout/override/sales_guest_print.xml | 46 - .../override/sales_guest_printcreditmemo.xml | 42 - .../override/sales_guest_printinvoice.xml | 42 - .../override/sales_guest_printshipment.xml | 32 - .../layout/override/sales_guest_reorder.xml | 35 - .../layout/override/sales_guest_shipment.xml | 44 - .../layout/override/sales_guest_view.xml | 53 - .../override/sales_order_creditmemo.xml | 51 - .../override/sales_order_guest_info_links.xml | 58 - .../layout/override/sales_order_history.xml | 34 - .../layout/override/sales_order_invoice.xml | 51 - .../override/sales_order_printcreditmemo.xml | 43 - .../override/sales_order_printinvoice.xml | 43 - .../override/sales_order_printshipment.xml | 33 - .../layout/override/sales_order_shipment.xml | 41 - .../layout/override/sales_order_view.xml | 50 - .../sales_recurring_profile_index.xml | 45 - .../sales_recurring_profile_orders.xml | 50 - .../override/sales_recurring_profile_view.xml | 87 - .../sales_recurring_profile_view__tabs.xml | 81 - .../Magento_Sales/order/comments.phtml | 43 - .../Magento_Sales/order/creditmemo.phtml | 32 - .../order/creditmemo/items.phtml | 65 - .../creditmemo/items/renderer/default.phtml | 302 --- .../Magento_Sales/order/history.phtml | 76 - .../Magento_Sales/order/info.phtml | 92 - .../Magento_Sales/order/info/buttons.phtml | 38 - .../Magento_Sales/order/invoice.phtml | 32 - .../Magento_Sales/order/invoice/items.phtml | 61 - .../invoice/items/renderer/default.phtml | 299 --- .../Magento_Sales/order/items.phtml | 77 - .../order/items/renderer/default.phtml | 323 --- .../Magento_Sales/order/print.phtml | 85 - .../order/print/creditmemo.phtml | 98 - .../Magento_Sales/order/print/invoice.phtml | 94 - .../Magento_Sales/order/print/shipment.phtml | 97 - .../Magento_Sales/order/recent.phtml | 75 - .../Magento_Sales/order/shipment.phtml | 32 - .../Magento_Sales/order/shipment/items.phtml | 89 - .../shipment/items/renderer/default.phtml | 65 - .../Magento_Sales/order/totals.phtml | 52 - .../Magento_Sales/order/trackinginfo.phtml | 67 - .../Magento_Sales/order/view.phtml | 63 - .../Magento_Sales/orders-returns.js | 50 - .../payment/form/billing/agreement.phtml | 41 - .../Magento_Sales/recurring/grid.phtml | 80 - .../recurring/profile/view.phtml | 110 - .../recurring/profile/view/info.phtml | 47 - .../Magento_Sales/recurring/profiles.phtml | 41 - .../Magento_Sales/reorder/sidebar.phtml | 83 - .../Magento_Sales/widget/guest/form.phtml | 87 - .../layout/base/shipping_tracking_popup.xml | 35 - .../Magento_Shipping/tracking/popup.phtml | 177 -- .../Magento_Tax/checkout/discount.phtml | 25 - .../Magento_Tax/checkout/grandtotal.phtml | 58 - .../Magento_Tax/checkout/shipping.phtml | 66 - .../Magento_Tax/checkout/subtotal.phtml | 57 - .../Magento_Tax/checkout/tax.phtml | 74 - .../Magento_Tax/order/tax.phtml | 81 - .../Magento_Weee/layout/override/default.xml | 34 - .../magento_backup/Magento_Weee/tax-toggle.js | 37 - .../layout/override/default.xml | 34 - .../Magento_Widget/layout/override/print.xml | 34 - .../magento_backup/Magento_Widget/widgets.css | 32 - .../Magento_Wishlist/button/share.phtml | 31 - .../Magento_Wishlist/button/tocart.phtml | 30 - .../Magento_Wishlist/button/update.phtml | 30 - .../Magento_Wishlist/email/items.phtml | 56 - .../Magento_Wishlist/email/rss.phtml | 31 - .../Magento_Wishlist/item/column/cart.phtml | 59 - .../Magento_Wishlist/item/column/image.phtml | 33 - .../Magento_Wishlist/item/column/info.phtml | 41 - .../Magento_Wishlist/item/column/remove.phtml | 29 - .../item/configure/addto.phtml | 39 - .../Magento_Wishlist/item/list.phtml | 57 - .../Magento_Wishlist/js/add-to-wishlist.js | 50 - .../Magento_Wishlist/js/search.js | 57 - .../layout/override/base/customer_account.xml | 35 - .../layout/override/base/default.xml | 33 - .../base/wishlist_index_configure.xml | 38 - .../wishlist_index_configure_type_bundle.xml | 73 - ...list_index_configure_type_configurable.xml | 35 - .../wishlist_index_configure_type_grouped.xml | 33 - .../wishlist_index_configure_type_simple.xml | 28 - .../override/base/wishlist_index_index.xml | 55 - .../override/base/wishlist_index_share.xml | 31 - .../override/base/wishlist_shared_index.xml | 30 - .../Magento_Wishlist/options_list.phtml | 51 - .../Magento_Wishlist/render/item/price.phtml | 39 - .../render/item/price_msrp_item.phtml | 88 - .../render/item/price_msrp_rss.phtml | 38 - .../Magento_Wishlist/shared.phtml | 85 - .../Magento_Wishlist/sharing.phtml | 75 - .../Magento_Wishlist/sidebar.phtml | 61 - .../Magento_Wishlist/view.phtml | 85 - .../Magento_Wishlist/wishlist.js | 208 -- .../frontend/magento_backup/css/print.css | 37 - .../magento_backup/media/preview_image.jpg | Bin 11420 -> 0 bytes app/design/frontend/magento_backup/theme.xml | 33 - .../images/slider_btn_zoom_in.gif | Bin 443 -> 0 bytes .../images/slider_btn_zoom_out.gif | Bin 432 -> 0 bytes app/design/frontend/magento_blank/theme.xml | 1 - app/design/frontend/magento_blank/view.xml | 298 +++ .../Magento_Page/layout/default.xml | 51 - .../Magento_Page/layout/print.xml | 51 - .../frontend/magento_demo/css/print.css | 39 - .../frontend/magento_demo/css/styles-ie.css | 146 -- .../frontend/magento_demo/css/styles.css | 1765 ---------------- .../i18n/de_DE/Magento_Core/logo_email.gif | Bin 3306 -> 0 bytes .../magento_demo/i18n/de_DE/images/logo.gif | Bin 3383 -> 0 bytes .../i18n/de_DE/images/logo_print.gif | Bin 3306 -> 0 bytes .../frontend/magento_demo/i18n/en_US.csv | 1 - .../i18n/fr_FR/Magento_Core/logo_email.gif | Bin 3271 -> 0 bytes .../magento_demo/i18n/fr_FR/images/logo.gif | Bin 3267 -> 0 bytes .../i18n/fr_FR/images/logo_print.gif | Bin 3271 -> 0 bytes .../images/best_selling_tr_even_bg.gif | Bin 49 -> 0 bytes .../images/best_selling_tr_odd_bg.gif | Bin 49 -> 0 bytes .../magento_demo/images/bkg_account_box.gif | Bin 117 -> 0 bytes .../magento_demo/images/bkg_block-actions.gif | Bin 63 -> 0 bytes .../images/bkg_block-currency.gif | Bin 2697 -> 0 bytes .../images/bkg_block-layered-dd.gif | Bin 43 -> 0 bytes .../images/bkg_block-layered-dt.gif | Bin 182 -> 0 bytes .../images/bkg_block-layered-label.gif | Bin 184 -> 0 bytes .../images/bkg_block-layered-li.gif | Bin 149 -> 0 bytes .../images/bkg_block-layered-title.gif | Bin 1907 -> 0 bytes .../images/bkg_block-layered1.gif | Bin 43 -> 0 bytes .../images/bkg_block-title-account.gif | Bin 173 -> 0 bytes .../magento_demo/images/bkg_block-title.gif | Bin 96 -> 0 bytes .../frontend/magento_demo/images/bkg_body.gif | Bin 72 -> 0 bytes .../magento_demo/images/bkg_buttons-set1.gif | Bin 49 -> 0 bytes .../magento_demo/images/bkg_checkout.gif | Bin 149 -> 0 bytes .../magento_demo/images/bkg_collapse-gm.gif | Bin 89 -> 0 bytes .../magento_demo/images/bkg_collapse.gif | Bin 86 -> 0 bytes .../magento_demo/images/bkg_divider1.gif | Bin 43 -> 0 bytes .../magento_demo/images/bkg_form-search.gif | Bin 1724 -> 0 bytes .../magento_demo/images/bkg_grand-total.gif | Bin 5505 -> 0 bytes .../frontend/magento_demo/images/bkg_grid.gif | Bin 53 -> 0 bytes .../magento_demo/images/bkg_header.jpg | Bin 35290 -> 0 bytes .../magento_demo/images/bkg_login-box.gif | Bin 285 -> 0 bytes .../magento_demo/images/bkg_main1.gif | Bin 7629 -> 0 bytes .../magento_demo/images/bkg_main2.gif | Bin 32524 -> 0 bytes .../frontend/magento_demo/images/bkg_nav0.jpg | Bin 5089 -> 0 bytes .../frontend/magento_demo/images/bkg_nav1.gif | Bin 43 -> 0 bytes .../frontend/magento_demo/images/bkg_nav2.gif | Bin 67 -> 0 bytes .../magento_demo/images/bkg_opc-title-off.gif | Bin 49 -> 0 bytes .../magento_demo/images/bkg_pipe1.gif | Bin 51 -> 0 bytes .../magento_demo/images/bkg_pipe2.gif | Bin 51 -> 0 bytes .../magento_demo/images/bkg_pipe3.gif | Bin 44 -> 0 bytes .../magento_demo/images/bkg_product-view.gif | Bin 10761 -> 0 bytes .../images/bkg_product_collateral.gif | Bin 63 -> 0 bytes .../magento_demo/images/bkg_rating.gif | Bin 661 -> 0 bytes .../magento_demo/images/bkg_sp-methods.gif | Bin 1144 -> 0 bytes .../magento_demo/images/bkg_tfoot.gif | Bin 63 -> 0 bytes .../frontend/magento_demo/images/bkg_th-v.gif | Bin 50 -> 0 bytes .../frontend/magento_demo/images/bkg_th.gif | Bin 43 -> 0 bytes .../magento_demo/images/bkg_toolbar.gif | Bin 149 -> 0 bytes .../magento_demo/images/btn_checkout.gif | Bin 4842 -> 0 bytes .../frontend/magento_demo/images/btn_edit.gif | Bin 88 -> 0 bytes .../magento_demo/images/btn_gm-close.gif | Bin 122 -> 0 bytes .../magento_demo/images/btn_place_order.gif | Bin 2929 -> 0 bytes .../magento_demo/images/btn_previous.gif | Bin 1254 -> 0 bytes .../images/btn_proceed_to_checkout.gif | Bin 3048 -> 0 bytes .../images/btn_proceed_to_checkout_dis.gif | Bin 3084 -> 0 bytes .../magento_demo/images/btn_remove2.gif | Bin 531 -> 0 bytes .../magento_demo/images/btn_search.gif | Bin 926 -> 0 bytes .../magento_demo/images/btn_trash.gif | Bin 643 -> 0 bytes .../magento_demo/images/btn_window_close.gif | Bin 226 -> 0 bytes .../frontend/magento_demo/images/calendar.gif | Bin 391 -> 0 bytes .../magento_demo/images/fam_book_open.png | Bin 622 -> 0 bytes .../images/free_shipping_callout.jpg | Bin 14639 -> 0 bytes .../frontend/magento_demo/images/grid-cal.gif | Bin 391 -> 0 bytes .../magento_demo/images/home_left_callout.jpg | Bin 11802 -> 0 bytes .../magento_demo/images/home_main_callout.jpg | Bin 36053 -> 0 bytes .../magento_demo/images/i_arrow-top.gif | Bin 131 -> 0 bytes .../images/i_availability_only.gif | Bin 562 -> 0 bytes .../images/i_availability_only_arrow.gif | Bin 113 -> 0 bytes .../magento_demo/images/i_block-cart.gif | Bin 604 -> 0 bytes .../magento_demo/images/i_block-currency.gif | Bin 1073 -> 0 bytes .../magento_demo/images/i_block-list.gif | Bin 600 -> 0 bytes .../magento_demo/images/i_block-poll.gif | Bin 1014 -> 0 bytes .../magento_demo/images/i_block-related.gif | Bin 560 -> 0 bytes .../magento_demo/images/i_block-subscribe.gif | Bin 606 -> 0 bytes .../magento_demo/images/i_block-tags.gif | Bin 594 -> 0 bytes .../magento_demo/images/i_block-viewed.gif | Bin 594 -> 0 bytes .../magento_demo/images/i_block-wishlist.gif | Bin 1014 -> 0 bytes .../magento_demo/images/i_discount.gif | Bin 1019 -> 0 bytes .../magento_demo/images/i_folder-table.gif | Bin 1039 -> 0 bytes .../magento_demo/images/i_ma-info.gif | Bin 604 -> 0 bytes .../magento_demo/images/i_ma-reviews.gif | Bin 614 -> 0 bytes .../magento_demo/images/i_ma-tags.gif | Bin 594 -> 0 bytes .../magento_demo/images/i_msg-error.gif | Bin 1013 -> 0 bytes .../magento_demo/images/i_msg-note.gif | Bin 1022 -> 0 bytes .../magento_demo/images/i_msg-success.gif | Bin 1024 -> 0 bytes .../frontend/magento_demo/images/i_notice.gif | Bin 802 -> 0 bytes .../frontend/magento_demo/images/i_page1.gif | Bin 253 -> 0 bytes .../frontend/magento_demo/images/i_page2.gif | Bin 379 -> 0 bytes .../magento_demo/images/i_pager-next.gif | Bin 155 -> 0 bytes .../magento_demo/images/i_pager-prev.gif | Bin 155 -> 0 bytes .../frontend/magento_demo/images/i_print.gif | Bin 1035 -> 0 bytes .../magento_demo/images/i_rss-big.png | Bin 791 -> 0 bytes .../frontend/magento_demo/images/i_rss.gif | Bin 350 -> 0 bytes .../magento_demo/images/i_search_criteria.gif | Bin 268 -> 0 bytes .../magento_demo/images/i_shipping.gif | Bin 591 -> 0 bytes .../magento_demo/images/i_tag_add.gif | Bin 621 -> 0 bytes .../frontend/magento_demo/images/i_tier.gif | Bin 160 -> 0 bytes .../magento_demo/images/i_type_grid.gif | Bin 105 -> 0 bytes .../magento_demo/images/i_type_list.gif | Bin 99 -> 0 bytes .../magento_demo/images/magnifier_handle.gif | Bin 209 -> 0 bytes .../magento_demo/images/map_popup_arrow.gif | Bin 82 -> 0 bytes .../images/media/404_callout1.jpg | Bin 17781 -> 0 bytes .../images/media/404_callout2.jpg | Bin 23222 -> 0 bytes .../images/media/best_selling_img01.jpg | Bin 1817 -> 0 bytes .../images/media/best_selling_img02.jpg | Bin 3118 -> 0 bytes .../images/media/best_selling_img03.jpg | Bin 2516 -> 0 bytes .../images/media/best_selling_img04.jpg | Bin 2455 -> 0 bytes .../images/media/best_selling_img05.jpg | Bin 2799 -> 0 bytes .../images/media/best_selling_img06.jpg | Bin 4898 -> 0 bytes .../media/cell_phone_landing_banner1.jpg | Bin 21259 -> 0 bytes .../images/media/electronics_cellphones.jpg | Bin 42440 -> 0 bytes .../media/electronics_digitalcameras.jpg | Bin 57481 -> 0 bytes .../images/media/electronics_laptops.jpg | Bin 44643 -> 0 bytes .../images/media/furniture_callout_spot.jpg | Bin 31312 -> 0 bytes .../images/media/furnitures_bed_room.jpg | Bin 2193 -> 0 bytes .../images/media/furnitures_living_room.jpg | Bin 2541 -> 0 bytes .../media/head_electronics_cellphones.gif | Bin 1039 -> 0 bytes .../media/head_electronics_digicamera.gif | Bin 1211 -> 0 bytes .../images/media/head_electronics_laptops.gif | Bin 949 -> 0 bytes .../images/media/laptop_callout_mid1.jpg | Bin 12145 -> 0 bytes .../images/media/laptop_callout_mid2.jpg | Bin 10540 -> 0 bytes .../images/media/laptop_callout_mid3.jpg | Bin 11699 -> 0 bytes .../images/media/laptop_callout_spot.jpg | Bin 30482 -> 0 bytes .../images/media/shirts_landing_banner1.jpg | Bin 27352 -> 0 bytes .../magento_demo/images/np_cart_thumb.gif | Bin 1372 -> 0 bytes .../magento_demo/images/np_more_img.gif | Bin 908 -> 0 bytes .../magento_demo/images/np_product_main.gif | Bin 4683 -> 0 bytes .../frontend/magento_demo/images/np_thumb.gif | Bin 1945 -> 0 bytes .../magento_demo/images/np_thumb2.gif | Bin 1779 -> 0 bytes .../images/ph_callout_left_rebel.jpg | Bin 14035 -> 0 bytes .../images/ph_callout_left_top.gif | Bin 29101 -> 0 bytes .../images/product_zoom_overlay_magnif.gif | Bin 706 -> 0 bytes .../magento_demo/images/slider_bg.gif | Bin 68 -> 0 bytes .../images/validation_advice_bg.gif | Bin 134 -> 0 bytes .../magento_demo/media/preview_image.jpg | Bin 11420 -> 0 bytes app/design/frontend/magento_demo/theme.xml | 34 - .../catalog/product/view/title.phtml | 31 - .../catalog/product/view/type/bundle.phtml | 59 - .../view/type/bundle/option/checkbox.phtml | 53 - .../view/type/bundle/option/multi.phtml | 50 - .../view/type/bundle/option/radio.phtml | 70 - .../view/type/bundle/option/select.phtml | 61 - .../product/view/type/bundle/options.phtml | 55 - .../magento_plushe/Magento_Bundle/js/slide.js | 99 - .../base/catalog_product_view_type_bundle.xml | 101 - .../override/base/checkout_cart_index.xml | 37 - .../layout/override/base/default.xml | 44 - .../order/creditmemo/items/renderer.phtml | 314 --- .../sales/order/invoice/items/renderer.phtml | 330 --- .../sales/order/items/renderer.phtml | 356 ---- .../sales/order/shipment/items/renderer.phtml | 109 - .../Magento_Catalog/category/title.phtml | 42 - .../Magento_Catalog/category/view.phtml | 63 - .../category/widget/link/link_block.phtml | 26 - .../category/widget/link/link_inline.phtml | 26 - .../magento_plushe/Magento_Catalog/js/list.js | 74 - .../Magento_Catalog/layer/filter.phtml | 46 - .../Magento_Catalog/layer/state.phtml | 61 - .../Magento_Catalog/layer/view.phtml | 57 - .../layout/catalog_product_compare_index.xml | 33 - .../layout/catalog_product_view.xml | 6 - .../override/base/catalog_category_view.xml | 92 - .../catalog_category_view_type_default.xml | 30 - .../catalog_category_view_type_layered.xml | 30 - .../base/catalog_product_compare_index.xml | 31 - .../override/base/catalog_product_view.xml | 139 -- ...catalog_product_view_type_configurable.xml | 39 - .../catalog_product_view_type_grouped.xml | 31 - .../base/catalog_product_view_type_simple.xml | 31 - .../catalog_product_view_type_virtual.xml | 31 - .../layout/override/base/default.xml | 48 - .../Magento_Catalog/navigation/left.phtml | 59 - .../product/compare/list.phtml | 150 -- .../product/compare/sidebar.phtml | 79 - .../Magento_Catalog/product/image.phtml | 31 - .../product/image_with_borders.phtml | 32 - .../Magento_Catalog/product/list.phtml | 126 -- .../product/list/toolbar.phtml | 111 - .../Magento_Catalog/product/view/addto.phtml | 48 - .../product/view/addtocart.phtml | 93 - .../product/view/attributes.phtml | 47 - .../product/view/base-image.phtml | 153 -- .../product/view/description.phtml | 32 - .../product/view/gallery.phtml | 77 - .../product/view/options.phtml | 43 - .../product/view/options/js.phtml | 88 - .../product/view/options/type/date.phtml | 79 - .../product/view/options/type/default.phtml | 29 - .../product/view/options/type/file.phtml | 88 - .../product/view/options/type/select.phtml | 44 - .../product/view/options/type/text.phtml | 61 - .../product/view/options/wrapper.phtml | 36 - .../product/view/options/wrapper/bottom.phtml | 28 - .../product/view/price_clone.phtml | 27 - .../product/view/tierprices.phtml | 219 -- .../product/view/type/default.phtml | 39 - .../product/view/type/grouped.phtml | 97 - .../view/type/options/configurable.phtml | 54 - .../product/widget/link/link_block.phtml | 26 - .../product/widget/link/link_inline.phtml | 26 - .../widget/new/column/new_default_list.phtml | 70 - .../widget/new/column/new_images_list.phtml | 47 - .../widget/new/column/new_names_list.phtml | 43 - .../product/widget/new/content/new_grid.phtml | 120 -- .../product/widget/new/content/new_list.phtml | 121 -- .../Magento_CatalogSearch/advanced/form.phtml | 129 -- .../advanced/result.phtml | 61 - .../Magento_CatalogSearch/form.mini.phtml | 88 - .../layout/catalogsearch_advanced_index.xml | 28 - .../layout/catalogsearch_advanced_result.xml | 33 - .../layout/catalogsearch_result_index.xml | 35 - .../layout/catalogsearch_term_popular.xml | 33 - .../base/catalogsearch_result_index.xml | 46 - .../Magento_CatalogSearch/result.phtml | 53 - .../Magento_CatalogSearch/term.phtml | 35 - .../catalog/product/links.phtml | 68 - .../catalog/product/samples.phtml | 44 - .../catalog/product/type.phtml | 41 - .../checkout/cart/item/default.phtml | 305 --- .../checkout/multishipping/item/default.phtml | 57 - .../checkout/onepage/review/item.phtml | 247 --- .../checkout/onepage/review/item_down.phtml | 246 --- .../customer/products/list.phtml | 75 - ...catalog_product_view_type_downloadable.xml | 36 - .../items/renderer/downloadable.phtml | 317 --- .../invoice/items/renderer/downloadable.phtml | 307 --- .../order/items/renderer/downloadable.phtml | 329 --- .../layout/override/base/default.xml | 31 - .../layout/override/base/print.xml | 26 - .../Magento_Reports/product_compared.phtml | 44 - .../Magento_Reports/product_viewed.phtml | 44 - .../column/compared_default_list.phtml | 58 - .../compared/content/compared_grid.phtml | 125 -- .../compared/content/compared_list.phtml | 125 -- .../viewed/column/viewed_default_list.phtml | 63 - .../widget/viewed/content/viewed_grid.phtml | 129 -- .../widget/viewed/content/viewed_list.phtml | 128 -- .../override/base/sendfriend_product_send.xml | 36 - .../Magento_Sendfriend/send.phtml | 118 -- .../frontend/magento_plushe/css/styles.css | 219 +- .../less/responsive/responsive.less | 2 +- .../frontend/magento_plushe/less/styles.less | 166 +- .../Annotation/AdminConfigFixture.php | 139 ++ .../TestFramework/Bootstrap/DocBlock.php | 1 + .../Magento/TestFramework/Cookie.php | 16 + .../TestFramework/ObjectManagerFactory.php | 1 + .../Annotation/AdminConfigFixtureTest.php | 99 + .../Magento/Adminhtml/DashboardTest.php | 70 - .../Block/Directpost/IframeTest.php | 2 +- .../Block/Page/HeadTest.php | 6 +- .../Block/Page/HeaderTest.php | 8 +- .../Backend/Block/System/Store/EditTest.php | 64 +- .../Controller/Adminhtml}/CacheTest.php | 16 +- .../Controller/Adminhtml/DashboardTest.php | 39 + .../Controller/Adminhtml/IndexTest.php | 28 +- .../Backend/Model/Auth/SessionTest.php | 2 +- .../Magento/Backend/Model/AuthTest.php | 2 +- .../Backend/Model/Translate/InlineTest.php | 65 + .../Magento/Backend/Model/UrlTest.php | 8 +- .../_files/cache/all_types_disabled.php | 0 .../cache/all_types_disabled_rollback.php | 0 .../_files/cache/all_types_enabled.php | 0 .../cache/all_types_enabled_rollback.php | 0 .../_files/cache/all_types_invalidated.php | 0 .../cache/all_types_invalidated_rollback.php | 0 .../_files/cache/application_cache.php | 0 .../cache/application_cache_rollback.php | 0 .../_files/cache/empty_storage.php | 0 .../_files/cache/non_application_cache.php | 0 .../cache/non_application_cache_rollback.php | 0 .../Magento/Bundle/Model/ProductTest.php | 7 +- .../Adminhtml/Captcha/DefaultCaptchaTest.php} | 35 +- .../Captcha/Block/Captcha/DefaultTest.php | 20 - .../Magento/Captcha/Model/ObserverTest.php | 26 +- .../Magento/Captcha/_files/dummy_user.php | 2 + .../Helper/Form/Gallery/ContentTest.php | 2 +- .../Block/Product/ProductList/RelatedTest.php | 3 +- .../Adminhtml/Product/AttributeTest.php | 10 +- .../Attribute/Backend/TierpriceTest.php | 12 +- .../Magento/Catalog/Model/ProductTest.php | 44 +- .../Magento/Centinel/CreateOrderTest.php | 8 +- .../Cms/Model/Wysiwyg/Images/StorageTest.php | 5 +- .../testsuite/Magento/Core/Helper/UrlTest.php | 7 +- .../testsuite/Magento/Core/Model/AppTest.php | 10 +- .../Magento/Core/Model/DesignTest.php | 4 +- .../Magento/Core/Model/LayoutTest.php | 1 + .../Core/Model/Resource/Layout/UpdateTest.php | 4 +- .../Model/Resource/Store/CollectionTest.php | 2 +- .../Core/Model/Resource/TransactionTest.php | 5 +- .../Magento/Core/Model/StoreTest.php | 20 +- .../Core/Model/Translate/InlineParserTest.php | 2 +- .../Core/Model/Translate/InlineTest.php | 2 +- .../Magento/Core/Model/TranslateTest.php | 6 +- .../testsuite/Magento/Core/Model/UrlTest.php | 2 - .../Core/Model/Variable/ConfigTest.php | 3 + .../Magento/Core/Model/View/DesignTest.php | 2 +- .../Magento/Core/Model/WebsiteTest.php | 3 +- .../layout_test_handle_sample.xml | 6 +- .../Core/_files/db_translate_admin_store.php | 6 +- .../Magento/Cron/Model/ObserverTest.php | 2 + .../Magento/Customer/Service/CustomerTest.php | 18 +- .../Model/Translate/InlineVdeTest.php | 2 +- .../Downloadable/Model/Product/TypeTest.php | 3 +- .../layout/email_template_test_handle.xml | 2 +- .../Magento/Install/Model/ConfigTest.php | 10 +- .../Magento/Install/Model/InstallerTest.php | 3 +- .../Block/Adminhtml}/Queue/Edit/FormTest.php | 8 +- .../Block/Adminhtml}/SubscriberTest.php | 6 +- .../Adminhtml}/NewsletterQueueTest.php | 6 +- .../Adminhtml}/NewsletterTemplateTest.php | 14 +- .../Magento/Newsletter/Model/QueueTest.php | 4 +- .../Magento/Newsletter/Model/TemplateTest.php | 5 +- .../_files/newsletter_sample.php | 0 .../Magento/Object/Copy/Config/ReaderTest.php | 2 +- .../Magento/Page/Block/Html/HeadTest.php | 8 +- .../Magento/Payment/Block/InfoTest.php | 3 +- .../Magento/Paypal/Controller/ExpressTest.php | 2 - .../Block/Adminhtml}/Filter/FormTest.php | 8 +- .../Adminhtml}/Sales/Bestsellers/GridTest.php | 6 +- .../Adminhtml}/Sales/Coupons/GridTest.php | 6 +- .../Adminhtml}/Sales/Invoiced/GridTest.php | 6 +- .../Adminhtml}/Sales/Refunded/GridTest.php | 6 +- .../Block/Adminhtml}/Sales/Sales/GridTest.php | 6 +- .../Adminhtml}/Sales/Shipping/GridTest.php | 6 +- .../Block/Adminhtml}/Sales/Tax/GridTest.php | 6 +- .../Report/Product/Viewed/CollectionTest.php | 2 +- .../Magento/Rss/Controller/CatalogTest.php | 1 + .../Controller/Adminhtml/Order/CreateTest.php | 1 + .../Report/Bestsellers/CollectionTest.php | 2 +- .../Invoiced/Collection/InvoicedTest.php | 2 +- .../Report/Invoiced/Collection/OrderTest.php | 2 +- .../Resource/Report/Order/CollectionTest.php | 2 +- .../Report/Refunded/Collection/OrderTest.php | 2 +- .../Refunded/Collection/RefundedTest.php | 2 +- .../Report/Shipping/Collection/OrderTest.php | 2 +- .../Shipping/Collection/ShipmentTest.php | 2 +- .../Model/Resource/Report/CollectionTest.php | 2 +- .../Magento/Sitemap/Helper/DataTest.php | 29 +- .../Model/Resource/Report/CollectionTest.php | 2 +- .../Integrity/Magento/Payment/MethodsTest.php | 2 +- .../Integrity/Modular/LayoutFilesTest.php | 13 +- .../Test/Integrity/Theme/ViewFilesTest.php | 16 - .../Magento/User/Helper/DataTest.php | 8 +- .../Resource/Role/Grid/CollectionTest.php | 2 +- .../testsuite/Magento/User/Model/UserTest.php | 10 +- .../Magento/User/_files/dummy_user.php | 2 + .../Magento/View/Block/AbstractBlockTest.php | 2 +- .../css/wrong.css | 0 .../Magento/View/Layout/ElementTest.php | 2 +- .../View/Layout/_files/_layout_update.xml | 6 +- .../Magento/Widget/Model/Config/DataTest.php | 2 +- .../Widget/Model/Config/ReaderTest.php | 2 +- .../Widget/Model/Widget/ConfigTest.php | 7 +- .../Widget/Model/Widget/InstanceTest.php | 2 +- .../Magento/Widget/Model/WidgetTest.php | 6 +- .../performance/benchmark_logs_merge.php | 88 + .../Magento/TestFramework/Application.php | 2 +- .../performance/testsuite/add_to_cart.jmx | 2 +- .../performance/testsuite/advanced_search.jmx | 8 +- dev/tests/performance/testsuite/backend.jmx | 6 +- dev/tests/performance/testsuite/checkout.jmx | 6 +- .../performance/testsuite/product_edit.jmx | 4 +- .../performance/testsuite/quick_search.jmx | 3 +- .../_files/blacklist/adminhtml_decoupling.php | 52 - .../Test/Legacy/_files/obsolete_classes.php | 212 ++ .../Test/Legacy/_files/obsolete_constants.php | 9 +- .../Test/Legacy/_files/obsolete_methods.php | 20 +- .../Magento/Test/Legacy/_files/words_ce.xml | 11 + .../Magento/Test/Php/LiveCodeTest.php | 1 - .../Php/_files/phpcpd/blacklist/common.txt | 6 + .../Php/_files/phpcs/blacklist/common.txt | 2 +- .../Test/Php/_files/whitelist/common.txt | 9 +- .../Authorizenet/Helper/BackendTest.php | 99 + .../Backend/App/Action/Plugin/StoreTest.php | 39 - .../App/Area/FrontNameResolverTest.php | 13 +- .../Magento/Backend/App/ConfigTest.php | 135 ++ .../Page/System/Config/Robots/ResetTest.php | 10 +- .../Block/UrlrewriteTest.php | 2 +- .../Controller/Adminhtml}/CacheTest.php | 2 +- .../Controller}/Adminhtml/DashboardTest.php | 2 +- .../Magento/Backend/Model/CookieTest.php | 44 + .../Translate/Inline/ConfigFactoryTest.php | 81 + .../Model/Translate/Inline/ConfigTest.php | 40 + .../Captcha/Helper/Adminhtml/DataTest.php | 74 + .../Magento/Captcha/Helper/DataTest.php | 8 - .../Magento/Captcha/Model/CronTest.php | 162 ++ .../Magento/Captcha/Model/ObserverTest.php | 12 +- .../Resource/Product/Option/ValueTest.php | 4 +- .../Model/Adminhtml/Stock/ItemTest.php | 85 + .../Magento/Centinel/Model/ServiceTest.php | 52 + .../Area/Request/PathInfoProcessorTest.php | 10 +- .../Magento/Core/Model/Layout/MergeTest.php | 25 +- .../Model/Layout/Update}/ValidatorTest.php | 16 +- .../Model/Layout/_files/layout/file_wrong.xml | 4 +- .../Core/Model/Theme/ThemeProviderTest.php | 2 +- .../Translate/Inline/ConfigFactoryTest.php | 43 + .../Model/Translate/Inline/ConfigTest.php | 44 + .../testsuite/Magento/Core/Model/UrlTest.php | 49 +- .../Customer/Model/Backend/CustomerTest.php | 84 + .../Block/Adminhtml/Template/EditTest.php | 2 +- .../Entity/Eav/Customer/AddressTest.php | 6 +- .../Model/Export/Entity/Eav/CustomerTest.php | 6 +- .../Entity/Eav/Customer/AddressTest.php | 2 +- .../Model/Import/Entity/ProductTest.php | 237 +++ .../Adminhtml/Order/Create/Items/GridTest.php | 2 +- .../Theme/Model/Config/CustomizationTest.php | 2 +- .../Design/Theme/FlyweightFactoryTest.php | 4 +- .../app/Magento/Downloader/Controller.php | 26 +- .../Model/Config/AbstractConfig.php | 2 +- .../app/Magento/Downloader/Model/Connect.php | 2 +- downloader/lib/Magento/Backup/Snapshot.php | 2 +- downloader/lib/Magento/Connect/Package.php | 2 +- downloader/lib/Magento/System/Ftp.php | 2 +- lib/Magento/App/Cache.php | 2 +- lib/Magento/App/Dir.php | 2 +- lib/Magento/App/Request/Http.php | 2 +- lib/Magento/Backup/Factory.php | 34 +- lib/Magento/Backup/Snapshot.php | 2 +- lib/Magento/Config/Dom.php | 2 +- lib/Magento/Connect/Package.php | 2 +- lib/Magento/Connect/Rest.php | 18 +- lib/Magento/Connect/Singleconfig.php | 14 +- lib/Magento/Data/Collection.php | 6 +- lib/Magento/Data/Collection/Db.php | 4 +- .../Collection/EntityFactoryInterface.php | 23 +- .../Data/Form/Element/CollectionFactory.php | 32 +- lib/Magento/Filter/Object.php | 6 +- .../Template/Tokenizer/AbstractTokenizer.php | 2 +- lib/Magento/Gdata/Gshopping/Content.php | 2 +- lib/Magento/HTTP/Adapter/Curl.php | 3 + lib/Magento/Image/Adapter/Gd2.php | 4 +- lib/Magento/Image/Adapter/ImageMagick.php | 4 +- lib/Magento/Oauth/ConsumerInterface.php | 2 +- lib/Magento/Phrase/Renderer/Translate.php | 6 +- lib/Magento/UrlInterface.php | 7 + .../Validator/Composite/VarienObject.php | 2 +- lib/Magento/View/Block/Template.php | 1 - lib/Magento/View/DesignInterface.php | 1 - lib/PEAR/SOAP/WSDL.php | 2 +- lib/Zend/Currency.php | 2 +- lib/Zend/Db/Select.php | 2 +- lib/Zend/Filter/Inflector.php | 2 +- lib/Zend/Gdata/App.php | 4 +- lib/Zend/Gdata/Calendar.php | 6 +- lib/Zend/Gdata/Docs.php | 14 +- lib/Zend/Gdata/Gapps.php | 52 +- lib/Zend/Gdata/Gbase.php | 4 +- lib/Zend/Gdata/Photos.php | 14 +- lib/Zend/Mail/Protocol/Pop3.php | 2 +- lib/Zend/OpenId/Consumer.php | 2 +- lib/Zend/Pdf.php | 2 +- lib/Zend/Pdf/ElementFactory.php | 2 +- lib/Zend/Pdf/ElementFactory/Interface.php | 2 +- lib/Zend/Pdf/ElementFactory/Proxy.php | 2 +- lib/Zend/Pdf/Page.php | 2 +- lib/Zend/Search/Lucene.php | 4 +- lib/Zend/Search/Lucene/Index/SegmentInfo.php | 2 +- .../Search/Lucene/Index/SegmentWriter.php | 6 +- .../Lucene/Index/TermsStream/Interface.php | 2 +- lib/Zend/Search/Lucene/Interface.php | 2 +- lib/Zend/Search/Lucene/MultiSearcher.php | 4 +- lib/Zend/Search/Lucene/Proxy.php | 4 +- .../Lucene/TermStreamsPriorityQueue.php | 2 +- lib/Zend/Service/Delicious/PostList.php | 2 +- .../Project/Context/Filesystem/Abstract.php | 4 +- .../Placeholder/Container/Standalone.php | 2 +- lib/flex/varien/varien/upload/Uploader.as | 266 +-- lib/phpseclib/Net/SSH2.php | 30 +- pub/lib/extjs/ext-all-debug.js | 2 +- pub/lib/extjs/package/form/form-debug.js | 486 ++--- pub/lib/jquery/jquery-ui.js | 2 +- pub/lib/lib/flex.js | 6 +- pub/lib/mage/validation.js | 2 +- pub/lib/prototype/tooltip_manager.js | 86 +- pub/lib/tiny_mce/classes/Editor.js | 70 +- pub/lib/tiny_mce/classes/Formatter.js | 26 +- pub/lib/tiny_mce/classes/Popup.js | 8 +- pub/lib/tiny_mce/classes/WindowManager.js | 32 +- .../classes/adapter/jquery/adapter.js | 2 +- pub/lib/tiny_mce/classes/ui/Container.js | 2 +- pub/lib/tiny_mce/classes/util/Cookie.js | 6 +- pub/lib/tiny_mce/classes/xml/Parser.js | 2 +- pub/lib/tiny_mce/tiny_mce_jquery_src.js | 332 +-- 1982 files changed, 13110 insertions(+), 47553 deletions(-) delete mode 100644 app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php delete mode 100644 app/code/Magento/Adminhtml/etc/adminhtml/events.xml delete mode 100644 app/code/Magento/Adminhtml/etc/adminhtml/menu.xml delete mode 100644 app/code/Magento/Adminhtml/etc/config.xml delete mode 100644 app/code/Magento/Adminhtml/etc/di.xml delete mode 100644 app/code/Magento/Adminhtml/etc/sales.xml delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml create mode 100644 app/code/Magento/Authorizenet/Helper/Backend.php rename app/code/Magento/{Adminhtml/Model/Observer.php => Authorizenet/Helper/HelperInterface.php} (68%) create mode 100644 app/code/Magento/Backend/App/Config.php create mode 100644 app/code/Magento/Backend/App/ConfigInterface.php rename app/code/Magento/{Adminhtml => Backend}/Block/Admin/Formkey.php (91%) rename app/code/Magento/{Adminhtml => Backend}/Block/Cache.php (96%) rename app/code/Magento/{Adminhtml => Backend}/Block/Cache/Additional.php (80%) rename app/code/Magento/{Adminhtml => Backend}/Block/Denied.php (93%) rename app/code/Magento/{Adminhtml => Backend}/Block/Media/Uploader.php (93%) rename app/code/Magento/{Adminhtml => Backend}/Block/Page.php (93%) rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Footer.php (88%) rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Head.php (96%) rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Header.php (93%) rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Notices.php (90%) rename app/code/Magento/{Adminhtml => Backend}/Block/Page/System/Config/Robots/Reset.php (96%) rename app/code/Magento/{Adminhtml => Backend}/Block/Text/ListText.php (91%) rename app/code/Magento/{Adminhtml/Block/Template.php => Backend/Model/Cookie.php} (73%) rename dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php => app/code/Magento/Backend/Model/Resource/Translate.php (70%) create mode 100644 app/code/Magento/Backend/Model/Resource/Translate/String.php rename app/code/Magento/{Adminhtml => Backend}/Model/Search/Catalog.php (91%) rename app/code/Magento/{Adminhtml => Backend}/Model/Search/Customer.php (90%) rename app/code/Magento/{Adminhtml => Backend}/Model/Search/Order.php (92%) rename app/code/Magento/{Adminhtml/Block/Html/Select.php => Backend/Model/Translate/Inline.php} (70%) create mode 100644 app/code/Magento/Backend/Model/Translate/Inline/Config.php create mode 100644 app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php rename app/code/Magento/{Adminhtml => Backend}/etc/adminhtml/acl.xml (100%) rename app/code/Magento/{Adminhtml => Backend}/etc/events.xml (78%) rename app/{design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml => code/Magento/Backend/etc/install/di.xml} (89%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/access_denied.phtml (97%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/formkey.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/overlay_popup.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/page.phtml (98%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/popup.phtml (95%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_denied.xml (90%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_noroute.xml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/editor.xml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/empty.xml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/formkey.xml (88%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/overlay_popup.xml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/popup.xml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/media/uploader.phtml (98%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/footer.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/head.phtml (95%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/header.phtml (97%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/js/calendar.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/js/components.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/js/translate.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/notices.phtml (100%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/system/config/robots/reset.phtml (95%) rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/store/switcher/enhanced.phtml (100%) rename app/code/Magento/{Adminhtml/Block => Backup/Block/Adminhtml}/Backup.php (89%) rename app/code/Magento/{Adminhtml/Block/Backup => Backup/Block/Adminhtml}/Dialogs.php (91%) rename app/code/Magento/{Backend/Controller/Adminhtml/System/Backup.php => Backup/Controller/Adminhtml/Index.php} (95%) rename app/{design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml => code/Magento/Backup/etc/adminhtml/routes.xml} (82%) rename app/code/Magento/{Adminhtml => Backup}/view/adminhtml/backup/dialogs.phtml (96%) rename app/code/Magento/{Adminhtml => Backup}/view/adminhtml/backup/left.phtml (100%) rename app/code/Magento/{Adminhtml => Backup}/view/adminhtml/backup/list.phtml (100%) rename app/code/Magento/{Backend/view/adminhtml/layout/adminhtml_system_backup_block.xml => Backup/view/adminhtml/layout/backup_index_block.xml} (100%) rename app/code/Magento/{Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml => Backup/view/adminhtml/layout/backup_index_grid.xml} (95%) rename app/code/Magento/{Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml => Backup/view/adminhtml/layout/backup_index_index.xml} (88%) rename app/{design/frontend/magento_plushe/Magento_Bundle => code/Magento/Bundle/view/frontend}/catalog/product/view/backbutton.phtml (86%) rename app/{design/frontend/magento_plushe/Magento_Bundle => code/Magento/Bundle/view/frontend}/catalog/product/view/customize.phtml (84%) rename app/{design/frontend/magento_plushe/Magento_Bundle => code/Magento/Bundle/view/frontend}/catalog/product/view/summary.phtml (83%) create mode 100644 app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php create mode 100644 app/code/Magento/Captcha/Helper/Adminhtml/Data.php create mode 100644 app/code/Magento/Captcha/Model/Cron.php rename app/code/Magento/{Catalog/view/frontend/layout/tag_product_list.xml => Captcha/etc/crontab/di.xml} (89%) create mode 100644 app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif delete mode 100644 app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg delete mode 100644 app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/compare/link.phtml (98%) rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/list/items.phtml (93%) delete mode 100644 app/code/Magento/Catalog/view/frontend/product/list/related.phtml delete mode 100644 app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/listing.phtml (97%) delete mode 100644 app/code/Magento/Catalog/view/frontend/product/new.phtml delete mode 100644 app/code/Magento/Catalog/view/frontend/product/view.phtml rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/attribute.phtml (93%) rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/details.phtml (100%) rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/form.phtml (90%) delete mode 100644 app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/mailto.phtml (85%) rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/price.phtml (100%) rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/rating.phtml (97%) create mode 100644 app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php rename app/{design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml => code/Magento/CatalogInventory/etc/adminhtml/di.xml} (86%) rename app/code/Magento/{Adminhtml/Model/LayoutUpdate => Core/Model/Layout/Update}/Validator.php (96%) create mode 100644 app/code/Magento/Core/Model/Translate/Inline/Config.php create mode 100644 app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php rename app/code/Magento/{Adminhtml/Helper/Data.php => Core/Model/Translate/Inline/ConfigInterface.php} (75%) rename app/code/Magento/{Adminhtml/Block/Html/Date.php => Customer/Model/Backend/Customer.php} (71%) rename app/{design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml => code/Magento/Downloadable/view/frontend/layout/default.xml} (89%) rename app/code/Magento/{Adminhtml/Model/Giftmessage => GiftMessage/Model}/Save.php (95%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Problem.php (90%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Problem/Grid/Filter/Checkbox.php (83%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Problem/Grid/Renderer/Checkbox.php (83%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Edit.php (93%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Edit/Form.php (97%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Grid/Renderer/Action.php (77%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Preview.php (95%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Preview/Form.php (90%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber.php (89%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid.php (92%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid/Filter/Checkbox.php (83%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid/Filter/Website.php (95%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid/Renderer/Checkbox.php (85%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template.php (74%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Edit.php (93%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Edit/Form.php (94%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Grid.php (91%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Grid/Renderer/Action.php (80%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Grid/Renderer/Sender.php (88%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Preview.php (95%) rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Preview/Form.php (90%) rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Problem.php (95%) rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Queue.php (92%) rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Subscriber.php (95%) rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Template.php (93%) rename app/code/Magento/{Catalog/view/frontend/layout/tag_customer_view.xml => Newsletter/etc/adminhtml/routes.xml} (84%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml => Newsletter/view/adminhtml/layout/newsletter_problem_block.xml} (98%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml => Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml => Newsletter/view/adminhtml/layout/newsletter_problem_index.xml} (90%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml => Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml} (94%) rename app/code/Magento/Newsletter/view/adminhtml/layout/{adminhtml_newsletter_queue_grid.xml => newsletter_queue_grid.xml} (95%) rename app/code/Magento/Newsletter/view/adminhtml/layout/{adminhtml_newsletter_queue_grid_block.xml => newsletter_queue_grid_block.xml} (99%) rename app/code/Magento/Newsletter/view/adminhtml/layout/{adminhtml_newsletter_queue_index.xml => newsletter_queue_index.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml => Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml} (82%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml => Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml} (85%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml} (97%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml} (90%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml => Newsletter/view/adminhtml/layout/newsletter_template_edit.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml => Newsletter/view/adminhtml/layout/newsletter_template_preview.xml} (83%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml => Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml} (85%) rename app/code/Magento/{Adminhtml => Newsletter}/view/adminhtml/layout/preview.xml (89%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/preview/iframeswitcher.phtml (98%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/preview/store.phtml (100%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/problem/list.phtml (100%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/queue/edit.phtml (98%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/queue/preview.phtml (100%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/subscriber/list.phtml (100%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/template/edit.phtml (99%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/template/list.phtml (100%) rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/template/preview.phtml (100%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Config/Form/Field/MtdStart.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Config/Form/Field/YtdStart.php (94%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Filter/Form.php (96%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/AbstractGrid.php (97%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Blanknumber.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Currency.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Customer.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Product.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Shopcart.php (93%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product.php (86%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Downloads.php (86%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Downloads/Grid.php (95%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Downloads/Renderer/Purchases.php (91%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Grid.php (97%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Lowstock.php (86%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Lowstock/Grid.php (96%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Viewed.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Viewed/Grid.php (90%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Customer.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Detail.php (87%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Detail/Grid.php (96%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Product.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Bestsellers.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Bestsellers/Grid.php (91%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Coupons.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Coupons/Grid.php (95%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Grid/Column/Renderer/Date.php (97%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Invoiced.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Invoiced/Grid.php (94%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Refunded.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Refunded/Grid.php (93%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Sales.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Sales/Grid.php (97%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Shipping.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Shipping/Grid.php (93%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Tax.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Tax/Grid.php (94%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Search.php (87%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Abandoned.php (86%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Abandoned/Grid.php (95%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Customer.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Customer/Grid.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Product.php (85%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Product/Grid.php (93%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Wishlist.php (92%) rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Wishlist/Grid.php (96%) rename app/code/Magento/{Adminhtml/Controller/Report.php => Reports/Controller/Adminhtml/Index.php} (95%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/AbstractReport.php (88%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Customer.php (98%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Product.php (92%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Review.php (95%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Sales.php (87%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Shopcart.php (90%) rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Statistics.php (95%) rename app/code/Magento/{Adminhtml/Model/Report => Reports/Model}/Item.php (95%) create mode 100644 app/code/Magento/Reports/etc/adminhtml/routes.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml => Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml} (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml => Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml} (95%) rename app/{design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml => code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml} (87%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml => Reports/view/adminhtml/layout/reports_index_search_block.xml} (98%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_accounts.xml => reports_report_customer_accounts.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_accounts_grid.xml => reports_report_customer_accounts_grid.xml} (98%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_exporttotalscsv.xml => reports_report_customer_exportaccountscsv.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_exporttotalsexcel.xml => reports_report_customer_exportaccountsexcel.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_exportproductcsv.xml => reports_report_customer_exportorderscsv.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_exportproductexcel.xml => reports_report_customer_exportordersexcel.xml} (95%) create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_orders.xml => reports_report_customer_orders.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_orders_grid.xml => reports_report_customer_orders_grid.xml} (99%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_totals.xml => reports_report_customer_totals.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_totals_grid.xml => reports_report_customer_totals_grid.xml} (97%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_grid.xml => reports_report_grid.xml} (100%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportlowstockcsv.xml => reports_report_product_exportlowstockcsv.xml} (94%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportlowstockexcel.xml => reports_report_product_exportlowstockexcel.xml} (94%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportsoldcsv.xml => reports_report_product_exportsoldcsv.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportsoldexcel.xml => reports_report_product_exportsoldexcel.xml} (95%) create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_lowstock_grid.xml => reports_report_product_lowstock_grid.xml} (97%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_sold.xml => reports_report_product_sold.xml} (95%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_sold_grid.xml => reports_report_product_sold_grid.xml} (98%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml => Reports/view/adminhtml/layout/reports_report_product_viewed.xml} (89%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_product.xml => reports_report_review_customer.xml} (86%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_customer_grid.xml => reports_report_review_customer_grid.xml} (98%) create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml => Reports/view/adminhtml/layout/reports_report_review_product.xml} (86%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_product_grid.xml => reports_report_review_product_grid.xml} (99%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml => Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml} (92%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml => Reports/view/adminhtml/layout/reports_report_sales_coupons.xml} (93%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml => Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml} (92%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml => Reports/view/adminhtml/layout/reports_report_sales_refunded.xml} (92%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml => Reports/view/adminhtml/layout/reports_report_sales_sales.xml} (93%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml => Reports/view/adminhtml/layout/reports_report_sales_shipping.xml} (92%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml => Reports/view/adminhtml/layout/reports_report_sales_tax.xml} (93%) rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_statistics_index.xml => reports_report_statistics_index.xml} (100%) rename app/code/Magento/{Adminhtml/view/adminhtml/layout/report_sales.xml => Reports/view/adminhtml/layout/reports_sales.xml} (100%) rename app/code/Magento/{Adminhtml => Reports}/view/adminhtml/report/grid/container.phtml (98%) rename app/code/Magento/{Adminhtml => Reports}/view/adminhtml/report/refresh/statistics.phtml (97%) rename app/code/Magento/{Adminhtml => Reports}/view/adminhtml/report/wishlist.phtml (98%) delete mode 100644 app/code/Magento/Reports/view/frontend/home_product_compared.phtml delete mode 100644 app/code/Magento/Reports/view/frontend/home_product_viewed.phtml delete mode 100644 app/code/Magento/Reports/view/frontend/images/i_widget-list.gif delete mode 100644 app/code/Magento/Reports/view/frontend/widgets.css rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Add.php (96%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Add/Form.php (93%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Edit.php (97%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Edit/Form.php (97%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Grid.php (96%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Grid/Filter/Type.php (90%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Grid/Renderer/Type.php (84%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Main.php (95%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Product/Grid.php (97%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Rating/Detailed.php (97%) rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Rating/Summary.php (95%) rename app/code/Magento/{Adminhtml/view/adminhtml/review => Review/view/adminhtml}/add.phtml (100%) rename app/code/Magento/{Adminhtml/Block/Shipping => Shipping/Block/Adminhtml}/Carrier/Tablerate/Grid.php (94%) create mode 100644 app/code/Magento/Shipping/Model/Shipping/Labels.php rename app/{design/adminhtml/magento_basic/theme.xml => code/Magento/Shipping/etc/adminhtml/di.xml} (84%) rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Edit.php (95%) rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Edit/Form.php (98%) rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Grid/Renderer/Action.php (96%) rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Grid/Renderer/Link.php (97%) rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Grid/Renderer/Time.php (96%) rename app/code/Magento/{Adminhtml/Block => Sitemap/Block/Adminhtml}/Sitemap.php (90%) rename app/design/adminhtml/{magento_basic => magento_backend}/i18n/en_US.csv (99%) delete mode 100644 app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml delete mode 100644 app/design/adminhtml/magento_basic/below_ie7.css delete mode 100644 app/design/adminhtml/magento_basic/boxes.css delete mode 100644 app/design/adminhtml/magento_basic/custom.css delete mode 100644 app/design/adminhtml/magento_basic/ie7.css delete mode 100644 app/design/adminhtml/magento_basic/iestyles.css delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_close.gif delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_close.png delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_open.gif delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_open.png delete mode 100644 app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif delete mode 100644 app/design/adminhtml/magento_basic/images/add_btn_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_li.gif delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_over_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif delete mode 100644 app/design/adminhtml/magento_basic/images/ajax-loader.gif delete mode 100644 app/design/adminhtml/magento_basic/images/application_view_tile.gif delete mode 100644 app/design/adminhtml/magento_basic/images/arrow_sort_move.gif delete mode 100644 app/design/adminhtml/magento_basic/images/bg_collapse.gif delete mode 100644 app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif delete mode 100644 app/design/adminhtml/magento_basic/images/bg_notifications.gif delete mode 100644 app/design/adminhtml/magento_basic/images/bg_window_mask.png delete mode 100644 app/design/adminhtml/magento_basic/images/bkg_btn-close.gif delete mode 100644 app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif delete mode 100644 app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png delete mode 100644 app/design/adminhtml/magento_basic/images/blank.gif delete mode 100644 app/design/adminhtml/magento_basic/images/box_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_back_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_bare_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_delete_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_go.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_gr_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_gr_on.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_gr_over.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_loading-icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_login.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/btn_task_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/button-close.png delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/dashboard-close.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-x-bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-header-bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-sep.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-start.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-top.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-roller.png delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-footer.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-header.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-left.gif delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-right.gif delete mode 100644 app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif delete mode 100644 app/design/adminhtml/magento_basic/images/dotted_divider_light.gif delete mode 100644 app/design/adminhtml/magento_basic/images/edit_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/error-msg.png delete mode 100644 app/design/adminhtml/magento_basic/images/fam_account.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_application_form_delete.png delete mode 100644 app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_bin.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_calendar.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_cart.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_comment.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_creditcards.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_folder_database.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_folder_palette.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_folder_table.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_group.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_help.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_house.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_layout.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_leaf.png delete mode 100644 app/design/adminhtml/magento_basic/images/fam_link.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_lorry.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_money.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_money_add.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_monitor.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_package.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_package_go.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_page_white.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_rainbow.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_refresh.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_server_database.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_status_online.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_tag_orange.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_user.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_user_comment.gif delete mode 100644 app/design/adminhtml/magento_basic/images/fam_user_edit.gif delete mode 100644 app/design/adminhtml/magento_basic/images/filter_row_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/footer_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/gift-message-collapse.gif delete mode 100644 app/design/adminhtml/magento_basic/images/gift-message-expand.gif delete mode 100644 app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/grid-cal.gif delete mode 100644 app/design/adminhtml/magento_basic/images/grid_sort_asc.gif delete mode 100644 app/design/adminhtml/magento_basic/images/grid_sort_desc.gif delete mode 100644 app/design/adminhtml/magento_basic/images/grid_th_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png delete mode 100644 app/design/adminhtml/magento_basic/images/header_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/header_top_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/i_notice.gif delete mode 100644 app/design/adminhtml/magento_basic/images/i_question-mark.png delete mode 100644 app/design/adminhtml/magento_basic/images/ico_success.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon-tooltip.png delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_add.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_back.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_delete.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_save.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_edit_address.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_export.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_export.png delete mode 100644 app/design/adminhtml/magento_basic/images/icon_feed.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_feed.png delete mode 100644 app/design/adminhtml/magento_basic/images/icon_note_list.gif delete mode 100644 app/design/adminhtml/magento_basic/images/icon_remove_address.gif delete mode 100644 app/design/adminhtml/magento_basic/images/loader-small.gif delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bg.jpg delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bottom.jpg delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/login_logo.gif delete mode 100644 app/design/adminhtml/magento_basic/images/logo-large.gif delete mode 100644 app/design/adminhtml/magento_basic/images/logo.gif delete mode 100644 app/design/adminhtml/magento_basic/images/massaction_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/massaction_button_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif delete mode 100644 app/design/adminhtml/magento_basic/images/middle_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/more_arrow.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_active.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_off.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_on.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_over.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_sep.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_li_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_li_bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_link_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav3_bg.png delete mode 100644 app/design/adminhtml/magento_basic/images/nav_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav_list_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav_on_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif delete mode 100644 app/design/adminhtml/magento_basic/images/note_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/note_cell_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/notice-msg.png delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_left.gif delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_right.gif delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif delete mode 100644 app/design/adminhtml/magento_basic/images/process_spinner.gif delete mode 100644 app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif delete mode 100644 app/design/adminhtml/magento_basic/images/product_rating_full_star.gif delete mode 100644 app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif delete mode 100644 app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif delete mode 100644 app/design/adminhtml/magento_basic/images/rule_component_add.gif delete mode 100644 app/design/adminhtml/magento_basic/images/rule_component_apply.gif delete mode 100644 app/design/adminhtml/magento_basic/images/rule_component_remove.gif delete mode 100644 app/design/adminhtml/magento_basic/images/save_btn_icon.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sec_nav_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_bottom.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/side_col_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/simple_container_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-down.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-down.png delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-up.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-up.png delete mode 100644 app/design/adminhtml/magento_basic/images/sort_heading_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sort_on_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sort_row_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/spacer.gif delete mode 100644 app/design/adminhtml/magento_basic/images/sub_button_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/success-msg.png delete mode 100644 app/design/adminhtml/magento_basic/images/tabs_link_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tabs_span_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tag_blue_edit.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tooltip_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tooltip_corner.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tooltip_top.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/join.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/line.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/minus.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif delete mode 100644 app/design/adminhtml/magento_basic/images/validation_advice_bg.gif delete mode 100644 app/design/adminhtml/magento_basic/images/varien_logo.gif delete mode 100644 app/design/adminhtml/magento_basic/images/window_close.png delete mode 100644 app/design/adminhtml/magento_basic/images/window_content.png delete mode 100644 app/design/adminhtml/magento_basic/images/window_top.png delete mode 100644 app/design/adminhtml/magento_basic/media/editor.swf delete mode 100644 app/design/adminhtml/magento_basic/media/flex.swf delete mode 100644 app/design/adminhtml/magento_basic/media/uploader.swf delete mode 100644 app/design/adminhtml/magento_basic/media/uploaderSingle.swf delete mode 100644 app/design/adminhtml/magento_basic/menu.css delete mode 100644 app/design/adminhtml/magento_basic/print.css delete mode 100644 app/design/adminhtml/magento_basic/reset.css delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/captcha.js delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/onepage.js delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/reload.png delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cvv.gif delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/overview.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/payment.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/success.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/widgets.css delete mode 100644 app/design/frontend/magento_backup/Magento_Contacts/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Core/fam_book_open.png delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento.css delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png delete mode 100644 app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address.js delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address/book.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/balance.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/address.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/login.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/register.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/logout.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/set-password.js delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/currency.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js delete mode 100644 app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/1column.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/3columns.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/empty.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/head.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/header.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/notices.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/pager.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/js/menu.js delete mode 100644 app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js delete mode 100644 app/design/frontend/magento_backup/Magento_Page/js/row-builder.js delete mode 100644 app/design/frontend/magento_backup/Magento_Page/link/current.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/popup.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/print.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/cc-type.js delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/order-review.js delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Rating/detailed.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/list.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Review/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Rss/list.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/gift-message.js delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/history.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/orders-returns.js delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js delete mode 100644 app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Widget/widgets.css delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/js/search.js delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/view.phtml delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js delete mode 100644 app/design/frontend/magento_backup/css/print.css delete mode 100644 app/design/frontend/magento_backup/media/preview_image.jpg delete mode 100644 app/design/frontend/magento_backup/theme.xml delete mode 100644 app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_in.gif delete mode 100644 app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif create mode 100644 app/design/frontend/magento_blank/view.xml delete mode 100644 app/design/frontend/magento_demo/Magento_Page/layout/default.xml delete mode 100644 app/design/frontend/magento_demo/Magento_Page/layout/print.xml delete mode 100644 app/design/frontend/magento_demo/css/print.css delete mode 100644 app/design/frontend/magento_demo/css/styles-ie.css delete mode 100644 app/design/frontend/magento_demo/css/styles.css delete mode 100644 app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif delete mode 100644 app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif delete mode 100644 app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif delete mode 100644 app/design/frontend/magento_demo/i18n/en_US.csv delete mode 100644 app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif delete mode 100644 app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif delete mode 100644 app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif delete mode 100644 app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif delete mode 100644 app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_account_box.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-actions.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-currency.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-label.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-li.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-title.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered1.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-title-account.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-title.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_body.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_buttons-set1.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_checkout.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_collapse-gm.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_collapse.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_divider1.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_form-search.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_grand-total.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_grid.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_header.jpg delete mode 100644 app/design/frontend/magento_demo/images/bkg_login-box.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_main1.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_main2.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_nav0.jpg delete mode 100644 app/design/frontend/magento_demo/images/bkg_nav1.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_nav2.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_opc-title-off.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_pipe1.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_pipe2.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_pipe3.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_product-view.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_product_collateral.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_rating.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_sp-methods.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_tfoot.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_th-v.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_th.gif delete mode 100644 app/design/frontend/magento_demo/images/bkg_toolbar.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_checkout.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_edit.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_gm-close.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_place_order.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_previous.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_remove2.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_search.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_trash.gif delete mode 100644 app/design/frontend/magento_demo/images/btn_window_close.gif delete mode 100644 app/design/frontend/magento_demo/images/calendar.gif delete mode 100644 app/design/frontend/magento_demo/images/fam_book_open.png delete mode 100644 app/design/frontend/magento_demo/images/free_shipping_callout.jpg delete mode 100644 app/design/frontend/magento_demo/images/grid-cal.gif delete mode 100644 app/design/frontend/magento_demo/images/home_left_callout.jpg delete mode 100644 app/design/frontend/magento_demo/images/home_main_callout.jpg delete mode 100644 app/design/frontend/magento_demo/images/i_arrow-top.gif delete mode 100644 app/design/frontend/magento_demo/images/i_availability_only.gif delete mode 100644 app/design/frontend/magento_demo/images/i_availability_only_arrow.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-cart.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-currency.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-list.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-poll.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-related.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-subscribe.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-tags.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-viewed.gif delete mode 100644 app/design/frontend/magento_demo/images/i_block-wishlist.gif delete mode 100644 app/design/frontend/magento_demo/images/i_discount.gif delete mode 100644 app/design/frontend/magento_demo/images/i_folder-table.gif delete mode 100644 app/design/frontend/magento_demo/images/i_ma-info.gif delete mode 100644 app/design/frontend/magento_demo/images/i_ma-reviews.gif delete mode 100644 app/design/frontend/magento_demo/images/i_ma-tags.gif delete mode 100644 app/design/frontend/magento_demo/images/i_msg-error.gif delete mode 100644 app/design/frontend/magento_demo/images/i_msg-note.gif delete mode 100644 app/design/frontend/magento_demo/images/i_msg-success.gif delete mode 100644 app/design/frontend/magento_demo/images/i_notice.gif delete mode 100644 app/design/frontend/magento_demo/images/i_page1.gif delete mode 100644 app/design/frontend/magento_demo/images/i_page2.gif delete mode 100644 app/design/frontend/magento_demo/images/i_pager-next.gif delete mode 100644 app/design/frontend/magento_demo/images/i_pager-prev.gif delete mode 100644 app/design/frontend/magento_demo/images/i_print.gif delete mode 100644 app/design/frontend/magento_demo/images/i_rss-big.png delete mode 100644 app/design/frontend/magento_demo/images/i_rss.gif delete mode 100644 app/design/frontend/magento_demo/images/i_search_criteria.gif delete mode 100644 app/design/frontend/magento_demo/images/i_shipping.gif delete mode 100644 app/design/frontend/magento_demo/images/i_tag_add.gif delete mode 100644 app/design/frontend/magento_demo/images/i_tier.gif delete mode 100644 app/design/frontend/magento_demo/images/i_type_grid.gif delete mode 100644 app/design/frontend/magento_demo/images/i_type_list.gif delete mode 100644 app/design/frontend/magento_demo/images/magnifier_handle.gif delete mode 100644 app/design/frontend/magento_demo/images/map_popup_arrow.gif delete mode 100644 app/design/frontend/magento_demo/images/media/404_callout1.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/404_callout2.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img01.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img02.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img03.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img04.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img05.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img06.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/electronics_laptops.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif delete mode 100644 app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif delete mode 100644 app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg delete mode 100644 app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg delete mode 100644 app/design/frontend/magento_demo/images/np_cart_thumb.gif delete mode 100644 app/design/frontend/magento_demo/images/np_more_img.gif delete mode 100644 app/design/frontend/magento_demo/images/np_product_main.gif delete mode 100644 app/design/frontend/magento_demo/images/np_thumb.gif delete mode 100644 app/design/frontend/magento_demo/images/np_thumb2.gif delete mode 100644 app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg delete mode 100644 app/design/frontend/magento_demo/images/ph_callout_left_top.gif delete mode 100644 app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif delete mode 100644 app/design/frontend/magento_demo/images/slider_bg.gif delete mode 100644 app/design/frontend/magento_demo/images/validation_advice_bg.gif delete mode 100644 app/design/frontend/magento_demo/media/preview_image.jpg delete mode 100644 app/design/frontend/magento_demo/theme.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/js/list.js delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml delete mode 100644 app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml delete mode 100644 app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php create mode 100644 dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php delete mode 100644 dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/Block/Page/HeadTest.php (88%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/Block/Page/HeaderTest.php (88%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/CacheTest.php (90%) create mode 100644 dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_disabled.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_disabled_rollback.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_enabled.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_enabled_rollback.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_invalidated.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_invalidated_rollback.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/application_cache.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/application_cache_rollback.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/empty_storage.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/non_application_cache.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/non_application_cache_rollback.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/TemplateTest.php => Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php} (56%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Edit/FormTest.php (90%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/SubscriberTest.php (89%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller => Newsletter/Controller/Adminhtml}/NewsletterQueueTest.php (93%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller => Newsletter/Controller/Adminhtml}/NewsletterTemplateTest.php (91%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/controllers => Newsletter}/_files/newsletter_sample.php (100%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Filter/FormTest.php (87%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Bestsellers/GridTest.php (87%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Coupons/GridTest.php (91%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Invoiced/GridTest.php (91%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Refunded/GridTest.php (91%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Sales/GridTest.php (92%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Shipping/GridTest.php (91%) rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Tax/GridTest.php (92%) rename dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/{magento_demo => magento_plushe}/css/wrong.css (100%) create mode 100644 dev/tests/performance/benchmark_logs_merge.php create mode 100644 dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php rename dev/tests/unit/testsuite/Magento/{Adminhtml => Backend}/Block/Page/System/Config/Robots/ResetTest.php (88%) rename dev/tests/unit/testsuite/Magento/{Adminhtml => Backend}/Block/UrlrewriteTest.php (98%) rename dev/tests/unit/testsuite/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/CacheTest.php (98%) rename dev/tests/unit/testsuite/Magento/{ => Backend/Controller}/Adminhtml/DashboardTest.php (99%) create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php rename dev/tests/unit/testsuite/Magento/{Adminhtml/Model/LayoutUpdate => Core/Model/Layout/Update}/ValidatorTest.php (89%) rename app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml => dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml (92%) create mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php create mode 100644 dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php rename app/code/Magento/Adminhtml/Block/Messages.php => lib/Magento/Data/Collection/EntityFactoryInterface.php (76%) rename app/code/Magento/Backend/App/Action/Plugin/Store.php => lib/Magento/Data/Form/Element/CollectionFactory.php (59%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 974e9df22c295..c440cb6de5ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,43 @@ +2.0.0.0-dev54 +============= +* Modularity improvements: + * Breakdown of the Adminhtml module: + * Moved Newsletter, Report logic to the respective modules + * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules + * Removed application dependencies from the library +* Move Magento\Core common blocks in the library +* Application areas rework: + * Areas are independent from Store + * Removed deprecated annotation from the getArea methods +* GitHub requests: + * [#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws in core URL helper + * [#247](https://github.com/magento/magento2/pull/247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage + * [#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is supported for Turkish members. + * [#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php + * [#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed typos + * [#382](https://github.com/magento/magento2/pull/382) -- [Magento/Core] Fixed typos + * [#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous closing " + * [#323](https://github.com/magento/magento2/pull/323) -- InstanceController.php - made setBody protected + * [#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog menu declaration into Mage_Catalog module. + * [#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php + * [#271](https://github.com/magento/magento2/pull/271) -- Check Data should validate gallery information + * [#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up nested quotes + * [#352](https://github.com/magento/magento2/pull/352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration + * [#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is locale aware and should not + * [#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for required_options column + * [#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix & partial invoice credit memo divide by zero warning +* Themes update: + * Old frontend (magento_demo) and backend (magento_basic) themes are removed + * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules +* Fixed bugs: + * Fixed the error when Magento cannot be reinstalled to the same database with table prefix + * Fixed report Products in Cart + * Fixed error on attempt to insert image to CMS pages under version control + * Fixed order status grid so that you can assign state, edit, and view custom order status + * Fixed Related Products Rule page so that category can be selected on conditions tab + * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled + * Fixed the bug with international DHL quotes + 2.0.0.0-dev53 ============= * Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module @@ -10,9 +50,9 @@ * GitHub requests: * [#238](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL * [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly - * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods. + * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods * [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code - * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation. + * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation * [#232](https://github.com/magento/magento2/pull/232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632) * Fixed bugs: * Fixed JavaScript error when printing orders from the frontend @@ -29,11 +69,10 @@ * Moved Magento\Core\Model\Theme to the Magento\View component * Moved Magento\Core\Model\Design to the Magento\View component * Consistent declaration of page-types - * The Framework part of the Cache functionality moved out from modules * Themes update: * Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme * Refactored and removed duplicate Persistent module templates - * Plushe theme made responsive + * Plushe theme is responsive now * Fixed bugs: * Fixed inability to print order, invoice, or creditmemo in the frontend * Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php index 4477bb68e9db7..4eb3679fa7884 100644 --- a/app/code/Magento/AdminNotification/Model/Feed.php +++ b/app/code/Magento/AdminNotification/Model/Feed.php @@ -49,9 +49,9 @@ class Feed extends \Magento\Core\Model\AbstractModel protected $_feedUrl; /** - * @var \Magento\Core\Model\Store\Config + * @var \Magento\Backend\App\ConfigInterface */ - protected $_coreStoreConfig; + protected $_backendConfig; /** * @var \Magento\AdminNotification\Model\InboxFactory @@ -61,7 +61,7 @@ class Feed extends \Magento\Core\Model\AbstractModel /** * @param \Magento\Core\Model\Context $context * @param \Magento\Core\Model\Registry $registry - * @param \Magento\Core\Model\Store\Config $coreStoreConfig + * @param \Magento\Backend\App\ConfigInterface $backendConfig * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory * @param \Magento\Core\Model\Resource\AbstractResource $resource * @param \Magento\Data\Collection\Db $resourceCollection @@ -70,14 +70,14 @@ class Feed extends \Magento\Core\Model\AbstractModel public function __construct( \Magento\Core\Model\Context $context, \Magento\Core\Model\Registry $registry, - \Magento\Core\Model\Store\Config $coreStoreConfig, + \Magento\Backend\App\ConfigInterface $backendConfig, \Magento\AdminNotification\Model\InboxFactory $inboxFactory, \Magento\Core\Model\Resource\AbstractResource $resource = null, \Magento\Data\Collection\Db $resourceCollection = null, array $data = array() ) { parent::__construct($context, $registry, $resource, $resourceCollection, $data); - $this->_coreStoreConfig = $coreStoreConfig; + $this->_backendConfig = $backendConfig; $this->_inboxFactory = $inboxFactory; } @@ -97,9 +97,9 @@ protected function _construct() */ public function getFeedUrl() { - $httpPath = $this->_coreStoreConfig->getConfigFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://'; + $httpPath = $this->_backendConfig->getFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://'; if (is_null($this->_feedUrl)) { - $this->_feedUrl = $httpPath . $this->_coreStoreConfig->getConfig(self::XML_FEED_URL_PATH); + $this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH); } return $this->_feedUrl; } @@ -158,7 +158,7 @@ public function getDate($rssDate) */ public function getFrequency() { - return $this->_coreStoreConfig->getConfig(self::XML_FREQUENCY_PATH) * 3600; + return $this->_backendConfig->getValue(self::XML_FREQUENCY_PATH) * 3600; } /** diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php index ed4045d5c38e1..e24551a102af9 100644 --- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php +++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php @@ -50,9 +50,9 @@ class Security protected $_cache; /** - * @var \Magento\Core\Model\Store\Config + * @var \Magento\Backend\App\ConfigInterface */ - protected $_storeConfig; + protected $_backendConfig; /** * @var \Magento\Core\Model\Config @@ -66,18 +66,18 @@ class Security /** * @param \Magento\App\CacheInterface $cache - * @param \Magento\Core\Model\Store\Config $storeConfig + * @param \Magento\Backend\App\ConfigInterface $backendConfig * @param \Magento\Core\Model\Config $config * @param \Magento\HTTP\Adapter\CurlFactory $curlFactory */ public function __construct( \Magento\App\CacheInterface $cache, - \Magento\Core\Model\Store\Config $storeConfig, + \Magento\Backend\App\ConfigInterface $backendConfig, \Magento\Core\Model\Config $config, \Magento\HTTP\Adapter\CurlFactory $curlFactory ) { $this->_cache = $cache; - $this->_storeConfig = $storeConfig; + $this->_backendConfig = $backendConfig; $this->_config = $config; $this->_curlFactory = $curlFactory; } @@ -97,7 +97,7 @@ private function _canShowNotification() return true; } - $adminSessionLifetime = (int) $this->_storeConfig->getConfig('admin/security/session_lifetime'); + $adminSessionLifetime = (int) $this->_backendConfig->getValue('admin/security/session_lifetime'); $this->_cache->save(true, self::VERIFICATION_RESULT_CACHE_KEY, array(), $adminSessionLifetime); return false; } diff --git a/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php b/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php deleted file mode 100644 index d51fdb7698d05..0000000000000 --- a/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php +++ /dev/null @@ -1,51 +0,0 @@ - - */ -namespace Magento\Adminhtml\Model\Newsletter\Renderer; - -class Text implements \Magento\Data\Form\Element\Renderer\RendererInterface -{ - - public function render(\Magento\Data\Form\Element\AbstractElement $element) - { - $html = ''."\n"; - if ($element->getLabel()) { - $html.= ''."\n"; - } - $html.= ' -'; - $html.= ''."\n"; - - return $html; - } -} diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/events.xml b/app/code/Magento/Adminhtml/etc/adminhtml/events.xml deleted file mode 100644 index e2cb639c2d64d..0000000000000 --- a/app/code/Magento/Adminhtml/etc/adminhtml/events.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml b/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml deleted file mode 100644 index 27d92ec34c8d4..0000000000000 --- a/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/code/Magento/Adminhtml/etc/config.xml b/app/code/Magento/Adminhtml/etc/config.xml deleted file mode 100644 index bcff89c470e2d..0000000000000 --- a/app/code/Magento/Adminhtml/etc/config.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - 1 - - - - - - - /*/sitemap.xml - - - - - - price - media_image - gallery - - - - - - - - - default - - - default - - - - - - - - - - true - - - - admin/noroute/index - - - - - diff --git a/app/code/Magento/Adminhtml/etc/di.xml b/app/code/Magento/Adminhtml/etc/di.xml deleted file mode 100644 index d4a999e0e2e31..0000000000000 --- a/app/code/Magento/Adminhtml/etc/di.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - Magento\App\State::PARAM_INSTALL_DATE - - - - - - - - diff --git a/app/code/Magento/Adminhtml/etc/module.xml b/app/code/Magento/Adminhtml/etc/module.xml index 4c589cb95b45a..d6a5997479c73 100755 --- a/app/code/Magento/Adminhtml/etc/module.xml +++ b/app/code/Magento/Adminhtml/etc/module.xml @@ -27,26 +27,7 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/code/Magento/Adminhtml/etc/sales.xml b/app/code/Magento/Adminhtml/etc/sales.xml deleted file mode 100644 index d18d4b5dfa01b..0000000000000 --- a/app/code/Magento/Adminhtml/etc/sales.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml deleted file mode 100644 index 8b77671e35619..0000000000000 --- a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - Magento Admin - - - - jquery/jquery.js - - - - - mage/jquery-no-conflict.js - - - - - jquery/jquery-ui.js - - - - - head.load.min.js - - - - - underscore.js - - - - - mage/mage.js - - - - - jquery/jquery.tmpl.min.js - - - - - jquery/jquery.validate.js - - - - - jquery/jquery.hoverIntent.js - - - - - mage/translate.js - - - - - mage/backend/bootstrap.js - - - - - mage/backend/floating-header.js - - - - - prototype/prototype.js - - - - - prototype/window.js - - - - - scriptaculous/builder.js - - - - - scriptaculous/effects.js - - - - - scriptaculous/dragdrop.js - - - - - scriptaculous/controls.js - - - - - scriptaculous/slider.js - - - - - lib/ccard.js - - - - - prototype/validation.js - - - - - varien/js.js - - - - - mage/adminhtml/hash.js - - - - - mage/adminhtml/events.js - - - - - mage/adminhtml/varienLoader.js - - - - - mage/adminhtml/grid.js - - - - - mage/backend/tabs.js - - - - - mage/adminhtml/form.js - - - - - mage/adminhtml/accordion.js - - - - - mage/adminhtml/tools.js - - - - - Magento_Catalog::catalog/product.js - - - - - lib/ds-sleight.js - - defer - lt IE 7 - - - - - - mage/calendar.css - - - - - - - - jquery/jquery-ui-timepicker-addon.js - - - - - mage/calendar.js - - - - - extjs/ext-tree.js - - - - can_load_ext_js - - - - - - extjs/ext-tree-checkbox.js - - - - can_load_ext_js - - - - - - extjs/resources/css/ext-all.css - - - - can_load_ext_js - - - - - - extjs/resources/css/ytheme-magento.css - - - - can_load_ext_js - - - - - - Magento_Rule::rules.js - - - - can_load_rules_js - - - - - - mage/adminhtml/wysiwyg/tiny_mce/setup.js - - - - can_load_tiny_mce - - - - - - - - - - - - - - - - - - - - - - - - - - http://www.magentocommerce.com/bug-tracking - - - - - diff --git a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml index 99cb75e01ff63..95e2cc91ba3a9 100644 --- a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml +++ b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml @@ -35,7 +35,7 @@
- helper('Magento\Adminhtml\Helper\Data')->getUrl('adminhtml/*/*')?> + helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/*/*')?> - -
    - -
  • getRequired()) echo 'data-validate = {"validate-one-required-by-name":true}'?> name="bundle_option[getId() ?>][]"isSelected($_selection)) echo ' checked="checked"' ?>isSaleable()) echo ' disabled="disabled"' ?> value="getSelectionId() ?>"/> - -
  • - -
-
- +
+ +
+
+ getRequired()): ?> + getSelectionQtyTitlePrice($_selections[0]) ?> + + + +
+ getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?> + name="bundle_option[getId() ?>][]" + isSelected($_selection)) echo ' checked="checked"' ?> + isSaleable()) echo ' disabled="disabled"' ?> + value="getSelectionId() ?>"/> + +
+ +
+ +
- +
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml index 405be460f2e0f..a24c0efedb6a1 100644 --- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml +++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml @@ -18,32 +18,42 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - getOption() ?> getSelections() ?> -
getRequired()) echo ' class="required"' ?>>escapeHtml($_option->getTitle()) ?>getRequired()) echo '*' ?>
-getDecoratedIsLast()):?> class="last"> -
- getRequired()): ?> - getSelectionQtyTitlePrice($_selections[0]) ?> - - - + + - - - - -
- +
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml index 89aa9c26f1778..c808e6c31c41b 100644 --- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml +++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml @@ -18,45 +18,73 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - getOption(); ?> getSelections(); ?> getDefaultSelection(); ?> getDefaultValues(); ?> -
- getRequired()) echo ' class="required"' ?>>escapeHtml($_option->getTitle()) ?>getRequired()) echo '*' ?> -
-getDecoratedIsLast()):?> class="last"> -
- showSingle()): ?> - getSelectionTitlePrice($_selections[0]) ?> - - -
    - getRequired()): ?> -
  • isSalable())?'':' checked="checked" ' ?> value=""/> - -
  • - - -
  • getRequired()) echo 'data-validate = {"validate-one-required-by-name":true}'?> name="bundle_option[getId() ?>]"isSelected($_selection)) echo ' checked="checked"' ?>isSaleable()) echo ' disabled="disabled"' ?>value="getSelectionId() ?>"/> - -
  • - -
-
- +
+ +
+
+ showSingle()): ?> + getSelectionTitlePrice($_selections[0]) ?> + + + getRequired()): ?> +
+ isSalable())?'':' checked="checked" ' ?> + value=""/> + +
+ + +
+ getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?> + name="bundle_option[getId() ?>]" + isSelected($_selection)) echo ' checked="checked"' ?> + isSaleable()) echo ' disabled="disabled"' ?> + value="getSelectionId() ?>"/> + +
+ +
+ +
+ +
+ + id="bundle-option-getId() ?>-qty-input" + class="input-text qty" + type="text" + name="bundle_option_qty[getId() ?>]" + value=""/> +
+
+
- - id="bundle-option-getId() ?>-qty-input" class="input-text qty" type="text" name="bundle_option_qty[getId() ?>]" value=""/> - - +
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml index b6fa2ac5edc11..52801328c7f05 100644 --- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml +++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml @@ -18,12 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ - ?> @@ -31,25 +28,45 @@ getSelections(); ?> getDefaultSelection(); ?> getDefaultValues(); ?> - -
- getRequired()) echo ' class="required"' ?>>escapeHtml($_option->getTitle()) ?>getRequired()) echo '*' ?> -
-getDecoratedIsLast()):?> class="last"> -
- showSingle()): ?> - getSelectionTitlePrice($_selections[0]) ?> - - - - +
+ +
+ showSingle()): ?> + getSelectionTitlePrice($_selections[0]) ?> + + + + +
+
+ +
+ + id="bundle-option-getId() ?>-qty-input" + class="input-text qty" + type="text" + name="bundle_option_qty[getId() ?>]" + value=""/> +
+
+
- - id="bundle-option-getId() ?>-qty-input" class="input-text qty" type="text" name="bundle_option_qty[getId() ?>]" value=""/> - - +
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml index 9fea3750b23a9..59b828af0171c 100644 --- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml +++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml @@ -18,33 +18,41 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getProduct(); ?> +getProduct(); +$_helper = $this->helper('Magento\Catalog\Helper\Output'); +?> decorateArray($this->getOptions()); ?> isSaleable()):?> - -
- - getSelections()): ?> - - - getOptionHtml($_option) ?> - -
+ +
+ + productAttribute($_product, $_product->getName(), 'name')) ?> +
+ + getSelections()): ?> + + + getOptionHtml($_option) ?> + +
-

+

diff --git a/app/code/Magento/Bundle/view/frontend/js/float.js b/app/code/Magento/Bundle/view/frontend/js/float.js index 3e3d7c7888f2e..8abb7bc455861 100644 --- a/app/code/Magento/Bundle/view/frontend/js/float.js +++ b/app/code/Magento/Bundle/view/frontend/js/float.js @@ -17,8 +17,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category frontend bundle product float - * @package mage * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/code/Magento/Bundle/view/frontend/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/js/product-summary.js index a204c51b2c7c1..2218a61433c0d 100644 --- a/app/code/Magento/Bundle/view/frontend/js/product-summary.js +++ b/app/code/Magento/Bundle/view/frontend/js/product-summary.js @@ -17,8 +17,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category frontend bundle product summary - * @package mage * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/code/Magento/Bundle/view/frontend/js/slide.js b/app/code/Magento/Bundle/view/frontend/js/slide.js index b451fce49cb28..d077384793866 100644 --- a/app/code/Magento/Bundle/view/frontend/js/slide.js +++ b/app/code/Magento/Bundle/view/frontend/js/slide.js @@ -17,8 +17,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category frontend bundle product slide - * @package mage * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -31,14 +29,21 @@ slideBackSelector: '.bundle-slide-back', bundleProductSelector: '#bundleProduct', bundleOptionsContainer: '#options-container', - productViewContainer: '#productView' + productViewContainer: '#productView', + slidedown: true }, _create: function() { - $(this.options.slideSelector).on('click', $.proxy(this._slide, this)); - $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this)); - this.options.autostart && this._slide(); + if(this.options.slidedown === true) { + $(this.options.slideSelector).on('click', $.proxy(this._show, this)); + $(this.options.slideBackSelector).on('click', $.proxy(this._hide, this)); + this.options.autostart && this._show(); + } else { + $(this.options.slideSelector).on('click', $.proxy(this._slide, this)); + $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this)); + this.options.autostart && this._slide(); + } }, /** @@ -75,6 +80,18 @@ this.element.css('height','auto'); }, this) ); + }, + _show: function() { + $(this.options.bundleOptionsContainer).slideDown(800); + $('html, body').animate({ + scrollTop: $(this.options.bundleOptionsContainer).offset().top + }, 600); + }, + _hide: function() { + $('html, body').animate({ + scrollTop: 0 + }, 600); + $(this.options.bundleOptionsContainer).slideUp(800); } }); }(jQuery)); \ No newline at end of file diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml index 83752c4c834c5..3e1666e39a957 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml @@ -36,21 +36,24 @@ + + + type-bundle + + - - - bundle - Magento\Bundle\Block\Catalog\Product\Price - catalog/product/price.phtml - + Magento_Catalog::product/price_msrp_item.phtml + + + @@ -62,7 +65,32 @@ + + + product.info.addtocart + + + 1 + + + product.info.addto + + + + + + + + + bundle + Magento\Bundle\Block\Catalog\Product\Price + catalog/product/view/price.phtml + + + + + bundle diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml index 547ba39c0ee11..f56f9a2b65b5b 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml @@ -24,7 +24,7 @@ */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/default.xml b/app/code/Magento/Bundle/view/frontend/layout/default.xml index c21ff6f807e4b..30de3dbeb470c 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/default.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/default.xml @@ -24,8 +24,12 @@ */ --> - - + + + bundle + Magento\Bundle\Block\Catalog\Product\Price + catalog/product/price.phtml + @@ -34,4 +38,7 @@ catalog/product/price.phtml + + + diff --git a/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml b/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml index a847fff4d91de..e8ab7745d80e1 100644 --- a/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml +++ b/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -29,7 +27,7 @@ /** * Template for displaying bundle product price in RSS feeds * - * @see \Magento\Bundle\Block\Catalog\Product\Price + * @var $this \Magento\Bundle\Block\Catalog\Product\Price */ ?> diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml index 81e3d4dd828e6..8058ab26283d5 100644 --- a/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml +++ b/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -35,228 +33,223 @@ -getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> - - - - + getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> + + + + -getOrderItem()->getParentItem()): ?> - getSelectionAttributes($_item) ?> - - -
-   -   -   -   -   -   - - + getOrderItem()->getParentItem()): ?> + getSelectionAttributes($_item) ?> + + +
+ + + - id="order-item-row-getId() ?>"> getOrderItem()->getParentItem()): ?> -

escapeHtml($_item->getName()) ?>

- + + escapeHtml($_item->getName()) ?> + -
getValueHtml($_item) ?>
+ getValueHtml($_item) ?> - escapeHtml($_item->getSku()) ?> - + escapeHtml($_item->getSku()) ?> + canShowPriceInfo($_item)): ?> - helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> - + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + - : + : helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - + + - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getPrice()) ?> - + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?> + + getOrder()->formatPrice($this->getItem()->getPrice()) ?> + - helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> - - -
- - helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?> - + +
+ + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?> + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + - : + : helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?> - - getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?> - + + + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?> + + getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?> + - helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> - - - + +   - + canShowPriceInfo($_item)): ?> getQty()*1 ?>   - + canShowPriceInfo($_item)): ?> - helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> - - helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - : - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> + + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + + + : + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + + + + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + + + - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?> - + getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> + - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - - - - - helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> + helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> - + + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + + :
getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?> +
+

helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?> - + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + - : + : helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> @@ -270,14 +263,14 @@   - + canShowPriceInfo($_item)): ?> getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>   - - + + canShowPriceInfo($_item)): ?> getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?> @@ -288,41 +281,41 @@ - - - getItemOptions()): ?> -
- -
escapeHtml($_option['label']) ?>
- getPrintStatus()): ?> - getFormatedOptionValue($_option) ?> - class="truncated" data-mage-init="{truncateOptions:[]}"> - - -
-
-
escapeHtml($_option['label']) ?>
-
-
-
- - - -
escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?>
+ + + getItemOptions()): ?> +
+ +
escapeHtml($_option['label']) ?>
+ getPrintStatus()): ?> + getFormatedOptionValue($_option) ?> + class="truncated" data-mage-init="{truncateOptions:[]}"> + + +
+
+
escapeHtml($_option['label']) ?>
+
+
+
+ + + +
escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?>
+ + +
- -
- - escapeHtml($_item->getDescription()) ?> - helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> - - - -   -   -   -   -   -   - + escapeHtml($_item->getDescription()) ?> + helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> + + + + + + diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml index dfdadda5c646f..32f782df72e90 100644 --- a/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml +++ b/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -32,321 +30,312 @@ - -getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> - - - - + getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> + + + + -getOrderItem()->getParentItem()): ?> - getSelectionAttributes($_item) ?> - - -
-   -   -   -   - - + getOrderItem()->getParentItem()): ?> + getSelectionAttributes($_item) ?> + + +
+ + + - - id="order-item-row-getId() ?>"> + id="order-item-row-getId() ?>"> getOrderItem()->getParentItem()): ?> -

escapeHtml($_item->getName()) ?>

+ + escapeHtml($_item->getName()) ?> + -
getValueHtml($_item) ?>
+ getValueHtml($_item) ?> - escapeHtml($_item->getSku()) ?> - + escapeHtml($_item->getSku()) ?> + canShowPriceInfo($_item)): ?> - helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> - + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + - : + : helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + + + + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?> - + getOrder()->formatPrice($this->getItem()->getPrice()) ?> - - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getPrice()) ?> - - - helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> - - -
- - helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?> - + +
+ + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?> + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + - : + : helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - - - - - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?> - - getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?> - + + + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?> + + getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?> + - helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> - - - + +   - + canShowPriceInfo($_item)): ?> getQty()*1 ?>   - + canShowPriceInfo($_item)): ?> helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?> - + helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?> helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + - : + : helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + - + + + helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> + getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?> + + getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?> - getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?> - - getOrder()->formatPrice($this->getItem()->getRowTotal()) ?> - - - helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?> - -
diff --git a/app/code/Magento/Catalog/view/adminhtml/product/product.css b/app/code/Magento/Catalog/view/adminhtml/product/product.css index f0c9fcaa03d27..7b8fa7ac9037d 100644 --- a/app/code/Magento/Catalog/view/adminhtml/product/product.css +++ b/app/code/Magento/Catalog/view/adminhtml/product/product.css @@ -27,9 +27,9 @@ [class^=" catalog-product-"] .page-actions .action-back, [class^=" catalog-product-"] .page-actions .action-back:hover, [class^=" catalog-product-"] .page-actions .action-back:active, -[class^=" adminhtml-newsletter-"] .page-actions .action-back, -[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover, -[class^=" adminhtml-newsletter-"] .page-actions .action-back:active { +[class^=" newsletter-"] .page-actions .action-back, +[class^=" newsletter-"] .page-actions .action-back:hover, +[class^=" newsletter-"] .page-actions .action-back:active { overflow: hidden; padding: 5px 6px 3px; margin-left: 12px; @@ -37,17 +37,17 @@ } [class^=" catalog-product-"] .page-actions .action-back:hover, -[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover { +[class^=" newsletter-"] .page-actions .action-back:hover { color: #000; } [class^=" catalog-product-"] .page-actions .action-back.mage-error, -[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error { +[class^=" newsletter-"] .page-actions .action-back.mage-error { color: #b57c72; } [class^=" catalog-product-"] .page-actions .action-back:before, -[class^=" adminhtml-newsletter-"] .page-actions .action-back:before { +[class^=" newsletter-"] .page-actions .action-back:before { display: inline-block; font-family: 'MUI-Icons'; font-style: normal; @@ -59,7 +59,7 @@ } [class^=" catalog-product-"] .page-actions .action-back span, -[class^=" adminhtml-newsletter-"] .page-actions .action-back span { +[class^=" newsletter-"] .page-actions .action-back span { display: inline-block; overflow: hidden; text-indent: -999em; diff --git a/app/code/Magento/Catalog/view/frontend/category/view.phtml b/app/code/Magento/Catalog/view/frontend/category/view.phtml index d576070d0a42d..4a3d1afe7aae0 100644 --- a/app/code/Magento/Catalog/view/frontend/category/view.phtml +++ b/app/code/Magento/Catalog/view/frontend/category/view.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -28,7 +26,7 @@ /** * Category view template * - * @see \Magento\Catalog\Block\Category\View + * @var $this \Magento\Catalog\Block\Category\View */ ?> getCurrentCategory(); $_imgHtml = ''; if ($_imgUrl = $_category->getImageUrl()) { - $_imgHtml = '

'.$this->escapeHtml($_category->getName()).'

'; + $_imgHtml = '
' . $this->escapeHtml($_category->getName()) . '
'; $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image'); } ?> -
-

categoryAttribute($_category, $_category->getName(), 'name') ?>

-
- -getMessagesBlock()->getGroupedHtml() ?> - - - - +
+ + + -getCurrentCategory()->getDescription()): ?> -
- categoryAttribute($_category, $_description, 'description') ?> -
+ getCurrentCategory()->getDescription()): ?> +
+ categoryAttribute($_category, $_description, 'description') ?> +
-isContentMode()): ?> - getCmsBlockHtml() ?> + isContentMode()): ?> + getCmsBlockHtml() ?> -isMixedMode()): ?> - getCmsBlockHtml() ?> - getProductListHtml() ?> + isMixedMode()): ?> + getCmsBlockHtml() ?> + getProductListHtml() ?> - - getProductListHtml() ?> - + + getProductListHtml() ?> + +
diff --git a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml index b41858ab8b394..1f250d2453ebe 100644 --- a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml +++ b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml @@ -18,10 +18,8 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getLinkAttributes() ?>>escapeHtml($this->getAnchorText()) ?> + diff --git a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml index 8c9808693b5b3..cec450787e082 100644 --- a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml +++ b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml @@ -18,10 +18,8 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getLinkAttributes() ?>>escapeHtml($this->getAnchorText()) ?> +getLinkAttributes() ?>>escapeHtml($this->getAnchorText()) ?> diff --git a/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif b/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif deleted file mode 100644 index 3ff818b1b442dd7d99578316d7f0eb090c8e58b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmV-(0F3`fNk%w1VFv&T0J9GO_|2{O%c|{sDEi&U_sFFC-^%^(<@wRG^|_4jl~MGs zd+Tr%|NHs-;mzu21^@s5A^8LW000jFEC2ui00#gH000Ca@JYg?R4&!0mRlOI49+1a VLGd_^fmp01#WD>y@`^tZ06W+)H&_4w diff --git a/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif b/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif deleted file mode 100644 index 3ac3de1ce5e01f145942aaae282835201e3e39ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 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 diff --git a/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg b/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg deleted file mode 100644 index 57dc1534051781fc02def8585a5a8ee586c3d118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14703 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 diff --git a/app/code/Magento/Catalog/view/frontend/js/configurable.js b/app/code/Magento/Catalog/view/frontend/js/configurable.js index 9333c64b8d44f..a4bf7504f6332 100644 --- a/app/code/Magento/Catalog/view/frontend/js/configurable.js +++ b/app/code/Magento/Catalog/view/frontend/js/configurable.js @@ -61,7 +61,7 @@ $(this.options.spConfig.containerId).find(this.options.superSelector) : $(this.options.superSelector); this.options.values = this.options.spConfig.defaultValues || {}; - this.options.parentImage = $('[data-role=base-image]').attr('src'); + this.options.parentImage = $('[data-role=base-image-container] img').attr('src'); }, /** @@ -233,7 +233,7 @@ $.each(imagesArray || {}, function (k, v) { result.push(v); }); - var baseImage = this.element.find('[data-role=base-image]'); + var baseImage = $('[data-role=base-image-container] img'); if (result.length === 1) { baseImage.attr('src', result[0]).trigger('imageChanged', result[0]); } else { @@ -247,7 +247,7 @@ * @private */ _fitImageToContainer: function () { - var image = this.element.find('[data-role=base-image]'), + var image = $('[data-role=base-image-container] img'), imageContainer = image.closest('[data-role=base-image-container]'), width = image.width(), height = image.height(), diff --git a/app/code/Magento/Catalog/view/frontend/js/list.js b/app/code/Magento/Catalog/view/frontend/js/list.js index 6e7b80dd8b0a2..1ed2bc0520771 100644 --- a/app/code/Magento/Catalog/view/frontend/js/list.js +++ b/app/code/Magento/Catalog/view/frontend/js/list.js @@ -26,40 +26,49 @@ (function ($, window) { $.widget('mage.compareList', { _create: function() { - this.element.decorate('table'); - $(this.options.windowCloseSelector).on('click', function() { - window.close(); - }); + var elem = this.element, + products = $('thead td', elem); + + if (products.length > this.options.productsInRow) { + var headings = $('') + .addClass('comparison headings data table') + .insertBefore(elem.closest('.container')); + elem.addClass('scroll'); + + $('th', elem).each(function(){ + var th = $(this), + thCopy = th.clone(); + + th.animate({ + top: '+=0' + }, 50, function(){ + var height; + if ($.browser.mozilla && $.browser.version <= '11.0') { + height = th.outerHeight(); + } + else { + height = th.height(); + } + thCopy.css('height', height) + .appendTo(headings) + .wrap(''); + }); + }); + } $(this.options.windowPrintSelector).on('click', function(e) { e.preventDefault(); window.print(); }); - var ajaxSpinner = $(this.options.ajaxSpinner); - $(this.options.productRemoveSelector).on('click', function(e) { - e.preventDefault(); - $.ajax({ - url: $(e.target).data('url'), - type: 'POST', - beforeSend: function() { - ajaxSpinner.show(); - } - }).done(function() { - ajaxSpinner.hide(); - window.location.reload(); - window.opener.location.reload(); - }); - }); - $.each(this.options.selectors, function(i, selector) { $(selector).on('click', function(e) { e.preventDefault(); - window.opener.focus(); - window.opener.location.href = $(this).data('url'); + window.location.href = $(this).data('url'); }); }); + } }); -})(jQuery, window); +})(jQuery, window); \ No newline at end of file diff --git a/app/code/Magento/Catalog/view/frontend/layer/filter.phtml b/app/code/Magento/Catalog/view/frontend/layer/filter.phtml index 60e8454a97c6e..c94aceb9799ae 100644 --- a/app/code/Magento/Catalog/view/frontend/layer/filter.phtml +++ b/app/code/Magento/Catalog/view/frontend/layer/filter.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -28,20 +26,20 @@ /** * Template for filter items block * - * @see \Magento\Catalog\Block\Layer\Filter + * @var $this \Magento\Catalog\Block\Layer\Filter */ ?> -
    -getItems() as $_item): ?> -
  1. - getCount() > 0): ?> - getLabel() ?> - getLabel() ?> - - shouldDisplayProductCount()): ?> - (getCount() ?>) - -
  2. - +
      + getItems() as $_item): ?> +
    1. + getCount() > 0): ?> + getLabel() ?> + getLabel() ?> + + shouldDisplayProductCount()): ?> + getCount() ?> + +
    2. +
    diff --git a/app/code/Magento/Catalog/view/frontend/layer/state.phtml b/app/code/Magento/Catalog/view/frontend/layer/state.phtml index fa2c878309377..17a44eeef0123 100644 --- a/app/code/Magento/Catalog/view/frontend/layer/state.phtml +++ b/app/code/Magento/Catalog/view/frontend/layer/state.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -33,23 +31,34 @@ ?> getActiveFilters() ?> -
    -

    -
      - -
    1. - getName()) ?>: stripTags($_filter->getLabel()) ?> - + +
        + +
      1. + getName()) ?>: + stripTags($_filter->getLabel()) ?> + getClearLinkUrl(); if ($clearLinkUrl): - ?> - - escapeHtml($_filter->getFilter()->getClearLinkText()) ?> - - - -
      2. - + ?> + + + escapeHtml($_filter->getFilter()->getClearLinkText()) ?> + + + + + + + +
    diff --git a/app/code/Magento/Catalog/view/frontend/layer/view.phtml b/app/code/Magento/Catalog/view/frontend/layer/view.phtml index 411c4564f4070..838bf752f3f34 100644 --- a/app/code/Magento/Catalog/view/frontend/layer/view.phtml +++ b/app/code/Magento/Catalog/view/frontend/layer/view.phtml @@ -18,42 +18,40 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default - * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> + canShowBlock()): ?> -
    -
    - +
    +
    +
    -
    +
    getStateHtml() ?> getLayer()->getState()->getFilters()): ?> -
    +
    + +
    - canShowOptions()): ?> -

    -
    - getFilters() ?> - + +
    + getFilters() ?> + getItemsCount()): ?>
    getName()) ?>
    getHtml() ?>
    - -
    - - + +
    diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml index 0c0ab92140c3d..57788350edba6 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml @@ -24,32 +24,60 @@ */ --> + + + - - empty - 6 - - - one_column - 5 - - - two_columns_left - 4 - - - two_columns_right - 4 - - - three_columns - 3 - product_list_toolbar diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml index b155ed90be56d..dabf708b51975 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml @@ -25,6 +25,6 @@ --> - + diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml index c33e2e17ba9d1..5d2abe78c9cd9 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml @@ -25,6 +25,6 @@ --> - + diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml index 6bc8385465344..e00562d5d779d 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml @@ -24,18 +24,12 @@ */ --> - - - popup.phtml + + + + Compare Products - - - - scriptaculous/scriptaculous.js - - - diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml index c625607f9b2e7..59a46c1af004c 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml @@ -24,69 +24,119 @@ */ --> + + + + product + itemprop="name" + + - - 2columns-right.phtml - + + itemscope itemtype="http://schema.org/Product" + - + + + mage/zoom.js + + + - Magento_Catalog::zoom.css + mage/gallery.css + + + + + + + + + + + + + + + + + + + + + - - - + + + + + getSku + sku + sku + default + itemprop="sku" + + + + + + getShortDescription + short_description + overview + none + Overview + itemprop="description" + + - - - 4 - - - upsell - 4 - + + + + + + + + + + + + - - - - Details - + + + + + getDescription + description + description + none + Details + - - Additional Information - - - - - - - - - - - - - - - - - - - - - - + + Additional Information + - - + + + + related + + + + + upsell + + + diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml index 2bad362d01d06..baf5f2d8391c7 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml @@ -24,11 +24,15 @@ */ --> - - - - + + + type-configurable + + + + + diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml index af3c5a23e151a..e86dc99138ff6 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml @@ -24,9 +24,8 @@ */ --> - - - - - + + + + diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml index 27a22feac4f7e..b39d1f7329a16 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml @@ -24,9 +24,8 @@ */ --> - - - - - + + + + diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml index 635b713c307ad..3f0089174f9d4 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml @@ -24,9 +24,8 @@ */ --> - - - - - + + + + diff --git a/app/code/Magento/Catalog/view/frontend/layout/default.xml b/app/code/Magento/Catalog/view/frontend/layout/default.xml index 61dce0450f1e8..c22c8528c0d92 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/default.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/default.xml @@ -24,36 +24,8 @@ */ --> - - - - Magento_Catalog::widgets.css - - - - - - - Magento_Catalog::images/media/col_left_callout.jpg - - - Our customer service is available 24/7. - - - checkout/cart - - - - - - - Magento_Catalog::images/media/col_right_callout.jpg - - - Look for our special back-to-school items and save bunches! - - + diff --git a/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml b/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml index 06b07bc17cffe..4b0273ddb94d0 100644 --- a/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml +++ b/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -31,32 +29,33 @@ */ ?> helper('Magento\Catalog\Helper\Data')->isMsrpEnabled()): ?> -
- - getItems() as $_item): ?> - - - - - - 2): ?> - - - - getItems() as $_item): ?> - - - - - - - - - - - - getItems() as $_item): ?> - - - - - - - - - getAttributes() as $_attribute): ?> - - - getItems() as $_item): ?> - - - - - - - - - - - - getItems() as $_item): ?> - - - - - - - -
 getRemoveUrl($_item) ?>' class="btn-remove" title="">
  - <?php echo $this->stripTags($_item->getName(), null, true) ?> -

helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?>

- getReviewsSummaryHtml($_item, 'short') ?> - getPriceHtml($_item, true, '-compare-list-top') ?> - isSaleable()): ?> -

- -

- - helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?> - - -
getStoreLabel() ?> - getAttributeCode()) { - case "price": ?> - getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?> - - <?php echo $this->escapeHtml($_item->getName()) ?> - getProductAttributeValue($_item, $_attribute),0,10); - break; - default: ?> -
- helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?> -
- -
  - getPriceHtml($_item, true, '-compare-list-bottom') ?> - isSaleable()): ?> -

- -

- - helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?> - - -
-

- - -
+ + + + getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?> +
+
+ + + + + getItems() as $_item): ?> + + + + + + + + + + + helper('Magento\Catalog\Helper\Output'); ?> + getItems() as $_item): ?> + + + + + + + + + getAttributes() as $_attribute): ?> + + + getItems() as $_item): ?> + + + + + + + + +
  + + + +
  + + + init($_item, 'product_comparison_list')->toHtml() ?> + + + + productAttribute($_item, $_item->getName(), 'name') ?> + + + getReviewsSummaryHtml($_item, 'short') ?> + getPriceHtml($_item, true, '-compare-list-top') ?> +
+
+ isSaleable()): ?> + + + getIsSalable()): ?> +

+ +

+ + +
+ helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?> + + +
+
+ + getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel()) ?> + + +
+ getAttributeCode()) { + case "price": ?> + getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?> + + <?php echo $this->stripTags($_item->getName(), null, true) ?> + + productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?> + +
+
+
+
+ +

diff --git a/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml index 29bc0cfc3ce53..bc3729367539c 100644 --- a/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml +++ b/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml @@ -18,8 +18,6 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design - * @package base_default * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -29,42 +27,54 @@ $_helper = $this->helper('Magento\Catalog\Helper\Product\Compare'); $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null; ?> -
-
- +
+
+ + getItemCount() > 0): ?> - getItemCount()) ?> - - + getItemCount()) ?> + +
-
+
getItemCount() > 0): ?> -
    +
      $_item): ?>
    1. - - -

      helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?>

      + + + + helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?> + + +
    2. - -
    -
    - - + +
+
+
+
- - +

diff --git a/app/code/Magento/Catalog/view/frontend/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/product/gallery.phtml index 6ca9aae68995c..3ed9f34b3703d 100644 --- a/app/code/Magento/Catalog/view/frontend/product/gallery.phtml +++ b/app/code/Magento/Catalog/view/frontend/product/gallery.phtml @@ -27,9 +27,9 @@ getImageWidth(); ?>
- getPreviusImageUrl() || $this->getNextImageUrl()): ?> + getPreviousImageUrl() || $this->getNextImageUrl()): ?>