Version Notes
1.7.0.0
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Interface_Adminhtml_Default |
| Version | 1.7.0.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.6.2.0 to 1.7.0.0
- app/design/adminhtml/default/default/layout/admin.xml +14 -1
- app/design/adminhtml/default/default/layout/adminnotification.xml +1 -1
- app/design/adminhtml/default/default/layout/api2.xml +147 -0
- app/design/adminhtml/default/default/layout/authorizenet.xml +1 -1
- app/design/adminhtml/default/default/layout/bundle.xml +1 -1
- app/design/adminhtml/default/default/layout/captcha.xml +48 -0
- app/design/adminhtml/default/default/layout/catalog.xml +1 -1
- app/design/adminhtml/default/default/layout/cms.xml +1 -1
- app/design/adminhtml/default/default/layout/connect.xml +1 -1
- app/design/adminhtml/default/default/layout/currencysymbol.xml +34 -0
- app/design/adminhtml/default/default/layout/customer.xml +67 -1
- app/design/adminhtml/default/default/layout/dataflow.xml +1 -1
- app/design/adminhtml/default/default/layout/downloadable.xml +1 -1
- app/design/adminhtml/default/default/layout/giftmessage.xml +1 -1
- app/design/adminhtml/default/default/layout/index.xml +1 -1
- app/design/adminhtml/default/default/layout/main.xml +38 -3
- app/design/adminhtml/default/default/layout/newsletter.xml +1 -1
- app/design/adminhtml/default/default/layout/oauth.xml +194 -0
- app/design/adminhtml/default/default/layout/pagecache.xml +1 -1
- app/design/adminhtml/default/default/layout/promo.xml +12 -1
- app/design/adminhtml/default/default/layout/report.xml +21 -1
- app/design/adminhtml/default/default/layout/rss.xml +1 -1
- app/design/adminhtml/default/default/layout/sales.xml +2 -2
- app/design/adminhtml/default/default/layout/search.xml +1 -1
- app/design/adminhtml/default/default/layout/tag.xml +37 -1
- app/design/adminhtml/default/default/layout/widget.xml +2 -2
- app/design/adminhtml/default/default/template/access_denied.phtml +1 -1
- app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +1 -1
- app/design/adminhtml/default/default/template/api/roleinfo.phtml +4 -2
- app/design/adminhtml/default/default/template/api/roles.phtml +2 -2
- app/design/adminhtml/default/default/template/api/rolesedit.phtml +1 -1
- app/design/adminhtml/default/default/template/api/rolesusers.phtml +1 -1
- app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +1 -1
- app/design/adminhtml/default/default/template/api/userinfo.phtml +1 -1
- app/design/adminhtml/default/default/template/api/usernroles.phtml +1 -1
- app/design/adminhtml/default/default/template/api/userroles.phtml +1 -1
- app/design/adminhtml/default/default/template/api/users.phtml +2 -2
- app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml +53 -0
- app/design/adminhtml/default/default/template/api2/attribute/resource.phtml +158 -0
- app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml +59 -0
- app/design/adminhtml/default/default/template/api2/role/buttons.phtml +52 -0
- app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml +122 -0
- app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml +1 -1
- app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml +1 -1
- app/design/adminhtml/default/default/template/backup/dialogs.phtml +164 -0
- app/design/adminhtml/default/default/template/backup/left.phtml +1 -1
- app/design/adminhtml/default/default/template/backup/list.phtml +7 -2
- app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml +4 -3
- app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml +4 -3
- app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml +4 -3
- app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml +4 -3
- app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml +2 -1
- app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml +3 -3
- app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml +1 -1
- app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml +1 -1
- app/design/adminhtml/default/default/template/captcha/zend.phtml +56 -0
- app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/category/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/category/tree.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml +25 -18
- app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml +15 -4
- app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml +3 -3
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml +3 -2
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml +10 -9
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/created.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml +12 -12
- app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml +2 -2
- app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml +2 -2
- app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml +17 -13
- app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml +2 -2
- app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml +169 -0
- app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml +4 -4
- app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml +5 -5
- app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml +29 -26
- app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/js.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/price.phtml +8 -8
- app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml +92 -62
- app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml +1 -1
- app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml +1 -1
- app/design/adminhtml/default/default/template/cms/browser/content.phtml +1 -1
- app/design/adminhtml/default/default/template/cms/browser/content/files.phtml +1 -1
- app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml +1 -1
- app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml +1 -4
- app/design/adminhtml/default/default/template/cms/browser/js.phtml +1 -1
- app/design/adminhtml/default/default/template/cms/browser/tree.phtml +1 -1
- app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml +1 -1
- app/design/adminhtml/default/default/template/coming.phtml +1 -1
- app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml +1 -1
- app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml +1 -1
- app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml +1 -1
- app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml +1 -1
- app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml +1 -1
- app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml +1 -1
- app/design/adminhtml/default/default/template/currencysymbol/grid.phtml +100 -0
- app/design/adminhtml/default/default/template/customer/edit/js.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml +52 -0
- app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/online.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml +52 -0
- app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml +65 -0
- app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +78 -3
- app/design/adminhtml/default/default/template/customer/tab/cart.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/tab/view.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml +1 -1
- app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/graph.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/grid.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/index.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/salebar.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/searches.phtml +1 -1
- app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml +3 -2
- app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +1 -1
- app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml +1 -1
- app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml +4 -3
- app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml +1 -1
- app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +4 -4
- app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml +3 -3
- app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml +2 -2
- app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml +2 -2
- app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml +2 -2
- app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +1 -1
- app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +1 -1
- app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +1 -1
- app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +1 -1
- app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +1 -1
- app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml +1 -1
- app/design/adminhtml/default/default/template/email/order/items.phtml +1 -1
- app/design/adminhtml/default/default/template/empty.phtml +42 -0
- app/design/adminhtml/default/default/template/example.phtml +1 -1
- app/design/adminhtml/default/default/template/forgotpassword.phtml +4 -2
- app/design/adminhtml/default/default/template/formkey.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/form.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/helper.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/popup.phtml +3 -3
- app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml +1 -1
- app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml +1 -1
- app/design/adminhtml/default/default/template/googlebase/captcha.phtml +1 -1
- app/design/adminhtml/default/default/template/googlebase/items.phtml +1 -1
- app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +1 -1
- app/design/adminhtml/default/default/template/importexport/busy.phtml +1 -1
- app/design/adminhtml/default/default/template/importexport/export/form/after.phtml +2 -2
- app/design/adminhtml/default/default/template/importexport/export/form/before.phtml +5 -3
- app/design/adminhtml/default/default/template/importexport/import/form/after.phtml +1 -1
- app/design/adminhtml/default/default/template/importexport/import/form/before.phtml +1 -1
- app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml +1 -1
- app/design/adminhtml/default/default/template/index/notifications.phtml +1 -1
- app/design/adminhtml/default/default/template/login.phtml +3 -1
- app/design/adminhtml/default/default/template/media/editor.phtml +4 -5
- app/design/adminhtml/default/default/template/media/uploader.phtml +4 -6
- app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml +2 -2
- app/design/adminhtml/default/default/template/newsletter/preview/store.phtml +3 -2
- app/design/adminhtml/default/default/template/newsletter/problem/list.phtml +3 -3
- app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/newsletter/queue/list.phtml +1 -1
- app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml +1 -1
- app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml +2 -2
- app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/newsletter/template/list.phtml +2 -2
- app/design/adminhtml/default/default/template/newsletter/template/preview.phtml +1 -1
- app/design/adminhtml/default/default/template/notification/baseurl.phtml +1 -1
- app/design/adminhtml/default/default/template/notification/security.phtml +1 -1
- app/design/adminhtml/default/default/template/notification/survey.phtml +1 -1
- app/design/adminhtml/default/default/template/notification/toolbar.phtml +3 -11
- app/design/adminhtml/default/default/template/notification/window.phtml +1 -1
- app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml +62 -0
- app/design/adminhtml/default/default/template/oauth/authorize/button.phtml +59 -0
- app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml +52 -0
- app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml +46 -0
- app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml +77 -0
- app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml +67 -0
- app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml +50 -0
- app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml +47 -0
- app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml +44 -0
- app/design/adminhtml/default/default/template/overlay_popup.phtml +1 -1
- app/design/adminhtml/default/default/template/page.phtml +2 -2
- app/design/adminhtml/default/default/template/page/footer.phtml +1 -1
- app/design/adminhtml/default/default/template/page/head.phtml +0 -3
- app/design/adminhtml/default/default/template/page/header.phtml +1 -1
- app/design/adminhtml/default/default/template/page/js/calendar.phtml +1 -1
- app/design/adminhtml/default/default/template/page/js/translate.phtml +10 -6
- app/design/adminhtml/default/default/template/page/menu.phtml +3 -16
- app/design/adminhtml/default/default/template/page/notices.phtml +2 -2
- app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml +1 -1
- app/design/adminhtml/default/default/template/paygate/form/cc.phtml +1 -1
- app/design/adminhtml/default/default/template/paygate/info/cc.phtml +1 -1
- app/design/adminhtml/default/default/template/paygate/info/pdf.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/form/cc.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/form/checkmo.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml +41 -0
- app/design/adminhtml/default/default/template/payment/info/checkmo.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/info/default.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml +1 -1
- app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml +1 -1
- app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml +3 -3
- app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml +1 -1
- app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml +1 -1
- app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml +1 -1
- app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml +1 -1
- app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml +1 -1
- app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml +15 -18
- app/design/adminhtml/default/default/template/permissions/roleinfo.phtml +2 -2
- app/design/adminhtml/default/default/template/permissions/roles.phtml +2 -2
- app/design/adminhtml/default/default/template/permissions/rolesedit.phtml +1 -1
- app/design/adminhtml/default/default/template/permissions/rolesusers.phtml +1 -1
- app/design/adminhtml/default/default/template/permissions/userinfo.phtml +1 -1
- app/design/adminhtml/default/default/template/permissions/usernroles.phtml +1 -1
- app/design/adminhtml/default/default/template/permissions/userroles.phtml +1 -1
- app/design/adminhtml/default/default/template/permissions/users.phtml +2 -2
- app/design/adminhtml/default/default/template/poll/answers/list.phtml +2 -2
- app/design/adminhtml/default/default/template/popup.phtml +1 -1
- app/design/adminhtml/default/default/template/promo/fieldset.phtml +1 -1
- app/design/adminhtml/default/default/template/promo/form.phtml +1 -1
- app/design/adminhtml/default/default/template/promo/js.phtml +11 -9
- app/design/adminhtml/default/default/template/promo/salesrulejs.phtml +114 -0
- app/design/adminhtml/default/default/template/rating/detailed.phtml +1 -1
- app/design/adminhtml/default/default/template/rating/options.phtml +1 -1
- app/design/adminhtml/default/default/template/rating/stars/detailed.phtml +1 -1
- app/design/adminhtml/default/default/template/rating/stars/summary.phtml +1 -1
- app/design/adminhtml/default/default/template/report/grid.phtml +1 -1
- app/design/adminhtml/default/default/template/report/grid/container.phtml +3 -1
- app/design/adminhtml/default/default/template/report/refresh/statistics.phtml +1 -1
- app/design/adminhtml/default/default/template/report/store/switcher.phtml +3 -2
- app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml +6 -5
- app/design/adminhtml/default/default/template/report/wishlist.phtml +1 -1
- app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +2 -2
- app/design/adminhtml/default/default/template/review/add.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/items/column/name.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/items/column/qty.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/address/form.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/comments/view.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/create/comment.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/create/data.phtml +3 -1
- app/design/adminhtml/default/default/template/sales/order/create/form.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +15 -6
- app/design/adminhtml/default/default/template/sales/order/create/js.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml +10 -8
- app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml +4 -1
- app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml +26 -20
- app/design/adminhtml/default/default/template/sales/order/create/totals.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +16 -17
- app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +1 -2
- app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +16 -17
- app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +1 -2
- app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +17 -17
- app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +1 -2
- app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml +6 -3
- app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml +1 -2
- app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml +1 -2
- app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml +6 -8
- app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml +5 -5
- app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml +7 -7
- app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml +2 -2
- app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml +8 -10
- app/design/adminhtml/default/default/template/sales/order/totalbar.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals.phtml +20 -20
- app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/due.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/item.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/main.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +3 -3
- app/design/adminhtml/default/default/template/sales/order/view/form.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/view/history.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/view/info.phtml +3 -3
- app/design/adminhtml/default/default/template/sales/order/view/items.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml +8 -5
- app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +3 -2
- app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml +12 -11
- app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml +1 -1
- app/design/adminhtml/default/default/template/sales/transactions/detail.phtml +1 -1
- app/design/adminhtml/default/default/template/store/switcher.phtml +18 -17
- app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml +3 -2
- app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml +63 -0
- app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml +50 -0
- app/design/adminhtml/default/default/template/system/autocomplete.phtml +1 -1
- app/design/adminhtml/default/default/template/system/cache/additional.phtml +3 -3
- app/design/adminhtml/default/default/template/system/cache/edit.phtml +3 -3
- app/design/adminhtml/default/default/template/system/cache/notifications.phtml +1 -1
- app/design/adminhtml/default/default/template/system/config/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/system/config/form/field/array.phtml +5 -5
- app/design/adminhtml/default/default/template/system/config/js.phtml +2 -7
- app/design/adminhtml/default/default/template/system/config/switcher.phtml +31 -4
- app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml +1 -1
- app/design/adminhtml/default/default/template/system/config/tabs.phtml +1 -1
- app/design/adminhtml/default/default/template/system/convert/profile/process.phtml +1 -1
- app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml +1 -1
- app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml +2 -2
- app/design/adminhtml/default/default/template/system/currency/rate/services.phtml +1 -1
- app/design/adminhtml/default/default/template/system/currency/rates.phtml +1 -1
- app/design/adminhtml/default/default/template/system/design/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/system/design/index.phtml +1 -1
- app/design/adminhtml/default/default/template/system/email/template/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/system/email/template/list.phtml +1 -1
- app/design/adminhtml/default/default/template/system/email/template/preview.phtml +1 -1
- app/design/adminhtml/default/default/template/system/info.phtml +1 -1
- app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml +1 -1
- app/design/adminhtml/default/default/template/system/shipping/ups.phtml +98 -125
- app/design/adminhtml/default/default/template/system/variable/js.phtml +1 -1
- app/design/adminhtml/default/default/template/tag/edit/container.phtml +1 -1
- app/design/adminhtml/default/default/template/tag/index.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/class/page/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/importExport.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/rate/form.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/rate/title.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml +2 -2
- app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml +1 -1
- app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml +2 -2
- app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml +1 -1
- app/design/adminhtml/default/default/template/urlrewrite/categories.phtml +1 -1
- app/design/adminhtml/default/default/template/urlrewrite/edit.phtml +1 -1
- app/design/adminhtml/default/default/template/urlrewrite/selector.phtml +1 -1
- app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml +53 -0
- app/design/adminhtml/default/default/template/weee/renderer/tax.phtml +3 -3
- app/design/adminhtml/default/default/template/widget/accordion.phtml +3 -3
- app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form/container.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form/element.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/grid.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/grid/container.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/grid/massaction.phtml +5 -1
- app/design/adminhtml/default/default/template/widget/grid/serializer.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml +56 -24
- app/design/adminhtml/default/default/template/widget/instance/js.phtml +10 -10
- app/design/adminhtml/default/default/template/widget/tabs.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/tabshoriz.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/tabsleft.phtml +1 -1
- app/design/adminhtml/default/default/template/widget/view/container.phtml +1 -1
- package.xml +6 -6
- skin/adminhtml/default/default/boxes.css +81 -16
- skin/adminhtml/default/default/iestyles.css +6 -3
- skin/adminhtml/default/default/images/btn_gr_bg.gif +0 -0
- skin/adminhtml/default/default/images/btn_gr_on.gif +0 -0
- skin/adminhtml/default/default/images/btn_gr_over.gif +0 -0
- skin/adminhtml/default/default/images/btn_loading-icon.gif +0 -0
- skin/adminhtml/default/default/images/i_question-mark.png +0 -0
- skin/adminhtml/default/default/images/login_box_bg_auth.jpg +0 -0
- skin/adminhtml/default/default/images/reload.png +0 -0
- skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css +39 -0
- skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif +0 -0
- skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif +0 -0
- skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif +0 -0
- skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png +0 -0
- skin/adminhtml/default/default/oauth-simple.css +239 -0
app/design/adminhtml/default/default/layout/admin.xml
CHANGED
|
@@ -21,12 +21,25 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 28 |
Â
|
| 29 |
Â
<layout>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 30 |
Â
<!-- admin acl roles grid page -->
|
| 31 |
Â
<adminhtml_permissions_role_index>
|
| 32 |
Â
<reference name="content">
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 28 |
Â
|
| 29 |
Â
<layout>
|
| 30 |
+
<!-- admin acl users edit page -->
|
| 31 |
+
<adminhtml_permissions_user_edit>
|
| 32 |
+
<reference name="left">
|
| 33 |
+
<block type="adminhtml/permissions_user_edit_tabs" name="adminhtml.permissions.user.edit.tabs"/>
|
| 34 |
+
</reference>
|
| 35 |
+
<reference name="content">
|
| 36 |
+
<block type="adminhtml/permissions_user_edit" name="adminhtml.permissions.user.edit"/>
|
| 37 |
+
</reference>
|
| 38 |
+
<reference name="js">
|
| 39 |
+
<block type="adminhtml/template" name="adminhtml.permissions.user.roles.grid.js" template="permissions/user_roles_grid_js.phtml"/>
|
| 40 |
+
</reference>
|
| 41 |
+
</adminhtml_permissions_user_edit>
|
| 42 |
+
|
| 43 |
Â
<!-- admin acl roles grid page -->
|
| 44 |
Â
<adminhtml_permissions_role_index>
|
| 45 |
Â
<reference name="content">
|
app/design/adminhtml/default/default/layout/adminnotification.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/api2.xml
ADDED
|
@@ -0,0 +1,147 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design
|
| 23 |
+
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
-->
|
| 28 |
+
<layout>
|
| 29 |
+
<adminhtml_api2_role_index>
|
| 30 |
+
<reference name="content">
|
| 31 |
+
<block type="api2/adminhtml_roles" name="api2_roles"/>
|
| 32 |
+
</reference>
|
| 33 |
+
</adminhtml_api2_role_index>
|
| 34 |
+
|
| 35 |
+
<adminhtml_api2_role_new>
|
| 36 |
+
<reference name="left">
|
| 37 |
+
<block type="api2/adminhtml_roles_tabs" name="adminhtml.role.edit.tabs">
|
| 38 |
+
<block type="api2/adminhtml_roles_tab_info" name="adminhtml.role.edit.tab.info"/>
|
| 39 |
+
<block type="api2/adminhtml_roles_tab_resources" name="adminhtml.role.edit.tab.resources" template="permissions/rolesedit.phtml"/>
|
| 40 |
+
<action method="addTab">
|
| 41 |
+
<id>api2_role_section_info</id>
|
| 42 |
+
<block>adminhtml.role.edit.tab.info</block>
|
| 43 |
+
</action>
|
| 44 |
+
<action method="addTab">
|
| 45 |
+
<id>api2_role_section_resources</id>
|
| 46 |
+
<block>adminhtml.role.edit.tab.resources</block>
|
| 47 |
+
</action>
|
| 48 |
+
</block>
|
| 49 |
+
</reference>
|
| 50 |
+
<reference name="content">
|
| 51 |
+
<block type="api2/adminhtml_roles_buttons" name="adminhtml.roles.buttons"/>
|
| 52 |
+
</reference>
|
| 53 |
+
<reference name="head">
|
| 54 |
+
<action method="setCanLoadExtJs">
|
| 55 |
+
<flag>1</flag>
|
| 56 |
+
</action>
|
| 57 |
+
</reference>
|
| 58 |
+
</adminhtml_api2_role_new>
|
| 59 |
+
|
| 60 |
+
<adminhtml_api2_role_edit>
|
| 61 |
+
<reference name="left">
|
| 62 |
+
<block type="api2/adminhtml_roles_tabs" name="adminhtml.role.edit.tabs">
|
| 63 |
+
<block type="api2/adminhtml_roles_tab_info" name="adminhtml.role.edit.tab.info"/>
|
| 64 |
+
<block type="api2/adminhtml_roles_tab_resources" name="adminhtml.role.edit.tab.resources" template="permissions/rolesedit.phtml"/>
|
| 65 |
+
<block type="api2/adminhtml_roles_tab_users" name="adminhtml.role.edit.tab.users"/>
|
| 66 |
+
<action method="addTab">
|
| 67 |
+
<id>api2_role_section_info</id>
|
| 68 |
+
<block>adminhtml.role.edit.tab.info</block>
|
| 69 |
+
</action>
|
| 70 |
+
<action method="addTab">
|
| 71 |
+
<id>api2_role_section_resources</id>
|
| 72 |
+
<block>adminhtml.role.edit.tab.resources</block>
|
| 73 |
+
</action>
|
| 74 |
+
<action method="addTab">
|
| 75 |
+
<id>roleUsersGrid</id>
|
| 76 |
+
<block>adminhtml.role.edit.tab.users</block>
|
| 77 |
+
</action>
|
| 78 |
+
</block>
|
| 79 |
+
</reference>
|
| 80 |
+
<reference name="content">
|
| 81 |
+
<block type="api2/adminhtml_roles_buttons" name="adminhtml.roles.buttons"/>
|
| 82 |
+
</reference>
|
| 83 |
+
<reference name="head">
|
| 84 |
+
<action method="setCanLoadExtJs">
|
| 85 |
+
<flag>1</flag>
|
| 86 |
+
</action>
|
| 87 |
+
</reference>
|
| 88 |
+
<reference name="js">
|
| 89 |
+
<block type="adminhtml/template" name="adminhtml.role.js.users.grid" template="api2/role/users_grid_js.phtml"/>
|
| 90 |
+
</reference>
|
| 91 |
+
</adminhtml_api2_role_edit>
|
| 92 |
+
|
| 93 |
+
<adminhtml_api2_role_grid>
|
| 94 |
+
<remove name="root"/>
|
| 95 |
+
<block type="api2/adminhtml_roles_grid" name="api2_roles.grid" output="toHtml"/>
|
| 96 |
+
</adminhtml_api2_role_grid>
|
| 97 |
+
|
| 98 |
+
<adminhtml_api2_role_usersgrid>
|
| 99 |
+
<remove name="root"/>
|
| 100 |
+
<block type="api2/adminhtml_roles_tab_users" name="adminhtml.role.edit.tab.users" output="toHtml"/>
|
| 101 |
+
</adminhtml_api2_role_usersgrid>
|
| 102 |
+
|
| 103 |
+
<!-- admin acl users edit page -->
|
| 104 |
+
<adminhtml_permissions_user_edit>
|
| 105 |
+
<reference name="adminhtml.permissions.user.edit.tabs">
|
| 106 |
+
<block type="api2/adminhtml_permissions_user_edit_tab_roles" name="adminhtml.permissions.user.edit.tab.roles"/>
|
| 107 |
+
<action method="addTabAfter">
|
| 108 |
+
<id>api2_roles_section</id>
|
| 109 |
+
<block>adminhtml.permissions.user.edit.tab.roles</block>
|
| 110 |
+
<after>roles_section</after>
|
| 111 |
+
</action>
|
| 112 |
+
</reference>
|
| 113 |
+
<reference name="js">
|
| 114 |
+
<block type="adminhtml/template" name="adminhtml.permissions.user.edit.tab.roles.js" template="api2/permissions/user/edit/tab/roles/js.phtml"/>
|
| 115 |
+
</reference>
|
| 116 |
+
</adminhtml_permissions_user_edit>
|
| 117 |
+
|
| 118 |
+
<!-- ACL attributes -->
|
| 119 |
+
<adminhtml_api2_attribute_index>
|
| 120 |
+
<reference name="content">
|
| 121 |
+
<block type="api2/adminhtml_attribute" name="api2.attribute"/>
|
| 122 |
+
</reference>
|
| 123 |
+
</adminhtml_api2_attribute_index>
|
| 124 |
+
|
| 125 |
+
<adminhtml_api2_attribute_edit>
|
| 126 |
+
<reference name="left">
|
| 127 |
+
<block type="api2/adminhtml_attribute_tabs" name="api2.attribute.edit.tabs">
|
| 128 |
+
<block type="api2/adminhtml_attribute_tab_resource" name="api2.attribute.tab.resource" template="api2/attribute/resource.phtml"/>
|
| 129 |
+
<action method="addTab">
|
| 130 |
+
<name>api2_attribute_section_resources</name>
|
| 131 |
+
<block>api2.attribute.tab.resource</block>
|
| 132 |
+
</action>
|
| 133 |
+
</block>
|
| 134 |
+
</reference>
|
| 135 |
+
<reference name="content">
|
| 136 |
+
<block type="api2/adminhtml_attribute_edit" name="edit_form">
|
| 137 |
+
<block type="api2/adminhtml_attribute_edit_form" name="form"/>
|
| 138 |
+
</block>
|
| 139 |
+
</reference>
|
| 140 |
+
<reference name="head">
|
| 141 |
+
<action method="setCanLoadExtJs">
|
| 142 |
+
<flag>1</flag>
|
| 143 |
+
</action>
|
| 144 |
+
</reference>
|
| 145 |
+
</adminhtml_api2_attribute_edit>
|
| 146 |
+
<!-- EOF ACL attributes -->
|
| 147 |
+
</layout>
|
app/design/adminhtml/default/default/layout/authorizenet.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
|
app/design/adminhtml/default/default/layout/bundle.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/captcha.xml
ADDED
|
@@ -0,0 +1,48 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design
|
| 23 |
+
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
|
| 28 |
+
-->
|
| 29 |
+
<layout version="0.1.0">
|
| 30 |
+
<adminhtml_index_login>
|
| 31 |
+
<reference name="form.additional.info">
|
| 32 |
+
<block type="captcha/captcha" name="captcha">
|
| 33 |
+
<action method="setFormId"><formId>backend_login</formId></action>
|
| 34 |
+
<action method="setImgWidth"><width>226</width></action>
|
| 35 |
+
<action method="setImgHeight"><width>50</width></action>
|
| 36 |
+
</block>
|
| 37 |
+
</reference>
|
| 38 |
+
</adminhtml_index_login>
|
| 39 |
+
<adminhtml_index_forgotpassword>
|
| 40 |
+
<reference name="form.additional.info">
|
| 41 |
+
<block type="captcha/captcha" name="captcha">
|
| 42 |
+
<action method="setFormId"><formId>backend_forgotpassword</formId></action>
|
| 43 |
+
<action method="setImgWidth"><width>226</width></action>
|
| 44 |
+
<action method="setImgHeight"><width>50</width></action>
|
| 45 |
+
</block>
|
| 46 |
+
</reference>
|
| 47 |
+
</adminhtml_index_forgotpassword>
|
| 48 |
+
</layout>
|
app/design/adminhtml/default/default/layout/catalog.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/cms.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/connect.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/currencysymbol.xml
ADDED
|
@@ -0,0 +1,34 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design
|
| 23 |
+
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
-->
|
| 28 |
+
<layout>
|
| 29 |
+
<adminhtml_system_currencysymbol_index>
|
| 30 |
+
<reference name="content">
|
| 31 |
+
<block type="currencysymbol/adminhtml_system_currencysymbol" name="mage.system.currencysymbol" template="currencysymbol/grid.phtml"/>
|
| 32 |
+
</reference>
|
| 33 |
+
</adminhtml_system_currencysymbol_index>
|
| 34 |
+
</layout>
|
app/design/adminhtml/default/default/layout/customer.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
|
@@ -57,4 +57,70 @@
|
|
| 57 |
Â
<adminhtml_customer_wishlist>
|
| 58 |
Â
<block type="adminhtml/customer_edit_tab_wishlist" name="customer.wishlist.edit.tab" output="toHtml" />
|
| 59 |
Â
</adminhtml_customer_wishlist>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 60 |
Â
</layout>
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 57 |
Â
<adminhtml_customer_wishlist>
|
| 58 |
Â
<block type="adminhtml/customer_edit_tab_wishlist" name="customer.wishlist.edit.tab" output="toHtml" />
|
| 59 |
Â
</adminhtml_customer_wishlist>
|
| 60 |
+
|
| 61 |
+
<adminhtml_customer_orders>
|
| 62 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 63 |
+
<block type="adminhtml/customer_edit_tab_orders" name="adminhtml.customer.edit.tab.orders"/>
|
| 64 |
+
</block>
|
| 65 |
+
</adminhtml_customer_orders>
|
| 66 |
+
|
| 67 |
+
<adminhtml_customer_carts>
|
| 68 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 69 |
+
<block type="adminhtml/customer_edit_tab_carts" name="admin.customer.carts"/>
|
| 70 |
+
</block>
|
| 71 |
+
</adminhtml_customer_carts>
|
| 72 |
+
|
| 73 |
+
<adminhtml_customer_viewcart>
|
| 74 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 75 |
+
<block type="adminhtml/customer_edit_tab_view_cart" name="admin.customer.view.cart"/>
|
| 76 |
+
</block>
|
| 77 |
+
</adminhtml_customer_viewcart>
|
| 78 |
+
|
| 79 |
+
<adminhtml_customer_viewwishlist>
|
| 80 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 81 |
+
<block type="adminhtml/customer_edit_tab_view_wishlist" name="admin.customer.view.wishlist"/>
|
| 82 |
+
</block>
|
| 83 |
+
</adminhtml_customer_viewwishlist>
|
| 84 |
+
|
| 85 |
+
<adminhtml_customer_lastorders>
|
| 86 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 87 |
+
<block type="adminhtml/customer_edit_tab_view_orders" name="admin.customer.lastorders"/>
|
| 88 |
+
</block>
|
| 89 |
+
</adminhtml_customer_lastorders>
|
| 90 |
+
|
| 91 |
+
<adminhtml_customer_productreviews>
|
| 92 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 93 |
+
<block type="adminhtml/customer_edit_tab_reviews" name="admin.customer.reviews"/>
|
| 94 |
+
</block>
|
| 95 |
+
</adminhtml_customer_productreviews>
|
| 96 |
+
|
| 97 |
+
<adminhtml_customer_producttags>
|
| 98 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 99 |
+
<block type="adminhtml/customer_edit_tab_tag" name="admin.customer.tags"/>
|
| 100 |
+
</block>
|
| 101 |
+
</adminhtml_customer_producttags>
|
| 102 |
+
|
| 103 |
+
<adminhtml_customer_taggrid>
|
| 104 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 105 |
+
<block type="adminhtml/customer_edit_tab_tag" name="admin.customer.tags"/>
|
| 106 |
+
</block>
|
| 107 |
+
</adminhtml_customer_taggrid>
|
| 108 |
+
|
| 109 |
+
<adminhtml_customer_newsletter>
|
| 110 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 111 |
+
<block type="adminhtml/customer_edit_tab_newsletter_grid" name="admin.customer.newsletter.grid"/>
|
| 112 |
+
</block>
|
| 113 |
+
</adminhtml_customer_newsletter>
|
| 114 |
+
|
| 115 |
+
<adminhtml_customer_grid>
|
| 116 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 117 |
+
<block type="adminhtml/customer_grid" name="admin.customer.grid"/>
|
| 118 |
+
</block>
|
| 119 |
+
</adminhtml_customer_grid>
|
| 120 |
+
|
| 121 |
+
<adminhtml_customer_cart>
|
| 122 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 123 |
+
<block type="adminhtml/customer_edit_tab_cart" name="admin.customer.view.edit.cart" />
|
| 124 |
+
</block>
|
| 125 |
+
</adminhtml_customer_cart>
|
| 126 |
Â
</layout>
|
app/design/adminhtml/default/default/layout/dataflow.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/downloadable.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/giftmessage.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/index.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/main.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
|
|
@@ -56,6 +56,7 @@ Default layout, loads most of the pages
|
|
| 56 |
Â
<block type="adminhtml/page_head" name="head" as="head" template="page/head.phtml">
|
| 57 |
Â
<action method="setTitle" translate="title"><title>Magento Admin</title></action>
|
| 58 |
Â
<action method="addJs"><script>prototype/prototype.js</script></action>
|
|
Â
|
|
| 59 |
Â
<action method="addJs"><script>prototype/window.js</script></action>
|
| 60 |
Â
<action method="addJs"><script>scriptaculous/builder.js</script></action>
|
| 61 |
Â
<action method="addJs"><script>scriptaculous/effects.js</script></action>
|
|
@@ -123,6 +124,8 @@ Default layout, loads most of the pages
|
|
| 123 |
Â
|
| 124 |
Â
<!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in Mage_Core_Model_Layout::createBlock() -->
|
| 125 |
Â
<block type="core/template" name="formkey" as="formkey" template="formkey.phtml"/>
|
|
Â
|
|
|
Â
|
|
| 126 |
Â
<block type="page/js_translate" name="js_translate" as="js_translate" template="page/js/translate.phtml"/>
|
| 127 |
Â
<block type="core/text_list" name="left" as="left"/>
|
| 128 |
Â
<block type="core/text_list" name="content" as="content"/>
|
|
@@ -173,7 +176,7 @@ Layout for editor element
|
|
| 173 |
Â
<action method="addJs"><script>mage/adminhtml/browser.js</script></action>
|
| 174 |
Â
<action method="addJs"><script>prototype/window.js</script></action>
|
| 175 |
Â
<action method="addItem"><type>js_css</type><name>prototype/windows/themes/default.css</name></action>
|
| 176 |
-
<action method="
|
| 177 |
Â
</reference>
|
| 178 |
Â
</editor>
|
| 179 |
Â
|
|
@@ -247,10 +250,42 @@ Base preview layout
|
|
| 247 |
Â
</block>
|
| 248 |
Â
</systemPreview>
|
| 249 |
Â
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 250 |
Â
<!--
|
| 251 |
Â
Empty hanle for ajax response etc.
|
| 252 |
Â
-->
|
| 253 |
Â
<empty>
|
| 254 |
Â
</empty>
|
| 255 |
-
|
| 256 |
Â
</layout>
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
|
| 56 |
Â
<block type="adminhtml/page_head" name="head" as="head" template="page/head.phtml">
|
| 57 |
Â
<action method="setTitle" translate="title"><title>Magento Admin</title></action>
|
| 58 |
Â
<action method="addJs"><script>prototype/prototype.js</script></action>
|
| 59 |
+
<action method="addItem"><type>js</type><name>extjs/fix-defer-before.js</name><params/><if/><condition>can_load_ext_js</condition></action>
|
| 60 |
Â
<action method="addJs"><script>prototype/window.js</script></action>
|
| 61 |
Â
<action method="addJs"><script>scriptaculous/builder.js</script></action>
|
| 62 |
Â
<action method="addJs"><script>scriptaculous/effects.js</script></action>
|
| 124 |
Â
|
| 125 |
Â
<!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in Mage_Core_Model_Layout::createBlock() -->
|
| 126 |
Â
<block type="core/template" name="formkey" as="formkey" template="formkey.phtml"/>
|
| 127 |
+
|
| 128 |
+
<!-- deprecated since 1.7.0.0 see Mage_Page_Block_Js_Translate -->
|
| 129 |
Â
<block type="page/js_translate" name="js_translate" as="js_translate" template="page/js/translate.phtml"/>
|
| 130 |
Â
<block type="core/text_list" name="left" as="left"/>
|
| 131 |
Â
<block type="core/text_list" name="content" as="content"/>
|
| 176 |
Â
<action method="addJs"><script>mage/adminhtml/browser.js</script></action>
|
| 177 |
Â
<action method="addJs"><script>prototype/window.js</script></action>
|
| 178 |
Â
<action method="addItem"><type>js_css</type><name>prototype/windows/themes/default.css</name></action>
|
| 179 |
+
<action method="addCss"><name>lib/prototype/windows/themes/magento.css</name></action>
|
| 180 |
Â
</reference>
|
| 181 |
Â
</editor>
|
| 182 |
Â
|
| 250 |
Â
</block>
|
| 251 |
Â
</systemPreview>
|
| 252 |
Â
|
| 253 |
+
<adminhtml_dashboard_customersmost>
|
| 254 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 255 |
+
<block type="adminhtml/dashboard_tab_customers_most" name="adminhtml.dashboard.tab.customers.most"/>
|
| 256 |
+
</block>
|
| 257 |
+
</adminhtml_dashboard_customersmost>
|
| 258 |
+
|
| 259 |
+
<adminhtml_dashboard_customersnewest>
|
| 260 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 261 |
+
<block type="adminhtml/dashboard_tab_customers_newest" name="adminhtml.dashboard.tab.customers.newest"/>
|
| 262 |
+
</block>
|
| 263 |
+
</adminhtml_dashboard_customersnewest>
|
| 264 |
+
|
| 265 |
+
<adminhtml_dashboard_productsviewed>
|
| 266 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 267 |
+
<block type="adminhtml/dashboard_tab_products_viewed" name="adminhtml.dashboard.tab.products.viewed"/>
|
| 268 |
+
</block>
|
| 269 |
+
</adminhtml_dashboard_productsviewed>
|
| 270 |
+
|
| 271 |
+
<adminhtml_index_login>
|
| 272 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 273 |
+
<block type="adminhtml/template" name="content" template="login.phtml">
|
| 274 |
+
<block type="core/text_list" name="form.additional.info" />
|
| 275 |
+
</block>
|
| 276 |
+
</block>
|
| 277 |
+
</adminhtml_index_login>
|
| 278 |
+
|
| 279 |
+
<adminhtml_index_forgotpassword>
|
| 280 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 281 |
+
<block type="adminhtml/template" name="content" template="forgotpassword.phtml">
|
| 282 |
+
<block type="core/text_list" name="form.additional.info" />
|
| 283 |
+
</block>
|
| 284 |
+
</block>
|
| 285 |
+
</adminhtml_index_forgotpassword>
|
| 286 |
Â
<!--
|
| 287 |
Â
Empty hanle for ajax response etc.
|
| 288 |
Â
-->
|
| 289 |
Â
<empty>
|
| 290 |
Â
</empty>
|
|
Â
|
|
| 291 |
Â
</layout>
|
app/design/adminhtml/default/default/layout/newsletter.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/oauth.xml
ADDED
|
@@ -0,0 +1,194 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design
|
| 23 |
+
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
-->
|
| 28 |
+
<layout>
|
| 29 |
+
<!-- Consumers -->
|
| 30 |
+
<adminhtml_oauth_consumer_index>
|
| 31 |
+
<reference name="content">
|
| 32 |
+
<block type="oauth/adminhtml_oauth_consumer" name="oauth_consumer"/>
|
| 33 |
+
</reference>
|
| 34 |
+
</adminhtml_oauth_consumer_index>
|
| 35 |
+
|
| 36 |
+
<adminhtml_oauth_consumer_grid>
|
| 37 |
+
<remove name="root"/>
|
| 38 |
+
<block type="oauth/adminhtml_oauth_consumer_grid" name="oauth_consumer.grid" output="toHtml"/>
|
| 39 |
+
</adminhtml_oauth_consumer_grid>
|
| 40 |
+
|
| 41 |
+
<adminhtml_oauth_consumer_new>
|
| 42 |
+
<reference name="content">
|
| 43 |
+
<block type="oauth/adminhtml_oauth_consumer_edit" name="oauth_consumer.edit">
|
| 44 |
+
<block type="oauth/adminhtml_oauth_consumer_edit_form" name="form"/>
|
| 45 |
+
</block>
|
| 46 |
+
</reference>
|
| 47 |
+
</adminhtml_oauth_consumer_new>
|
| 48 |
+
|
| 49 |
+
<adminhtml_oauth_consumer_edit>
|
| 50 |
+
<reference name="content">
|
| 51 |
+
<block type="oauth/adminhtml_oauth_consumer_edit" name="oauth_consumer.edit">
|
| 52 |
+
<block type="oauth/adminhtml_oauth_consumer_edit_form" name="form"/>
|
| 53 |
+
</block>
|
| 54 |
+
</reference>
|
| 55 |
+
</adminhtml_oauth_consumer_edit>
|
| 56 |
+
<!-- EOF Consumers -->
|
| 57 |
+
|
| 58 |
+
<!-- My Applications -->
|
| 59 |
+
<adminhtml_oauth_admin_token_index>
|
| 60 |
+
<reference name="content">
|
| 61 |
+
<block type="oauth/adminhtml_oauth_admin_token" name="oauth_admin_token"/>
|
| 62 |
+
</reference>
|
| 63 |
+
</adminhtml_oauth_admin_token_index>
|
| 64 |
+
|
| 65 |
+
<adminhtml_oauth_admin_token_grid>
|
| 66 |
+
<remove name="root"/>
|
| 67 |
+
<block type="oauth/adminhtml_oauth_admin_token_grid" name="oauth_admin_token.grid" output="toHtml"/>
|
| 68 |
+
</adminhtml_oauth_admin_token_grid>
|
| 69 |
+
<!-- EOF My Applications -->
|
| 70 |
+
|
| 71 |
+
|
| 72 |
+
|
| 73 |
+
<oauth_root_handle>
|
| 74 |
+
<reference name="root">
|
| 75 |
+
<action method="setTemplate">
|
| 76 |
+
<template>empty.phtml</template>
|
| 77 |
+
</action>
|
| 78 |
+
</reference>
|
| 79 |
+
<reference name="head">
|
| 80 |
+
<action method="removeItem"><type>js</type><name>scriptaculous/controls.js</name></action>
|
| 81 |
+
<action method="removeItem"><type>js</type><name>prototype/window.js</name></action>
|
| 82 |
+
<action method="removeItem"><type>js</type><name>scriptaculous/builder.js</name></action>
|
| 83 |
+
<action method="removeItem"><type>js</type><name>scriptaculous/dragdrop.js</name></action>
|
| 84 |
+
<action method="removeItem"><type>js</type><name>scriptaculous/controls.js</name></action>
|
| 85 |
+
<action method="removeItem"><type>js</type><name>scriptaculous/slider.js</name></action>
|
| 86 |
+
<action method="removeItem"><type>js</type><name>lib/ccard.js</name></action>
|
| 87 |
+
<action method="removeItem"><type>js</type><name>varien/js.js</name></action>
|
| 88 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/hash.js</name></action>
|
| 89 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/events.js</name></action>
|
| 90 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/loader.js</name></action>
|
| 91 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/grid.js</name></action>
|
| 92 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/tabs.js</name></action>
|
| 93 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/accordion.js</name></action>
|
| 94 |
+
<!-- <action method="removeItem"><type>js</type><name>mage/adminhtml/tools.js</name></action>-->
|
| 95 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/uploader.js</name></action>
|
| 96 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/product.js</name></action>
|
| 97 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/rules.js</name></action>
|
| 98 |
+
<action method="removeItem"><type>js</type><name>mage/adminhtml/wysiwyg/tiny_mce/setup.js</name></action>
|
| 99 |
+
<action method="removeItem"><type>js</type><name>lib/ds-sleight.js</name></action>
|
| 100 |
+
<action method="removeItem"><type>js</type><name>varien/iehover-fix.js</name></action>
|
| 101 |
+
|
| 102 |
+
<action method="removeItem"><type>css</type><name>print.css</name></action>
|
| 103 |
+
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>
|
| 104 |
+
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ext-all.css</name></action>
|
| 105 |
+
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ytheme-magento.css</name></action>
|
| 106 |
+
<action method="removeItem"><type>skin_css</type><name>menu.css</name></action>
|
| 107 |
+
|
| 108 |
+
<action method="removeItem"><type>js</type><name>calendar/calendar.js</name></action>
|
| 109 |
+
<action method="removeItem"><type>js</type><name>calendar/calendar-setup.js</name></action>
|
| 110 |
+
<action method="removeItem"><type>js</type><name>extjs/fix-defer-before.js</name></action>
|
| 111 |
+
<action method="removeItem"><type>js</type><name>extjs/ext-tree.js</name></action>
|
| 112 |
+
<action method="removeItem"><type>js</type><name>extjs/fix-defer.js</name></action>
|
| 113 |
+
<action method="removeItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name></action>
|
| 114 |
+
</reference>
|
| 115 |
+
</oauth_root_handle>
|
| 116 |
+
|
| 117 |
+
<oauth_root_handle_simple>
|
| 118 |
+
<remove name="js_cookie" />
|
| 119 |
+
<block type="adminhtml/page" name="root" output="toHtml" template="empty.phtml">
|
| 120 |
+
<block type="adminhtml/page_head" name="head" as="head" template="oauth/authorize/head-simple.phtml">
|
| 121 |
+
<action method="addCss"><name>oauth-simple.css</name></action>
|
| 122 |
+
</block>
|
| 123 |
+
<block type="core/text_list" name="content"/>
|
| 124 |
+
</block>
|
| 125 |
+
</oauth_root_handle_simple>
|
| 126 |
+
|
| 127 |
+
<!-- Authorize -->
|
| 128 |
+
<!--Handle for simple pages-->
|
| 129 |
+
<adminhtml_oauth_authorize_index translate="label">
|
| 130 |
+
<update handle="oauth_root_handle"/>
|
| 131 |
+
<label>OAuth authorization for admin</label>
|
| 132 |
+
<reference name="content">
|
| 133 |
+
<block type="oauth/adminhtml_oauth_authorize" name="oauth.authorize.form" template="oauth/authorize/form/login.phtml"/>
|
| 134 |
+
<block type="oauth/adminhtml_oauth_authorize_button" name="oauth.authorize.button" template="oauth/authorize/button.phtml" />
|
| 135 |
+
</reference>
|
| 136 |
+
</adminhtml_oauth_authorize_index>
|
| 137 |
+
|
| 138 |
+
<adminhtml_oauth_authorize_simple translate="label">
|
| 139 |
+
<update handle="oauth_root_handle_simple"/>
|
| 140 |
+
<label>OAuth authorization simple for admin</label>
|
| 141 |
+
<reference name="content">
|
| 142 |
+
<block type="oauth/adminhtml_oauth_authorize" name="oauth.authorize.form" template="oauth/authorize/form/login-simple.phtml"/>
|
| 143 |
+
<block type="oauth/adminhtml_oauth_authorize_button" name="oauth.authorize.button" template="oauth/authorize/button-simple.phtml" />
|
| 144 |
+
</reference>
|
| 145 |
+
</adminhtml_oauth_authorize_simple>
|
| 146 |
+
<!-- EOF Authorize -->
|
| 147 |
+
|
| 148 |
+
<!-- Confirm Authorization -->
|
| 149 |
+
<adminhtml_oauth_authorize_confirm translate="label">
|
| 150 |
+
<update handle="oauth_root_handle"/>
|
| 151 |
+
<label>Confirm token authorization for admin</label>
|
| 152 |
+
<reference name="content">
|
| 153 |
+
<block type="core/template" name="oauth.authorize.confirm" template="oauth/authorize/confirm.phtml" />
|
| 154 |
+
</reference>
|
| 155 |
+
</adminhtml_oauth_authorize_confirm>
|
| 156 |
+
|
| 157 |
+
<adminhtml_oauth_authorize_confirmsimple translate="label">
|
| 158 |
+
<update handle="oauth_root_handle_simple"/>
|
| 159 |
+
<label>Confirm token authorization Pop Up for admin</label>
|
| 160 |
+
<reference name="content">
|
| 161 |
+
<block type="core/template" name="oauth.authorize.confirm" template="oauth/authorize/confirm-simple.phtml" />
|
| 162 |
+
</reference>
|
| 163 |
+
</adminhtml_oauth_authorize_confirmsimple>
|
| 164 |
+
<!-- EOF Confirm Authorization -->
|
| 165 |
+
|
| 166 |
+
<!-- Reject Authorization -->
|
| 167 |
+
<adminhtml_oauth_authorize_reject translate="label">
|
| 168 |
+
<update handle="oauth_root_handle"/>
|
| 169 |
+
<label>Reject token authorization for admin</label>
|
| 170 |
+
<reference name="content">
|
| 171 |
+
<block type="core/template" name="oauth.authorize.reject" template="oauth/authorize/reject.phtml" />
|
| 172 |
+
</reference>
|
| 173 |
+
</adminhtml_oauth_authorize_reject>
|
| 174 |
+
|
| 175 |
+
<adminhtml_oauth_authorize_rejectsimple translate="label">
|
| 176 |
+
<update handle="oauth_root_handle_simple"/>
|
| 177 |
+
<label>Reject token authorization Pop Up for admin</label>
|
| 178 |
+
<reference name="content">
|
| 179 |
+
<block type="core/template" name="oauth.authorize.reject" template="oauth/authorize/reject-simple.phtml" />
|
| 180 |
+
</reference>
|
| 181 |
+
</adminhtml_oauth_authorize_rejectsimple>
|
| 182 |
+
<!-- EOF Reject Authorization -->
|
| 183 |
+
|
| 184 |
+
<adminhtml_oauth_authorizedtokens_index>
|
| 185 |
+
<reference name="content">
|
| 186 |
+
<block type="oauth/adminhtml_oauth_authorizedTokens" name="oauth_authorizedTokens"/>
|
| 187 |
+
</reference>
|
| 188 |
+
</adminhtml_oauth_authorizedtokens_index>
|
| 189 |
+
|
| 190 |
+
<adminhtml_oauth_authorizedtokens_grid>
|
| 191 |
+
<remove name="root"/>
|
| 192 |
+
<block type="oauth/adminhtml_oauth_authorizedTokens_grid" name="oauth_authorizedTokens.grid" output="toHtml"/>
|
| 193 |
+
</adminhtml_oauth_authorizedtokens_grid>
|
| 194 |
+
</layout>
|
app/design/adminhtml/default/default/layout/pagecache.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/promo.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
|
@@ -73,11 +73,17 @@
|
|
| 73 |
Â
<block type="adminhtml/promo_quote_edit_tab_conditions" name="promo_quote_edit_tab_conditions"/>
|
| 74 |
Â
<block type="adminhtml/promo_quote_edit_tab_actions" name="promo_quote_edit_tab_actions"/>
|
| 75 |
Â
<block type="adminhtml/promo_quote_edit_tab_labels" name="promo_quote_edit_tab_labels"/>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 76 |
Â
<action method="addTab"><name>main_section</name><block>promo_quote_edit_tab_main</block></action>
|
| 77 |
Â
<action method="addTab"><name>conditions_section</name><block>promo_quote_edit_tab_conditions</block></action>
|
| 78 |
Â
<action method="addTab"><name>actions_section</name><block>promo_quote_edit_tab_actions</block></action>
|
| 79 |
Â
<action method="addTab"><name>labels_section</name><block>promo_quote_edit_tab_labels</block></action>
|
|
Â
|
|
| 80 |
Â
</block>
|
|
Â
|
|
| 81 |
Â
</reference>
|
| 82 |
Â
<reference name="content">
|
| 83 |
Â
<block type="adminhtml/promo_quote_edit" name="promo_quote_edit"></block>
|
|
@@ -87,4 +93,9 @@
|
|
| 87 |
Â
<remove name="root" />
|
| 88 |
Â
<block type="adminhtml/promo_quote_edit_tab_product" name="promo_quote_grid" output="toHtml" />
|
| 89 |
Â
</adminhtml_promo_quote_grid>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 90 |
Â
</layout>
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 73 |
Â
<block type="adminhtml/promo_quote_edit_tab_conditions" name="promo_quote_edit_tab_conditions"/>
|
| 74 |
Â
<block type="adminhtml/promo_quote_edit_tab_actions" name="promo_quote_edit_tab_actions"/>
|
| 75 |
Â
<block type="adminhtml/promo_quote_edit_tab_labels" name="promo_quote_edit_tab_labels"/>
|
| 76 |
+
<block type="adminhtml/promo_quote_edit_tab_coupons" name="promo_quote_edit_tab_coupons">
|
| 77 |
+
<block type="adminhtml/promo_quote_edit_tab_coupons_form" name="promo_quote_edit_tab_coupons_form"/>
|
| 78 |
+
<block type="adminhtml/promo_quote_edit_tab_coupons_grid" name="promo_quote_edit_tab_coupons_grid"/>
|
| 79 |
+
</block>
|
| 80 |
Â
<action method="addTab"><name>main_section</name><block>promo_quote_edit_tab_main</block></action>
|
| 81 |
Â
<action method="addTab"><name>conditions_section</name><block>promo_quote_edit_tab_conditions</block></action>
|
| 82 |
Â
<action method="addTab"><name>actions_section</name><block>promo_quote_edit_tab_actions</block></action>
|
| 83 |
Â
<action method="addTab"><name>labels_section</name><block>promo_quote_edit_tab_labels</block></action>
|
| 84 |
+
<action method="addTab"><name>coupons_section</name><block>promo_quote_edit_tab_coupons</block></action>
|
| 85 |
Â
</block>
|
| 86 |
+
<block type="adminhtml/template" template="promo/salesrulejs.phtml" name="promo_quote_edit_jsinit"/>
|
| 87 |
Â
</reference>
|
| 88 |
Â
<reference name="content">
|
| 89 |
Â
<block type="adminhtml/promo_quote_edit" name="promo_quote_edit"></block>
|
| 93 |
Â
<remove name="root" />
|
| 94 |
Â
<block type="adminhtml/promo_quote_edit_tab_product" name="promo_quote_grid" output="toHtml" />
|
| 95 |
Â
</adminhtml_promo_quote_grid>
|
| 96 |
+
<adminhtml_promo_quote_couponsgrid>
|
| 97 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 98 |
+
<block type="adminhtml/promo_quote_edit_tab_coupons_grid" name="promo_quote_edit_tab_coupons_grid" />
|
| 99 |
+
</block>
|
| 100 |
+
</adminhtml_promo_quote_couponsgrid>
|
| 101 |
Â
</layout>
|
app/design/adminhtml/default/default/layout/report.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
|
@@ -32,4 +32,24 @@
|
|
| 32 |
Â
<block type="adminhtml/report_refresh_statistics" template="report/refresh/statistics.phtml" name="sales.report.refreshstatistics" />
|
| 33 |
Â
</reference>
|
| 34 |
Â
</adminhtml_report_statistics_index>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 35 |
Â
</layout>
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 32 |
Â
<block type="adminhtml/report_refresh_statistics" template="report/refresh/statistics.phtml" name="sales.report.refreshstatistics" />
|
| 33 |
Â
</reference>
|
| 34 |
Â
</adminhtml_report_statistics_index>
|
| 35 |
+
<adminhtml_report_product_viewed>
|
| 36 |
+
<reference name="messages">
|
| 37 |
+
<action method="addNotice" translate="message">
|
| 38 |
+
<message>This report depends on timezone configuration. Once timezone is changed, the lifetime statistics need to be refreshed.</message>
|
| 39 |
+
</action>
|
| 40 |
+
</reference>
|
| 41 |
+
<reference name="content">
|
| 42 |
+
<block type="adminhtml/report_product_viewed" template="report/grid/container.phtml" name="product.report.grid.container">
|
| 43 |
+
<block type="adminhtml/store_switcher" template="report/store/switcher/enhanced.phtml" name="store.switcher">
|
| 44 |
+
<action method="setStoreVarName"><var_name>store_ids</var_name></action>
|
| 45 |
+
</block>
|
| 46 |
+
<block type="adminhtml/report_filter_form" name="grid.filter.form">
|
| 47 |
+
<action method="setFieldVisibility">
|
| 48 |
+
<field>report_type</field>
|
| 49 |
+
<visibility>0</visibility>
|
| 50 |
+
</action>
|
| 51 |
+
</block>
|
| 52 |
+
</block>
|
| 53 |
+
</reference>
|
| 54 |
+
</adminhtml_report_product_viewed>
|
| 55 |
Â
</layout>
|
app/design/adminhtml/default/default/layout/rss.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/sales.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
|
@@ -924,7 +924,7 @@
|
|
| 924 |
Â
<block type="adminhtml/store_switcher" template="report/store/switcher/enhanced.phtml" name="store.switcher">
|
| 925 |
Â
<action method="setStoreVarName"><var_name>store_ids</var_name></action>
|
| 926 |
Â
</block>
|
| 927 |
-
<block type="sales/
|
| 928 |
Â
<action method="addReportTypeOption" translate="value">
|
| 929 |
Â
<key>created_at_order</key>
|
| 930 |
Â
<value>Order Created Date</value>
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 924 |
Â
<block type="adminhtml/store_switcher" template="report/store/switcher/enhanced.phtml" name="store.switcher">
|
| 925 |
Â
<action method="setStoreVarName"><var_name>store_ids</var_name></action>
|
| 926 |
Â
</block>
|
| 927 |
+
<block type="sales/adminhtml_report_filter_form_coupon" name="grid.filter.form">
|
| 928 |
Â
<action method="addReportTypeOption" translate="value">
|
| 929 |
Â
<key>created_at_order</key>
|
| 930 |
Â
<value>Order Created Date</value>
|
app/design/adminhtml/default/default/layout/search.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
app/design/adminhtml/default/default/layout/tag.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
|
@@ -49,4 +49,40 @@
|
|
| 49 |
Â
<remove name="root" />
|
| 50 |
Â
<block type="adminhtml/tag_assigned_grid" name="assigned_grid" output="toHtml" />
|
| 51 |
Â
</adminhtml_tag_assignedgridonly>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 52 |
Â
</layout>
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 49 |
Â
<remove name="root" />
|
| 50 |
Â
<block type="adminhtml/tag_assigned_grid" name="assigned_grid" output="toHtml" />
|
| 51 |
Â
</adminhtml_tag_assignedgridonly>
|
| 52 |
+
|
| 53 |
+
<adminhtml_tag_index>
|
| 54 |
+
<reference name="content">
|
| 55 |
+
<block type="adminhtml/tag_tag" name="adminhtml.tag.tag"/>
|
| 56 |
+
</reference>
|
| 57 |
+
</adminhtml_tag_index>
|
| 58 |
+
|
| 59 |
+
<adminhtml_tag_pending>
|
| 60 |
+
<reference name="content">
|
| 61 |
+
<block type="adminhtml/tag_pending" name="adminhtml.tag.pending"/>
|
| 62 |
+
</reference>
|
| 63 |
+
</adminhtml_tag_pending>
|
| 64 |
+
|
| 65 |
+
<adminhtml_tag_ajaxgrid>
|
| 66 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 67 |
+
<block type="adminhtml/tag_tag_grid" name="adminhtml.tag.tag.grid"/>
|
| 68 |
+
</block>
|
| 69 |
+
</adminhtml_tag_ajaxgrid>
|
| 70 |
+
|
| 71 |
+
<adminhtml_tag_ajaxpendinggrid>
|
| 72 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 73 |
+
<block type="adminhtml/tag_grid_pending" name="adminhtml.tag.grid.pending"/>
|
| 74 |
+
</block>
|
| 75 |
+
</adminhtml_tag_ajaxpendinggrid>
|
| 76 |
+
|
| 77 |
+
<adminhtml_tag_product>
|
| 78 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 79 |
+
<block type="adminhtml/tag_product_grid" name="adminhtml.tag.product.grid"/>
|
| 80 |
+
</block>
|
| 81 |
+
</adminhtml_tag_product>
|
| 82 |
+
|
| 83 |
+
<adminhtml_tag_customer>
|
| 84 |
+
<block type="core/text_list" name="root" output="toHtml">
|
| 85 |
+
<block type="adminhtml/tag_customer_grid" name="adminhtml.tag.customer.grid"/>
|
| 86 |
+
</block>
|
| 87 |
+
</adminhtml_tag_customer>
|
| 88 |
Â
</layout>
|
app/design/adminhtml/default/default/layout/widget.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
-
* @copyright Copyright (c)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
|
@@ -47,7 +47,7 @@
|
|
| 47 |
Â
<action method="addJs"><script>mage/adminhtml/wysiwyg/widget.js</script></action>
|
| 48 |
Â
<action method="addItem"><type>js</type><name>prototype/window.js</name></action>
|
| 49 |
Â
<action method="addItem"><type>js_css</type><name>prototype/windows/themes/default.css</name></action>
|
| 50 |
-
<action method="
|
| 51 |
Â
</reference>
|
| 52 |
Â
<reference name="content">
|
| 53 |
Â
<block type="widget/adminhtml_widget_instance_edit" name="widget_instance_edit" />
|
| 21 |
Â
*
|
| 22 |
Â
* @category design
|
| 23 |
Â
* @package default_default
|
| 24 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 25 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
Â
*/
|
| 27 |
Â
-->
|
| 47 |
Â
<action method="addJs"><script>mage/adminhtml/wysiwyg/widget.js</script></action>
|
| 48 |
Â
<action method="addItem"><type>js</type><name>prototype/window.js</name></action>
|
| 49 |
Â
<action method="addItem"><type>js_css</type><name>prototype/windows/themes/default.css</name></action>
|
| 50 |
+
<action method="addCss"><name>lib/prototype/windows/themes/magento.css</name></action>
|
| 51 |
Â
</reference>
|
| 52 |
Â
<reference name="content">
|
| 53 |
Â
<block type="widget/adminhtml_widget_instance_edit" name="widget_instance_edit" />
|
app/design/adminhtml/default/default/template/access_denied.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/roleinfo.phtml
CHANGED
|
@@ -20,14 +20,16 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
|
Â
|
|
|
Â
|
|
| 26 |
Â
?>
|
| 27 |
Â
<div class="content-header">
|
| 28 |
Â
<table cellspacing="0">
|
| 29 |
Â
<tr>
|
| 30 |
-
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo ($this->getRoleId() > 0 ) ? ($this->__('Edit Role') . " '{$this->getRoleInfo()->getRoleName()}'") : $this->__('Add New Role') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
Â
<?php echo $this->getBackButtonHtml() ?>
|
| 33 |
Â
<?php echo $this->getResetButtonHtml() ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
+
/** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */
|
| 27 |
+
|
| 28 |
Â
?>
|
| 29 |
Â
<div class="content-header">
|
| 30 |
Â
<table cellspacing="0">
|
| 31 |
Â
<tr>
|
| 32 |
+
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo ($this->getRoleId() > 0 ) ? ($this->__('Edit Role') . " '{$this->escapeHtml($this->getRoleInfo()->getRoleName())}'") : $this->__('Add New Role') ?></h3></td>
|
| 33 |
Â
<td class="form-buttons">
|
| 34 |
Â
<?php echo $this->getBackButtonHtml() ?>
|
| 35 |
Â
<?php echo $this->getResetButtonHtml() ?>
|
app/design/adminhtml/default/default/template/api/roles.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo $this->__('Roles') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
-
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><?php echo $this->__('Add New Role') ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo $this->__('Roles') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
+
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><span><span><?php echo $this->__('Add New Role') ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/api/rolesedit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/rolesusers.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/userinfo.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/usernroles.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/userroles.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/api/users.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3><?php echo $this->__('Users') ?></h3></td>
|
| 31 |
Â
<td class="a-right">
|
| 32 |
-
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><?php echo $this->__('Add New User') ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3><?php echo $this->__('Users') ?></h3></td>
|
| 31 |
Â
<td class="a-right">
|
| 32 |
+
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><span><span><?php echo $this->__('Add New User') ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
/** @var $this Mage_Api2_Block_Adminhtml_Attribute_Buttons */
|
| 27 |
+
|
| 28 |
+
?>
|
| 29 |
+
<div class="content-header">
|
| 30 |
+
<table cellspacing="0">
|
| 31 |
+
<tr>
|
| 32 |
+
<td style="width:50%;">
|
| 33 |
+
<h3 class="icon-head head-permissions-role">
|
| 34 |
+
<?php echo $this->getCaption() ?>
|
| 35 |
+
</h3>
|
| 36 |
+
</td>
|
| 37 |
+
<td class="form-buttons">
|
| 38 |
+
<?php echo $this->getBackButtonHtml() ?>
|
| 39 |
+
<?php echo $this->getResetButtonHtml() ?>
|
| 40 |
+
<?php echo $this->getDeleteButtonHtml() ?>
|
| 41 |
+
<?php echo $this->getSaveButtonHtml() ?>
|
| 42 |
+
</td>
|
| 43 |
+
</tr>
|
| 44 |
+
</table>
|
| 45 |
+
</div>
|
| 46 |
+
<form action="<?php echo $this->getUrl('*/*/save') ?>" method="post" id="role_edit_form">
|
| 47 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 48 |
+
</form>
|
| 49 |
+
<script type="text/javascript">
|
| 50 |
+
//<![CDATA[
|
| 51 |
+
var roleForm = new varienForm('role_edit_form');
|
| 52 |
+
//]]>
|
| 53 |
+
</script>
|
app/design/adminhtml/default/default/template/api2/attribute/resource.phtml
ADDED
|
@@ -0,0 +1,158 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
|
| 28 |
+
<?php
|
| 29 |
+
/**
|
| 30 |
+
* @see Mage_Api2_Block_Adminhtml_Attribute_Tab_Resource
|
| 31 |
+
*/
|
| 32 |
+
?>
|
| 33 |
+
|
| 34 |
+
<?php echo $this->getChildHtml(); ?>
|
| 35 |
+
|
| 36 |
+
<div class="entry-edit">
|
| 37 |
+
<div class="entry-edit-head">
|
| 38 |
+
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('User Type Resources') ?></h4>
|
| 39 |
+
</div>
|
| 40 |
+
<input type="hidden" name="resource" id="role_resources" value="" />
|
| 41 |
+
<fieldset id="role_resources">
|
| 42 |
+
|
| 43 |
+
<span class="field-row">
|
| 44 |
+
<label for="all"><?php echo $this->__('Resource Access') ?></label>
|
| 45 |
+
<select id="all" name="all" onchange="$('resources_container').toggle()" class="select">
|
| 46 |
+
<option value="0" <?php echo ($this->getEverythingAllowed()?'':'selected'); ?>><?php echo $this->__('Custom') ?></option>
|
| 47 |
+
<option value="1" <?php echo ($this->getEverythingAllowed()?'selected':''); ?>><?php echo $this->__('All') ?></option>
|
| 48 |
+
</select>
|
| 49 |
+
</span>
|
| 50 |
+
|
| 51 |
+
<span class="field-row" id="resources_container">
|
| 52 |
+
<label><?php echo $this->__('Resources') ?></label>
|
| 53 |
+
<div class="f-left">
|
| 54 |
+
<div class="tree x-tree" id="resource-tree"></div>
|
| 55 |
+
</div>
|
| 56 |
+
<?php if ($this->hasEntityOnlyAttributes()): ?>
|
| 57 |
+
<div class="clear"></div>
|
| 58 |
+
<span>* This attribute data will be returned for a single resource only.</span>
|
| 59 |
+
<?php endif; ?>
|
| 60 |
+
</span>
|
| 61 |
+
|
| 62 |
+
</fieldset>
|
| 63 |
+
</div>
|
| 64 |
+
<!-- Draw Resources Tree -->
|
| 65 |
+
<script type="text/javascript">
|
| 66 |
+
//<![CDATA[
|
| 67 |
+
<?php if($this->getEverythingAllowed()): ?>
|
| 68 |
+
$('resources_container').hide();
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
Ext.EventManager.onDocumentReady(function() {
|
| 71 |
+
var tree = new Ext.tree.TreePanel('resource-tree', {
|
| 72 |
+
animate:false,
|
| 73 |
+
loader: false,
|
| 74 |
+
enableDD:false,
|
| 75 |
+
containerScroll: true,
|
| 76 |
+
rootUIProvider: Ext.tree.CheckboxNodeUI,
|
| 77 |
+
selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
|
| 78 |
+
rootVisible: false
|
| 79 |
+
});
|
| 80 |
+
|
| 81 |
+
tree.on('check', checkHandler, tree);
|
| 82 |
+
|
| 83 |
+
// set the root node
|
| 84 |
+
var root = new Ext.tree.TreeNode({
|
| 85 |
+
text: 'root',
|
| 86 |
+
draggable:false,
|
| 87 |
+
checked:'false',
|
| 88 |
+
id:'__root__',
|
| 89 |
+
uiProvider: Ext.tree.CheckboxNodeUI
|
| 90 |
+
});
|
| 91 |
+
|
| 92 |
+
tree.setRootNode(root);
|
| 93 |
+
bildResourcesTree(root, <?php echo $this->getResTreeJson() ?>);
|
| 94 |
+
tree.addListener('click', resourceClick.createDelegate(this));
|
| 95 |
+
|
| 96 |
+
// render the tree
|
| 97 |
+
tree.render();
|
| 98 |
+
// root.expand();
|
| 99 |
+
tree.expandAll();
|
| 100 |
+
|
| 101 |
+
$('role_resources').value = tree.getChecked().join(',');
|
| 102 |
+
});
|
| 103 |
+
|
| 104 |
+
function resourceClick(node, e){
|
| 105 |
+
node.getUI().check(!node.getUI().checked());
|
| 106 |
+
varienElementMethods.setHasChanges(Event.element(e), e);
|
| 107 |
+
};
|
| 108 |
+
|
| 109 |
+
function bildResourcesTree(parent, config){
|
| 110 |
+
if (!config) return null;
|
| 111 |
+
|
| 112 |
+
if (parent && config && config.length){
|
| 113 |
+
for (var i = 0; i < config.length; i++){
|
| 114 |
+
config[i].uiProvider = Ext.tree.CheckboxNodeUI;
|
| 115 |
+
var node = new Ext.tree.TreeNode(config[i]);
|
| 116 |
+
parent.appendChild(node);
|
| 117 |
+
if(config[i].children){
|
| 118 |
+
bildResourcesTree(node, config[i].children);
|
| 119 |
+
}
|
| 120 |
+
}
|
| 121 |
+
}
|
| 122 |
+
}
|
| 123 |
+
|
| 124 |
+
function checkHandler(node)
|
| 125 |
+
{
|
| 126 |
+
if ( node.attributes.checked && node.parentNode ) {
|
| 127 |
+
var n = node.parentNode;
|
| 128 |
+
this.removeListener('check', checkHandler);
|
| 129 |
+
do {
|
| 130 |
+
if (!n || n.attributes.id == 'admin' || n.attributes.id == '__root__') {
|
| 131 |
+
break;
|
| 132 |
+
} else {
|
| 133 |
+
n.ui.check(true);
|
| 134 |
+
}
|
| 135 |
+
} while (n = n.parentNode );
|
| 136 |
+
this.on('check', checkHandler);
|
| 137 |
+
}
|
| 138 |
+
if ( !node.isLeaf() && node.hasChildNodes() ) {
|
| 139 |
+
this.removeListener('check', checkHandler);
|
| 140 |
+
processChildren(node, node.attributes.checked);
|
| 141 |
+
this.on('check', checkHandler);
|
| 142 |
+
}
|
| 143 |
+
$('role_resources').value = this.getChecked().join(',');
|
| 144 |
+
}
|
| 145 |
+
|
| 146 |
+
function processChildren(node, state)
|
| 147 |
+
{
|
| 148 |
+
if ( !node.hasChildNodes() ) return false;
|
| 149 |
+
for(var i = 0; i < node.childNodes.length; i++ ) {
|
| 150 |
+
node.childNodes[i].ui.check(state);
|
| 151 |
+
if ( node.childNodes[i].hasChildNodes() ) {
|
| 152 |
+
processChildren(node.childNodes[i], state);
|
| 153 |
+
}
|
| 154 |
+
}
|
| 155 |
+
return true;
|
| 156 |
+
}
|
| 157 |
+
//]]>
|
| 158 |
+
</script>
|
app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
|
| 28 |
+
<script type="text/javascript">
|
| 29 |
+
//<![CDATA[
|
| 30 |
+
var activeRestRole = getActiveRestRole();
|
| 31 |
+
|
| 32 |
+
/* Retrieve current active rest role */
|
| 33 |
+
function getActiveRestRole() {
|
| 34 |
+
var role;
|
| 35 |
+
api2_roles_sectionJsObject.rows.each(function(row) {
|
| 36 |
+
var radiobox = $(row).getElementsByClassName('radio')[0];
|
| 37 |
+
if ('undefined' != typeof radiobox && radiobox.checked) {
|
| 38 |
+
role = radiobox;
|
| 39 |
+
}
|
| 40 |
+
});
|
| 41 |
+
return role;
|
| 42 |
+
}
|
| 43 |
+
|
| 44 |
+
/* Callback function for rest role row click */
|
| 45 |
+
function restRolesRowClick(grid, event) {
|
| 46 |
+
var newRestRole = getActiveRestRole();
|
| 47 |
+
if (newRestRole.value !== activeRestRole.value) {
|
| 48 |
+
if (!confirm("Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?") ) {
|
| 49 |
+
newRestRole.checked = !newRestRole.checked;
|
| 50 |
+
activeRestRole.checked = true;
|
| 51 |
+
} else {
|
| 52 |
+
activeRestRole = newRestRole;
|
| 53 |
+
}
|
| 54 |
+
}
|
| 55 |
+
}
|
| 56 |
+
|
| 57 |
+
api2_roles_sectionJsObject.rowClickCallback = restRolesRowClick;
|
| 58 |
+
//]]>
|
| 59 |
+
</script>
|
app/design/adminhtml/default/default/template/api2/role/buttons.phtml
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php /** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */ ?>
|
| 28 |
+
<div class="content-header">
|
| 29 |
+
<table cellspacing="0">
|
| 30 |
+
<tr>
|
| 31 |
+
<td style="width:50%;">
|
| 32 |
+
<h3 class="icon-head head-permissions-role">
|
| 33 |
+
<?php echo $this->getCaption() ?>
|
| 34 |
+
</h3>
|
| 35 |
+
</td>
|
| 36 |
+
<td class="form-buttons">
|
| 37 |
+
<?php echo $this->getBackButtonHtml() ?>
|
| 38 |
+
<?php echo $this->getResetButtonHtml() ?>
|
| 39 |
+
<?php echo $this->getDeleteButtonHtml() ?>
|
| 40 |
+
<?php echo $this->getSaveButtonHtml() ?>
|
| 41 |
+
</td>
|
| 42 |
+
</tr>
|
| 43 |
+
</table>
|
| 44 |
+
</div>
|
| 45 |
+
<form action="<?php echo $this->getUrl('*/*/save') ?>" method="post" id="role_edit_form">
|
| 46 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 47 |
+
</form>
|
| 48 |
+
<script type="text/javascript">
|
| 49 |
+
//<![CDATA[
|
| 50 |
+
var roleForm = new varienForm('role_edit_form');
|
| 51 |
+
//]]>
|
| 52 |
+
</script>
|
app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml
ADDED
|
@@ -0,0 +1,122 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
?>
|
| 28 |
+
<script type="text/javascript">
|
| 29 |
+
//<![CDATA[
|
| 30 |
+
<?php
|
| 31 |
+
/** @var $myBlock Mage_Api2_Block_Adminhtml_Roles_Tab_Users */
|
| 32 |
+
$myBlock = $this->getLayout()->getBlock('adminhtml.role.edit.tab.users');
|
| 33 |
+
$name = $myBlock->getJsObjectName();
|
| 34 |
+
?>
|
| 35 |
+
<?php if (is_object($myBlock) && $name && !$myBlock->isHidden()): ?>
|
| 36 |
+
var checkBoxes = $H(<?php echo $myBlock->getUsers(true) ?>);
|
| 37 |
+
var warning = false;
|
| 38 |
+
if (checkBoxes.size() > 0) {
|
| 39 |
+
warning = true;
|
| 40 |
+
}
|
| 41 |
+
$('in_role_users').value = checkBoxes.toQueryString();
|
| 42 |
+
|
| 43 |
+
function registerUserRole(grid, element, checked)
|
| 44 |
+
{
|
| 45 |
+
if (checked) {
|
| 46 |
+
checkBoxes.set(element.value, 0);
|
| 47 |
+
} else {
|
| 48 |
+
checkBoxes.unset(element.value);
|
| 49 |
+
}
|
| 50 |
+
$('in_role_users').value = checkBoxes.toQueryString();
|
| 51 |
+
grid.reloadParams = {'in_role_users[]':checkBoxes.keys()};
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
function roleUsersRowClick(grid, event)
|
| 55 |
+
{
|
| 56 |
+
var trElement = Event.findElement(event, 'tr');
|
| 57 |
+
var isInput = Event.element(event).tagName == 'INPUT';
|
| 58 |
+
if (trElement) {
|
| 59 |
+
var checkbox = Element.getElementsBySelector(trElement, 'input');
|
| 60 |
+
if(checkbox[0]){
|
| 61 |
+
var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
|
| 62 |
+
if (checked) {
|
| 63 |
+
checkbox[0].checked = true;
|
| 64 |
+
if ( confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
|
| 65 |
+
checkBoxes.set(checkbox[0].value, checked);
|
| 66 |
+
varienElementMethods.setHasChanges(checkbox[0]);
|
| 67 |
+
} else {
|
| 68 |
+
checkbox[0].checked = false;
|
| 69 |
+
}
|
| 70 |
+
warning = false;
|
| 71 |
+
} else {
|
| 72 |
+
checkBoxes.unset(checkbox[0].value);
|
| 73 |
+
}
|
| 74 |
+
|
| 75 |
+
$('in_role_users').value = checkBoxes.toQueryString();
|
| 76 |
+
grid.reloadParams = {'in_role_user[]':checkBoxes.keys()};
|
| 77 |
+
}
|
| 78 |
+
}
|
| 79 |
+
}
|
| 80 |
+
|
| 81 |
+
function roleUsersRowInit(grid, row)
|
| 82 |
+
{
|
| 83 |
+
var checkbox = $(row).getElementsByClassName('checkbox')[0];
|
| 84 |
+
if (checkbox) {
|
| 85 |
+
if (checkbox.checked) {
|
| 86 |
+
checkBoxes.set(checkbox.value, checkbox.checked);
|
| 87 |
+
} else {
|
| 88 |
+
checkBoxes.unset(checkbox.value);
|
| 89 |
+
}
|
| 90 |
+
|
| 91 |
+
$('in_role_users').value = checkBoxes.toQueryString();
|
| 92 |
+
grid.reloadParams = {'in_role_user[]':checkBoxes.keys()};
|
| 93 |
+
}
|
| 94 |
+
}
|
| 95 |
+
|
| 96 |
+
function myhandler(o)
|
| 97 |
+
{
|
| 98 |
+
if (checkBoxes.size() > 0) {
|
| 99 |
+
if (!confirm("<?php echo $this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
|
| 100 |
+
o.checked = !o.checked;
|
| 101 |
+
} else {
|
| 102 |
+
checkBoxes.each(function(el){
|
| 103 |
+
el.checked = o.checked;
|
| 104 |
+
});
|
| 105 |
+
return false;
|
| 106 |
+
}
|
| 107 |
+
warning = false;
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
+
$('in_role_users').value = checkBoxes.toQueryString();
|
| 111 |
+
//grid.reloadParams = {'in_role_user[]':checkBoxes.keys()};
|
| 112 |
+
}
|
| 113 |
+
|
| 114 |
+
<?php echo $name ?>.rowClickCallback = roleUsersRowClick;
|
| 115 |
+
<?php echo $name ?>.initRowCallback = roleUsersRowInit;
|
| 116 |
+
<?php echo $name ?>.checkboxCheckCallback = registerUserRole;
|
| 117 |
+
<?php echo $name ?>.checkCheckboxes = myhandler;
|
| 118 |
+
<?php echo $name ?>.rows.each(function(row){roleUsersRowInit(<?php echo $name ?>, row)});
|
| 119 |
+
$('in_role_users_old').value = $('in_role_users').value;
|
| 120 |
+
<?php endif; ?>
|
| 121 |
+
//]]>
|
| 122 |
+
</script>
|
app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/backup/dialogs.phtml
ADDED
|
@@ -0,0 +1,164 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<div class="backup-dialog" style="display: none;" id="rollback-warning">
|
| 2 |
+
<div class="entry-edit">
|
| 3 |
+
<div class="entry-edit-head">
|
| 4 |
+
<h4 class="head-edit-form fieldset-legend"><?php echo $this->__('Warning') ?></h4>
|
| 5 |
+
</div>
|
| 6 |
+
<div class="content">
|
| 7 |
+
<div><?php echo $this->__('Any data created since the backup was made will be lost including admin users, customers and orders.')?></div>
|
| 8 |
+
<div class="question"><?php echo $this->__('Are you sure you want to proceed?')?></div>
|
| 9 |
+
</div>
|
| 10 |
+
<div class="buttons-set">
|
| 11 |
+
<div class="f-right">
|
| 12 |
+
<button type="button" class="scalable " onclick="backup.requestPassword()"><span><?php echo $this->__('OK')?></span></button>
|
| 13 |
+
<button type="button" class="scalable " onclick="backup.hidePopups()"><span><?php echo $this->__('Cancel')?></span></button>
|
| 14 |
+
</div>
|
| 15 |
+
</div>
|
| 16 |
+
</div>
|
| 17 |
+
</div>
|
| 18 |
+
|
| 19 |
+
<div class="backup-dialog" style="display: none;" id="backup-warning">
|
| 20 |
+
<div class="entry-edit">
|
| 21 |
+
<div class="entry-edit-head">
|
| 22 |
+
<h4 class="head-edit-form fieldset-legend"><?php echo $this->__('Warning') ?></h4>
|
| 23 |
+
</div>
|
| 24 |
+
<div class="content">
|
| 25 |
+
<div class="backup-messages" style="display: none;"><ul class="messages"></ul></div>
|
| 26 |
+
<div><?php echo $this->__("The backup's creation process will take time.")?></div>
|
| 27 |
+
<div><?php echo $this->__('You will need to wait when the action ends.')?></div>
|
| 28 |
+
<div><?php echo $this->__('Do you really want to proceed?')?></div>
|
| 29 |
+
</div>
|
| 30 |
+
<div class="buttons-set">
|
| 31 |
+
<div class="f-right">
|
| 32 |
+
<button type="button" class="scalable " onclick="backup.requestBackupOptions()"><span><?php echo $this->__('OK')?></span></button>
|
| 33 |
+
<button type="button" class="scalable " onclick="backup.hidePopups()"><span><?php echo $this->__('Cancel')?></span></button>
|
| 34 |
+
</div>
|
| 35 |
+
</div>
|
| 36 |
+
</div>
|
| 37 |
+
</div>
|
| 38 |
+
|
| 39 |
+
<div class="backup-dialog" style="display: none;" id="backup-options">
|
| 40 |
+
<div class="entry-edit">
|
| 41 |
+
<div class="entry-edit-head">
|
| 42 |
+
<h4 class="head-edit-form fieldset-legend"><?php echo $this->__('Backup options') ?></h4>
|
| 43 |
+
</div>
|
| 44 |
+
<div class="content">
|
| 45 |
+
<div class="backup-messages" style="display: none;"><ul class="messages"></ul></div>
|
| 46 |
+
<div><?php echo $this->__('Please specify backup creation options')?></div>
|
| 47 |
+
<form action="" method="post" id="backup-form" onsubmit="return backup.submitBackup();">
|
| 48 |
+
<table class="form-list question" cellspacing="0">
|
| 49 |
+
<tr>
|
| 50 |
+
<td style="padding-right: 8px;"><label for="backup_name" class="nobr"><?php echo $this->__('Backup Name')?></label></td>
|
| 51 |
+
<td>
|
| 52 |
+
<input type="text" name="backup_name" id="backup_name" class="validate-alphanum-with-spaces validate-length maximum-length-50" style="width: 343px" maxlength="50" />
|
| 53 |
+
<p class="note"><span><?php echo $this->__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?></span></p>
|
| 54 |
+
</td>
|
| 55 |
+
</tr>
|
| 56 |
+
<tr>
|
| 57 |
+
<td> </td>
|
| 58 |
+
<td class="maintenance-checkbox-container">
|
| 59 |
+
<input type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
|
| 60 |
+
<label for="backup_maintenance_mode"><?php echo $this->__('Put store on the maintenance mode while backup creation')?></label>
|
| 61 |
+
</td>
|
| 62 |
+
</tr>
|
| 63 |
+
<tr id="exclude-media-checkbox-container" style="display: none;">
|
| 64 |
+
<td> </td>
|
| 65 |
+
<td>
|
| 66 |
+
<input type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
|
| 67 |
+
<label for="exclude_media"><?php echo $this->__('Exclude media folder from backup')?></label>
|
| 68 |
+
</td>
|
| 69 |
+
</tr>
|
| 70 |
+
</table>
|
| 71 |
+
</form>
|
| 72 |
+
</div>
|
| 73 |
+
<div class="buttons-set">
|
| 74 |
+
<div class="f-right">
|
| 75 |
+
<button type="button" class="scalable " onclick="backup.submitBackup()"><span><?php echo $this->__('OK')?></span></button>
|
| 76 |
+
<button type="button" class="scalable " onclick="backup.hidePopups()"><span><?php echo $this->__('Cancel')?></span></button>
|
| 77 |
+
</div>
|
| 78 |
+
</div>
|
| 79 |
+
</div>
|
| 80 |
+
</div>
|
| 81 |
+
|
| 82 |
+
<div class="backup-dialog" style="display: none;" id="rollback-request-password">
|
| 83 |
+
<div class="entry-edit">
|
| 84 |
+
<div class="entry-edit-head">
|
| 85 |
+
<h4 class="head-edit-form fieldset-legend"><?php echo $this->__('Please enter password') ?></h4>
|
| 86 |
+
</div>
|
| 87 |
+
<div class="content">
|
| 88 |
+
<div class="backup-messages" style="display: none;"><ul class="messages"></ul></div>
|
| 89 |
+
<div><?php echo $this->__('Please enter password to confirm rollback.')?></div>
|
| 90 |
+
<div><?php echo $this->__('This action cannot be undone.')?></div>
|
| 91 |
+
<div class="question"><?php echo $this->__('Are you sure you want to proceed?')?></div>
|
| 92 |
+
<form action="" method="post" id="rollback-form" onsubmit="return backup.submitRollback();">
|
| 93 |
+
<div class="password-box-container">
|
| 94 |
+
<table class="form-list" cellspacing="0">
|
| 95 |
+
<tr>
|
| 96 |
+
<td style="padding-right: 8px;"><label for="password" class="nobr"><?php echo $this->__('User Password')?> <span class="required">*</span></label></td>
|
| 97 |
+
<td><input type="password" name="password" id="password" class="required-entry"></td>
|
| 98 |
+
</tr>
|
| 99 |
+
<tr>
|
| 100 |
+
<td> </td>
|
| 101 |
+
<td class="maintenance-checkbox-container">
|
| 102 |
+
<input type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
|
| 103 |
+
<label for="rollback_maintenance_mode"><?php echo $this->__('Put store on the maintenance mode while rollback processing')?></label>
|
| 104 |
+
</td>
|
| 105 |
+
</tr>
|
| 106 |
+
<tr id="use-ftp-checkbox-row" style="display: none;">
|
| 107 |
+
<td> </td>
|
| 108 |
+
<td><input type="checkbox" name="use_ftp" value="1" id="use_ftp" onClick="backup.toggleFtpCredentialsForm();"/> <label for="use_ftp"><?php echo $this->__('Use FTP Connection')?></label></td>
|
| 109 |
+
</tr>
|
| 110 |
+
</table>
|
| 111 |
+
</div>
|
| 112 |
+
<div class="entry-edit" id="ftp-credentials-container" style="display: none;">
|
| 113 |
+
<div class="entry-edit-head">
|
| 114 |
+
<h4 class=""><?php echo $this->__('FTP credentials')?></h4>
|
| 115 |
+
</div>
|
| 116 |
+
<fieldset>
|
| 117 |
+
<table class="form-list" cellspacing="0">
|
| 118 |
+
<tr>
|
| 119 |
+
<td class="label"><label for="ftp_host"><?php echo $this->__('FTP Host')?> <span class="required">*</span></label></td>
|
| 120 |
+
<td class="value"><input type="text" name="ftp_host" id="ftp_host"></td>
|
| 121 |
+
</tr>
|
| 122 |
+
<tr>
|
| 123 |
+
<td class="label"><label for="ftp_user"><?php echo $this->__('FTP Login')?> <span class="required">*</span></label></td>
|
| 124 |
+
<td class="value"><input type="text" name="ftp_user" id="ftp_user"></td>
|
| 125 |
+
</tr>
|
| 126 |
+
<tr>
|
| 127 |
+
<td class="label"><label for="ftp_pass"><?php echo $this->__('FTP Password')?> <span class="required">*</span></label></td>
|
| 128 |
+
<td class="value"><input type="password" name="ftp_pass" id="ftp_pass"></td>
|
| 129 |
+
</tr>
|
| 130 |
+
<tr>
|
| 131 |
+
<td class="label"><label for="ftp_path"><?php echo $this->__('Magento root directory')?></label></td>
|
| 132 |
+
<td class="value"><input type="text" name="ftp_path" id="ftp_path"></td>
|
| 133 |
+
</tr>
|
| 134 |
+
</table>
|
| 135 |
+
</fieldset>
|
| 136 |
+
</div>
|
| 137 |
+
</form>
|
| 138 |
+
</div>
|
| 139 |
+
<div class="buttons-set">
|
| 140 |
+
<div class="f-right">
|
| 141 |
+
<button type="button" class="scalable " onclick="backup.submitRollback()"><span><?php echo $this->__('OK')?></span></button>
|
| 142 |
+
<button type="button" class="scalable " onclick="backup.hidePopups()"><span><?php echo $this->__('Cancel')?></span></button>
|
| 143 |
+
</div>
|
| 144 |
+
</div>
|
| 145 |
+
</div>
|
| 146 |
+
</div>
|
| 147 |
+
|
| 148 |
+
<div id="popup-window-mask" style="display: none;"></div>
|
| 149 |
+
|
| 150 |
+
<?php
|
| 151 |
+
$helper = Mage::helper('backup');
|
| 152 |
+
$rollbackUrl = $this->getUrl('*/*/rollback');
|
| 153 |
+
$backupUrl = $this->getUrl('*/*/create');
|
| 154 |
+
?>
|
| 155 |
+
|
| 156 |
+
<script type="text/javascript">
|
| 157 |
+
//<![CDATA[
|
| 158 |
+
document.observe('dom:loaded', function () {
|
| 159 |
+
backup = new AdminBackup();
|
| 160 |
+
backup.rollbackUrl = '<?php echo $helper->jsQuoteEscape($rollbackUrl);?>';
|
| 161 |
+
backup.backupUrl = '<?php echo $helper->jsQuoteEscape($backupUrl);?>';
|
| 162 |
+
});
|
| 163 |
+
//]]>
|
| 164 |
+
</script>
|
app/design/adminhtml/default/default/template/backup/left.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/backup/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -28,8 +28,13 @@
|
|
| 28 |
Â
<table cellspacing="0">
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-backups-control"><?php echo Mage::helper('backup')->__('Backups') ?></h3></td>
|
| 31 |
-
<td class="form-buttons"
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 32 |
Â
</tr>
|
| 33 |
Â
</table>
|
| 34 |
Â
</div>
|
| 35 |
Â
<?php echo $this->getGridHtml() ?>
|
|
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 28 |
Â
<table cellspacing="0">
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-backups-control"><?php echo Mage::helper('backup')->__('Backups') ?></h3></td>
|
| 31 |
+
<td class="form-buttons">
|
| 32 |
+
<?php echo $this->getCreateSnapshotButtonHtml(); ?>
|
| 33 |
+
<?php echo $this->getCreateMediaBackupButtonHtml(); ?>
|
| 34 |
+
<?php echo $this->getCreateButtonHtml(); ?>
|
| 35 |
+
</td>
|
| 36 |
Â
</tr>
|
| 37 |
Â
</table>
|
| 38 |
Â
</div>
|
| 39 |
Â
<?php echo $this->getGridHtml() ?>
|
| 40 |
+
<?php echo $this->getDialogsHtml() ?>
|
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
|
@@ -28,7 +28,8 @@
|
|
| 28 |
Â
<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox */ ?>
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
-
|
|
Â
|
|
| 32 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 33 |
Â
<div class="input-box">
|
| 34 |
Â
<?php if (count($_selections) == 1 && $_option->getRequired()): ?>
|
|
@@ -37,7 +38,7 @@
|
|
| 37 |
Â
<?php else:?>
|
| 38 |
Â
<ul class="options-list">
|
| 39 |
Â
<?php foreach($_selections as $_selection): ?>
|
| 40 |
-
<li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>"/>
|
| 41 |
Â
<span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></label></span>
|
| 42 |
Â
<?php if($_option->getRequired()): ?>
|
| 43 |
Â
<?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 28 |
Â
<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox */ ?>
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 32 |
+
<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
|
| 33 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 34 |
Â
<div class="input-box">
|
| 35 |
Â
<?php if (count($_selections) == 1 && $_option->getRequired()): ?>
|
| 38 |
Â
<?php else:?>
|
| 39 |
Â
<ul class="options-list">
|
| 40 |
Â
<?php foreach($_selections as $_selection): ?>
|
| 41 |
+
<li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>"/>
|
| 42 |
Â
<span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></label></span>
|
| 43 |
Â
<?php if($_option->getRequired()): ?>
|
| 44 |
Â
<?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
|
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
|
@@ -28,7 +28,8 @@
|
|
| 28 |
Â
<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi */ ?>
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
-
|
|
Â
|
|
| 32 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 33 |
Â
<div class="input-box">
|
| 34 |
Â
<?php if (count($_selections) == 1 && $_option->getRequired()): ?>
|
|
@@ -40,7 +41,7 @@
|
|
| 40 |
Â
<option value=""><?php echo $this->__('None') ?></option>
|
| 41 |
Â
<?php endif; ?>
|
| 42 |
Â
<?php foreach ($_selections as $_selection): ?>
|
| 43 |
-
<option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
|
| 44 |
Â
<?php endforeach; ?>
|
| 45 |
Â
</select>
|
| 46 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 28 |
Â
<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi */ ?>
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 32 |
+
<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
|
| 33 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 34 |
Â
<div class="input-box">
|
| 35 |
Â
<?php if (count($_selections) == 1 && $_option->getRequired()): ?>
|
| 41 |
Â
<option value=""><?php echo $this->__('None') ?></option>
|
| 42 |
Â
<?php endif; ?>
|
| 43 |
Â
<?php foreach ($_selections as $_selection): ?>
|
| 44 |
+
<option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
|
| 45 |
Â
<?php endforeach; ?>
|
| 46 |
Â
</select>
|
| 47 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
|
@@ -29,13 +29,14 @@
|
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
Â
<?php $_default = $_option->getDefaultSelection(); ?>
|
|
Â
|
|
| 32 |
Â
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
|
| 33 |
Â
|
| 34 |
Â
<dt>
|
| 35 |
Â
<span class="qty-holder">
|
| 36 |
Â
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
|
| 37 |
Â
</span>
|
| 38 |
-
<label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->
|
| 39 |
Â
</dt>
|
| 40 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 41 |
Â
<div class="input-box">
|
|
@@ -50,7 +51,7 @@
|
|
| 50 |
Â
</li>
|
| 51 |
Â
<?php endif; ?>
|
| 52 |
Â
<?php foreach ($_selections as $_selection): ?>
|
| 53 |
-
<li><input type="radio" class="radio<?php echo $_option->getRequired()?' validate-one-required-by-name':'' ?> change-container-classname" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>" qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"/>
|
| 54 |
Â
<span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
|
| 55 |
Â
<?php if ($_option->getRequired()): ?>
|
| 56 |
Â
<?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
Â
<?php $_default = $_option->getDefaultSelection(); ?>
|
| 32 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 33 |
Â
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
|
| 34 |
Â
|
| 35 |
Â
<dt>
|
| 36 |
Â
<span class="qty-holder">
|
| 37 |
Â
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
|
| 38 |
Â
</span>
|
| 39 |
+
<label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
|
| 40 |
Â
</dt>
|
| 41 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 42 |
Â
<div class="input-box">
|
| 51 |
Â
</li>
|
| 52 |
Â
<?php endif; ?>
|
| 53 |
Â
<?php foreach ($_selections as $_selection): ?>
|
| 54 |
+
<li><input type="radio" class="radio<?php echo $_option->getRequired()?' validate-one-required-by-name':'' ?> change-container-classname" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>" qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"/>
|
| 55 |
Â
<span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
|
| 56 |
Â
<?php if ($_option->getRequired()): ?>
|
| 57 |
Â
<?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
|
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
|
@@ -29,13 +29,14 @@
|
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
Â
<?php $_default = $_option->getDefaultSelection(); ?>
|
|
Â
|
|
| 32 |
Â
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
|
| 33 |
Â
|
| 34 |
Â
<dt>
|
| 35 |
Â
<span class="qty-holder">
|
| 36 |
Â
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
|
| 37 |
Â
</span>
|
| 38 |
-
<label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->
|
| 39 |
Â
</dt>
|
| 40 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 41 |
Â
<div class="input-box">
|
|
@@ -46,7 +47,7 @@
|
|
| 46 |
Â
<select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select change-container-classname" onchange="ProductConfigure.bundleControl.changeSelection(this)">
|
| 47 |
Â
<option value=""><?php echo $this->__('Choose a selection...') ?></option>
|
| 48 |
Â
<?php foreach ($_selections as $_selection): ?>
|
| 49 |
-
<option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>" qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
|
| 50 |
Â
<?php endforeach; ?>
|
| 51 |
Â
</select>
|
| 52 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 29 |
Â
<?php $_option = $this->getOption(); ?>
|
| 30 |
Â
<?php $_selections = $_option->getSelections(); ?>
|
| 31 |
Â
<?php $_default = $_option->getDefaultSelection(); ?>
|
| 32 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 33 |
Â
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
|
| 34 |
Â
|
| 35 |
Â
<dt>
|
| 36 |
Â
<span class="qty-holder">
|
| 37 |
Â
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
|
| 38 |
Â
</span>
|
| 39 |
+
<label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
|
| 40 |
Â
</dt>
|
| 41 |
Â
<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
|
| 42 |
Â
<div class="input-box">
|
| 47 |
Â
<select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select change-container-classname" onchange="ProductConfigure.bundleControl.changeSelection(this)">
|
| 48 |
Â
<option value=""><?php echo $this->__('Choose a selection...') ?></option>
|
| 49 |
Â
<?php foreach ($_selections as $_selection): ?>
|
| 50 |
+
<option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>" qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
|
| 51 |
Â
<?php endforeach; ?>
|
| 52 |
Â
</select>
|
| 53 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -212,6 +212,7 @@ bOption = new Bundle.Option(optionTemplate);
|
|
| 212 |
Â
optionIndex = bOption.add(<?php echo $_option->toJson() ?>);
|
| 213 |
Â
<?php if ($_option->getSelections()):?>
|
| 214 |
Â
<?php foreach ($_option->getSelections() as $_selection): ?>
|
|
Â
|
|
| 215 |
Â
bSelection.addRow(optionIndex, <?php echo $_selection->toJson() ?>);
|
| 216 |
Â
<?php endforeach; ?>
|
| 217 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 212 |
Â
optionIndex = bOption.add(<?php echo $_option->toJson() ?>);
|
| 213 |
Â
<?php if ($_option->getSelections()):?>
|
| 214 |
Â
<?php foreach ($_option->getSelections() as $_selection): ?>
|
| 215 |
+
<?php $_selection->setName($this->escapeHtml($_selection->getName())); ?>
|
| 216 |
Â
bSelection.addRow(optionIndex, <?php echo $_selection->toJson() ?>);
|
| 217 |
Â
<?php endforeach; ?>
|
| 218 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -364,8 +364,8 @@
|
|
| 364 |
Â
<td class="a-right last">
|
| 365 |
Â
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 366 |
Â
<?php echo $this->displayPrices(
|
| 367 |
-
$_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
|
| 368 |
-
$_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
|
| 369 |
Â
); ?>
|
| 370 |
Â
<?php else: ?>
|
| 371 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 364 |
Â
<td class="a-right last">
|
| 365 |
Â
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 366 |
Â
<?php echo $this->displayPrices(
|
| 367 |
+
max(0, $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount()),
|
| 368 |
+
max(0, $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount())
|
| 369 |
Â
); ?>
|
| 370 |
Â
<?php else: ?>
|
| 371 |
Â
|
app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/captcha/zend.phtml
ADDED
|
@@ -0,0 +1,56 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $captcha = $this->getCaptchaModel() ?>
|
| 28 |
+
<?php /* @var $this Mage_Core_Block_Captcha_Zend */ ?>
|
| 29 |
+
<div class="clear"></div>
|
| 30 |
+
<div class="captcha">
|
| 31 |
+
<div class="captcha-input input-box input-left">
|
| 32 |
+
<label for="captcha"><?php echo $this->__('Please type the letters from the image:') ?></label><br />
|
| 33 |
+
<input type="text" name="<?php echo Mage_Captcha_Helper_Data::INPUT_NAME_FIELD_VALUE ?>[<?php echo $this->getFormId()?>]" id="captcha" class="required-entry input-text validation-failed"/>
|
| 34 |
+
</div>
|
| 35 |
+
<div class="captcha-image input-right">
|
| 36 |
+
<img id="captcha-reload" class="captcha-reload" src="<?php echo $this->getSkinUrl('images/reload.png') ?>" alt="<?php echo $this->__('Reload captcha') ?>"/>
|
| 37 |
+
<img id="<?php echo $this->getFormId() ?>" width="<?php echo $this->getImgWidth() ?>" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>" />
|
| 38 |
+
</div>
|
| 39 |
+
</div>
|
| 40 |
+
<?php if ($captcha->isCaseSensitive()) :?>
|
| 41 |
+
<div class="captcha-note">
|
| 42 |
+
<p><?php echo $this->__('<strong>Attention</strong>: Captcha is case sensitive.') ?></p>
|
| 43 |
+
</div>
|
| 44 |
+
<?php endif; ?>
|
| 45 |
+
<script type="text/javascript">
|
| 46 |
+
//<![CDATA[
|
| 47 |
+
document.observe('dom:loaded', function () {
|
| 48 |
+
var captcha = new Captcha('<?php echo $this->getRefreshUrl() ?>', '<?php echo $this->getFormId() ?>');
|
| 49 |
+
|
| 50 |
+
$('captcha-reload').observe('click', function () {
|
| 51 |
+
captcha.refresh(this);
|
| 52 |
+
});
|
| 53 |
+
|
| 54 |
+
});
|
| 55 |
+
//]]>
|
| 56 |
+
</script>
|
app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/category/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/category/tree.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -117,26 +117,33 @@ function bindAttributeInputType()
|
|
| 117 |
Â
|
| 118 |
Â
setRowVisibility('is_wysiwyg_enabled', false);
|
| 119 |
Â
setRowVisibility('is_html_allowed_on_front', false);
|
| 120 |
-
|
| 121 |
-
|
| 122 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 123 |
Â
setRowVisibility('is_html_allowed_on_front', true);
|
| 124 |
Â
$('is_html_allowed_on_front').disabled = false;
|
| 125 |
-
}
|
| 126 |
-
$('frontend_class').value = '';
|
| 127 |
-
$('frontend_class').disabled = true;
|
| 128 |
-
}
|
| 129 |
-
else if($('frontend_input').value=='text'){
|
| 130 |
-
setRowVisibility('is_html_allowed_on_front', true);
|
| 131 |
-
$('is_html_allowed_on_front').disabled = false;
|
| 132 |
Â
|
| 133 |
-
|
| 134 |
-
|
| 135 |
-
|
| 136 |
-
|
| 137 |
-
|
| 138 |
-
|
| 139 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 140 |
Â
}
|
| 141 |
Â
|
| 142 |
Â
switchIsFilterable();
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 117 |
Â
|
| 118 |
Â
setRowVisibility('is_wysiwyg_enabled', false);
|
| 119 |
Â
setRowVisibility('is_html_allowed_on_front', false);
|
| 120 |
+
|
| 121 |
+
switch ($('frontend_input').value) {
|
| 122 |
+
case 'textarea':
|
| 123 |
+
setRowVisibility('is_wysiwyg_enabled', true);
|
| 124 |
+
if($('is_wysiwyg_enabled').value == '0'){
|
| 125 |
+
setRowVisibility('is_html_allowed_on_front', true);
|
| 126 |
+
$('is_html_allowed_on_front').disabled = false;
|
| 127 |
+
}
|
| 128 |
+
$('frontend_class').value = '';
|
| 129 |
+
$('frontend_class').disabled = true;
|
| 130 |
+
break;
|
| 131 |
+
case 'text':
|
| 132 |
Â
setRowVisibility('is_html_allowed_on_front', true);
|
| 133 |
Â
$('is_html_allowed_on_front').disabled = false;
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 134 |
Â
|
| 135 |
+
if (!$('frontend_class').getAttribute('readonly')) {
|
| 136 |
+
$('frontend_class').disabled = false;
|
| 137 |
+
}
|
| 138 |
+
break;
|
| 139 |
+
case 'select':
|
| 140 |
+
case 'multiselect':
|
| 141 |
+
setRowVisibility('is_html_allowed_on_front', true);
|
| 142 |
+
$('is_html_allowed_on_front').disabled = false;
|
| 143 |
+
break;
|
| 144 |
+
default:
|
| 145 |
+
$('frontend_class').value = '';
|
| 146 |
+
$('frontend_class').disabled = true;
|
| 147 |
Â
}
|
| 148 |
Â
|
| 149 |
Â
switchIsFilterable();
|
app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
CHANGED
|
@@ -20,13 +20,13 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<?php
|
| 28 |
Â
/**
|
| 29 |
-
* Attribute
|
| 30 |
Â
*
|
| 31 |
Â
* @see Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Options
|
| 32 |
Â
*/
|
|
@@ -115,7 +115,7 @@ var templateText =
|
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
'<td><input class="input-text" type="text" name="option[order][{{id}}]" value="{{sort_order}}" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
|
| 117 |
Â
'<td class="a-center"><input class="input-radio" type="{{intype}}" name="default[]" value="{{id}}" {{checked}} <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
|
| 118 |
-
'<td class="a-left">'+
|
| 119 |
Â
'<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
|
| 120 |
Â
<?php if (!$this->getReadOnly()):?>
|
| 121 |
Â
'<?php echo $this->getDeleteButtonHtml() ?>'+
|
|
@@ -129,16 +129,21 @@ var attributeOption = {
|
|
| 129 |
Â
templateText : templateText,
|
| 130 |
Â
itemCount : 0,
|
| 131 |
Â
totalItems : 0,
|
|
Â
|
|
| 132 |
Â
add : function(data) {
|
| 133 |
Â
this.template = new Template(this.templateText, this.templateSyntax);
|
|
Â
|
|
| 134 |
Â
if(!data.id){
|
| 135 |
Â
data = {};
|
| 136 |
Â
data.id = 'option_'+this.itemCount;
|
|
Â
|
|
| 137 |
Â
}
|
| 138 |
Â
if (!data.intype)
|
| 139 |
Â
data.intype = optionDefaultInputType;
|
| 140 |
-
|
| 141 |
Â
Element.insert(this.table, {after: this.template.evaluate(data)});
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 142 |
Â
this.bindRemoveButtons();
|
| 143 |
Â
this.itemCount++;
|
| 144 |
Â
this.totalItems++;
|
|
@@ -178,6 +183,12 @@ var attributeOption = {
|
|
| 178 |
Â
$('option-count-check').value = '';
|
| 179 |
Â
}
|
| 180 |
Â
},
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 181 |
Â
bindRemoveButtons : function(){
|
| 182 |
Â
var buttons = $$('.delete-option');
|
| 183 |
Â
for(var i=0;i<buttons.length;i++){
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<?php
|
| 28 |
Â
/**
|
| 29 |
+
* Attribute options control
|
| 30 |
Â
*
|
| 31 |
Â
* @see Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Options
|
| 32 |
Â
*/
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
'<td><input class="input-text" type="text" name="option[order][{{id}}]" value="{{sort_order}}" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
|
| 117 |
Â
'<td class="a-center"><input class="input-radio" type="{{intype}}" name="default[]" value="{{id}}" {{checked}} <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
|
| 118 |
+
'<td class="a-left" id="delete_button_container_{{id}}">'+
|
| 119 |
Â
'<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
|
| 120 |
Â
<?php if (!$this->getReadOnly()):?>
|
| 121 |
Â
'<?php echo $this->getDeleteButtonHtml() ?>'+
|
| 129 |
Â
templateText : templateText,
|
| 130 |
Â
itemCount : 0,
|
| 131 |
Â
totalItems : 0,
|
| 132 |
+
isReadOnly: <?php echo (int)$this->getReadOnly(); ?>,
|
| 133 |
Â
add : function(data) {
|
| 134 |
Â
this.template = new Template(this.templateText, this.templateSyntax);
|
| 135 |
+
var isNewOption = false;
|
| 136 |
Â
if(!data.id){
|
| 137 |
Â
data = {};
|
| 138 |
Â
data.id = 'option_'+this.itemCount;
|
| 139 |
+
isNewOption = true;
|
| 140 |
Â
}
|
| 141 |
Â
if (!data.intype)
|
| 142 |
Â
data.intype = optionDefaultInputType;
|
|
Â
|
|
| 143 |
Â
Element.insert(this.table, {after: this.template.evaluate(data)});
|
| 144 |
+
if (isNewOption && !this.isReadOnly) {
|
| 145 |
+
this.enableNewOptionDeleteButton(data.id);
|
| 146 |
+
}
|
| 147 |
Â
this.bindRemoveButtons();
|
| 148 |
Â
this.itemCount++;
|
| 149 |
Â
this.totalItems++;
|
| 183 |
Â
$('option-count-check').value = '';
|
| 184 |
Â
}
|
| 185 |
Â
},
|
| 186 |
+
enableNewOptionDeleteButton: function(id) {
|
| 187 |
+
$$('#delete_button_container_' + id + ' button').each(function(button) {
|
| 188 |
+
button.enable();
|
| 189 |
+
button.removeClassName('disabled');
|
| 190 |
+
});
|
| 191 |
+
},
|
| 192 |
Â
bindRemoveButtons : function(){
|
| 193 |
Â
var buttons = $$('.delete-option');
|
| 194 |
Â
for(var i=0;i<buttons.length;i++){
|
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -39,8 +39,8 @@
|
|
| 39 |
Â
<div id="product_composite_configure_form_additional" style="display:none;"></div>
|
| 40 |
Â
<div id="product_composite_configure_form_confirmed" style="display:none;"></div>
|
| 41 |
Â
<div class="buttons-set a-right">
|
| 42 |
-
<button type="button" class="scalable" onclick="productConfigure.onCancelBtn()" id="product_composite_configure_form_cancel"><span><?php echo Mage::helper('catalog')->__('Cancel') ?></span></button>
|
| 43 |
-
<button type="submit" class="scalable"><span><?php echo Mage::helper('catalog')->__('OK') ?></span></button>
|
| 44 |
Â
</div>
|
| 45 |
Â
</div>
|
| 46 |
Â
<input type="hidden" name="as_js_varname" value="iFrameResponse" />
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 39 |
Â
<div id="product_composite_configure_form_additional" style="display:none;"></div>
|
| 40 |
Â
<div id="product_composite_configure_form_confirmed" style="display:none;"></div>
|
| 41 |
Â
<div class="buttons-set a-right">
|
| 42 |
+
<button type="button" class="scalable" onclick="productConfigure.onCancelBtn()" id="product_composite_configure_form_cancel"><span><span><span><?php echo Mage::helper('catalog')->__('Cancel') ?></span></span></span></button>
|
| 43 |
+
<button type="submit" class="scalable"><span><span><span><?php echo Mage::helper('catalog')->__('OK') ?></span></span></span></button>
|
| 44 |
Â
</div>
|
| 45 |
Â
</div>
|
| 46 |
Â
<input type="hidden" name="as_js_varname" value="iFrameResponse" />
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -28,7 +28,8 @@
|
|
| 28 |
Â
<?php /* @var $this Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Configurable */ ?>
|
| 29 |
Â
<?php $_product = $this->getProduct(); ?>
|
| 30 |
Â
<?php $_attributes = Mage::helper('core')->decorateArray($this->getAllowAttributes()); ?>
|
| 31 |
-
<?php
|
|
Â
|
|
| 32 |
Â
<div id="catalog_product_composite_configure_fields_configurable" class="<?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
|
| 33 |
Â
<h4><?php echo Mage::helper('catalog')->__('Associated Products') ?></h4>
|
| 34 |
Â
<div class="product-options">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 28 |
Â
<?php /* @var $this Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Configurable */ ?>
|
| 29 |
Â
<?php $_product = $this->getProduct(); ?>
|
| 30 |
Â
<?php $_attributes = Mage::helper('core')->decorateArray($this->getAllowAttributes()); ?>
|
| 31 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 32 |
+
<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
|
| 33 |
Â
<div id="catalog_product_composite_configure_fields_configurable" class="<?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
|
| 34 |
Â
<h4><?php echo Mage::helper('catalog')->__('Associated Products') ?></h4>
|
| 35 |
Â
<div class="product-options">
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml
CHANGED
|
@@ -20,12 +20,13 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
|
| 28 |
-
|
|
Â
|
|
| 29 |
Â
<div id="catalog_product_composite_configure_fields_grouped" class="grid <?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
|
| 30 |
Â
<h4><?php echo Mage::helper('catalog')->__('Associated Products') ?></h4>
|
| 31 |
Â
<div class="product-options">
|
|
@@ -33,7 +34,7 @@
|
|
| 33 |
Â
<?php $this->setPreconfiguredValue(); ?>
|
| 34 |
Â
<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
|
| 35 |
Â
<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
|
| 36 |
-
<?php if (!$_product->isAvailable() || !$_hasAssociatedProducts): ?>
|
| 37 |
Â
<p class="availability out-of-stock"><?php echo Mage::helper('catalog')->__('Availability:') ?> <span><?php echo Mage::helper('catalog')->__('Out of stock') ?></span></p>
|
| 38 |
Â
<?php endif; ?>
|
| 39 |
Â
<table class="data-table grouped-items-table" id="super-product-table">
|
|
@@ -50,7 +51,7 @@
|
|
| 50 |
Â
<?php if ($this->getCanShowProductPrice($_product)): ?>
|
| 51 |
Â
<th class="a-right"><?php echo Mage::helper('catalog')->__('Price') ?></th>
|
| 52 |
Â
<?php endif; ?>
|
| 53 |
-
<?php if ($_product->isSaleable()): ?>
|
| 54 |
Â
<th class="a-center"><?php echo Mage::helper('catalog')->__('Qty') ?></th>
|
| 55 |
Â
<?php endif; ?>
|
| 56 |
Â
</tr>
|
|
@@ -62,8 +63,8 @@
|
|
| 62 |
Â
<?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_item, $_item->getFinalPrice(), true) ?>
|
| 63 |
Â
<tr class="<?php echo (++$i % 2) ? 'even' : 'odd' ?>">
|
| 64 |
Â
<td><?php echo $_item->getId() ?></td>
|
| 65 |
-
<td><?php echo $this->
|
| 66 |
-
<td><?php echo $this->
|
| 67 |
Â
<?php if ($this->getCanShowProductPrice($_product)): ?>
|
| 68 |
Â
<td class="a-right">
|
| 69 |
Â
<?php if ($this->getCanShowProductPrice($_item)): ?>
|
|
@@ -71,9 +72,9 @@
|
|
| 71 |
Â
<?php endif; ?>
|
| 72 |
Â
</td>
|
| 73 |
Â
<?php endif; ?>
|
| 74 |
-
<?php if ($_product->isSaleable()): ?>
|
| 75 |
Â
<td class="a-center">
|
| 76 |
-
<?php if ($_item->isSaleable()) : ?>
|
| 77 |
Â
<input type="text" name="super_group[<?php echo $_item->getId() ?>]" id="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('catalog')->__('Qty') ?>" class="input-text qty" />
|
| 78 |
Â
<input type="hidden" value="1" price="<?php echo $this->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
|
| 79 |
Â
<?php else: ?>
|
|
@@ -85,7 +86,7 @@
|
|
| 85 |
Â
<?php endforeach; ?>
|
| 86 |
Â
<?php else: ?>
|
| 87 |
Â
<tr>
|
| 88 |
-
<td colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>"><?php echo Mage::helper('catalog')->__('No options of this product are available.') ?></td>
|
| 89 |
Â
</tr>
|
| 90 |
Â
<?php endif; ?>
|
| 91 |
Â
</tbody>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
|
| 28 |
+
<?php /* @var $this Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Grouped */ ?>
|
| 29 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 30 |
Â
<div id="catalog_product_composite_configure_fields_grouped" class="grid <?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
|
| 31 |
Â
<h4><?php echo Mage::helper('catalog')->__('Associated Products') ?></h4>
|
| 32 |
Â
<div class="product-options">
|
| 34 |
Â
<?php $this->setPreconfiguredValue(); ?>
|
| 35 |
Â
<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
|
| 36 |
Â
<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
|
| 37 |
+
<?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts): ?>
|
| 38 |
Â
<p class="availability out-of-stock"><?php echo Mage::helper('catalog')->__('Availability:') ?> <span><?php echo Mage::helper('catalog')->__('Out of stock') ?></span></p>
|
| 39 |
Â
<?php endif; ?>
|
| 40 |
Â
<table class="data-table grouped-items-table" id="super-product-table">
|
| 51 |
Â
<?php if ($this->getCanShowProductPrice($_product)): ?>
|
| 52 |
Â
<th class="a-right"><?php echo Mage::helper('catalog')->__('Price') ?></th>
|
| 53 |
Â
<?php endif; ?>
|
| 54 |
+
<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
|
| 55 |
Â
<th class="a-center"><?php echo Mage::helper('catalog')->__('Qty') ?></th>
|
| 56 |
Â
<?php endif; ?>
|
| 57 |
Â
</tr>
|
| 63 |
Â
<?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_item, $_item->getFinalPrice(), true) ?>
|
| 64 |
Â
<tr class="<?php echo (++$i % 2) ? 'even' : 'odd' ?>">
|
| 65 |
Â
<td><?php echo $_item->getId() ?></td>
|
| 66 |
+
<td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
|
| 67 |
+
<td><?php echo $this->escapeHtml($_item->getName()) ?></td>
|
| 68 |
Â
<?php if ($this->getCanShowProductPrice($_product)): ?>
|
| 69 |
Â
<td class="a-right">
|
| 70 |
Â
<?php if ($this->getCanShowProductPrice($_item)): ?>
|
| 72 |
Â
<?php endif; ?>
|
| 73 |
Â
</td>
|
| 74 |
Â
<?php endif; ?>
|
| 75 |
+
<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
|
| 76 |
Â
<td class="a-center">
|
| 77 |
+
<?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
|
| 78 |
Â
<input type="text" name="super_group[<?php echo $_item->getId() ?>]" id="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('catalog')->__('Qty') ?>" class="input-text qty" />
|
| 79 |
Â
<input type="hidden" value="1" price="<?php echo $this->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
|
| 80 |
Â
<?php else: ?>
|
| 86 |
Â
<?php endforeach; ?>
|
| 87 |
Â
<?php else: ?>
|
| 88 |
Â
<tr>
|
| 89 |
+
<td colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>4<?php else : ?>3<?php endif; ?>"><?php echo Mage::helper('catalog')->__('No options of this product are available.') ?></td>
|
| 90 |
Â
</tr>
|
| 91 |
Â
<?php endif; ?>
|
| 92 |
Â
</tbody>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/created.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -62,7 +62,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 62 |
Â
<input type="checkbox" id="inventory_manage_stock_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 63 |
Â
<label for="inventory_manage_stock_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 64 |
Â
</td>
|
| 65 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 66 |
Â
</tr>
|
| 67 |
Â
<tr>
|
| 68 |
Â
<td class="label"><label for="inventory_qty"><?php echo Mage::helper('catalog')->__('Qty') ?><span class="required">*</span></label></td>
|
|
@@ -71,7 +71,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 71 |
Â
<input type="checkbox" id="inventory_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 72 |
Â
<label for="inventory_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 73 |
Â
</td>
|
| 74 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 75 |
Â
</tr>
|
| 76 |
Â
<tr>
|
| 77 |
Â
<td class="label"><label for="inventory_min_qty"><?php echo Mage::helper('catalog')->__('Minimum Qty for Item\'s Status to be Out of Stock') ?></label></td>
|
|
@@ -81,7 +81,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 81 |
Â
<input type="checkbox" id="inventory_min_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 82 |
Â
<label for="inventory_min_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 83 |
Â
</td>
|
| 84 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 85 |
Â
</tr>
|
| 86 |
Â
<tr>
|
| 87 |
Â
<td class="label"><label for="inventory_min_sale_qty"><?php echo Mage::helper('catalog')->__('Minimum Qty Allowed in Shopping Cart') ?></label></td>
|
|
@@ -91,7 +91,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 91 |
Â
<input type="checkbox" id="inventory_min_sale_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 92 |
Â
<label for="inventory_min_sale_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 93 |
Â
</td>
|
| 94 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 95 |
Â
</tr>
|
| 96 |
Â
<tr>
|
| 97 |
Â
<td class="label"><label for="inventory_max_sale_qty"><?php echo Mage::helper('catalog')->__('Maximum Qty Allowed in Shopping Cart') ?></label></td>
|
|
@@ -101,7 +101,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 101 |
Â
<input type="checkbox" id="inventory_max_sale_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 102 |
Â
<label for="inventory_max_sale_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 103 |
Â
</td>
|
| 104 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 105 |
Â
</tr>
|
| 106 |
Â
<tr>
|
| 107 |
Â
<td class="label"><label for="inventory_is_qty_decimal"><?php echo Mage::helper('catalog')->__('Qty Uses Decimals') ?></label></td>
|
|
@@ -112,7 +112,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 112 |
Â
<input type="checkbox" id="inventory_is_qty_decimal_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 113 |
Â
<label for="inventory_is_qty_decimal_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 114 |
Â
</td>
|
| 115 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 116 |
Â
</tr>
|
| 117 |
Â
<tr>
|
| 118 |
Â
<td class="label"><label for="inventory_backorders"><?php echo Mage::helper('catalog')->__('Backorders') ?></label></td>
|
|
@@ -127,7 +127,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 127 |
Â
<input type="checkbox" id="inventory_backorders_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 128 |
Â
<label for="inventory_backorders_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 129 |
Â
</td>
|
| 130 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 131 |
Â
</tr>
|
| 132 |
Â
<tr>
|
| 133 |
Â
<td class="label"><label for="inventory_notify_stock_qty"><?php echo Mage::helper('catalog')->__('Notify for Quantity Below') ?></label></td>
|
|
@@ -137,7 +137,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 137 |
Â
<input type="checkbox" id="inventory_notify_stock_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 138 |
Â
<label for="inventory_notify_stock_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 139 |
Â
</td>
|
| 140 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 141 |
Â
</tr>
|
| 142 |
Â
|
| 143 |
Â
<tr>
|
|
@@ -151,7 +151,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 151 |
Â
<input type="checkbox" id="inventory_enable_qty_increments_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 152 |
Â
<label for="inventory_enable_qty_increments_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 153 |
Â
</td>
|
| 154 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 155 |
Â
</tr>
|
| 156 |
Â
<tr>
|
| 157 |
Â
<td class="label"><label for="inventory_qty_increments"><?php echo Mage::helper('catalog')->__('Qty Increments') ?></label></td>
|
|
@@ -162,7 +162,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 162 |
Â
<input type="checkbox" id="inventory_qty_increments_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 163 |
Â
<label for="inventory_qty_increments_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 164 |
Â
</td>
|
| 165 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 166 |
Â
</tr>
|
| 167 |
Â
|
| 168 |
Â
<tr>
|
|
@@ -174,7 +174,7 @@ function toggleValueElementsWithCheckbox(checkbox) {
|
|
| 174 |
Â
<input type="checkbox" id="inventory_stock_availability_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 175 |
Â
<label for="inventory_stock_availability_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 176 |
Â
</td>
|
| 177 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 178 |
Â
</tr>
|
| 179 |
Â
</table>
|
| 180 |
Â
</fieldset>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 62 |
Â
<input type="checkbox" id="inventory_manage_stock_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 63 |
Â
<label for="inventory_manage_stock_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 64 |
Â
</td>
|
| 65 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 66 |
Â
</tr>
|
| 67 |
Â
<tr>
|
| 68 |
Â
<td class="label"><label for="inventory_qty"><?php echo Mage::helper('catalog')->__('Qty') ?><span class="required">*</span></label></td>
|
| 71 |
Â
<input type="checkbox" id="inventory_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 72 |
Â
<label for="inventory_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 73 |
Â
</td>
|
| 74 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 75 |
Â
</tr>
|
| 76 |
Â
<tr>
|
| 77 |
Â
<td class="label"><label for="inventory_min_qty"><?php echo Mage::helper('catalog')->__('Minimum Qty for Item\'s Status to be Out of Stock') ?></label></td>
|
| 81 |
Â
<input type="checkbox" id="inventory_min_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 82 |
Â
<label for="inventory_min_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 83 |
Â
</td>
|
| 84 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 85 |
Â
</tr>
|
| 86 |
Â
<tr>
|
| 87 |
Â
<td class="label"><label for="inventory_min_sale_qty"><?php echo Mage::helper('catalog')->__('Minimum Qty Allowed in Shopping Cart') ?></label></td>
|
| 91 |
Â
<input type="checkbox" id="inventory_min_sale_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 92 |
Â
<label for="inventory_min_sale_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 93 |
Â
</td>
|
| 94 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 95 |
Â
</tr>
|
| 96 |
Â
<tr>
|
| 97 |
Â
<td class="label"><label for="inventory_max_sale_qty"><?php echo Mage::helper('catalog')->__('Maximum Qty Allowed in Shopping Cart') ?></label></td>
|
| 101 |
Â
<input type="checkbox" id="inventory_max_sale_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 102 |
Â
<label for="inventory_max_sale_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 103 |
Â
</td>
|
| 104 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 105 |
Â
</tr>
|
| 106 |
Â
<tr>
|
| 107 |
Â
<td class="label"><label for="inventory_is_qty_decimal"><?php echo Mage::helper('catalog')->__('Qty Uses Decimals') ?></label></td>
|
| 112 |
Â
<input type="checkbox" id="inventory_is_qty_decimal_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 113 |
Â
<label for="inventory_is_qty_decimal_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 114 |
Â
</td>
|
| 115 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 116 |
Â
</tr>
|
| 117 |
Â
<tr>
|
| 118 |
Â
<td class="label"><label for="inventory_backorders"><?php echo Mage::helper('catalog')->__('Backorders') ?></label></td>
|
| 127 |
Â
<input type="checkbox" id="inventory_backorders_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 128 |
Â
<label for="inventory_backorders_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 129 |
Â
</td>
|
| 130 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 131 |
Â
</tr>
|
| 132 |
Â
<tr>
|
| 133 |
Â
<td class="label"><label for="inventory_notify_stock_qty"><?php echo Mage::helper('catalog')->__('Notify for Quantity Below') ?></label></td>
|
| 137 |
Â
<input type="checkbox" id="inventory_notify_stock_qty_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 138 |
Â
<label for="inventory_notify_stock_qty_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 139 |
Â
</td>
|
| 140 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 141 |
Â
</tr>
|
| 142 |
Â
|
| 143 |
Â
<tr>
|
| 151 |
Â
<input type="checkbox" id="inventory_enable_qty_increments_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 152 |
Â
<label for="inventory_enable_qty_increments_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 153 |
Â
</td>
|
| 154 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 155 |
Â
</tr>
|
| 156 |
Â
<tr>
|
| 157 |
Â
<td class="label"><label for="inventory_qty_increments"><?php echo Mage::helper('catalog')->__('Qty Increments') ?></label></td>
|
| 162 |
Â
<input type="checkbox" id="inventory_qty_increments_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 163 |
Â
<label for="inventory_qty_increments_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 164 |
Â
</td>
|
| 165 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 166 |
Â
</tr>
|
| 167 |
Â
|
| 168 |
Â
<tr>
|
| 174 |
Â
<input type="checkbox" id="inventory_stock_availability_checkbox" onclick="toggleValueElementsWithCheckbox(this)" />
|
| 175 |
Â
<label for="inventory_stock_availability_checkbox" class="normal"><?php echo Mage::helper('catalog')->__('Change') ?></label>
|
| 176 |
Â
</td>
|
| 177 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 178 |
Â
</tr>
|
| 179 |
Â
</table>
|
| 180 |
Â
</fieldset>
|
app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -330,7 +330,7 @@ if($('<?php echo $this->getAddButtonId() ?>')){
|
|
| 330 |
Â
|
| 331 |
Â
//validation for selected input type
|
| 332 |
Â
Validation.addAllThese([
|
| 333 |
-
['required-option-select',
|
| 334 |
Â
if (elm.getValue() == '') {
|
| 335 |
Â
return false;
|
| 336 |
Â
}
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 330 |
Â
|
| 331 |
Â
//validation for selected input type
|
| 332 |
Â
Validation.addAllThese([
|
| 333 |
+
['required-option-select', <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Select type of option')) ?>, function(v, elm) {
|
| 334 |
Â
if (elm.getValue() == '') {
|
| 335 |
Â
return false;
|
| 336 |
Â
}
|
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -36,7 +36,7 @@ OptionTemplateDate = '<table class="border" cellpadding="0" cellspacing="0">'+
|
|
| 36 |
Â
'</tr>'+
|
| 37 |
Â
'<tr>'+
|
| 38 |
Â
<?php if ($this->getCanReadPrice() !== false) : ?>
|
| 39 |
-
'<td><input type="text" class="input-text validate-
|
| 40 |
Â
'<td><?php echo $this->getPriceTypeSelectHtml() ?>{{checkboxScopePrice}}</td>' +
|
| 41 |
Â
<?php else : ?>
|
| 42 |
Â
'<input type="hidden" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]">' +
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 36 |
Â
'</tr>'+
|
| 37 |
Â
'<tr>'+
|
| 38 |
Â
<?php if ($this->getCanReadPrice() !== false) : ?>
|
| 39 |
+
'<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?>></td>' +
|
| 40 |
Â
'<td><?php echo $this->getPriceTypeSelectHtml() ?>{{checkboxScopePrice}}</td>' +
|
| 41 |
Â
<?php else : ?>
|
| 42 |
Â
'<input type="hidden" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]">' +
|
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,24 +29,28 @@
|
|
| 29 |
Â
OptionTemplateFile = '<table class="border" cellpadding="0" cellspacing="0">'+
|
| 30 |
Â
'<tr class="headings">'+
|
| 31 |
Â
<?php if ($this->getCanReadPrice() !== false) : ?>
|
| 32 |
-
'<th class="type-price"
|
| 33 |
-
'<th class="type-type"
|
| 34 |
Â
<?php endif; ?>
|
| 35 |
-
'<th class="type-sku"
|
| 36 |
-
'<th class="type-title"
|
| 37 |
-
'<th class="last"
|
| 38 |
-
'</tr>'+
|
| 39 |
-
'<tr>'+
|
| 40 |
Â
<?php if ($this->getCanReadPrice() !== false) : ?>
|
| 41 |
-
'<td><input class="input-text" type="text" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?>></td>' +
|
| 42 |
-
'<td
|
| 43 |
Â
<?php else : ?>
|
| 44 |
Â
'<input type="hidden" name="product[options][{{option_id}}][price]">' +
|
| 45 |
Â
'<input type="hidden" name="product[options][{{option_id}}][price_type]" id="product_option_{{option_id}}_price_type">' +
|
| 46 |
Â
<?php endif; ?>
|
| 47 |
-
'<td><input type="text" class="input-text" name="product[options][{{option_id}}][sku]" value="{{sku}}"></td>'+
|
| 48 |
-
'<td><input class="input-text" type="text" name="product[options][{{option_id}}][file_extension]" value="{{file_extension}}"></td>'+
|
| 49 |
-
'<td class="type-last last" nowrap><input class="input-text" type="text" name="product[options][{{option_id}}][image_size_x]" value="{{image_size_x}}">
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 50 |
Â
'</tr>'+
|
| 51 |
Â
'</table>';
|
| 52 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
OptionTemplateFile = '<table class="border" cellpadding="0" cellspacing="0">'+
|
| 30 |
Â
'<tr class="headings">'+
|
| 31 |
Â
<?php if ($this->getCanReadPrice() !== false) : ?>
|
| 32 |
+
'<th class="type-price">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Price')); ?> + '</th>' +
|
| 33 |
+
'<th class="type-type">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Price Type')); ?> + '</th>' +
|
| 34 |
Â
<?php endif; ?>
|
| 35 |
+
'<th class="type-sku">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('SKU')); ?> + '</th>' +
|
| 36 |
+
'<th class="type-title">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Allowed File Extensions')); ?> + '</th>'+
|
| 37 |
+
'<th class="last">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Maximum Image Size')); ?> + '</th>' +
|
| 38 |
+
'</tr>' +
|
| 39 |
+
'<tr>' +
|
| 40 |
Â
<?php if ($this->getCanReadPrice() !== false) : ?>
|
| 41 |
+
'<td><input class="input-text validate-zero-or-greater" type="text" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?>></td>' +
|
| 42 |
+
'<td>' + <?php echo $this->helper('core')->jsonEncode($this->getPriceTypeSelectHtml()) ?> + '</td>' +
|
| 43 |
Â
<?php else : ?>
|
| 44 |
Â
'<input type="hidden" name="product[options][{{option_id}}][price]">' +
|
| 45 |
Â
'<input type="hidden" name="product[options][{{option_id}}][price_type]" id="product_option_{{option_id}}_price_type">' +
|
| 46 |
Â
<?php endif; ?>
|
| 47 |
+
'<td><input type="text" class="input-text" name="product[options][{{option_id}}][sku]" value="{{sku}}"></td>' +
|
| 48 |
+
'<td><input class="input-text" type="text" name="product[options][{{option_id}}][file_extension]" value="{{file_extension}}"></td>' +
|
| 49 |
+
'<td class="type-last last" nowrap><input class="input-text" type="text" name="product[options][{{option_id}}][image_size_x]" value="{{image_size_x}}">' +
|
| 50 |
+
<?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('x')) ?> +
|
| 51 |
+
'<input class="input-text" type="text" name="product[options][{{option_id}}][image_size_y]" value="{{image_size_y}}">' +
|
| 52 |
+
<?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('px.')) ?> +
|
| 53 |
+
'<br/>' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('leave blank if its not an image')) ?> + '</td>' +
|
| 54 |
Â
'</tr>'+
|
| 55 |
Â
'</table>';
|
| 56 |
Â
|
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -153,7 +153,7 @@ if ($('option_panel_type_select')) {
|
|
| 153 |
Â
selectOptionType.bindRemoveButtons();
|
| 154 |
Â
|
| 155 |
Â
Validation.addAllThese([
|
| 156 |
-
['required-option-select-type-rows',
|
| 157 |
Â
var optionContainerElm = elm.up('div.grid');
|
| 158 |
Â
var selectTypesFlag = false;
|
| 159 |
Â
selectTypeElements = $$('#'+optionContainerElm.id+' .select-type-title');
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 153 |
Â
selectOptionType.bindRemoveButtons();
|
| 154 |
Â
|
| 155 |
Â
Validation.addAllThese([
|
| 156 |
+
['required-option-select-type-rows', <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Please add rows to option.')); ?>, function(v, elm) {
|
| 157 |
Â
var optionContainerElm = elm.up('div.grid');
|
| 158 |
Â
var selectTypesFlag = false;
|
| 159 |
Â
selectTypeElements = $$('#'+optionContainerElm.id+' .select-type-title');
|
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
ADDED
|
@@ -0,0 +1,169 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/** @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group */
|
| 29 |
+
$_htmlId = $this->getElement()->getHtmlId();
|
| 30 |
+
$_htmlClass = $this->getElement()->getClass();
|
| 31 |
+
$_htmlName = $this->getElement()->getName();
|
| 32 |
+
$_readonly = $this->getElement()->getReadonly();
|
| 33 |
+
$_priceValueValidation = $this->getPriceValidation('validate-zero-or-greater');
|
| 34 |
+
|
| 35 |
+
$_showWebsite= $this->isMultiWebsites();
|
| 36 |
+
?>
|
| 37 |
+
<tr>
|
| 38 |
+
<td class="label"><?php echo $this->getElement()->getLabel(); ?></td>
|
| 39 |
+
<td colspan="10" class="grid tier">
|
| 40 |
+
<table cellspacing="0" class="data border" id="group_prices_table">
|
| 41 |
+
<?php if ($_showWebsite) : ?>
|
| 42 |
+
<col width="135" />
|
| 43 |
+
<?php endif; ?>
|
| 44 |
+
<col width="120" />
|
| 45 |
+
<col />
|
| 46 |
+
<col width="1" />
|
| 47 |
+
<thead>
|
| 48 |
+
<tr class="headings">
|
| 49 |
+
<th <?php if (!$_showWebsite): ?>style="display: none;"<?php endif; ?>><?php echo Mage::helper('catalog')->__('Website'); ?></th>
|
| 50 |
+
<th><?php echo Mage::helper('catalog')->__('Customer Group'); ?></th>
|
| 51 |
+
<th><?php echo $this->getPriceColumnHeader(Mage::helper('catalog')->__('Price')); ?></th>
|
| 52 |
+
<th class="last"><?php echo Mage::helper('catalog')->__('Action'); ?></th>
|
| 53 |
+
</tr>
|
| 54 |
+
</thead>
|
| 55 |
+
<tbody id="<?php echo $_htmlId; ?>_container"></tbody>
|
| 56 |
+
<tfoot>
|
| 57 |
+
<tr>
|
| 58 |
+
<td <?php if (!$_showWebsite): ?>style="display: none;"<?php endif; ?>></td>
|
| 59 |
+
<td colspan="4" class="a-right"><?php echo $this->getAddButtonHtml(); ?></td>
|
| 60 |
+
</tr>
|
| 61 |
+
</tfoot>
|
| 62 |
+
</table>
|
| 63 |
+
|
| 64 |
+
<script type="text/javascript">
|
| 65 |
+
//<![CDATA[
|
| 66 |
+
var groupPriceRowTemplate = '<tr>'
|
| 67 |
+
+ '<td<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
|
| 68 |
+
+ '<select class="<?php echo $_htmlClass; ?> required-entry" name="<?php echo $_htmlName; ?>[{{index}}][website_id]" id="group_price_row_{{index}}_website">'
|
| 69 |
+
<?php foreach ($this->getWebsites() as $_websiteId => $_info) : ?>
|
| 70 |
+
+ '<option value="<?php echo $_websiteId; ?>"><?php echo $this->jsQuoteEscape($this->escapeHtml($_info['name'])); ?><?php if (!empty($_info['currency'])) : ?> [<?php echo $this->escapeHtml($_info['currency']); ?>]<?php endif; ?></option>'
|
| 71 |
+
<?php endforeach; ?>
|
| 72 |
+
+ '</select></td>'
|
| 73 |
+
+ '<td><select class="<?php echo $_htmlClass; ?> custgroup required-entry" name="<?php echo $_htmlName; ?>[{{index}}][cust_group]" id="group_price_row_{{index}}_cust_group">'
|
| 74 |
+
<?php foreach ($this->getCustomerGroups() as $_groupId => $_groupName): ?>
|
| 75 |
+
+ '<option value="<?php echo $_groupId; ?>"><?php echo $this->jsQuoteEscape($this->escapeHtml($_groupName)); ?></option>'
|
| 76 |
+
<?php endforeach; ?>
|
| 77 |
+
+ '</select></td>'
|
| 78 |
+
+ '<td><input class="<?php echo $_htmlClass; ?> required-entry <?php echo $_priceValueValidation; ?>" type="text" name="<?php echo $_htmlName; ?>[{{index}}][price]" value="{{price}}" id="group_price_row_{{index}}_price" /></td>'
|
| 79 |
+
+ '<td class="last"><input type="hidden" name="<?php echo $_htmlName; ?>[{{index}}][delete]" class="delete" value="" id="group_price_row_{{index}}_delete" />'
|
| 80 |
+
+ '<button title="<?php echo Mage::helper('catalog')->__('Delete Group Price'); ?>" type="button" class="scalable delete icon-btn delete-product-option" id="group_price_row_{{index}}_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
|
| 81 |
+
+ '<span><?php echo Mage::helper('catalog')->__('Delete'); ?></span></button></td>'
|
| 82 |
+
+ '</tr>';
|
| 83 |
+
|
| 84 |
+
var groupPriceControl = {
|
| 85 |
+
template: new Template(groupPriceRowTemplate, new RegExp('(^|.|\\r|\\n)({{\\s*(\\w+)\\s*}})', '')),
|
| 86 |
+
itemsCount: 0,
|
| 87 |
+
addItem : function () {
|
| 88 |
+
<?php if ($_readonly): ?>
|
| 89 |
+
if (arguments.length < 3) {
|
| 90 |
+
return;
|
| 91 |
+
}
|
| 92 |
+
<?php endif; ?>
|
| 93 |
+
var data = {
|
| 94 |
+
website_id: '<?php echo $this->getDefaultWebsite(); ?>',
|
| 95 |
+
group: '<?php echo $this->getDefaultCustomerGroup(); ?>',
|
| 96 |
+
price: '',
|
| 97 |
+
readOnly: false,
|
| 98 |
+
index: this.itemsCount++
|
| 99 |
+
};
|
| 100 |
+
|
| 101 |
+
if(arguments.length >= 3) {
|
| 102 |
+
data.website_id = arguments[0];
|
| 103 |
+
data.group = arguments[1];
|
| 104 |
+
data.price = arguments[2];
|
| 105 |
+
}
|
| 106 |
+
if (arguments.length == 4) {
|
| 107 |
+
data.readOnly = arguments[3];
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
+
Element.insert($('<?php echo $_htmlId; ?>_container'), {
|
| 111 |
+
bottom : this.template.evaluate(data)
|
| 112 |
+
});
|
| 113 |
+
|
| 114 |
+
$('group_price_row_' + data.index + '_cust_group').value = data.group;
|
| 115 |
+
$('group_price_row_' + data.index + '_website').value = data.website_id;
|
| 116 |
+
|
| 117 |
+
<?php if ($this->isShowWebsiteColumn() && !$this->isAllowChangeWebsite()): ?>
|
| 118 |
+
var websiteElement = $('group_price_row_' + data.index + '_website');
|
| 119 |
+
var websiteCaption = websiteElement.options[websiteElement.selectedIndex].text;
|
| 120 |
+
|
| 121 |
+
websiteElement.insert({after:'<span class="website-name">' + websiteCaption + '</span>'});
|
| 122 |
+
websiteElement.hide();
|
| 123 |
+
<?php endif;?>
|
| 124 |
+
|
| 125 |
+
if (data.readOnly == '1') {
|
| 126 |
+
['website', 'cust_group', 'price', 'delete'].each(function(element_suffix) {
|
| 127 |
+
$('group_price_row_' + data.index + '_' + element_suffix).disabled = true;
|
| 128 |
+
});
|
| 129 |
+
$('group_price_row_' + data.index + '_delete_button').hide();
|
| 130 |
+
}
|
| 131 |
+
|
| 132 |
+
<?php if ($_readonly): ?>
|
| 133 |
+
$('<?php echo $_htmlId; ?>_container').select('input', 'select').each(this.disableElement);
|
| 134 |
+
$('<?php echo $_htmlId; ?>_container').up('table').select('button').each(this.disableElement);
|
| 135 |
+
<?php else: ?>
|
| 136 |
+
$('<?php echo $_htmlId; ?>_container').select('input', 'select').each(function(element) {
|
| 137 |
+
Event.observe(element, 'change', element.setHasChanges.bind(element));
|
| 138 |
+
});
|
| 139 |
+
<?php endif; ?>
|
| 140 |
+
},
|
| 141 |
+
disableElement: function(element) {
|
| 142 |
+
element.disabled = true;
|
| 143 |
+
element.addClassName('disabled');
|
| 144 |
+
},
|
| 145 |
+
deleteItem: function(event) {
|
| 146 |
+
var tr = Event.findElement(event, 'tr');
|
| 147 |
+
if (tr) {
|
| 148 |
+
Element.select(tr, '.delete').each(function(element) {
|
| 149 |
+
element.value='1';
|
| 150 |
+
});
|
| 151 |
+
Element.select(tr, ['input', 'select']).each(function(element) {
|
| 152 |
+
element.hide();
|
| 153 |
+
});
|
| 154 |
+
Element.hide(tr);
|
| 155 |
+
Element.addClassName(tr, 'no-display template');
|
| 156 |
+
}
|
| 157 |
+
return false;
|
| 158 |
+
}
|
| 159 |
+
};
|
| 160 |
+
<?php foreach ($this->getValues() as $_item) : ?>
|
| 161 |
+
groupPriceControl.addItem('<?php echo $_item['website_id']; ?>', '<?php echo $_item['cust_group']; ?>', '<?php echo sprintf('%.2f', $_item['price']); ?>', <?php echo (int)!empty($_item['readonly']); ?>);
|
| 162 |
+
<?php endforeach; ?>
|
| 163 |
+
<?php if ($_readonly) : ?>
|
| 164 |
+
$('<?php echo $_htmlId; ?>_container').up('table').select('button')
|
| 165 |
+
.each(groupPriceControl.disableElement);
|
| 166 |
+
<?php endif; ?>
|
| 167 |
+
//]]>
|
| 168 |
+
</script>
|
| 169 |
+
</td></tr>
|
app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/* @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier */
|
|
@@ -80,11 +80,11 @@ var tierPriceRowTemplate = '<tr>'
|
|
| 80 |
Â
<?php endforeach ?>
|
| 81 |
Â
+ '</select></td>'
|
| 82 |
Â
+ '<td class="nobr"><input class="<?php echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php echo $_htmlName ?>[{{index}}][price_qty]" value="{{qty}}" id="tier_price_row_{{index}}_qty" />'
|
| 83 |
-
+ ' <small class="nobr"><?php echo Mage::helper(
|
| 84 |
Â
+ '<td><input class="<?php echo $_htmlClass ?> required-entry <?php echo $_priceValueValidation ?>" type="text" name="<?php echo $_htmlName ?>[{{index}}][price]" value="{{price}}" id="tier_price_row_{{index}}_price" /></td>'
|
| 85 |
Â
+ '<td class="last"><input type="hidden" name="<?php echo $_htmlName ?>[{{index}}][delete]" class="delete" value="" id="tier_price_row_{{index}}_delete" />'
|
| 86 |
-
+ '<button title="<?php echo Mage::helper(
|
| 87 |
-
+ '<span><?php echo Mage::helper(
|
| 88 |
Â
+ '</tr>';
|
| 89 |
Â
|
| 90 |
Â
var tierPriceControl = {
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/* @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier */
|
| 80 |
Â
<?php endforeach ?>
|
| 81 |
Â
+ '</select></td>'
|
| 82 |
Â
+ '<td class="nobr"><input class="<?php echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php echo $_htmlName ?>[{{index}}][price_qty]" value="{{qty}}" id="tier_price_row_{{index}}_qty" />'
|
| 83 |
+
+ ' <small class="nobr"><?php echo Mage::helper('catalog')->__("and above")?></small></td>'
|
| 84 |
Â
+ '<td><input class="<?php echo $_htmlClass ?> required-entry <?php echo $_priceValueValidation ?>" type="text" name="<?php echo $_htmlName ?>[{{index}}][price]" value="{{price}}" id="tier_price_row_{{index}}_price" /></td>'
|
| 85 |
Â
+ '<td class="last"><input type="hidden" name="<?php echo $_htmlName ?>[{{index}}][delete]" class="delete" value="" id="tier_price_row_{{index}}_delete" />'
|
| 86 |
+
+ '<button title="<?php echo Mage::helper('catalog')->__("Delete Tier") ?>" type="button" class="scalable delete icon-btn delete-product-option" id="tier_price_row_{{index}}_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
|
| 87 |
+
+ '<span><span><span><?php echo Mage::helper('catalog')->__("Delete") ?></span></span></span></button></td>'
|
| 88 |
Â
+ '</tr>';
|
| 89 |
Â
|
| 90 |
Â
var tierPriceControl = {
|
app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -72,7 +72,7 @@
|
|
| 72 |
Â
</div>
|
| 73 |
Â
<div class="values-container right">
|
| 74 |
Â
<label for="__id___label" class="bold"><?php echo Mage::helper('catalog')->__('Attribute Name:') ?></label>
|
| 75 |
-
<input id="__id___label" type="text" <?php if ($this->
|
| 76 |
Â
<input id="__id___label_use_default" type="checkbox" value="1" " checked="use_default" class="attribute-use-default-label">
|
| 77 |
Â
<label for="__id___label_use_default"><?php echo Mage::helper('catalog')->__('Use default')?> ('{{store_label}}')</label>
|
| 78 |
Â
<ul class="attribute-values">
|
|
@@ -87,17 +87,17 @@
|
|
| 87 |
Â
<div class="attribute-values-container-main">
|
| 88 |
Â
<div class="attribute-values-container left">
|
| 89 |
Â
<?php echo Mage::helper('catalog')->__('Price:') ?>
|
| 90 |
-
<input id="__id___pricing" type="text" <?php if ($this->
|
| 91 |
Â
</div>
|
| 92 |
Â
<div class="attribute-values-container left">
|
| 93 |
-
<select class="attribute-price-type" id="__id___price_type" <?php if ($this->
|
| 94 |
Â
<option value="0"><?php echo Mage::helper('catalog')->__('Fixed') ?></option>
|
| 95 |
Â
<option value="1"><?php echo Mage::helper('catalog')->__('Percentage') ?></option>
|
| 96 |
Â
</select>
|
| 97 |
Â
</div>
|
| 98 |
Â
<?php if ($this->getShowUseDefaultPrice()):?>
|
| 99 |
Â
<div class="attribute-values-container">
|
| 100 |
-
<input id="__id___default" type="checkbox" <?php if ($this->
|
| 101 |
Â
</div>
|
| 102 |
Â
<?php endif;?>
|
| 103 |
Â
<?php else : ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 72 |
Â
</div>
|
| 73 |
Â
<div class="values-container right">
|
| 74 |
Â
<label for="__id___label" class="bold"><?php echo Mage::helper('catalog')->__('Attribute Name:') ?></label>
|
| 75 |
+
<input id="__id___label" type="text" <?php if ($this->isAttributesConfigurationReadonly()): ?> disabled="disabled" <?php endif;?> class="input-text attribute-label required-entry template no-display" value="'{{label}}'" readonly="label" />
|
| 76 |
Â
<input id="__id___label_use_default" type="checkbox" value="1" " checked="use_default" class="attribute-use-default-label">
|
| 77 |
Â
<label for="__id___label_use_default"><?php echo Mage::helper('catalog')->__('Use default')?> ('{{store_label}}')</label>
|
| 78 |
Â
<ul class="attribute-values">
|
| 87 |
Â
<div class="attribute-values-container-main">
|
| 88 |
Â
<div class="attribute-values-container left">
|
| 89 |
Â
<?php echo Mage::helper('catalog')->__('Price:') ?>
|
| 90 |
+
<input id="__id___pricing" type="text" <?php if ($this->isAttributesPricesReadonly() || $this->getCanEditPrice() === false): ?> disabled="disabled" <?php endif;?> class="input-text attribute-price validate-number template no-display" value="'{{pricing_value}}'"/>
|
| 91 |
Â
</div>
|
| 92 |
Â
<div class="attribute-values-container left">
|
| 93 |
+
<select class="attribute-price-type" id="__id___price_type" <?php if ($this->isAttributesPricesReadonly() || $this->getCanEditPrice() === false): ?> disabled="disabled" <?php endif;?>>
|
| 94 |
Â
<option value="0"><?php echo Mage::helper('catalog')->__('Fixed') ?></option>
|
| 95 |
Â
<option value="1"><?php echo Mage::helper('catalog')->__('Percentage') ?></option>
|
| 96 |
Â
</select>
|
| 97 |
Â
</div>
|
| 98 |
Â
<?php if ($this->getShowUseDefaultPrice()):?>
|
| 99 |
Â
<div class="attribute-values-container">
|
| 100 |
+
<input id="__id___default" type="checkbox" <?php if ($this->isAttributesPricesReadonly() || $this->getCanEditPrice() === false): ?> disabled="disabled" <?php endif;?> class="attribute-use-default-value"> <label for="__id___default" class="normal"><?php echo Mage::helper('catalog')->__('Use Default Value') ?></label>
|
| 101 |
Â
</div>
|
| 102 |
Â
<?php endif;?>
|
| 103 |
Â
<?php else : ?>
|
app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -38,35 +38,38 @@
|
|
| 38 |
Â
</li>
|
| 39 |
Â
</ul>
|
| 40 |
Â
<?php endif; ?>
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
<div class="
|
| 44 |
-
|
| 45 |
-
<
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
<
|
| 50 |
-
|
| 51 |
-
|
| 52 |
-
|
| 53 |
-
<
|
| 54 |
-
|
| 55 |
-
<
|
| 56 |
-
|
| 57 |
-
<
|
| 58 |
-
<?php
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 63 |
Â
<?php endforeach; ?>
|
| 64 |
-
</table>
|
| 65 |
Â
</div>
|
| 66 |
-
|
| 67 |
Â
</div>
|
| 68 |
Â
</div>
|
| 69 |
-
<?php endforeach; ?>
|
| 70 |
Â
</fieldset>
|
| 71 |
Â
</div>
|
| 72 |
Â
<script type="text/javascript">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 38 |
Â
</li>
|
| 39 |
Â
</ul>
|
| 40 |
Â
<?php endif; ?>
|
| 41 |
+
<div class="store-scope">
|
| 42 |
+
<?php echo $this->getHintHtml() ?>
|
| 43 |
+
<div class="tree-store-scope">
|
| 44 |
+
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
| 45 |
+
<div class="website-name">
|
| 46 |
+
<input name="product[website_ids][]" value="<?php echo $_website->getId() ?>" <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="product_website_<?php echo $_website->getId() ?>" type="checkbox"<?php if($this->hasWebsite($_website->getId())): ?> checked="checked"<?php endif; ?> />
|
| 47 |
+
<big><strong><label for="product_website_<?php echo $_website->getId() ?>"><?php echo $this->escapeHtml($_website->getName()) ?></label></strong></big>
|
| 48 |
+
</div>
|
| 49 |
+
<div class="webiste-groups" id="product_website_<?php echo $_website->getId() ?>_data">
|
| 50 |
+
<?php foreach ($this->getGroupCollection($_website) as $_group): ?>
|
| 51 |
+
<h4><?php echo $this->escapeHtml($_group->getName()) ?></h4>
|
| 52 |
+
<div class="group-stores">
|
| 53 |
+
<table>
|
| 54 |
+
<?php foreach ($this->getStoreCollection($_group) as $_store): ?>
|
| 55 |
+
<tr>
|
| 56 |
+
<td><?php echo $this->escapeHtml($_store->getName()) ?></td>
|
| 57 |
+
<td>
|
| 58 |
+
<?php if($this->getWebsites() && !$this->hasWebsite($_website->getId())): ?>
|
| 59 |
+
<span class="website-<?php echo $_website->getId() ?>-select" style="display:none">
|
| 60 |
+
<?php echo Mage::helper('catalog')->__('(Copy data from: %s)', $this->getChooseFromStoreHtml($_store)) ?>
|
| 61 |
+
</span>
|
| 62 |
+
<?php endif; ?>
|
| 63 |
+
</td>
|
| 64 |
+
</tr>
|
| 65 |
+
<?php endforeach; ?>
|
| 66 |
+
</table>
|
| 67 |
+
</div>
|
| 68 |
Â
<?php endforeach; ?>
|
|
Â
|
|
| 69 |
Â
</div>
|
| 70 |
+
<?php endforeach; ?>
|
| 71 |
Â
</div>
|
| 72 |
Â
</div>
|
|
Â
|
|
| 73 |
Â
</fieldset>
|
| 74 |
Â
</div>
|
| 75 |
Â
<script type="text/javascript">
|
app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/price.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -213,13 +213,13 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
|
|
| 213 |
Â
<p class="special-price">
|
| 214 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 215 |
Â
<span class="price-excluding-tax">
|
| 216 |
-
<span class="label"><?php echo $
|
| 217 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 218 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 219 |
Â
</span>
|
| 220 |
Â
</span>
|
| 221 |
Â
<span class="price-including-tax">
|
| 222 |
-
<span class="label"><?php echo $
|
| 223 |
Â
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 224 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPriceInclTax+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 225 |
Â
</span>
|
|
@@ -245,7 +245,7 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
|
|
| 245 |
Â
<p class="special-price">
|
| 246 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 247 |
Â
<span class="price-excluding-tax">
|
| 248 |
-
<span class="label"><?php echo $
|
| 249 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 250 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 251 |
Â
</span>
|
|
@@ -275,7 +275,7 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
|
|
| 275 |
Â
<p class="special-price">
|
| 276 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 277 |
Â
<span class="price-excluding-tax">
|
| 278 |
-
<span class="label"><?php echo $
|
| 279 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 280 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 281 |
Â
</span>
|
|
@@ -305,7 +305,7 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
|
|
| 305 |
Â
<p class="special-price">
|
| 306 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 307 |
Â
<span class="price-excluding-tax">
|
| 308 |
-
<span class="label"><?php echo $
|
| 309 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 310 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice, $_storeId, true, false) ?>
|
| 311 |
Â
</span>
|
|
@@ -316,7 +316,7 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
|
|
| 316 |
Â
</span>
|
| 317 |
Â
<?php endforeach; ?>
|
| 318 |
Â
<span class="price-including-tax">
|
| 319 |
-
<span class="label"><?php echo $
|
| 320 |
Â
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 321 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPriceInclTax+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 322 |
Â
</span>
|
|
@@ -334,7 +334,7 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
|
|
| 334 |
Â
<p class="special-price">
|
| 335 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 336 |
Â
<span class="price-excluding-tax">
|
| 337 |
-
<span class="label"><?php echo $
|
| 338 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 339 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice, $_storeId, true, false) ?>
|
| 340 |
Â
</span>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 213 |
Â
<p class="special-price">
|
| 214 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 215 |
Â
<span class="price-excluding-tax">
|
| 216 |
+
<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
|
| 217 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 218 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 219 |
Â
</span>
|
| 220 |
Â
</span>
|
| 221 |
Â
<span class="price-including-tax">
|
| 222 |
+
<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
|
| 223 |
Â
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 224 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPriceInclTax+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 225 |
Â
</span>
|
| 245 |
Â
<p class="special-price">
|
| 246 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 247 |
Â
<span class="price-excluding-tax">
|
| 248 |
+
<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
|
| 249 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 250 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 251 |
Â
</span>
|
| 275 |
Â
<p class="special-price">
|
| 276 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 277 |
Â
<span class="price-excluding-tax">
|
| 278 |
+
<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
|
| 279 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 280 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 281 |
Â
</span>
|
| 305 |
Â
<p class="special-price">
|
| 306 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 307 |
Â
<span class="price-excluding-tax">
|
| 308 |
+
<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
|
| 309 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 310 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice, $_storeId, true, false) ?>
|
| 311 |
Â
</span>
|
| 316 |
Â
</span>
|
| 317 |
Â
<?php endforeach; ?>
|
| 318 |
Â
<span class="price-including-tax">
|
| 319 |
+
<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
|
| 320 |
Â
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 321 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPriceInclTax+$_weeeTaxAmount, $_storeId, true, false) ?>
|
| 322 |
Â
</span>
|
| 334 |
Â
<p class="special-price">
|
| 335 |
Â
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 336 |
Â
<span class="price-excluding-tax">
|
| 337 |
+
<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
|
| 338 |
Â
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
|
| 339 |
Â
<?php echo $_coreHelper->currencyByStore($_finalPrice, $_storeId, true, false) ?>
|
| 340 |
Â
</span>
|
app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -49,7 +49,7 @@
|
|
| 49 |
Â
<input type="checkbox" id="inventory_use_config_manage_stock" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 50 |
Â
<label for="inventory_use_config_manage_stock" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 51 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);</script><?php endif; ?></td>
|
| 52 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 53 |
Â
</tr>
|
| 54 |
Â
|
| 55 |
Â
<?php if(!$this->getProduct()->isComposite()): ?>
|
|
@@ -61,7 +61,7 @@
|
|
| 61 |
Â
<?php endif;?>
|
| 62 |
Â
<input type="text" class="input-text required-entry validate-number" id="inventory_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][qty]" value="<?php echo $this->getFieldValue('qty')*1 ?>" <?php echo $_readonly;?>/>
|
| 63 |
Â
</td>
|
| 64 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 65 |
Â
</tr>
|
| 66 |
Â
|
| 67 |
Â
<tr>
|
|
@@ -72,7 +72,7 @@
|
|
| 72 |
Â
<input type="checkbox" id="inventory_use_config_min_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?> />
|
| 73 |
Â
<label for="inventory_use_config_min_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 74 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);</script><?php endif; ?></td>
|
| 75 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 76 |
Â
</tr>
|
| 77 |
Â
|
| 78 |
Â
<tr>
|
|
@@ -83,7 +83,7 @@
|
|
| 83 |
Â
<input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?> />
|
| 84 |
Â
<label for="inventory_use_config_min_sale_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 85 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);</script><?php endif; ?></td>
|
| 86 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 87 |
Â
</tr>
|
| 88 |
Â
|
| 89 |
Â
<tr>
|
|
@@ -94,7 +94,7 @@
|
|
| 94 |
Â
<input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?> />
|
| 95 |
Â
<label for="inventory_use_config_max_sale_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 96 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);</script><?php endif; ?></td>
|
| 97 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 98 |
Â
</tr>
|
| 99 |
Â
|
| 100 |
Â
<?php if($this->canUseQtyDecimals()): ?>
|
|
@@ -105,8 +105,21 @@
|
|
| 105 |
Â
<option value="1"<?php if($this->getFieldValue('is_qty_decimal')==1): ?> selected="selected"<?php endif; ?>><?php echo Mage::helper('catalog')->__('Yes') ?></option>
|
| 106 |
Â
</select>
|
| 107 |
Â
</td>
|
| 108 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 109 |
Â
</tr>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 110 |
Â
<?php endif; ?>
|
| 111 |
Â
|
| 112 |
Â
<tr>
|
|
@@ -122,7 +135,7 @@
|
|
| 122 |
Â
<input type="checkbox" id="inventory_use_config_backorders" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?> />
|
| 123 |
Â
<label for="inventory_use_config_backorders" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 124 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);</script><?php endif; ?></td>
|
| 125 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 126 |
Â
</tr>
|
| 127 |
Â
<tr>
|
| 128 |
Â
<td class="label"><label for="inventory_notify_stock_qty"><?php echo Mage::helper('catalog')->__('Notify for Quantity Below') ?></label></td>
|
|
@@ -132,7 +145,7 @@
|
|
| 132 |
Â
<input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 133 |
Â
<label for="inventory_use_config_notify_stock_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 134 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);</script><?php endif; ?></td>
|
| 135 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 136 |
Â
</tr>
|
| 137 |
Â
<?php endif; ?>
|
| 138 |
Â
<tr>
|
|
@@ -147,7 +160,7 @@
|
|
| 147 |
Â
<input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 148 |
Â
<label for="inventory_use_config_enable_qty_increments" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 149 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);</script><?php endif; ?></td>
|
| 150 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 151 |
Â
</tr>
|
| 152 |
Â
<tr>
|
| 153 |
Â
<td class="label"><label for="inventory_qty_increments"><?php echo Mage::helper('catalog')->__('Qty Increments') ?></label></td>
|
|
@@ -157,7 +170,7 @@
|
|
| 157 |
Â
<input type="checkbox" id="inventory_use_config_qty_increments" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 158 |
Â
<label for="inventory_use_config_qty_increments" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 159 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);</script><?php endif; ?></td>
|
| 160 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 161 |
Â
</tr>
|
| 162 |
Â
<tr>
|
| 163 |
Â
<td class="label"><label for="inventory_stock_availability"><?php echo Mage::helper('catalog')->__('Stock Availability') ?></label></td>
|
|
@@ -168,66 +181,83 @@
|
|
| 168 |
Â
<?php endforeach; ?>
|
| 169 |
Â
</select>
|
| 170 |
Â
</td>
|
| 171 |
-
<td class="value scope-label"><?php echo Mage::helper('
|
| 172 |
Â
</tr>
|
| 173 |
Â
</table>
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
|
| 177 |
-
|
| 178 |
-
inventory_max_sale_qty: true,
|
| 179 |
-
inventory_qty_increments: true
|
| 180 |
-
};
|
| 181 |
Â
function changeManageStockOption()
|
| 182 |
Â
{
|
| 183 |
-
|
| 184 |
-
|
| 185 |
-
|
| 186 |
-
|
| 187 |
-
|
| 188 |
-
|
| 189 |
-
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
|
| 193 |
-
|
| 194 |
-
|
| 195 |
-
return;
|
| 196 |
-
}
|
| 197 |
-
for(field in cataloginventoryNotManagestockFields) {
|
| 198 |
-
if ($(field) && ($(field).up(1) == el)) {
|
| 199 |
Â
return;
|
| 200 |
Â
}
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
-
|
| 206 |
-
|
| 207 |
-
|
| 208 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 209 |
Â
}
|
| 210 |
-
Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
|
| 211 |
-
Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
|
| 212 |
-
changeManageStockOption();
|
| 213 |
Â
|
| 214 |
Â
function applyEnableQtyIncrements() {
|
| 215 |
-
|
| 216 |
-
|
| 217 |
-
|
| 218 |
-
|
| 219 |
-
|
| 220 |
-
|
| 221 |
-
|
| 222 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 223 |
Â
} else {
|
| 224 |
-
$('inventory_qty_increments').
|
|
Â
|
|
| 225 |
Â
}
|
| 226 |
Â
}
|
| 227 |
-
|
| 228 |
-
Event.observe(
|
| 229 |
-
|
| 230 |
-
|
| 231 |
-
|
| 232 |
-
|
| 233 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 49 |
Â
<input type="checkbox" id="inventory_use_config_manage_stock" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 50 |
Â
<label for="inventory_use_config_manage_stock" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 51 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);</script><?php endif; ?></td>
|
| 52 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 53 |
Â
</tr>
|
| 54 |
Â
|
| 55 |
Â
<?php if(!$this->getProduct()->isComposite()): ?>
|
| 61 |
Â
<?php endif;?>
|
| 62 |
Â
<input type="text" class="input-text required-entry validate-number" id="inventory_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][qty]" value="<?php echo $this->getFieldValue('qty')*1 ?>" <?php echo $_readonly;?>/>
|
| 63 |
Â
</td>
|
| 64 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 65 |
Â
</tr>
|
| 66 |
Â
|
| 67 |
Â
<tr>
|
| 72 |
Â
<input type="checkbox" id="inventory_use_config_min_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?> />
|
| 73 |
Â
<label for="inventory_use_config_min_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 74 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);</script><?php endif; ?></td>
|
| 75 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 76 |
Â
</tr>
|
| 77 |
Â
|
| 78 |
Â
<tr>
|
| 83 |
Â
<input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?> />
|
| 84 |
Â
<label for="inventory_use_config_min_sale_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 85 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);</script><?php endif; ?></td>
|
| 86 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 87 |
Â
</tr>
|
| 88 |
Â
|
| 89 |
Â
<tr>
|
| 94 |
Â
<input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?> />
|
| 95 |
Â
<label for="inventory_use_config_max_sale_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 96 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);</script><?php endif; ?></td>
|
| 97 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 98 |
Â
</tr>
|
| 99 |
Â
|
| 100 |
Â
<?php if($this->canUseQtyDecimals()): ?>
|
| 105 |
Â
<option value="1"<?php if($this->getFieldValue('is_qty_decimal')==1): ?> selected="selected"<?php endif; ?>><?php echo Mage::helper('catalog')->__('Yes') ?></option>
|
| 106 |
Â
</select>
|
| 107 |
Â
</td>
|
| 108 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 109 |
Â
</tr>
|
| 110 |
+
|
| 111 |
+
<?php if (!$this->isVirtual()) : ?>
|
| 112 |
+
<tr>
|
| 113 |
+
<td class="label"><label for="inventory_is_decimal_divided"><?php echo Mage::helper('catalog')->__('Can be Divided into Multiple Boxes for Shipping') ?></label></td>
|
| 114 |
+
<td class="value"><select id="inventory_is_decimal_divided" name="<?php echo $this->getFieldSuffix() ?>[stock_data][is_decimal_divided]" class="select" <?php echo $_readonly;?>>
|
| 115 |
+
<option value="0"><?php echo Mage::helper('catalog')->__('No') ?></option>
|
| 116 |
+
<option value="1"<?php if($this->getFieldValue('is_decimal_divided') == 1): ?> selected="selected"<?php endif; ?>><?php echo Mage::helper('catalog')->__('Yes') ?></option>
|
| 117 |
+
</select>
|
| 118 |
+
</td>
|
| 119 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 120 |
+
</tr>
|
| 121 |
+
<?php endif; ?>
|
| 122 |
+
|
| 123 |
Â
<?php endif; ?>
|
| 124 |
Â
|
| 125 |
Â
<tr>
|
| 135 |
Â
<input type="checkbox" id="inventory_use_config_backorders" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?> />
|
| 136 |
Â
<label for="inventory_use_config_backorders" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 137 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);</script><?php endif; ?></td>
|
| 138 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 139 |
Â
</tr>
|
| 140 |
Â
<tr>
|
| 141 |
Â
<td class="label"><label for="inventory_notify_stock_qty"><?php echo Mage::helper('catalog')->__('Notify for Quantity Below') ?></label></td>
|
| 145 |
Â
<input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 146 |
Â
<label for="inventory_use_config_notify_stock_qty" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 147 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);</script><?php endif; ?></td>
|
| 148 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 149 |
Â
</tr>
|
| 150 |
Â
<?php endif; ?>
|
| 151 |
Â
<tr>
|
| 160 |
Â
<input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 161 |
Â
<label for="inventory_use_config_enable_qty_increments" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 162 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);</script><?php endif; ?></td>
|
| 163 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 164 |
Â
</tr>
|
| 165 |
Â
<tr>
|
| 166 |
Â
<td class="label"><label for="inventory_qty_increments"><?php echo Mage::helper('catalog')->__('Qty Increments') ?></label></td>
|
| 170 |
Â
<input type="checkbox" id="inventory_use_config_qty_increments" name="<?php echo $this->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>/>
|
| 171 |
Â
<label for="inventory_use_config_qty_increments" class="normal"><?php echo Mage::helper('catalog')->__('Use Config Settings') ?></label>
|
| 172 |
Â
<?php if (!$this->isReadonly()):?><script type="text/javascript">toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);</script><?php endif; ?></td>
|
| 173 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 174 |
Â
</tr>
|
| 175 |
Â
<tr>
|
| 176 |
Â
<td class="label"><label for="inventory_stock_availability"><?php echo Mage::helper('catalog')->__('Stock Availability') ?></label></td>
|
| 181 |
Â
<?php endforeach; ?>
|
| 182 |
Â
</select>
|
| 183 |
Â
</td>
|
| 184 |
+
<td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
|
| 185 |
Â
</tr>
|
| 186 |
Â
</table>
|
| 187 |
+
</fieldset>
|
| 188 |
+
</div>
|
| 189 |
+
<script type="text/javascript">
|
| 190 |
+
//<![CDATA[
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 191 |
Â
function changeManageStockOption()
|
| 192 |
Â
{
|
| 193 |
+
var manageStock = $('inventory_use_config_manage_stock').checked
|
| 194 |
+
? $('inventory_manage_stock_default').value
|
| 195 |
+
: $('inventory_manage_stock').value;
|
| 196 |
+
var catalogInventoryNotManageStockFields = {
|
| 197 |
+
inventory_min_sale_qty: true,
|
| 198 |
+
inventory_max_sale_qty: true,
|
| 199 |
+
inventory_enable_qty_increments : true,
|
| 200 |
+
inventory_qty_increments: true
|
| 201 |
+
};
|
| 202 |
+
|
| 203 |
+
$$('#table_cataloginventory tr').each(function(el) {
|
| 204 |
+
if (el == $('inventory_manage_stock').up(1)) {
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 205 |
Â
return;
|
| 206 |
Â
}
|
| 207 |
+
|
| 208 |
+
for (field in catalogInventoryNotManageStockFields) {
|
| 209 |
+
if ($(field) && ($(field).up(1) == el)) {
|
| 210 |
+
return;
|
| 211 |
+
}
|
| 212 |
+
}
|
| 213 |
+
|
| 214 |
+
el[manageStock == 1 ? 'show' : 'hide']();
|
| 215 |
+
});
|
| 216 |
+
|
| 217 |
+
return true;
|
| 218 |
Â
}
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 219 |
Â
|
| 220 |
Â
function applyEnableQtyIncrements() {
|
| 221 |
+
var enableQtyIncrements = $('inventory_use_config_enable_qty_increments').checked
|
| 222 |
+
? $('inventory_enable_qty_increments_default').value
|
| 223 |
+
: $('inventory_enable_qty_increments').value;
|
| 224 |
+
|
| 225 |
+
$('inventory_qty_increments').up('tr')[enableQtyIncrements == 1 ? 'show' : 'hide']();
|
| 226 |
+
}
|
| 227 |
+
|
| 228 |
+
function applyEnableDecimalDivided() {
|
| 229 |
+
<?php if (!$this->isVirtual()) : ?>
|
| 230 |
+
$('inventory_is_decimal_divided').up('tr').hide();
|
| 231 |
+
<?php endif; ?>
|
| 232 |
+
$('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
|
| 233 |
+
$('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
|
| 234 |
+
if ($('inventory_is_qty_decimal').value == 1) {
|
| 235 |
+
<?php if (!$this->isVirtual()) : ?>
|
| 236 |
+
$('inventory_is_decimal_divided').up('tr').show();
|
| 237 |
+
<?php endif; ?>
|
| 238 |
+
$('inventory_qty_increments').addClassName('validate-number');
|
| 239 |
+
$('inventory_min_sale_qty').addClassName('validate-number');
|
| 240 |
Â
} else {
|
| 241 |
+
$('inventory_qty_increments').addClassName('validate-digits');
|
| 242 |
+
$('inventory_min_sale_qty').addClassName('validate-digits');
|
| 243 |
Â
}
|
| 244 |
Â
}
|
| 245 |
+
|
| 246 |
+
Event.observe(window, 'load', function() {
|
| 247 |
+
if ($('inventory_manage_stock') && $('inventory_use_config_manage_stock')) {
|
| 248 |
+
Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
|
| 249 |
+
Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
|
| 250 |
+
changeManageStockOption();
|
| 251 |
+
}
|
| 252 |
+
if ($('inventory_enable_qty_increments') && $('inventory_use_config_enable_qty_increments')) {
|
| 253 |
+
Event.observe($('inventory_enable_qty_increments'), 'change', applyEnableQtyIncrements);
|
| 254 |
+
Event.observe($('inventory_use_config_enable_qty_increments'), 'change', applyEnableQtyIncrements);
|
| 255 |
+
applyEnableQtyIncrements();
|
| 256 |
+
}
|
| 257 |
+
if ($('inventory_is_qty_decimal') && $('inventory_qty_increments') && $('inventory_min_sale_qty')) {
|
| 258 |
+
Event.observe($('inventory_is_qty_decimal'), 'change', applyEnableDecimalDivided);
|
| 259 |
+
applyEnableDecimalDivided();
|
| 260 |
+
}
|
| 261 |
+
});
|
| 262 |
+
//]]>
|
| 263 |
+
</script>
|
app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/cms/browser/content.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/cms/browser/content/files.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -31,9 +31,6 @@
|
|
| 31 |
Â
* @see Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Uploader
|
| 32 |
Â
*/
|
| 33 |
Â
?>
|
| 34 |
-
|
| 35 |
-
<?php echo $this->helper('adminhtml/media_js')->getTranslatorScript() ?>
|
| 36 |
-
|
| 37 |
Â
<div id="<?php echo $this->getHtmlId() ?>" class="uploader">
|
| 38 |
Â
<div class="buttons">
|
| 39 |
Â
<div id="<?php echo $this->getHtmlId() ?>-install-flash" style="display:none">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 31 |
Â
* @see Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Uploader
|
| 32 |
Â
*/
|
| 33 |
Â
?>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 34 |
Â
<div id="<?php echo $this->getHtmlId() ?>" class="uploader">
|
| 35 |
Â
<div class="buttons">
|
| 36 |
Â
<div id="<?php echo $this->getHtmlId() ?>-install-flash" style="display:none">
|
app/design/adminhtml/default/default/template/cms/browser/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/cms/browser/tree.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/coming.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/currencysymbol/grid.phtml
ADDED
|
@@ -0,0 +1,100 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* @var $this Mage_Currencysymbol_Block_Adminhtml_System_Currencysymbol
|
| 30 |
+
*/
|
| 31 |
+
?>
|
| 32 |
+
<div class="content-header">
|
| 33 |
+
<table cellspacing="0">
|
| 34 |
+
<tr>
|
| 35 |
+
<td style="width:50%;"><h3 class="icon-head head-system-currency"><?php echo $this->getHeader() ?></h3></td>
|
| 36 |
+
<td class="form-buttons">
|
| 37 |
+
<?php
|
| 38 |
+
echo $this->getSaveButtonHtml();
|
| 39 |
+
?>
|
| 40 |
+
</td>
|
| 41 |
+
</tr>
|
| 42 |
+
</table>
|
| 43 |
+
</div>
|
| 44 |
+
|
| 45 |
+
<?php $this->getCurrencySymbolsData();?>
|
| 46 |
+
|
| 47 |
+
<form id="currency_symbols_form" action="<?php echo $this->getFormActionUrl() ?>" method="post">
|
| 48 |
+
<input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
|
| 49 |
+
|
| 50 |
+
<div class="entry-edit">
|
| 51 |
+
<div class="fieldset fieldset-wide">
|
| 52 |
+
<div class="grid">
|
| 53 |
+
<div class="hor-scroll">
|
| 54 |
+
<table cellspacing="0" class="data table-cat-img-sizes">
|
| 55 |
+
<colgroup>
|
| 56 |
+
<col width="15%"/>
|
| 57 |
+
<col />
|
| 58 |
+
</colgroup>
|
| 59 |
+
<thead>
|
| 60 |
+
<tr class="headings">
|
| 61 |
+
<th><span class="nobr"><span class="not-sort"><?php echo $this->__('Currency'); ?></span></span></th>
|
| 62 |
+
<th><span class="nobr"><span class="not-sort"><?php echo $this->__('Symbol'); ?><span class="required"><em>*</em></span></span></span></th>
|
| 63 |
+
</tr>
|
| 64 |
+
</thead>
|
| 65 |
+
<tbody>
|
| 66 |
+
<?php foreach($this->getCurrencySymbolsData() as $code => $data): ?>
|
| 67 |
+
<tr>
|
| 68 |
+
<td class="label">
|
| 69 |
+
<label for="custom_currency_symbol<?php echo $code; ?>"><?php echo $code; ?> (<?php echo $data['displayName']; ?>)</label>
|
| 70 |
+
</td>
|
| 71 |
+
<td class="value">
|
| 72 |
+
<input id="custom_currency_symbol<?php echo $code; ?>" class=" required-entry input-text" type="text" value="<?php echo Mage::helper('core')->quoteEscape($data['displaySymbol']); ?>"<?php echo $data['inherited'] ? ' disabled="disabled"' : '';?> name="custom_currency_symbol[<?php echo $code; ?>]">
|
| 73 |
+
<input id="custom_currency_symbol_inherit<?php echo $code; ?>" class="checkbox config-inherit" type="checkbox" onclick="toggleUseDefault(<?php echo '\'' . $code . '\',\'' . Mage::helper('core')->quoteEscape($data['parentSymbol'], true) . '\''; ?>)"<?php echo $data['inherited'] ? ' checked="checked"' : ''; ?> value="1" name="inherit_custom_currency_symbol[<?php echo $code; ?>]">
|
| 74 |
+
<label class="inherit" title="" for="custom_currency_symbol_inherit<?php echo $code; ?>"><?php echo $this->getInheritText(); ?></label>
|
| 75 |
+
</td>
|
| 76 |
+
</tr>
|
| 77 |
+
<?php endforeach; ?>
|
| 78 |
+
</tbody>
|
| 79 |
+
</table>
|
| 80 |
+
</div>
|
| 81 |
+
</div>
|
| 82 |
+
</div>
|
| 83 |
+
</div>
|
| 84 |
+
</form>
|
| 85 |
+
<script type="text/javascript">
|
| 86 |
+
var currencySymbolsForm = new varienForm('currency_symbols_form');
|
| 87 |
+
|
| 88 |
+
function toggleUseDefault(code, value)
|
| 89 |
+
{
|
| 90 |
+
checkbox = $('custom_currency_symbol_inherit'+code);
|
| 91 |
+
input = $('custom_currency_symbol'+code);
|
| 92 |
+
if (checkbox.checked) {
|
| 93 |
+
input.value = value;
|
| 94 |
+
input.disabled = true;
|
| 95 |
+
} else {
|
| 96 |
+
input.disabled = false;
|
| 97 |
+
}
|
| 98 |
+
}
|
| 99 |
+
</script>
|
| 100 |
+
|
app/design/adminhtml/default/default/template/customer/edit/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
$_element = $this->getElement();
|
| 29 |
+
$_note = $_element->getNote();
|
| 30 |
+
$_trId = $_element->getHtmlContainerId();
|
| 31 |
+
$_class = $_element->getFieldsetHtmlClass();
|
| 32 |
+
?>
|
| 33 |
+
<?php if (!$_element->getNoDisplay()): ?>
|
| 34 |
+
<tr<?php if ($_trId): ?> id="<?php echo $_trId; ?>"<?php endif; ?>>
|
| 35 |
+
<?php if ($_element->getType() == 'hidden'): ?>
|
| 36 |
+
<td colspan="2" class="hidden"><?php echo trim($_element->getElementHtml()); ?></td>
|
| 37 |
+
<?php else: ?>
|
| 38 |
+
<td class="label<?php echo $_class ? " {$_class}-label" : ''; ?>"><?php echo trim($_element->getLabelHtml()); ?></td>
|
| 39 |
+
<td class="<?php echo $_element->hasValueClass() ? $_element->getValueClass() : 'value'; ?><?php echo $_class ? " {$_class}-value" : ''; ?>">
|
| 40 |
+
<?php echo trim($_element->getElementHtml()); ?>
|
| 41 |
+
<?php if ($this->getDisableAutoGroupChangeAttribute()): ?>
|
| 42 |
+
<br/>
|
| 43 |
+
<input id="<?php echo $this->escapeHtml($this->getDisableAutoGroupChangeCheckboxElementId()); ?>" name="<?php echo $this->escapeHtml($this->getDisableAutoGroupChangeCheckboxElementName()); ?>" type="checkbox"<?php if ($this->getDisableAutoGroupChangeCheckboxState() == 'checked') :?> checked="checked"<?php endif; ?> value="1"/>
|
| 44 |
+
<label for="<?php echo $this->escapeHtml($this->getDisableAutoGroupChangeCheckboxElementId()); ?>"><?php echo $this->escapeHtml($this->getDisableAutoGroupChangeCheckboxLabel()); ?></label>
|
| 45 |
+
<?php endif; ?>
|
| 46 |
+
<?php if ($_note): ?>
|
| 47 |
+
<p class="note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php echo $_element->getId(); ?>"><span><?php echo $_note; ?></span></p>
|
| 48 |
+
<?php endif ?>
|
| 49 |
+
</td>
|
| 50 |
+
<?php endif; ?>
|
| 51 |
+
</tr>
|
| 52 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/online.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
$_element = $this->getElement();
|
| 29 |
+
$_note = $_element->getNote();
|
| 30 |
+
$_trId = $_element->getHtmlContainerId();
|
| 31 |
+
$_class = $_element->getFieldsetHtmlClass();
|
| 32 |
+
$_validateButton = $this->getValidateButton();
|
| 33 |
+
?>
|
| 34 |
+
<?php if (!$_element->getNoDisplay()): ?>
|
| 35 |
+
<tr<?php if($_trId): ?> id="<?php echo $_trId; ?>"<?php endif; ?>>
|
| 36 |
+
<?php if ($_element->getType()=='hidden'): ?>
|
| 37 |
+
<td colspan="2" class="hidden"><?php echo trim($_element->getElementHtml()); ?></td>
|
| 38 |
+
<?php else: ?>
|
| 39 |
+
<td class="label<?php echo $_class ? " {$_class}-label" : ''?>"><?php echo trim($_element->getLabelHtml()); ?></td>
|
| 40 |
+
<td class="<?php echo $_element->hasValueClass() ? $_element->getValueClass() : 'value'; ?><?php echo $_class ? " {$_class}-value" : ''; ?>">
|
| 41 |
+
<?php echo trim($_element->getElementHtml()); ?>
|
| 42 |
+
<?php if ($_note): ?>
|
| 43 |
+
<p class="note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php echo $_element->getId(); ?>"><span><?php echo $_note; ?></span></p>
|
| 44 |
+
<?php endif; ?>
|
| 45 |
+
<div class="validate-vat">
|
| 46 |
+
<?php echo $_validateButton->toHtml(); ?>
|
| 47 |
+
</div>
|
| 48 |
+
</td>
|
| 49 |
+
<?php endif; ?>
|
| 50 |
+
|
| 51 |
+
</tr>
|
| 52 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml
ADDED
|
@@ -0,0 +1,65 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* @see Mage_Adminhtml_Block_Customer_System_Config_Validatevat
|
| 30 |
+
*/
|
| 31 |
+
?>
|
| 32 |
+
<script type="text/javascript">
|
| 33 |
+
//<![CDATA[
|
| 34 |
+
function validateVat() {
|
| 35 |
+
var elem = $('<?php echo $this->getHtmlId() ?>');
|
| 36 |
+
|
| 37 |
+
params = {
|
| 38 |
+
country: $('general_store_information_merchant_country').value,
|
| 39 |
+
vat: $('general_store_information_merchant_vat_number').value
|
| 40 |
+
};
|
| 41 |
+
|
| 42 |
+
new Ajax.Request('<?php echo $this->getAjaxUrl() ?>', {
|
| 43 |
+
parameters: params,
|
| 44 |
+
onSuccess: function(response) {
|
| 45 |
+
result = '<?php echo $this->__('VAT Number is Invalid') ?>';
|
| 46 |
+
try {
|
| 47 |
+
response = response.responseText;
|
| 48 |
+
if (response == 1) {
|
| 49 |
+
result = '<?php echo $this->__('VAT Number is Valid') ?>';
|
| 50 |
+
elem.removeClassName('fail').addClassName('success')
|
| 51 |
+
} else {
|
| 52 |
+
elem.removeClassName('success').addClassName('fail')
|
| 53 |
+
}
|
| 54 |
+
} catch (e) {
|
| 55 |
+
elem.removeClassName('success').addClassName('fail')
|
| 56 |
+
}
|
| 57 |
+
$('validation_result').update(result);
|
| 58 |
+
}
|
| 59 |
+
});
|
| 60 |
+
}
|
| 61 |
+
//]]>
|
| 62 |
+
</script>
|
| 63 |
+
<button onclick="javascript:validateVat(); return false;" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
|
| 64 |
+
<span id="validation_result"><?php echo $this->escapeHtml($this->getButtonLabel()) ?></span>
|
| 65 |
+
</button>
|
app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -146,6 +146,8 @@ addressesModel.prototype = {
|
|
| 146 |
Â
|
| 147 |
Â
this.loader = new varienLoader(true);
|
| 148 |
Â
this.regionsUrl = '<?php echo $this->getRegionsUrl() ?>';
|
|
Â
|
|
|
Â
|
|
| 149 |
Â
|
| 150 |
Â
this.reloadItemList(1);
|
| 151 |
Â
|
|
@@ -206,7 +208,10 @@ addressesModel.prototype = {
|
|
| 206 |
Â
if($('no_address_message')){
|
| 207 |
Â
$('no_address_message').hide();
|
| 208 |
Â
}
|
| 209 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 210 |
Â
// create new form elements
|
| 211 |
Â
Element.insert(this.formContainer, {bottom:
|
| 212 |
Â
'<div id="' + 'form_' + this.baseItemId + this.itemCount + '">'
|
|
@@ -330,6 +335,16 @@ addressesModel.prototype = {
|
|
| 330 |
Â
//new Effect.Appear($('form_'+item.id), {duration : 0.3 });
|
| 331 |
Â
//$('form_'+item.id).focus();
|
| 332 |
Â
this.addFieldChangeObserver($('form_'+item.id));
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 333 |
Â
}
|
| 334 |
Â
|
| 335 |
Â
this.activeItem = item;
|
|
@@ -406,8 +421,12 @@ addressesModel.prototype = {
|
|
| 406 |
Â
var html = this.itemContentTemplate.evaluate(data);
|
| 407 |
Â
html = html.replace(new RegExp('(<br\\s*/?>\\s*){2,}','img'),'<br/>');
|
| 408 |
Â
html = html.replace(new RegExp('<br\\s*/?>(\\s*,){1,}\\s*<br\\s*/?>','ig'),'<br/>');
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 409 |
Â
html = html.replace(new RegExp('t:\\s*<br\\s*/?>','ig'),'');
|
| 410 |
-
html = html.replace(new RegExp('f:\\s
|
|
Â
|
|
| 411 |
Â
itemContainer[0].innerHTML = html;
|
| 412 |
Â
}
|
| 413 |
Â
}
|
|
@@ -476,6 +495,7 @@ addressesModel.prototype = {
|
|
| 476 |
Â
var regionElement = $(countryElement.id.replace(/country_id/, 'region'));
|
| 477 |
Â
if(regionElement){
|
| 478 |
Â
this.regionElement = regionElement;
|
|
Â
|
|
| 479 |
Â
if (countryElement.value) {
|
| 480 |
Â
var url = this.regionsUrl + 'parent/' + countryElement.value;
|
| 481 |
Â
this.loader.load(url, {}, this.refreshRegionField.bind(this));
|
|
@@ -549,6 +569,61 @@ addressesModel.prototype = {
|
|
| 549 |
Â
var newInput = $(newInputId);
|
| 550 |
Â
Event.observe(newInput, 'change', this.onItemFormFieldChange); // Restore observing to update address info
|
| 551 |
Â
this.syncFormData(newInput); // Update address info now
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 552 |
Â
}
|
| 553 |
Â
}
|
| 554 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 146 |
Â
|
| 147 |
Â
this.loader = new varienLoader(true);
|
| 148 |
Â
this.regionsUrl = '<?php echo $this->getRegionsUrl() ?>';
|
| 149 |
+
this.requiredStateForCountries = <?php echo $this->helper('directory')->getCountriesWithStatesRequired(true) ?>;
|
| 150 |
+
this.showAllRegions = <?php echo (string)$this->helper('directory')->getShowNonRequiredState() ? 1 : 0; ?>;
|
| 151 |
Â
|
| 152 |
Â
this.reloadItemList(1);
|
| 153 |
Â
|
| 208 |
Â
if($('no_address_message')){
|
| 209 |
Â
$('no_address_message').hide();
|
| 210 |
Â
}
|
| 211 |
+
// preventing duplication of ids for fields and blocks
|
| 212 |
+
while ($$("div[id='form_address_item_" + this.itemCount + "']").length) {
|
| 213 |
+
this.itemCount++;
|
| 214 |
+
}
|
| 215 |
Â
// create new form elements
|
| 216 |
Â
Element.insert(this.formContainer, {bottom:
|
| 217 |
Â
'<div id="' + 'form_' + this.baseItemId + this.itemCount + '">'
|
| 335 |
Â
//new Effect.Appear($('form_'+item.id), {duration : 0.3 });
|
| 336 |
Â
//$('form_'+item.id).focus();
|
| 337 |
Â
this.addFieldChangeObserver($('form_'+item.id));
|
| 338 |
+
var regionIdElement = $('_item' + item.id.replace(/address_item_/, '') + 'region_id');
|
| 339 |
+
var regionElement = $('_item' + item.id.replace(/address_item_/, '') + 'region');
|
| 340 |
+
this.countryEl = $('_item' + item.id.replace(/address_item_/, '') + 'country_id');
|
| 341 |
+
if (regionIdElement && regionElement) {
|
| 342 |
+
var actualId = regionElement.id;
|
| 343 |
+
if (('select' == regionIdElement.tagName.toLowerCase()) && regionIdElement) {
|
| 344 |
+
actualId = regionIdElement.id;
|
| 345 |
+
}
|
| 346 |
+
this._checkRegionRequired([regionIdElement, regionElement], actualId);
|
| 347 |
+
}
|
| 348 |
Â
}
|
| 349 |
Â
|
| 350 |
Â
this.activeItem = item;
|
| 421 |
Â
var html = this.itemContentTemplate.evaluate(data);
|
| 422 |
Â
html = html.replace(new RegExp('(<br\\s*/?>\\s*){2,}','img'),'<br/>');
|
| 423 |
Â
html = html.replace(new RegExp('<br\\s*/?>(\\s*,){1,}\\s*<br\\s*/?>','ig'),'<br/>');
|
| 424 |
+
html = html.replace(new RegExp('<br\\s*/?>(\\s*,){1,}(.*)<br\\s*/?>','ig'),'<br/>$2<br/>');
|
| 425 |
+
html = html.replace(new RegExp('<br\\s*/?>(.*?)(,\\s*){1,}<br\\s*/?>','ig'),'<br/>$1<br/>');
|
| 426 |
+
html = html.replace(new RegExp('<br\\s*/?>(.*?)(,\\s*){2,}(.*?)<br\\s*/?>','ig'),'<br/>$1, $3<br/>');
|
| 427 |
Â
html = html.replace(new RegExp('t:\\s*<br\\s*/?>','ig'),'');
|
| 428 |
+
html = html.replace(new RegExp('f:\\s*<br\\s*/?>','ig'),'');
|
| 429 |
+
html = html.replace(new RegExp('vat:\\s*$','ig'),'');
|
| 430 |
Â
itemContainer[0].innerHTML = html;
|
| 431 |
Â
}
|
| 432 |
Â
}
|
| 495 |
Â
var regionElement = $(countryElement.id.replace(/country_id/, 'region'));
|
| 496 |
Â
if(regionElement){
|
| 497 |
Â
this.regionElement = regionElement;
|
| 498 |
+
this.countryEl = countryElement;
|
| 499 |
Â
if (countryElement.value) {
|
| 500 |
Â
var url = this.regionsUrl + 'parent/' + countryElement.value;
|
| 501 |
Â
this.loader.load(url, {}, this.refreshRegionField.bind(this));
|
| 569 |
Â
var newInput = $(newInputId);
|
| 570 |
Â
Event.observe(newInput, 'change', this.onItemFormFieldChange); // Restore observing to update address info
|
| 571 |
Â
this.syncFormData(newInput); // Update address info now
|
| 572 |
+
var activeElementId = regionHtmlId;
|
| 573 |
+
if (('select' == $(regionIdHtmlId).tagName.toLowerCase()) && regionIdHtmlId) {
|
| 574 |
+
activeElementId = regionIdHtmlId;
|
| 575 |
+
}
|
| 576 |
+
this._checkRegionRequired([$(regionHtmlId), $(regionIdHtmlId)], activeElementId);
|
| 577 |
+
},
|
| 578 |
+
|
| 579 |
+
_checkRegionRequired: function(elements, activeElementId)
|
| 580 |
+
{
|
| 581 |
+
var label, wildCard;
|
| 582 |
+
var that = this;
|
| 583 |
+
var regionRequired = this.requiredStateForCountries.indexOf(this.countryEl.value) >= 0;
|
| 584 |
+
|
| 585 |
+
elements.each(function(currentElement) {
|
| 586 |
+
Validation.reset(currentElement);
|
| 587 |
+
label = $$('label[for="' + currentElement.id + '"]')[0];
|
| 588 |
+
if (label) {
|
| 589 |
+
wildCard = label.down('em') || label.down('span.required');
|
| 590 |
+
if (!that.showAllRegions) {
|
| 591 |
+
if (regionRequired) {
|
| 592 |
+
label.up('tr').show();
|
| 593 |
+
} else {
|
| 594 |
+
label.up('tr').hide();
|
| 595 |
+
}
|
| 596 |
+
}
|
| 597 |
+
}
|
| 598 |
+
|
| 599 |
+
if (label && wildCard) {
|
| 600 |
+
if (!regionRequired) {
|
| 601 |
+
wildCard.hide();
|
| 602 |
+
} else {
|
| 603 |
+
wildCard.show();
|
| 604 |
+
}
|
| 605 |
+
}
|
| 606 |
+
|
| 607 |
+
if (!regionRequired) {
|
| 608 |
+
if (currentElement.hasClassName('required-entry')) {
|
| 609 |
+
currentElement.removeClassName('required-entry');
|
| 610 |
+
}
|
| 611 |
+
if ('select' == currentElement.tagName.toLowerCase() &&
|
| 612 |
+
currentElement.hasClassName('validate-select')
|
| 613 |
+
) {
|
| 614 |
+
currentElement.removeClassName('validate-select');
|
| 615 |
+
}
|
| 616 |
+
} else if (activeElementId == currentElement.id) {
|
| 617 |
+
if (!currentElement.hasClassName('required-entry')) {
|
| 618 |
+
currentElement.addClassName('required-entry');
|
| 619 |
+
}
|
| 620 |
+
if ('select' == currentElement.tagName.toLowerCase() &&
|
| 621 |
+
!currentElement.hasClassName('validate-select')
|
| 622 |
+
) {
|
| 623 |
+
currentElement.addClassName('validate-select');
|
| 624 |
+
}
|
| 625 |
+
}
|
| 626 |
+
});
|
| 627 |
Â
}
|
| 628 |
Â
}
|
| 629 |
Â
|
app/design/adminhtml/default/default/template/customer/tab/cart.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/tab/view.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/dashboard/graph.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/*
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/*
|
app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/dashboard/grid.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/dashboard/index.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/dashboard/salebar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/dashboard/searches.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
CHANGED
|
@@ -20,11 +20,12 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
-
<p class="switcher"><label for="store_switcher"><?php echo $this->__('View Statistics For')
|
|
Â
|
|
| 28 |
Â
<select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
|
| 29 |
Â
<option value=""><?php echo $this->__('All Websites') ?></option>
|
| 30 |
Â
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<p class="switcher"><label for="store_switcher"><?php echo $this->__('View Statistics For:') ?></label>
|
| 28 |
+
<?php echo $this->getHintHtml() ?>
|
| 29 |
Â
<select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
|
| 30 |
Â
<option value=""><?php echo $this->__('All Websites') ?></option>
|
| 31 |
Â
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml
CHANGED
|
@@ -20,13 +20,14 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<?php /* @var $this Mage_Downloadable_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Downloadable */ ?>
|
| 28 |
Â
<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
|
| 29 |
-
<?php
|
|
Â
|
|
| 30 |
Â
|
| 31 |
Â
<div id="catalog_product_composite_configure_fields_downloadable" class="<?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
|
| 32 |
Â
<h4><?php echo Mage::helper('catalog')->__('Downloadable Information') ?></h4>
|
|
@@ -44,7 +45,7 @@
|
|
| 44 |
Â
<?php endif; ?>
|
| 45 |
Â
<span class="label">
|
| 46 |
Â
<label for="links_<?php echo $_link->getId() ?>">
|
| 47 |
-
<?php echo $_link->getTitle() ?>
|
| 48 |
Â
</label>
|
| 49 |
Â
<?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
|
| 50 |
Â
(<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo Mage::helper('downloadable')->__('sample') ?></a>)
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<?php /* @var $this Mage_Downloadable_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Downloadable */ ?>
|
| 28 |
Â
<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
|
| 29 |
+
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
|
| 30 |
+
<?php if (($this->getProduct()->isSaleable() || $_skipSaleableCheck) && $this->hasLinks()):?>
|
| 31 |
Â
|
| 32 |
Â
<div id="catalog_product_composite_configure_fields_downloadable" class="<?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
|
| 33 |
Â
<h4><?php echo Mage::helper('catalog')->__('Downloadable Information') ?></h4>
|
| 45 |
Â
<?php endif; ?>
|
| 46 |
Â
<span class="label">
|
| 47 |
Â
<label for="links_<?php echo $_link->getId() ?>">
|
| 48 |
+
<?php echo $this->escapeHtml($_link->getTitle()) ?>
|
| 49 |
Â
</label>
|
| 50 |
Â
<?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
|
| 51 |
Â
(<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo Mage::helper('downloadable')->__('sample') ?></a>)
|
app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -40,7 +40,7 @@
|
|
| 40 |
Â
<td class="value">
|
| 41 |
Â
<input type="text" class="input-text" id="downloadable_links_title" name="product[links_title]" value="<?php echo $_product->getId()?$_product->getLinksTitle():$this->getLinksTitle() ?>" <?php echo ($_product->getStoreId() && $this->getUsedDefault())?'disabled="disabled"':'' ?> />
|
| 42 |
Â
</td>
|
| 43 |
-
<td class="scope-label"><?php
|
| 44 |
Â
<td class="value use-default">
|
| 45 |
Â
<?php if($_product->getStoreId()): ?>
|
| 46 |
Â
<input id="link_title_default" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?php echo $this->getUsedDefault()?'checked="checked"':'' ?> />
|
|
@@ -59,7 +59,7 @@
|
|
| 59 |
Â
<td class="value">
|
| 60 |
Â
<?php echo $this->getPurchasedSeparatelySelect()?>
|
| 61 |
Â
</td>
|
| 62 |
-
<td class="scope-label"><?php
|
| 63 |
Â
<td><small> </small></td>
|
| 64 |
Â
</tr>
|
| 65 |
Â
</tbody>
|
|
@@ -185,7 +185,7 @@ var linkTemplate = '<tr>'+
|
|
| 185 |
Â
'</td>'+
|
| 186 |
Â
'<td class="a-center"><input type="text" name="downloadable[link][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
|
| 187 |
Â
'<td>'+
|
| 188 |
-
'<button id="downloadable_link_{{id}}_delete_button" type="button" class="scalable delete icon-btn delete-link-item"><span><?php echo Mage::helper('downloadable')->__('Delete'); ?></span></button>'+
|
| 189 |
Â
'</td>'+
|
| 190 |
Â
'</tr>';
|
| 191 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 40 |
Â
<td class="value">
|
| 41 |
Â
<input type="text" class="input-text" id="downloadable_links_title" name="product[links_title]" value="<?php echo $_product->getId()?$_product->getLinksTitle():$this->getLinksTitle() ?>" <?php echo ($_product->getStoreId() && $this->getUsedDefault())?'disabled="disabled"':'' ?> />
|
| 42 |
Â
</td>
|
| 43 |
+
<td class="scope-label"><?php echo !Mage::app()->isSingleStoreMode() ? Mage::helper('adminhtml')->__('[STORE VIEW]') : ''; ?></td>
|
| 44 |
Â
<td class="value use-default">
|
| 45 |
Â
<?php if($_product->getStoreId()): ?>
|
| 46 |
Â
<input id="link_title_default" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?php echo $this->getUsedDefault()?'checked="checked"':'' ?> />
|
| 59 |
Â
<td class="value">
|
| 60 |
Â
<?php echo $this->getPurchasedSeparatelySelect()?>
|
| 61 |
Â
</td>
|
| 62 |
+
<td class="scope-label"><?php echo !Mage::app()->isSingleStoreMode() ? Mage::helper('adminhtml')->__('[GLOBAL]') : ''; ?></td>
|
| 63 |
Â
<td><small> </small></td>
|
| 64 |
Â
</tr>
|
| 65 |
Â
</tbody>
|
| 185 |
Â
'</td>'+
|
| 186 |
Â
'<td class="a-center"><input type="text" name="downloadable[link][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
|
| 187 |
Â
'<td>'+
|
| 188 |
+
'<button id="downloadable_link_{{id}}_delete_button" type="button" class="scalable delete icon-btn delete-link-item"><span><span><span><?php echo Mage::helper('downloadable')->__('Delete'); ?></span></span></span></button>'+
|
| 189 |
Â
'</td>'+
|
| 190 |
Â
'</tr>';
|
| 191 |
Â
|
app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -40,7 +40,7 @@
|
|
| 40 |
Â
<td class="value">
|
| 41 |
Â
<input type="text" class="input-text" name="product[samples_title]" value="<?php echo $_product->getId()?$_product->getSamplesTitle():$this->getSamplesTitle() ?>" <?php echo ($_product->getStoreId() && $this->getUsedDefault())?'disabled="disabled"':'' ?> />
|
| 42 |
Â
</td>
|
| 43 |
-
<td class="scope-label"><?php
|
| 44 |
Â
<td class="value use-default">
|
| 45 |
Â
<?php if($_product->getStoreId()): ?>
|
| 46 |
Â
<input id="sample_title_default" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?php echo $this->getUsedDefault()?'checked="checked"':'' ?> />
|
|
@@ -114,7 +114,7 @@ var sampleTemplate = '<tr>'+
|
|
| 114 |
Â
'</td>'+
|
| 115 |
Â
'<td class="a-center"><input type="text" name="downloadable[sample][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
|
| 116 |
Â
'<td>'+
|
| 117 |
-
'<button type="button" class="scalable delete icon-btn delete-sample-item"><span>Delete</span></button>'+
|
| 118 |
Â
'</td>'+
|
| 119 |
Â
'</tr>';
|
| 120 |
Â
var sampleItems = {
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 40 |
Â
<td class="value">
|
| 41 |
Â
<input type="text" class="input-text" name="product[samples_title]" value="<?php echo $_product->getId()?$_product->getSamplesTitle():$this->getSamplesTitle() ?>" <?php echo ($_product->getStoreId() && $this->getUsedDefault())?'disabled="disabled"':'' ?> />
|
| 42 |
Â
</td>
|
| 43 |
+
<td class="scope-label"><?php echo !Mage::app()->isSingleStoreMode() ? Mage::helper('adminhtml')->__('[STORE VIEW]') : ''; ?></td>
|
| 44 |
Â
<td class="value use-default">
|
| 45 |
Â
<?php if($_product->getStoreId()): ?>
|
| 46 |
Â
<input id="sample_title_default" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?php echo $this->getUsedDefault()?'checked="checked"':'' ?> />
|
| 114 |
Â
'</td>'+
|
| 115 |
Â
'<td class="a-center"><input type="text" name="downloadable[sample][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
|
| 116 |
Â
'<td>'+
|
| 117 |
+
'<button type="button" class="scalable delete icon-btn delete-sample-item"><span><span><span>Delete</span></span></span></button>'+
|
| 118 |
Â
'</td>'+
|
| 119 |
Â
'</tr>';
|
| 120 |
Â
var sampleItems = {
|
app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -54,7 +54,7 @@
|
|
| 54 |
Â
<dl class="item-options">
|
| 55 |
Â
<dt><?php echo $this->getLinksTitle(); ?></dt>
|
| 56 |
Â
<?php foreach ($this->getLinks()->getPurchasedItems() as $_link): ?>
|
| 57 |
-
<dd><?php echo $_link->getLinkTitle() ?></dd>
|
| 58 |
Â
<?php endforeach; ?>
|
| 59 |
Â
</dl>
|
| 60 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 54 |
Â
<dl class="item-options">
|
| 55 |
Â
<dt><?php echo $this->getLinksTitle(); ?></dt>
|
| 56 |
Â
<?php foreach ($this->getLinks()->getPurchasedItems() as $_link): ?>
|
| 57 |
+
<dd><?php echo $this->escapeHtml($_link->getLinkTitle()); ?></dd>
|
| 58 |
Â
<?php endforeach; ?>
|
| 59 |
Â
</dl>
|
| 60 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -54,7 +54,7 @@
|
|
| 54 |
Â
<dl class="item-options">
|
| 55 |
Â
<dt><?php echo $this->getLinksTitle(); ?></dt>
|
| 56 |
Â
<?php foreach ($this->getLinks()->getPurchasedItems() as $_link): ?>
|
| 57 |
-
<dd><?php echo $_link->getLinkTitle() ?> (<?php echo $_link->getNumberOfDownloadsBought()?$_link->getNumberOfDownloadsBought():Mage::helper('downloadable')->__('Unlimited') ?>)</dd>
|
| 58 |
Â
<?php endforeach; ?>
|
| 59 |
Â
</dl>
|
| 60 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 54 |
Â
<dl class="item-options">
|
| 55 |
Â
<dt><?php echo $this->getLinksTitle(); ?></dt>
|
| 56 |
Â
<?php foreach ($this->getLinks()->getPurchasedItems() as $_link): ?>
|
| 57 |
+
<dd><?php echo $this->escapeHtml($_link->getLinkTitle()); ?> (<?php echo $_link->getNumberOfDownloadsBought()?$_link->getNumberOfDownloadsBought():Mage::helper('downloadable')->__('Unlimited') ?>)</dd>
|
| 58 |
Â
<?php endforeach; ?>
|
| 59 |
Â
</dl>
|
| 60 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -54,7 +54,7 @@
|
|
| 54 |
Â
<dl class="item-options">
|
| 55 |
Â
<dt><?php echo $this->getLinksTitle(); ?></dt>
|
| 56 |
Â
<?php foreach ($this->getLinks()->getPurchasedItems() as $_link): ?>
|
| 57 |
-
<dd><?php echo $_link->getLinkTitle() ?> (<?php echo $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought()?$_link->getNumberOfDownloadsBought():Mage::helper('downloadable')->__('U')) ?>)</dd>
|
| 58 |
Â
<?php endforeach; ?>
|
| 59 |
Â
</dl>
|
| 60 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 54 |
Â
<dl class="item-options">
|
| 55 |
Â
<dt><?php echo $this->getLinksTitle(); ?></dt>
|
| 56 |
Â
<?php foreach ($this->getLinks()->getPurchasedItems() as $_link): ?>
|
| 57 |
+
<dd><?php echo $this->escapeHtml($_link->getLinkTitle()) ?> (<?php echo $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought()?$_link->getNumberOfDownloadsBought():Mage::helper('downloadable')->__('U')) ?>)</dd>
|
| 58 |
Â
<?php endforeach; ?>
|
| 59 |
Â
</dl>
|
| 60 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/email/order/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/empty.phtml
ADDED
|
@@ -0,0 +1,42 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
| 28 |
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
|
| 29 |
+
<head>
|
| 30 |
+
<?php $this->getChild('head')->unsetChildren(); ?>
|
| 31 |
+
<?php echo $this->getChildHtml('head'); ?>
|
| 32 |
+
</head>
|
| 33 |
+
<body class="page-popup<?php echo $this->getBodyClass()?$this->getBodyClass() : ''?>">
|
| 34 |
+
<div>
|
| 35 |
+
<?php echo $this->getChildHtml('after_body_start') ?>
|
| 36 |
+
<?php echo $this->getChildHtml('global_notices') ?>
|
| 37 |
+
<?php echo $this->getChildHtml('content') ?>
|
| 38 |
+
<?php echo $this->getChildHtml('before_body_end') ?>
|
| 39 |
+
</div>
|
| 40 |
+
<?php echo $this->getAbsoluteFooter() ?>
|
| 41 |
+
</body>
|
| 42 |
+
</html>
|
app/design/adminhtml/default/default/template/example.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/forgotpassword.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -35,6 +35,7 @@
|
|
| 35 |
Â
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />
|
| 36 |
Â
|
| 37 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl(); ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>
|
|
Â
|
|
| 38 |
Â
|
| 39 |
Â
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
|
| 40 |
Â
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
|
|
@@ -53,10 +54,11 @@
|
|
| 53 |
Â
<div class="input-box forgot-password"><label for="email"><?php echo Mage::helper('adminhtml')->__('Email Address:'); ?></label><br />
|
| 54 |
Â
<input type="text" id="email" name="email" value="" class="required-entry input-text forgot-password validate-email" style="width:461px;" />
|
| 55 |
Â
</div>
|
|
Â
|
|
| 56 |
Â
<div class="clear"></div>
|
| 57 |
Â
<div class="form-buttons">
|
| 58 |
Â
<a class="left" href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)); ?>">« <?php echo Mage::helper('adminhtml')->__('Back to Login'); ?></a>
|
| 59 |
-
<button class="forgot-password" onclick="loginForm.submit()" type="button"><span><?php echo Mage::helper('adminhtml')->__('Retrieve Password'); ?></span></button>
|
| 60 |
Â
</div>
|
| 61 |
Â
</fieldset>
|
| 62 |
Â
<p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')); ?></p>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 35 |
Â
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />
|
| 36 |
Â
|
| 37 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl(); ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>
|
| 38 |
+
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
|
| 39 |
Â
|
| 40 |
Â
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
|
| 41 |
Â
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
|
| 54 |
Â
<div class="input-box forgot-password"><label for="email"><?php echo Mage::helper('adminhtml')->__('Email Address:'); ?></label><br />
|
| 55 |
Â
<input type="text" id="email" name="email" value="" class="required-entry input-text forgot-password validate-email" style="width:461px;" />
|
| 56 |
Â
</div>
|
| 57 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 58 |
Â
<div class="clear"></div>
|
| 59 |
Â
<div class="form-buttons">
|
| 60 |
Â
<a class="left" href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)); ?>">« <?php echo Mage::helper('adminhtml')->__('Back to Login'); ?></a>
|
| 61 |
+
<button class="forgot-password" onclick="loginForm.submit()" type="button"><span><span><span><?php echo Mage::helper('adminhtml')->__('Retrieve Password'); ?></span></span></span></button>
|
| 62 |
Â
</div>
|
| 63 |
Â
</fieldset>
|
| 64 |
Â
<p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')); ?></p>
|
app/design/adminhtml/default/default/template/formkey.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/helper.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/popup.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -37,8 +37,8 @@
|
|
| 37 |
Â
<?php echo $this->getChildHtml();?>
|
| 38 |
Â
</div>
|
| 39 |
Â
<div class="buttons-set a-right">
|
| 40 |
-
<button type="button" class="scalable" id="gift_options_cancel_button"><span><?php echo Mage::helper('giftmessage')->__('Cancel'); ?></span></button>
|
| 41 |
-
<button type="button" class="scalable" id="gift_options_ok_button"><span><?php echo Mage::helper('giftmessage')->__('OK'); ?></span></button>
|
| 42 |
Â
</div>
|
| 43 |
Â
</div>
|
| 44 |
Â
</div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 37 |
Â
<?php echo $this->getChildHtml();?>
|
| 38 |
Â
</div>
|
| 39 |
Â
<div class="buttons-set a-right">
|
| 40 |
+
<button type="button" class="scalable" id="gift_options_cancel_button"><span><span><span><?php echo Mage::helper('giftmessage')->__('Cancel'); ?></span></span></span></button>
|
| 41 |
+
<button type="button" class="scalable" id="gift_options_ok_button"><span><span><span><?php echo Mage::helper('giftmessage')->__('OK'); ?></span></span></span></button>
|
| 42 |
Â
</div>
|
| 43 |
Â
</div>
|
| 44 |
Â
</div>
|
app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/googlebase/captcha.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/googlebase/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/importexport/busy.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/importexport/export/form/after.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -33,7 +33,7 @@
|
|
| 33 |
Â
<div id="export_filter_grid_container" class="fieldset"><!-- --></div>
|
| 34 |
Â
</form>
|
| 35 |
Â
<div class="a-right">
|
| 36 |
-
<button class="scalable" type="button" onclick="getFile();"><span><?php echo $this->__('Continue') ?></span></button>
|
| 37 |
Â
</div>
|
| 38 |
Â
</div>
|
| 39 |
Â
<script type="text/javascript">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 33 |
Â
<div id="export_filter_grid_container" class="fieldset"><!-- --></div>
|
| 34 |
Â
</form>
|
| 35 |
Â
<div class="a-right">
|
| 36 |
+
<button class="scalable" type="button" onclick="getFile();"><span><span><span><?php echo $this->__('Continue') ?></span></span></span></button>
|
| 37 |
Â
</div>
|
| 38 |
Â
</div>
|
| 39 |
Â
<script type="text/javascript">
|
app/design/adminhtml/default/default/template/importexport/export/form/before.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -37,11 +37,13 @@
|
|
| 37 |
Â
var url = "<?php echo $this->getUrl('*/*/getFilter') ?>";
|
| 38 |
Â
url += ((url.slice(-1) != '/') ? '/' : '') + 'entity/' + $F('entity');
|
| 39 |
Â
|
| 40 |
-
new Ajax.
|
| 41 |
Â
method: 'post',
|
| 42 |
Â
//parameters: $(this.formId).serialize(),
|
| 43 |
Â
evalScripts: true,
|
| 44 |
-
onComplete: function(){
|
|
Â
|
|
|
Â
|
|
| 45 |
Â
$('export_filter_container').show();
|
| 46 |
Â
}
|
| 47 |
Â
});
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 37 |
Â
var url = "<?php echo $this->getUrl('*/*/getFilter') ?>";
|
| 38 |
Â
url += ((url.slice(-1) != '/') ? '/' : '') + 'entity/' + $F('entity');
|
| 39 |
Â
|
| 40 |
+
new Ajax.Request(url, {
|
| 41 |
Â
method: 'post',
|
| 42 |
Â
//parameters: $(this.formId).serialize(),
|
| 43 |
Â
evalScripts: true,
|
| 44 |
+
onComplete: function(transport) {
|
| 45 |
+
var responseText = transport.responseText.replace(/>\s+</g, '><');
|
| 46 |
+
$('export_filter_grid_container').update(responseText);
|
| 47 |
Â
$('export_filter_container').show();
|
| 48 |
Â
}
|
| 49 |
Â
});
|
app/design/adminhtml/default/default/template/importexport/import/form/after.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/importexport/import/form/before.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/index/notifications.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/login.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -38,6 +38,7 @@
|
|
| 38 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
|
| 39 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
|
| 40 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
|
|
Â
|
|
| 41 |
Â
|
| 42 |
Â
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
|
| 43 |
Â
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
|
|
@@ -57,6 +58,7 @@
|
|
| 57 |
Â
<input type="text" id="username" name="login[username]" value="" class="required-entry input-text" /></div>
|
| 58 |
Â
<div class="input-box input-right"><label for="login"><?php echo Mage::helper('adminhtml')->__('Password:') ?></label><br />
|
| 59 |
Â
<input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
|
|
Â
|
|
| 60 |
Â
<div class="clear"></div>
|
| 61 |
Â
<div class="form-buttons">
|
| 62 |
Â
<a class="left" href="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/index/forgotpassword', array('_nosecret' => true)) ?>"><?php echo Mage::helper('adminhtml')->__('Forgot your password?') ?></a>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 38 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
|
| 39 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
|
| 40 |
Â
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
|
| 41 |
+
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
|
| 42 |
Â
|
| 43 |
Â
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
|
| 44 |
Â
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
|
| 58 |
Â
<input type="text" id="username" name="login[username]" value="" class="required-entry input-text" /></div>
|
| 59 |
Â
<div class="input-box input-right"><label for="login"><?php echo Mage::helper('adminhtml')->__('Password:') ?></label><br />
|
| 60 |
Â
<input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
|
| 61 |
+
<?php echo $this->getChildHtml('form.additional.info'); ?>
|
| 62 |
Â
<div class="clear"></div>
|
| 63 |
Â
<div class="form-buttons">
|
| 64 |
Â
<a class="left" href="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/index/forgotpassword', array('_nosecret' => true)) ?>"><?php echo Mage::helper('adminhtml')->__('Forgot your password?') ?></a>
|
app/design/adminhtml/default/default/template/media/editor.phtml
CHANGED
|
@@ -20,14 +20,13 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
-
<?php echo $this->helper('adminhtml/
|
| 28 |
-
<?php echo $this->helper('adminhtml/
|
| 29 |
-
<?php echo $this->helper('adminhtml/
|
| 30 |
-
<?php echo $this->helper('adminhtml/media_js')->getTranslatorScript() ?>
|
| 31 |
Â
<div id="<?php echo $this->getHtmlId() ?>" class="editor" style="width:100%; height:100%;">
|
| 32 |
Â
<div class="buttons" style="margin-bottom: 20px;">
|
| 33 |
Â
<?php echo $this->getRotatecwButtonHtml() ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php echo $this->helper('adminhtml/js')->includeScript('lib/flex.js') ?>
|
| 28 |
+
<?php echo $this->helper('adminhtml/js')->includeScript('lib/FABridge.js') ?>
|
| 29 |
+
<?php echo $this->helper('adminhtml/js')->includeScript('mage/adminhtml/image.js') ?>
|
|
Â
|
|
| 30 |
Â
<div id="<?php echo $this->getHtmlId() ?>" class="editor" style="width:100%; height:100%;">
|
| 31 |
Â
<div class="buttons" style="margin-bottom: 20px;">
|
| 32 |
Â
<?php echo $this->getRotatecwButtonHtml() ?>
|
app/design/adminhtml/default/default/template/media/uploader.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -30,11 +30,9 @@
|
|
| 30 |
Â
*/
|
| 31 |
Â
?>
|
| 32 |
Â
|
| 33 |
-
<?php echo $this->helper('adminhtml/
|
| 34 |
-
<?php echo $this->helper('adminhtml/
|
| 35 |
-
<?php echo $this->helper('adminhtml/
|
| 36 |
-
<?php echo $this->helper('adminhtml/media_js')->getTranslatorScript() ?>
|
| 37 |
-
|
| 38 |
Â
|
| 39 |
Â
<div id="<?php echo $this->getHtmlId() ?>" class="uploader">
|
| 40 |
Â
<div class="buttons">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 30 |
Â
*/
|
| 31 |
Â
?>
|
| 32 |
Â
|
| 33 |
+
<?php echo $this->helper('adminhtml/js')->includeScript('lib/flex.js') ?>
|
| 34 |
+
<?php echo $this->helper('adminhtml/js')->includeScript('mage/adminhtml/flexuploader.js') ?>
|
| 35 |
+
<?php echo $this->helper('adminhtml/js')->includeScript('lib/FABridge.js') ?>
|
|
Â
|
|
|
Â
|
|
| 36 |
Â
|
| 37 |
Â
<div id="<?php echo $this->getHtmlId() ?>" class="uploader">
|
| 38 |
Â
<div class="buttons">
|
app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -41,7 +41,7 @@
|
|
| 41 |
Â
<?php if (!Mage::app()->isSingleStoreMode()) :?>
|
| 42 |
Â
<p class="switcher">
|
| 43 |
Â
<?php echo $this->getChildHtml('store_switcher') ?>
|
| 44 |
-
<button class="button" onclick="preview();"><span><?php echo $this->__('Preview'); ?></span></button>
|
| 45 |
Â
</p>
|
| 46 |
Â
<?php endif;?>
|
| 47 |
Â
</div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 41 |
Â
<?php if (!Mage::app()->isSingleStoreMode()) :?>
|
| 42 |
Â
<p class="switcher">
|
| 43 |
Â
<?php echo $this->getChildHtml('store_switcher') ?>
|
| 44 |
+
<button class="button" onclick="preview();"><span><span><span><?php echo $this->__('Preview'); ?></span></span></span></button>
|
| 45 |
Â
</p>
|
| 46 |
Â
<?php endif;?>
|
| 47 |
Â
</div>
|
app/design/adminhtml/default/default/template/newsletter/preview/store.phtml
CHANGED
|
@@ -20,13 +20,13 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
|
| 28 |
Â
<?php if ($websites = $this->getWebsites()): ?>
|
| 29 |
-
<label for="store_switcher"><?php echo $this->__('Choose Store View')
|
| 30 |
Â
<select name="store_switcher" id="store_switcher">
|
| 31 |
Â
<?php foreach ($websites as $website): ?>
|
| 32 |
Â
<?php $showWebsite=false; ?>
|
|
@@ -49,6 +49,7 @@
|
|
| 49 |
Â
<?php endforeach; ?>
|
| 50 |
Â
<?php endforeach; ?>
|
| 51 |
Â
</select>
|
|
Â
|
|
| 52 |
Â
<script type="text/javascript">
|
| 53 |
Â
//<![CDATA[
|
| 54 |
Â
Event.observe($('store_switcher'), 'change', function(event) {
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
|
| 28 |
Â
<?php if ($websites = $this->getWebsites()): ?>
|
| 29 |
+
<label for="store_switcher"><?php echo $this->__('Choose Store View:') ?></label>
|
| 30 |
Â
<select name="store_switcher" id="store_switcher">
|
| 31 |
Â
<?php foreach ($websites as $website): ?>
|
| 32 |
Â
<?php $showWebsite=false; ?>
|
| 49 |
Â
<?php endforeach; ?>
|
| 50 |
Â
<?php endforeach; ?>
|
| 51 |
Â
</select>
|
| 52 |
+
<?php echo $this->getHintHtml() ?>
|
| 53 |
Â
<script type="text/javascript">
|
| 54 |
Â
//<![CDATA[
|
| 55 |
Â
Event.observe($('store_switcher'), 'change', function(event) {
|
app/design/adminhtml/default/default/template/newsletter/problem/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -63,7 +63,7 @@
|
|
| 63 |
Â
},
|
| 64 |
Â
|
| 65 |
Â
unsubscribe: function () {
|
| 66 |
-
var elements =
|
| 67 |
Â
var serializedElements = Form.serializeElements(elements, true);
|
| 68 |
Â
serializedElements._unsubscribe = '1';
|
| 69 |
Â
serializedElements.form_key = FORM_KEY;
|
|
@@ -76,7 +76,7 @@
|
|
| 76 |
Â
},
|
| 77 |
Â
|
| 78 |
Â
deleteSelected: function () {
|
| 79 |
-
var elements =
|
| 80 |
Â
var serializedElements = Form.serializeElements(elements, true);
|
| 81 |
Â
serializedElements._delete = '1';
|
| 82 |
Â
serializedElements.form_key = FORM_KEY;
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 63 |
Â
},
|
| 64 |
Â
|
| 65 |
Â
unsubscribe: function () {
|
| 66 |
+
var elements = $$('input.problemCheckbox');
|
| 67 |
Â
var serializedElements = Form.serializeElements(elements, true);
|
| 68 |
Â
serializedElements._unsubscribe = '1';
|
| 69 |
Â
serializedElements.form_key = FORM_KEY;
|
| 76 |
Â
},
|
| 77 |
Â
|
| 78 |
Â
deleteSelected: function () {
|
| 79 |
+
var elements = $$('input.problemCheckbox');
|
| 80 |
Â
var serializedElements = Form.serializeElements(elements, true);
|
| 81 |
Â
serializedElements._delete = '1';
|
| 82 |
Â
serializedElements.form_key = FORM_KEY;
|
app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/* @var $this Mage_Adminhtml_Block_Newsletter_Queue_Edit */
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/* @var $this Mage_Adminhtml_Block_Newsletter_Queue_Edit */
|
app/design/adminhtml/default/default/template/newsletter/queue/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -41,7 +41,7 @@
|
|
| 41 |
Â
<option value="<?php echo $_queue['value'] ?>"><?php echo $_queue['label'] ?> #<?php echo $_queue['value'] ?></option>
|
| 42 |
Â
<?php endforeach; ?>
|
| 43 |
Â
</select>
|
| 44 |
-
<button class="scalable" onclick="subscriberController.addToQueue();"><span><?php echo Mage::helper('newsletter')->__('Add to Queue'); ?></span></button>
|
| 45 |
Â
</div>
|
| 46 |
Â
<?php endif ?>
|
| 47 |
Â
<script type="text/javascript">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 41 |
Â
<option value="<?php echo $_queue['value'] ?>"><?php echo $_queue['label'] ?> #<?php echo $_queue['value'] ?></option>
|
| 42 |
Â
<?php endforeach; ?>
|
| 43 |
Â
</select>
|
| 44 |
+
<button class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?php echo Mage::helper('newsletter')->__('Add to Queue'); ?></span></span></span></button>
|
| 45 |
Â
</div>
|
| 46 |
Â
<?php endif ?>
|
| 47 |
Â
<script type="text/javascript">
|
app/design/adminhtml/default/default/template/newsletter/template/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/* @var $this Mage_Adminhtml_Block_Newsletter_Template_Edit */
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/* @var $this Mage_Adminhtml_Block_Newsletter_Template_Edit */
|
app/design/adminhtml/default/default/template/newsletter/template/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-newsletter-list"><?php echo $this->getHeaderText() ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
-
<button class="scalable add" onclick="window.location='<?php echo $this->getCreateUrl() ?>'"><span><?php echo Mage::helper('newsletter')->__('Add New Template'); ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-newsletter-list"><?php echo $this->getHeaderText() ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
+
<button class="scalable add" onclick="window.location='<?php echo $this->getCreateUrl() ?>'"><span><span><span><?php echo Mage::helper('newsletter')->__('Add New Template'); ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/notification/baseurl.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
app/design/adminhtml/default/default/template/notification/security.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
app/design/adminhtml/default/default/template/notification/survey.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/notification/toolbar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -59,10 +59,7 @@
|
|
| 59 |
Â
$latestNoticeUrl = $this->getLatestNoticeUrl();
|
| 60 |
Â
?>
|
| 61 |
Â
<?php /*
|
| 62 |
-
<span class="f-right"><?php echo $this->__('You have %s unread message(s). <a href="%s">Go to messages inbox</a>.',
|
| 63 |
-
$msgStats,
|
| 64 |
-
$this->getNoticesInboxUrl()
|
| 65 |
-
);?></span>
|
| 66 |
Â
*/?>
|
| 67 |
Â
|
| 68 |
Â
<span class="f-right">
|
|
@@ -70,12 +67,7 @@
|
|
| 70 |
Â
<?php echo $this->__('You have %s unread message(s).', $msgStats) ?> <a href="<?php echo $this->getNoticesInboxUrl() ?>"><?php echo $goToBoxMessage ?></a>
|
| 71 |
Â
</span>
|
| 72 |
Â
<?php /* ********** temporary commented
|
| 73 |
-
<span class="f-right"><?php echo $this->__('You have %s, %s and %s unread messages. <a href="%s">Go to messages inbox</a>.',
|
| 74 |
-
'<span class="critical"><strong>'.$this->getCriticalCount().'</strong> '.$this->__('critical').'</span>',
|
| 75 |
-
'<strong>'.$this->getMajorCount().'</strong> '.$this->__('major'),
|
| 76 |
-
'<strong>'.$this->getMinorCount().'</strong> '.$this->__('minor'),
|
| 77 |
-
$this->getNoticesInboxUrl()
|
| 78 |
-
);?></span>
|
| 79 |
Â
******** */?>
|
| 80 |
Â
<?php if ($this->isMessageWindowAvailable()): ?>
|
| 81 |
Â
<strong class="label clickable" onclick="openMessagePopup()">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 59 |
Â
$latestNoticeUrl = $this->getLatestNoticeUrl();
|
| 60 |
Â
?>
|
| 61 |
Â
<?php /*
|
| 62 |
+
<span class="f-right"><?php echo $this->__('You have %s unread message(s). <a href="%s">Go to messages inbox</a>.', $msgStats, $this->getNoticesInboxUrl());?></span>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 63 |
Â
*/?>
|
| 64 |
Â
|
| 65 |
Â
<span class="f-right">
|
| 67 |
Â
<?php echo $this->__('You have %s unread message(s).', $msgStats) ?> <a href="<?php echo $this->getNoticesInboxUrl() ?>"><?php echo $goToBoxMessage ?></a>
|
| 68 |
Â
</span>
|
| 69 |
Â
<?php /* ********** temporary commented
|
| 70 |
+
<span class="f-right"><?php echo $this->__('You have %s, %s and %s unread messages. <a href="%s">Go to messages inbox</a>.', '<span class="critical"><strong>'.$this->getCriticalCount().'</strong> '.$this->__('critical').'</span>', '<strong>'.$this->getMajorCount().'</strong> '.$this->__('major'), '<strong>'.$this->getMinorCount().'</strong> '.$this->__('minor'), $this->getNoticesInboxUrl());?></span>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 71 |
Â
******** */?>
|
| 72 |
Â
<?php if ($this->isMessageWindowAvailable()): ?>
|
| 73 |
Â
<strong class="label clickable" onclick="openMessagePopup()">
|
app/design/adminhtml/default/default/template/notification/window.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml
ADDED
|
@@ -0,0 +1,62 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* "Grant Access" button
|
| 30 |
+
*
|
| 31 |
+
* @var $this Mage_Oauth_Block_Authorize_ButtonBaseAbstract
|
| 32 |
+
*/
|
| 33 |
+
$logo = $this->getSkinUrl('images/logo-large.gif', array('_area' => 'adminhtml', '_package' => 'default'));
|
| 34 |
+
?>
|
| 35 |
+
<div class="login-container">
|
| 36 |
+
<div class="login-box">
|
| 37 |
+
<div class="page-title">
|
| 38 |
+
<h1><?php echo $this->__('Authorize application') ?></h1>
|
| 39 |
+
</div>
|
| 40 |
+
<div class="form-box">
|
| 41 |
+
<div>
|
| 42 |
+
<div id="messages">
|
| 43 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 44 |
+
</div>
|
| 45 |
+
<?php if (!$this->getHasException()) : ?>
|
| 46 |
+
<h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
|
| 47 |
+
<p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
|
| 48 |
+
<form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
|
| 49 |
+
<input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
|
| 50 |
+
<button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>">
|
| 51 |
+
<span><span><?php echo $this->__('Authorize') ?></span></span></button>
|
| 52 |
+
</form>
|
| 53 |
+
<form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
|
| 54 |
+
<input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
|
| 55 |
+
<button type="submit" class="button" title="<?php echo $this->__('Reject') ?>">
|
| 56 |
+
<span><span><?php echo $this->__('Reject') ?></span></span></button>
|
| 57 |
+
</form>
|
| 58 |
+
<?php endif; ?>
|
| 59 |
+
</div>
|
| 60 |
+
</div>
|
| 61 |
+
</div>
|
| 62 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/button.phtml
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* "Grant Access" button
|
| 29 |
+
*
|
| 30 |
+
* @see Mage_Oauth_Block_Authorize
|
| 31 |
+
*/
|
| 32 |
+
|
| 33 |
+
/** @var $this Mage_Oauth_Block_Adminhtml_Oauth_Authorize_Button */
|
| 34 |
+
?>
|
| 35 |
+
<div class="login-container auth-confirm">
|
| 36 |
+
<div class="login-box">
|
| 37 |
+
<div class="login-form auth-confirm">
|
| 38 |
+
<div class="page-title">
|
| 39 |
+
<h1><?php echo $this->__('Authorize application') ?></h1>
|
| 40 |
+
</div>
|
| 41 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 42 |
+
|
| 43 |
+
<?php if (!$this->getHasException()) : ?>
|
| 44 |
+
<h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
|
| 45 |
+
<p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
|
| 46 |
+
<form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
|
| 47 |
+
<input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
|
| 48 |
+
<button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>"><span><span><?php echo $this->__('Authorize') ?></span></span></button>
|
| 49 |
+
</form>
|
| 50 |
+
<form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
|
| 51 |
+
<input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
|
| 52 |
+
<button type="submit" class="button" title="<?php echo $this->__('Reject') ?>"><span><span><?php echo $this->__('Reject') ?></span></span></button>
|
| 53 |
+
</form>
|
| 54 |
+
<?php endif; ?>
|
| 55 |
+
</div>
|
| 56 |
+
<p class="legal"><?php echo $this->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')) ?></p>
|
| 57 |
+
<div class="bottom"></div>
|
| 58 |
+
</div>
|
| 59 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Authorize confirmation simple template
|
| 29 |
+
*
|
| 30 |
+
* @var $this Mage_Oauth_Block_AuthorizeBaseAbstract
|
| 31 |
+
*/
|
| 32 |
+
?>
|
| 33 |
+
<div class="login-container">
|
| 34 |
+
<div class="login-box">
|
| 35 |
+
<div class="page-title">
|
| 36 |
+
<h1><?php echo $this->__('Confirmation Of Authorization') ?></h1>
|
| 37 |
+
</div>
|
| 38 |
+
<div class="form-box">
|
| 39 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 40 |
+
<?php if ($this->getVerifier()): ?>
|
| 41 |
+
<h2><?php echo $this->__('Authorization confirmed') ?></h2>
|
| 42 |
+
<p><?php echo $this->__('Give the verifier code to application administrator') ?></p>
|
| 43 |
+
<p style="font-size: 14px;"><?php echo $this->__('Verifier code: %s', $this->getVerifier()) ?></p>
|
| 44 |
+
<?php endif; ?>
|
| 45 |
+
<button type="submit" class="button"
|
| 46 |
+
onclick="window.close();"
|
| 47 |
+
title="<?php echo $this->__('Close') ?>">
|
| 48 |
+
<span><span><?php echo $this->__('Close') ?></span></span>
|
| 49 |
+
</button>
|
| 50 |
+
</div>
|
| 51 |
+
</div>
|
| 52 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* "Grant Access" button
|
| 29 |
+
*
|
| 30 |
+
* @var $this Mage_Oauth_Block_Authorize
|
| 31 |
+
*/
|
| 32 |
+
?>
|
| 33 |
+
<div class="login-container">
|
| 34 |
+
<div class="login-box">
|
| 35 |
+
<div class="login-form">
|
| 36 |
+
<h1><?php echo $this->__('Confirmation Of Authorization') ?></h1>
|
| 37 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 38 |
+
<?php if (!$this->getHasException()): ?>
|
| 39 |
+
<p><?php echo $this->__('Give the verifier code to application administrator') ?></p>
|
| 40 |
+
<p style="font-size: 14px;"><?php echo $this->__('Verifier code: %s', $this->getVerifier()) ?></p>
|
| 41 |
+
<?php endif; ?>
|
| 42 |
+
</div>
|
| 43 |
+
<p class="legal"><?php echo $this->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')) ?></p>
|
| 44 |
+
<div class="bottom"></div>
|
| 45 |
+
</div>
|
| 46 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml
ADDED
|
@@ -0,0 +1,77 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Admin login form template
|
| 29 |
+
*
|
| 30 |
+
* @var $this Mage_Oauth_Block_AuthorizeBaseAbstract
|
| 31 |
+
*/
|
| 32 |
+
?>
|
| 33 |
+
<div class="content-container">
|
| 34 |
+
<div class="login-box">
|
| 35 |
+
<div class="page-title">
|
| 36 |
+
<h1><?php echo $this->__('Log In') ?></h1>
|
| 37 |
+
</div>
|
| 38 |
+
<div class="form-box">
|
| 39 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 40 |
+
<?php if (!$this->getHasException()) : ?>
|
| 41 |
+
<form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
|
| 42 |
+
<fieldset class="fieldset">
|
| 43 |
+
<h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
|
| 44 |
+
<p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
|
| 45 |
+
<div class="login-form simple">
|
| 46 |
+
<input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>"/>
|
| 47 |
+
<input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>"/>
|
| 48 |
+
|
| 49 |
+
<div class="input-box input-left">
|
| 50 |
+
<label for="username">
|
| 51 |
+
<em class="required">*</em> <?php echo $this->getIdentityLabel(); ?>
|
| 52 |
+
</label>
|
| 53 |
+
<input type="text" id="username" name="login[username]" value="" class="required-entry input-text"/>
|
| 54 |
+
</div>
|
| 55 |
+
<div class="clear"></div>
|
| 56 |
+
<div class="input-box input-right">
|
| 57 |
+
<label for="login">
|
| 58 |
+
<em class="required">*</em> <?php echo $this->__('Password') ?>
|
| 59 |
+
</label>
|
| 60 |
+
<input type="password" id="login" name="login[password]" class="required-entry input-text"
|
| 61 |
+
value=""/></div>
|
| 62 |
+
<div class="clear"></div>
|
| 63 |
+
<div class="form-buttons">
|
| 64 |
+
<button type="submit" class="form-button"
|
| 65 |
+
title="<?php echo $this->__('Login') ?>"/><?php echo $this->__('Login') ?></button>
|
| 66 |
+
<button type="button" onclick="document.location.href='<?php echo $this->getRejectUrl(); ?>';"
|
| 67 |
+
title="<?php echo $this->__('Reject') ?>"><?php echo $this->__('Reject') ?></button>
|
| 68 |
+
<p class="required"><?php echo $this->__('* Required Fields') ?></p>
|
| 69 |
+
</div>
|
| 70 |
+
</div>
|
| 71 |
+
</fieldset>
|
| 72 |
+
</form>
|
| 73 |
+
<?php endif; ?>
|
| 74 |
+
</div>
|
| 75 |
+
<div class="bottom"></div>
|
| 76 |
+
</div>
|
| 77 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml
ADDED
|
@@ -0,0 +1,67 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Admin login form template
|
| 29 |
+
*
|
| 30 |
+
* @var $this Mage_Oauth_Block_Adminhtml_Oauth_Authorize
|
| 31 |
+
* @see Mage_Oauth_Block_Adminhtml_Oauth_Authorize
|
| 32 |
+
*/
|
| 33 |
+
|
| 34 |
+
?>
|
| 35 |
+
<div class="login-container">
|
| 36 |
+
<div class="login-box">
|
| 37 |
+
<div class="login-form">
|
| 38 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 39 |
+
<?php if (!$this->getHasException()): ?>
|
| 40 |
+
<form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
|
| 41 |
+
<fieldset>
|
| 42 |
+
<input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
|
| 43 |
+
<h2><?php echo $this->__('Log in to Admin Panel'); ?></h2>
|
| 44 |
+
<p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
|
| 45 |
+
<div class="input-box input-left"><label for="username"><?php echo $this->__('User Name:') ?></label><br/>
|
| 46 |
+
<input type="text" id="username" name="login[username]" value="" class="required-entry input-text" /></div>
|
| 47 |
+
<div class="input-box input-right"><label for="login"><?php echo $this->__('Password:') ?></label><br />
|
| 48 |
+
<input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
|
| 49 |
+
<div class="clear"></div>
|
| 50 |
+
<div class="form-buttons">
|
| 51 |
+
<button type="submit" class="form-button" title="<?php echo $this->__('Login') ?>" ><?php echo $this->__('Login') ?></button>
|
| 52 |
+
<button onclick="document.location.href='<?php echo $this->getRejectUrl() ?>'; return false;" title="<?php echo $this->__('Reject') ?>"><?php echo $this->__('Reject') ?></button>
|
| 53 |
+
</div>
|
| 54 |
+
<input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>"/>
|
| 55 |
+
</fieldset>
|
| 56 |
+
</form>
|
| 57 |
+
<script type="text/javascript">
|
| 58 |
+
//<![CDATA[
|
| 59 |
+
var loginForm = new varienForm('loginForm');
|
| 60 |
+
//]]>
|
| 61 |
+
</script>
|
| 62 |
+
<?php endif; ?>
|
| 63 |
+
</div>
|
| 64 |
+
<p class="legal"><?php echo $this->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')) ?></p>
|
| 65 |
+
<div class="bottom"></div>
|
| 66 |
+
</div>
|
| 67 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Head block Oauth simple pages
|
| 29 |
+
*
|
| 30 |
+
* @var $this Mage_Adminhtml_Block_Page_Head
|
| 31 |
+
*/
|
| 32 |
+
|
| 33 |
+
//Code partially copied from adminhtml/default/default/template/page/head.phtml
|
| 34 |
+
?>
|
| 35 |
+
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
|
| 36 |
+
<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
|
| 37 |
+
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
|
| 38 |
+
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
|
| 39 |
+
|
| 40 |
+
<script type="text/javascript">
|
| 41 |
+
//<![CDATA[
|
| 42 |
+
var BLANK_URL = '<?php echo $this->getJsUrl() ?>blank.html';
|
| 43 |
+
var BLANK_IMG = '<?php echo $this->getJsUrl() ?>spacer.gif';
|
| 44 |
+
var BASE_URL = '<?php echo $this->getUrl('*') ?>';
|
| 45 |
+
var SKIN_URL = '<?php echo $this->getSkinUrl() ?>';
|
| 46 |
+
var FORM_KEY = '<?php echo $this->getFormKey() ?>';
|
| 47 |
+
//]]>
|
| 48 |
+
</script>
|
| 49 |
+
|
| 50 |
+
<?php echo $this->getCssJsHtml() ?>
|
app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml
ADDED
|
@@ -0,0 +1,47 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
/**
|
| 28 |
+
* Authorize rejection simple template
|
| 29 |
+
*
|
| 30 |
+
* @var $this Mage_Oauth_Block_AuthorizeBaseAbstract
|
| 31 |
+
*/
|
| 32 |
+
?>
|
| 33 |
+
<div class="login-container">
|
| 34 |
+
<div class="login-box">
|
| 35 |
+
<div class="page-title">
|
| 36 |
+
<h1><?php echo $this->__('Rejection Of Authorization') ?></h1>
|
| 37 |
+
</div>
|
| 38 |
+
<div class="form-box">
|
| 39 |
+
<div id="messages">
|
| 40 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 41 |
+
</div>
|
| 42 |
+
<button type="submit" class="button" onclick="window.close();" title="<?php echo $this->__('Close') ?>">
|
| 43 |
+
<span><span><?php echo $this->__('Close') ?></span></span>
|
| 44 |
+
</button>
|
| 45 |
+
</div>
|
| 46 |
+
</div>
|
| 47 |
+
</div>
|
app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* "Grant Access" button
|
| 30 |
+
*
|
| 31 |
+
* @see Mage_Oauth_Block_Authorize
|
| 32 |
+
*/
|
| 33 |
+
?>
|
| 34 |
+
<?php /** @var $this Mage_Core_Block_Template */ ?>
|
| 35 |
+
<div class="login-container">
|
| 36 |
+
<div class="login-box">
|
| 37 |
+
<div class="login-form">
|
| 38 |
+
<h1><?php echo $this->__('Rejection Of Authorization') ?></h1>
|
| 39 |
+
<?php echo $this->getMessagesBlock()->toHtml() ?>
|
| 40 |
+
</div>
|
| 41 |
+
<p class="legal"><?php echo $this->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')) ?></p>
|
| 42 |
+
<div class="bottom"></div>
|
| 43 |
+
</div>
|
| 44 |
+
</div>
|
app/design/adminhtml/default/default/template/overlay_popup.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/page.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -43,7 +43,7 @@
|
|
| 43 |
Â
<?php echo $this->getChildHtml('head') ?>
|
| 44 |
Â
</head>
|
| 45 |
Â
|
| 46 |
-
<body id="html-body"<?php echo $this->getBodyClass()?'class="'
|
| 47 |
Â
<?php echo $this->getChildHtml('notification_window'); ?>
|
| 48 |
Â
<div class="wrapper">
|
| 49 |
Â
<?php echo $this->getChildHtml('global_notices') ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 43 |
Â
<?php echo $this->getChildHtml('head') ?>
|
| 44 |
Â
</head>
|
| 45 |
Â
|
| 46 |
+
<body id="html-body"<?php echo $this->getBodyClass() ? ' class="' . $this->getBodyClass() . '"' : ''; ?>>
|
| 47 |
Â
<?php echo $this->getChildHtml('notification_window'); ?>
|
| 48 |
Â
<div class="wrapper">
|
| 49 |
Â
<?php echo $this->getChildHtml('global_notices') ?>
|
app/design/adminhtml/default/default/template/page/footer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/page/head.phtml
CHANGED
|
@@ -1,7 +1,4 @@
|
|
| 1 |
Â
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
|
| 2 |
-
<?php if($this->getCanLoadTinyMce()): ?>
|
| 3 |
-
<meta http-equiv="X-UA-Compatible" content="IE=8" />
|
| 4 |
-
<?php endif; ?>
|
| 5 |
Â
<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
|
| 6 |
Â
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
|
| 7 |
Â
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
|
| 1 |
Â
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 2 |
Â
<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
|
| 3 |
Â
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
|
| 4 |
Â
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
|
app/design/adminhtml/default/default/template/page/header.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/page/js/calendar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
// no notice of license for now
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
// no notice of license for now
|
app/design/adminhtml/default/default/template/page/js/translate.phtml
CHANGED
|
@@ -20,10 +20,17 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 27 |
Â
$_data = array(
|
| 28 |
Â
'Please select an option.' => $this->__('Please select an option.'),
|
| 29 |
Â
'This is a required field.' => $this->__('This is a required field.'),
|
|
@@ -52,10 +59,7 @@ $_data = array(
|
|
| 52 |
Â
'Please enter valid password.' => $this->__('Please enter valid password.'),
|
| 53 |
Â
'Please enter a number greater than 0 in this field.' => $this->__('Please enter a number greater than 0 in this field.'),
|
| 54 |
Â
'Please enter a valid credit card number.' => $this->__('Please enter a valid credit card number.'),
|
| 55 |
-
'Please wait, loading...' => $this->__('Please wait, loading...')
|
| 56 |
-
/*'' => $this->__(''),
|
| 57 |
-
'' => $this->__(''),
|
| 58 |
-
'' => $this->__(''),*/
|
| 59 |
Â
);
|
| 60 |
Â
?>
|
| 61 |
Â
<script type="text/javascript">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
+
?>
|
| 27 |
+
|
| 28 |
+
<?php
|
| 29 |
+
/**
|
| 30 |
+
* @var $this Mage_Page_Block_Js_Translate
|
| 31 |
+
*/
|
| 32 |
+
?>
|
| 33 |
+
<?php
|
| 34 |
Â
$_data = array(
|
| 35 |
Â
'Please select an option.' => $this->__('Please select an option.'),
|
| 36 |
Â
'This is a required field.' => $this->__('This is a required field.'),
|
| 59 |
Â
'Please enter valid password.' => $this->__('Please enter valid password.'),
|
| 60 |
Â
'Please enter a number greater than 0 in this field.' => $this->__('Please enter a number greater than 0 in this field.'),
|
| 61 |
Â
'Please enter a valid credit card number.' => $this->__('Please enter a valid credit card number.'),
|
| 62 |
+
'Please wait, loading...' => $this->__('Please wait, loading...')
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 63 |
Â
);
|
| 64 |
Â
?>
|
| 65 |
Â
<script type="text/javascript">
|
app/design/adminhtml/default/default/template/page/menu.phtml
CHANGED
|
@@ -20,30 +20,17 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
|
|
Â
|
|
| 28 |
Â
<!-- menu start -->
|
| 29 |
-
|
| 30 |
Â
<!-- menu end -->
|
| 31 |
-
<div class="nav-bar">
|
| 32 |
-
<?php drawMenuLevel($this->getMenuArray()); ?>
|
| 33 |
-
<?php function drawMenuLevel($_menu, $_level=0) { ?>
|
| 34 |
-
<ul <?php if(!$_level): ?>id="nav"<?php endif ?>>
|
| 35 |
-
<?php foreach ($_menu as $_item): ?>
|
| 36 |
-
<li <?php if(!empty($_item['children'])): ?>onmouseover="Element.addClassName(this,'over')" onmouseout="Element.removeClassName(this,'over')"<?php endif ?> class=" <?php echo (!$_level && !empty($_item['active']))?' active':'' ?> <?php echo !empty($_item['children'])?' parent':'' ?><?php echo (!empty($_level) && !empty($_item['last']))?' last':'' ?> level<?php echo $_level ?>"> <a href="<?php echo $_item['url'] ?>" <?php if(!empty($_item['title'])): ?>title="<?php echo $_item['title'] ?>"<?php endif ?> <?php if(!empty($_item['click'])): ?>onclick="<?php echo $_item['click']; ?>"<?php endif ?> class="<?php echo ($_level===0 && !empty($_item['active']))?'active':'' ?>"><span><?php echo $_item['label'] ?><?php if(!$_level): ?><?php endif ?></span></a>
|
| 37 |
-
<?php if(!empty($_item['children'])): ?>
|
| 38 |
-
<?php drawMenuLevel($_item['children'], $_level+1); ?>
|
| 39 |
-
<?php endif; ?>
|
| 40 |
-
</li>
|
| 41 |
-
<?php endforeach; ?>
|
| 42 |
-
</ul>
|
| 43 |
-
<?php }//function ?>
|
| 44 |
Â
|
| 45 |
Â
<a id="page-help-link" href="<?php echo Mage::helper('adminhtml')->getPageHelpUrl() ?>"><?php echo $this->__('Get help for this page') ?></a>
|
| 46 |
Â
<script type="text/javascript">$('page-help-link').target = 'magento_page_help'</script>
|
| 47 |
Â
|
| 48 |
Â
</div>
|
| 49 |
-
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
|
| 28 |
+
<div class="nav-bar">
|
| 29 |
Â
<!-- menu start -->
|
| 30 |
+
<?php echo $this->getMenuLevel($this->getMenuArray()); ?>
|
| 31 |
Â
<!-- menu end -->
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 32 |
Â
|
| 33 |
Â
<a id="page-help-link" href="<?php echo Mage::helper('adminhtml')->getPageHelpUrl() ?>"><?php echo $this->__('Get help for this page') ?></a>
|
| 34 |
Â
<script type="text/javascript">$('page-help-link').target = 'magento_page_help'</script>
|
| 35 |
Â
|
| 36 |
Â
</div>
|
|
Â
|
app/design/adminhtml/default/default/template/page/notices.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -33,7 +33,7 @@
|
|
| 33 |
Â
<noscript>
|
| 34 |
Â
<div class="noscript">
|
| 35 |
Â
<div class="noscript-inner">
|
| 36 |
-
<p><strong><?php echo $this->__('
|
| 37 |
Â
<p><?php echo $this->__('You must have JavaScript enabled in your browser to utilize the functionality of this website.'); ?></p>
|
| 38 |
Â
</div>
|
| 39 |
Â
</div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 33 |
Â
<noscript>
|
| 34 |
Â
<div class="noscript">
|
| 35 |
Â
<div class="noscript-inner">
|
| 36 |
+
<p><strong><?php echo $this->__('JavaScript seems to be disabled in your browser.'); ?></strong></p>
|
| 37 |
Â
<p><?php echo $this->__('You must have JavaScript enabled in your browser to utilize the functionality of this website.'); ?></p>
|
| 38 |
Â
</div>
|
| 39 |
Â
</div>
|
app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paygate/form/cc.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paygate/info/cc.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paygate/info/pdf.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/form/cc.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/form/ccsave.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/form/checkmo.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* @see Mage_Payment_Block_Info
|
| 30 |
+
*/
|
| 31 |
+
?>
|
| 32 |
+
<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
|
| 33 |
+
<?php if ($this->getInstructions()): ?>
|
| 34 |
+
<table>
|
| 35 |
+
<tbody>
|
| 36 |
+
<tr>
|
| 37 |
+
<td><?php echo nl2br($this->getInstructions()) ?></td>
|
| 38 |
+
</tr>
|
| 39 |
+
</tbody>
|
| 40 |
+
</table>
|
| 41 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/info/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -33,12 +33,12 @@
|
|
| 33 |
Â
<tr>
|
| 34 |
Â
<td>
|
| 35 |
Â
<button style="" onclick="javascript:window.open('<?php echo $this->getButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
|
| 36 |
-
<span><?php echo $this->escapeHtml($this->getButtonLabel()); ?></span>
|
| 37 |
Â
</button>
|
| 38 |
Â
</td>
|
| 39 |
Â
<td>
|
| 40 |
Â
<button style="" onclick="javascript:window.open('<?php echo $this->getSandboxButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $this->getSandboxHtmlId() ?>">
|
| 41 |
-
<span><?php echo $this->escapeHtml($this->getSandboxButtonLabel()); ?></span>
|
| 42 |
Â
</button>
|
| 43 |
Â
</td>
|
| 44 |
Â
</tr>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 33 |
Â
<tr>
|
| 34 |
Â
<td>
|
| 35 |
Â
<button style="" onclick="javascript:window.open('<?php echo $this->getButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
|
| 36 |
+
<span><span><span><?php echo $this->escapeHtml($this->getButtonLabel()); ?></span></span></span>
|
| 37 |
Â
</button>
|
| 38 |
Â
</td>
|
| 39 |
Â
<td>
|
| 40 |
Â
<button style="" onclick="javascript:window.open('<?php echo $this->getSandboxButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $this->getSandboxHtmlId() ?>">
|
| 41 |
+
<span><span><span><?php echo $this->escapeHtml($this->getSandboxButtonLabel()); ?></span></span></span>
|
| 42 |
Â
</button>
|
| 43 |
Â
</td>
|
| 44 |
Â
</tr>
|
app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
CHANGED
|
@@ -27,18 +27,18 @@
|
|
| 27 |
Â
if (trElement) {
|
| 28 |
Â
var checkbox = Element.getElementsBySelector(trElement, 'input');
|
| 29 |
Â
if(checkbox[0]){
|
| 30 |
-
var checked = isInput ? checkbox[0].checked :
|
| 31 |
Â
if (checked) {
|
| 32 |
-
checkbox[0].checked = true;
|
| 33 |
Â
if ( confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
|
| 34 |
-
|
|
Â
|
|
| 35 |
Â
varienElementMethods.setHasChanges(checkbox[0]);
|
| 36 |
Â
} else {
|
| 37 |
-
checkbox[0].checked =
|
| 38 |
Â
}
|
| 39 |
-
warning = false;
|
| 40 |
Â
} else {
|
| 41 |
-
|
|
Â
|
|
| 42 |
Â
}
|
| 43 |
Â
|
| 44 |
Â
$('in_role_user').value = checkBoxes.toQueryString();
|
|
@@ -62,28 +62,25 @@
|
|
| 62 |
Â
}
|
| 63 |
Â
}
|
| 64 |
Â
|
| 65 |
-
function
|
| 66 |
Â
{
|
| 67 |
-
if (checkBoxes.size() > 0) {
|
| 68 |
Â
if (!confirm("<?php echo $this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
|
| 69 |
-
|
| 70 |
-
} else {
|
| 71 |
-
checkBoxes.each(function(el){
|
| 72 |
-
el.checked = o.checked;
|
| 73 |
-
});
|
| 74 |
Â
return false;
|
| 75 |
Â
}
|
| 76 |
-
warning = false;
|
| 77 |
Â
}
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
|
Â
|
|
|
Â
|
|
| 81 |
Â
}
|
| 82 |
Â
|
| 83 |
Â
<?php echo $myBlock->getJsObjectName() ?>.rowClickCallback = roleUsersRowClick;
|
| 84 |
Â
<?php echo $myBlock->getJsObjectName() ?>.initRowCallback = roleUsersRowInit;
|
| 85 |
Â
<?php echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
|
| 86 |
-
<?php echo $myBlock->getJsObjectName() ?>.checkCheckboxes =
|
| 87 |
Â
<?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row){roleUsersRowInit(<?php echo $myBlock->getJsObjectName() ?>, row)});
|
| 88 |
Â
$('in_role_user_old').value = $('in_role_user').value;
|
| 89 |
Â
<?php endif; ?>
|
| 27 |
Â
if (trElement) {
|
| 28 |
Â
var checkbox = Element.getElementsBySelector(trElement, 'input');
|
| 29 |
Â
if(checkbox[0]){
|
| 30 |
+
var checked = isInput ? !checkbox[0].checked : checkbox[0].checked;
|
| 31 |
Â
if (checked) {
|
|
Â
|
|
| 32 |
Â
if ( confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
|
| 33 |
+
checkbox[0].checked = false;
|
| 34 |
+
checkBoxes.unset(checkbox[0].value);
|
| 35 |
Â
varienElementMethods.setHasChanges(checkbox[0]);
|
| 36 |
Â
} else {
|
| 37 |
+
checkbox[0].checked = true;
|
| 38 |
Â
}
|
|
Â
|
|
| 39 |
Â
} else {
|
| 40 |
+
checkbox[0].checked = true;
|
| 41 |
+
checkBoxes.set(checkbox[0].value, true);
|
| 42 |
Â
}
|
| 43 |
Â
|
| 44 |
Â
$('in_role_user').value = checkBoxes.toQueryString();
|
| 62 |
Â
}
|
| 63 |
Â
}
|
| 64 |
Â
|
| 65 |
+
function massSelectUsers(allCheckbox)
|
| 66 |
Â
{
|
| 67 |
+
if (!allCheckbox.checked && checkBoxes.size() > 0) {
|
| 68 |
Â
if (!confirm("<?php echo $this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
|
| 69 |
+
allCheckbox.checked = false;
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 70 |
Â
return false;
|
| 71 |
Â
}
|
|
Â
|
|
| 72 |
Â
}
|
| 73 |
+
<?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row)
|
| 74 |
+
{
|
| 75 |
+
$(row).getElementsByClassName('checkbox')[0].checked = allCheckbox.checked;
|
| 76 |
+
roleUsersRowInit(<?php echo $myBlock->getJsObjectName() ?>, row);
|
| 77 |
+
});
|
| 78 |
Â
}
|
| 79 |
Â
|
| 80 |
Â
<?php echo $myBlock->getJsObjectName() ?>.rowClickCallback = roleUsersRowClick;
|
| 81 |
Â
<?php echo $myBlock->getJsObjectName() ?>.initRowCallback = roleUsersRowInit;
|
| 82 |
Â
<?php echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
|
| 83 |
+
<?php echo $myBlock->getJsObjectName() ?>.checkCheckboxes = massSelectUsers;
|
| 84 |
Â
<?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row){roleUsersRowInit(<?php echo $myBlock->getJsObjectName() ?>, row)});
|
| 85 |
Â
$('in_role_user_old').value = $('in_role_user').value;
|
| 86 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/permissions/roleinfo.phtml
CHANGED
|
@@ -20,14 +20,14 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<div class="content-header">
|
| 28 |
Â
<table cellspacing="0">
|
| 29 |
Â
<tr>
|
| 30 |
-
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo ($this->getRoleId() > 0 ) ? ($this->__('Edit Role') . " '{$this->getRoleInfo()->getRoleName()}'") : $this->__('Add New Role') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
Â
<?php echo $this->getBackButtonHtml() ?>
|
| 33 |
Â
<?php echo $this->getResetButtonHtml() ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<div class="content-header">
|
| 28 |
Â
<table cellspacing="0">
|
| 29 |
Â
<tr>
|
| 30 |
+
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo ($this->getRoleId() > 0 ) ? ($this->__('Edit Role') . " '{$this->escapeHtml($this->getRoleInfo()->getRoleName())}'") : $this->__('Add New Role') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
Â
<?php echo $this->getBackButtonHtml() ?>
|
| 33 |
Â
<?php echo $this->getResetButtonHtml() ?>
|
app/design/adminhtml/default/default/template/permissions/roles.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo $this->__('Roles') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
-
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><?php echo $this->__('Add New Role') ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo $this->__('Roles') ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
+
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><span><span><?php echo $this->__('Add New Role') ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/permissions/rolesedit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/permissions/userinfo.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/permissions/usernroles.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/permissions/userroles.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/permissions/users.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3><?php echo $this->__('Users') ?></h3></td>
|
| 31 |
Â
<td class="a-right">
|
| 32 |
-
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><?php echo $this->__('Add New User') ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3><?php echo $this->__('Users') ?></h3></td>
|
| 31 |
Â
<td class="a-right">
|
| 32 |
+
<button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><span><span><?php echo $this->__('Add New User') ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/poll/answers/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -35,7 +35,7 @@
|
|
| 35 |
Â
<table cellspacing="0" class="form-list">
|
| 36 |
Â
<tr>
|
| 37 |
Â
<td class="label"><label for="answer_<?php echo $_item->getId() ?>"><?php echo Mage::helper('poll')->__('Answer Title:') ?> <span class="required">*</span></label></td>
|
| 38 |
-
<td class="value"><input type="text" id="answer_<?php echo $_item->getId() ?>" name="answer[<?php echo $_item->getId() ?>][title]" value="<?php echo $_item->getAnswerTitle() ?>" class="input-text required-entry" /></td>
|
| 39 |
Â
</tr>
|
| 40 |
Â
<tr>
|
| 41 |
Â
<td class="label"><label for="answer_votes_<?php echo $_item->getId() ?>"><?php echo Mage::helper('poll')->__('Votes Count:') ?> <span class="required">*</span></label></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 35 |
Â
<table cellspacing="0" class="form-list">
|
| 36 |
Â
<tr>
|
| 37 |
Â
<td class="label"><label for="answer_<?php echo $_item->getId() ?>"><?php echo Mage::helper('poll')->__('Answer Title:') ?> <span class="required">*</span></label></td>
|
| 38 |
+
<td class="value"><input type="text" id="answer_<?php echo $_item->getId() ?>" name="answer[<?php echo $_item->getId() ?>][title]" value="<?php echo $this->escapeHtml($_item->getAnswerTitle()) ?>" class="input-text required-entry" /></td>
|
| 39 |
Â
</tr>
|
| 40 |
Â
<tr>
|
| 41 |
Â
<td class="label"><label for="answer_votes_<?php echo $_item->getId() ?>"><?php echo Mage::helper('poll')->__('Votes Count:') ?> <span class="required">*</span></label></td>
|
app/design/adminhtml/default/default/template/popup.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/promo/fieldset.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/promo/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/promo/js.phtml
CHANGED
|
@@ -20,25 +20,27 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<script type="text/javascript">
|
| 28 |
Â
//<![CDATA[
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
function hideShowSubproductOptions(enabler)
|
| 32 |
Â
{
|
| 33 |
-
if (
|
| 34 |
-
$('rule_sub_simple_action').
|
| 35 |
-
$('rule_sub_discount_amount').
|
| 36 |
Â
$('rule_sub_discount_amount').addClassName('required-entry validate-not-negative-number');
|
| 37 |
Â
} else {
|
| 38 |
-
$('rule_sub_simple_action').
|
| 39 |
-
$('rule_sub_discount_amount').
|
| 40 |
Â
$('rule_sub_discount_amount').removeClassName('required-entry').removeClassName('validate-not-negative-number');
|
| 41 |
Â
}
|
|
Â
|
|
|
Â
|
|
| 42 |
Â
}
|
|
Â
|
|
|
Â
|
|
| 43 |
Â
//]]>
|
| 44 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<script type="text/javascript">
|
| 28 |
Â
//<![CDATA[
|
| 29 |
+
function hideShowSubproductOptions()
|
|
Â
|
|
|
Â
|
|
| 30 |
Â
{
|
| 31 |
+
if ($('rule_sub_is_enable').value == 1) {
|
| 32 |
+
$('rule_sub_simple_action').up('tr').show();
|
| 33 |
+
$('rule_sub_discount_amount').up('tr').show();
|
| 34 |
Â
$('rule_sub_discount_amount').addClassName('required-entry validate-not-negative-number');
|
| 35 |
Â
} else {
|
| 36 |
+
$('rule_sub_simple_action').up('tr').hide();
|
| 37 |
+
$('rule_sub_discount_amount').up('tr').hide();
|
| 38 |
Â
$('rule_sub_discount_amount').removeClassName('required-entry').removeClassName('validate-not-negative-number');
|
| 39 |
Â
}
|
| 40 |
+
|
| 41 |
+
return true;
|
| 42 |
Â
}
|
| 43 |
+
|
| 44 |
+
document.observe("dom:loaded", hideShowSubproductOptions);
|
| 45 |
Â
//]]>
|
| 46 |
Â
</script>
|
app/design/adminhtml/default/default/template/promo/salesrulejs.phtml
ADDED
|
@@ -0,0 +1,114 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<script type="text/javascript">
|
| 28 |
+
//<![CDATA[
|
| 29 |
+
var couponTypeSpecific = '<?php echo Mage_SalesRule_Model_Rule::COUPON_TYPE_SPECIFIC ?>';
|
| 30 |
+
var tmpButtonsActionsStorage = [];
|
| 31 |
+
|
| 32 |
+
function disableEnableCouponsTabContent(disable) {
|
| 33 |
+
var containerId = 'promo_catalog_edit_tabs_coupons_section_content';
|
| 34 |
+
if($(containerId)){
|
| 35 |
+
var dataFields = $(containerId).select('input', 'select', 'textarea', 'button');
|
| 36 |
+
for(var i = 0; i < dataFields.length; i++) {
|
| 37 |
+
disable ? dataFields[i].disable().addClassName('disabled')
|
| 38 |
+
: dataFields[i].enable().removeClassName('disabled');
|
| 39 |
+
}
|
| 40 |
+
}
|
| 41 |
+
disable ? $('rule_coupon_code').enable() : $('rule_coupon_code').disable();
|
| 42 |
+
}
|
| 43 |
+
|
| 44 |
+
function handleCouponsTabContentActivity() {
|
| 45 |
+
disableEnableCouponsTabContent(!$('rule_use_auto_generation').checked);
|
| 46 |
+
}
|
| 47 |
+
|
| 48 |
+
function handleCouponTypeChange() {
|
| 49 |
+
$('rule_coupon_type').observe('change', function() {
|
| 50 |
+
var disable = $('rule_coupon_type').value != couponTypeSpecific;
|
| 51 |
+
if (!disable) {
|
| 52 |
+
disable = !$('rule_use_auto_generation').checked;
|
| 53 |
+
}
|
| 54 |
+
disableEnableCouponsTabContent(disable);
|
| 55 |
+
});
|
| 56 |
+
}
|
| 57 |
+
|
| 58 |
+
function refreshCouponCodesGrid(grid, gridMassAction, transport) {
|
| 59 |
+
grid.reload();
|
| 60 |
+
gridMassAction.unselectAll();
|
| 61 |
+
}
|
| 62 |
+
|
| 63 |
+
function generateCouponCodes(idPrefix, generateUrl, grid) {
|
| 64 |
+
$(idPrefix + 'information_fieldset').removeClassName('ignore-validate');
|
| 65 |
+
var validationResult = $(idPrefix + 'information_fieldset').select('input',
|
| 66 |
+
'select', 'textarea').collect( function(elm) {
|
| 67 |
+
return Validation.validate(elm, {
|
| 68 |
+
useTitle :false,
|
| 69 |
+
onElementValidate : function() {
|
| 70 |
+
}
|
| 71 |
+
});
|
| 72 |
+
}).all();
|
| 73 |
+
$(idPrefix + 'information_fieldset').addClassName('ignore-validate');
|
| 74 |
+
|
| 75 |
+
if (!validationResult) {
|
| 76 |
+
return;
|
| 77 |
+
}
|
| 78 |
+
var elements = $(idPrefix + 'information_fieldset').select('input', 'select', 'textarea');
|
| 79 |
+
|
| 80 |
+
elements = elements.concat(
|
| 81 |
+
$$('#rule_uses_per_coupon'),
|
| 82 |
+
$$('#rule_uses_per_customer'),
|
| 83 |
+
$$('#rule_to_date')
|
| 84 |
+
);
|
| 85 |
+
|
| 86 |
+
var params = Form.serializeElements(elements, true);
|
| 87 |
+
params.form_key = FORM_KEY;
|
| 88 |
+
$('messages').update();
|
| 89 |
+
var couponCodesGrid = eval(grid);
|
| 90 |
+
new Ajax.Request(generateUrl, {
|
| 91 |
+
parameters :params,
|
| 92 |
+
method :'post',
|
| 93 |
+
onComplete : function (transport, param){
|
| 94 |
+
var response = false;
|
| 95 |
+
if (transport && transport.responseText) {
|
| 96 |
+
response = eval('(' + transport.responseText + ')');
|
| 97 |
+
}
|
| 98 |
+
if (couponCodesGrid) {
|
| 99 |
+
couponCodesGrid.reload();
|
| 100 |
+
}
|
| 101 |
+
if (response && response.messages) {
|
| 102 |
+
$('messages').update(response.messages);
|
| 103 |
+
}
|
| 104 |
+
if (response && response.error) {
|
| 105 |
+
alert(response.error);
|
| 106 |
+
}
|
| 107 |
+
}
|
| 108 |
+
});
|
| 109 |
+
}
|
| 110 |
+
|
| 111 |
+
document.observe("dom:loaded", handleCouponsTabContentActivity);
|
| 112 |
+
document.observe("dom:loaded", handleCouponTypeChange);
|
| 113 |
+
//]]>
|
| 114 |
+
</script>
|
app/design/adminhtml/default/default/template/rating/detailed.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/rating/options.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/rating/stars/summary.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/report/grid.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/report/grid/container.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -42,6 +42,7 @@
|
|
| 42 |
Â
<?php echo $this->getGridHtml() ?>
|
| 43 |
Â
</div>
|
| 44 |
Â
<script type="text/javascript">
|
|
Â
|
|
| 45 |
Â
function filterFormSubmit() {
|
| 46 |
Â
var filters = $$('#filter_form input', '#filter_form select');
|
| 47 |
Â
var elements = [];
|
|
@@ -53,4 +54,5 @@
|
|
| 53 |
Â
setLocation('<?php echo $this->getFilterUrl(); ?>filter/'+encode_base64(Form.serializeElements(elements))+'/');
|
| 54 |
Â
}
|
| 55 |
Â
}
|
|
Â
|
|
| 56 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 42 |
Â
<?php echo $this->getGridHtml() ?>
|
| 43 |
Â
</div>
|
| 44 |
Â
<script type="text/javascript">
|
| 45 |
+
//<![CDATA[
|
| 46 |
Â
function filterFormSubmit() {
|
| 47 |
Â
var filters = $$('#filter_form input', '#filter_form select');
|
| 48 |
Â
var elements = [];
|
| 54 |
Â
setLocation('<?php echo $this->getFilterUrl(); ?>filter/'+encode_base64(Form.serializeElements(elements))+'/');
|
| 55 |
Â
}
|
| 56 |
Â
}
|
| 57 |
+
//]]>
|
| 58 |
Â
</script>
|
app/design/adminhtml/default/default/template/report/refresh/statistics.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/report/store/switcher.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -30,7 +30,7 @@
|
|
| 30 |
Â
*/
|
| 31 |
Â
?>
|
| 32 |
Â
<?php if ($this->isShow()): ?>
|
| 33 |
-
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Show Report For')
|
| 34 |
Â
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
|
| 35 |
Â
<option value=""><?php echo $this->__('All Websites') ?></option>
|
| 36 |
Â
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
|
@@ -55,6 +55,7 @@
|
|
| 55 |
Â
<?php endforeach; ?>
|
| 56 |
Â
<?php endforeach; ?>
|
| 57 |
Â
</select>
|
|
Â
|
|
| 58 |
Â
</p>
|
| 59 |
Â
<script type="text/javascript">
|
| 60 |
Â
function switchStore(obj){
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 30 |
Â
*/
|
| 31 |
Â
?>
|
| 32 |
Â
<?php if ($this->isShow()): ?>
|
| 33 |
+
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Show Report For:') ?></label>
|
| 34 |
Â
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
|
| 35 |
Â
<option value=""><?php echo $this->__('All Websites') ?></option>
|
| 36 |
Â
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
| 55 |
Â
<?php endforeach; ?>
|
| 56 |
Â
<?php endforeach; ?>
|
| 57 |
Â
</select>
|
| 58 |
+
<?php echo $this->getHintHtml() ?>
|
| 59 |
Â
</p>
|
| 60 |
Â
<script type="text/javascript">
|
| 61 |
Â
function switchStore(obj){
|
app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -31,7 +31,7 @@
|
|
| 31 |
Â
?>
|
| 32 |
Â
|
| 33 |
Â
<?php if ($this->isShow()): ?>
|
| 34 |
-
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Show Report For')
|
| 35 |
Â
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
|
| 36 |
Â
<option value=""><?php echo $this->__('All Websites') ?></option>
|
| 37 |
Â
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
|
@@ -41,13 +41,13 @@
|
|
| 41 |
Â
<?php foreach ($this->getStoreCollection($_group) as $_store): ?>
|
| 42 |
Â
<?php if ($showWebsite == false): ?>
|
| 43 |
Â
<?php $showWebsite = true; ?>
|
| 44 |
-
<option website="true" value="<?php echo implode(',', $_website->getStoreIds()) ?>"<?php if($this->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())): ?> selected<?php endif; ?>><?php echo $_website->getName() ?></option>
|
| 45 |
Â
<?php endif; ?>
|
| 46 |
Â
<?php if ($showGroup == false): ?>
|
| 47 |
Â
<?php $showGroup = true; ?>
|
| 48 |
-
<option group="true" value="<?php echo implode(',', $_group->getStoreIds()) ?>"<?php if($this->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())): ?> selected<?php endif; ?>> <?php echo $_group->getName() ?></option>
|
| 49 |
Â
<?php endif; ?>
|
| 50 |
-
<option value="<?php echo $_store->getId() ?>"<?php if($this->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>> <?php echo $_store->getName() ?></option>
|
| 51 |
Â
<?php endforeach; ?>
|
| 52 |
Â
<?php if ($showGroup): ?>
|
| 53 |
Â
</optgroup>
|
|
@@ -55,6 +55,7 @@
|
|
| 55 |
Â
<?php endforeach; ?>
|
| 56 |
Â
<?php endforeach; ?>
|
| 57 |
Â
</select>
|
|
Â
|
|
| 58 |
Â
</p>
|
| 59 |
Â
<script type="text/javascript">
|
| 60 |
Â
function switchStore(obj){
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 31 |
Â
?>
|
| 32 |
Â
|
| 33 |
Â
<?php if ($this->isShow()): ?>
|
| 34 |
+
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Show Report For:') ?></label>
|
| 35 |
Â
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
|
| 36 |
Â
<option value=""><?php echo $this->__('All Websites') ?></option>
|
| 37 |
Â
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
| 41 |
Â
<?php foreach ($this->getStoreCollection($_group) as $_store): ?>
|
| 42 |
Â
<?php if ($showWebsite == false): ?>
|
| 43 |
Â
<?php $showWebsite = true; ?>
|
| 44 |
+
<option website="true" value="<?php echo implode(',', $_website->getStoreIds()) ?>"<?php if($this->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())): ?> selected<?php endif; ?>><?php echo $this->escapeHtml($_website->getName()) ?></option>
|
| 45 |
Â
<?php endif; ?>
|
| 46 |
Â
<?php if ($showGroup == false): ?>
|
| 47 |
Â
<?php $showGroup = true; ?>
|
| 48 |
+
<option group="true" value="<?php echo implode(',', $_group->getStoreIds()) ?>"<?php if($this->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())): ?> selected<?php endif; ?>> <?php echo $this->escapeHtml($_group->getName()) ?></option>
|
| 49 |
Â
<?php endif; ?>
|
| 50 |
+
<option value="<?php echo $_store->getId() ?>"<?php if($this->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>> <?php echo $this->escapeHtml($_store->getName()) ?></option>
|
| 51 |
Â
<?php endforeach; ?>
|
| 52 |
Â
<?php if ($showGroup): ?>
|
| 53 |
Â
</optgroup>
|
| 55 |
Â
<?php endforeach; ?>
|
| 56 |
Â
<?php endforeach; ?>
|
| 57 |
Â
</select>
|
| 58 |
+
<?php echo $this->getHintHtml() ?>
|
| 59 |
Â
</p>
|
| 60 |
Â
<script type="text/javascript">
|
| 61 |
Â
function switchStore(obj){
|
app/design/adminhtml/default/default/template/report/wishlist.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -63,7 +63,7 @@
|
|
| 63 |
Â
<div class="clear"></div>
|
| 64 |
Â
<div class="form-buttons">
|
| 65 |
Â
<a class="left" href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)) ?>">« <?php echo Mage::helper('adminhtml')->__('Back to Login'); ?></a>
|
| 66 |
-
<button type="submit" title="<?php echo Mage::helper('adminhtml')->__('Reset Password'); ?>" class="forgot-password"><span><?php echo Mage::helper('adminhtml')->__('Reset Password'); ?></span></button>
|
| 67 |
Â
</div>
|
| 68 |
Â
</fieldset>
|
| 69 |
Â
<p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')); ?></p>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 63 |
Â
<div class="clear"></div>
|
| 64 |
Â
<div class="form-buttons">
|
| 65 |
Â
<a class="left" href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)) ?>">« <?php echo Mage::helper('adminhtml')->__('Back to Login'); ?></a>
|
| 66 |
+
<button type="submit" title="<?php echo Mage::helper('adminhtml')->__('Reset Password'); ?>" class="forgot-password"><span><span><span><?php echo Mage::helper('adminhtml')->__('Reset Password'); ?></span></span></span></button>
|
| 67 |
Â
</div>
|
| 68 |
Â
</fieldset>
|
| 69 |
Â
<p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright © %s Magento Inc.', date('Y')); ?></p>
|
app/design/adminhtml/default/default/template/review/add.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/items/column/name.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/items/column/qty.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/address/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/comments/view.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -50,5 +50,5 @@
|
|
| 50 |
Â
</div>
|
| 51 |
Â
<script type="text/javascript">order.setPaymentMethod('<?php echo $this->getSelectedMethodCode() ?>')</script>
|
| 52 |
Â
<?php else: ?>
|
| 53 |
-
|
| 54 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 50 |
Â
</div>
|
| 51 |
Â
<script type="text/javascript">order.setPaymentMethod('<?php echo $this->getSelectedMethodCode() ?>')</script>
|
| 52 |
Â
<?php else: ?>
|
| 53 |
+
<div><?php echo Mage::helper('sales')->__('No Payment Methods') ?></div>
|
| 54 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/sales/order/create/comment.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -38,7 +38,7 @@
|
|
| 38 |
Â
<div class="content">
|
| 39 |
Â
<p><input type="text" class="input-text" id="coupons:code" value="" name="coupon_code" style="width:200px" /> <?php echo $this->getButtonHtml(Mage::helper('sales')->__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?></p>
|
| 40 |
Â
<?php if($this->getCouponCode()): ?>
|
| 41 |
-
<p><strong><?php echo $this->getCouponCode() ?></strong> [<a href="#" onclick="order.applyCoupon(''); return false;" title="<?php echo Mage::helper('sales')->__('Remove Coupon Code') ?>"><?php echo Mage::helper('sales')->__('Remove') ?></a>]</p>
|
| 42 |
Â
<?php endif; ?>
|
| 43 |
Â
<script type="text/javascript">
|
| 44 |
Â
order.overlay('shipping-method-overlay', <?php if ($this->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 38 |
Â
<div class="content">
|
| 39 |
Â
<p><input type="text" class="input-text" id="coupons:code" value="" name="coupon_code" style="width:200px" /> <?php echo $this->getButtonHtml(Mage::helper('sales')->__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?></p>
|
| 40 |
Â
<?php if($this->getCouponCode()): ?>
|
| 41 |
+
<p><strong><?php echo $this->escapeHtml($this->getCouponCode()) ?></strong> [<a href="#" onclick="order.applyCoupon(''); return false;" title="<?php echo Mage::helper('sales')->__('Remove Coupon Code') ?>"><?php echo Mage::helper('sales')->__('Remove') ?></a>]</p>
|
| 42 |
Â
<?php endif; ?>
|
| 43 |
Â
<script type="text/javascript">
|
| 44 |
Â
order.overlay('shipping-method-overlay', <?php if ($this->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
|
app/design/adminhtml/default/default/template/sales/order/create/data.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -42,8 +42,10 @@
|
|
| 42 |
Â
</td>
|
| 43 |
Â
<?php endif; ?>
|
| 44 |
Â
<td <?php if($this->getCustomerId()): ?>class="main-col"<?php endif; ?>>
|
|
Â
|
|
| 45 |
Â
<div id="order-search" style="display:none" class="order-search-items"><?php echo $this->getChildHtml('search') ?></div>
|
| 46 |
Â
<div id="order-items"><?php echo $this->getChildHtml('items') ?></div>
|
|
Â
|
|
| 47 |
Â
<div id="order-form_account"><?php echo $this->getChildHtml('form_account') ?></div>
|
| 48 |
Â
<div id="order-addresses">
|
| 49 |
Â
<div id="order-billing_address" class="box-left"><?php echo $this->getChildHtml('billing_address') ?></div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 42 |
Â
</td>
|
| 43 |
Â
<?php endif; ?>
|
| 44 |
Â
<td <?php if($this->getCustomerId()): ?>class="main-col"<?php endif; ?>>
|
| 45 |
+
<div id="order-additional_area" style="display:none" class="order-additional-area"><?php echo $this->getChildHtml('additional_area') ?></div>
|
| 46 |
Â
<div id="order-search" style="display:none" class="order-search-items"><?php echo $this->getChildHtml('search') ?></div>
|
| 47 |
Â
<div id="order-items"><?php echo $this->getChildHtml('items') ?></div>
|
| 48 |
+
<div id="order-errors"><?php echo $this->getChildHtml('errors') ?></div>
|
| 49 |
Â
<div id="order-form_account"><?php echo $this->getChildHtml('form_account') ?></div>
|
| 50 |
Â
<div id="order-addresses">
|
| 51 |
Â
<div id="order-billing_address" class="box-left"><?php echo $this->getChildHtml('billing_address') ?></div>
|
app/design/adminhtml/default/default/template/sales/order/create/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
if($this->getIsShipping()):
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
if($this->getIsShipping()):
|
app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -110,12 +110,12 @@
|
|
| 110 |
Â
<h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span></h5>
|
| 111 |
Â
<div>
|
| 112 |
Â
<strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
|
| 113 |
-
<?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->
|
| 114 |
Â
</div>
|
| 115 |
Â
<?php if($_item->getMessage(false)): ?>
|
| 116 |
Â
<?php foreach ($_item->getMessage(false) as $message): ?>
|
| 117 |
Â
<div class="<?php if($_item->getHasError()): ?>error<?php else: ?>notice<?php endif; ?>">
|
| 118 |
-
<div style="font-size:95%"><?php echo $message; ?></div>
|
| 119 |
Â
</div>
|
| 120 |
Â
<?php endforeach; ?>
|
| 121 |
Â
<?php endif; ?>
|
|
@@ -319,9 +319,9 @@
|
|
| 319 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 320 |
Â
<?php endif; ?>
|
| 321 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 322 |
-
<?php echo $this->formatPrice($_rowTotalWithoutDiscount+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 323 |
Â
<?php else: ?>
|
| 324 |
-
<?php echo $this->formatPrice($_rowTotalWithoutDiscount) ?>
|
| 325 |
Â
<?php endif; ?>
|
| 326 |
Â
|
| 327 |
Â
|
|
@@ -397,7 +397,16 @@
|
|
| 397 |
Â
<?php if($this->getCustomerId() && $this->getMoveToCustomerStorage()): ?>
|
| 398 |
Â
<option value="cart"><?php echo $this->helper('sales')->__('Move to Shopping Cart') ?></option>
|
| 399 |
Â
<?php if ($this->isMoveToWishlistAllowed($_item)): ?>
|
| 400 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 401 |
Â
<?php endif; ?>
|
| 402 |
Â
<?php endif; ?>
|
| 403 |
Â
</select>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 110 |
Â
<h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span></h5>
|
| 111 |
Â
<div>
|
| 112 |
Â
<strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
|
| 113 |
+
<?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
|
| 114 |
Â
</div>
|
| 115 |
Â
<?php if($_item->getMessage(false)): ?>
|
| 116 |
Â
<?php foreach ($_item->getMessage(false) as $message): ?>
|
| 117 |
Â
<div class="<?php if($_item->getHasError()): ?>error<?php else: ?>notice<?php endif; ?>">
|
| 118 |
+
<div style="font-size:95%"><?php echo Mage::helper('core')->escapeHtml($message); ?></div>
|
| 119 |
Â
</div>
|
| 120 |
Â
<?php endforeach; ?>
|
| 121 |
Â
<?php endif; ?>
|
| 319 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 320 |
Â
<?php endif; ?>
|
| 321 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 322 |
+
<?php echo $this->formatPrice(max(0, $_rowTotalWithoutDiscount+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition())); ?>
|
| 323 |
Â
<?php else: ?>
|
| 324 |
+
<?php echo $this->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
|
| 325 |
Â
<?php endif; ?>
|
| 326 |
Â
|
| 327 |
Â
|
| 397 |
Â
<?php if($this->getCustomerId() && $this->getMoveToCustomerStorage()): ?>
|
| 398 |
Â
<option value="cart"><?php echo $this->helper('sales')->__('Move to Shopping Cart') ?></option>
|
| 399 |
Â
<?php if ($this->isMoveToWishlistAllowed($_item)): ?>
|
| 400 |
+
<?php $wishlists = $this->getCustomerWishlists();?>
|
| 401 |
+
<?php if (count($wishlists) <= 1):?>
|
| 402 |
+
<option value="wishlist"><?php echo $this->helper('sales')->__('Move to Wishlist') ?></option>
|
| 403 |
+
<?php else: ?>
|
| 404 |
+
<optgroup label="<?php echo $this->helper('sales')->__('Move to Wishlist') ?>">
|
| 405 |
+
<?php foreach ($wishlists as $wishlist):?>
|
| 406 |
+
<option value="wishlist_<?php echo $wishlist->getId();?>"><?php echo $this->escapeHtml($wishlist->getName());?></option>
|
| 407 |
+
<?php endforeach;?>
|
| 408 |
+
</optgroup>
|
| 409 |
+
<?php endif; ?>
|
| 410 |
Â
<?php endif; ?>
|
| 411 |
Â
<?php endif; ?>
|
| 412 |
Â
</select>
|
app/design/adminhtml/default/default/template/sales/order/create/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml
CHANGED
|
@@ -20,15 +20,17 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
-
<?php
|
|
Â
|
|
|
Â
|
|
| 28 |
Â
<div id="order-shipping-method-choose" style="display:none">
|
| 29 |
Â
<dl class="shipment-methods">
|
| 30 |
Â
<?php foreach ($_shippingRateGroups as $code => $_rates): ?>
|
| 31 |
-
<dt><strong><?php echo $this->getCarrierName($code) ?></strong></dt>
|
| 32 |
Â
<dd>
|
| 33 |
Â
<ul>
|
| 34 |
Â
<?php foreach ($_rates as $_rate): ?>
|
|
@@ -37,13 +39,13 @@
|
|
| 37 |
Â
<li>
|
| 38 |
Â
<?php if ($_rate->getErrorMessage()): ?>
|
| 39 |
Â
<ul class="messages">
|
| 40 |
-
<li class="error-msg"><?php echo $_rate->getErrorMessage() ?></li>
|
| 41 |
Â
</ul>
|
| 42 |
Â
<?php else: ?>
|
| 43 |
Â
<?php $_checked = $this->isMethodActive($_code) ? 'checked="checked"' : '' ?>
|
| 44 |
Â
<input <?php echo $_radioProperty ?> value="<?php echo $_code ?>" id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>/>
|
| 45 |
Â
<label class="normal" for="s_method_<?php echo $_code ?>">
|
| 46 |
-
<?php echo $_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()?> -
|
| 47 |
Â
<strong>
|
| 48 |
Â
<?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
|
| 49 |
Â
<?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
|
|
@@ -64,8 +66,8 @@
|
|
| 64 |
Â
</div>
|
| 65 |
Â
<?php if ($_rate = $this->getActiveMethodRate()): ?>
|
| 66 |
Â
<div id="order-shipping-method-info">
|
| 67 |
-
<strong><?php echo $this->getCarrierName($_rate->getCarrier()) ?></strong><br/>
|
| 68 |
-
<?php echo $_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription() ?> -
|
| 69 |
Â
<strong>
|
| 70 |
Â
<?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
|
| 71 |
Â
<?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
|
|
@@ -91,7 +93,7 @@
|
|
| 91 |
Â
<a href="#" onclick="order.loadShippingRates();return false">
|
| 92 |
Â
<?php echo Mage::helper('sales')->__('Get shipping methods and rates') ?>
|
| 93 |
Â
</a>
|
| 94 |
-
<input type="hidden" name="order[has_shipping]" value="" class="required-entry"
|
| 95 |
Â
</div>
|
| 96 |
Â
<?php endif; ?>
|
| 97 |
Â
<div style="display:none;" id="shipping-method-overlay" class="overlay"><span><?php echo $this->__('Shipping method selection is not applicable') ?></span></div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /** @var $this Mage_Adminhtml_Block_Sales_Order_Create_Shipping_Method_Form */ ?>
|
| 28 |
+
<?php $_shippingRateGroups = $this->getShippingRates(); ?>
|
| 29 |
+
<?php if ($_shippingRateGroups): ?>
|
| 30 |
Â
<div id="order-shipping-method-choose" style="display:none">
|
| 31 |
Â
<dl class="shipment-methods">
|
| 32 |
Â
<?php foreach ($_shippingRateGroups as $code => $_rates): ?>
|
| 33 |
+
<dt><strong><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></strong></dt>
|
| 34 |
Â
<dd>
|
| 35 |
Â
<ul>
|
| 36 |
Â
<?php foreach ($_rates as $_rate): ?>
|
| 39 |
Â
<li>
|
| 40 |
Â
<?php if ($_rate->getErrorMessage()): ?>
|
| 41 |
Â
<ul class="messages">
|
| 42 |
+
<li class="error-msg"><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li>
|
| 43 |
Â
</ul>
|
| 44 |
Â
<?php else: ?>
|
| 45 |
Â
<?php $_checked = $this->isMethodActive($_code) ? 'checked="checked"' : '' ?>
|
| 46 |
Â
<input <?php echo $_radioProperty ?> value="<?php echo $_code ?>" id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>/>
|
| 47 |
Â
<label class="normal" for="s_method_<?php echo $_code ?>">
|
| 48 |
+
<?php echo $this->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
|
| 49 |
Â
<strong>
|
| 50 |
Â
<?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
|
| 51 |
Â
<?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
|
| 66 |
Â
</div>
|
| 67 |
Â
<?php if ($_rate = $this->getActiveMethodRate()): ?>
|
| 68 |
Â
<div id="order-shipping-method-info">
|
| 69 |
+
<strong><?php echo $this->escapeHtml($this->getCarrierName($_rate->getCarrier())) ?></strong><br/>
|
| 70 |
+
<?php echo $this->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
|
| 71 |
Â
<strong>
|
| 72 |
Â
<?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
|
| 73 |
Â
<?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
|
| 93 |
Â
<a href="#" onclick="order.loadShippingRates();return false">
|
| 94 |
Â
<?php echo Mage::helper('sales')->__('Get shipping methods and rates') ?>
|
| 95 |
Â
</a>
|
| 96 |
+
<input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
|
| 97 |
Â
</div>
|
| 98 |
Â
<?php endif; ?>
|
| 99 |
Â
<div style="display:none;" id="shipping-method-overlay" class="overlay"><span><?php echo $this->__('Shipping method selection is not applicable') ?></span></div>
|
app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -92,5 +92,8 @@
|
|
| 92 |
Â
<p class="center"><?php echo Mage::helper('sales')->__('No items') ?></p>
|
| 93 |
Â
<?php endif ?>
|
| 94 |
Â
</div>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 95 |
Â
</div>
|
| 96 |
Â
</div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 92 |
Â
<p class="center"><?php echo Mage::helper('sales')->__('No items') ?></p>
|
| 93 |
Â
<?php endif ?>
|
| 94 |
Â
</div>
|
| 95 |
+
<?php if ($this->getItemCount() && $this->canRemoveItems()): ?>
|
| 96 |
+
<?php echo $this->getChildHtml('empty_customer_cart_button'); ?>
|
| 97 |
+
<?php endif; ?>
|
| 98 |
Â
</div>
|
| 99 |
Â
</div>
|
app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml
CHANGED
|
@@ -20,29 +20,35 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
-
<?php
|
| 28 |
-
|
| 29 |
-
<?php
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 35 |
Â
<?php endif; ?>
|
| 36 |
-
<?php if ($showGroup == false): ?>
|
| 37 |
-
<?php $showGroup = true; ?>
|
| 38 |
-
<h4 style="margin-left:12px;"><?php echo $_group->getName() ?></h4>
|
| 39 |
-
<?php endif; ?>
|
| 40 |
-
<span class="field-row" style="margin-left:28px;">
|
| 41 |
-
<input type="radio" id="store_<?php echo $_store->getId() ?>" class="radio" onclick="order.setStoreId('<?php echo $_store->getId() ?>')"/>
|
| 42 |
-
<label for="store_<?php echo $_store->getId() ?>" class="inline"><?php echo $_store->getName() ?></label>
|
| 43 |
-
</span>
|
| 44 |
Â
<?php endforeach; ?>
|
| 45 |
-
<?php if ($showGroup): ?>
|
| 46 |
-
<?php endif; ?>
|
| 47 |
Â
<?php endforeach; ?>
|
| 48 |
-
|
|
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /* @var $this Mage_Adminhtml_Block_Sales_Order_Create_Store_Select */ ?>
|
| 28 |
+
<div class="store-scope">
|
| 29 |
+
<?php echo $this->getHintHtml() ?>
|
| 30 |
+
<div class="tree-store-scope">
|
| 31 |
+
<?php foreach ($this->getWebsiteCollection() as $_website): ?>
|
| 32 |
+
<?php $showWebsite=false; ?>
|
| 33 |
+
<?php foreach ($this->getGroupCollection($_website) as $_group): ?>
|
| 34 |
+
<?php $showGroup=false; ?>
|
| 35 |
+
<?php foreach ($this->getStoreCollection($_group) as $_store): ?>
|
| 36 |
+
<?php if ($showWebsite == false): ?>
|
| 37 |
+
<?php $showWebsite = true; ?>
|
| 38 |
+
<h3><?php echo $this->escapeHtml($_website->getName()) ?></h3>
|
| 39 |
+
<?php endif; ?>
|
| 40 |
+
<?php if ($showGroup == false): ?>
|
| 41 |
+
<?php $showGroup = true; ?>
|
| 42 |
+
<h4 style="margin-left:12px;"><?php echo $this->escapeHtml($_group->getName()) ?></h4>
|
| 43 |
+
<?php endif; ?>
|
| 44 |
+
<span class="field-row" style="margin-left:28px;">
|
| 45 |
+
<input type="radio" id="store_<?php echo $_store->getId() ?>" class="radio" onclick="order.setStoreId('<?php echo $_store->getId() ?>')"/>
|
| 46 |
+
<label for="store_<?php echo $_store->getId() ?>" class="inline"><?php echo $this->escapeHtml($_store->getName()) ?></label>
|
| 47 |
+
</span>
|
| 48 |
+
<?php endforeach; ?>
|
| 49 |
+
<?php if ($showGroup): ?>
|
| 50 |
Â
<?php endif; ?>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 51 |
Â
<?php endforeach; ?>
|
|
Â
|
|
|
Â
|
|
| 52 |
Â
<?php endforeach; ?>
|
| 53 |
+
</div>
|
| 54 |
+
</div>
|
app/design/adminhtml/default/default/template/sales/order/create/totals.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml
CHANGED
|
@@ -20,14 +20,14 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<tr class="<?php echo $this->getTotal()->getCode(); ?>">
|
| 28 |
Â
<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
|
| 29 |
Â
<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
|
| 30 |
-
<?php echo $this->getTotal()->getTitle() ?>
|
| 31 |
Â
<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
|
| 32 |
Â
</td>
|
| 33 |
Â
<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<tr class="<?php echo $this->getTotal()->getCode(); ?>">
|
| 28 |
Â
<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
|
| 29 |
Â
<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
|
| 30 |
+
<?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
|
| 31 |
Â
<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
|
| 32 |
Â
</td>
|
| 33 |
Â
<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
|
app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
|
@@ -57,7 +57,7 @@
|
|
| 57 |
Â
<?php else:?>
|
| 58 |
Â
<tr>
|
| 59 |
Â
<td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
|
| 60 |
-
<?php echo $this->getTotal()->getTitle() ?>
|
| 61 |
Â
</td>
|
| 62 |
Â
<td style="<?php echo $this->getStyle() ?>" class="a-right">
|
| 63 |
Â
<?php echo $this->formatPrice($this->getShippingExcludeTax()) ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
| 57 |
Â
<?php else:?>
|
| 58 |
Â
<tr>
|
| 59 |
Â
<td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
|
| 60 |
+
<?php echo $this->escapeHtml($this->getTotal()->getTitle()) ?>
|
| 61 |
Â
</td>
|
| 62 |
Â
<td style="<?php echo $this->getStyle() ?>" class="a-right">
|
| 63 |
Â
<?php echo $this->formatPrice($this->getShippingExcludeTax()) ?>
|
app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/**
|
app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -37,7 +37,7 @@
|
|
| 37 |
Â
<?php foreach ($rates as $rate): ?>
|
| 38 |
Â
<tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
|
| 39 |
Â
<td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
|
| 40 |
-
<?php echo $rate['title']; ?>
|
| 41 |
Â
<?php if (!is_null($rate['percent'])): ?>
|
| 42 |
Â
(<?php echo (float)$rate['percent']; ?>%)
|
| 43 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 37 |
Â
<?php foreach ($rates as $rate): ?>
|
| 38 |
Â
<tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
|
| 39 |
Â
<td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
|
| 40 |
+
<?php echo $this->escapeHtml($rate['title']); ?>
|
| 41 |
Â
<?php if (!is_null($rate['percent'])): ?>
|
| 42 |
Â
(<?php echo (float)$rate['percent']; ?>%)
|
| 43 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -57,7 +57,7 @@
|
|
| 57 |
Â
<h4 class="icon-head head-shipping-method"><?php echo Mage::helper('sales')->__('Shipping Information') ?></h4>
|
| 58 |
Â
</div>
|
| 59 |
Â
<fieldset>
|
| 60 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 61 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 62 |
Â
|
| 63 |
Â
<?php if ($this->helper('tax')->displaySalesPriceInclTax($this->getSource()->getStoreId())): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 57 |
Â
<h4 class="icon-head head-shipping-method"><?php echo Mage::helper('sales')->__('Shipping Information') ?></h4>
|
| 58 |
Â
</div>
|
| 59 |
Â
<fieldset>
|
| 60 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 61 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 62 |
Â
|
| 63 |
Â
<?php if ($this->helper('tax')->displaySalesPriceInclTax($this->getSource()->getStoreId())): ?>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -34,7 +34,7 @@
|
|
| 34 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 35 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 36 |
Â
<?php endif; ?>
|
| 37 |
-
|
| 38 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 39 |
Â
<?php
|
| 40 |
Â
echo $this->displayPrices(
|
|
@@ -45,8 +45,8 @@
|
|
| 45 |
Â
<?php else: ?>
|
| 46 |
Â
<?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
|
| 47 |
Â
<?php endif; ?>
|
| 48 |
-
|
| 49 |
-
|
| 50 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 51 |
Â
<br />
|
| 52 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
|
@@ -66,7 +66,7 @@
|
|
| 66 |
Â
<?php endforeach; ?>
|
| 67 |
Â
</small>
|
| 68 |
Â
<?php endif; ?>
|
| 69 |
-
|
| 70 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 71 |
Â
<br />
|
| 72 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
|
@@ -89,13 +89,13 @@
|
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 91 |
Â
<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
|
| 92 |
-
|
| 93 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 94 |
Â
<?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 95 |
Â
<?php else: ?>
|
| 96 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 97 |
Â
<?php endif; ?>
|
| 98 |
-
|
| 99 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 100 |
Â
<br />
|
| 101 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
|
@@ -115,7 +115,7 @@
|
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
</small>
|
| 117 |
Â
<?php endif; ?>
|
| 118 |
-
|
| 119 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 120 |
Â
<br />
|
| 121 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
|
@@ -145,7 +145,7 @@
|
|
| 145 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 146 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 147 |
Â
<?php endif; ?>
|
| 148 |
-
|
| 149 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 150 |
Â
<?php
|
| 151 |
Â
echo $this->displayPrices(
|
|
@@ -156,8 +156,8 @@
|
|
| 156 |
Â
<?php else: ?>
|
| 157 |
Â
<?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
|
| 158 |
Â
<?php endif; ?>
|
| 159 |
-
|
| 160 |
-
|
| 161 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 162 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 163 |
Â
<small>
|
|
@@ -176,7 +176,7 @@
|
|
| 176 |
Â
<?php endforeach; ?>
|
| 177 |
Â
</small>
|
| 178 |
Â
<?php endif; ?>
|
| 179 |
-
|
| 180 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 181 |
Â
<br />
|
| 182 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
|
@@ -204,10 +204,10 @@
|
|
| 204 |
Â
<?php else: ?>
|
| 205 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 206 |
Â
<?php endif; ?>
|
| 207 |
-
|
| 208 |
-
|
| 209 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 210 |
-
|
| 211 |
Â
<br />
|
| 212 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 213 |
Â
<small>
|
|
@@ -226,14 +226,13 @@
|
|
| 226 |
Â
<?php endforeach; ?>
|
| 227 |
Â
</small>
|
| 228 |
Â
<?php endif; ?>
|
| 229 |
-
|
| 230 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 231 |
Â
<br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 232 |
Â
<?php endif; ?>
|
| 233 |
Â
<?php endif; ?>
|
| 234 |
Â
</span>
|
| 235 |
Â
<?php endif; ?>
|
| 236 |
-
</span>
|
| 237 |
Â
</td>
|
| 238 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 239 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 34 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 35 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 36 |
Â
<?php endif; ?>
|
| 37 |
+
|
| 38 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 39 |
Â
<?php
|
| 40 |
Â
echo $this->displayPrices(
|
| 45 |
Â
<?php else: ?>
|
| 46 |
Â
<?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
|
| 47 |
Â
<?php endif; ?>
|
| 48 |
+
|
| 49 |
+
|
| 50 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 51 |
Â
<br />
|
| 52 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 66 |
Â
<?php endforeach; ?>
|
| 67 |
Â
</small>
|
| 68 |
Â
<?php endif; ?>
|
| 69 |
+
|
| 70 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 71 |
Â
<br />
|
| 72 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 91 |
Â
<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
|
| 92 |
+
|
| 93 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 94 |
Â
<?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 95 |
Â
<?php else: ?>
|
| 96 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 97 |
Â
<?php endif; ?>
|
| 98 |
+
|
| 99 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 100 |
Â
<br />
|
| 101 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
</small>
|
| 117 |
Â
<?php endif; ?>
|
| 118 |
+
|
| 119 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 120 |
Â
<br />
|
| 121 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
| 145 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 146 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 147 |
Â
<?php endif; ?>
|
| 148 |
+
|
| 149 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 150 |
Â
<?php
|
| 151 |
Â
echo $this->displayPrices(
|
| 156 |
Â
<?php else: ?>
|
| 157 |
Â
<?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
|
| 158 |
Â
<?php endif; ?>
|
| 159 |
+
|
| 160 |
+
|
| 161 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 162 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 163 |
Â
<small>
|
| 176 |
Â
<?php endforeach; ?>
|
| 177 |
Â
</small>
|
| 178 |
Â
<?php endif; ?>
|
| 179 |
+
|
| 180 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 181 |
Â
<br />
|
| 182 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
| 204 |
Â
<?php else: ?>
|
| 205 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 206 |
Â
<?php endif; ?>
|
| 207 |
+
|
| 208 |
+
|
| 209 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 210 |
+
|
| 211 |
Â
<br />
|
| 212 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 213 |
Â
<small>
|
| 226 |
Â
<?php endforeach; ?>
|
| 227 |
Â
</small>
|
| 228 |
Â
<?php endif; ?>
|
| 229 |
+
|
| 230 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 231 |
Â
<br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 232 |
Â
<?php endif; ?>
|
| 233 |
Â
<?php endif; ?>
|
| 234 |
Â
</span>
|
| 235 |
Â
<?php endif; ?>
|
|
Â
|
|
| 236 |
Â
</td>
|
| 237 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 238 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -233,7 +233,6 @@
|
|
| 233 |
Â
<?php endif; ?>
|
| 234 |
Â
</span>
|
| 235 |
Â
<?php endif; ?>
|
| 236 |
-
</span>
|
| 237 |
Â
</td>
|
| 238 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 239 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 233 |
Â
<?php endif; ?>
|
| 234 |
Â
</span>
|
| 235 |
Â
<?php endif; ?>
|
|
Â
|
|
| 236 |
Â
</td>
|
| 237 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 238 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -50,7 +50,7 @@
|
|
| 50 |
Â
<h4 class="icon-head head-shipping-method"><?php echo $this->helper('sales')->__('Shipping Information') ?></h4>
|
| 51 |
Â
</div>
|
| 52 |
Â
<fieldset>
|
| 53 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 54 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 55 |
Â
|
| 56 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 50 |
Â
<h4 class="icon-head head-shipping-method"><?php echo $this->helper('sales')->__('Shipping Information') ?></h4>
|
| 51 |
Â
</div>
|
| 52 |
Â
<fieldset>
|
| 53 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 54 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 55 |
Â
|
| 56 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -34,7 +34,7 @@
|
|
| 34 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 35 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 36 |
Â
<?php endif; ?>
|
| 37 |
-
|
| 38 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 39 |
Â
<?php
|
| 40 |
Â
echo $this->displayPrices(
|
|
@@ -45,8 +45,8 @@
|
|
| 45 |
Â
<?php else: ?>
|
| 46 |
Â
<?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
|
| 47 |
Â
<?php endif; ?>
|
| 48 |
-
|
| 49 |
-
|
| 50 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 51 |
Â
<br />
|
| 52 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
|
@@ -66,7 +66,7 @@
|
|
| 66 |
Â
<?php endforeach; ?>
|
| 67 |
Â
</small>
|
| 68 |
Â
<?php endif; ?>
|
| 69 |
-
|
| 70 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 71 |
Â
<br />
|
| 72 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
|
@@ -89,13 +89,13 @@
|
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 91 |
Â
<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
|
| 92 |
-
|
| 93 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 94 |
Â
<?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 95 |
Â
<?php else: ?>
|
| 96 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 97 |
Â
<?php endif; ?>
|
| 98 |
-
|
| 99 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 100 |
Â
<br />
|
| 101 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
|
@@ -115,7 +115,7 @@
|
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
</small>
|
| 117 |
Â
<?php endif; ?>
|
| 118 |
-
|
| 119 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 120 |
Â
<br />
|
| 121 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
|
@@ -132,7 +132,7 @@
|
|
| 132 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 133 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 134 |
Â
<?php endif; ?>
|
| 135 |
-
|
| 136 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 137 |
Â
<?php
|
| 138 |
Â
echo $this->displayPrices(
|
|
@@ -143,8 +143,8 @@
|
|
| 143 |
Â
<?php else: ?>
|
| 144 |
Â
<?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
|
| 145 |
Â
<?php endif; ?>
|
| 146 |
-
|
| 147 |
-
|
| 148 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 149 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 150 |
Â
<small>
|
|
@@ -163,7 +163,7 @@
|
|
| 163 |
Â
<?php endforeach; ?>
|
| 164 |
Â
</small>
|
| 165 |
Â
<?php endif; ?>
|
| 166 |
-
|
| 167 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 168 |
Â
<br />
|
| 169 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
|
@@ -191,10 +191,10 @@
|
|
| 191 |
Â
<?php else: ?>
|
| 192 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 193 |
Â
<?php endif; ?>
|
| 194 |
-
|
| 195 |
-
|
| 196 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 197 |
-
|
| 198 |
Â
<br />
|
| 199 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 200 |
Â
<small>
|
|
@@ -213,14 +213,13 @@
|
|
| 213 |
Â
<?php endforeach; ?>
|
| 214 |
Â
</small>
|
| 215 |
Â
<?php endif; ?>
|
| 216 |
-
|
| 217 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 218 |
Â
<br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 219 |
Â
<?php endif; ?>
|
| 220 |
Â
<?php endif; ?>
|
| 221 |
Â
</span>
|
| 222 |
Â
<?php endif; ?>
|
| 223 |
-
</span>
|
| 224 |
Â
</td>
|
| 225 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 226 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 34 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 35 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 36 |
Â
<?php endif; ?>
|
| 37 |
+
|
| 38 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 39 |
Â
<?php
|
| 40 |
Â
echo $this->displayPrices(
|
| 45 |
Â
<?php else: ?>
|
| 46 |
Â
<?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
|
| 47 |
Â
<?php endif; ?>
|
| 48 |
+
|
| 49 |
+
|
| 50 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 51 |
Â
<br />
|
| 52 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 66 |
Â
<?php endforeach; ?>
|
| 67 |
Â
</small>
|
| 68 |
Â
<?php endif; ?>
|
| 69 |
+
|
| 70 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 71 |
Â
<br />
|
| 72 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 91 |
Â
<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
|
| 92 |
+
|
| 93 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 94 |
Â
<?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 95 |
Â
<?php else: ?>
|
| 96 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 97 |
Â
<?php endif; ?>
|
| 98 |
+
|
| 99 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 100 |
Â
<br />
|
| 101 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
</small>
|
| 117 |
Â
<?php endif; ?>
|
| 118 |
+
|
| 119 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 120 |
Â
<br />
|
| 121 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
| 132 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 133 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 134 |
Â
<?php endif; ?>
|
| 135 |
+
|
| 136 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 137 |
Â
<?php
|
| 138 |
Â
echo $this->displayPrices(
|
| 143 |
Â
<?php else: ?>
|
| 144 |
Â
<?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
|
| 145 |
Â
<?php endif; ?>
|
| 146 |
+
|
| 147 |
+
|
| 148 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 149 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 150 |
Â
<small>
|
| 163 |
Â
<?php endforeach; ?>
|
| 164 |
Â
</small>
|
| 165 |
Â
<?php endif; ?>
|
| 166 |
+
|
| 167 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 168 |
Â
<br />
|
| 169 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
| 191 |
Â
<?php else: ?>
|
| 192 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 193 |
Â
<?php endif; ?>
|
| 194 |
+
|
| 195 |
+
|
| 196 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 197 |
+
|
| 198 |
Â
<br />
|
| 199 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 200 |
Â
<small>
|
| 213 |
Â
<?php endforeach; ?>
|
| 214 |
Â
</small>
|
| 215 |
Â
<?php endif; ?>
|
| 216 |
+
|
| 217 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 218 |
Â
<br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 219 |
Â
<?php endif; ?>
|
| 220 |
Â
<?php endif; ?>
|
| 221 |
Â
</span>
|
| 222 |
Â
<?php endif; ?>
|
|
Â
|
|
| 223 |
Â
</td>
|
| 224 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 225 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -221,7 +221,6 @@
|
|
| 221 |
Â
<?php endif; ?>
|
| 222 |
Â
</span>
|
| 223 |
Â
<?php endif; ?>
|
| 224 |
-
</span>
|
| 225 |
Â
</td>
|
| 226 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 227 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 221 |
Â
<?php endif; ?>
|
| 222 |
Â
</span>
|
| 223 |
Â
<?php endif; ?>
|
|
Â
|
|
| 224 |
Â
</td>
|
| 225 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 226 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -53,7 +53,7 @@
|
|
| 53 |
Â
</div>
|
| 54 |
Â
<fieldset>
|
| 55 |
Â
<div>
|
| 56 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 57 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 58 |
Â
|
| 59 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 53 |
Â
</div>
|
| 54 |
Â
<fieldset>
|
| 55 |
Â
<div>
|
| 56 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 57 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 58 |
Â
|
| 59 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -34,7 +34,7 @@
|
|
| 34 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 35 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 36 |
Â
<?php endif; ?>
|
| 37 |
-
|
| 38 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 39 |
Â
<?php
|
| 40 |
Â
echo $this->displayPrices(
|
|
@@ -45,8 +45,8 @@
|
|
| 45 |
Â
<?php else: ?>
|
| 46 |
Â
<?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
|
| 47 |
Â
<?php endif; ?>
|
| 48 |
-
|
| 49 |
-
|
| 50 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 51 |
Â
<br />
|
| 52 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
|
@@ -66,7 +66,7 @@
|
|
| 66 |
Â
<?php endforeach; ?>
|
| 67 |
Â
</small>
|
| 68 |
Â
<?php endif; ?>
|
| 69 |
-
|
| 70 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 71 |
Â
<br />
|
| 72 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
|
@@ -89,13 +89,13 @@
|
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 91 |
Â
<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
|
| 92 |
-
|
| 93 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 94 |
Â
<?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 95 |
Â
<?php else: ?>
|
| 96 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 97 |
Â
<?php endif; ?>
|
| 98 |
-
|
| 99 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 100 |
Â
<br />
|
| 101 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
|
@@ -115,7 +115,7 @@
|
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
</small>
|
| 117 |
Â
<?php endif; ?>
|
| 118 |
-
|
| 119 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 120 |
Â
<br />
|
| 121 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
|
@@ -139,7 +139,7 @@
|
|
| 139 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 140 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 141 |
Â
<?php endif; ?>
|
| 142 |
-
|
| 143 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 144 |
Â
<?php
|
| 145 |
Â
echo $this->displayPrices(
|
|
@@ -150,8 +150,8 @@
|
|
| 150 |
Â
<?php else: ?>
|
| 151 |
Â
<?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
|
| 152 |
Â
<?php endif; ?>
|
| 153 |
-
|
| 154 |
-
|
| 155 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 156 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 157 |
Â
<small>
|
|
@@ -170,7 +170,7 @@
|
|
| 170 |
Â
<?php endforeach; ?>
|
| 171 |
Â
</small>
|
| 172 |
Â
<?php endif; ?>
|
| 173 |
-
|
| 174 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 175 |
Â
<br />
|
| 176 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
|
@@ -198,10 +198,10 @@
|
|
| 198 |
Â
<?php else: ?>
|
| 199 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 200 |
Â
<?php endif; ?>
|
| 201 |
-
|
| 202 |
-
|
| 203 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 204 |
-
|
| 205 |
Â
<br />
|
| 206 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 207 |
Â
<small>
|
|
@@ -220,14 +220,14 @@
|
|
| 220 |
Â
<?php endforeach; ?>
|
| 221 |
Â
</small>
|
| 222 |
Â
<?php endif; ?>
|
| 223 |
-
|
| 224 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 225 |
Â
<br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 226 |
Â
<?php endif; ?>
|
| 227 |
Â
<?php endif; ?>
|
| 228 |
Â
</span>
|
| 229 |
Â
<?php endif; ?>
|
| 230 |
-
|
| 231 |
Â
</td>
|
| 232 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 233 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 34 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 35 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 36 |
Â
<?php endif; ?>
|
| 37 |
+
|
| 38 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 39 |
Â
<?php
|
| 40 |
Â
echo $this->displayPrices(
|
| 45 |
Â
<?php else: ?>
|
| 46 |
Â
<?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
|
| 47 |
Â
<?php endif; ?>
|
| 48 |
+
|
| 49 |
+
|
| 50 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 51 |
Â
<br />
|
| 52 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 66 |
Â
<?php endforeach; ?>
|
| 67 |
Â
</small>
|
| 68 |
Â
<?php endif; ?>
|
| 69 |
+
|
| 70 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 71 |
Â
<br />
|
| 72 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 91 |
Â
<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
|
| 92 |
+
|
| 93 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 94 |
Â
<?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 95 |
Â
<?php else: ?>
|
| 96 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 97 |
Â
<?php endif; ?>
|
| 98 |
+
|
| 99 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 100 |
Â
<br />
|
| 101 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 115 |
Â
<?php endforeach; ?>
|
| 116 |
Â
</small>
|
| 117 |
Â
<?php endif; ?>
|
| 118 |
+
|
| 119 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 120 |
Â
<br />
|
| 121 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
| 139 |
Â
<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
|
| 140 |
Â
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 141 |
Â
<?php endif; ?>
|
| 142 |
+
|
| 143 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 144 |
Â
<?php
|
| 145 |
Â
echo $this->displayPrices(
|
| 150 |
Â
<?php else: ?>
|
| 151 |
Â
<?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
|
| 152 |
Â
<?php endif; ?>
|
| 153 |
+
|
| 154 |
+
|
| 155 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 156 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 157 |
Â
<small>
|
| 170 |
Â
<?php endforeach; ?>
|
| 171 |
Â
</small>
|
| 172 |
Â
<?php endif; ?>
|
| 173 |
+
|
| 174 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 175 |
Â
<br />
|
| 176 |
Â
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
|
| 198 |
Â
<?php else: ?>
|
| 199 |
Â
<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 200 |
Â
<?php endif; ?>
|
| 201 |
+
|
| 202 |
+
|
| 203 |
Â
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 204 |
+
|
| 205 |
Â
<br />
|
| 206 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 207 |
Â
<small>
|
| 220 |
Â
<?php endforeach; ?>
|
| 221 |
Â
</small>
|
| 222 |
Â
<?php endif; ?>
|
| 223 |
+
|
| 224 |
Â
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 225 |
Â
<br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 226 |
Â
<?php endif; ?>
|
| 227 |
Â
<?php endif; ?>
|
| 228 |
Â
</span>
|
| 229 |
Â
<?php endif; ?>
|
| 230 |
+
|
| 231 |
Â
</td>
|
| 232 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 233 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -227,7 +227,6 @@
|
|
| 227 |
Â
<?php endif; ?>
|
| 228 |
Â
</span>
|
| 229 |
Â
<?php endif; ?>
|
| 230 |
-
</span>
|
| 231 |
Â
</td>
|
| 232 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 233 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 227 |
Â
<?php endif; ?>
|
| 228 |
Â
</span>
|
| 229 |
Â
<?php endif; ?>
|
|
Â
|
|
| 230 |
Â
</td>
|
| 231 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 232 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml
CHANGED
|
@@ -20,12 +20,14 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
Â
|
|
| 27 |
Â
<script type="text/javascript">
|
| 28 |
-
|
|
Â
|
|
| 29 |
Â
trackingControl = {
|
| 30 |
Â
index : 0,
|
| 31 |
Â
add : function () {
|
|
@@ -64,6 +66,7 @@ trackingControl = {
|
|
| 64 |
Â
}
|
| 65 |
Â
}
|
| 66 |
Â
}
|
|
Â
|
|
| 67 |
Â
</script>
|
| 68 |
Â
<div class="grid">
|
| 69 |
Â
<table cellspacing="0" class="data" id="tracking_numbers_table">
|
|
@@ -89,7 +92,7 @@ trackingControl = {
|
|
| 89 |
Â
<td>
|
| 90 |
Â
<select name="tracking[__index__][carrier_code]" id="trackingC__index__" class="select carrier" style="width:110px;" disabled="disabled">
|
| 91 |
Â
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
|
| 92 |
-
<option value="<?php echo $_code ?>"><?php echo $_name ?></option>
|
| 93 |
Â
<?php endforeach; ?>
|
| 94 |
Â
</select>
|
| 95 |
Â
</td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /** @var $this Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking */ ?>
|
| 28 |
Â
<script type="text/javascript">
|
| 29 |
+
//<![CDATA[
|
| 30 |
+
var trackingControl;
|
| 31 |
Â
trackingControl = {
|
| 32 |
Â
index : 0,
|
| 33 |
Â
add : function () {
|
| 66 |
Â
}
|
| 67 |
Â
}
|
| 68 |
Â
}
|
| 69 |
+
//]]>
|
| 70 |
Â
</script>
|
| 71 |
Â
<div class="grid">
|
| 72 |
Â
<table cellspacing="0" class="data" id="tracking_numbers_table">
|
| 92 |
Â
<td>
|
| 93 |
Â
<select name="tracking[__index__][carrier_code]" id="trackingC__index__" class="select carrier" style="width:110px;" disabled="disabled">
|
| 94 |
Â
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
|
| 95 |
+
<option value="<?php echo $_code ?>"><?php echo $this->escapeHtml($_name) ?></option>
|
| 96 |
Â
<?php endforeach; ?>
|
| 97 |
Â
</select>
|
| 98 |
Â
</td>
|
app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -51,7 +51,7 @@
|
|
| 51 |
Â
<h4 class="icon-head head-shipping-method"><?php echo $this->helper('sales')->__('Shipping Information') ?></h4>
|
| 52 |
Â
</div>
|
| 53 |
Â
<fieldset>
|
| 54 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 55 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 56 |
Â
|
| 57 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 51 |
Â
<h4 class="icon-head head-shipping-method"><?php echo $this->helper('sales')->__('Shipping Information') ?></h4>
|
| 52 |
Â
</div>
|
| 53 |
Â
<fieldset>
|
| 54 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 55 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 56 |
Â
|
| 57 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -227,7 +227,6 @@
|
|
| 227 |
Â
<?php endif; ?>
|
| 228 |
Â
</span>
|
| 229 |
Â
<?php endif; ?>
|
| 230 |
-
</span>
|
| 231 |
Â
</td>
|
| 232 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 233 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 227 |
Â
<?php endif; ?>
|
| 228 |
Â
</span>
|
| 229 |
Â
<?php endif; ?>
|
|
Â
|
|
| 230 |
Â
</td>
|
| 231 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 232 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -221,7 +221,6 @@
|
|
| 221 |
Â
<?php endif; ?>
|
| 222 |
Â
</span>
|
| 223 |
Â
<?php endif; ?>
|
| 224 |
-
</span>
|
| 225 |
Â
</td>
|
| 226 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 227 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 221 |
Â
<?php endif; ?>
|
| 222 |
Â
</span>
|
| 223 |
Â
<?php endif; ?>
|
|
Â
|
|
| 224 |
Â
</td>
|
| 225 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
|
| 226 |
Â
<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
|
app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -50,7 +50,7 @@
|
|
| 50 |
Â
</div>
|
| 51 |
Â
<fieldset>
|
| 52 |
Â
<div>
|
| 53 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 54 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 55 |
Â
|
| 56 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 50 |
Â
</div>
|
| 51 |
Â
<fieldset>
|
| 52 |
Â
<div>
|
| 53 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 54 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 55 |
Â
|
| 56 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml
CHANGED
|
@@ -20,17 +20,14 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
-
<?php
|
| 28 |
-
/**
|
| 29 |
-
* @see Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking
|
| 30 |
-
*/
|
| 31 |
-
?>
|
| 32 |
Â
<script type="text/javascript">
|
| 33 |
-
|
|
Â
|
|
| 34 |
Â
trackingControl = {
|
| 35 |
Â
index : 0,
|
| 36 |
Â
add : function () {
|
|
@@ -69,6 +66,7 @@ trackingControl = {
|
|
| 69 |
Â
}
|
| 70 |
Â
}
|
| 71 |
Â
}
|
|
Â
|
|
| 72 |
Â
</script>
|
| 73 |
Â
<div class="grid">
|
| 74 |
Â
<table cellspacing="0" class="data" id="tracking_numbers_table">
|
|
@@ -94,7 +92,7 @@ trackingControl = {
|
|
| 94 |
Â
<td>
|
| 95 |
Â
<select name="tracking[__index__][carrier_code]" id="trackingC__index__" class="select carrier" style="width:110px;" disabled="disabled">
|
| 96 |
Â
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
|
| 97 |
-
<option value="<?php echo $_code ?>"><?php echo $_name ?></option>
|
| 98 |
Â
<?php endforeach; ?>
|
| 99 |
Â
</select>
|
| 100 |
Â
</td>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /** @var $this Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking */ ?>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 28 |
Â
<script type="text/javascript">
|
| 29 |
+
//<![CDATA[
|
| 30 |
+
var trackingControl;
|
| 31 |
Â
trackingControl = {
|
| 32 |
Â
index : 0,
|
| 33 |
Â
add : function () {
|
| 66 |
Â
}
|
| 67 |
Â
}
|
| 68 |
Â
}
|
| 69 |
+
//]]>
|
| 70 |
Â
</script>
|
| 71 |
Â
<div class="grid">
|
| 72 |
Â
<table cellspacing="0" class="data" id="tracking_numbers_table">
|
| 92 |
Â
<td>
|
| 93 |
Â
<select name="tracking[__index__][carrier_code]" id="trackingC__index__" class="select carrier" style="width:110px;" disabled="disabled">
|
| 94 |
Â
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
|
| 95 |
+
<option value="<?php echo $_code ?>"><?php echo $this->escapeHtml($_name) ?></option>
|
| 96 |
Â
<?php endforeach; ?>
|
| 97 |
Â
</select>
|
| 98 |
Â
</td>
|
app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -81,7 +81,7 @@
|
|
| 81 |
Â
<input type="hidden" name="price" value="<?php echo $item->getPrice(); ?>">
|
| 82 |
Â
<input type="text" name="qty" value="<?php echo $item->getQty()*1; ?>" class="input-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">
|
| 83 |
Â
<button type="button" class="scalable delete icon-btn" onclick="packaging.deleteItem(this);" style="display:none;">
|
| 84 |
-
<span><?php echo Mage::helper('sales')->__('Delete') ?></span>
|
| 85 |
Â
</button>
|
| 86 |
Â
</td>
|
| 87 |
Â
</tr>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 81 |
Â
<input type="hidden" name="price" value="<?php echo $item->getPrice(); ?>">
|
| 82 |
Â
<input type="text" name="qty" value="<?php echo $item->getQty()*1; ?>" class="input-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">
|
| 83 |
Â
<button type="button" class="scalable delete icon-btn" onclick="packaging.deleteItem(this);" style="display:none;">
|
| 84 |
+
<span><span><span><?php echo Mage::helper('sales')->__('Delete') ?></span></span></span>
|
| 85 |
Â
</button>
|
| 86 |
Â
</td>
|
| 87 |
Â
</tr>
|
app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -69,7 +69,7 @@
|
|
| 69 |
Â
<tr>
|
| 70 |
Â
<?php if ($this->displayCustomsValue()): ?>
|
| 71 |
Â
<th><?php echo Mage::helper('sales')->__('Customs Value') ?></th>
|
| 72 |
-
<td><?php echo $this->
|
| 73 |
Â
<?php else: ?>
|
| 74 |
Â
<th><?php echo Mage::helper('sales')->__('Total Weight') ?></th>
|
| 75 |
Â
<td><?php echo $params->getWeight() .' '. Mage::helper('usa')->getMeasureWeightName($params->getWeightUnits()) ?></td>
|
|
@@ -85,7 +85,7 @@
|
|
| 85 |
Â
<?php if ($params->getContentType() != null): ?>
|
| 86 |
Â
<th><?php echo Mage::helper('sales')->__('Contents') ?></th>
|
| 87 |
Â
<?php if ($params->getContentType() == 'OTHER'): ?>
|
| 88 |
-
<td><?php echo $params->getContentTypeOther() ?></td>
|
| 89 |
Â
<?php else: ?>
|
| 90 |
Â
<td><?php echo $this->getContentTypeByCode($params->getContentType()) ?></td>
|
| 91 |
Â
<?php endif; ?>
|
|
@@ -170,7 +170,7 @@
|
|
| 170 |
Â
<?php echo $item->getWeight(); ?>
|
| 171 |
Â
</td>
|
| 172 |
Â
<?php if ($this->displayCustomsValue()): ?>
|
| 173 |
-
<td class="a-right"><?php echo $this->
|
| 174 |
Â
<?php endif; ?>
|
| 175 |
Â
<td class="a-right">
|
| 176 |
Â
<?php echo $this->getQtyOrderedItem($item->getOrderItemId()); ?>
|
|
@@ -190,7 +190,7 @@
|
|
| 190 |
Â
<div class="buttons-set a-right">
|
| 191 |
Â
<?php echo $this->getPrintButton() ?>
|
| 192 |
Â
<button type="button" class="scalable SavePackagesBtn save" onclick="hidePackedWindow();" title="<?php echo Mage::helper('sales')->__('Products should be added to package(s)')?>">
|
| 193 |
-
<span><?php echo Mage::helper('sales')->__('OK') ?></span>
|
| 194 |
Â
</button>
|
| 195 |
Â
</div>
|
| 196 |
Â
</div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 69 |
Â
<tr>
|
| 70 |
Â
<?php if ($this->displayCustomsValue()): ?>
|
| 71 |
Â
<th><?php echo Mage::helper('sales')->__('Customs Value') ?></th>
|
| 72 |
+
<td><?php echo $this->displayCustomsPrice($params->getCustomsValue()) ?></td>
|
| 73 |
Â
<?php else: ?>
|
| 74 |
Â
<th><?php echo Mage::helper('sales')->__('Total Weight') ?></th>
|
| 75 |
Â
<td><?php echo $params->getWeight() .' '. Mage::helper('usa')->getMeasureWeightName($params->getWeightUnits()) ?></td>
|
| 85 |
Â
<?php if ($params->getContentType() != null): ?>
|
| 86 |
Â
<th><?php echo Mage::helper('sales')->__('Contents') ?></th>
|
| 87 |
Â
<?php if ($params->getContentType() == 'OTHER'): ?>
|
| 88 |
+
<td><?php echo $this->escapeHtml($params->getContentTypeOther()) ?></td>
|
| 89 |
Â
<?php else: ?>
|
| 90 |
Â
<td><?php echo $this->getContentTypeByCode($params->getContentType()) ?></td>
|
| 91 |
Â
<?php endif; ?>
|
| 170 |
Â
<?php echo $item->getWeight(); ?>
|
| 171 |
Â
</td>
|
| 172 |
Â
<?php if ($this->displayCustomsValue()): ?>
|
| 173 |
+
<td class="a-right"><?php echo $this->displayCustomsPrice($item->getCustomsValue()) ?></td>
|
| 174 |
Â
<?php endif; ?>
|
| 175 |
Â
<td class="a-right">
|
| 176 |
Â
<?php echo $this->getQtyOrderedItem($item->getOrderItemId()); ?>
|
| 190 |
Â
<div class="buttons-set a-right">
|
| 191 |
Â
<?php echo $this->getPrintButton() ?>
|
| 192 |
Â
<button type="button" class="scalable SavePackagesBtn save" onclick="hidePackedWindow();" title="<?php echo Mage::helper('sales')->__('Products should be added to package(s)')?>">
|
| 193 |
+
<span><span><span><?php echo Mage::helper('sales')->__('OK') ?></span></span></span>
|
| 194 |
Â
</button>
|
| 195 |
Â
</div>
|
| 196 |
Â
</div>
|
app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -46,7 +46,7 @@ document.observe("dom:loaded", function() {
|
|
| 46 |
Â
<div class="entry-edit">
|
| 47 |
Â
<div class="entry-edit-head">
|
| 48 |
Â
<button type="button" class="scalable AddPackageBtn" onclick="packaging.newPackage();">
|
| 49 |
-
<span><?php echo Mage::helper('sales')->__('Add Package') ?></span>
|
| 50 |
Â
</button>
|
| 51 |
Â
<h4 class="icon-head fieldset-legend"><?php echo Mage::helper('sales')->__('Create Packages') ?></h4>
|
| 52 |
Â
</div>
|
|
@@ -156,12 +156,12 @@ document.observe("dom:loaded", function() {
|
|
| 156 |
Â
<?php endif; ?>
|
| 157 |
Â
<td>
|
| 158 |
Â
<button type="button" class="scalable AddItemsBtn" onclick="packaging.getItemsForPack(this);">
|
| 159 |
-
<span><?php echo Mage::helper('sales')->__('Add Products') ?></span>
|
| 160 |
Â
</button>
|
| 161 |
Â
</td>
|
| 162 |
Â
<td>
|
| 163 |
Â
<button type="button" class="scalable DeletePackageBtn" onclick="packaging.deletePackage(this);">
|
| 164 |
-
<span><?php echo Mage::helper('sales')->__('Delete Package') ?></span>
|
| 165 |
Â
</button>
|
| 166 |
Â
</td>
|
| 167 |
Â
</tbody>
|
|
@@ -198,7 +198,7 @@ document.observe("dom:loaded", function() {
|
|
| 198 |
Â
<div class="package_prapare" style="display:none">
|
| 199 |
Â
<div class="entry-edit-head">
|
| 200 |
Â
<button type="button" class="scalable AddSelectedBtn" onclick="packaging.packItems(this);">
|
| 201 |
-
<span><?php echo Mage::helper('sales')->__('Add Selected Product(s) to Package') ?></span>
|
| 202 |
Â
</button>
|
| 203 |
Â
<h4><?php echo Mage::helper('sales')->__('Please Select Products to Add') ?></h4>
|
| 204 |
Â
</div>
|
|
@@ -210,10 +210,10 @@ document.observe("dom:loaded", function() {
|
|
| 210 |
Â
</div>
|
| 211 |
Â
<div class="buttons-set a-right">
|
| 212 |
Â
<button type="button" class="scalable disabled SavePackagesBtn" disabled="disabled" onclick="packaging.confirmPackaging();" title="<?php echo Mage::helper('sales')->__('Products should be added to package(s)')?>">
|
| 213 |
-
<span><?php echo Mage::helper('sales')->__('OK') ?></span>
|
| 214 |
Â
</button>
|
| 215 |
Â
<button type="button" class="scalable" onclick="packaging.cancelPackaging();">
|
| 216 |
-
<span><?php echo Mage::helper('sales')->__('Cancel') ?></span>
|
| 217 |
Â
</button>
|
| 218 |
Â
</div>
|
| 219 |
Â
</div>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 46 |
Â
<div class="entry-edit">
|
| 47 |
Â
<div class="entry-edit-head">
|
| 48 |
Â
<button type="button" class="scalable AddPackageBtn" onclick="packaging.newPackage();">
|
| 49 |
+
<span><span><span><?php echo Mage::helper('sales')->__('Add Package') ?></span></span></span>
|
| 50 |
Â
</button>
|
| 51 |
Â
<h4 class="icon-head fieldset-legend"><?php echo Mage::helper('sales')->__('Create Packages') ?></h4>
|
| 52 |
Â
</div>
|
| 156 |
Â
<?php endif; ?>
|
| 157 |
Â
<td>
|
| 158 |
Â
<button type="button" class="scalable AddItemsBtn" onclick="packaging.getItemsForPack(this);">
|
| 159 |
+
<span><span><span><?php echo Mage::helper('sales')->__('Add Products') ?></span></span></span>
|
| 160 |
Â
</button>
|
| 161 |
Â
</td>
|
| 162 |
Â
<td>
|
| 163 |
Â
<button type="button" class="scalable DeletePackageBtn" onclick="packaging.deletePackage(this);">
|
| 164 |
+
<span><span><span><?php echo Mage::helper('sales')->__('Delete Package') ?></span></span></span>
|
| 165 |
Â
</button>
|
| 166 |
Â
</td>
|
| 167 |
Â
</tbody>
|
| 198 |
Â
<div class="package_prapare" style="display:none">
|
| 199 |
Â
<div class="entry-edit-head">
|
| 200 |
Â
<button type="button" class="scalable AddSelectedBtn" onclick="packaging.packItems(this);">
|
| 201 |
+
<span><span><span><?php echo Mage::helper('sales')->__('Add Selected Product(s) to Package') ?></span></span></span>
|
| 202 |
Â
</button>
|
| 203 |
Â
<h4><?php echo Mage::helper('sales')->__('Please Select Products to Add') ?></h4>
|
| 204 |
Â
</div>
|
| 210 |
Â
</div>
|
| 211 |
Â
<div class="buttons-set a-right">
|
| 212 |
Â
<button type="button" class="scalable disabled SavePackagesBtn" disabled="disabled" onclick="packaging.confirmPackaging();" title="<?php echo Mage::helper('sales')->__('Products should be added to package(s)')?>">
|
| 213 |
+
<span><span><span><?php echo Mage::helper('sales')->__('OK') ?></span></span></span>
|
| 214 |
Â
</button>
|
| 215 |
Â
<button type="button" class="scalable" onclick="packaging.cancelPackaging();">
|
| 216 |
+
<span><span><span><?php echo Mage::helper('sales')->__('Cancel') ?></span></span></span>
|
| 217 |
Â
</button>
|
| 218 |
Â
</div>
|
| 219 |
Â
</div>
|
app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -30,7 +30,7 @@
|
|
| 30 |
Â
<?php echo $this->getTrackingInfo()->getErrorMessage() ?>
|
| 31 |
Â
<?php else: ?>
|
| 32 |
Â
<?php if ($this->getTrackingInfo()->getUrl()): ?>
|
| 33 |
-
Please, visit for more info: <a href="<?php echo $this->getTrackingInfo()->getUrl() ?>" target="_blank"><?php echo $this->trackingInfo->getCarrierTitle() ?></a><br/>
|
| 34 |
Â
<?php endif; ?>
|
| 35 |
Â
|
| 36 |
Â
<?php if ($this->getTrackingInfo()->getStatus()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 30 |
Â
<?php echo $this->getTrackingInfo()->getErrorMessage() ?>
|
| 31 |
Â
<?php else: ?>
|
| 32 |
Â
<?php if ($this->getTrackingInfo()->getUrl()): ?>
|
| 33 |
+
Please, visit for more info: <a href="<?php echo $this->getTrackingInfo()->getUrl() ?>" target="_blank"><?php echo $this->escapeHtml($this->trackingInfo->getCarrierTitle()) ?></a><br/>
|
| 34 |
Â
<?php endif; ?>
|
| 35 |
Â
|
| 36 |
Â
<?php if ($this->getTrackingInfo()->getStatus()): ?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -51,7 +51,7 @@
|
|
| 51 |
Â
<a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($this->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->__('Track this shipment') ?>"><?php echo $this->__('Track this shipment') ?></a>
|
| 52 |
Â
<br/>
|
| 53 |
Â
<?php endif; ?>
|
| 54 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 55 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 56 |
Â
|
| 57 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 51 |
Â
<a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($this->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->__('Track this shipment') ?>"><?php echo $this->__('Track this shipment') ?></a>
|
| 52 |
Â
<br/>
|
| 53 |
Â
<?php endif; ?>
|
| 54 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 55 |
Â
<?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
|
| 56 |
Â
|
| 57 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
CHANGED
|
@@ -20,10 +20,11 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
Â
|
|
| 27 |
Â
<div class="field-row grid" id="shipment_tracking_info">
|
| 28 |
Â
<table cellspacing="0" class="data">
|
| 29 |
Â
<col width="100" />
|
|
@@ -43,7 +44,7 @@
|
|
| 43 |
Â
<td>
|
| 44 |
Â
<select name="carrier" class="select" style="width:110px" onchange="selectCarrier(this)">
|
| 45 |
Â
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
|
| 46 |
-
<option value="<?php echo $_code ?>"><?php echo $_name ?></option>
|
| 47 |
Â
<?php endforeach; ?>
|
| 48 |
Â
</select>
|
| 49 |
Â
</td>
|
|
@@ -56,7 +57,7 @@
|
|
| 56 |
Â
<tbody>
|
| 57 |
Â
<?php $i=0;foreach ($_tracks as $_track):$i++ ?>
|
| 58 |
Â
<tr class="<?php echo ($i%2==0)?'even':'odd' ?>">
|
| 59 |
-
<td><?php echo $this->getCarrierTitle($_track->getCarrierCode()) ?></td>
|
| 60 |
Â
<td><?php echo $this->escapeHtml($_track->getTitle()) ?></td>
|
| 61 |
Â
<td>
|
| 62 |
Â
<?php if ($_track->isCustom()): ?>
|
|
@@ -74,14 +75,10 @@
|
|
| 74 |
Â
</table>
|
| 75 |
Â
</div>
|
| 76 |
Â
<script type="text/javascript">
|
|
Â
|
|
| 77 |
Â
function selectCarrier(elem) {
|
| 78 |
-
option = elem.options[elem.selectedIndex];
|
| 79 |
-
|
| 80 |
-
$('tracking_title').value = option.text;
|
| 81 |
-
}
|
| 82 |
-
else {
|
| 83 |
-
$('tracking_title').value = '';
|
| 84 |
-
}
|
| 85 |
Â
}
|
| 86 |
Â
|
| 87 |
Â
function deleteTrackingNumber(url) {
|
|
@@ -89,4 +86,5 @@ function deleteTrackingNumber(url) {
|
|
| 89 |
Â
submitAndReloadArea($('shipment_tracking_info').parentNode, url)
|
| 90 |
Â
}
|
| 91 |
Â
}
|
|
Â
|
|
| 92 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /** @var $this Mage_Adminhtml_Block_Sales_Order_Shipment_View_Tracking */ ?>
|
| 28 |
Â
<div class="field-row grid" id="shipment_tracking_info">
|
| 29 |
Â
<table cellspacing="0" class="data">
|
| 30 |
Â
<col width="100" />
|
| 44 |
Â
<td>
|
| 45 |
Â
<select name="carrier" class="select" style="width:110px" onchange="selectCarrier(this)">
|
| 46 |
Â
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
|
| 47 |
+
<option value="<?php echo $_code ?>"><?php echo $this->escapeHtml($_name) ?></option>
|
| 48 |
Â
<?php endforeach; ?>
|
| 49 |
Â
</select>
|
| 50 |
Â
</td>
|
| 57 |
Â
<tbody>
|
| 58 |
Â
<?php $i=0;foreach ($_tracks as $_track):$i++ ?>
|
| 59 |
Â
<tr class="<?php echo ($i%2==0)?'even':'odd' ?>">
|
| 60 |
+
<td><?php echo $this->escapeHtml($this->getCarrierTitle($_track->getCarrierCode())) ?></td>
|
| 61 |
Â
<td><?php echo $this->escapeHtml($_track->getTitle()) ?></td>
|
| 62 |
Â
<td>
|
| 63 |
Â
<?php if ($_track->isCustom()): ?>
|
| 75 |
Â
</table>
|
| 76 |
Â
</div>
|
| 77 |
Â
<script type="text/javascript">
|
| 78 |
+
//<![CDATA[
|
| 79 |
Â
function selectCarrier(elem) {
|
| 80 |
+
var option = elem.options[elem.selectedIndex];
|
| 81 |
+
$('tracking_title').value = option.value && option.value != 'custom' ? option.text : '';
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 82 |
Â
}
|
| 83 |
Â
|
| 84 |
Â
function deleteTrackingNumber(url) {
|
| 86 |
Â
submitAndReloadArea($('shipment_tracking_info').parentNode, url)
|
| 87 |
Â
}
|
| 88 |
Â
}
|
| 89 |
+
//]]>
|
| 90 |
Â
</script>
|
app/design/adminhtml/default/default/template/sales/order/totalbar.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -35,52 +35,52 @@
|
|
| 35 |
Â
<table cellspacing="0" width="100%">
|
| 36 |
Â
<col />
|
| 37 |
Â
<col width="1" />
|
| 38 |
-
<?php $_totals = $this->getTotals('')?>
|
| 39 |
Â
<?php if ($_totals):?>
|
| 40 |
-
<
|
| 41 |
-
<?php foreach ($
|
| 42 |
Â
<?php if ($_total->getBlockName()): ?>
|
| 43 |
Â
<?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
|
| 44 |
Â
<?php else:?>
|
| 45 |
Â
<tr class="<?php echo $_code?>">
|
| 46 |
Â
<td <?php echo $this->getLabelProperties()?> class="label">
|
| 47 |
-
|
| 48 |
-
<strong><?php echo $_total->getLabel()?></strong>
|
| 49 |
-
<?php else:?>
|
| 50 |
-
<?php echo $_total->getLabel()?>
|
| 51 |
-
<?php endif?>
|
| 52 |
Â
</td>
|
| 53 |
-
<?php if ($_total->getStrong()):?>
|
| 54 |
Â
<td <?php echo $this->getValueProperties()?> class="emph">
|
| 55 |
Â
<strong><?php echo $this->formatValue($_total) ?></strong>
|
| 56 |
-
<?php else:?>
|
| 57 |
-
<td <?php echo $this->getValueProperties()?>>
|
| 58 |
-
<?php echo $this->formatValue($_total) ?>
|
| 59 |
-
<?php endif?>
|
| 60 |
Â
</td>
|
| 61 |
Â
</tr>
|
| 62 |
Â
<?php endif?>
|
| 63 |
Â
<?php endforeach?>
|
| 64 |
-
</
|
| 65 |
Â
<?php endif?>
|
| 66 |
Â
|
| 67 |
-
<?php $_totals = $this->getTotals('
|
| 68 |
Â
<?php if ($_totals):?>
|
| 69 |
-
<
|
| 70 |
-
<?php foreach ($
|
| 71 |
Â
<?php if ($_total->getBlockName()): ?>
|
| 72 |
Â
<?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
|
| 73 |
Â
<?php else:?>
|
| 74 |
Â
<tr class="<?php echo $_code?>">
|
| 75 |
Â
<td <?php echo $this->getLabelProperties()?> class="label">
|
| 76 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 77 |
Â
</td>
|
|
Â
|
|
| 78 |
Â
<td <?php echo $this->getValueProperties()?> class="emph">
|
| 79 |
Â
<strong><?php echo $this->formatValue($_total) ?></strong>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 80 |
Â
</td>
|
| 81 |
Â
</tr>
|
| 82 |
Â
<?php endif?>
|
| 83 |
Â
<?php endforeach?>
|
| 84 |
-
</
|
| 85 |
Â
<?php endif?>
|
| 86 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 35 |
Â
<table cellspacing="0" width="100%">
|
| 36 |
Â
<col />
|
| 37 |
Â
<col width="1" />
|
| 38 |
+
<?php $_totals = $this->getTotals('footer')?>
|
| 39 |
Â
<?php if ($_totals):?>
|
| 40 |
+
<tfoot>
|
| 41 |
+
<?php foreach ($this->getTotals('footer') as $_code => $_total): ?>
|
| 42 |
Â
<?php if ($_total->getBlockName()): ?>
|
| 43 |
Â
<?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
|
| 44 |
Â
<?php else:?>
|
| 45 |
Â
<tr class="<?php echo $_code?>">
|
| 46 |
Â
<td <?php echo $this->getLabelProperties()?> class="label">
|
| 47 |
+
<strong><?php echo $this->escapeHtml($_total->getLabel()); ?></strong>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 48 |
Â
</td>
|
|
Â
|
|
| 49 |
Â
<td <?php echo $this->getValueProperties()?> class="emph">
|
| 50 |
Â
<strong><?php echo $this->formatValue($_total) ?></strong>
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 51 |
Â
</td>
|
| 52 |
Â
</tr>
|
| 53 |
Â
<?php endif?>
|
| 54 |
Â
<?php endforeach?>
|
| 55 |
+
</tfoot>
|
| 56 |
Â
<?php endif?>
|
| 57 |
Â
|
| 58 |
+
<?php $_totals = $this->getTotals('')?>
|
| 59 |
Â
<?php if ($_totals):?>
|
| 60 |
+
<tbody>
|
| 61 |
+
<?php foreach ($_totals as $_code => $_total): ?>
|
| 62 |
Â
<?php if ($_total->getBlockName()): ?>
|
| 63 |
Â
<?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
|
| 64 |
Â
<?php else:?>
|
| 65 |
Â
<tr class="<?php echo $_code?>">
|
| 66 |
Â
<td <?php echo $this->getLabelProperties()?> class="label">
|
| 67 |
+
<?php if ($_total->getStrong()):?>
|
| 68 |
+
<strong><?php echo $this->escapeHtml($_total->getLabel()); ?></strong>
|
| 69 |
+
<?php else:?>
|
| 70 |
+
<?php echo $this->escapeHtml($_total->getLabel()); ?>
|
| 71 |
+
<?php endif?>
|
| 72 |
Â
</td>
|
| 73 |
+
<?php if ($_total->getStrong()):?>
|
| 74 |
Â
<td <?php echo $this->getValueProperties()?> class="emph">
|
| 75 |
Â
<strong><?php echo $this->formatValue($_total) ?></strong>
|
| 76 |
+
<?php else:?>
|
| 77 |
+
<td <?php echo $this->getValueProperties()?>>
|
| 78 |
+
<?php echo $this->formatValue($_total) ?>
|
| 79 |
+
<?php endif?>
|
| 80 |
Â
</td>
|
| 81 |
Â
</tr>
|
| 82 |
Â
<?php endif?>
|
| 83 |
Â
<?php endforeach?>
|
| 84 |
+
</tbody>
|
| 85 |
Â
<?php endif?>
|
| 86 |
Â
</table>
|
app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/due.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/main.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/** @var $this Mage_Adminhtml_Block_Sales_Order_Totals_Tax */
|
|
@@ -73,9 +73,9 @@ $_fullInfo = $this->getFullTaxInfo();
|
|
| 73 |
Â
|
| 74 |
Â
<tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
|
| 75 |
Â
<?php if (!is_null($info['percent'])): ?>
|
| 76 |
-
<td class="label"><?php echo $info['title']; ?> (<?php echo (float)$info['percent']; ?>%)<br /></td>
|
| 77 |
Â
<?php else: ?>
|
| 78 |
-
<td class="label"><?php echo $info['title']; ?><br /></td>
|
| 79 |
Â
<?php endif; ?>
|
| 80 |
Â
<td><?php echo $this->displayAmount($amount, $baseAmount); ?></td>
|
| 81 |
Â
</tr>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
/** @var $this Mage_Adminhtml_Block_Sales_Order_Totals_Tax */
|
| 73 |
Â
|
| 74 |
Â
<tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
|
| 75 |
Â
<?php if (!is_null($info['percent'])): ?>
|
| 76 |
+
<td class="label"><?php echo $this->escapeHtml($info['title']); ?> (<?php echo (float)$info['percent']; ?>%)<br /></td>
|
| 77 |
Â
<?php else: ?>
|
| 78 |
+
<td class="label"><?php echo $this->escapeHtml($info['title']); ?><br /></td>
|
| 79 |
Â
<?php endif; ?>
|
| 80 |
Â
<td><?php echo $this->displayAmount($amount, $baseAmount); ?></td>
|
| 81 |
Â
</tr>
|
app/design/adminhtml/default/default/template/sales/order/view/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/view/history.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/view/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -81,10 +81,10 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
|
|
| 81 |
Â
</a></td>
|
| 82 |
Â
</tr>
|
| 83 |
Â
<?php endif; ?>
|
| 84 |
-
<?php if($_order->getRemoteIp()): ?>
|
| 85 |
Â
<tr>
|
| 86 |
Â
<td class="label"><label><?php echo Mage::helper('sales')->__('Placed from IP') ?></label></td>
|
| 87 |
-
<td class="value"><strong><?php echo $_order->getRemoteIp(); echo ($_order->getXForwardedFor())?' (' . $_order->getXForwardedFor() . ')':''; ?></strong></td>
|
| 88 |
Â
</tr>
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php if($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 81 |
Â
</a></td>
|
| 82 |
Â
</tr>
|
| 83 |
Â
<?php endif; ?>
|
| 84 |
+
<?php if($_order->getRemoteIp() && $this->shouldDisplayCustomerIp()): ?>
|
| 85 |
Â
<tr>
|
| 86 |
Â
<td class="label"><label><?php echo Mage::helper('sales')->__('Placed from IP') ?></label></td>
|
| 87 |
+
<td class="value"><strong><?php echo $_order->getRemoteIp(); echo ($_order->getXForwardedFor())?' (' . $this->escapeHtml($_order->getXForwardedFor()) . ')':''; ?></strong></td>
|
| 88 |
Â
</tr>
|
| 89 |
Â
<?php endif; ?>
|
| 90 |
Â
<?php if($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
|
app/design/adminhtml/default/default/template/sales/order/view/items.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -31,9 +31,12 @@
|
|
| 31 |
Â
<li>
|
| 32 |
Â
<strong><?php echo $this->getItemCreatedAt($_item) ?></strong>
|
| 33 |
Â
<?php echo $this->getItemCreatedAt($_item, 'time') ?><span class="separator">|</span>
|
|
Â
|
|
| 34 |
Â
<strong><?php echo $this->getItemTitle($_item) ?></strong>
|
| 35 |
-
|
| 36 |
-
|
|
Â
|
|
|
Â
|
|
| 37 |
Â
<strong class="subdue">
|
| 38 |
Â
<?php if ($this->isCustomerNotificationNotApplicable($_item)): ?>
|
| 39 |
Â
<?php echo $this->helper('sales')->__('Notification Not Applicable') ?>
|
|
@@ -43,8 +46,8 @@
|
|
| 43 |
Â
<?php else: ?>
|
| 44 |
Â
<?php echo $this->helper('sales')->__('Not Notified') ?>
|
| 45 |
Â
<?php endif; ?>
|
| 46 |
-
</strong
|
| 47 |
-
|
| 48 |
Â
<?php if ($_comment = $this->getItemComment($_item)): ?>
|
| 49 |
Â
<br/><?php echo $_comment ?>
|
| 50 |
Â
<?php endif; ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 31 |
Â
<li>
|
| 32 |
Â
<strong><?php echo $this->getItemCreatedAt($_item) ?></strong>
|
| 33 |
Â
<?php echo $this->getItemCreatedAt($_item, 'time') ?><span class="separator">|</span>
|
| 34 |
+
<?php if ($this->getItemTitle($_item)): ?>
|
| 35 |
Â
<strong><?php echo $this->getItemTitle($_item) ?></strong>
|
| 36 |
+
<span class="separator">|</span>
|
| 37 |
+
<?php endif; ?>
|
| 38 |
+
<small>
|
| 39 |
+
<?php echo $this->helper('sales')->__('Customer') ?>
|
| 40 |
Â
<strong class="subdue">
|
| 41 |
Â
<?php if ($this->isCustomerNotificationNotApplicable($_item)): ?>
|
| 42 |
Â
<?php echo $this->helper('sales')->__('Notification Not Applicable') ?>
|
| 46 |
Â
<?php else: ?>
|
| 47 |
Â
<?php echo $this->helper('sales')->__('Not Notified') ?>
|
| 48 |
Â
<?php endif; ?>
|
| 49 |
+
</strong>
|
| 50 |
+
</small>
|
| 51 |
Â
<?php if ($_comment = $this->getItemComment($_item)): ?>
|
| 52 |
Â
<br/><?php echo $_comment ?>
|
| 53 |
Â
<?php endif; ?>
|
app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
CHANGED
|
@@ -20,10 +20,11 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
Â
|
|
| 27 |
Â
<?php $_order = $this->getOrder() ?>
|
| 28 |
Â
<div>
|
| 29 |
Â
<div id="order-messages">
|
|
@@ -60,7 +61,7 @@
|
|
| 60 |
Â
<br/>
|
| 61 |
Â
<?php endif; ?>
|
| 62 |
Â
<?php if ($_order->getShippingDescription()): ?>
|
| 63 |
-
<strong><?php echo $_order->getShippingDescription() ?></strong>
|
| 64 |
Â
|
| 65 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 66 |
Â
<?php $_excl = $this->displayShippingPriceInclTax($_order); ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /** @var $this Mage_Adminhtml_Block_Sales_Order_View_Tab_Info */ ?>
|
| 28 |
Â
<?php $_order = $this->getOrder() ?>
|
| 29 |
Â
<div>
|
| 30 |
Â
<div id="order-messages">
|
| 61 |
Â
<br/>
|
| 62 |
Â
<?php endif; ?>
|
| 63 |
Â
<?php if ($_order->getShippingDescription()): ?>
|
| 64 |
+
<strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
|
| 65 |
Â
|
| 66 |
Â
<?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
|
| 67 |
Â
<?php $_excl = $this->displayShippingPriceInclTax($_order); ?>
|
app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
CHANGED
|
@@ -20,23 +20,24 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
-
<?php
|
|
Â
|
|
| 28 |
Â
<span class="field-row" id="order_tracking_info">
|
| 29 |
Â
<table cellpadding="0" cellspacing="0" width="100%">
|
| 30 |
Â
<tr>
|
| 31 |
-
<td><label
|
| 32 |
Â
<td width="100%">
|
| 33 |
-
<?php
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
|
| 40 |
Â
<?php endif; ?>
|
| 41 |
Â
<input class="input-text" type="text" id="tracking_number" name="tracking_number" value="" style="width:120px;"/>
|
| 42 |
Â
<?php echo $this->getSaveButtonHtml() ?>
|
|
@@ -44,4 +45,4 @@
|
|
| 44 |
Â
</tr>
|
| 45 |
Â
</table>
|
| 46 |
Â
</span>
|
| 47 |
-
<?php endif ?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php $_shippingCarrier = $this->getOrder()->getShippingCarrier(); ?>
|
| 28 |
+
<?php if ($_shippingCarrier && $_shippingCarrier->isTrackingAvailable()): ?>
|
| 29 |
Â
<span class="field-row" id="order_tracking_info">
|
| 30 |
Â
<table cellpadding="0" cellspacing="0" width="100%">
|
| 31 |
Â
<tr>
|
| 32 |
+
<td><label for="tracking_number"><?php echo Mage::helper('sales')->__('Tracking Number') ?></label></td>
|
| 33 |
Â
<td width="100%">
|
| 34 |
+
<?php $_numbers = $this->getOrder()->getTrackingNumbers(); ?>
|
| 35 |
+
<?php if ($_numbers): ?>
|
| 36 |
+
<?php foreach ($_numbers as $_number): ?>
|
| 37 |
+
<a href="#" onclick="<?php echo $this->getViewLinkHtml($_number) ?>"><?php echo $_number ?></a>
|
| 38 |
+
<a href="#" onclick="<?php echo $this->getRemoveLinkHtml($_number) ?>"><?php echo Mage::helper('sales')->__('Delete') ?></a><br/>
|
| 39 |
+
<span id="order_tracking_info_response_<?php echo $_number ?>"></span>
|
| 40 |
+
<?php endforeach; ?>
|
| 41 |
Â
<?php endif; ?>
|
| 42 |
Â
<input class="input-text" type="text" id="tracking_number" name="tracking_number" value="" style="width:120px;"/>
|
| 43 |
Â
<?php echo $this->getSaveButtonHtml() ?>
|
| 45 |
Â
</tr>
|
| 46 |
Â
</table>
|
| 47 |
Â
</span>
|
| 48 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/sales/transactions/detail.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/store/switcher.phtml
CHANGED
|
@@ -20,30 +20,31 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
Â
|
|
| 27 |
Â
<?php if ($websites = $this->getWebsites()): ?>
|
| 28 |
-
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Choose Store View')
|
| 29 |
Â
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
|
| 30 |
Â
<?php if ($this->hasDefaultOption()): ?>
|
| 31 |
Â
<option value=""><?php echo $this->getDefaultStoreName() ?></option>
|
| 32 |
Â
<?php endif; ?>
|
| 33 |
Â
<?php foreach ($websites as $website): ?>
|
| 34 |
-
<?php $showWebsite=false; ?>
|
| 35 |
Â
<?php foreach ($website->getGroups() as $group): ?>
|
| 36 |
-
<?php $showGroup=false; ?>
|
| 37 |
Â
<?php foreach ($this->getStores($group) as $store): ?>
|
| 38 |
Â
<?php if ($showWebsite == false): ?>
|
| 39 |
Â
<?php $showWebsite = true; ?>
|
| 40 |
-
<optgroup label="<?php echo $website->getName() ?>"></optgroup>
|
| 41 |
Â
<?php endif; ?>
|
| 42 |
Â
<?php if ($showGroup == false): ?>
|
| 43 |
Â
<?php $showGroup = true; ?>
|
| 44 |
-
<optgroup label=" <?php echo $group->getName() ?>">
|
| 45 |
Â
<?php endif; ?>
|
| 46 |
-
<option value="<?php echo $store->getId() ?>"<?php if($this->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>> <?php echo $store->getName() ?></option>
|
| 47 |
Â
<?php endforeach; ?>
|
| 48 |
Â
<?php if ($showGroup): ?>
|
| 49 |
Â
</optgroup>
|
|
@@ -51,24 +52,24 @@
|
|
| 51 |
Â
<?php endforeach; ?>
|
| 52 |
Â
<?php endforeach; ?>
|
| 53 |
Â
</select>
|
|
Â
|
|
| 54 |
Â
</p>
|
| 55 |
Â
<script type="text/javascript">
|
| 56 |
-
function switchStore(obj){
|
| 57 |
-
var storeParam = obj.value ? 'store/'+obj.value + '/' : '';
|
| 58 |
-
if(obj.switchParams){
|
| 59 |
-
storeParam+= obj.switchParams;
|
| 60 |
Â
}
|
| 61 |
-
<?php if($this->getUseConfirm()): ?>
|
| 62 |
-
if(confirm("<?php echo $this->__('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")){
|
| 63 |
-
setLocation('<?php echo $this->getSwitchUrl() ?>'+storeParam);
|
| 64 |
Â
return true;
|
| 65 |
-
}
|
| 66 |
-
else {
|
| 67 |
Â
obj.value = '<?php echo $this->getStoreId() ?>';
|
| 68 |
Â
}
|
| 69 |
Â
return false;
|
| 70 |
Â
<?php else: ?>
|
| 71 |
-
setLocation('<?php echo $this->getSwitchUrl() ?>'+storeParam);
|
| 72 |
Â
<?php endif; ?>
|
| 73 |
Â
}
|
| 74 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
+
<?php /* @var $this Mage_Core_Block_Template */ ?>
|
| 28 |
Â
<?php if ($websites = $this->getWebsites()): ?>
|
| 29 |
+
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Choose Store View:') ?></label>
|
| 30 |
Â
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
|
| 31 |
Â
<?php if ($this->hasDefaultOption()): ?>
|
| 32 |
Â
<option value=""><?php echo $this->getDefaultStoreName() ?></option>
|
| 33 |
Â
<?php endif; ?>
|
| 34 |
Â
<?php foreach ($websites as $website): ?>
|
| 35 |
+
<?php $showWebsite = false; ?>
|
| 36 |
Â
<?php foreach ($website->getGroups() as $group): ?>
|
| 37 |
+
<?php $showGroup = false; ?>
|
| 38 |
Â
<?php foreach ($this->getStores($group) as $store): ?>
|
| 39 |
Â
<?php if ($showWebsite == false): ?>
|
| 40 |
Â
<?php $showWebsite = true; ?>
|
| 41 |
+
<optgroup label="<?php echo $this->escapeHtml($website->getName()) ?>"></optgroup>
|
| 42 |
Â
<?php endif; ?>
|
| 43 |
Â
<?php if ($showGroup == false): ?>
|
| 44 |
Â
<?php $showGroup = true; ?>
|
| 45 |
+
<optgroup label=" <?php echo $this->escapeHtml($group->getName()) ?>">
|
| 46 |
Â
<?php endif; ?>
|
| 47 |
+
<option value="<?php echo $this->escapeHtml($store->getId()) ?>"<?php if($this->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>> <?php echo $this->escapeHtml($store->getName()) ?></option>
|
| 48 |
Â
<?php endforeach; ?>
|
| 49 |
Â
<?php if ($showGroup): ?>
|
| 50 |
Â
</optgroup>
|
| 52 |
Â
<?php endforeach; ?>
|
| 53 |
Â
<?php endforeach; ?>
|
| 54 |
Â
</select>
|
| 55 |
+
<?php echo $this->getHintHtml() ?>
|
| 56 |
Â
</p>
|
| 57 |
Â
<script type="text/javascript">
|
| 58 |
+
function switchStore(obj) {
|
| 59 |
+
var storeParam = obj.value ? 'store/' + obj.value + '/' : '';
|
| 60 |
+
if (obj.switchParams) {
|
| 61 |
+
storeParam += obj.switchParams;
|
| 62 |
Â
}
|
| 63 |
+
<?php if ($this->getUseConfirm()): ?>
|
| 64 |
+
if (confirm("<?php echo $this->__('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
|
| 65 |
+
setLocation('<?php echo $this->getSwitchUrl() ?>' + storeParam);
|
| 66 |
Â
return true;
|
| 67 |
+
} else {
|
|
Â
|
|
| 68 |
Â
obj.value = '<?php echo $this->getStoreId() ?>';
|
| 69 |
Â
}
|
| 70 |
Â
return false;
|
| 71 |
Â
<?php else: ?>
|
| 72 |
+
setLocation('<?php echo $this->getSwitchUrl() ?>' + storeParam);
|
| 73 |
Â
<?php endif; ?>
|
| 74 |
Â
}
|
| 75 |
Â
</script>
|
app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml
CHANGED
|
@@ -20,14 +20,14 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<?php $_websiteCollection = $this->getWebsiteCollection() ?>
|
| 28 |
Â
<?php if ($_websiteCollection->getSize()): ?>
|
| 29 |
Â
<div id="store_switcher_container">
|
| 30 |
-
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Choose Store View')
|
| 31 |
Â
<select name="store_switcher" id="store_switcher" class="left-col-block">
|
| 32 |
Â
<option value=""><?php echo $this->getDefaultStoreName() ?></option>
|
| 33 |
Â
<?php foreach ($_websiteCollection as $_website): ?>
|
|
@@ -51,6 +51,7 @@
|
|
| 51 |
Â
<?php endforeach; ?>
|
| 52 |
Â
<?php endforeach; ?>
|
| 53 |
Â
</select>
|
|
Â
|
|
| 54 |
Â
</p>
|
| 55 |
Â
</div>
|
| 56 |
Â
<script type="text/javascript">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<?php $_websiteCollection = $this->getWebsiteCollection() ?>
|
| 28 |
Â
<?php if ($_websiteCollection->getSize()): ?>
|
| 29 |
Â
<div id="store_switcher_container">
|
| 30 |
+
<p class="switcher"><label for="store_switcher"><?php echo $this->__('Choose Store View:') ?></label>
|
| 31 |
Â
<select name="store_switcher" id="store_switcher" class="left-col-block">
|
| 32 |
Â
<option value=""><?php echo $this->getDefaultStoreName() ?></option>
|
| 33 |
Â
<?php foreach ($_websiteCollection as $_website): ?>
|
| 51 |
Â
<?php endforeach; ?>
|
| 52 |
Â
<?php endforeach; ?>
|
| 53 |
Â
</select>
|
| 54 |
+
<?php echo $this->getHintHtml() ?>
|
| 55 |
Â
</p>
|
| 56 |
Â
</div>
|
| 57 |
Â
<script type="text/javascript">
|
app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_element = $this->getElement() ?>
|
| 28 |
+
<?php if ($_element->getFieldsetContainerId()): ?>
|
| 29 |
+
<div id="<?php echo $_element->getFieldsetContainerId(); ?>">
|
| 30 |
+
<?php endif; ?>
|
| 31 |
+
<?php if ($_element->getLegend()): ?>
|
| 32 |
+
<div class="entry-edit-head">
|
| 33 |
+
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $_element->getLegend() ?></h4>
|
| 34 |
+
<div class="form-buttons"><?php echo $_element->getHeaderBar() ?></div>
|
| 35 |
+
</div>
|
| 36 |
+
<?php endif; ?>
|
| 37 |
+
<?php if (!$_element->getNoContainer()): ?>
|
| 38 |
+
<div class="fieldset <?php echo $_element->getClass() ?>" id="<?php echo $_element->getHtmlId() ?>">
|
| 39 |
+
<?php endif; ?>
|
| 40 |
+
<div class="store-scope">
|
| 41 |
+
<?php echo $this->getHintHtml() ?>
|
| 42 |
+
<div class="tree-store-scope">
|
| 43 |
+
<?php if ($_element->getComment()): ?>
|
| 44 |
+
<p class="comment"><?php echo $this->escapeHtml($_element->getComment()) ?></p>
|
| 45 |
+
<?php endif; ?>
|
| 46 |
+
<?php if ($_element->hasHtmlContent()): ?>
|
| 47 |
+
<?php echo $_element->getHtmlContent(); ?>
|
| 48 |
+
<?php else: ?>
|
| 49 |
+
<table cellspacing="0" class="<?php echo $_element->hasTableClass() ? $_element->getTableClass() : 'form-list'?>">
|
| 50 |
+
<tbody>
|
| 51 |
+
<?php echo $_element->getChildrenHtml(); ?>
|
| 52 |
+
</tbody>
|
| 53 |
+
</table>
|
| 54 |
+
<?php endif; ?>
|
| 55 |
+
</div>
|
| 56 |
+
</div>
|
| 57 |
+
<?php echo $_element->getSubFieldsetHtml() ?>
|
| 58 |
+
<?php if (!$_element->getNoContainer()): ?>
|
| 59 |
+
</div>
|
| 60 |
+
<?php endif; ?>
|
| 61 |
+
<?php if ($_element->getFieldsetContainerId()): ?>
|
| 62 |
+
</div>
|
| 63 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
$_element = $this->getElement();
|
| 29 |
+
$_note = $_element->getNote();
|
| 30 |
+
$_trId = $_element->getHtmlContainerId();
|
| 31 |
+
$_class = $_element->getFieldsetHtmlClass();
|
| 32 |
+
?>
|
| 33 |
+
<?php if (!$_element->getNoDisplay()): ?>
|
| 34 |
+
<tr<?php if($_trId): ?> id="<?php echo $_trId ?>"<?php endif; ?>>
|
| 35 |
+
<?php if ($_element->getType()=='hidden'): ?>
|
| 36 |
+
<td colspan="2" class="hidden"><?php echo trim($_element->getElementHtml()) ?></td>
|
| 37 |
+
<?php else: ?>
|
| 38 |
+
<td class="label<?php echo $_class ? " {$_class}-label" : ''?>"><?php echo trim($_element->getLabelHtml()) ?></td>
|
| 39 |
+
<td class="<?php echo $_element->hasValueClass() ? $_element->getValueClass() : 'value' ?><?php echo $_class ? " {$_class}-value" : ''?>">
|
| 40 |
+
<div class="store-scope">
|
| 41 |
+
<?php echo trim($_element->getElementHtml()) ?>
|
| 42 |
+
<?php echo $this->getHintHtml() ?>
|
| 43 |
+
</div>
|
| 44 |
+
<?php if ($_note): ?>
|
| 45 |
+
<p class="note<?php echo $_class ? " {$_class}-note" : ''?>" id="note_<?php echo $_element->getId()?>"><span><?php echo $_note ?></span></p>
|
| 46 |
+
<?php endif ?>
|
| 47 |
+
</td>
|
| 48 |
+
<?php endif; ?>
|
| 49 |
+
</tr>
|
| 50 |
+
<?php endif; ?>
|
app/design/adminhtml/default/default/template/system/autocomplete.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/cache/additional.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -35,7 +35,7 @@
|
|
| 35 |
Â
<table class="form-list">
|
| 36 |
Â
<tr>
|
| 37 |
Â
<td class="scope-label">
|
| 38 |
-
<button onclick="setLocation('<?php echo $this->getCleanImagesUrl()?>')" type="button" class="scalable"><span><?php echo Mage::helper('adminhtml')->__('Flush Catalog Images Cache') ?></span></button>
|
| 39 |
Â
</td>
|
| 40 |
Â
<td class="scope-label">
|
| 41 |
Â
<?php echo Mage::helper('adminhtml')->__('Pregenerated product images files.')?>
|
|
@@ -43,7 +43,7 @@
|
|
| 43 |
Â
</tr>
|
| 44 |
Â
<tr>
|
| 45 |
Â
<td class="scope-label">
|
| 46 |
-
<button onclick="setLocation('<?php echo $this->getCleanMediaUrl()?>')" type="button" class="scalable"><span><?php echo Mage::helper('adminhtml')->__('Flush JavaScript/CSS Cache') ?></span></button>
|
| 47 |
Â
</td>
|
| 48 |
Â
<td class="scope-label">
|
| 49 |
Â
<?php echo Mage::helper('adminhtml')->__('Themes JavaScript and CSS files combined to one file.')?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 35 |
Â
<table class="form-list">
|
| 36 |
Â
<tr>
|
| 37 |
Â
<td class="scope-label">
|
| 38 |
+
<button onclick="setLocation('<?php echo $this->getCleanImagesUrl()?>')" type="button" class="scalable"><span><span><span><?php echo Mage::helper('adminhtml')->__('Flush Catalog Images Cache') ?></span></span></span></button>
|
| 39 |
Â
</td>
|
| 40 |
Â
<td class="scope-label">
|
| 41 |
Â
<?php echo Mage::helper('adminhtml')->__('Pregenerated product images files.')?>
|
| 43 |
Â
</tr>
|
| 44 |
Â
<tr>
|
| 45 |
Â
<td class="scope-label">
|
| 46 |
+
<button onclick="setLocation('<?php echo $this->getCleanMediaUrl()?>')" type="button" class="scalable"><span><span><span><?php echo Mage::helper('adminhtml')->__('Flush JavaScript/CSS Cache') ?></span></span></span></button>
|
| 47 |
Â
</td>
|
| 48 |
Â
<td class="scope-label">
|
| 49 |
Â
<?php echo Mage::helper('adminhtml')->__('Themes JavaScript and CSS files combined to one file.')?>
|
app/design/adminhtml/default/default/template/system/cache/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -73,7 +73,7 @@
|
|
| 73 |
Â
<?php if (isset($_button['warning']) && $_button['warning']): ?>
|
| 74 |
Â
<?php $clickAction = "if (confirm('".addslashes($_button['warning'])."')) {{$clickAction}}"; ?>
|
| 75 |
Â
<?php endif; ?>
|
| 76 |
-
<button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>onclick="<?php echo $clickAction; ?>"<?php endif; ?> id="<?php echo $_button['name'] ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif; ?>" style=""><span><?php echo $_button['action'] ?></span></button>
|
| 77 |
Â
<?php if (isset($_button['comment'])): ?> <br /> <small><?php echo $_button['comment']; ?></small> <?php endif; ?>
|
| 78 |
Â
<?php endforeach; ?>
|
| 79 |
Â
</td>
|
|
@@ -96,7 +96,7 @@
|
|
| 96 |
Â
<tr>
|
| 97 |
Â
<td class="label"><label><?php echo $this->__('JavaScript/CSS Cache') ?></label></td>
|
| 98 |
Â
<td class="value">
|
| 99 |
-
<button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><?php echo $this->__('Clear') ?></span></button>
|
| 100 |
Â
</td>
|
| 101 |
Â
</tr>
|
| 102 |
Â
</tbody>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 73 |
Â
<?php if (isset($_button['warning']) && $_button['warning']): ?>
|
| 74 |
Â
<?php $clickAction = "if (confirm('".addslashes($_button['warning'])."')) {{$clickAction}}"; ?>
|
| 75 |
Â
<?php endif; ?>
|
| 76 |
+
<button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>onclick="<?php echo $clickAction; ?>"<?php endif; ?> id="<?php echo $_button['name'] ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif; ?>" style=""><span><span><span><?php echo $_button['action'] ?></span></span></span></button>
|
| 77 |
Â
<?php if (isset($_button['comment'])): ?> <br /> <small><?php echo $_button['comment']; ?></small> <?php endif; ?>
|
| 78 |
Â
<?php endforeach; ?>
|
| 79 |
Â
</td>
|
| 96 |
Â
<tr>
|
| 97 |
Â
<td class="label"><label><?php echo $this->__('JavaScript/CSS Cache') ?></label></td>
|
| 98 |
Â
<td class="value">
|
| 99 |
+
<button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?php echo $this->__('Clear') ?></span></span></span></button>
|
| 100 |
Â
</td>
|
| 101 |
Â
</tr>
|
| 102 |
Â
</tbody>
|
app/design/adminhtml/default/default/template/system/cache/notifications.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/config/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -50,7 +50,7 @@ $_colspan = $_colspan > 1 ? 'colspan="' . $_colspan . '"' : '';
|
|
| 50 |
Â
<td colspan="<?php echo count($this->_columns) ?>"></td>
|
| 51 |
Â
<td <?php echo $_colspan?>>
|
| 52 |
Â
<button style="" onclick="" class="scalable add" type="button" id="addToEndBtn<?php echo $_htmlId ?>">
|
| 53 |
-
<span><?php echo $this->_addButtonLabel ?></span>
|
| 54 |
Â
</button>
|
| 55 |
Â
</td>
|
| 56 |
Â
</tr>
|
|
@@ -61,7 +61,7 @@ $_colspan = $_colspan > 1 ? 'colspan="' . $_colspan . '"' : '';
|
|
| 61 |
Â
</div>
|
| 62 |
Â
<div id="empty<?php echo $_htmlId ?>">
|
| 63 |
Â
<button style="" onclick="" class="scalable add" type="button" id="emptyAddBtn<?php echo $_htmlId ?>">
|
| 64 |
-
<span><?php echo $this->_addButtonLabel ?></span>
|
| 65 |
Â
</button>
|
| 66 |
Â
</div>
|
| 67 |
Â
|
|
@@ -78,9 +78,9 @@ var arrayRow<?php echo $_htmlId ?> = {
|
|
| 78 |
Â
+'<\/td>'
|
| 79 |
Â
<?php endforeach;?>
|
| 80 |
Â
<?php if ($this->_addAfter):?>
|
| 81 |
-
+'<td><button onclick="" class="scalable add" type="button" id="addAfterBtn#{_id}"><span><?php echo Mage::helper('adminhtml')->__('Add after') ?><\/span><\/button><\/td>'
|
| 82 |
Â
<?php endif;?>
|
| 83 |
-
+'<td><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'#{_id}\')" class="scalable delete" type="button"><span><?php echo Mage::helper('adminhtml')->__('Delete') ?><\/span><\/button><\/td>'
|
| 84 |
Â
+'<\/tr>'
|
| 85 |
Â
),
|
| 86 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 50 |
Â
<td colspan="<?php echo count($this->_columns) ?>"></td>
|
| 51 |
Â
<td <?php echo $_colspan?>>
|
| 52 |
Â
<button style="" onclick="" class="scalable add" type="button" id="addToEndBtn<?php echo $_htmlId ?>">
|
| 53 |
+
<span><span><span><?php echo $this->_addButtonLabel ?></span></span></span>
|
| 54 |
Â
</button>
|
| 55 |
Â
</td>
|
| 56 |
Â
</tr>
|
| 61 |
Â
</div>
|
| 62 |
Â
<div id="empty<?php echo $_htmlId ?>">
|
| 63 |
Â
<button style="" onclick="" class="scalable add" type="button" id="emptyAddBtn<?php echo $_htmlId ?>">
|
| 64 |
+
<span><span><span><?php echo $this->_addButtonLabel ?></span></span></span>
|
| 65 |
Â
</button>
|
| 66 |
Â
</div>
|
| 67 |
Â
|
| 78 |
Â
+'<\/td>'
|
| 79 |
Â
<?php endforeach;?>
|
| 80 |
Â
<?php if ($this->_addAfter):?>
|
| 81 |
+
+'<td><button onclick="" class="scalable add" type="button" id="addAfterBtn#{_id}"><span><span><span><?php echo Mage::helper('adminhtml')->__('Add after') ?><\/span><\/span><\/span><\/button><\/td>'
|
| 82 |
Â
<?php endif;?>
|
| 83 |
+
+'<td><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'#{_id}\')" class="scalable delete" type="button"><span><span><span><?php echo Mage::helper('adminhtml')->__('Delete') ?><\/span><\/span><\/span><\/button><\/td>'
|
| 84 |
Â
+'<\/tr>'
|
| 85 |
Â
),
|
| 86 |
Â
|
app/design/adminhtml/default/default/template/system/config/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -199,8 +199,8 @@ perPageModel.prototype = {
|
|
| 199 |
Â
|
| 200 |
Â
this.refreshPerPageSelect();
|
| 201 |
Â
this.bindListModeChange();
|
| 202 |
-
this.addValidate();
|
| 203 |
Â
}
|
|
Â
|
|
| 204 |
Â
},
|
| 205 |
Â
bindListModeChange : function()
|
| 206 |
Â
{
|
|
@@ -251,11 +251,6 @@ perPageModel.prototype = {
|
|
| 251 |
Â
var values = $(elm.id + '_values').value.split(',');
|
| 252 |
Â
return values.indexOf(v) != -1;
|
| 253 |
Â
});
|
| 254 |
-
|
| 255 |
-
this.gridValuesElement.addClassName('validate-per-page-value-list');
|
| 256 |
-
this.listValuesElement.addClassName('validate-per-page-value-list');
|
| 257 |
-
this.gridElement.addClassName('validate-per-page-value');
|
| 258 |
-
this.listElement.addClassName('validate-per-page-value');
|
| 259 |
Â
}
|
| 260 |
Â
}
|
| 261 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 199 |
Â
|
| 200 |
Â
this.refreshPerPageSelect();
|
| 201 |
Â
this.bindListModeChange();
|
|
Â
|
|
| 202 |
Â
}
|
| 203 |
+
this.addValidate();
|
| 204 |
Â
},
|
| 205 |
Â
bindListModeChange : function()
|
| 206 |
Â
{
|
| 251 |
Â
var values = $(elm.id + '_values').value.split(',');
|
| 252 |
Â
return values.indexOf(v) != -1;
|
| 253 |
Â
});
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 254 |
Â
}
|
| 255 |
Â
}
|
| 256 |
Â
|
app/design/adminhtml/default/default/template/system/config/switcher.phtml
CHANGED
|
@@ -1,17 +1,44 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 1 |
Â
<div class="switcher">
|
| 2 |
Â
<label for="store_switcher"><?php echo $this->__('Current Configuration Scope:') ?></label>
|
|
Â
|
|
| 3 |
Â
<select id="store_switcher" class="system-config-store-switcher" onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
|
| 4 |
-
<?php foreach ($this->getStoreSelectOptions() as $_value
|
| 5 |
Â
<?php if (isset($_option['is_group'])): ?>
|
| 6 |
Â
<?php if ($_option['is_close']): ?>
|
| 7 |
Â
</optgroup>
|
| 8 |
Â
<?php else: ?>
|
| 9 |
-
<optgroup label="<?php echo $_option['label'] ?>" style="<?php echo $_option['style'] ?>">
|
| 10 |
Â
<?php endif; ?>
|
| 11 |
Â
<?php continue ?>
|
| 12 |
Â
<?php endif; ?>
|
| 13 |
-
<option value="<?php echo $_value ?>" url="<?php echo $_option['url'] ?>" <?php echo $_option['selected']?'selected="selected"':'' ?> style="<?php echo $_option['style'] ?>">
|
| 14 |
-
<?php echo $_option['label'] ?>
|
| 15 |
Â
</option>
|
| 16 |
Â
<?php endforeach ?>
|
| 17 |
Â
</select>
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
/* @var $this Mage_Core_Block_Template */ ?>
|
| 27 |
Â
<div class="switcher">
|
| 28 |
Â
<label for="store_switcher"><?php echo $this->__('Current Configuration Scope:') ?></label>
|
| 29 |
+
<?php echo $this->getHintHtml() ?>
|
| 30 |
Â
<select id="store_switcher" class="system-config-store-switcher" onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
|
| 31 |
+
<?php foreach ($this->getStoreSelectOptions() as $_value => $_option): ?>
|
| 32 |
Â
<?php if (isset($_option['is_group'])): ?>
|
| 33 |
Â
<?php if ($_option['is_close']): ?>
|
| 34 |
Â
</optgroup>
|
| 35 |
Â
<?php else: ?>
|
| 36 |
+
<optgroup label="<?php echo $this->escapeHtml($_option['label']) ?>" style="<?php echo $_option['style'] ?>">
|
| 37 |
Â
<?php endif; ?>
|
| 38 |
Â
<?php continue ?>
|
| 39 |
Â
<?php endif; ?>
|
| 40 |
+
<option value="<?php echo $this->escapeHtml($_value) ?>" url="<?php echo $_option['url'] ?>" <?php echo $_option['selected'] ? 'selected="selected"' : '' ?> style="<?php echo $_option['style'] ?>">
|
| 41 |
+
<?php echo $this->escapeHtml($_option['label']) ?>
|
| 42 |
Â
</option>
|
| 43 |
Â
<?php endforeach ?>
|
| 44 |
Â
</select>
|
app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/config/tabs.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/convert/profile/process.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -53,7 +53,7 @@ $_rates = ( $_newRates ) ? $_newRates : $_oldRates;
|
|
| 53 |
Â
<?php if( isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate]) ): ?>
|
| 54 |
Â
<br /><span class="old-rate"><?php echo $this->__('Old rate:') ?> <?php echo $_oldRates[$_currencyCode][$_rate] ?></span>
|
| 55 |
Â
<?php endif; ?>
|
| 56 |
-
</
|
| 57 |
Â
<?php else: ?>
|
| 58 |
Â
<td class="a-right">
|
| 59 |
Â
<input type="text" name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]" value="<?php echo ( $_currencyCode == $_rate ) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>" <?php echo ( $_currencyCode == $_rate ) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 53 |
Â
<?php if( isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate]) ): ?>
|
| 54 |
Â
<br /><span class="old-rate"><?php echo $this->__('Old rate:') ?> <?php echo $_oldRates[$_currencyCode][$_rate] ?></span>
|
| 55 |
Â
<?php endif; ?>
|
| 56 |
+
</td>
|
| 57 |
Â
<?php else: ?>
|
| 58 |
Â
<td class="a-right">
|
| 59 |
Â
<input type="text" name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]" value="<?php echo ( $_currencyCode == $_rate ) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>" <?php echo ( $_currencyCode == $_rate ) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
|
app/design/adminhtml/default/default/template/system/currency/rate/services.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/currency/rates.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/design/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/design/index.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/email/template/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/email/template/list.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/email/template/preview.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/info.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/system/shipping/ups.phtml
CHANGED
|
@@ -20,203 +20,176 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 27 |
Â
|
| 28 |
-
$
|
| 29 |
-
|
| 30 |
-
$defShipArr = Mage::getSingleton('usa/shipping_carrier_ups')->getCode('method');
|
| 31 |
-
|
| 32 |
Â
$sectionCode = $this->getRequest()->getParam('section');
|
| 33 |
Â
$websiteCode = $this->getRequest()->getParam('website');
|
| 34 |
Â
$storeCode = $this->getRequest()->getParam('store');
|
| 35 |
Â
|
| 36 |
-
|
| 37 |
-
|
| 38 |
Â
$web = Mage::getModel('Mage_Core_Model_Website')->load($websiteCode);
|
| 39 |
-
$
|
| 40 |
-
$
|
| 41 |
-
$
|
| 42 |
-
$
|
| 43 |
Â
} elseif ($storeCode) {
|
| 44 |
-
$
|
| 45 |
-
$
|
| 46 |
-
$
|
| 47 |
-
$
|
| 48 |
Â
} else {
|
| 49 |
-
$
|
| 50 |
-
$
|
| 51 |
-
$
|
| 52 |
-
$
|
| 53 |
Â
}
|
| 54 |
Â
?>
|
| 55 |
Â
<script type="text/javascript">
|
| 56 |
Â
//<![CDATA[
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
<?php
|
| 61 |
-
//get origin shipment data, using in UPS XML module
|
| 62 |
-
foreach ($orShipArr as $key=>$val){
|
| 63 |
-
print "originShipmentObj['$key'] = new Object();\n";
|
| 64 |
-
foreach ($val as $code=>$label){
|
| 65 |
-
print "\toriginShipmentObj['$key']['$code'] = '$label';\n";
|
| 66 |
-
}
|
| 67 |
-
}
|
| 68 |
-
?>
|
| 69 |
-
//get default shipment data, using in UPS module
|
| 70 |
-
<?php
|
| 71 |
-
print "originShipmentObj['default'] = new Object();\n";
|
| 72 |
-
foreach ($defShipArr as $code=>$label){
|
| 73 |
-
print "\toriginShipmentObj['default']['$code'] = '$label';\n";
|
| 74 |
-
}
|
| 75 |
-
?>
|
| 76 |
-
//get stored Allowed Methods
|
| 77 |
-
<?php
|
| 78 |
-
print "stroredAllowedMethods = new Array();\n";
|
| 79 |
-
foreach ($stroredAllowedMethods as $code){
|
| 80 |
-
print "\tstroredAllowedMethods.push('$code');\n";
|
| 81 |
-
}
|
| 82 |
-
?>
|
| 83 |
-
//set stored origin shipment
|
| 84 |
-
<?php
|
| 85 |
-
print "stroredOriginShipment='$stroredOriginShipment'";
|
| 86 |
-
?>
|
| 87 |
-
|
| 88 |
-
//set stored Free origin shipment
|
| 89 |
-
<?php
|
| 90 |
-
print "stroredFreeShipment='$stroredFreeShipment'";
|
| 91 |
-
?>
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
function hideRowArrayElements(arr,method)
|
| 95 |
Â
{
|
| 96 |
-
for(a=0;a<arr.length;a++){
|
| 97 |
Â
$(arr[a]).up(1).hide();
|
| 98 |
Â
}
|
| 99 |
Â
}
|
| 100 |
Â
|
| 101 |
-
function showRowArrayElements(arr
|
| 102 |
Â
{
|
| 103 |
-
for(a=0;a<arr.length;a++){
|
| 104 |
Â
$(arr[a]).up(1).show();
|
| 105 |
Â
}
|
| 106 |
Â
}
|
| 107 |
Â
|
| 108 |
-
function inArray(arr,value)
|
| 109 |
Â
{
|
| 110 |
-
var i;
|
| 111 |
-
|
| 112 |
-
|
| 113 |
-
|
| 114 |
-
}
|
| 115 |
Â
}
|
| 116 |
Â
return false;
|
| 117 |
Â
}
|
| 118 |
Â
|
| 119 |
Â
var upsXml = Class.create();
|
| 120 |
Â
upsXml.prototype = {
|
| 121 |
-
initialize
|
| 122 |
Â
{
|
| 123 |
-
|
| 124 |
Â
this.carriersUpsTypeId = 'carriers_ups_type';
|
| 125 |
-
if(
|
| 126 |
-
|
| 127 |
-
this.checkingUpsId = new Array('carriers_ups_gateway_url');
|
| 128 |
-
this.originShipmentTitle = '';
|
| 129 |
-
this.allowedMethodsId = 'carriers_ups_allowed_methods';
|
| 130 |
-
this.freeShipmentId = 'carriers_ups_free_method';
|
| 131 |
-
this.onlyUpsXmlElements = new Array('carriers_ups_gateway_xml_url','carriers_ups_tracking_xml_url','carriers_ups_username','carriers_ups_password','carriers_ups_access_license_number','carriers_ups_origin_shipment','carriers_ups_negotiated_active','carriers_ups_shipper_number','carriers_ups_mode_xml');
|
| 132 |
-
this.onlyUpsElements = new Array('carriers_ups_gateway_url');
|
| 133 |
-
this.setFormValues();
|
| 134 |
-
Event.observe($('carriers_ups_type'), 'change', this.setFormValues.bind(this));
|
| 135 |
Â
}
|
| 136 |
Â
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 137 |
Â
},
|
| 138 |
Â
updateAllowedMethods: function(originShipmentTitle)
|
| 139 |
Â
{
|
| 140 |
-
|
| 141 |
-
|
|
Â
|
|
| 142 |
Â
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
while (selectFieldAllowedMethod.length> 0) {
|
| 146 |
-
selectFieldAllowedMethod.remove(0);
|
| 147 |
-
}
|
| 148 |
-
while (selectFieldFreeShipment.length> 0) {
|
| 149 |
-
selectFieldFreeShipment.remove(0);
|
| 150 |
Â
}
|
| 151 |
Â
|
| 152 |
-
|
| 153 |
-
|
| 154 |
-
optionFree.value = '';
|
| 155 |
-
try {
|
| 156 |
-
selectFieldFreeShipment.add(optionFree, null);
|
| 157 |
-
} catch(ex) {
|
| 158 |
-
selectFieldFreeShipment.add(optionFree);
|
| 159 |
Â
}
|
| 160 |
Â
|
| 161 |
-
|
| 162 |
-
var option = document.createElement("OPTION");
|
| 163 |
-
option.text = originShipment[code];
|
| 164 |
-
option.value = code;
|
| 165 |
-
|
| 166 |
-
var optionFree = document.createElement("OPTION");
|
| 167 |
-
optionFree.text = originShipment[code];
|
| 168 |
-
optionFree.value = code;
|
| 169 |
Â
|
| 170 |
-
|
| 171 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 172 |
Â
}
|
| 173 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 174 |
Â
option.selected = true;
|
| 175 |
Â
}
|
| 176 |
-
|
| 177 |
-
|
| 178 |
-
|
| 179 |
-
|
| 180 |
-
|
| 181 |
-
selectFieldFreeShipment.add(optionFree);
|
| 182 |
Â
}
|
|
Â
|
|
|
Â
|
|
| 183 |
Â
}
|
| 184 |
Â
},
|
| 185 |
Â
setFormValues: function()
|
| 186 |
Â
{
|
| 187 |
-
|
| 188 |
-
|
|
Â
|
|
| 189 |
Â
$(this.checkingUpsXmlId[a]).removeClassName('required-entry');
|
| 190 |
Â
}
|
| 191 |
-
for(a=0;a<this.checkingUpsId.length;a++){
|
| 192 |
Â
$(this.checkingUpsXmlId[a]).addClassName('required-entry');
|
| 193 |
Â
}
|
| 194 |
Â
Event.stopObserving($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
|
| 195 |
Â
showRowArrayElements(this.onlyUpsElements);
|
| 196 |
Â
hideRowArrayElements(this.onlyUpsXmlElements);
|
| 197 |
-
this.changeOriginShipment(null,'default');
|
| 198 |
Â
} else {
|
| 199 |
-
for(a=0;a<this.checkingUpsXmlId.length;a++){
|
| 200 |
Â
$(this.checkingUpsXmlId[a]).addClassName('required-entry');
|
| 201 |
Â
}
|
| 202 |
-
for(a=0;a<this.checkingUpsId.length;a++){
|
| 203 |
Â
$(this.checkingUpsXmlId[a]).removeClassName('required-entry');
|
| 204 |
Â
}
|
| 205 |
Â
Event.observe($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
|
| 206 |
Â
showRowArrayElements(this.onlyUpsXmlElements);
|
| 207 |
Â
hideRowArrayElements(this.onlyUpsElements);
|
| 208 |
-
this.changeOriginShipment();
|
| 209 |
Â
}
|
| 210 |
Â
},
|
| 211 |
-
changeOriginShipment: function(Event,key)
|
| 212 |
Â
{
|
| 213 |
-
|
| 214 |
-
this.originShipmentTitle = key
|
| 215 |
-
else
|
| 216 |
-
this.originShipmentTitle = $F('carriers_ups_origin_shipment');
|
| 217 |
Â
this.updateAllowedMethods(this.originShipmentTitle);
|
| 218 |
Â
}
|
| 219 |
-
}
|
| 220 |
Â
xml = new upsXml();
|
| 221 |
-
//]]>
|
| 222 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 27 |
+
/** @var $upsModel Mage_Usa_Model_Shipping_Carrier_Ups */
|
| 28 |
+
$upsModel = Mage::getSingleton('usa/shipping_carrier_ups');
|
| 29 |
+
$orShipArr = $upsModel->getCode('originShipment');
|
| 30 |
+
$defShipArr = $upsModel->getCode('method');
|
| 31 |
Â
|
| 32 |
+
/** @var $this Mage_Adminhtml_Block_Template */
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 33 |
Â
$sectionCode = $this->getRequest()->getParam('section');
|
| 34 |
Â
$websiteCode = $this->getRequest()->getParam('website');
|
| 35 |
Â
$storeCode = $this->getRequest()->getParam('store');
|
| 36 |
Â
|
| 37 |
+
if (!$storeCode && $websiteCode) {
|
| 38 |
+
/** @var $web Mage_Core_Model_Website */
|
| 39 |
Â
$web = Mage::getModel('Mage_Core_Model_Website')->load($websiteCode);
|
| 40 |
+
$storedAllowedMethods = explode(',', $web->getConfig('carriers/ups/allowed_methods'));
|
| 41 |
+
$storedOriginShipment = $web->getConfig('carriers/ups/origin_shipment');
|
| 42 |
+
$storedFreeShipment = $web->getConfig('carriers/ups/free_method');
|
| 43 |
+
$storedUpsType = $web->getConfig('carriers/ups/type');
|
| 44 |
Â
} elseif ($storeCode) {
|
| 45 |
+
$storedAllowedMethods = explode(',', Mage::getStoreConfig('carriers/ups/allowed_methods', $storeCode));
|
| 46 |
+
$storedOriginShipment = Mage::getStoreConfig('carriers/ups/origin_shipment', $storeCode);
|
| 47 |
+
$storedFreeShipment = Mage::getStoreConfig('carriers/ups/free_method', $storeCode);
|
| 48 |
+
$storedUpsType = Mage::getStoreConfig('carriers/ups/type', $storeCode);
|
| 49 |
Â
} else {
|
| 50 |
+
$storedAllowedMethods = explode(',', Mage::getStoreConfig('carriers/ups/allowed_methods'));
|
| 51 |
+
$storedOriginShipment = Mage::getStoreConfig('carriers/ups/origin_shipment');
|
| 52 |
+
$storedFreeShipment = Mage::getStoreConfig('carriers/ups/free_method');
|
| 53 |
+
$storedUpsType = Mage::getStoreConfig('carriers/ups/type');
|
| 54 |
Â
}
|
| 55 |
Â
?>
|
| 56 |
Â
<script type="text/javascript">
|
| 57 |
Â
//<![CDATA[
|
| 58 |
+
function hideRowArrayElements(arr)
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 59 |
Â
{
|
| 60 |
+
for (var a = 0; a < arr.length; a++) {
|
| 61 |
Â
$(arr[a]).up(1).hide();
|
| 62 |
Â
}
|
| 63 |
Â
}
|
| 64 |
Â
|
| 65 |
+
function showRowArrayElements(arr)
|
| 66 |
Â
{
|
| 67 |
+
for (var a = 0; a < arr.length; a++) {
|
| 68 |
Â
$(arr[a]).up(1).show();
|
| 69 |
Â
}
|
| 70 |
Â
}
|
| 71 |
Â
|
| 72 |
+
function inArray(arr, value)
|
| 73 |
Â
{
|
| 74 |
+
for (var i = 0; i < arr.length; i++) {
|
| 75 |
+
if (arr[i] === value) {
|
| 76 |
+
return true;
|
| 77 |
+
}
|
|
Â
|
|
| 78 |
Â
}
|
| 79 |
Â
return false;
|
| 80 |
Â
}
|
| 81 |
Â
|
| 82 |
Â
var upsXml = Class.create();
|
| 83 |
Â
upsXml.prototype = {
|
| 84 |
+
initialize: function()
|
| 85 |
Â
{
|
|
Â
|
|
| 86 |
Â
this.carriersUpsTypeId = 'carriers_ups_type';
|
| 87 |
+
if (!$(this.carriersUpsTypeId)) {
|
| 88 |
+
return;
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 89 |
Â
}
|
| 90 |
Â
|
| 91 |
+
this.checkingUpsXmlId = ['carriers_ups_gateway_xml_url','carriers_ups_username',
|
| 92 |
+
'carriers_ups_password','carriers_ups_access_license_number'];
|
| 93 |
+
this.checkingUpsId = ['carriers_ups_gateway_url'];
|
| 94 |
+
this.originShipmentTitle = '';
|
| 95 |
+
this.allowedMethodsId = 'carriers_ups_allowed_methods';
|
| 96 |
+
this.freeShipmentId = 'carriers_ups_free_method';
|
| 97 |
+
this.onlyUpsXmlElements = ['carriers_ups_gateway_xml_url','carriers_ups_tracking_xml_url',
|
| 98 |
+
'carriers_ups_username','carriers_ups_password','carriers_ups_access_license_number',
|
| 99 |
+
'carriers_ups_origin_shipment','carriers_ups_negotiated_active','carriers_ups_shipper_number',
|
| 100 |
+
'carriers_ups_mode_xml'];
|
| 101 |
+
this.onlyUpsElements = ['carriers_ups_gateway_url'];
|
| 102 |
+
|
| 103 |
+
this.storedOriginShipment = '<?php echo $storedOriginShipment ?>';
|
| 104 |
+
this.storedFreeShipment = '<?php echo $storedFreeShipment ?>';
|
| 105 |
+
this.storedUpsType = '<?php echo $storedUpsType ?>';
|
| 106 |
+
<?php /** @var $_coreHelper Mage_Core_Helper_Data */ $_coreHelper = Mage::helper('core'); ?>
|
| 107 |
+
this.storedAllowedMethods = <?php echo $_coreHelper->jsonEncode($storedAllowedMethods) ?>;
|
| 108 |
+
this.originShipmentObj = <?php echo $_coreHelper->jsonEncode($orShipArr) ?>;
|
| 109 |
+
this.originShipmentObj['default'] = <?php echo $_coreHelper->jsonEncode($defShipArr) ?>;
|
| 110 |
+
|
| 111 |
+
this.setFormValues();
|
| 112 |
+
Event.observe($(this.carriersUpsTypeId), 'change', this.setFormValues.bind(this));
|
| 113 |
Â
},
|
| 114 |
Â
updateAllowedMethods: function(originShipmentTitle)
|
| 115 |
Â
{
|
| 116 |
+
var allowedMethods = $(this.allowedMethodsId), // multiselect
|
| 117 |
+
freeMethod = $(this.freeShipmentId), // single-choice select
|
| 118 |
+
originShipment = this.originShipmentObj[originShipmentTitle];
|
| 119 |
Â
|
| 120 |
+
while (allowedMethods.length > 0) {
|
| 121 |
+
allowedMethods.remove(0);
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 122 |
Â
}
|
| 123 |
Â
|
| 124 |
+
while (freeMethod.length > 0) {
|
| 125 |
+
freeMethod.remove(0);
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 126 |
Â
}
|
| 127 |
Â
|
| 128 |
+
freeMethod.insert(new Element('option', {value:''}).update('None'));
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 129 |
Â
|
| 130 |
+
var code, option;
|
| 131 |
+
for (code in originShipment) {
|
| 132 |
+
option = new Element('option', {value:code}).update(originShipment[code]);
|
| 133 |
+
if ((originShipmentTitle == this.storedOriginShipment || originShipmentTitle == 'default')
|
| 134 |
+
&& this.storedFreeShipment == code
|
| 135 |
+
) {
|
| 136 |
+
option.selected = true;
|
| 137 |
Â
}
|
| 138 |
+
freeMethod.insert(option);
|
| 139 |
+
|
| 140 |
+
option = new Element('option', {value:code}).update(originShipment[code]);
|
| 141 |
+
if (this.storedUpsType == 'UPS') {
|
| 142 |
+
if (originShipmentTitle != 'default' || inArray(this.storedAllowedMethods, code)) {
|
| 143 |
+
option.selected = true;
|
| 144 |
+
}
|
| 145 |
+
} else if (originShipmentTitle != this.storedOriginShipment
|
| 146 |
+
|| inArray(this.storedAllowedMethods, code)
|
| 147 |
+
) {
|
| 148 |
Â
option.selected = true;
|
| 149 |
Â
}
|
| 150 |
+
|
| 151 |
+
if ((originShipmentTitle == 'default' || originShipmentTitle == this.storedOriginShipment)
|
| 152 |
+
&& inArray(this.storedAllowedMethods, code)
|
| 153 |
+
) {
|
| 154 |
+
option.selected = true;
|
|
Â
|
|
| 155 |
Â
}
|
| 156 |
+
|
| 157 |
+
allowedMethods.insert(option);
|
| 158 |
Â
}
|
| 159 |
Â
},
|
| 160 |
Â
setFormValues: function()
|
| 161 |
Â
{
|
| 162 |
+
var a;
|
| 163 |
+
if ($F(this.carriersUpsTypeId) == 'UPS') {
|
| 164 |
+
for (a = 0; a < this.checkingUpsXmlId.length; a++) {
|
| 165 |
Â
$(this.checkingUpsXmlId[a]).removeClassName('required-entry');
|
| 166 |
Â
}
|
| 167 |
+
for (a = 0; a < this.checkingUpsId.length; a++) {
|
| 168 |
Â
$(this.checkingUpsXmlId[a]).addClassName('required-entry');
|
| 169 |
Â
}
|
| 170 |
Â
Event.stopObserving($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
|
| 171 |
Â
showRowArrayElements(this.onlyUpsElements);
|
| 172 |
Â
hideRowArrayElements(this.onlyUpsXmlElements);
|
| 173 |
+
this.changeOriginShipment(null, 'default');
|
| 174 |
Â
} else {
|
| 175 |
+
for (a = 0; a < this.checkingUpsXmlId.length; a++) {
|
| 176 |
Â
$(this.checkingUpsXmlId[a]).addClassName('required-entry');
|
| 177 |
Â
}
|
| 178 |
+
for (a = 0; a < this.checkingUpsId.length; a++) {
|
| 179 |
Â
$(this.checkingUpsXmlId[a]).removeClassName('required-entry');
|
| 180 |
Â
}
|
| 181 |
Â
Event.observe($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
|
| 182 |
Â
showRowArrayElements(this.onlyUpsXmlElements);
|
| 183 |
Â
hideRowArrayElements(this.onlyUpsElements);
|
| 184 |
+
this.changeOriginShipment(null, null);
|
| 185 |
Â
}
|
| 186 |
Â
},
|
| 187 |
+
changeOriginShipment: function(Event, key)
|
| 188 |
Â
{
|
| 189 |
+
this.originShipmentTitle = key ? key : $F('carriers_ups_origin_shipment');
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 190 |
Â
this.updateAllowedMethods(this.originShipmentTitle);
|
| 191 |
Â
}
|
| 192 |
+
};
|
| 193 |
Â
xml = new upsXml();
|
| 194 |
+
//]]>
|
| 195 |
Â
</script>
|
app/design/adminhtml/default/default/template/system/variable/js.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tag/edit/container.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tag/index.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/class/page/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/importExport.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/rate/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/rate/title.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-tax"><?php echo $header ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
-
<button class="scalable add" onclick="window.location.href='<?php echo $createUrl ?>'"><span><?php echo Mage::helper('tax')->__('Add New Class') ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-tax"><?php echo $header ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
+
<button class="scalable add" onclick="window.location.href='<?php echo $createUrl ?>'"><span><span><span><?php echo Mage::helper('tax')->__('Add New Class') ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,7 +29,7 @@
|
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-tax"><?php echo $header ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
-
<button class="scalable add" onclick="window.location.href='<?php echo $createUrl ?>'"><span><?php echo Mage::helper('tax')->__('Add New Tax Rule') ?></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
<tr>
|
| 30 |
Â
<td style="width:50%;"><h3 class="icon-head head-tax"><?php echo $header ?></h3></td>
|
| 31 |
Â
<td class="form-buttons">
|
| 32 |
+
<button class="scalable add" onclick="window.location.href='<?php echo $createUrl ?>'"><span><span><span><?php echo Mage::helper('tax')->__('Add New Tax Rule') ?></span></span></span></button>
|
| 33 |
Â
</td>
|
| 34 |
Â
</tr>
|
| 35 |
Â
</table>
|
app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/urlrewrite/categories.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/urlrewrite/edit.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/urlrewrite/selector.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
|
app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design
|
| 22 |
+
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* @var $this Mage_Usa_Block_Adminhtml_Dhl_Unitofmeasure
|
| 30 |
+
*/
|
| 31 |
+
?>
|
| 32 |
+
<script type="text/javascript">
|
| 33 |
+
//<![CDATA[
|
| 34 |
+
function changeDimensions()
|
| 35 |
+
{
|
| 36 |
+
var dimensionUnit = '(<?php echo $this->getInch(); ?>)';
|
| 37 |
+
var dhlintUnitOfMeasureNote = '<?php echo $this->getDivideOrderWeightNoteLbp(); ?>';
|
| 38 |
+
if ($("carriers_dhlint_unit_of_measure").value == "K") {
|
| 39 |
+
dimensionUnit = '(<?php echo $this->getCm(); ?>)';
|
| 40 |
+
dhlintUnitOfMeasureNote = '<?php echo $this->getDivideOrderWeightNoteKg(); ?>';
|
| 41 |
+
}
|
| 42 |
+
$$('[for="carriers_dhlint_height"]')[0].innerHTML = '<?php echo $this->getHeight(); ?> ' + dimensionUnit;
|
| 43 |
+
$$('[for="carriers_dhlint_depth"]')[0].innerHTML = '<?php echo $this->getDepth(); ?> ' + dimensionUnit;
|
| 44 |
+
$$('[for="carriers_dhlint_width"]')[0].innerHTML = '<?php echo $this->getWidth(); ?> ' + dimensionUnit;
|
| 45 |
+
|
| 46 |
+
$('carriers_dhlint_divide_order_weight').next().down().innerHTML = dhlintUnitOfMeasureNote;
|
| 47 |
+
}
|
| 48 |
+
document.observe("dom:loaded", function() {
|
| 49 |
+
$("carriers_dhlint_unit_of_measure").observe("change", changeDimensions);
|
| 50 |
+
changeDimensions();
|
| 51 |
+
});
|
| 52 |
+
//]]>
|
| 53 |
+
</script>
|
app/design/adminhtml/default/default/template/weee/renderer/tax.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -61,7 +61,7 @@
|
|
| 61 |
Â
</select>
|
| 62 |
Â
<br />
|
| 63 |
Â
<select disabled="no-template" class="<?php echo $_htmlClass ?> state" name="<?php echo $_htmlName ?>[__index__][state]" id="#{prefix}_weee_tax_row___index___state">
|
| 64 |
-
<option value="">*</option>
|
| 65 |
Â
</select>
|
| 66 |
Â
</td>
|
| 67 |
Â
<td>
|
|
@@ -69,7 +69,7 @@
|
|
| 69 |
Â
</td>
|
| 70 |
Â
<td class="last">
|
| 71 |
Â
<input type="hidden" name="<?php echo $_htmlName ?>[__index__][delete]" class="delete" disabled="no-template" value="" id="#{prefix}_weee_tax_row___index___delete" />
|
| 72 |
-
<button title="Delete WEEE Tax" class="scalable delete icon-btn delete-product-option" onclick="weeeTaxControl.deleteItem('<?php echo $_htmlId ?>', event);return false"><span>Delete</span></button>
|
| 73 |
Â
</td>
|
| 74 |
Â
</tr>
|
| 75 |
Â
</thead>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 61 |
Â
</select>
|
| 62 |
Â
<br />
|
| 63 |
Â
<select disabled="no-template" class="<?php echo $_htmlClass ?> state" name="<?php echo $_htmlName ?>[__index__][state]" id="#{prefix}_weee_tax_row___index___state">
|
| 64 |
+
<option value="0">*</option>
|
| 65 |
Â
</select>
|
| 66 |
Â
</td>
|
| 67 |
Â
<td>
|
| 69 |
Â
</td>
|
| 70 |
Â
<td class="last">
|
| 71 |
Â
<input type="hidden" name="<?php echo $_htmlName ?>[__index__][delete]" class="delete" disabled="no-template" value="" id="#{prefix}_weee_tax_row___index___delete" />
|
| 72 |
+
<button title="Delete WEEE Tax" class="scalable delete icon-btn delete-product-option" onclick="weeeTaxControl.deleteItem('<?php echo $_htmlId ?>', event);return false"><span><span><span>Delete</span></span></span></button>
|
| 73 |
Â
</td>
|
| 74 |
Â
</tr>
|
| 75 |
Â
</thead>
|
app/design/adminhtml/default/default/template/widget/accordion.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -29,11 +29,11 @@
|
|
| 29 |
Â
* Template for Mage_Adminhtml_Block_Widget_Accordion
|
| 30 |
Â
*/
|
| 31 |
Â
?>
|
| 32 |
-
<dl id="<?php echo $this->getHtmlId() ?>" class="accordion">
|
| 33 |
Â
<?php foreach ($this->getItems() as $_item): ?>
|
| 34 |
Â
<?php echo $this->getChildHtml($_item->getId()) ?>
|
| 35 |
Â
<?php endforeach ?>
|
| 36 |
Â
</dl>
|
| 37 |
Â
<script type="text/javascript">
|
| 38 |
-
<?php echo $this->getHtmlId() ?>AccordionJs = new varienAccordion('<?php echo $this->getHtmlId() ?>', '<?php echo $this->getShowOnlyOne() ?>');
|
| 39 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 29 |
Â
* Template for Mage_Adminhtml_Block_Widget_Accordion
|
| 30 |
Â
*/
|
| 31 |
Â
?>
|
| 32 |
+
<dl id="tab_content_<?php echo $this->getHtmlId() ?>" name="tab_content_<?php echo $this->getHtmlId() ?>" class="accordion">
|
| 33 |
Â
<?php foreach ($this->getItems() as $_item): ?>
|
| 34 |
Â
<?php echo $this->getChildHtml($_item->getId()) ?>
|
| 35 |
Â
<?php endforeach ?>
|
| 36 |
Â
</dl>
|
| 37 |
Â
<script type="text/javascript">
|
| 38 |
+
tab_content_<?php echo $this->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?php echo $this->getHtmlId() ?>', '<?php echo $this->getShowOnlyOne() ?>');
|
| 39 |
Â
</script>
|
app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form/container.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form/element.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/grid.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/grid/container.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/grid/massaction.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -42,7 +42,9 @@
|
|
| 42 |
Â
<td>
|
| 43 |
Â
<div class="right">
|
| 44 |
Â
<div class="entry-edit">
|
|
Â
|
|
| 45 |
Â
<form action="" id="<?php echo $this->getHtmlId() ?>-form" method="post">
|
|
Â
|
|
| 46 |
Â
<?php echo $this->getBlockHtml('formkey')?>
|
| 47 |
Â
<fieldset>
|
| 48 |
Â
<span class="field-row">
|
|
@@ -60,7 +62,9 @@
|
|
| 60 |
Â
<?php echo $this->getApplyButtonHtml() ?>
|
| 61 |
Â
</span>
|
| 62 |
Â
</fieldset>
|
|
Â
|
|
| 63 |
Â
</form>
|
|
Â
|
|
| 64 |
Â
</div>
|
| 65 |
Â
|
| 66 |
Â
<div class="no-display">
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 42 |
Â
<td>
|
| 43 |
Â
<div class="right">
|
| 44 |
Â
<div class="entry-edit">
|
| 45 |
+
<?php if ($this->getHideFormElement() !== true):?>
|
| 46 |
Â
<form action="" id="<?php echo $this->getHtmlId() ?>-form" method="post">
|
| 47 |
+
<?php endif ?>
|
| 48 |
Â
<?php echo $this->getBlockHtml('formkey')?>
|
| 49 |
Â
<fieldset>
|
| 50 |
Â
<span class="field-row">
|
| 62 |
Â
<?php echo $this->getApplyButtonHtml() ?>
|
| 63 |
Â
</span>
|
| 64 |
Â
</fieldset>
|
| 65 |
+
<?php if ($this->getHideFormElement() !== true):?>
|
| 66 |
Â
</form>
|
| 67 |
+
<?php endif ?>
|
| 68 |
Â
</div>
|
| 69 |
Â
|
| 70 |
Â
<div class="no-display">
|
app/design/adminhtml/default/default/template/widget/grid/serializer.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
|
@@ -41,7 +41,7 @@ var pageGroupTemplate = '<div class="options-box page_group_container" id="page_
|
|
| 41 |
Â
'<div class="option-title">'+
|
| 42 |
Â
'<?php echo $this->getRemoveLayoutButtonHtml() ?>'+
|
| 43 |
Â
'<label for="widget_instance[{{id}}][page_group]">Display On <span class="required">*</span></label>'+
|
| 44 |
-
'<?php echo $this->getDisplayOnSelectHtml() ?>'+
|
| 45 |
Â
'</div>'+
|
| 46 |
Â
<?php foreach ($this->getDisplayOnContainers() as $container): ?>
|
| 47 |
Â
'<div class="no-display <?php echo $container['code'] ?> group_container" id="<?php echo $container['name'] ?>_{{id}}">'+
|
|
@@ -55,9 +55,9 @@ var pageGroupTemplate = '<div class="options-box page_group_container" id="page_
|
|
| 55 |
Â
'<col />'+
|
| 56 |
Â
'<thead>'+
|
| 57 |
Â
'<tr>'+
|
| 58 |
-
'<th><label><?php echo Mage::helper('widget')->__('%s', $container['label']) ?></label></th>'+
|
| 59 |
-
'<th><label><?php echo Mage::helper('widget')->__('Block Reference') ?> <span class="required">*</span></label></th>'+
|
| 60 |
-
'<th><label><?php echo Mage::helper('widget')->__('Template') ?></label></th>'+
|
| 61 |
Â
'<th> </th>'+
|
| 62 |
Â
'</tr>'+
|
| 63 |
Â
'</thead>'+
|
|
@@ -65,9 +65,9 @@ var pageGroupTemplate = '<div class="options-box page_group_container" id="page_
|
|
| 65 |
Â
'<tr>'+
|
| 66 |
Â
'<td>'+
|
| 67 |
Â
'<input type="radio" class="radio for_all" id="all_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" /> '+
|
| 68 |
-
'<label for="all_<?php echo $container['name'] ?>_{{id}}"><?php echo Mage::helper('widget')->__('All') ?></label> '+
|
| 69 |
Â
'<input type="radio" class="radio for_specific" id="specific_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" /> '+
|
| 70 |
-
'<label for="specific_<?php echo $container['name'] ?>_{{id}}"><?php echo Mage::helper('widget')->__('Specific %s', $container['label']) ?></label>'+
|
| 71 |
Â
'</td>'+
|
| 72 |
Â
'<td>'+
|
| 73 |
Â
'<div class="block_reference_container">'+
|
|
@@ -85,7 +85,15 @@ var pageGroupTemplate = '<div class="options-box page_group_container" id="page_
|
|
| 85 |
Â
'<div class="no-display chooser_container" id="<?php echo $container['name'] ?>_ids_{{id}}">'+
|
| 86 |
Â
'<input type="hidden" class="is_anchor_only" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][is_anchor_only]" value="<?php echo $container['is_anchor_only'] ?>" />'+
|
| 87 |
Â
'<input type="hidden" class="product_type_id" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][product_type_id]" value="<?php echo $container['product_type_id'] ?>" />'+
|
| 88 |
-
'<p
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 89 |
Â
'<div class="chooser"></div>'+
|
| 90 |
Â
'</div>'+
|
| 91 |
Â
'</div>'+
|
|
@@ -101,8 +109,8 @@ var pageGroupTemplate = '<div class="options-box page_group_container" id="page_
|
|
| 101 |
Â
'<col />'+
|
| 102 |
Â
'<thead>'+
|
| 103 |
Â
'<tr>'+
|
| 104 |
-
'<th><label><?php echo Mage::helper('widget')->__('Block Reference') ?> <span class="required">*</span></label></th>'+
|
| 105 |
-
'<th><label><?php echo Mage::helper('widget')->__('Template') ?></label></th>'+
|
| 106 |
Â
'<th> </th>'+
|
| 107 |
Â
'</tr>'+
|
| 108 |
Â
'</thead>'+
|
|
@@ -134,9 +142,9 @@ var pageGroupTemplate = '<div class="options-box page_group_container" id="page_
|
|
| 134 |
Â
'<col />'+
|
| 135 |
Â
'<thead>'+
|
| 136 |
Â
'<tr>'+
|
| 137 |
-
'<th><label><?php echo Mage::helper('widget')->__('Page') ?> <span class="required">*</span></label></th>'+
|
| 138 |
-
'<th><label><?php echo Mage::helper('widget')->__('Block Reference') ?> <span class="required">*</span></label></th>'+
|
| 139 |
-
'<th><label><?php echo Mage::helper('widget')->__('Template') ?></label></th>'+
|
| 140 |
Â
'<th> </th>'+
|
| 141 |
Â
'</tr>'+
|
| 142 |
Â
'</thead>'+
|
|
@@ -167,6 +175,8 @@ var WidgetInstance = {
|
|
| 167 |
Â
templatePattern : /(^|.|\r|\n)({{(\w+)}})/,
|
| 168 |
Â
count : 0,
|
| 169 |
Â
activePageGroups : $H({}),
|
|
Â
|
|
|
Â
|
|
| 170 |
Â
addPageGroup : function(data) {
|
| 171 |
Â
if (this.pageGroupTemplate && (pageGroupContainer = $(this.pageGroupContainerId))) {
|
| 172 |
Â
if (!data.page_id) {
|
|
@@ -175,6 +185,14 @@ var WidgetInstance = {
|
|
| 175 |
Â
data.entities = '';
|
| 176 |
Â
}
|
| 177 |
Â
data.id = this.count++;
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 178 |
Â
pageGroupTemplateObj = new Template(this.pageGroupTemplate, this.templatePattern);
|
| 179 |
Â
Element.insert(pageGroupContainer, {'top':pageGroupTemplateObj.evaluate(data)});
|
| 180 |
Â
if (data.group) {
|
|
@@ -188,7 +206,7 @@ var WidgetInstance = {
|
|
| 188 |
Â
if (data.group == 'pages') {
|
| 189 |
Â
layoutSelect = pageGroup.down('select#layout_handle');
|
| 190 |
Â
if (layoutSelect) {
|
| 191 |
-
for (var i=0; i < layoutSelect.options.length; i++) {
|
| 192 |
Â
if (layoutSelect.options[i].value == data.layout_handle) {
|
| 193 |
Â
layoutSelect.options[i].selected = true;
|
| 194 |
Â
break;
|
|
@@ -198,7 +216,7 @@ var WidgetInstance = {
|
|
| 198 |
Â
}
|
| 199 |
Â
if ($(this.pageGroupContainerId+'_'+data.id)) {
|
| 200 |
Â
selectGroupElm = $(this.pageGroupContainerId+'_'+data.id).down('select.page_group_select');
|
| 201 |
-
for (var i=0; i < selectGroupElm.options.length; i++) {
|
| 202 |
Â
if (selectGroupElm.options[i].value == data.group) {
|
| 203 |
Â
selectGroupElm.options[i].selected = true;
|
| 204 |
Â
break;
|
|
@@ -226,6 +244,19 @@ var WidgetInstance = {
|
|
| 226 |
Â
container.remove();
|
| 227 |
Â
}
|
| 228 |
Â
},
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 229 |
Â
showBlockContainer : function(container) {
|
| 230 |
Â
container = $(container);
|
| 231 |
Â
if (container) {
|
|
@@ -326,16 +357,17 @@ var WidgetInstance = {
|
|
| 326 |
Â
}
|
| 327 |
Â
},
|
| 328 |
Â
checkProduct : function(event) {
|
| 329 |
-
|
| 330 |
-
|
| 331 |
-
|
| 332 |
-
|
| 333 |
-
|
| 334 |
-
|
| 335 |
-
}
|
| 336 |
-
|
|
Â
|
|
| 337 |
Â
if (entitiesElm) {
|
| 338 |
-
entitiesElm.value =
|
| 339 |
Â
}
|
| 340 |
Â
},
|
| 341 |
Â
checkCategory : function(event) {
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 41 |
Â
'<div class="option-title">'+
|
| 42 |
Â
'<?php echo $this->getRemoveLayoutButtonHtml() ?>'+
|
| 43 |
Â
'<label for="widget_instance[{{id}}][page_group]">Display On <span class="required">*</span></label>'+
|
| 44 |
+
'<?php echo $this->getDisplayOnSelectHtml(); ?>'+
|
| 45 |
Â
'</div>'+
|
| 46 |
Â
<?php foreach ($this->getDisplayOnContainers() as $container): ?>
|
| 47 |
Â
'<div class="no-display <?php echo $container['code'] ?> group_container" id="<?php echo $container['name'] ?>_{{id}}">'+
|
| 55 |
Â
'<col />'+
|
| 56 |
Â
'<thead>'+
|
| 57 |
Â
'<tr>'+
|
| 58 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('%s', $container['label'])) ?></label></th>'+
|
| 59 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Block Reference')) ?> <span class="required">*</span></label></th>'+
|
| 60 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Template')) ?></label></th>'+
|
| 61 |
Â
'<th> </th>'+
|
| 62 |
Â
'</tr>'+
|
| 63 |
Â
'</thead>'+
|
| 65 |
Â
'<tr>'+
|
| 66 |
Â
'<td>'+
|
| 67 |
Â
'<input type="radio" class="radio for_all" id="all_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" /> '+
|
| 68 |
+
'<label for="all_<?php echo $container['name'] ?>_{{id}}"><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('All')) ?></label> '+
|
| 69 |
Â
'<input type="radio" class="radio for_specific" id="specific_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" /> '+
|
| 70 |
+
'<label for="specific_<?php echo $container['name'] ?>_{{id}}"><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Specific %s', $container['label'])) ?></label>'+
|
| 71 |
Â
'</td>'+
|
| 72 |
Â
'<td>'+
|
| 73 |
Â
'<div class="block_reference_container">'+
|
| 85 |
Â
'<div class="no-display chooser_container" id="<?php echo $container['name'] ?>_ids_{{id}}">'+
|
| 86 |
Â
'<input type="hidden" class="is_anchor_only" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][is_anchor_only]" value="<?php echo $container['is_anchor_only'] ?>" />'+
|
| 87 |
Â
'<input type="hidden" class="product_type_id" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][product_type_id]" value="<?php echo $container['product_type_id'] ?>" />'+
|
| 88 |
+
'<p>' +
|
| 89 |
+
'<input type="text" class="input-text entities" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][entities]" value="{{<?php echo $container['name'] ?>_entities}}" readonly="readonly" /> ' +
|
| 90 |
+
'<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?php echo $container['code'] ?>\', \'<?php echo $container['name'] ?>_ids_{{id}}\')" title="<?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Open Chooser')) ?>">' +
|
| 91 |
+
'<img src="<?php echo Mage::getDesign()->getSkinUrl('images/rule_chooser_trigger.gif') ?>" class="v-middle" alt="<?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Open Chooser')); ?>" />' +
|
| 92 |
+
'</a> ' +
|
| 93 |
+
'<a href="javascript:void(0)" onclick="WidgetInstance.hideEntityChooser(\'<?php echo $container['name'] ?>_ids_{{id}}\')" title="<?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Apply')); ?>">' +
|
| 94 |
+
'<img src="<?php echo Mage::getDesign()->getSkinUrl('images/rule_component_apply.gif') ?>" class="v-middle" alt="<?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Apply')); ?>" />' +
|
| 95 |
+
'</a>' +
|
| 96 |
+
'</p>'+
|
| 97 |
Â
'<div class="chooser"></div>'+
|
| 98 |
Â
'</div>'+
|
| 99 |
Â
'</div>'+
|
| 109 |
Â
'<col />'+
|
| 110 |
Â
'<thead>'+
|
| 111 |
Â
'<tr>'+
|
| 112 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Block Reference')) ?> <span class="required">*</span></label></th>'+
|
| 113 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Template')) ?></label></th>'+
|
| 114 |
Â
'<th> </th>'+
|
| 115 |
Â
'</tr>'+
|
| 116 |
Â
'</thead>'+
|
| 142 |
Â
'<col />'+
|
| 143 |
Â
'<thead>'+
|
| 144 |
Â
'<tr>'+
|
| 145 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Page')) ?> <span class="required">*</span></label></th>'+
|
| 146 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Block Reference')) ?> <span class="required">*</span></label></th>'+
|
| 147 |
+
'<th><label><?php echo $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Template')) ?></label></th>'+
|
| 148 |
Â
'<th> </th>'+
|
| 149 |
Â
'</tr>'+
|
| 150 |
Â
'</thead>'+
|
| 175 |
Â
templatePattern : /(^|.|\r|\n)({{(\w+)}})/,
|
| 176 |
Â
count : 0,
|
| 177 |
Â
activePageGroups : $H({}),
|
| 178 |
+
selectedItems : {},
|
| 179 |
+
|
| 180 |
Â
addPageGroup : function(data) {
|
| 181 |
Â
if (this.pageGroupTemplate && (pageGroupContainer = $(this.pageGroupContainerId))) {
|
| 182 |
Â
if (!data.page_id) {
|
| 185 |
Â
data.entities = '';
|
| 186 |
Â
}
|
| 187 |
Â
data.id = this.count++;
|
| 188 |
+
if (data[data.group + '_entities']) {
|
| 189 |
+
var selected_entities = data[data.group + '_entities'].split(',');
|
| 190 |
+
if (selected_entities.length > 0) {
|
| 191 |
+
for (var i = 0; i < selected_entities.length; i++) {
|
| 192 |
+
this.addProductItemToSelection(data.group + '_ids_' + data.id, selected_entities[i]);
|
| 193 |
+
}
|
| 194 |
+
}
|
| 195 |
+
}
|
| 196 |
Â
pageGroupTemplateObj = new Template(this.pageGroupTemplate, this.templatePattern);
|
| 197 |
Â
Element.insert(pageGroupContainer, {'top':pageGroupTemplateObj.evaluate(data)});
|
| 198 |
Â
if (data.group) {
|
| 206 |
Â
if (data.group == 'pages') {
|
| 207 |
Â
layoutSelect = pageGroup.down('select#layout_handle');
|
| 208 |
Â
if (layoutSelect) {
|
| 209 |
+
for (var i = 0; i < layoutSelect.options.length; i++) {
|
| 210 |
Â
if (layoutSelect.options[i].value == data.layout_handle) {
|
| 211 |
Â
layoutSelect.options[i].selected = true;
|
| 212 |
Â
break;
|
| 216 |
Â
}
|
| 217 |
Â
if ($(this.pageGroupContainerId+'_'+data.id)) {
|
| 218 |
Â
selectGroupElm = $(this.pageGroupContainerId+'_'+data.id).down('select.page_group_select');
|
| 219 |
+
for (var i = 0; i < selectGroupElm.options.length; i++) {
|
| 220 |
Â
if (selectGroupElm.options[i].value == data.group) {
|
| 221 |
Â
selectGroupElm.options[i].selected = true;
|
| 222 |
Â
break;
|
| 244 |
Â
container.remove();
|
| 245 |
Â
}
|
| 246 |
Â
},
|
| 247 |
+
addProductItemToSelection: function(groupId, item) {
|
| 248 |
+
if (undefined == this.selectedItems[groupId]) {
|
| 249 |
+
this.selectedItems[groupId] = $H({});
|
| 250 |
+
}
|
| 251 |
+
if (!isNaN(parseInt(item))) {
|
| 252 |
+
this.selectedItems[groupId].set(item, 1);
|
| 253 |
+
}
|
| 254 |
+
},
|
| 255 |
+
removeProductItemFromSelection: function(groupId, item) {
|
| 256 |
+
if (undefined !== this.selectedItems[groupId]) {
|
| 257 |
+
this.selectedItems[groupId].unset(item);
|
| 258 |
+
}
|
| 259 |
+
},
|
| 260 |
Â
showBlockContainer : function(container) {
|
| 261 |
Â
container = $(container);
|
| 262 |
Â
if (container) {
|
| 357 |
Â
}
|
| 358 |
Â
},
|
| 359 |
Â
checkProduct : function(event) {
|
| 360 |
+
var elm = event.memo.element,
|
| 361 |
+
container = event.target.up('div.chooser').up('div.chooser_container'),
|
| 362 |
+
selectionId = container.id,
|
| 363 |
+
entitiesElm = container.down('input[type="text"].entities');
|
| 364 |
+
if (elm.checked) {
|
| 365 |
+
this.addProductItemToSelection(selectionId, elm.value);
|
| 366 |
+
} else {
|
| 367 |
+
this.removeProductItemFromSelection(selectionId, elm.value);
|
| 368 |
+
}
|
| 369 |
Â
if (entitiesElm) {
|
| 370 |
+
entitiesElm.value = this.selectedItems[selectionId].keys().join(',');
|
| 371 |
Â
}
|
| 372 |
Â
},
|
| 373 |
Â
checkCategory : function(event) {
|
app/design/adminhtml/default/default/template/widget/instance/js.phtml
CHANGED
|
@@ -20,29 +20,29 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<script type="text/javascript">
|
| 28 |
Â
//<![CDATA[
|
| 29 |
Â
function setSettings(urlTemplate, typeElement, packageThemeElement) {
|
| 30 |
-
|
| 31 |
-
var template = new Template(urlTemplate, templateSyntax);
|
| 32 |
-
typeElement = $F(typeElement).replace(/\//g, "-");
|
| 33 |
-
packageThemeElement = $F(packageThemeElement).split(/\//g);
|
| 34 |
-
if(typeof packageThemeElement[0] == 'undefined' || typeof packageThemeElement[1] == 'undefined') {
|
| 35 |
-
alert('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Undefined Design Package or Theme.')); ?>');
|
| 36 |
Â
return false;
|
| 37 |
Â
}
|
| 38 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 39 |
Â
'type': typeElement,
|
| 40 |
Â
'package': packageThemeElement[0],
|
| 41 |
Â
'theme': packageThemeElement[1]
|
| 42 |
Â
}));
|
| 43 |
Â
}
|
| 44 |
-
|
| 45 |
-
|
|
Â
|
|
| 46 |
Â
}
|
| 47 |
Â
//]]>
|
| 48 |
Â
</script>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 27 |
Â
<script type="text/javascript">
|
| 28 |
Â
//<![CDATA[
|
| 29 |
Â
function setSettings(urlTemplate, typeElement, packageThemeElement) {
|
| 30 |
+
if (!editForm.validate()) {
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 31 |
Â
return false;
|
| 32 |
Â
}
|
| 33 |
+
|
| 34 |
+
typeElement = $F(typeElement).replace(/\//g, '-');
|
| 35 |
+
packageThemeElement = $F(packageThemeElement).split(/\//g);
|
| 36 |
+
|
| 37 |
+
setLocation(new Template(urlTemplate, /(^|.|\r|\n)({{(\w+)}})/).evaluate({
|
| 38 |
Â
'type': typeElement,
|
| 39 |
Â
'package': packageThemeElement[0],
|
| 40 |
Â
'theme': packageThemeElement[1]
|
| 41 |
Â
}));
|
| 42 |
Â
}
|
| 43 |
+
|
| 44 |
+
function saveAndContinueEdit() {
|
| 45 |
+
editForm.submit($('edit_form').action + 'back/edit/');
|
| 46 |
Â
}
|
| 47 |
Â
//]]>
|
| 48 |
Â
</script>
|
app/design/adminhtml/default/default/template/widget/tabs.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/tabshoriz.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/tabsleft.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
app/design/adminhtml/default/default/template/widget/view/container.phtml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
-
* @copyright Copyright (c)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
| 20 |
Â
*
|
| 21 |
Â
* @category design
|
| 22 |
Â
* @package default_default
|
| 23 |
+
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
| 24 |
Â
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
Â
*/
|
| 26 |
Â
?>
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
Â
<?xml version="1.0"?>
|
| 2 |
Â
<package>
|
| 3 |
Â
<name>Interface_Adminhtml_Default</name>
|
| 4 |
-
<version>1.
|
| 5 |
Â
<stability>stable</stability>
|
| 6 |
Â
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
|
| 7 |
Â
<channel>community</channel>
|
| 8 |
Â
<extends/>
|
| 9 |
Â
<summary>Default interface for Adminhtml</summary>
|
| 10 |
Â
<description>Default interface for Adminhtml</description>
|
| 11 |
-
<notes>1.
|
| 12 |
Â
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
-
<date>2012-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="admin.xml" hash="44393050c34e9ad8b7bab1d66413e351"/><file name="adminnotification.xml" hash="ee78ff1d19d55877cb7b9827a6940a46"/><file name="authorizenet.xml" hash="3f360f98d8bff41b2fd2719dd8579d8f"/><file name="bundle.xml" hash="4b83ffa2299d7f9dd89420dddd5df6a1"/><file name="catalog.xml" hash="b39f26951cc765bd7abade64a72a0467"/><file name="cms.xml" hash="f2f334ac4f3534dd9132ba4e3545b217"/><file name="connect.xml" hash="1ea87ced1e80b37181a7217bb4bd2632"/><file name="customer.xml" hash="0a2c6be8b9e27cdd23970e2611fff010"/><file name="dataflow.xml" hash="bd8d1b9a588c9b1aaf69a55a51d030b4"/><file name="downloadable.xml" hash="b0a9d21104a142872af1979b3ad7cf8b"/><file name="giftmessage.xml" hash="cf2625b578167fc919890ed4ebc316b7"/><file name="importexport.xml" hash="90833e5f738675aec4d5e3912a243339"/><file name="index.xml" hash="3a1f79fcaf43a6cd38b48aac01b41cf5"/><file name="main.xml" hash="bc0e48d6bec35636aa5e54f75ef1e26c"/><file name="newsletter.xml" hash="eba82cbbbaf36f8139c27860701cba94"/><file name="pagecache.xml" hash="c825482e400ead41e31257577d83c82e"/><file name="promo.xml" hash="bdcc5ac857431f908c724a518b7f25da"/><file name="report.xml" hash="7ef988341935bb9bce80578c9605f1be"/><file name="rss.xml" hash="982700100011a75c27ffaac4449d989f"/><file name="sales.xml" hash="a2260719ac76011afe558fbcab40d363"/><file name="search.xml" hash="c11b6a1be8c756400dd827853dee6b4a"/><file name="tag.xml" hash="f51fd19ec6760da7ed3a924ecccbd930"/><file name="widget.xml" hash="41300e83b45056200ee2f189e4fd950a"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="735c9ec66d1309f1206294f075fdcdd1"/></dir></dir><dir name="template"><file name="access_denied.phtml" hash="f84932f9bcce08b48e23645c94020dc3"/><dir name="api"><file name="role_users_grid_js.phtml" hash="cf382e08080d38d04aa08a9dfa64b9ec"/><file name="roleinfo.phtml" hash="5cf4655eb686597cafcc57e4212bb7de"/><file name="roles.phtml" hash="580eae36eaee465ddaf20507ec87b16a"/><file name="rolesedit.phtml" hash="40192e90633e603806c444b58e82e473"/><file name="rolesusers.phtml" hash="9925e7839ad4754386e4a19a4eec48c9"/><file name="user_roles_grid_js.phtml" hash="57460585baf5a5b970649a63ccf1d182"/><file name="userinfo.phtml" hash="a9447181e813957d426aa1d8d491c8dc"/><file name="usernroles.phtml" hash="d5921bb6c4343fd29051442a0a69498f"/><file name="userroles.phtml" hash="cfe422707baf29ac225b07abb8a21bff"/><file name="users.phtml" hash="ea0b5773de76fe56a95cc3b82d9a149e"/></dir><dir name="authorizenet"><dir name="directpost"><file name="iframe.phtml" hash="1dfd172ad73fdf12032250f51055564c"/><file name="info.phtml" hash="2b61893031ee2e6426d42b2bde670da2"/></dir></dir><dir name="backup"><file name="left.phtml" hash="5b25b522887932a4496024ac812facbd"/><file name="list.phtml" hash="d9d73c79d0cb549fe258d0a1652f25d4"/></dir><dir name="bundle"><dir name="product"><dir name="composite"><dir name="fieldset"><dir name="options"><file name="bundle.phtml" hash="8c69e874129e66ed12abab5034aeaf5b"/><dir name="type"><file name="checkbox.phtml" hash="a12d5663a4e60ae2f63680f4ef78cd84"/><file name="multi.phtml" hash="47536a6aed3592a7ec5db3df6f5e6ace"/><file name="radio.phtml" hash="1257a59768c889b9703295d589593aab"/><file name="select.phtml" hash="5ed9bcb52ded0af26c54a4826cec3a85"/></dir></dir></dir></dir><dir name="edit"><dir name="bundle"><dir name="option"><file name="search.phtml" hash="f8a1fd551f266c5bd957b725dc3ef149"/><file name="selection.phtml" hash="8db64c00fc6f5db0b63925e998ae27ef"/></dir><file name="option.phtml" hash="5b6ca684099d527dc6c58153a53204f6"/></dir><file name="bundle.phtml" hash="15336f42e4df8ddd79cfabd4e29f86b0"/></dir></dir><dir name="sales"><dir name="creditmemo"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="e461cf4d769e011eb6a2dec1677dbfa0"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="590226d1735b63456b4869f58b3398f4"/></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="e0405df7154938f82d75e4ece3c13830"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="80b07e7f29790392a2a2987277ee8f16"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="items"><file name="renderer.phtml" hash="5cdbedb6d1b470c549d368a4555c93d3"/></dir></dir></dir><dir name="shipment"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="18fab3c476214db2fa33a30dcca8e637"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="38443b4198b88bbe91fffdf3d844be96"/></dir></dir></dir></dir></dir><dir name="catalog"><dir name="category"><dir name="checkboxes"><file name="tree.phtml" hash="ccc073f9a9149cfb07054ea25de06c8c"/></dir><dir name="edit"><file name="form.phtml" hash="c528a23f7b4f8ebdda288d58d73356bc"/></dir><file name="edit.phtml" hash="614c2a987ec237808659f2d139adc027"/><file name="tree.phtml" hash="d13ba25ce1271e07f4b36dc32d822351"/><dir name="widget"><file name="tree.phtml" hash="229025c0e461b79c5578893c9f6fcd5d"/></dir></dir><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="68d5938477ca48241cf963aa541c6ec8"/></dir></dir></dir><dir name="product"><dir name="attribute"><file name="js.phtml" hash="18e0a360967ee4fda7ca5329e995b794"/><dir name="new"><file name="created.phtml" hash="09f1423d45cbf7e1a855f3fd3f93b638"/></dir><file name="options.phtml" hash="71e1c0ebfdcffb0aa1666c76bd33272b"/><dir name="set"><dir name="main"><dir name="tree"><file name="attribute.phtml" hash="dd6f95e01ec7553ad5febba612efc022"/><file name="group.phtml" hash="4a2e8c13117ca01c8bc10596640d3c2d"/></dir></dir><file name="main.phtml" hash="7900c2e3769780332f90c4345785a2ad"/><dir name="toolbar"><file name="add.phtml" hash="a3426c834d542d10c0c12d6090d44984"/><file name="main.phtml" hash="de3713573b3c7b11ff30f28ea24a2368"/></dir></dir></dir><dir name="composite"><file name="configure.phtml" hash="4394c381d307acaef6239a2d9c4e9ebb"/><dir name="fieldset"><file name="configurable.phtml" hash="96712aaaf15ef0ad6d9b16df19a9d15c"/><file name="grouped.phtml" hash="6a4ac7e1391ac4b28c8c34001adaba50"/><dir name="options"><file name="js.phtml" hash="93e79dbaac822fc1ba208eb8fa708960"/><dir name="type"><file name="date.phtml" hash="ecae03bcd15f9341d13d104af29764b2"/><file name="default.phtml" hash="6ffdd3c543eff82fbaea3db2bdd7ac6e"/><file name="file.phtml" hash="bc7e78b6173a72270c7fd50d35dfb460"/><file name="select.phtml" hash="1d0ef51d63fd1c4071a30e6acc2359be"/><file name="text.phtml" hash="13b59a632f5402737c7384e12cc76b46"/></dir></dir><file name="options.phtml" hash="f5508099fea6784c4cda5bd9da282e9c"/><file name="qty.phtml" hash="c7c70cef1129a65a2b6bb55a758ee9c7"/></dir></dir><file name="created.phtml" hash="ad89b4ffa73fba7a6f2e0a67ec229f39"/><dir name="edit"><dir name="action"><file name="attribute.phtml" hash="d0cc2c4244b47943896e6b0fc768f5bb"/><file name="inventory.phtml" hash="66d0f79fc8d237ddc8d8ea3736cdcac9"/><file name="websites.phtml" hash="612c182600ab5ea537a426df5610fbd6"/></dir><file name="categories.phtml" hash="c522d7fb65dcbebe6e1125e3dc98ac94"/><dir name="options"><file name="option.phtml" hash="c2f07629795a5b624f468b255096ba6a"/><dir name="type"><file name="date.phtml" hash="6a549f3e609dc7ec785d10349e29ef6f"/><file name="file.phtml" hash="4ccd3ccec30eb3bfcf4c239d5474400e"/><file name="select.phtml" hash="7165f7c31682f78a779601de61570581"/><file name="text.phtml" hash="b5a9d3ca97bd25f3f1890f9495c94982"/></dir></dir><file name="options.phtml" hash="b39f61d9175a281c20eac188d8970e0f"/><dir name="price"><file name="tier.phtml" hash="f5c5e154144a77696a7db3e8f610a9bb"/></dir><file name="serializer.phtml" hash="1e58dedca6c141ff82d81c7fe792a472"/><dir name="super"><file name="config.phtml" hash="f9ce6ea67afabfa6e659dacc66651374"/></dir><file name="websites.phtml" hash="4f23ce0bfd9cbd6459bce1d08356af2a"/></dir><file name="edit.phtml" hash="1395d86c1a329ec9ca8e3391e89c3cb3"/><dir name="helper"><file name="gallery.phtml" hash="fcde1ebdb88ac4cee5ebc94ffafcb93b"/></dir><file name="js.phtml" hash="d79c35e82eb3b6c92a3206ef10e2819e"/><file name="price.phtml" hash="b9ad2733f9b9e9f1f366992568900f07"/><dir name="tab"><file name="alert.phtml" hash="1b52a7bfc26f7d93eaaf806322fe1b4a"/><file name="inventory.phtml" hash="9072a245f3ad6ca722bf34cceb8b1a8e"/></dir><dir name="widget"><dir name="chooser"><file name="container.phtml" hash="30b62d06274380a56f1bed0f52d3d764"/></dir></dir></dir><file name="product.phtml" hash="db8d042acd4e41c3b446bd69c688ca83"/><dir name="wysiwyg"><file name="js.phtml" hash="69596b033cb3f906d95923c223b8e6a3"/></dir></dir><dir name="cms"><dir name="browser"><dir name="content"><file name="files.phtml" hash="7167f0c75a3b64e9bcd572cc2ff5e7fe"/><file name="newfolder.phtml" hash="bfa6760e1cbb38cf7b9a74ab0ec76bff"/><file name="uploader.phtml" hash="1b50850b7444c11a8e6bd45cb87086f0"/></dir><file name="content.phtml" hash="1ca3b215da8c5512eb24599e375c495e"/><file name="js.phtml" hash="5d42cc3ec6ec34f4df663fc1144b19e1"/><file name="tree.phtml" hash="72a155f7c7732b98c92f51bedb046e56"/></dir><dir name="page"><dir name="edit"><dir name="form"><dir name="renderer"><file name="content.phtml" hash="f3a203b47deb0b7cccf02df89c8f8b19"/></dir></dir></dir></dir></dir><file name="coming.phtml" hash="a41515d8b09f96b82e577debf474e60a"/><dir name="connect"><dir name="extension"><dir name="custom"><file name="authors.phtml" hash="60a5c4e2148cd5461e18991b8a95ab98"/><file name="contents.phtml" hash="8e0540bff057d88332b7de58a5004430"/><file name="depends.phtml" hash="601f3d216b38c05cc352f52c6b81d547"/><file name="load.phtml" hash="188bdfd12f26419fe368ede482668893"/><file name="package.phtml" hash="94ef94a28022c213188bd55515096267"/><file name="release.phtml" hash="ef73019c61a8e1ddb930076eca7e9b4c"/></dir></dir></dir><dir name="customer"><dir name="edit"><file name="js.phtml" hash="73a8a53f50c8662b300db5565b44f9c5"/><dir name="tab"><dir name="view"><dir name="grid"><file name="item.phtml" hash="e24c76add63b62955aba14f3f42dfe1a"/></dir></dir></dir></dir><file name="online.phtml" hash="517c2e94caea59bc20c0affd884619a9"/><dir name="tab"><file name="addresses.phtml" hash="931d32553257d5b506b80d685e22ca97"/><file name="cart.phtml" hash="12efd24d2b4e9f052453e7229c85cedc"/><file name="newsletter.phtml" hash="880441c95ff77dc6250d3f95dec782c4"/><dir name="view"><file name="sales.phtml" hash="de13c5e5e66f04967225f41566fef998"/></dir><file name="view.phtml" hash="4e2f72e8543dfca1b4bb08105e587428"/><file name="wishlist.phtml" hash="3ac024173b61b132c0d0be29b1efbe1f"/></dir></dir><dir name="dashboard"><dir name="graph"><file name="disabled.phtml" hash="cf079ab445ff89ddf8982e7d26457a62"/></dir><file name="graph.phtml" hash="a3165c01f9fde6d88493f74f38bbdd66"/><file name="grid.phtml" hash="fe2825827a2e56c5d98cc46c5e090723"/><file name="index.phtml" hash="500bced1a72364c4cc04aa78443bb946"/><file name="salebar.phtml" hash="09914d4e5edcafe16f7e9a4d90b73a6f"/><file name="searches.phtml" hash="6adfc69fd24cfb616e0d358bf527888c"/><dir name="store"><file name="switcher.phtml" hash="21f30f8c73eecc7e123c8c67f23c59d6"/></dir><file name="totalbar.phtml" hash="f7503e85a5f9b2a04fc4ed38bb84d170"/></dir><dir name="directory"><dir name="js"><file name="optional_zip_countries.phtml" hash="633ce587f8f0fffa821a7a0067edf158"/></dir></dir><dir name="downloadable"><dir name="product"><dir name="composite"><dir name="fieldset"><file name="downloadable.phtml" hash="0a84aa199dffe73013e420d732e577e9"/></dir></dir><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="4d0677b71d77f2b17d1d45d145103dc1"/><file name="samples.phtml" hash="03f428c80efd340d498a69af72677411"/></dir><file name="downloadable.phtml" hash="427163f5bf5eaad4e009fc3f1c4d90a7"/></dir></dir><dir name="sales"><dir name="items"><dir name="column"><dir name="downloadable"><dir name="creditmemo"><file name="name.phtml" hash="323d7774d16ce00b13aa9f55ba907a7a"/></dir><dir name="invoice"><file name="name.phtml" hash="7b3788c59862eda4cda241fb15e1dad0"/></dir><file name="name.phtml" hash="a72cdf111f03a4454d15aa778fcb877b"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b58f6b394a0489c8979f7f32eb48304b"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8938d4e8eee68316fed6b2b2cc519386"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="59387875677a254f27078e6bceb0995a"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="cc1ad4b9f1f7a85f55fbf51a7a636d61"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="eb8f0b158378b1d45be03342dd813fe8"/></dir></dir></dir></dir></dir></dir><dir name="eav"><dir name="attribute"><dir name="edit"><file name="js.phtml" hash="dd6f95e01ec7553ad5febba612efc022"/></dir></dir></dir><dir name="email"><dir name="order"><file name="items.phtml" hash="6f09628ad32a466051c21ddea8fcf92c"/></dir></dir><file name="example.phtml" hash="e352d84f75b869d60a8ac82f558a0f22"/><file name="forgotpassword.phtml" hash="4cdc674c25baf1cee5755a6c076891c7"/><file name="formkey.phtml" hash="c3d0c73aff5dfa4742fba106e4c6143d"/><dir name="giftmessage"><file name="form.phtml" hash="9840908a5c826c7f0ef3e2f9806da221"/><file name="giftoptionsform.phtml" hash="a4c28c7894f99dec6d74124b800edb8c"/><file name="helper.phtml" hash="848bddf30c028b6fd3587bac2046eeec"/><file name="popup.phtml" hash="14049f6774c82c8443b72785998e896e"/><dir name="sales"><dir name="order"><dir name="create"><file name="giftoptions.phtml" hash="5507d829289c78d15e628f63489f7cd2"/><file name="items.phtml" hash="9429f73df55e733006ae5fffceb4d830"/></dir><dir name="view"><file name="giftoptions.phtml" hash="792cfe8d0a0f41f8e5ccc08c84e0981d"/><file name="items.phtml" hash="b65c37606ea1ee2f09c37c94afc85588"/></dir></dir></dir></dir><dir name="googlebase"><file name="captcha.phtml" hash="915d302e134056fd9ec3d814eba37d18"/><file name="items.phtml" hash="39f55e6bf90ee32f6fd9c33f9d217ca5"/><dir name="types"><dir name="edit"><file name="attributes.phtml" hash="099470741568583322fb75d22c40125a"/></dir></dir></dir><dir name="importexport"><file name="busy.phtml" hash="b7484dec96196a0a3e4140ae28356e02"/><dir name="export"><dir name="form"><file name="after.phtml" hash="7961e751003a41d00e6d35f5aecb5868"/><file name="before.phtml" hash="4bf822cc399d681c6c33cb88ede2fd7e"/></dir></dir><dir name="import"><dir name="form"><file name="after.phtml" hash="5acfcc3dacec743e0ef258cc6afad81b"/><file name="before.phtml" hash="8eac7c5e1637149bcbf6f5f6e1c4665b"/></dir><dir name="frame"><file name="result.phtml" hash="fe68a86c1d687c7f25ac4df3df401019"/></dir></dir></dir><dir name="index"><file name="notifications.phtml" hash="bbdc237e21b2eaa9f2e7e7cfffb35f0c"/></dir><file name="login.phtml" hash="c66c2670e610257a977ff8bf79b4c8c9"/><dir name="media"><file name="editor.phtml" hash="0a57ad5a1973e45c97116a21e2afde94"/><file name="uploader.phtml" hash="c32021c8dfc3270235c41eec2774a708"/></dir><dir name="newsletter"><dir name="preview"><file name="iframeswitcher.phtml" hash="bc3dc2d4001138352ed57c10406dd92a"/><file name="store.phtml" hash="cd801f685a24762281e58a41ab1fff46"/></dir><dir name="problem"><file name="list.phtml" hash="f191174e8f0ea2560ef37fc4c69a9e29"/></dir><dir name="queue"><file name="edit.phtml" hash="e027bb47e0e220ea97a1dfef511ee5fd"/><file name="list.phtml" hash="ba66ac141e1da5e7fdb1b001006efa00"/><file name="preview.phtml" hash="557bbe93210ba8bb719451c4837d2056"/></dir><dir name="subscriber"><file name="list.phtml" hash="b3709d8bd2c12bc930130d9595db2e97"/></dir><dir name="template"><file name="edit.phtml" hash="bec3577868ed1a38df728e8bcb7fe508"/><file name="list.phtml" hash="f5cd0619e8b49750d211aad103294689"/><file name="preview.phtml" hash="557bbe93210ba8bb719451c4837d2056"/></dir></dir><dir name="notification"><file name="baseurl.phtml" hash="75f09d6cb54819bd97c9aae2a89f0c9d"/><file name="security.phtml" hash="a3cc231af1f93330dfd02814bfab28f2"/><file name="survey.phtml" hash="490ace639149bca0079c34ec02aa5f5c"/><file name="toolbar.phtml" hash="f0b508fa13d96821db7ffa2d76ec80ac"/><file name="window.phtml" hash="6d88ca09b808c5530f79c9aedecdf3b3"/></dir><file name="overlay_popup.phtml" hash="da123b3e45e7dfd1605af0352765bea6"/><dir name="page"><file name="footer.phtml" hash="57b002b1a1010040bf7d8a94a749233f"/><file name="head.phtml" hash="80a75aab52155524d31826628cec8a35"/><file name="header.phtml" hash="9bfad0b661eb4c80eb28357660784186"/><dir name="js"><file name="calendar.phtml" hash="66e15fb9e75422cb743cce74fb392495"/><file name="translate.phtml" hash="dc48119d8ced01e90fdc649336550cbc"/></dir><file name="menu.phtml" hash="900256aa15f520f228bec9073e0fc7f9"/><file name="notices.phtml" hash="377f6e42d5aaa1e9fb8c6124150b1830"/></dir><file name="page.phtml" hash="acfc88fa5f2264f931c1c7c1c1ec636f"/><dir name="pagecache"><dir name="cache"><file name="additional.phtml" hash="df4094ea01318c03d897af6b8c0059f9"/></dir></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="a783b5df33c0c49f8d01eac496cf8112"/></dir><dir name="info"><file name="cc.phtml" hash="be479943265a31a40f3d6377511eb435"/><file name="pdf.phtml" hash="aa92b1a889a8964b4827a503faf34efb"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="12a9d00aa65027d2530a40dbf1dc4baa"/><file name="ccsave.phtml" hash="1880bddf0e991f0b6809036c71a21f0b"/><file name="checkmo.phtml" hash="b7519fe8c802d6c4da06f0edaf1085c1"/><file name="purchaseorder.phtml" hash="969c68d73446c9a9ed40f5059b688745"/></dir><dir name="info"><file name="checkmo.phtml" hash="89ff5f164123bad98d94beafd8138532"/><file name="default.phtml" hash="b1fbe9b758bb7221e78a587bf25d1588"/><dir name="pdf"><file name="checkmo.phtml" hash="b5e47713e2f818bd15ef36164b7aad19"/><file name="default.phtml" hash="95af5e8df75c80badf71de8b7cf7f72b"/><file name="purchaseorder.phtml" hash="648f08268d7cbdaa1ce63b2b1a343a7b"/></dir><file name="purchaseorder.phtml" hash="09206729a163ceb6c6b3502d455807ab"/></dir></dir><dir name="paypal"><dir name="system"><dir name="config"><file name="api_wizard.phtml" hash="1e42a8334a5f0209e1547774af2d7198"/><dir name="fieldset"><file name="global.phtml" hash="1226178958b355551b3516e2055e6b71"/><file name="hint.phtml" hash="cebd5368e01c6f1c51b5a4de70e01d5e"/><file name="store.phtml" hash="6cdd38ecbfd46cde48e1c8fd1617062f"/></dir><dir name="payflowlink"><file name="advanced.phtml" hash="dbf8e355fc726216ed9c8bcdbbe72eee"/><file name="info.phtml" hash="ec19c502de775a99c404a5507278a23d"/></dir></dir></dir></dir><dir name="permissions"><file name="role_users_grid_js.phtml" hash="c8a117889d579429aee7252a4e742fef"/><file name="roleinfo.phtml" hash="adcd9a8543f1dff4ccdd4aad32305e31"/><file name="roles.phtml" hash="580eae36eaee465ddaf20507ec87b16a"/><file name="rolesedit.phtml" hash="baecc14884deda5180273c45d6b538c8"/><file name="rolesusers.phtml" hash="9925e7839ad4754386e4a19a4eec48c9"/><file name="user_roles_grid_js.phtml" hash="9267240bc35a6f42f6ade61b5575b137"/><file name="userinfo.phtml" hash="a9447181e813957d426aa1d8d491c8dc"/><file name="usernroles.phtml" hash="d5921bb6c4343fd29051442a0a69498f"/><file name="userroles.phtml" hash="cfe422707baf29ac225b07abb8a21bff"/><file name="users.phtml" hash="ea0b5773de76fe56a95cc3b82d9a149e"/></dir><dir name="poll"><dir name="answers"><file name="list.phtml" hash="75535156fd23082928697654993a8be2"/></dir></dir><file name="popup.phtml" hash="2036a235e6a42c9417721c42229bfd08"/><dir name="promo"><file name="fieldset.phtml" hash="fceba8c0b055d0ec3b120fbf16e3e7cc"/><file name="form.phtml" hash="48f289001b8f4665ac9fe12603945bb4"/><file name="js.phtml" hash="bd6c8035e94d86ef4b59bc97566f392c"/></dir><dir name="rating"><file name="detailed.phtml" hash="53fc83c79e68843d1b2c232f577ccc7e"/><file name="options.phtml" hash="bc5892eaa95463d7e0af17c833ce7064"/><dir name="stars"><file name="detailed.phtml" hash="cf301e0430532c5936d18a97dbba862e"/><file name="summary.phtml" hash="6b6249a2bc31a6c26b8330f2c12763bb"/></dir></dir><dir name="report"><dir name="grid"><file name="container.phtml" hash="8b4c4e009372d9a4eca2cab949d3689c"/></dir><file name="grid.phtml" hash="3cccf95def1a3fc611bdf2456269770a"/><dir name="refresh"><file name="statistics.phtml" hash="18c7db8c25ae3e0ebcdb48384b2069f1"/></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="6d4d53bad242f1e4731a4deef2dea957"/></dir><file name="switcher.phtml" hash="3fb9f5f70ebfefb12b8374b093765e01"/></dir><file name="wishlist.phtml" hash="9bda71b6a4f1fc05ecefd573c77979f2"/></dir><file name="resetforgottenpassword.phtml" hash="dc3b694d6c35906910359817eef22a97"/><dir name="review"><file name="add.phtml" hash="61e1e939f95ba629c6e0a595760438f7"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="form.phtml" hash="2f1980b952370e2faf7509acf00f520e"/><dir name="view"><file name="form.phtml" hash="694f082cb8ee5c6c3c6367ccdea60b25"/><dir name="tab"><file name="info.phtml" hash="1b31e1951b7840964a2ff7f62e2602ff"/></dir></dir></dir></dir><dir name="items"><dir name="column"><file name="name.phtml" hash="733538b760f1414105659e7842dc8a87"/><file name="qty.phtml" hash="e7bc271b11e82ab67cb1b245f71ec126"/></dir><dir name="renderer"><file name="default.phtml" hash="4822aee818adafcffe576f33c0dfe5cb"/></dir></dir><dir name="order"><dir name="address"><file name="form.phtml" hash="01d1352cb65c26d5d103eb07ebd2e770"/></dir><dir name="comments"><file name="view.phtml" hash="01330ec7b1a1335794885543ed0985d4"/></dir><dir name="create"><file name="abstract.phtml" hash="74707ef1b04e403dba9609912ae6c714"/><dir name="billing"><dir name="method"><file name="form.phtml" hash="e4b9fc0c00bb3fe94cff292f42c61ae2"/></dir></dir><file name="comment.phtml" hash="44ee507232b26df7784edda1831dcdf1"/><dir name="coupons"><file name="form.phtml" hash="71cde519542ffbe800f2e66236539f5d"/></dir><file name="data.phtml" hash="0e92c3744fac3335fb112dd2cd4c8d0e"/><dir name="form"><file name="account.phtml" hash="d85c18d7a895b9810f60e611e6ee0c17"/><file name="address.phtml" hash="76ddccb168f16579133532f55db3a331"/></dir><file name="form.phtml" hash="27eb920acc041db7f53e3143ed9983dd"/><file name="giftmessage.phtml" hash="0dafb24c19bb44ac44327d5a4f0a4a17"/><dir name="items"><file name="grid.phtml" hash="ad442e282b8a6ef07fb6f02f0a3db16f"/></dir><file name="items.phtml" hash="ac2d276a2281923eca8f29bfb65a459e"/><file name="js.phtml" hash="1b5a660ba82df692d0a1a33593d2be02"/><dir name="newsletter"><file name="form.phtml" hash="4c887a66644a9080d7449bfc9844dbb6"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="312fc0557bb63773060cdbc023d57d5a"/></dir></dir><dir name="sidebar"><file name="items.phtml" hash="3734b52a54242d28004b1422abf44460"/></dir><file name="sidebar.phtml" hash="495bdf00adb0c7bcc951aed0975577cc"/><dir name="store"><file name="select.phtml" hash="c4a85e0d8cbee5211d3476f8a044fb2e"/></dir><dir name="totals"><file name="default.phtml" hash="c4bc9b5beb642020f1438e55f9448f77"/><file name="grandtotal.phtml" hash="803918087eb1156945a21c964a08575e"/><file name="shipping.phtml" hash="2f020dda0d79ca089415d2ad9475c827"/><file name="subtotal.phtml" hash="9918b4612f47e035b467ab07a631e06b"/><file name="tax.phtml" hash="b710fd9ee5847714f6f15291cb61faf5"/></dir><file name="totals.phtml" hash="a889ab04c606f3493877c8866d5f0209"/></dir><dir name="creditmemo"><dir name="create"><file name="form.phtml" hash="ef199283396f09cb778cf5cc0f1660eb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="f97bfbca4fe3b04030e7c5dda1a5fbc4"/><file name="default.phtml" hash="004fe6084ceb9fbf049a44943294f039"/></dir></dir><file name="items.phtml" hash="7b66ec1ae61ec4a28533c2e3d0397fb9"/><dir name="totals"><file name="adjustments.phtml" hash="de1664e63a5a915be781c90c12144943"/></dir></dir><dir name="view"><file name="form.phtml" hash="c9172f2942eaffd843d49567f6584757"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="36f0891057b450981f7efa82b333968d"/><file name="default.phtml" hash="e5398bff677877b7b063dd2c61792d1b"/></dir></dir><file name="items.phtml" hash="f93aa068266a29260f56d8d7cf3c1a42"/></dir></dir><file name="giftoptions.phtml" hash="3b72be9025fe261017c0ea740a1b8ffb"/><dir name="invoice"><dir name="create"><file name="form.phtml" hash="f9db53e9cd35c6279e560254628bc9ec"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="c02ada42e8dae2923e2101ba21c045cf"/><file name="default.phtml" hash="5c2da533258494a8e8690ebee17f2708"/></dir></dir><file name="items.phtml" hash="b50001dc069530441dae95daf84d3a70"/><file name="tracking.phtml" hash="03f9edc3959eabf444d450ecc0162f47"/></dir><dir name="view"><file name="form.phtml" hash="3016a5651845b7fef4501124bc95e243"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="d3753500e683107343fd03c7ecb2038a"/><file name="default.phtml" hash="f62a0333aff983701c7ccb2c58c991c0"/></dir></dir><file name="items.phtml" hash="c0edb909b2048881a38d67d16eaad0c7"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="88814d4fcb8d3c01267dc10b7a6822ae"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="5cc001fdd9e2333115262323bfd19faf"/><file name="default.phtml" hash="b460f07e7e95cd64fe066a83ae81294c"/></dir></dir><file name="items.phtml" hash="fcbeb963f11d1534476ae165bbe41932"/><file name="tracking.phtml" hash="ff74c443c34d94aba7dcddcdb18cc46a"/></dir><dir name="packaging"><file name="grid.phtml" hash="370a10720b3ea132da19d71e4e2cd52c"/><file name="packed.phtml" hash="21664e9e9a4ef1fd0a6c94a3d689acd5"/><file name="popup.phtml" hash="f2827a4d2fa6e7c7db2434917a4cc260"/></dir><dir name="tracking"><file name="info.phtml" hash="1c532815b072488770a065822fda9422"/></dir><dir name="view"><file name="form.phtml" hash="5bd5dfe1a14d70543a1aac13c505b01a"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="0520b5738355658514187bf43f568d3f"/><file name="default.phtml" hash="e1105eb7f20c8ea04254c15b1b57538f"/></dir></dir><file name="items.phtml" hash="ccebcdf69b20c1bb312a752a8038b3fb"/><file name="tracking.phtml" hash="c522b6fdc72a558158802863c35dbb96"/></dir></dir><file name="totalbar.phtml" hash="a80bdf73fd4273f8ac0d51a27a22d143"/><dir name="totals"><file name="discount.phtml" hash="3b93a2f49448c0a541d3efc1f2e8617c"/><file name="due.phtml" hash="ca7bee40adf98113c433833922b6d6dd"/><file name="footer.phtml" hash="e1d0718b4351a0d20dfa5a6af4b1337b"/><file name="grand.phtml" hash="2b2c3d60f90758432b0f984aae035ea6"/><file name="item.phtml" hash="8923cbad49ccb0f5287be33f4d4eb16d"/><file name="main.phtml" hash="f688b8237218e5c35fb39d1a2d6f37f2"/><file name="paid.phtml" hash="5507d2a64a759f84ca399b92fad73af9"/><file name="refunded.phtml" hash="749beb69cd46b3d88dd1edcd6b40110c"/><file name="shipping.phtml" hash="0b049234e306c81d728bfc2edacf07ef"/><file name="subtotal.phtml" hash="3c3342d4032a7d32d295bc3cedb67d5a"/><file name="tax.phtml" hash="b5e5fb73262388965089b49e4b5e7475"/></dir><file name="totals.phtml" hash="b0f86f616208b11e1389dc7412832f54"/><dir name="view"><file name="form.phtml" hash="9323755bf939cfcc3edc322cec320438"/><file name="giftmessage.phtml" hash="0ca845c02eaa723b58de23c7b986b9f4"/><file name="history.phtml" hash="b5779e5d287d66b5bc5285986f96322d"/><file name="info.phtml" hash="101b84a3c5ac6a18bfa9b52f2cc5cfc6"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="cc3fedd0489a3f9d8b4c8a6e1b97f29e"/></dir></dir><file name="items.phtml" hash="d23adc55978d43fee672a146a4f956e6"/><dir name="tab"><file name="history.phtml" hash="c9f102bb42c95cc784795d0d9308d48a"/><file name="info.phtml" hash="c1f200a46d5b167a7717ed8f5416697a"/></dir><file name="tracking.phtml" hash="a034b329bf7a3c5a0db7967ce4bbc269"/></dir></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="127bcdf02155babd9eb75adf6817352e"/></dir></dir></dir><dir name="recurring"><dir name="profile"><dir name="view"><file name="info.phtml" hash="b83c4929f04f7b25e875073a6ade87e1"/></dir><file name="view.phtml" hash="5c8f883a1ac899b3962aff63dfaa88f2"/></dir></dir><dir name="transactions"><file name="detail.phtml" hash="790b50ef6cbbbc6e29d5bf2b55850157"/></dir></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="f934dc4dfb9df4935a24f143eb5065c3"/></dir><file name="switcher.phtml" hash="b870ae25d38ae4b3cc428ce1dcea81d2"/></dir><dir name="system"><file name="autocomplete.phtml" hash="074a430a0aac1f8d2ed27c57d18dca7c"/><dir name="cache"><file name="additional.phtml" hash="abac4992f67918d7e4112220304532c1"/><file name="edit.phtml" hash="b1902027b98e2ca7d00b87202c0e5e6e"/><file name="notifications.phtml" hash="3d9c258a8cb3d73d3938e0ae5de1cfe8"/></dir><dir name="config"><file name="edit.phtml" hash="298d533828a5a6996a90d1ec555e823c"/><dir name="form"><dir name="field"><file name="array.phtml" hash="ad33fd6fb01911b3b3306cebb99e1758"/></dir></dir><file name="js.phtml" hash="892e889d02d8bbd385ced6f3a6321553"/><file name="switcher.phtml" hash="f4455351e2027efc714e850bbe8cb210"/><dir name="system"><dir name="storage"><dir name="media"><file name="synchronize.phtml" hash="14ee555d5ad14db2a31905c182c86c7d"/></dir></dir></dir><file name="tabs.phtml" hash="a60b8c27198ece6fd2491b084a978619"/></dir><dir name="convert"><dir name="profile"><file name="process.phtml" hash="de67a80eba033323f002355b8174637b"/><file name="run.phtml" hash="8314278f7c72dd49f72bd1d23260f360"/><file name="upload.phtml" hash="0376f43508fe8248beade715e50b6380"/><file name="wizard.phtml" hash="c8447a56d913375a63ddf1a3bde909e9"/></dir></dir><dir name="currency"><dir name="rate"><file name="matrix.phtml" hash="2707ef5c5d1dd79d2814fc5bd92fbd82"/><file name="services.phtml" hash="6f2f854cf737e35dd30b21c40968f8d0"/></dir><file name="rates.phtml" hash="81ecafc08e627f0c697607051ae34f5a"/></dir><dir name="design"><file name="edit.phtml" hash="fce43082d75f3611b6b796e5e2f270a1"/><file name="index.phtml" hash="5579c7c493463079ebc115254cde5fc2"/></dir><dir name="email"><dir name="template"><file name="edit.phtml" hash="4f060631cb4bf6a393a0cdade3e59d32"/><file name="list.phtml" hash="4f9f9c8365cf23238a292bceb194a25d"/><file name="preview.phtml" hash="f20da9dd0e956cd534977ede18a0fe69"/></dir></dir><file name="info.phtml" hash="532bb2fd1c83545f5af94a893d553b48"/><dir name="shipping"><file name="applicable_country.phtml" hash="38c5275d777e14f84c2e0416f9c4d0e9"/><file name="ups.phtml" hash="84f542956ef59320a219e246b2fa4a08"/></dir><dir name="variable"><file name="js.phtml" hash="93a5de4aa2fb05d736273529b365919a"/></dir></dir><dir name="tag"><dir name="edit"><file name="container.phtml" hash="8a09e4ce6e4842bcec10e9eefbac24f8"/></dir><file name="index.phtml" hash="7624f30b01d1a331454092b1600890fb"/></dir><dir name="tax"><dir name="class"><dir name="page"><file name="edit.phtml" hash="09e65ebdacf278b9c39285a2cd9076d3"/></dir></dir><file name="importExport.phtml" hash="5bf476f1cb68d902f621f139fd0c18b3"/><dir name="rate"><file name="form.phtml" hash="c6eff4952efe8a9603797e7f368ab878"/><file name="title.phtml" hash="25b502570a78bb25c991656fe76a2752"/></dir><dir name="toolbar"><dir name="class"><file name="add.phtml" hash="8a5be799844e6ef01b1af94545c8cd53"/><file name="save.phtml" hash="9c7161620c66a932271fd6e3151b07b1"/></dir><dir name="rate"><file name="add.phtml" hash="7258d676f14fb0c6d430df627c88f399"/><file name="save.phtml" hash="f8ba6310d2ce384c2868f131a8f43285"/></dir><dir name="rule"><file name="add.phtml" hash="a5bf61b01ade5cacf1466e4ef2679029"/><file name="save.phtml" hash="c5fe290d3fa5910821250132dc48bd84"/></dir></dir></dir><dir name="urlrewrite"><file name="categories.phtml" hash="b517f33e9b00ee5bccd200c6842be86b"/><file name="edit.phtml" hash="b519cac483f85eed45143cd29ca97e1a"/><file name="selector.phtml" hash="6f139ebeafe43b031227a3328531811a"/></dir><dir name="weee"><dir name="renderer"><file name="tax.phtml" hash="83e8b753e1c756b6a4ef56edecc7b685"/></dir></dir><dir name="widget"><file name="accordion.phtml" hash="45cdaa43e24d1fb233f76ea697b25b1c"/><file name="breadcrumbs.phtml" hash="fc8beefb7eafb272540b94166ffc977a"/><dir name="form"><file name="container.phtml" hash="07482905548a8539c1c60e91e232e768"/><dir name="element"><file name="gallery.phtml" hash="a7d5ca3f97901a9ffd3fb969fe17c632"/></dir><file name="element.phtml" hash="efc0df6e3370d5d03562b8ab8d5394a1"/><dir name="renderer"><file name="element.phtml" hash="7bc6babc40e34bb4e180b2adea49083a"/><dir name="fieldset"><file name="element.phtml" hash="019127c717f067f5b877b787369ff410"/></dir><file name="fieldset.phtml" hash="9cec6163bf026ebd5fad165657de5bc2"/></dir></dir><file name="form.phtml" hash="332c8b6bd71628c067f1df8ac4e2596b"/><dir name="grid"><file name="container.phtml" hash="3eac12f7df27bdfeb2115467e8c03120"/><file name="massaction.phtml" hash="c1c2350057d49aa434939c79c3565567"/><file name="serializer.phtml" hash="2e63911f9b542509221285d85443e8ba"/></dir><file name="grid.phtml" hash="a390964f00c3d44f1178434586ac3e43"/><dir name="instance"><dir name="edit"><file name="layout.phtml" hash="185830ba937f88791c4d2724bdd516cc"/></dir><file name="js.phtml" hash="dc14439d24e4e9fe2607fb666d119101"/></dir><file name="tabs.phtml" hash="b462b8bade904f5dac2d6b86b35322d4"/><file name="tabshoriz.phtml" hash="06c61f0dc4ed54c4da1d2199da38e60f"/><file name="tabsleft.phtml" hash="613cdf8c451cf82fcc482e983c2a5ac3"/><dir name="view"><file name="container.phtml" hash="5a2f0defc17efe51b429624dc29c69cf"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="below_ie7.css" hash="b2bf3a91f389f2ea7912765a814ce10f"/><file name="boxes.css" hash="487698cbac89beffa9d2556cc681f571"/><file name="custom.css" hash="30ed634c4e5d7521cf9961c880c3cba4"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="ie7.css" hash="15db0c436a5438265a91b2c1e4ac4626"/><file name="iestyles.css" hash="ea74f1466bd9faf4a83ee212d617845b"/><dir name="images"><file name="accordion_close.gif" hash="875409122fc82f5f6705e20dd801fd3d"/><file name="accordion_close.png" hash="6213698b5f69bb2907a5c7bb94b5fe8d"/><file name="accordion_open.gif" hash="d9d50e220b0b676094c6134a9708194e"/><file name="accordion_open.png" hash="9fbc3aba23ce5e0465e4d1cf3f6a7aee"/><file name="add_btn_icon-disabled.gif" hash="c8f6a5cfb455ef121efb56a747821f82"/><file name="add_btn_icon.gif" hash="7300097305b577ee564dc49102822d16"/><file name="address_list_li.gif" hash="79b917b514e35ce0a7833a5e268fd9f7"/><file name="address_list_on_arrow.gif" hash="3a2884ddcc87ebd48883662530b9de1b"/><file name="address_list_over_arrow.gif" hash="e826883c71b1184bd4f29433e39c18ad"/><file name="address_list_over_bg.gif" hash="56291480cc89de9d817205a5f23b66dd"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="arrow_sort_move.gif" hash="f5ac151a2b0cb1f07d6e771b8aee0ea7"/><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_create_order_totals.gif" hash="ff6ab75c050b959c539cc6a6fdff2934"/><file name="bg_notifications.gif" hash="a365594725a83585d989f722b3d8c458"/><file name="bg_window_mask.png" hash="93d6efad062d24c94c105802b138b6a5"/><file name="bkg_btn-close.gif" hash="df3f2332f0bad01e031deb22b81f630c"/><file name="bkg_btn-close2.gif" hash="822457d78fb3c21dc12e9777d83eb4f1"/><file name="blank.gif" hash="5722d7bd0f1e1379d0a2005a0a9ea401"/><file name="box_bg.gif" hash="4c501bd6db9d361c18780f106a809b03"/><file name="breadcrumb_bg.gif" hash="72c4adf6c75b4640ca8f7cadffa42266"/><file name="btn_add-image_icon.gif" hash="1d42210fd29fc534d9ed6b41e811d40f"/><file name="btn_add-variable_icon.gif" hash="a2db02e318d107d5b57b444c8d80b8f8"/><file name="btn_add-widget_icon.gif" hash="b4f66ca7f6097fbafd672e0b3f076ef4"/><file name="btn_add-widget_icon2.gif" hash="467acd3a14fb8be37191f5d2ec5a5b13"/><file name="btn_back_bg.gif" hash="8be512788b8044fe31aa8d00cc16ba7b"/><file name="btn_bare_bg.gif" hash="ddbbab8c0d201c3e502d50e7d4a3d64b"/><file name="btn_bg-disabled.gif" hash="079971a9d2c385fe353d35716ec9f26b"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="btn_bg.png" hash="6e3b7003381f919e8f6533444afaa978"/><file name="btn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="btn_delete_bg.gif" hash="ad740d0c16f2f6603c8ef023004d6539"/><file name="btn_go.gif" hash="1bd787868713767cc205e2ee25e41f62"/><file name="btn_login.gif" hash="79fa32d49d3f4e39d3fbf8327f9229e1"/><file name="btn_on_bg.gif" hash="709cf5b0be137db1ef8427688503bf37"/><file name="btn_over_bg.gif" hash="f91641168454c03d1fa72731ec97a2b3"/><file name="btn_show-hide_icon.gif" hash="0238c509b33ba56c25df9513bb48f804"/><file name="btn_task_bg.gif" hash="5e0594bd9cbfcc1e32ffa918d7f9c812"/><file name="button-close.png" hash="04d0907b2d7fc3240693497b199f64f5"/><file name="cancel_btn_active_bg.gif" hash="91ce403d286eef2b4e0c13733875882f"/><file name="cancel_btn_bg.gif" hash="26749cf4949ac27c30f597434d3bde65"/><file name="cancel_btn_icon.gif" hash="97e0cd94ed31d6f2a1181f627e60e9a3"/><file name="cancel_btn_over_bg.gif" hash="45eb4e883b17375961672f5390387c31"/><file name="cancel_icon.gif" hash="70a23b78353f0a7b9b118a937fcb7ea9"/><file name="config_tab_dt_bg.gif" hash="a33f71077ca4078caa794cae01d9fca7"/><file name="dashboard-close.gif" hash="5ae5afd61e937fcd2d5b84641255ee4d"/><file name="db-graph-bg.gif" hash="5d76efb7c3244f5684df2566782124ea"/><file name="db-graph-bottom-bg.gif" hash="b58ced87a38a10891106329ae882aa1c"/><file name="db-graph-line-bg.gif" hash="f16bb08e040c2c0a3e23b3f35c54b79b"/><file name="db-graph-line2-bg.gif" hash="744ebfdba20d050f4d252afc216394be"/><file name="db-graph-x-bg.png" hash="d5c26510718a78d22083916d80ef7a22"/><file name="db-header-bg.png" hash="3976cb6351e167686a501a85cf3a68e9"/><file name="db-menu-bg-hov.gif" hash="34ea76a6d105d90fcb63bf105aadb8f7"/><file name="db-menu-bg-up.gif" hash="b0f754872dff5f2f0dc57ba193fdfa4c"/><file name="db-menu-bg.gif" hash="ea534c3c09bb309e566b6ae876655e13"/><file name="db-menu-sep-last.gif" hash="a01fe34854e1187e466fd58d462c4106"/><file name="db-menu-sep.gif" hash="7c5ae1cd59a189261cc3244358d5c1ad"/><file name="db-menu-start.gif" hash="aa5cac2194d937cc7fa904ccfce70ecc"/><file name="db-scroll-bg.gif" hash="06d2411e3b5f350ab21b625439d2d69d"/><file name="db-scroll-but-bot-roll.png" hash="6bc5e482f3f6d8fb1fc5014ddea43706"/><file name="db-scroll-but-bot.png" hash="25c0181e76ff8ceb3c0ec59071b8c72c"/><file name="db-scroll-but-top-roll.png" hash="b7961f2a3b5b641694a9b0b30d58e46b"/><file name="db-scroll-but-top.png" hash="de7df96e961596be9ff556924259b98b"/><file name="db-scroll-roller.png" hash="e01dde7bd096c52179acf29a425a29e5"/><file name="db-tab-bottom-left-bg.gif" hash="124388d44ac58b029377c6311a4782d5"/><file name="db-tab-bottom-mid-bg.gif" hash="9c48f33aa8907cfcb227bc779c2e1dce"/><file name="db-tab-bottom-right-bg.gif" hash="1db45e6fd8abc67d59f96a676607b412"/><file name="db-tab-footer.gif" hash="cac8928acba75bc1edd73186ced78e5c"/><file name="db-tab-header-sep.gif" hash="580312af7441b6a62f7e32081c40fb0f"/><file name="db-tab-header.gif" hash="fdf493b9477fcff7e7be98405effc33d"/><file name="db-tab-left.gif" hash="3fe3c55267dbbdd1db2ff959ccc9e0be"/><file name="db-tab-right.gif" hash="b7a32c8b03efe2fbdb63215d0446e3be"/><file name="dotted_divider_dark.gif" hash="8bf1de196d9ea048bfb25155cedd2e9e"/><file name="dotted_divider_light.gif" hash="92e562bf2070110f6b0a15e29b845445"/><file name="edit_icon.gif" hash="dbda31751c78d964c04394e9d8533187"/><file name="entry_edit_head_arrow_down.gif" hash="985c3ce4439fbf8bb2216fc7e73a3f0b"/><file name="entry_edit_head_arrow_down2.gif" hash="d68dd0fbc2819858a26ea2835c05df77"/><file name="entry_edit_head_arrow_up.gif" hash="d2b90a1823fff9f3917f19b427410144"/><file name="entry_edit_head_bg.gif" hash="1086b7196e8b33c4f46e49fecef0f35f"/><file name="error-msg.png" hash="3cd27b642416dacdc28907c89d934886"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_account.gif" hash="c910fd1ff41b940d71b0835e02fc143e"/><file name="fam_application_form_delete.png" hash="972c2d998fc19572dd64af6b5e2e898e"/><file name="fam_application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="fam_asterisk_orange.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="fam_bin.gif" hash="2fb388bc9f1d32d3802db8e91dc238bc"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="fam_bullet_disk.gif" hash="9fe82691d960c18d3d315c3f9164af4f"/><file name="fam_bullet_error.gif" hash="008802f44288b732b59cfe9fdbfecefe"/><file name="fam_bullet_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="fam_calendar.gif" hash="0614207ce4e3e0a9bd631b39e7692e3c"/><file name="fam_cart.gif" hash="1f2fd2c8ac6574488ea78302b6856191"/><file name="fam_comment.gif" hash="5138f9a4b6019a5b14b8ff9a32a3cb89"/><file name="fam_creditcards.gif" hash="b75b8ce2f4fceb58f8082c48344560c7"/><file name="fam_folder_database.gif" hash="e86175ff0f389ade1fc7bf15e03346eb"/><file name="fam_folder_palette.gif" hash="c0941b9145e06d53cc0d17ac4c151764"/><file name="fam_folder_table.gif" hash="e2914ba75944acd2a9e2d338fa339e16"/><file name="fam_group.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="fam_help.gif" hash="2b5ed4c13a8e24456207b757826c7b2c"/><file name="fam_house.gif" hash="8eb2d580c5a40b7974f4263ca64fb94a"/><file name="fam_layout.gif" hash="5366a5f02260d3a860ef0c4787282ad6"/><file name="fam_leaf.png" hash="078d4f24683331b4557356a59e67b125"/><file name="fam_link.gif" hash="78590d5d8375d1baabe7b66d7b9ceb7d"/><file name="fam_lorry.gif" hash="174e86e45e76e7008fa3510cefa85047"/><file name="fam_money.gif" hash="6996bad465222fb6487cab94b4607846"/><file name="fam_money_add.gif" hash="70ceed401fe9913305f2362f7e26225d"/><file name="fam_monitor.gif" hash="f3bc806ff9d0907320b03018ba2d00ea"/><file name="fam_newspaper.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="fam_newspaper_delete.gif" hash="41acabfc19102be92d3ccbc66d1fede3"/><file name="fam_newspaper_error.gif" hash="009bfa425298e1d2e44e38e58cd97938"/><file name="fam_newspaper_go.gif" hash="eb43105f8e13e3a752d7ca33bb086831"/><file name="fam_package.gif" hash="bf9be09ef64d006455baa211b7c03983"/><file name="fam_package_go.gif" hash="e4f8d380c2f8e5a7345e360293433764"/><file name="fam_page_white.gif" hash="26940eb67826c5af72b6048c7c5a8335"/><file name="fam_page_white_edit.gif" hash="a4f88300b74ad592a5c47ed54ff07af9"/><file name="fam_rainbow.gif" hash="e8b04cc945b3582a181d4ddbc2d2325f"/><file name="fam_refresh.gif" hash="01bbef614023c0890812e76bc7ecf7e0"/><file name="fam_server_database.gif" hash="7901fa06ffd68ed730cf43bb560756fd"/><file name="fam_status_online.gif" hash="a80019ffa3a573f709772ed1099343fc"/><file name="fam_tag_orange.gif" hash="6ce735a0e590bda040b6e1614c42e58a"/><file name="fam_user.gif" hash="63bbdd6d9d7a27591907a7b87898e259"/><file name="fam_user_comment.gif" hash="014dfd31d9af40e3d5960b2b0d900da3"/><file name="fam_user_edit.gif" hash="f5b36e803060c6b82e639a4fad57b9f7"/><file name="filter_row_bg.gif" hash="013a0929a7b2ddc6823bdda17d08acc0"/><file name="footer_bg.gif" hash="7724711d3ca07a5e46a6030e86743a71"/><file name="gift-message-collapse.gif" hash="5b710f5faa9c7352a39c10e3ebbee6fc"/><file name="gift-message-expand.gif" hash="fd53a70cbb1ea048754657a63787e9cb"/><file name="gift-message-grid-column-bg.gif" hash="97a8a9b8cc4ab68e7404ccf1320f50a6"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="grid_sort_asc.gif" hash="b78c3a1a27ac9672a31b7d1bbac60322"/><file name="grid_sort_desc.gif" hash="d958b946eba3dba863d724530a0dba1a"/><file name="grid_th_bg.gif" hash="8f4349fac728858374e17edf03390977"/><file name="grid_th_onclick_bg.gif" hash="7bf331e2a41e5331c4210bdc6adc4383"/><file name="grouped_to_order_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="header_bg.gif" hash="cbe510856afa5cb0c32642c1f9a8eceb"/><file name="header_top_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="horiz_tabs_ul_bg.gif" hash="58dbd9c45f76993346c2bb788896248e"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="ico_success.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="icon_btn_add.gif" hash="7300097305b577ee564dc49102822d16"/><file name="icon_btn_back.gif" hash="89ed97cede3f68241446a62c96e3ce4c"/><file name="icon_btn_delete.gif" hash="dbde0b76d36cfd624bf0de166d0a265e"/><file name="icon_btn_save.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="icon_edit_address.gif" hash="d1ca2bb3a5c86afd379f25d9fc4352e3"/><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/><file name="icon_export.png" hash="fb299dd13df666516eabe16f59193383"/><file name="icon_feed.gif" hash="0366583ed6e285d028442fcdebb05072"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_note_list.gif" hash="8d25ba225ca09b687a78bff510df5d10"/><file name="icon_remove_address.gif" hash="2de2b3d02c19adfb93e9e43a392db178"/><file name="login_box_bg.gif" hash="e4654826eaa8d5ebc0ab18e9bee71e1d"/><file name="login_box_bg.jpg" hash="404e37f4ee9f4ff9bfcb638741c7581d"/><file name="login_box_bottom.jpg" hash="038f15261e74bc381484f2fcfa45a73b"/><file name="login_box_legal_bg.gif" hash="528ac4dd480c4fc00ac808bf17394c05"/><file name="login_logo.gif" hash="9cc90e7aa1210883000fe5319862ce14"/><file name="logo-large.gif" hash="5c77654c424b0a35cc24d28df5166dc4"/><file name="logo.gif" hash="c7e9f290d965f707e4c4a61bfdab58cb"/><file name="massaction_bg.gif" hash="8b5f4db3ab3ea09cd5bd0164d67c4f0d"/><file name="massaction_button_bg.gif" hash="4c8262817e48d007237124ce0e7f4d18"/><file name="massaction_links_delimiter.gif" hash="9a0337183b5b67c0eed75993d7f14d10"/><file name="middle_bg.gif" hash="ba4f176d2c553201ebab4aba5c6d3d20"/><file name="more_arrow.gif" hash="38bb4c0e9270250151486d0bb36c476f"/><file name="nav1_active.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_bg.gif" hash="a1d4ef5b590ce0a425dc04e45ed06cbe"/><file name="nav1_off.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav1_on.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_over.gif" hash="2c70d6175f1c965c27dda0598a67e63c"/><file name="nav1_sep.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav2_last_li_bg.png" hash="279935c9799679fc5894337eaabc7cf0"/><file name="nav2_last_li_over_bg.png" hash="39536f00824293d11242888a76f40a5f"/><file name="nav2_li_bg.gif" hash="0a4f34b0e4436c519d31203f19503b83"/><file name="nav2_li_bg.png" hash="2fad219d162324e9a19f2745d5b6d562"/><file name="nav2_li_over_bg.png" hash="dc37c4a4aab40ea2ae44dea5ea133a9d"/><file name="nav2_link_bg.gif" hash="dce00ddad351e72e83bc87274cbaa54a"/><file name="nav2_parent_arrow.gif" hash="60e012a14a077bd2257343facc369c0c"/><file name="nav3_bg.png" hash="2bc7af80ad8886013da38401b63ab6df"/><file name="nav_bg.gif" hash="1b857c7d35f35ef9f6cae9e03a4e3dff"/><file name="nav_list_bg.gif" hash="7a4e2bdb887c12d8a1152bbcc8c02a3c"/><file name="nav_nest_link_bg.gif" hash="1d0c6b374bf02ac4b5aa012955c431de"/><file name="nav_nest_link_over_bg.gif" hash="fae3c579a4d432503b1f4f929d070609"/><file name="nav_on_bg.gif" hash="ac624b580cae5a76f6c92abc5a44191d"/><file name="nav_parent_arrow.gif" hash="3a95559263e569dc1c8065cb2d9b3f2c"/><file name="note_bg.gif" hash="105967d7c15ab4610726eea52d862a97"/><file name="note_cell_bg.gif" hash="71e656d42f8ba8c2d477c6866c499b71"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="notice-msg.png" hash="9cd1dfebccec8a2123d543fa49b17bd7"/><file name="pager_arrow_left.gif" hash="6e44f608dac8eb8be1d1ebee5a3285aa"/><file name="pager_arrow_left_off.gif" hash="30f5e56195ab3546b36f4016db5254be"/><file name="pager_arrow_right.gif" hash="cc79526156b7e0c8abce61fad3d53f77"/><file name="pager_arrow_right_off.gif" hash="f01b7dad9acf0180b5c62edbd7ea9939"/><file name="paypal_logo.gif" hash="871e205a64292121f4c893373acfb581"/><file name="paypal_section.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="paypal_tick.gif" hash="e8685c1fb7c4c106ae4fd24e9bbf5a27"/><dir name="placeholder"><file name="thumbnail.jpg" hash="5c73b5aa515b1719f7b398f5131f91a8"/></dir><file name="process_spinner.gif" hash="345b30b4d0b6088d0151ecfbdf48c036"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="rule-ajax-loader.gif" hash="32dc1f5901143d36fbd7a6df3950819f"/><file name="rule_chooser_trigger.gif" hash="9c498e789c3ce734f5301c2475e2a04c"/><file name="rule_component_add.gif" hash="7914e57701ca26f5c8bf23c6bc3e1f25"/><file name="rule_component_apply.gif" hash="3f9b9025551da6963a9ecf8d184a204a"/><file name="rule_component_remove.gif" hash="4d785bcecfbe716fa4d749d20738a8f0"/><file name="save_btn_icon.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="sec_nav_bg.gif" hash="99c6741591cdb2a2a128668a1d32d668"/><file name="section_menu_bg.gif" hash="f9edd44c92743a0c9ae9535a7992d6b1"/><file name="section_menu_bottom.gif" hash="167d2ef46ff80158c807b4b916501b28"/><file name="section_menu_link_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="section_menu_link_over_bg.gif" hash="7da7e56567633aab279cf3aec6f49d8d"/><file name="section_menu_over_span_bg.gif" hash="f5ea5292f15ed62b99f0f51d9fff2c66"/><file name="section_menu_span_bg.gif" hash="dbf3916358e794ee809b4cf33903af2c"/><file name="section_menu_ul_bg.gif" hash="3aea6e5452f548438ca34e17954a9d6b"/><file name="side_col_bg.gif" hash="b3691fd62663457af39eaf71dd8cda5a"/><file name="simple_container_bg.gif" hash="56f1ac91169eb4896b8c91384fc8bf15"/><file name="sort-arrow-down.gif" hash="fc2cd9f756ce510c4470478d720f81cd"/><file name="sort-arrow-down.png" hash="dc65160d9d4d6cdd6bfe1b397a931975"/><file name="sort-arrow-up.gif" hash="39026b0ff1f0c18091caa60384491163"/><file name="sort-arrow-up.png" hash="da54e5306bdce67551aa415f5d7f7ea7"/><file name="sort_heading_bg.gif" hash="6066d09f237f556b0a4770e4788e7598"/><file name="sort_on_bg.gif" hash="0cb36788ed4fbf19e657acbc75a3f1b8"/><file name="sort_row_bg.gif" hash="f2e1c5cb26b9f5211419b99d30745244"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="sub_button_bg.gif" hash="e3f66dd60510f9f7e937e2e55442c30a"/><file name="success-msg.png" hash="c64cb2acc3d0eeba48fdea83620913ed"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="tabs_link_bg.gif" hash="34447929f5e6591ba9b5795b983fdfd4"/><file name="tabs_link_over_bg.gif" hash="2cf3f56884096055fb0bdf9474f280c9"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="tag_blue_edit.gif" hash="b2163ac3baf7d822b48593342846645a"/><file name="tn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="tooltip_bg.gif" hash="0aa4b866fc067a75f27ab749c1dabf74"/><file name="tooltip_corner.gif" hash="71146534671d5e0751505640b7c59859"/><file name="tooltip_top.gif" hash="032ff52a6ff5714cbdf6c1f62abaf7e5"/><dir name="tree_icons"><file name="join.gif" hash="4d5d614e0da056df815a4306d6368692"/><file name="joinbottom.gif" hash="4b3daa7f2cc584f1aac0d142275d7cba"/><file name="line.gif" hash="63ab38a6203262f15ca46c631232ea2c"/><file name="minus.gif" hash="d647fbbd0ec410b8f3bb3357b62eedcf"/><file name="minusbottom.gif" hash="b09d684cca7135ef728141aaf2464baa"/><file name="nolines_minus.gif" hash="eb2243a354ffcfac93ba0fe948f7167d"/><file name="nolines_plus.gif" hash="ec92b634b63608fb4b0dbf114e3b89e1"/></dir><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><file name="varien_logo.gif" hash="6f10d0fe572cb012947c164217e9e428"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><dir name="widget"><file name="catalog__category_widget_link.gif" hash="8435943009f1f774bbd6a4809c719eb8"/><file name="catalog__product_widget_link.gif" hash="62f2d7020143f98ba7514469eb612a7f"/><file name="catalog__product_widget_new.gif" hash="37a5af9f98ae73e180ad0cca05c95324"/><file name="cms__widget_block.gif" hash="b7b0b1517cc38b18b92841b33b312190"/><file name="cms__widget_page_link.gif" hash="b839dee210e61850a5858cc8634cbccd"/><file name="default.gif" hash="684143ae5531aa6ba22215f4fadeea6c"/><file name="reports__product_widget_compared.gif" hash="bd3e5a5015eb2c5c64f1d11835166dc4"/><file name="reports__product_widget_viewed.gif" hash="44d5cd71e4fb7235f9cff0c7e2b2f531"/></dir><file name="widget_placeholder.gif" hash="2bd8d72cf12f8d7d0a6a3268f97786ff"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/><file name="window_content.png" hash="08361df29783d46a2493cf0d8ad733a7"/><file name="window_top.png" hash="555a8db5efa3a252c2ead3d3dadd1075"/><dir name="wysiwyg"><file name="skin_image.png" hash="a521b0c60b001de4a3405e73c4a6cd4a"/></dir></dir><dir name="media"><file name="editor.swf" hash="259afd515d7b2edee76f67973fea95a6"/><file name="flex.swf" hash="60a8c242ca2ff0e70ed9a038749f4cc1"/><file name="uploader.swf" hash="1c300001dadd932ef6e33a2fadf941e1"/><file name="uploaderSingle.swf" hash="304dd960698c5786dcd64b0e138f80ca"/></dir><file name="menu.css" hash="6f39c760b70b8250c193c5311885193a"/><file name="print.css" hash="db77a54f0e6a7146cad6566eb200a0d5"/><file name="reset.css" hash="d45948716e2dd828a40715b9a43e2115"/></dir></dir></dir></target></contents>
|
| 16 |
Â
<compatible/>
|
| 17 |
-
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.
|
| 18 |
Â
</package>
|
| 1 |
Â
<?xml version="1.0"?>
|
| 2 |
Â
<package>
|
| 3 |
Â
<name>Interface_Adminhtml_Default</name>
|
| 4 |
+
<version>1.7.0.0</version>
|
| 5 |
Â
<stability>stable</stability>
|
| 6 |
Â
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
|
| 7 |
Â
<channel>community</channel>
|
| 8 |
Â
<extends/>
|
| 9 |
Â
<summary>Default interface for Adminhtml</summary>
|
| 10 |
Â
<description>Default interface for Adminhtml</description>
|
| 11 |
+
<notes>1.7.0.0</notes>
|
| 12 |
Â
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
+
<date>2012-04-23</date>
|
| 14 |
+
<time>13:47:33</time>
|
| 15 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="admin.xml" hash="0a820b9bcd195b60fd688b68b3b02467"/><file name="adminnotification.xml" hash="f83b3e6324405b52026d03a2ac8d1b2c"/><file name="api2.xml" hash="ab7506f228c71270d80ef81cebb85765"/><file name="authorizenet.xml" hash="9a53dd3c2b0e7add73a9525027f10acb"/><file name="bundle.xml" hash="69c494389bcd62210374e9293b6dc37a"/><file name="captcha.xml" hash="8f9e230604cb2555c6e5ac6bd3612a3c"/><file name="catalog.xml" hash="9b791d35c4fea555b82889bc1c3defb6"/><file name="cms.xml" hash="0228247c07fd981cd67ce5abf18e3deb"/><file name="connect.xml" hash="031dec6f16b56bffa8461ae0ed55b6d4"/><file name="currencysymbol.xml" hash="1e36cf794b5774203439623da316f90f"/><file name="customer.xml" hash="9ceb87d4f91bcc0c02cfaec709ce2995"/><file name="dataflow.xml" hash="24d25de0691d392feb7beeb604e4cfd9"/><file name="downloadable.xml" hash="2522207692a3bdabc3f548910fe83ee1"/><file name="giftmessage.xml" hash="6ef96abfdaf4ad60f6e1bec98a58aebc"/><file name="importexport.xml" hash="90833e5f738675aec4d5e3912a243339"/><file name="index.xml" hash="17f46ca66bebbe3e027240811c2f0533"/><file name="main.xml" hash="e029c0cc5407255880d1fbaaefe2067e"/><file name="newsletter.xml" hash="34404ef78e6ce939f5c7d823aadb8e2b"/><file name="oauth.xml" hash="d40d03bbb41900ab4a9ef881fbb5f0e5"/><file name="pagecache.xml" hash="924be8bc6ce31fa997df5484248cf0c7"/><file name="promo.xml" hash="6d49882295e59d21cc1642be6eec4a13"/><file name="report.xml" hash="ca02d867bae3beaf871f1ee22d626611"/><file name="rss.xml" hash="3a6888f2ee09ae9dd5877f3978ed72aa"/><file name="sales.xml" hash="11f2a7d98845da4dddca432542bdb81d"/><file name="search.xml" hash="a9f97613e387d0571149abf350984fae"/><file name="tag.xml" hash="626f5548865c1b373741348fbf2349a8"/><file name="widget.xml" hash="61480133c53084da2922b7b4d5770523"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="735c9ec66d1309f1206294f075fdcdd1"/></dir></dir><dir name="template"><file name="access_denied.phtml" hash="d5bed07c639925ce1752c0e10ae61b5f"/><dir name="api"><file name="role_users_grid_js.phtml" hash="0677fa6b0ace755cdef890009d6c020e"/><file name="roleinfo.phtml" hash="347ac7931cc9bb626b3cb6491d836b12"/><file name="roles.phtml" hash="44f40cb9fdfb7aba5d67c658e279d4f0"/><file name="rolesedit.phtml" hash="f97d0729b2e9b0286032f7013463a6cf"/><file name="rolesusers.phtml" hash="0057260be86964b6d8d4abf58662037a"/><file name="user_roles_grid_js.phtml" hash="3a4ad375a54503d8b2846887f05816bf"/><file name="userinfo.phtml" hash="b666c1eae5c25a7fc65791626e958b27"/><file name="usernroles.phtml" hash="766c1de65b8c8f360ddaa5006e900515"/><file name="userroles.phtml" hash="fe9a9103b4570408de2d98f5a36efcc0"/><file name="users.phtml" hash="5d0d989d2e17c90f70c894518e4f8dfa"/></dir><dir name="api2"><dir name="attribute"><file name="buttons.phtml" hash="a9406c3f569b76ce3dcca2dcf818ce2a"/><file name="resource.phtml" hash="b4c4751a5378869468f491c9260662de"/></dir><dir name="permissions"><dir name="user"><dir name="edit"><dir name="tab"><dir name="roles"><file name="js.phtml" hash="d34637f08384c657e114e3d527e3c5fa"/></dir></dir></dir></dir></dir><dir name="role"><file name="buttons.phtml" hash="c0625ce68ef097c318defcf9aba821e9"/><file name="users_grid_js.phtml" hash="4bc24097d9136c9ef3c3ebd61cdab171"/></dir></dir><dir name="authorizenet"><dir name="directpost"><file name="iframe.phtml" hash="1660f94427e0a84e9bd70d9a192b4f6f"/><file name="info.phtml" hash="d5cfbe6943450fe814e5a53a8b69c167"/></dir></dir><dir name="backup"><file name="dialogs.phtml" hash="fc0361f93157b9d6da56419ee5bf8a9f"/><file name="left.phtml" hash="594faf73b9ba3651dd20a9f213ef20a7"/><file name="list.phtml" hash="21e8afbb06c01ad4d04a0dc1d44faf9f"/></dir><dir name="bundle"><dir name="product"><dir name="composite"><dir name="fieldset"><dir name="options"><file name="bundle.phtml" hash="e7ccb93edb02772496753ca94bece601"/><dir name="type"><file name="checkbox.phtml" hash="a552c8f58151dabe4aada5f9cb582494"/><file name="multi.phtml" hash="bdc1494d93d81e91c797649b683c9a9e"/><file name="radio.phtml" hash="797143bc2e589bb3b02ed57e41be49c2"/><file name="select.phtml" hash="b08d9b888cfda630ddd66286c9f64553"/></dir></dir></dir></dir><dir name="edit"><dir name="bundle"><dir name="option"><file name="search.phtml" hash="6caaf5fb27929c966116f4676917767a"/><file name="selection.phtml" hash="f352d08b55e7c3ff081d37e0d58e224a"/></dir><file name="option.phtml" hash="3d5d0b1da7bd296da288326a390fc10d"/></dir><file name="bundle.phtml" hash="3122d30572240cb05c08bb48b992d2f1"/></dir></dir><dir name="sales"><dir name="creditmemo"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="69168e5075f291e3522391ddf9b12a38"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="367333900903f41395729d481c54eb0e"/></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="514e22c107f96b9f400c606c5cfa9252"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="8cdf3a06b48d1776cc2b6d123bdffa45"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="items"><file name="renderer.phtml" hash="89b7910756224761f92a192cd7b25d54"/></dir></dir></dir><dir name="shipment"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="b00ddb86e00ceed946755816c7f297db"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="e18be4aa499943bf2dea1ddc575b8448"/></dir></dir></dir></dir></dir><dir name="captcha"><file name="zend.phtml" hash="51eb9f8f5c33a5f95256c78681178a99"/></dir><dir name="catalog"><dir name="category"><dir name="checkboxes"><file name="tree.phtml" hash="8fd43d32bac6a7ad5e134112c5af7d25"/></dir><dir name="edit"><file name="form.phtml" hash="ab6786ed00edb5604303d63c59d317df"/></dir><file name="edit.phtml" hash="2a85d97c5f2f4f3233ab7e4c99fb823d"/><file name="tree.phtml" hash="e7dc28e978ab8dadfb31c52ba28dab94"/><dir name="widget"><file name="tree.phtml" hash="2567c4563f81a2db03a1c0766efdd973"/></dir></dir><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="8ed4b3b49dfa3b8a784581e6763e7829"/></dir></dir></dir><dir name="product"><dir name="attribute"><file name="js.phtml" hash="8e53f650ffc0a71a677a4de3fa9a3ea7"/><dir name="new"><file name="created.phtml" hash="032fe9b0bfb57a1c7e465fd96e64b8e9"/></dir><file name="options.phtml" hash="f23721bb3c8a47039214c8644038b97c"/><dir name="set"><dir name="main"><dir name="tree"><file name="attribute.phtml" hash="a5ebaf99c0417845717f6f200e6f7767"/><file name="group.phtml" hash="af4fc3c80e66930f2d6b712e96d82251"/></dir></dir><file name="main.phtml" hash="444c0255a5b36711451c231062129184"/><dir name="toolbar"><file name="add.phtml" hash="4de818587cb032864e0f09a4b6f32a40"/><file name="main.phtml" hash="9272b5e3ea4f69f2962b99489ec80bf8"/></dir></dir></dir><dir name="composite"><file name="configure.phtml" hash="d0c97530631a41774da5d0c59e3cdbda"/><dir name="fieldset"><file name="configurable.phtml" hash="fc0f59af53f80affbbf70836698d49bc"/><file name="grouped.phtml" hash="34381e935e64c6012516f06bd24c13e0"/><dir name="options"><file name="js.phtml" hash="78a20bf4f8e3d370e311c7a4f4f82254"/><dir name="type"><file name="date.phtml" hash="e20257bbb3a9a8b46590258a9445e4d9"/><file name="default.phtml" hash="361f4f1544704c729ed458f1b0c98fad"/><file name="file.phtml" hash="48e6ff4cde3646cde70b95838464795b"/><file name="select.phtml" hash="7c722ba3d91435d09aab9a906823b0d2"/><file name="text.phtml" hash="a8d94ed13494ff1c6ed9e69693446da5"/></dir></dir><file name="options.phtml" hash="def632897318e7b6f32e4044ba296e82"/><file name="qty.phtml" hash="4684f0f736d2fdc60533eb569462701f"/></dir></dir><file name="created.phtml" hash="f84a3d8a0519862514f3d946448a4c2d"/><dir name="edit"><dir name="action"><file name="attribute.phtml" hash="061de8d0557544bf3cebcead73fda1ab"/><file name="inventory.phtml" hash="97ed49d69e46a6a1b57f4ea4c0ad5f3e"/><file name="websites.phtml" hash="5974c3c8353d0dbbd19bf5adcb3d3d34"/></dir><file name="categories.phtml" hash="923d4b19ca764d1e691e3353c6b6457b"/><dir name="options"><file name="option.phtml" hash="3e102a132c8d5349e88d4be2ecb12c0b"/><dir name="type"><file name="date.phtml" hash="28ecb8e0a74b8a2ab229197da1637a4d"/><file name="file.phtml" hash="3ce9fbbf9d098d45ff1be02b60dadbe1"/><file name="select.phtml" hash="5c8f9b19dc64f6d1398dfd97f2995716"/><file name="text.phtml" hash="2c2d0f04bdca46037687ffca4575dcf7"/></dir></dir><file name="options.phtml" hash="974e554598a69b3d5a77ee0c94b57c1f"/><dir name="price"><file name="group.phtml" hash="1f5cd0864a9fc4c83840507d4b28e2c1"/><file name="tier.phtml" hash="eed84e2b3ff0528b064eee66963001dc"/></dir><file name="serializer.phtml" hash="b12184c01e2c7faed564cfb8cb840aa9"/><dir name="super"><file name="config.phtml" hash="56dce619c18f5792144adbf13934297e"/></dir><file name="websites.phtml" hash="d4f2cf608c45852bf9858ac267570271"/></dir><file name="edit.phtml" hash="46312d31eb18c810935ff70a5c8c210c"/><dir name="helper"><file name="gallery.phtml" hash="621d559c5f10d29ae74f5cb1bd902613"/></dir><file name="js.phtml" hash="c5cad3bdb3bccbbb4661539d9a40ecea"/><file name="price.phtml" hash="095b3fdc27421ab377d158628d639f97"/><dir name="tab"><file name="alert.phtml" hash="3f5b114451fd992ffee8d21de8e8ede3"/><file name="inventory.phtml" hash="d23ee04d83f03c78285af89bcfaf733a"/></dir><dir name="widget"><dir name="chooser"><file name="container.phtml" hash="aa1f5d7f161aefa4366a8ac8b7b71f5b"/></dir></dir></dir><file name="product.phtml" hash="9e264075af4f545a8b5963b0f01d4228"/><dir name="wysiwyg"><file name="js.phtml" hash="d333dc811581cd314d687c6f46715376"/></dir></dir><dir name="cms"><dir name="browser"><dir name="content"><file name="files.phtml" hash="e3fdcc18ca6ea098bd2887cc5494b093"/><file name="newfolder.phtml" hash="77082fd65b7102793eeeeac521c57206"/><file name="uploader.phtml" hash="c2d0e71dd177ff70fced8c56b87ca7fd"/></dir><file name="content.phtml" hash="3f0fd227b44ec388568fd2dd0df0bb26"/><file name="js.phtml" hash="f6b52edab44101c37d51b9a85eff3a56"/><file name="tree.phtml" hash="cefe536095fd873b21008ccd61369481"/></dir><dir name="page"><dir name="edit"><dir name="form"><dir name="renderer"><file name="content.phtml" hash="e819bdcd6c207ab05be363d30cbc316b"/></dir></dir></dir></dir></dir><file name="coming.phtml" hash="d078d87fb1dee05dabd24dcb2ebc60e2"/><dir name="connect"><dir name="extension"><dir name="custom"><file name="authors.phtml" hash="01c2481e9ede0294a825c19e24aba73c"/><file name="contents.phtml" hash="f93365afcac856feec30f033ca404501"/><file name="depends.phtml" hash="8ceb032333278db3c061b48d38b8b921"/><file name="load.phtml" hash="12466c801bcc6523af05edd4c890041c"/><file name="package.phtml" hash="fadeaf6ce780d32a086262a6f219b2c9"/><file name="release.phtml" hash="58353d92898b849ae0199f0fa360e1db"/></dir></dir></dir><dir name="currencysymbol"><file name="grid.phtml" hash="cc3f1f992652b93fcf9118c9eb5ca3fb"/></dir><dir name="customer"><dir name="edit"><file name="js.phtml" hash="ff08ee06b16dc0d5902f360c2ffeb0f5"/><dir name="tab"><dir name="account"><dir name="form"><dir name="renderer"><file name="group.phtml" hash="2d5642e74067b823f9b19abfd8c3f6b3"/></dir></dir></dir><dir name="view"><dir name="grid"><file name="item.phtml" hash="e80ee11d249c01e6ba39fd899e879b92"/></dir></dir></dir></dir><file name="online.phtml" hash="333634c1a3230967c7fe8782dc7469b1"/><dir name="sales"><dir name="order"><dir name="create"><dir name="address"><dir name="form"><dir name="renderer"><file name="vat.phtml" hash="54d8011cce22fea7a0a0a1c8107feb3e"/></dir></dir></dir></dir></dir></dir><dir name="system"><dir name="config"><file name="validatevat.phtml" hash="a3688f9bd32179c65c12c1a5a817a3f5"/></dir></dir><dir name="tab"><file name="addresses.phtml" hash="f17e9d117b93b203c7f914cebc1309f4"/><file name="cart.phtml" hash="2a6de2ebfab4096c43cb5d9da39e3b29"/><file name="newsletter.phtml" hash="9a6d753f221c819bb3937852796b54d7"/><dir name="view"><file name="sales.phtml" hash="676336114f57be3b27045026e0135b61"/></dir><file name="view.phtml" hash="0f47888096f2a721a0699035b4a65e40"/><file name="wishlist.phtml" hash="52aa9d6e5ae46f49015fd8e635104455"/></dir></dir><dir name="dashboard"><dir name="graph"><file name="disabled.phtml" hash="2e44e550011e5fbc76cf6e4a140f67b0"/></dir><file name="graph.phtml" hash="aa0f4fc8d3267f40adef061629be4bb6"/><file name="grid.phtml" hash="21ad3429047d896e874f360c7ee2a969"/><file name="index.phtml" hash="0f83dc824549252c8bd909f0468f3157"/><file name="salebar.phtml" hash="f40ee3dde8210e2cbdd8a6c165d75c02"/><file name="searches.phtml" hash="7cc460a3a34e2cfcf17112fb5d259877"/><dir name="store"><file name="switcher.phtml" hash="604e401e899efccedac3f7db1d660670"/></dir><file name="totalbar.phtml" hash="946dc8ac9a0d2d561a47d1467d107337"/></dir><dir name="directory"><dir name="js"><file name="optional_zip_countries.phtml" hash="1347eb09dbe7605343fe4227627bc702"/></dir></dir><dir name="downloadable"><dir name="product"><dir name="composite"><dir name="fieldset"><file name="downloadable.phtml" hash="623b84e491e09ed2d88e7d9e3f8b0c04"/></dir></dir><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="623f86965fecbbbdf5e30c030c645171"/><file name="samples.phtml" hash="30079e87422b40873e1d7869d70b61c1"/></dir><file name="downloadable.phtml" hash="37f56cb0c25df2bdececa3bbff1a0aa3"/></dir></dir><dir name="sales"><dir name="items"><dir name="column"><dir name="downloadable"><dir name="creditmemo"><file name="name.phtml" hash="6429d95ac54961490c5c7ecd1ebd0b8a"/></dir><dir name="invoice"><file name="name.phtml" hash="69336f5ed5a993eb25edbea7aa65855b"/></dir><file name="name.phtml" hash="0f174cbf31ef56eef1d2d269fa378fc6"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="0034362139fce4fc8b6a6d4cbd7d139f"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="ca3eb309d20edcf7d910f6327b52fc88"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="2baa50d39f8f429c2ae7f43a43caa696"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="c613ce7b4cbc6e12dc02455325a0d91e"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="05ab31768964d2c6b57a5d7e8679ba68"/></dir></dir></dir></dir></dir></dir><dir name="eav"><dir name="attribute"><dir name="edit"><file name="js.phtml" hash="a5ebaf99c0417845717f6f200e6f7767"/></dir></dir></dir><dir name="email"><dir name="order"><file name="items.phtml" hash="9ad25014464e6aebfa5b2f1959ff1927"/></dir></dir><file name="empty.phtml" hash="89962e49cd326407e00f7fca6e46e532"/><file name="example.phtml" hash="10e6bdf1b32eadbed75d35538c53b9e3"/><file name="forgotpassword.phtml" hash="7aaaacd88dd9b4649878279bb193ea47"/><file name="formkey.phtml" hash="9ccc3d9276e40ce83eeaa828af04e34c"/><dir name="giftmessage"><file name="form.phtml" hash="8aaee3c7394c645ef9c4dac3aeb77710"/><file name="giftoptionsform.phtml" hash="be34a43e323685bf1b0d96b1ea5dad7f"/><file name="helper.phtml" hash="ebdf3748778f41043298cee718db6215"/><file name="popup.phtml" hash="1ea05c3d19c02710bb50ad7b1533ff44"/><dir name="sales"><dir name="order"><dir name="create"><file name="giftoptions.phtml" hash="21d7847833ec37e35264850706bb602b"/><file name="items.phtml" hash="6fa0683c2aad1732ab536ebb98bb2a98"/></dir><dir name="view"><file name="giftoptions.phtml" hash="21aea526aeeb96df475bf03c2f27cc94"/><file name="items.phtml" hash="1542a295638b2eed8101579b10ec8ad0"/></dir></dir></dir></dir><dir name="googlebase"><file name="captcha.phtml" hash="1689288632eacee602a3e0310a588260"/><file name="items.phtml" hash="4cc1fa6c2fb7ab2979b8372e932479e9"/><dir name="types"><dir name="edit"><file name="attributes.phtml" hash="70f5103d122290f6eeaa3e9258253b4e"/></dir></dir></dir><dir name="importexport"><file name="busy.phtml" hash="d889ef95ffa00988bfb45458da928ee0"/><dir name="export"><dir name="form"><file name="after.phtml" hash="d9f2306048470d7cb78b74db2cd48a16"/><file name="before.phtml" hash="4661c4964faebc528b86a11765197146"/></dir></dir><dir name="import"><dir name="form"><file name="after.phtml" hash="82f147959a1a63c97d7b8cfd5643a529"/><file name="before.phtml" hash="970bb388fff1aae7af2c3c5a537d6a54"/></dir><dir name="frame"><file name="result.phtml" hash="87f629974959d669e2e5c6cf05120aaf"/></dir></dir></dir><dir name="index"><file name="notifications.phtml" hash="65bf19314dc24ee3cdbb240699e17443"/></dir><file name="login.phtml" hash="dfbf940938db3d5e21ad6a6bb74d4f8d"/><dir name="media"><file name="editor.phtml" hash="f2b56802cc7b1c385660a4e20c770316"/><file name="uploader.phtml" hash="dcc8ccc057bda4ec8d0fbfbface4e685"/></dir><dir name="newsletter"><dir name="preview"><file name="iframeswitcher.phtml" hash="932c271a38143a9ac60e2293ae360aac"/><file name="store.phtml" hash="454c67705e72952c7f6cfa363423e8d2"/></dir><dir name="problem"><file name="list.phtml" hash="6c69041bce5164ec6778c674b4c235eb"/></dir><dir name="queue"><file name="edit.phtml" hash="ea83e9c0552eb8de8b20235c40321556"/><file name="list.phtml" hash="706cec4b5012d21bf72ac4589ea2f287"/><file name="preview.phtml" hash="ae8507b5f895e414d20402779232daa8"/></dir><dir name="subscriber"><file name="list.phtml" hash="0bdcd6f3b29cbe46bff90ccbd2314ba7"/></dir><dir name="template"><file name="edit.phtml" hash="498aba977208aa85a7ba7a94fcec0f9c"/><file name="list.phtml" hash="001f4deb1e3598f00b3b0ba89b00aa17"/><file name="preview.phtml" hash="ae8507b5f895e414d20402779232daa8"/></dir></dir><dir name="notification"><file name="baseurl.phtml" hash="a31f2ed7ac9d1c8792587bc571e50eb7"/><file name="security.phtml" hash="11ba6b5a1988370bd7c9537b628dbfc4"/><file name="survey.phtml" hash="24b7b3f22291ccdc64ceef293641f431"/><file name="toolbar.phtml" hash="482225a21c43eb20ffa34769393768d7"/><file name="window.phtml" hash="648a78b154635e67ef4ee04df70b146f"/></dir><dir name="oauth"><dir name="authorize"><file name="button-simple.phtml" hash="4408c7e5ef0a998907eff9c9bfcc8dc1"/><file name="button.phtml" hash="bd18ded242ce7531fa1c51646a77dc67"/><file name="confirm-simple.phtml" hash="4994f7b397454c4d7e77878597e5c2fa"/><file name="confirm.phtml" hash="745c0afc24d36453dd3a72692fd2451e"/><dir name="form"><file name="login-simple.phtml" hash="1afef3849eb7461b350097445da55e73"/><file name="login.phtml" hash="62fc200c6cd1441b3e3e90bd4c4d6885"/></dir><file name="head-simple.phtml" hash="8ec0542528c505758b84cad4bcbd5460"/><file name="reject-simple.phtml" hash="4c3e945c7c53ca57b7cd5acbddbe43eb"/><file name="reject.phtml" hash="7ed19f54de6397473d46405e79dc35f9"/></dir></dir><file name="overlay_popup.phtml" hash="94e2b20c69e388247f7593e13e4cc627"/><dir name="page"><file name="footer.phtml" hash="e27a0f0cab4706f140bcc5a66a12bcef"/><file name="head.phtml" hash="5d95792ce437b953557e60e41cff7122"/><file name="header.phtml" hash="e0ea5a8491018ee7ae48760670f2c739"/><dir name="js"><file name="calendar.phtml" hash="f4ac59e22f1041a49a8d1b0ecdbfa268"/><file name="translate.phtml" hash="e079775ae056baa793a9f705fac78f1c"/></dir><file name="menu.phtml" hash="40e19614eb664d68bb7ed9f4634edafe"/><file name="notices.phtml" hash="833664b09febf71bde620e0223d25e88"/></dir><file name="page.phtml" hash="4e507a52e94165a139ec846cb92331e7"/><dir name="pagecache"><dir name="cache"><file name="additional.phtml" hash="d609fc18fcd2084d47dd0f6dab290e58"/></dir></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="de602713ce6e3d010bf57c298022e245"/></dir><dir name="info"><file name="cc.phtml" hash="64b46aed2145f3afae9bbd7e26cf21ec"/><file name="pdf.phtml" hash="f519477e82b9a8f6cfbc8ba95e5cdd97"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="13da9e4d3678d782c6fc756fa2d2fcb3"/><file name="ccsave.phtml" hash="7f2cba5617bd2fc695b62079fdb0336e"/><file name="checkmo.phtml" hash="47e90ffed92e77326f090cab712d92d6"/><file name="purchaseorder.phtml" hash="c68cbea2a94851ca0be2f74e412c4cc4"/></dir><dir name="info"><file name="banktransfer.phtml" hash="263e93d5122dd68c6c59ebc6d172b07c"/><file name="checkmo.phtml" hash="b3b0600f842a41affdbd9c7ad36ad8c5"/><file name="default.phtml" hash="c991fa5f7aaa9531b7db1119bc35dda6"/><dir name="pdf"><file name="checkmo.phtml" hash="8aa671b417391746258446d660aaa634"/><file name="default.phtml" hash="66197f7bf5de4c608bed49b05e6cf517"/><file name="purchaseorder.phtml" hash="fca55f1de42a12a1fd4b195eb5624a2e"/></dir><file name="purchaseorder.phtml" hash="d5002176f401d45b40494e428a478e95"/></dir></dir><dir name="paypal"><dir name="system"><dir name="config"><file name="api_wizard.phtml" hash="7849a9083b412aecd3345104603257b4"/><dir name="fieldset"><file name="global.phtml" hash="7e896362a7afddcd76f019eecab0d56d"/><file name="hint.phtml" hash="fcd99c13e66c66a68740650d9c426bbb"/><file name="store.phtml" hash="f05eed8334cc4d25b3f767e330763cf4"/></dir><dir name="payflowlink"><file name="advanced.phtml" hash="06c5e8c1cbed2c4d5363c66a1d54beca"/><file name="info.phtml" hash="21ebcfce996a9ddedb446573b099a79e"/></dir></dir></dir></dir><dir name="permissions"><file name="role_users_grid_js.phtml" hash="f4cb17fefcca73b09a5f2ae39234f34d"/><file name="roleinfo.phtml" hash="5f2de370b2280607d0b15de16977a149"/><file name="roles.phtml" hash="44f40cb9fdfb7aba5d67c658e279d4f0"/><file name="rolesedit.phtml" hash="ec6b58db148871d221f8441222ab28ec"/><file name="rolesusers.phtml" hash="0057260be86964b6d8d4abf58662037a"/><file name="user_roles_grid_js.phtml" hash="9267240bc35a6f42f6ade61b5575b137"/><file name="userinfo.phtml" hash="b666c1eae5c25a7fc65791626e958b27"/><file name="usernroles.phtml" hash="766c1de65b8c8f360ddaa5006e900515"/><file name="userroles.phtml" hash="fe9a9103b4570408de2d98f5a36efcc0"/><file name="users.phtml" hash="5d0d989d2e17c90f70c894518e4f8dfa"/></dir><dir name="poll"><dir name="answers"><file name="list.phtml" hash="fa2195f0a5900c9ac8719507fdd752d8"/></dir></dir><file name="popup.phtml" hash="211a30735ddde8da665b221e0b923531"/><dir name="promo"><file name="fieldset.phtml" hash="27ed97b021dc2c86f9e5d76a0129446a"/><file name="form.phtml" hash="f35f78df885c20e04c668208a61ed456"/><file name="js.phtml" hash="6b707435a723964017e086367406d2d3"/><file name="salesrulejs.phtml" hash="f7e845e237a2f350bceda095161cb9cb"/></dir><dir name="rating"><file name="detailed.phtml" hash="9e1905b87ea7f65602d791dca4081f9c"/><file name="options.phtml" hash="26f9a556171fadae7a9f00dda42373c7"/><dir name="stars"><file name="detailed.phtml" hash="664a285b0bd9aeeacf7fe0e0cce77e64"/><file name="summary.phtml" hash="ad43244178466728fa9548abcfb330f3"/></dir></dir><dir name="report"><dir name="grid"><file name="container.phtml" hash="949003640a4e77dd1eb112fe7b36f29c"/></dir><file name="grid.phtml" hash="e2796d41842f8eb16e3cf95e65c565bb"/><dir name="refresh"><file name="statistics.phtml" hash="754c977a85944e84b58c6d5994a9e5c8"/></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="1b270e0e315aa297e35001e886311c8d"/></dir><file name="switcher.phtml" hash="a344572f8deb1108a889d2109e795e9b"/></dir><file name="wishlist.phtml" hash="11e49d3f6d8cd55f9d10848fd7a620bc"/></dir><file name="resetforgottenpassword.phtml" hash="179bfd294427de2afddf26e43ba3419f"/><dir name="review"><file name="add.phtml" hash="28cdc93c1dd6a5bf0391c8c5d4ef2957"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="form.phtml" hash="b878b61f3e089aa935b294e29af9edcd"/><dir name="view"><file name="form.phtml" hash="76166e5edbfde42110a6eebeb998bb95"/><dir name="tab"><file name="info.phtml" hash="b98b73404e409b752c129512b54edd33"/></dir></dir></dir></dir><dir name="items"><dir name="column"><file name="name.phtml" hash="881307bef1a1d1a5161c790a09e985b5"/><file name="qty.phtml" hash="f5698a5ffbcc7c2f3a3129750ff26baf"/></dir><dir name="renderer"><file name="default.phtml" hash="2228548ddc8331fc366f8cf93b27ccb3"/></dir></dir><dir name="order"><dir name="address"><file name="form.phtml" hash="888398a314a13309f90780b3ac502e51"/></dir><dir name="comments"><file name="view.phtml" hash="9bbc1ee3d1a89650e53275b81999cbfc"/></dir><dir name="create"><file name="abstract.phtml" hash="68732b0fb6af4ee5b9d8bdb8e5e54083"/><dir name="billing"><dir name="method"><file name="form.phtml" hash="c3b50d4216181bd740a617946028c12a"/></dir></dir><file name="comment.phtml" hash="aa98eee21361a42cf7a4e7c13aa82f05"/><dir name="coupons"><file name="form.phtml" hash="d35cff4b9fa305964864c66139d01073"/></dir><file name="data.phtml" hash="e44deeceb9d881a816802f98988a6c66"/><dir name="form"><file name="account.phtml" hash="55322f65447a7c460e0c68e0572811d4"/><file name="address.phtml" hash="70460bbdaf72001eecbf971b3cb0fc2b"/></dir><file name="form.phtml" hash="fbccffd74638e36da5ad6ec67fb4a9d1"/><file name="giftmessage.phtml" hash="9954c5026a9d98d38d99b5d58df1f2fa"/><dir name="items"><file name="grid.phtml" hash="bc845d30d5052e19edd305cd83eb05d0"/></dir><file name="items.phtml" hash="66b2e2c6687a66f97d555889319654c5"/><file name="js.phtml" hash="1e68583847553bd7024c7ca78f14d927"/><dir name="newsletter"><file name="form.phtml" hash="0a46fe2fc7ab1313cf7870e21a2039e0"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="3140a17f15733b16a7096439f76a919e"/></dir></dir><dir name="sidebar"><file name="items.phtml" hash="b031937c6d99776db67cddb56422d87b"/></dir><file name="sidebar.phtml" hash="02b4f31daee4d9885dbe2e3d158d490b"/><dir name="store"><file name="select.phtml" hash="285b00cfabf41439f641d0fa392a2b38"/></dir><dir name="totals"><file name="default.phtml" hash="f95af8298a5137ddac83c8793d5542fb"/><file name="grandtotal.phtml" hash="c1a909e10d5c92d1196df218d37b8c87"/><file name="shipping.phtml" hash="92cd39d62f5ae4a063cf97d4dc753934"/><file name="subtotal.phtml" hash="d6e60ee65fc17c5d6b7935a3fe50f3a3"/><file name="tax.phtml" hash="afe0528ff24d6d823d258325c20e6d95"/></dir><file name="totals.phtml" hash="3ad14c9d582754f2d030429aabdb975f"/></dir><dir name="creditmemo"><dir name="create"><file name="form.phtml" hash="e198ebd0df0a3777c5cd3735bb22cf6c"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="53ff4a22d7da03e8f93ab96f54631ed8"/><file name="default.phtml" hash="886dbe061d47eda60842acdac1d2a51c"/></dir></dir><file name="items.phtml" hash="0a17b4a9c4d3d5eafc427a1e7dbd8f19"/><dir name="totals"><file name="adjustments.phtml" hash="7b871074443bb95aa1ad4ecc09f67ef8"/></dir></dir><dir name="view"><file name="form.phtml" hash="d7def8e12598df1388df8cfdd6056808"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="9268abf07eccbc4c8ff6f6ac29baceaf"/><file name="default.phtml" hash="fdcfbc08c55ac3907762dfd99b463be9"/></dir></dir><file name="items.phtml" hash="44cca32887f1a512ff3580cbe3b2558e"/></dir></dir><file name="giftoptions.phtml" hash="a204623685fd75f317cb2b0c0d03d8e7"/><dir name="invoice"><dir name="create"><file name="form.phtml" hash="bd8ec3705a73dfdcae17ea4cc196a519"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="b378bc865e41ee004b7ad23ded56dc5e"/><file name="default.phtml" hash="6960b8be452717e313c3f31d25389f17"/></dir></dir><file name="items.phtml" hash="05bd310d437d3746e0fcd5eb5742ffdf"/><file name="tracking.phtml" hash="b47e0f141eadc894742b70dcf1915076"/></dir><dir name="view"><file name="form.phtml" hash="79b57e670ac29bd80e84c992a41da161"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="00834aae48514b7e0038b463287a3780"/><file name="default.phtml" hash="34dfb8e55594390a85a89d2def116f9b"/></dir></dir><file name="items.phtml" hash="e57eefe1ea4e4bc8e65ad9dff46bc75d"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="a6d0535095626de53b18450a36873312"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="c3498b4a4ae8ad2f44dafe26be31e548"/><file name="default.phtml" hash="a582b6a05afd4868c1c57752e5469422"/></dir></dir><file name="items.phtml" hash="ba49080c515343a236b8cfafe87ccbf6"/><file name="tracking.phtml" hash="6cc43307a9abfe50fda3bdecc170ee2b"/></dir><dir name="packaging"><file name="grid.phtml" hash="a4634fdad65fde020295279530d53294"/><file name="packed.phtml" hash="a186c42cd32fb065bb8cdf71a6f3c228"/><file name="popup.phtml" hash="893fce5b77c4421e3fd0b8454e13e1ea"/></dir><dir name="tracking"><file name="info.phtml" hash="586668333e8fcd02204b76c15081a678"/></dir><dir name="view"><file name="form.phtml" hash="2f68ed8e4aa300b77fef8284b7a962c6"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="4280ebbe6d25e68a809ec9338036d1a6"/><file name="default.phtml" hash="725e3882fcc9bb2d186ecc8a36f35fdc"/></dir></dir><file name="items.phtml" hash="3be33b7df573c611d943ffad331f44e1"/><file name="tracking.phtml" hash="61a618cf6f643ede113a12fcc716b5d4"/></dir></dir><file name="totalbar.phtml" hash="f9c0a66ae2c811738ad6eee80cd34778"/><dir name="totals"><file name="discount.phtml" hash="d66c6b1c50b4acd5b0ade1e64db98698"/><file name="due.phtml" hash="e700390511e9b00143c5931f732e2e67"/><file name="footer.phtml" hash="74b04a32f272ec944ae4aca4569827c1"/><file name="grand.phtml" hash="5af9d979c637d673c2f09e622a5dd20e"/><file name="item.phtml" hash="8df8f1c58deef31089988e88f1abfdd3"/><file name="main.phtml" hash="788a5912bea56f8c3f6057d1f5fd2736"/><file name="paid.phtml" hash="4266d7aaa5d70406b4d7e7bc13fdb574"/><file name="refunded.phtml" hash="7c4a61420a7971cc6df7fa3465d79d3f"/><file name="shipping.phtml" hash="e38cc3640f3723bb12914bfae0185a33"/><file name="subtotal.phtml" hash="79c4b8b9b1d72c788a778f6754d10d8c"/><file name="tax.phtml" hash="b378dc484acf822fdcdd55ba4c08721f"/></dir><file name="totals.phtml" hash="2aefa78e027dca5a2f1b032f591276b6"/><dir name="view"><file name="form.phtml" hash="e1f793cf6b9486976fd17a3193c6c8eb"/><file name="giftmessage.phtml" hash="df0626bf189981656a538693adc0ddd4"/><file name="history.phtml" hash="fed6caf7fb8d74e2dec086bf4a841421"/><file name="info.phtml" hash="ac00c9fa45c61bb179d1af94418d3cde"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="1d52a5f3ee87ed1c881bc259f17ed105"/></dir></dir><file name="items.phtml" hash="737645b913a1392fdee6cd10ab7e4c7c"/><dir name="tab"><file name="history.phtml" hash="b007a7f7b1fd87fe274b5ee894bc7085"/><file name="info.phtml" hash="6e9e4b56693e03e99d46cc62bc4663ad"/></dir><file name="tracking.phtml" hash="a1ea607e6938366979e9bf51af9fd9a5"/></dir></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="a3ae56e69f1130046feaa26b68fdaa66"/></dir></dir></dir><dir name="recurring"><dir name="profile"><dir name="view"><file name="info.phtml" hash="bf59472f613b30959145d5a4fc2f2055"/></dir><file name="view.phtml" hash="2ec1123d4f0a732767a24bedb9c67eb4"/></dir></dir><dir name="transactions"><file name="detail.phtml" hash="e9aef1d19eefca108731af2394a64c52"/></dir></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="b7ee01017565412c69cf27b7941c9283"/><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="bc70979cb82252e88162f342fc385b90"/></dir><file name="fieldset.phtml" hash="587640c09359d302448000c267f00c39"/></dir></dir></dir><file name="switcher.phtml" hash="57b0c1f999664a1b59d41bd7324c887a"/></dir><dir name="system"><file name="autocomplete.phtml" hash="c6b77c56d1f68eaf7cc2062c3ef50262"/><dir name="cache"><file name="additional.phtml" hash="f20c96feeac8687f624ea59c1b9cdc1c"/><file name="edit.phtml" hash="6f336781a355ca1f02bf3191fb34ea60"/><file name="notifications.phtml" hash="57bb85775f48d8a15a1e8095d1de4346"/></dir><dir name="config"><file name="edit.phtml" hash="55a48098d0509224d5d97980e02543d5"/><dir name="form"><dir name="field"><file name="array.phtml" hash="55785c479306d2a817f004f09581f2f6"/></dir></dir><file name="js.phtml" hash="a3f08cfab54587de1af2324426a62e00"/><file name="switcher.phtml" hash="29be1b9f27c3e6d4ce996f033a0919eb"/><dir name="system"><dir name="storage"><dir name="media"><file name="synchronize.phtml" hash="21e5ed17aeff7c41bbf91729e273c96d"/></dir></dir></dir><file name="tabs.phtml" hash="e02a1750e75999e4c30c22c62a86919a"/></dir><dir name="convert"><dir name="profile"><file name="process.phtml" hash="2027dc969ceeb5244b9941e2f7188d25"/><file name="run.phtml" hash="8314278f7c72dd49f72bd1d23260f360"/><file name="upload.phtml" hash="0376f43508fe8248beade715e50b6380"/><file name="wizard.phtml" hash="99bc610bff250c52882a6bcce7326898"/></dir></dir><dir name="currency"><dir name="rate"><file name="matrix.phtml" hash="f22ef74e19360f9c734757fa8cb302bb"/><file name="services.phtml" hash="9847a573bf4ae7573b1b117b5e054472"/></dir><file name="rates.phtml" hash="6ce061fa22e053319ecd8fd441d505d9"/></dir><dir name="design"><file name="edit.phtml" hash="6cbc6bedb2cb8b83c945f78b4e38c421"/><file name="index.phtml" hash="57c30650e2dd93cb29773efb3c4a9dc1"/></dir><dir name="email"><dir name="template"><file name="edit.phtml" hash="dd551e820e2f3aacd838e972549a110a"/><file name="list.phtml" hash="0d51d69f410ccb623225c54973156ff9"/><file name="preview.phtml" hash="57bfb853fcbfadfac43dca2cf7b814ea"/></dir></dir><file name="info.phtml" hash="f528b6d7eabf061865a212024a51348e"/><dir name="shipping"><file name="applicable_country.phtml" hash="67fc9abf4bc7aecbc0bdc551bb687de8"/><file name="ups.phtml" hash="5f59adf3768a2342fd9d8d12623fea38"/></dir><dir name="variable"><file name="js.phtml" hash="cfd6353ef018f34527e349f1d15bc78b"/></dir></dir><dir name="tag"><dir name="edit"><file name="container.phtml" hash="cf9d138f0d108c21bf24cb447d71151e"/></dir><file name="index.phtml" hash="8ee7a37d2c937629f853c8e1df7e5fbf"/></dir><dir name="tax"><dir name="class"><dir name="page"><file name="edit.phtml" hash="f88bfccd01b8aaaab46a917527fe3d27"/></dir></dir><file name="importExport.phtml" hash="4d38f0bbce2f5619a8537f222e892631"/><dir name="rate"><file name="form.phtml" hash="c56be3eec42fcd4f47dc388e8d3484ab"/><file name="title.phtml" hash="6ca23e32838ad31b32071543fee82821"/></dir><dir name="toolbar"><dir name="class"><file name="add.phtml" hash="51894cb7186b80095a8c973ccf21da5c"/><file name="save.phtml" hash="54af0998433b4fa521f65be11e9c3871"/></dir><dir name="rate"><file name="add.phtml" hash="347929d575484c24cac216c07fe7caac"/><file name="save.phtml" hash="d59d04830f862891b6d68a0e7bac4c01"/></dir><dir name="rule"><file name="add.phtml" hash="1fe26ed1d323556e0453652a463381de"/><file name="save.phtml" hash="178b8fe11bc0d73d3606649372e6f053"/></dir></dir></dir><dir name="urlrewrite"><file name="categories.phtml" hash="5d823dd7a8c9f6a1e89a1018dc10f092"/><file name="edit.phtml" hash="593d5df3d0b798cdebb300e01627f816"/><file name="selector.phtml" hash="117d36df145429cca4f60c99957ca647"/></dir><dir name="usa"><dir name="dhl"><file name="unitofmeasure.phtml" hash="5bb5d7e8382adeb325031b916721a3cb"/></dir></dir><dir name="weee"><dir name="renderer"><file name="tax.phtml" hash="7b0526557d64d459d9b7a949c7b95490"/></dir></dir><dir name="widget"><file name="accordion.phtml" hash="48553fb10937c141d417225d56ad94a3"/><file name="breadcrumbs.phtml" hash="57edf19ce7999e9eae91dd92d3638e5c"/><dir name="form"><file name="container.phtml" hash="7e7e8c1ee8e03e7ed9869c09e25a5a0a"/><dir name="element"><file name="gallery.phtml" hash="9da2bd780a35b86ef66ee787223fc1a8"/></dir><file name="element.phtml" hash="6b358e48f756e5e55451a9d00a452936"/><dir name="renderer"><file name="element.phtml" hash="925c9b11fe2183088e4e4145a9cef7a8"/><dir name="fieldset"><file name="element.phtml" hash="4edd4cad53ae4aaee43bdf44ae6aca96"/></dir><file name="fieldset.phtml" hash="012a27d9b938e558aba19b2e36c1f9c2"/></dir></dir><file name="form.phtml" hash="c7e2e7085c21cf12be835b56ac05d005"/><dir name="grid"><file name="container.phtml" hash="318ff0e096840cfcc66c7bdec0a4dcc9"/><file name="massaction.phtml" hash="3aeaaa2894c173cfc15705ab747ac2b6"/><file name="serializer.phtml" hash="7a2305c5de079aded175830bc0075afc"/></dir><file name="grid.phtml" hash="4a4380543347bd6f63c96a70ca83b822"/><dir name="instance"><dir name="edit"><file name="layout.phtml" hash="33f7187f307c32a2444cfe7091bf402c"/></dir><file name="js.phtml" hash="3022c3ee5b9d7224bbfbca7d5e697553"/></dir><file name="tabs.phtml" hash="90a072b56582b35ea11f560d4fbd0edc"/><file name="tabshoriz.phtml" hash="876a21e3cc5121c8608bc6948248c683"/><file name="tabsleft.phtml" hash="636b477b649c28aa48c4f55bddd0045a"/><dir name="view"><file name="container.phtml" hash="5388d51591b9b3034dd2fb9d4a52b0ac"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="below_ie7.css" hash="b2bf3a91f389f2ea7912765a814ce10f"/><file name="boxes.css" hash="1cbeca223c2e15dcaf500caa5d05b4ed"/><file name="custom.css" hash="30ed634c4e5d7521cf9961c880c3cba4"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="ie7.css" hash="15db0c436a5438265a91b2c1e4ac4626"/><file name="iestyles.css" hash="f76a77ec3d1127522642b69d28a86154"/><dir name="images"><file name="accordion_close.gif" hash="875409122fc82f5f6705e20dd801fd3d"/><file name="accordion_close.png" hash="6213698b5f69bb2907a5c7bb94b5fe8d"/><file name="accordion_open.gif" hash="d9d50e220b0b676094c6134a9708194e"/><file name="accordion_open.png" hash="9fbc3aba23ce5e0465e4d1cf3f6a7aee"/><file name="add_btn_icon-disabled.gif" hash="c8f6a5cfb455ef121efb56a747821f82"/><file name="add_btn_icon.gif" hash="7300097305b577ee564dc49102822d16"/><file name="address_list_li.gif" hash="79b917b514e35ce0a7833a5e268fd9f7"/><file name="address_list_on_arrow.gif" hash="3a2884ddcc87ebd48883662530b9de1b"/><file name="address_list_over_arrow.gif" hash="e826883c71b1184bd4f29433e39c18ad"/><file name="address_list_over_bg.gif" hash="56291480cc89de9d817205a5f23b66dd"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="arrow_sort_move.gif" hash="f5ac151a2b0cb1f07d6e771b8aee0ea7"/><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_create_order_totals.gif" hash="ff6ab75c050b959c539cc6a6fdff2934"/><file name="bg_notifications.gif" hash="a365594725a83585d989f722b3d8c458"/><file name="bg_window_mask.png" hash="93d6efad062d24c94c105802b138b6a5"/><file name="bkg_btn-close.gif" hash="df3f2332f0bad01e031deb22b81f630c"/><file name="bkg_btn-close2.gif" hash="822457d78fb3c21dc12e9777d83eb4f1"/><file name="blank.gif" hash="5722d7bd0f1e1379d0a2005a0a9ea401"/><file name="box_bg.gif" hash="4c501bd6db9d361c18780f106a809b03"/><file name="breadcrumb_bg.gif" hash="72c4adf6c75b4640ca8f7cadffa42266"/><file name="btn_add-image_icon.gif" hash="1d42210fd29fc534d9ed6b41e811d40f"/><file name="btn_add-variable_icon.gif" hash="a2db02e318d107d5b57b444c8d80b8f8"/><file name="btn_add-widget_icon.gif" hash="b4f66ca7f6097fbafd672e0b3f076ef4"/><file name="btn_add-widget_icon2.gif" hash="467acd3a14fb8be37191f5d2ec5a5b13"/><file name="btn_back_bg.gif" hash="8be512788b8044fe31aa8d00cc16ba7b"/><file name="btn_bare_bg.gif" hash="ddbbab8c0d201c3e502d50e7d4a3d64b"/><file name="btn_bg-disabled.gif" hash="079971a9d2c385fe353d35716ec9f26b"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="btn_bg.png" hash="6e3b7003381f919e8f6533444afaa978"/><file name="btn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="btn_delete_bg.gif" hash="ad740d0c16f2f6603c8ef023004d6539"/><file name="btn_go.gif" hash="1bd787868713767cc205e2ee25e41f62"/><file name="btn_gr_bg.gif" hash="6cc324b79a512150fee24fb3517d22cb"/><file name="btn_gr_on.gif" hash="820c134df02f7bc12efa5a9ac3b4d3dd"/><file name="btn_gr_over.gif" hash="d4c8b807d64c1f493d17c6c9d2bab69a"/><file name="btn_loading-icon.gif" hash="45f500105be432a12c78fed2b4592cf9"/><file name="btn_login.gif" hash="79fa32d49d3f4e39d3fbf8327f9229e1"/><file name="btn_on_bg.gif" hash="709cf5b0be137db1ef8427688503bf37"/><file name="btn_over_bg.gif" hash="f91641168454c03d1fa72731ec97a2b3"/><file name="btn_show-hide_icon.gif" hash="0238c509b33ba56c25df9513bb48f804"/><file name="btn_task_bg.gif" hash="5e0594bd9cbfcc1e32ffa918d7f9c812"/><file name="button-close.png" hash="04d0907b2d7fc3240693497b199f64f5"/><file name="cancel_btn_active_bg.gif" hash="91ce403d286eef2b4e0c13733875882f"/><file name="cancel_btn_bg.gif" hash="26749cf4949ac27c30f597434d3bde65"/><file name="cancel_btn_icon.gif" hash="97e0cd94ed31d6f2a1181f627e60e9a3"/><file name="cancel_btn_over_bg.gif" hash="45eb4e883b17375961672f5390387c31"/><file name="cancel_icon.gif" hash="70a23b78353f0a7b9b118a937fcb7ea9"/><file name="config_tab_dt_bg.gif" hash="a33f71077ca4078caa794cae01d9fca7"/><file name="dashboard-close.gif" hash="5ae5afd61e937fcd2d5b84641255ee4d"/><file name="db-graph-bg.gif" hash="5d76efb7c3244f5684df2566782124ea"/><file name="db-graph-bottom-bg.gif" hash="b58ced87a38a10891106329ae882aa1c"/><file name="db-graph-line-bg.gif" hash="f16bb08e040c2c0a3e23b3f35c54b79b"/><file name="db-graph-line2-bg.gif" hash="744ebfdba20d050f4d252afc216394be"/><file name="db-graph-x-bg.png" hash="d5c26510718a78d22083916d80ef7a22"/><file name="db-header-bg.png" hash="3976cb6351e167686a501a85cf3a68e9"/><file name="db-menu-bg-hov.gif" hash="34ea76a6d105d90fcb63bf105aadb8f7"/><file name="db-menu-bg-up.gif" hash="b0f754872dff5f2f0dc57ba193fdfa4c"/><file name="db-menu-bg.gif" hash="ea534c3c09bb309e566b6ae876655e13"/><file name="db-menu-sep-last.gif" hash="a01fe34854e1187e466fd58d462c4106"/><file name="db-menu-sep.gif" hash="7c5ae1cd59a189261cc3244358d5c1ad"/><file name="db-menu-start.gif" hash="aa5cac2194d937cc7fa904ccfce70ecc"/><file name="db-scroll-bg.gif" hash="06d2411e3b5f350ab21b625439d2d69d"/><file name="db-scroll-but-bot-roll.png" hash="6bc5e482f3f6d8fb1fc5014ddea43706"/><file name="db-scroll-but-bot.png" hash="25c0181e76ff8ceb3c0ec59071b8c72c"/><file name="db-scroll-but-top-roll.png" hash="b7961f2a3b5b641694a9b0b30d58e46b"/><file name="db-scroll-but-top.png" hash="de7df96e961596be9ff556924259b98b"/><file name="db-scroll-roller.png" hash="e01dde7bd096c52179acf29a425a29e5"/><file name="db-tab-bottom-left-bg.gif" hash="124388d44ac58b029377c6311a4782d5"/><file name="db-tab-bottom-mid-bg.gif" hash="9c48f33aa8907cfcb227bc779c2e1dce"/><file name="db-tab-bottom-right-bg.gif" hash="1db45e6fd8abc67d59f96a676607b412"/><file name="db-tab-footer.gif" hash="cac8928acba75bc1edd73186ced78e5c"/><file name="db-tab-header-sep.gif" hash="580312af7441b6a62f7e32081c40fb0f"/><file name="db-tab-header.gif" hash="fdf493b9477fcff7e7be98405effc33d"/><file name="db-tab-left.gif" hash="3fe3c55267dbbdd1db2ff959ccc9e0be"/><file name="db-tab-right.gif" hash="b7a32c8b03efe2fbdb63215d0446e3be"/><file name="dotted_divider_dark.gif" hash="8bf1de196d9ea048bfb25155cedd2e9e"/><file name="dotted_divider_light.gif" hash="92e562bf2070110f6b0a15e29b845445"/><file name="edit_icon.gif" hash="dbda31751c78d964c04394e9d8533187"/><file name="entry_edit_head_arrow_down.gif" hash="985c3ce4439fbf8bb2216fc7e73a3f0b"/><file name="entry_edit_head_arrow_down2.gif" hash="d68dd0fbc2819858a26ea2835c05df77"/><file name="entry_edit_head_arrow_up.gif" hash="d2b90a1823fff9f3917f19b427410144"/><file name="entry_edit_head_bg.gif" hash="1086b7196e8b33c4f46e49fecef0f35f"/><file name="error-msg.png" hash="3cd27b642416dacdc28907c89d934886"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_account.gif" hash="c910fd1ff41b940d71b0835e02fc143e"/><file name="fam_application_form_delete.png" hash="972c2d998fc19572dd64af6b5e2e898e"/><file name="fam_application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="fam_asterisk_orange.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="fam_bin.gif" hash="2fb388bc9f1d32d3802db8e91dc238bc"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="fam_bullet_disk.gif" hash="9fe82691d960c18d3d315c3f9164af4f"/><file name="fam_bullet_error.gif" hash="008802f44288b732b59cfe9fdbfecefe"/><file name="fam_bullet_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="fam_calendar.gif" hash="0614207ce4e3e0a9bd631b39e7692e3c"/><file name="fam_cart.gif" hash="1f2fd2c8ac6574488ea78302b6856191"/><file name="fam_comment.gif" hash="5138f9a4b6019a5b14b8ff9a32a3cb89"/><file name="fam_creditcards.gif" hash="b75b8ce2f4fceb58f8082c48344560c7"/><file name="fam_folder_database.gif" hash="e86175ff0f389ade1fc7bf15e03346eb"/><file name="fam_folder_palette.gif" hash="c0941b9145e06d53cc0d17ac4c151764"/><file name="fam_folder_table.gif" hash="e2914ba75944acd2a9e2d338fa339e16"/><file name="fam_group.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="fam_help.gif" hash="2b5ed4c13a8e24456207b757826c7b2c"/><file name="fam_house.gif" hash="8eb2d580c5a40b7974f4263ca64fb94a"/><file name="fam_layout.gif" hash="5366a5f02260d3a860ef0c4787282ad6"/><file name="fam_leaf.png" hash="078d4f24683331b4557356a59e67b125"/><file name="fam_link.gif" hash="78590d5d8375d1baabe7b66d7b9ceb7d"/><file name="fam_lorry.gif" hash="174e86e45e76e7008fa3510cefa85047"/><file name="fam_money.gif" hash="6996bad465222fb6487cab94b4607846"/><file name="fam_money_add.gif" hash="70ceed401fe9913305f2362f7e26225d"/><file name="fam_monitor.gif" hash="f3bc806ff9d0907320b03018ba2d00ea"/><file name="fam_newspaper.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="fam_newspaper_delete.gif" hash="41acabfc19102be92d3ccbc66d1fede3"/><file name="fam_newspaper_error.gif" hash="009bfa425298e1d2e44e38e58cd97938"/><file name="fam_newspaper_go.gif" hash="eb43105f8e13e3a752d7ca33bb086831"/><file name="fam_package.gif" hash="bf9be09ef64d006455baa211b7c03983"/><file name="fam_package_go.gif" hash="e4f8d380c2f8e5a7345e360293433764"/><file name="fam_page_white.gif" hash="26940eb67826c5af72b6048c7c5a8335"/><file name="fam_page_white_edit.gif" hash="a4f88300b74ad592a5c47ed54ff07af9"/><file name="fam_rainbow.gif" hash="e8b04cc945b3582a181d4ddbc2d2325f"/><file name="fam_refresh.gif" hash="01bbef614023c0890812e76bc7ecf7e0"/><file name="fam_server_database.gif" hash="7901fa06ffd68ed730cf43bb560756fd"/><file name="fam_status_online.gif" hash="a80019ffa3a573f709772ed1099343fc"/><file name="fam_tag_orange.gif" hash="6ce735a0e590bda040b6e1614c42e58a"/><file name="fam_user.gif" hash="63bbdd6d9d7a27591907a7b87898e259"/><file name="fam_user_comment.gif" hash="014dfd31d9af40e3d5960b2b0d900da3"/><file name="fam_user_edit.gif" hash="f5b36e803060c6b82e639a4fad57b9f7"/><file name="filter_row_bg.gif" hash="013a0929a7b2ddc6823bdda17d08acc0"/><file name="footer_bg.gif" hash="7724711d3ca07a5e46a6030e86743a71"/><file name="gift-message-collapse.gif" hash="5b710f5faa9c7352a39c10e3ebbee6fc"/><file name="gift-message-expand.gif" hash="fd53a70cbb1ea048754657a63787e9cb"/><file name="gift-message-grid-column-bg.gif" hash="97a8a9b8cc4ab68e7404ccf1320f50a6"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="grid_sort_asc.gif" hash="b78c3a1a27ac9672a31b7d1bbac60322"/><file name="grid_sort_desc.gif" hash="d958b946eba3dba863d724530a0dba1a"/><file name="grid_th_bg.gif" hash="8f4349fac728858374e17edf03390977"/><file name="grid_th_onclick_bg.gif" hash="7bf331e2a41e5331c4210bdc6adc4383"/><file name="grouped_to_order_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="header_bg.gif" hash="cbe510856afa5cb0c32642c1f9a8eceb"/><file name="header_top_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="horiz_tabs_ul_bg.gif" hash="58dbd9c45f76993346c2bb788896248e"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="i_question-mark.png" hash="23201b7ac207eebd9be0776ea44098a4"/><file name="ico_success.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="icon_btn_add.gif" hash="7300097305b577ee564dc49102822d16"/><file name="icon_btn_back.gif" hash="89ed97cede3f68241446a62c96e3ce4c"/><file name="icon_btn_delete.gif" hash="dbde0b76d36cfd624bf0de166d0a265e"/><file name="icon_btn_save.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="icon_edit_address.gif" hash="d1ca2bb3a5c86afd379f25d9fc4352e3"/><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/><file name="icon_export.png" hash="fb299dd13df666516eabe16f59193383"/><file name="icon_feed.gif" hash="0366583ed6e285d028442fcdebb05072"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_note_list.gif" hash="8d25ba225ca09b687a78bff510df5d10"/><file name="icon_remove_address.gif" hash="2de2b3d02c19adfb93e9e43a392db178"/><file name="login_box_bg.gif" hash="e4654826eaa8d5ebc0ab18e9bee71e1d"/><file name="login_box_bg.jpg" hash="404e37f4ee9f4ff9bfcb638741c7581d"/><file name="login_box_bg_auth.jpg" hash="d90a81db1064ec37b0cc92436725c24b"/><file name="login_box_bottom.jpg" hash="038f15261e74bc381484f2fcfa45a73b"/><file name="login_box_legal_bg.gif" hash="528ac4dd480c4fc00ac808bf17394c05"/><file name="login_logo.gif" hash="9cc90e7aa1210883000fe5319862ce14"/><file name="logo-large.gif" hash="5c77654c424b0a35cc24d28df5166dc4"/><file name="logo.gif" hash="c7e9f290d965f707e4c4a61bfdab58cb"/><file name="massaction_bg.gif" hash="8b5f4db3ab3ea09cd5bd0164d67c4f0d"/><file name="massaction_button_bg.gif" hash="4c8262817e48d007237124ce0e7f4d18"/><file name="massaction_links_delimiter.gif" hash="9a0337183b5b67c0eed75993d7f14d10"/><file name="middle_bg.gif" hash="ba4f176d2c553201ebab4aba5c6d3d20"/><file name="more_arrow.gif" hash="38bb4c0e9270250151486d0bb36c476f"/><file name="nav1_active.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_bg.gif" hash="a1d4ef5b590ce0a425dc04e45ed06cbe"/><file name="nav1_off.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav1_on.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_over.gif" hash="2c70d6175f1c965c27dda0598a67e63c"/><file name="nav1_sep.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav2_last_li_bg.png" hash="279935c9799679fc5894337eaabc7cf0"/><file name="nav2_last_li_over_bg.png" hash="39536f00824293d11242888a76f40a5f"/><file name="nav2_li_bg.gif" hash="0a4f34b0e4436c519d31203f19503b83"/><file name="nav2_li_bg.png" hash="2fad219d162324e9a19f2745d5b6d562"/><file name="nav2_li_over_bg.png" hash="dc37c4a4aab40ea2ae44dea5ea133a9d"/><file name="nav2_link_bg.gif" hash="dce00ddad351e72e83bc87274cbaa54a"/><file name="nav2_parent_arrow.gif" hash="60e012a14a077bd2257343facc369c0c"/><file name="nav3_bg.png" hash="2bc7af80ad8886013da38401b63ab6df"/><file name="nav_bg.gif" hash="1b857c7d35f35ef9f6cae9e03a4e3dff"/><file name="nav_list_bg.gif" hash="7a4e2bdb887c12d8a1152bbcc8c02a3c"/><file name="nav_nest_link_bg.gif" hash="1d0c6b374bf02ac4b5aa012955c431de"/><file name="nav_nest_link_over_bg.gif" hash="fae3c579a4d432503b1f4f929d070609"/><file name="nav_on_bg.gif" hash="ac624b580cae5a76f6c92abc5a44191d"/><file name="nav_parent_arrow.gif" hash="3a95559263e569dc1c8065cb2d9b3f2c"/><file name="note_bg.gif" hash="105967d7c15ab4610726eea52d862a97"/><file name="note_cell_bg.gif" hash="71e656d42f8ba8c2d477c6866c499b71"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="notice-msg.png" hash="9cd1dfebccec8a2123d543fa49b17bd7"/><file name="pager_arrow_left.gif" hash="6e44f608dac8eb8be1d1ebee5a3285aa"/><file name="pager_arrow_left_off.gif" hash="30f5e56195ab3546b36f4016db5254be"/><file name="pager_arrow_right.gif" hash="cc79526156b7e0c8abce61fad3d53f77"/><file name="pager_arrow_right_off.gif" hash="f01b7dad9acf0180b5c62edbd7ea9939"/><file name="paypal_logo.gif" hash="871e205a64292121f4c893373acfb581"/><file name="paypal_section.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="paypal_tick.gif" hash="e8685c1fb7c4c106ae4fd24e9bbf5a27"/><dir name="placeholder"><file name="thumbnail.jpg" hash="5c73b5aa515b1719f7b398f5131f91a8"/></dir><file name="process_spinner.gif" hash="345b30b4d0b6088d0151ecfbdf48c036"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><file name="rule-ajax-loader.gif" hash="32dc1f5901143d36fbd7a6df3950819f"/><file name="rule_chooser_trigger.gif" hash="9c498e789c3ce734f5301c2475e2a04c"/><file name="rule_component_add.gif" hash="7914e57701ca26f5c8bf23c6bc3e1f25"/><file name="rule_component_apply.gif" hash="3f9b9025551da6963a9ecf8d184a204a"/><file name="rule_component_remove.gif" hash="4d785bcecfbe716fa4d749d20738a8f0"/><file name="save_btn_icon.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="sec_nav_bg.gif" hash="99c6741591cdb2a2a128668a1d32d668"/><file name="section_menu_bg.gif" hash="f9edd44c92743a0c9ae9535a7992d6b1"/><file name="section_menu_bottom.gif" hash="167d2ef46ff80158c807b4b916501b28"/><file name="section_menu_link_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="section_menu_link_over_bg.gif" hash="7da7e56567633aab279cf3aec6f49d8d"/><file name="section_menu_over_span_bg.gif" hash="f5ea5292f15ed62b99f0f51d9fff2c66"/><file name="section_menu_span_bg.gif" hash="dbf3916358e794ee809b4cf33903af2c"/><file name="section_menu_ul_bg.gif" hash="3aea6e5452f548438ca34e17954a9d6b"/><file name="side_col_bg.gif" hash="b3691fd62663457af39eaf71dd8cda5a"/><file name="simple_container_bg.gif" hash="56f1ac91169eb4896b8c91384fc8bf15"/><file name="sort-arrow-down.gif" hash="fc2cd9f756ce510c4470478d720f81cd"/><file name="sort-arrow-down.png" hash="dc65160d9d4d6cdd6bfe1b397a931975"/><file name="sort-arrow-up.gif" hash="39026b0ff1f0c18091caa60384491163"/><file name="sort-arrow-up.png" hash="da54e5306bdce67551aa415f5d7f7ea7"/><file name="sort_heading_bg.gif" hash="6066d09f237f556b0a4770e4788e7598"/><file name="sort_on_bg.gif" hash="0cb36788ed4fbf19e657acbc75a3f1b8"/><file name="sort_row_bg.gif" hash="f2e1c5cb26b9f5211419b99d30745244"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="sub_button_bg.gif" hash="e3f66dd60510f9f7e937e2e55442c30a"/><file name="success-msg.png" hash="c64cb2acc3d0eeba48fdea83620913ed"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="tabs_link_bg.gif" hash="34447929f5e6591ba9b5795b983fdfd4"/><file name="tabs_link_over_bg.gif" hash="2cf3f56884096055fb0bdf9474f280c9"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="tag_blue_edit.gif" hash="b2163ac3baf7d822b48593342846645a"/><file name="tn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="tooltip_bg.gif" hash="0aa4b866fc067a75f27ab749c1dabf74"/><file name="tooltip_corner.gif" hash="71146534671d5e0751505640b7c59859"/><file name="tooltip_top.gif" hash="032ff52a6ff5714cbdf6c1f62abaf7e5"/><dir name="tree_icons"><file name="join.gif" hash="4d5d614e0da056df815a4306d6368692"/><file name="joinbottom.gif" hash="4b3daa7f2cc584f1aac0d142275d7cba"/><file name="line.gif" hash="63ab38a6203262f15ca46c631232ea2c"/><file name="minus.gif" hash="d647fbbd0ec410b8f3bb3357b62eedcf"/><file name="minusbottom.gif" hash="b09d684cca7135ef728141aaf2464baa"/><file name="nolines_minus.gif" hash="eb2243a354ffcfac93ba0fe948f7167d"/><file name="nolines_plus.gif" hash="ec92b634b63608fb4b0dbf114e3b89e1"/></dir><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><file name="varien_logo.gif" hash="6f10d0fe572cb012947c164217e9e428"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><dir name="widget"><file name="catalog__category_widget_link.gif" hash="8435943009f1f774bbd6a4809c719eb8"/><file name="catalog__product_widget_link.gif" hash="62f2d7020143f98ba7514469eb612a7f"/><file name="catalog__product_widget_new.gif" hash="37a5af9f98ae73e180ad0cca05c95324"/><file name="cms__widget_block.gif" hash="b7b0b1517cc38b18b92841b33b312190"/><file name="cms__widget_page_link.gif" hash="b839dee210e61850a5858cc8634cbccd"/><file name="default.gif" hash="684143ae5531aa6ba22215f4fadeea6c"/><file name="reports__product_widget_compared.gif" hash="bd3e5a5015eb2c5c64f1d11835166dc4"/><file name="reports__product_widget_viewed.gif" hash="44d5cd71e4fb7235f9cff0c7e2b2f531"/></dir><file name="widget_placeholder.gif" hash="2bd8d72cf12f8d7d0a6a3268f97786ff"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/><file name="window_content.png" hash="08361df29783d46a2493cf0d8ad733a7"/><file name="window_top.png" hash="555a8db5efa3a252c2ead3d3dadd1075"/><dir name="wysiwyg"><file name="skin_image.png" hash="a521b0c60b001de4a3405e73c4a6cd4a"/></dir></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="a0b153cee7655dad31ee2923657cc08a"/></dir></dir></dir></dir><dir name="media"><file name="editor.swf" hash="259afd515d7b2edee76f67973fea95a6"/><file name="flex.swf" hash="60a8c242ca2ff0e70ed9a038749f4cc1"/><file name="uploader.swf" hash="1c300001dadd932ef6e33a2fadf941e1"/><file name="uploaderSingle.swf" hash="304dd960698c5786dcd64b0e138f80ca"/></dir><file name="menu.css" hash="6f39c760b70b8250c193c5311885193a"/><file name="oauth-simple.css" hash="c8ba6fccc85ce28f4360b10b5b59adb9"/><file name="print.css" hash="db77a54f0e6a7146cad6566eb200a0d5"/><file name="reset.css" hash="d45948716e2dd828a40715b9a43e2115"/></dir></dir></dir></target></contents>
|
| 16 |
Â
<compatible/>
|
| 17 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package></required></dependencies>
|
| 18 |
Â
</package>
|
skin/adminhtml/default/default/boxes.css
CHANGED
|
@@ -90,9 +90,9 @@
|
|
| 90 |
Â
position:fixed;
|
| 91 |
Â
top:45%;
|
| 92 |
Â
left:50%;
|
| 93 |
-
width:
|
| 94 |
-
margin-left:-
|
| 95 |
-
padding:15px
|
| 96 |
Â
background:#fff4e9;
|
| 97 |
Â
border:2px solid #f1af73;
|
| 98 |
Â
color:#d85909;
|
|
@@ -134,6 +134,9 @@
|
|
| 134 |
Â
.grid th { white-space:nowrap; }
|
| 135 |
Â
.grid td.editable input.input-text { width:50px !important; margin-left:4px !important; }
|
| 136 |
Â
.grid td input.input-text { width:86%; }
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 137 |
Â
.grid td input.input-inactive { background:#eee; }
|
| 138 |
Â
.grid table td { border-width:0 1px 1px 0; border-color:#dadfe0; border-style:solid; }
|
| 139 |
Â
.grid table.border td { background:#fff !important; }
|
|
@@ -205,7 +208,9 @@ table.actions td { vertical-align:top; }
|
|
| 205 |
Â
.grid tr.filter .range select { float:right; width:56px !important; margin-top:0; }
|
| 206 |
Â
.grid tr.filter .range .label { display:block; width:36px; float:left; padding-left:2px; }
|
| 207 |
Â
.grid tr.filter .date img { width:15px; height:15px; cursor:pointer; vertical-align:middle; }
|
| 208 |
-
.grid .head-massaction select { width:
|
|
Â
|
|
|
Â
|
|
| 209 |
Â
|
| 210 |
Â
/* Grid Footer */
|
| 211 |
Â
.grid table tfoot tr { background:#D7E5EF; }
|
|
@@ -270,7 +275,7 @@ ul.tabs a.changed { font-style:italic; }
|
|
| 270 |
Â
ul.tabs-horiz { margin:0 0 18px 0; background:url(images/horiz_tabs_ul_bg.gif) repeat-x 0 100% #f8f8f8; padding:8px 0 0 5px; }
|
| 271 |
Â
ul.tabs-horiz li { float:left; margin:0 4px; }
|
| 272 |
Â
ul.tabs-horiz li a { display:block; background:#e2e2e2; border:1px solid #ccc; padding:2px 10px; color:#333 !important; text-decoration:none !important; }
|
| 273 |
-
ul.tabs-horiz li a.notloaded {
|
| 274 |
Â
ul.tabs-horiz li a.active { border-bottom:1px solid #fff; background:#fff; }
|
| 275 |
Â
|
| 276 |
Â
|
|
@@ -335,6 +340,7 @@ table.form-edit { width:100%; }
|
|
| 335 |
Â
label.inline { float:none !important; width:auto !important; }
|
| 336 |
Â
.nested-content .entry-edit { margin-left:2em; }
|
| 337 |
Â
.nested-content .entry-edit .entry-edit { margin-left:0; }
|
|
Â
|
|
| 338 |
Â
|
| 339 |
Â
/* Form Elements */
|
| 340 |
Â
input.input-text,textarea,select { border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; background:#fff; font:12px arial, helvetica, sans-serif; }
|
|
@@ -352,7 +358,10 @@ select.multiselect option { padding:3px 4px; border-bottom:1px solid #ddd;
|
|
| 352 |
Â
.field-100 { background-color:#fff; border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; padding:2px; }
|
| 353 |
Â
.field-100 textarea,
|
| 354 |
Â
.field-100 input.input-text { float:left; width:100% !important; border:0 !important; padding:0 !important; }
|
| 355 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 356 |
Â
|
| 357 |
Â
/* Form List */ /* Table for default form data */
|
| 358 |
Â
.form-list { width:auto; border:0 !important; }
|
|
@@ -369,6 +378,7 @@ select.multiselect option { padding:3px 4px; border-bottom:1px solid #ddd;
|
|
| 369 |
Â
.form-list td.value textarea { width:274px; }
|
| 370 |
Â
.form-list td.value textarea { height:15em; }
|
| 371 |
Â
.form-list td.value select { width:280px; }
|
|
Â
|
|
| 372 |
Â
.form-list td.note { background:url(images/note_cell_bg.gif) 6px 10px no-repeat !important; padding-left:18px; }
|
| 373 |
Â
.form-list td.scope-label { padding-left:5px; color:#6f8992; font-size:.9em; }
|
| 374 |
Â
.form-list p.note { margin:0; padding:0 0 0 13px; background:url(images/note_bg.gif) 1px 6px no-repeat; font-size:11px; }
|
|
@@ -376,13 +386,13 @@ select.multiselect option { padding:3px 4px; border-bottom:1px solid #ddd;
|
|
| 376 |
Â
.columns .form-list { width:auto; }
|
| 377 |
Â
.columns .form-list td.value { width:280px; padding-right:5px !important; }
|
| 378 |
Â
.columns .form-list td.value .next-toinput { width:75px; display:inline; margin-right:5px; }
|
| 379 |
-
.columns .form-list td.value .next-toselect input.input-text { width:
|
| 380 |
Â
|
| 381 |
Â
.fieldset-wide .form-list { width:100% !important; }
|
| 382 |
Â
.fieldset-wide .form-list td.value { width:auto !important; }
|
| 383 |
Â
.fieldset-wide .form-list td.value input.input-text,
|
| 384 |
Â
.fieldset-wide .form-list td.value textarea { width:98% !important; }
|
| 385 |
-
|
| 386 |
Â
.fieldset-wide .form-list td.scope-label { white-space:nowrap; width:1px; }
|
| 387 |
Â
.fieldset-wide .form-list td.note { width:120px; }
|
| 388 |
Â
|
|
@@ -396,14 +406,13 @@ span.delete-image,
|
|
| 396 |
Â
span.delete-file { display:block; white-space:nowrap; padding-left:25px; }
|
| 397 |
Â
span.delete-file { padding:0; }
|
| 398 |
Â
|
| 399 |
-
|
| 400 |
Â
/* Back compatibility with span forms */
|
| 401 |
Â
.entry-edit .field-row { display:block; }
|
| 402 |
Â
.entry-edit .field-row label { float:left; width:150px; }
|
| 403 |
Â
|
| 404 |
Â
/* Form Button */
|
| 405 |
Â
.content-buttons.form-buttons,
|
| 406 |
-
.content-header .form-buttons { text-align:right; margin-bottom:0;
|
| 407 |
Â
.content-header .content-buttons-placeholder { display:inline !important; }
|
| 408 |
Â
.content-header .form-buttons { float:right; }
|
| 409 |
Â
.content-header td.form-buttons { float:none; }
|
|
@@ -414,6 +423,7 @@ button,
|
|
| 414 |
Â
button:hover { background:#f77c16 url(images/btn_over_bg.gif) repeat-x 0 0; }
|
| 415 |
Â
button:active { background:#f77c16 url(images/btn_on_bg.gif) repeat-x 0 0; }
|
| 416 |
Â
button span { line-height:1.35em; background-repeat:no-repeat; background-position:0 50%; }
|
|
Â
|
|
| 417 |
Â
button.delete,
|
| 418 |
Â
button.save,
|
| 419 |
Â
button.add { padding-left:6px; }
|
|
@@ -424,12 +434,18 @@ button.add span,
|
|
| 424 |
Â
button.back span,
|
| 425 |
Â
button.add-image span,
|
| 426 |
Â
button.add-widget span { padding-left:20px; }
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 427 |
Â
button.back { border-color:#ccc #aaa #aaa #ccc; background-color:#fff; background-image:url(images/btn_back_bg.gif); color:#555; }
|
| 428 |
Â
button.back span { background-image:url(images/icon_btn_back.gif); }
|
|
Â
|
|
| 429 |
Â
button.cancel,
|
| 430 |
Â
button.delete { border-color:#d24403 #a92000 #a92000 #d24403; background-image:url(images/cancel_btn_bg.gif); background-color:#fcaf81; color:#fff; }
|
|
Â
|
|
| 431 |
Â
button.cancel:hover,
|
| 432 |
Â
button.delete:hover { background-image:url(images/cancel_btn_over_bg.gif); }
|
|
Â
|
|
| 433 |
Â
button.cancel:active,
|
| 434 |
Â
button.delete:active { background-image:url(images/cancel_btn_active_bg.gif); background-color:#e0612f; }
|
| 435 |
Â
button.cancel span,
|
|
@@ -442,12 +458,17 @@ button.add-widget span { background-image:url(images/btn_add-widget_icon2.gif);
|
|
| 442 |
Â
button.add-variable span { background-image:url(images/btn_add-variable_icon.gif); padding-left:26px; }
|
| 443 |
Â
button.go span { background-image:url(images/btn_go.gif); padding-left:16px; }
|
| 444 |
Â
button.btn-chooser { display:block; margin:0 0 10px; }
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 445 |
Â
|
| 446 |
Â
button.disabled,
|
| 447 |
Â
button.disabled:hover,
|
| 448 |
Â
button.disabled:active { border-color:#777 #505050 #505050 #777; background:#919191 url(images/btn_bg-disabled.gif) 0 0 repeat-x; color:#fff; cursor:default; opacity:.8; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; }
|
| 449 |
Â
button.add.disabled span { background-image:url(images/add_btn_icon-disabled.gif); }
|
| 450 |
Â
|
|
Â
|
|
|
Â
|
|
| 451 |
Â
button.icon-btn { width:32px !important; }
|
| 452 |
Â
button.icon-btn span { text-indent:-999em; display:block; width:16px; padding:0; overflow:hidden; }
|
| 453 |
Â
|
|
@@ -458,9 +479,18 @@ button.icon-btn span { text-indent:-999em; display:block; width:16px; padding:0;
|
|
| 458 |
Â
/* SWITCHER
|
| 459 |
Â
*******************************************************************************/
|
| 460 |
Â
.switcher { margin-bottom:10px; border:1px solid #cddddd; background:#e7efef; padding:10px; }
|
| 461 |
-
.side-col .switcher
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 462 |
Â
/*.side-col .switcher { margin-right:20px; margin-bottom:20px; }*/
|
| 463 |
Â
.catalog-categories .side-col .switcher { margin-right:0; margin-bottom:15px; }
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 464 |
Â
|
| 465 |
Â
|
| 466 |
Â
/* SPACE
|
|
@@ -693,7 +723,24 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex
|
|
| 693 |
Â
.login-container .legal { margin:0; background:url(images/login_box_legal_bg.gif) no-repeat; padding:8px 8px 5px 8px; font-size:.95em; }
|
| 694 |
Â
.login-form .validation-advice { margin:3px 0 0 0; }
|
| 695 |
Â
.login-form .forgot-link { margin:0 17px 0 0; text-align:right; }
|
| 696 |
-
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 697 |
Â
|
| 698 |
Â
|
| 699 |
Â
/* DASHBOARD
|
|
@@ -758,9 +805,10 @@ ul.item-options li { padding-left:.7em; }
|
|
| 758 |
Â
|
| 759 |
Â
.entry-edit .order-address td.label label { width:100px; }
|
| 760 |
Â
.entry-edit .order-address input.input-text,
|
| 761 |
-
.entry-edit .order-address .textarea
|
| 762 |
-
.entry-edit .order-address .select
|
| 763 |
-
.order-
|
|
Â
|
|
| 764 |
Â
.order-search-items .entry-edit .grid table { width:99.9%; }
|
| 765 |
Â
/* .create-order-totals { background:url(images/bg_create_order_totals.gif) repeat-y 50% 0 !important; } */
|
| 766 |
Â
|
|
@@ -990,8 +1038,10 @@ ul.tabs a.paypal-section:hover span { background:url(images/paypal_section.png)
|
|
| 990 |
Â
.x-tree-node { margin:0 !important; }
|
| 991 |
Â
.x-tree-node .leaf .x-tree-node-icon { background-image:url(images/fam_leaf.png); }
|
| 992 |
Â
.x-tree-node .system-leaf .x-tree-node-icon { background-image:url(images/fam_application_form_delete.png); }
|
|
Â
|
|
| 993 |
Â
|
| 994 |
Â
/* Product - Websites */
|
|
Â
|
|
| 995 |
Â
.webiste-groups { padding:10px 20px; }
|
| 996 |
Â
.group-stores { padding:2px 10px; }
|
| 997 |
Â
|
|
@@ -1423,6 +1473,19 @@ ul.super-product-attributes { padding-left:15px; }
|
|
| 1423 |
Â
#catalog-wysiwyg-editor .magento_message { padding:0 7px; }
|
| 1424 |
Â
#catalog-wysiwyg-editor .magento_buttons { padding-left:7px; padding-right:7px; }
|
| 1425 |
Â
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
| 1426 |
Â
|
| 1427 |
Â
/*****************************************/
|
| 1428 |
Â
/******** ALIGNMENTS AND CLEARS **********/
|
|
@@ -1455,6 +1518,7 @@ ul.super-product-attributes { padding-left:15px; }
|
|
| 1455 |
Â
.normal { font-weight:normal !important; }
|
| 1456 |
Â
|
| 1457 |
Â
/* Clear */ /* This keeps our HTML free of buncha clearing elements */
|
|
Â
|
|
| 1458 |
Â
.message-popup .message-popup-head:after,
|
| 1459 |
Â
.message-popup .message-popup-content .message:after,
|
| 1460 |
Â
.login-form .form-buttons:after,
|
|
@@ -1486,4 +1550,5 @@ div.actions:after,
|
|
| 1486 |
Â
.notification-global:after,
|
| 1487 |
Â
.files .row:after,
|
| 1488 |
Â
.files-wide .row:after,
|
| 1489 |
-
.grid tr.filter .range .range-line:after
|
|
Â
|
| 90 |
Â
position:fixed;
|
| 91 |
Â
top:45%;
|
| 92 |
Â
left:50%;
|
| 93 |
+
width:150px;
|
| 94 |
+
margin-left:-105px;
|
| 95 |
+
padding:15px 30px;
|
| 96 |
Â
background:#fff4e9;
|
| 97 |
Â
border:2px solid #f1af73;
|
| 98 |
Â
color:#d85909;
|
| 134 |
Â
.grid th { white-space:nowrap; }
|
| 135 |
Â
.grid td.editable input.input-text { width:50px !important; margin-left:4px !important; }
|
| 136 |
Â
.grid td input.input-text { width:86%; }
|
| 137 |
+
.grid td input.input-text-export-filter { width:272px; }
|
| 138 |
+
.grid td input.input-text-range { width:104px; }
|
| 139 |
+
.grid td input.input-text-range-date { width:87px; }
|
| 140 |
Â
.grid td input.input-inactive { background:#eee; }
|
| 141 |
Â
.grid table td { border-width:0 1px 1px 0; border-color:#dadfe0; border-style:solid; }
|
| 142 |
Â
.grid table.border td { background:#fff !important; }
|
| 208 |
Â
.grid tr.filter .range select { float:right; width:56px !important; margin-top:0; }
|
| 209 |
Â
.grid tr.filter .range .label { display:block; width:36px; float:left; padding-left:2px; }
|
| 210 |
Â
.grid tr.filter .date img { width:15px; height:15px; cursor:pointer; vertical-align:middle; }
|
| 211 |
+
.grid .head-massaction select { width:auto !important; max-width:90px; }
|
| 212 |
+
.grid select.select-export-filter,
|
| 213 |
+
.grid select.multiselect-export-filter { width:278px; }
|
| 214 |
Â
|
| 215 |
Â
/* Grid Footer */
|
| 216 |
Â
.grid table tfoot tr { background:#D7E5EF; }
|
| 275 |
Â
ul.tabs-horiz { margin:0 0 18px 0; background:url(images/horiz_tabs_ul_bg.gif) repeat-x 0 100% #f8f8f8; padding:8px 0 0 5px; }
|
| 276 |
Â
ul.tabs-horiz li { float:left; margin:0 4px; }
|
| 277 |
Â
ul.tabs-horiz li a { display:block; background:#e2e2e2; border:1px solid #ccc; padding:2px 10px; color:#333 !important; text-decoration:none !important; }
|
| 278 |
+
ul.tabs-horiz li a.notloaded { /* not used for now */ }
|
| 279 |
Â
ul.tabs-horiz li a.active { border-bottom:1px solid #fff; background:#fff; }
|
| 280 |
Â
|
| 281 |
Â
|
| 340 |
Â
label.inline { float:none !important; width:auto !important; }
|
| 341 |
Â
.nested-content .entry-edit { margin-left:2em; }
|
| 342 |
Â
.nested-content .entry-edit .entry-edit { margin-left:0; }
|
| 343 |
+
#coupon_container .entry-edit { min-width:310px; }
|
| 344 |
Â
|
| 345 |
Â
/* Form Elements */
|
| 346 |
Â
input.input-text,textarea,select { border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; background:#fff; font:12px arial, helvetica, sans-serif; }
|
| 358 |
Â
.field-100 { background-color:#fff; border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; padding:2px; }
|
| 359 |
Â
.field-100 textarea,
|
| 360 |
Â
.field-100 input.input-text { float:left; width:100% !important; border:0 !important; padding:0 !important; }
|
| 361 |
+
@media screen and (-webkit-min-device-pixel-ratio:0) {
|
| 362 |
+
select option:disabled,
|
| 363 |
+
select:disabled option { color:#c9c9c9!important;color:#cacaca!important; text-shadow:2px 2px 2px #000; }
|
| 364 |
+
}
|
| 365 |
Â
|
| 366 |
Â
/* Form List */ /* Table for default form data */
|
| 367 |
Â
.form-list { width:auto; border:0 !important; }
|
| 378 |
Â
.form-list td.value textarea { width:274px; }
|
| 379 |
Â
.form-list td.value textarea { height:15em; }
|
| 380 |
Â
.form-list td.value select { width:280px; }
|
| 381 |
+
.form-list td.value select.select-date { width:87px; }
|
| 382 |
Â
.form-list td.note { background:url(images/note_cell_bg.gif) 6px 10px no-repeat !important; padding-left:18px; }
|
| 383 |
Â
.form-list td.scope-label { padding-left:5px; color:#6f8992; font-size:.9em; }
|
| 384 |
Â
.form-list p.note { margin:0; padding:0 0 0 13px; background:url(images/note_bg.gif) 1px 6px no-repeat; font-size:11px; }
|
| 386 |
Â
.columns .form-list { width:auto; }
|
| 387 |
Â
.columns .form-list td.value { width:280px; padding-right:5px !important; }
|
| 388 |
Â
.columns .form-list td.value .next-toinput { width:75px; display:inline; margin-right:5px; }
|
| 389 |
+
.columns .form-list td.value .next-toselect input.input-text { width:195px!important; display:inline; }
|
| 390 |
Â
|
| 391 |
Â
.fieldset-wide .form-list { width:100% !important; }
|
| 392 |
Â
.fieldset-wide .form-list td.value { width:auto !important; }
|
| 393 |
Â
.fieldset-wide .form-list td.value input.input-text,
|
| 394 |
Â
.fieldset-wide .form-list td.value textarea { width:98% !important; }
|
| 395 |
+
/*.fieldset-wide .form-list td.value select { display:block; }*/
|
| 396 |
Â
.fieldset-wide .form-list td.scope-label { white-space:nowrap; width:1px; }
|
| 397 |
Â
.fieldset-wide .form-list td.note { width:120px; }
|
| 398 |
Â
|
| 406 |
Â
span.delete-file { display:block; white-space:nowrap; padding-left:25px; }
|
| 407 |
Â
span.delete-file { padding:0; }
|
| 408 |
Â
|
|
Â
|
|
| 409 |
Â
/* Back compatibility with span forms */
|
| 410 |
Â
.entry-edit .field-row { display:block; }
|
| 411 |
Â
.entry-edit .field-row label { float:left; width:150px; }
|
| 412 |
Â
|
| 413 |
Â
/* Form Button */
|
| 414 |
Â
.content-buttons.form-buttons,
|
| 415 |
+
.content-header .form-buttons { text-align:right; margin-bottom:0; }
|
| 416 |
Â
.content-header .content-buttons-placeholder { display:inline !important; }
|
| 417 |
Â
.content-header .form-buttons { float:right; }
|
| 418 |
Â
.content-header td.form-buttons { float:none; }
|
| 423 |
Â
button:hover { background:#f77c16 url(images/btn_over_bg.gif) repeat-x 0 0; }
|
| 424 |
Â
button:active { background:#f77c16 url(images/btn_on_bg.gif) repeat-x 0 0; }
|
| 425 |
Â
button span { line-height:1.35em; background-repeat:no-repeat; background-position:0 50%; }
|
| 426 |
+
button span span { background:none !important; padding:0 !important; margin:0 !important; display:inline !important; }
|
| 427 |
Â
button.delete,
|
| 428 |
Â
button.save,
|
| 429 |
Â
button.add { padding-left:6px; }
|
| 434 |
Â
button.back span,
|
| 435 |
Â
button.add-image span,
|
| 436 |
Â
button.add-widget span { padding-left:20px; }
|
| 437 |
+
/* Google Chrome specific fix for empty buttons */
|
| 438 |
+
button.add span:after,
|
| 439 |
+
button.delete span:after { display:inline-block; clear:both; content:"."; font-size:0; line-height:0; height:0; overflow:hidden; }
|
| 440 |
Â
button.back { border-color:#ccc #aaa #aaa #ccc; background-color:#fff; background-image:url(images/btn_back_bg.gif); color:#555; }
|
| 441 |
Â
button.back span { background-image:url(images/icon_btn_back.gif); }
|
| 442 |
+
button.fail,
|
| 443 |
Â
button.cancel,
|
| 444 |
Â
button.delete { border-color:#d24403 #a92000 #a92000 #d24403; background-image:url(images/cancel_btn_bg.gif); background-color:#fcaf81; color:#fff; }
|
| 445 |
+
button.fail:hover,
|
| 446 |
Â
button.cancel:hover,
|
| 447 |
Â
button.delete:hover { background-image:url(images/cancel_btn_over_bg.gif); }
|
| 448 |
+
button.fail:active,
|
| 449 |
Â
button.cancel:active,
|
| 450 |
Â
button.delete:active { background-image:url(images/cancel_btn_active_bg.gif); background-color:#e0612f; }
|
| 451 |
Â
button.cancel span,
|
| 458 |
Â
button.add-variable span { background-image:url(images/btn_add-variable_icon.gif); padding-left:26px; }
|
| 459 |
Â
button.go span { background-image:url(images/btn_go.gif); padding-left:16px; }
|
| 460 |
Â
button.btn-chooser { display:block; margin:0 0 10px; }
|
| 461 |
+
button.success { background-image:url(images/btn_gr_bg.gif); border-color:#46745E; }
|
| 462 |
+
button.success:hover { background:url(images/btn_gr_over.gif) #6cac46; }
|
| 463 |
+
button.success:active { background:url(images/btn_gr_on.gif) repeat-x 0 0 #3fa05e; }
|
| 464 |
Â
|
| 465 |
Â
button.disabled,
|
| 466 |
Â
button.disabled:hover,
|
| 467 |
Â
button.disabled:active { border-color:#777 #505050 #505050 #777; background:#919191 url(images/btn_bg-disabled.gif) 0 0 repeat-x; color:#fff; cursor:default; opacity:.8; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; }
|
| 468 |
Â
button.add.disabled span { background-image:url(images/add_btn_icon-disabled.gif); }
|
| 469 |
Â
|
| 470 |
+
button.loading > span { padding-left:20px; background-image: url(images/btn_loading-icon.gif) !important;}
|
| 471 |
+
|
| 472 |
Â
button.icon-btn { width:32px !important; }
|
| 473 |
Â
button.icon-btn span { text-indent:-999em; display:block; width:16px; padding:0; overflow:hidden; }
|
| 474 |
Â
|
| 479 |
Â
/* SWITCHER
|
| 480 |
Â
*******************************************************************************/
|
| 481 |
Â
.switcher { margin-bottom:10px; border:1px solid #cddddd; background:#e7efef; padding:10px; }
|
| 482 |
+
.side-col .switcher { padding-right:26px; }
|
| 483 |
+
.side-col .switcher label { display:block; }
|
| 484 |
+
.side-col .switcher .link-store-scope { float:right; margin-right:-19px; margin-left:3px; }
|
| 485 |
+
.side-col .switcher select { width:100%; float:left; }
|
| 486 |
Â
/*.side-col .switcher { margin-right:20px; margin-bottom:20px; }*/
|
| 487 |
Â
.catalog-categories .side-col .switcher { margin-right:0; margin-bottom:15px; }
|
| 488 |
+
.link-store-scope { display:inline-block; vertical-align:middle; margin:0 0 1px; width:16px; height:16px; background:url(images/i_question-mark.png) 0 0 no-repeat; text-decoration:none !important; text-indent:-999em; overflow:hidden; }
|
| 489 |
+
.store-scope .link-store-scope { float:left; margin-right:10px; }
|
| 490 |
+
.store-scope .tree-store-scope { float:left; padding:7px 10px; border:1px dotted #dedede; }
|
| 491 |
+
.store-scope table.stores-tree { float:left; width:auto !important; }
|
| 492 |
+
.form-list td.value .store-scope { white-space:nowrap; }
|
| 493 |
+
.form-list td.value .link-store-scope { float:none; margin-right:0; vertical-align:top; margin-top:6px; }
|
| 494 |
Â
|
| 495 |
Â
|
| 496 |
Â
/* SPACE
|
| 723 |
Â
.login-container .legal { margin:0; background:url(images/login_box_legal_bg.gif) no-repeat; padding:8px 8px 5px 8px; font-size:.95em; }
|
| 724 |
Â
.login-form .validation-advice { margin:3px 0 0 0; }
|
| 725 |
Â
.login-form .forgot-link { margin:0 17px 0 0; text-align:right; }
|
| 726 |
+
.login-form .captcha { padding:10px 0 0; }
|
| 727 |
+
.login-form .captcha-image { border:1px solid #aaa; margin:1.5em 0 0; position:relative; }
|
| 728 |
+
.login-form .captcha-image img { vertical-align:bottom; }
|
| 729 |
+
.login-form .captcha-reload { cursor:pointer; position: absolute; top:2px; right:2px; }
|
| 730 |
+
.login-form .captcha-reload.refreshing { animation:rotate 1.5s infinite linear; -webkit-animation:rotate 1.5s infinite linear; -moz-animation:rotate 1.5s infinite linear; }
|
| 731 |
+
|
| 732 |
+
@-webkit-keyframes rotate {
|
| 733 |
+
0% { -webkit-transform:rotate(0); }
|
| 734 |
+
0% { -webkit-transform:rotate(360deg); }
|
| 735 |
+
}
|
| 736 |
+
@-moz-keyframes rotate {
|
| 737 |
+
0% { -moz-transform:rotate(0); }
|
| 738 |
+
0% { -moz-transform:rotate(360deg); }
|
| 739 |
+
}
|
| 740 |
+
@keyframes rotate {
|
| 741 |
+
0% { transform:rotate(0); }
|
| 742 |
+
0% { transform:rotate(360deg); }
|
| 743 |
+
}
|
| 744 |
Â
|
| 745 |
Â
|
| 746 |
Â
/* DASHBOARD
|
| 805 |
Â
|
| 806 |
Â
.entry-edit .order-address td.label label { width:100px; }
|
| 807 |
Â
.entry-edit .order-address input.input-text,
|
| 808 |
+
.entry-edit .order-address .textarea { width:95% !important; }
|
| 809 |
+
.entry-edit .order-address .select { width:96.5%; }
|
| 810 |
+
.entry-edit .order-address .validate-vat { text-align:right; padding:10px 0 0; width:96%; }
|
| 811 |
+
.order-search-items .entry-edit .grid { height:610px; overflow:auto; }
|
| 812 |
Â
.order-search-items .entry-edit .grid table { width:99.9%; }
|
| 813 |
Â
/* .create-order-totals { background:url(images/bg_create_order_totals.gif) repeat-y 50% 0 !important; } */
|
| 814 |
Â
|
| 1038 |
Â
.x-tree-node { margin:0 !important; }
|
| 1039 |
Â
.x-tree-node .leaf .x-tree-node-icon { background-image:url(images/fam_leaf.png); }
|
| 1040 |
Â
.x-tree-node .system-leaf .x-tree-node-icon { background-image:url(images/fam_application_form_delete.png); }
|
| 1041 |
+
.x-tree-node-ct { overflow:hidden; }
|
| 1042 |
Â
|
| 1043 |
Â
/* Product - Websites */
|
| 1044 |
+
.website-name .checkbox { vertical-align:top; margin-top:2px; }
|
| 1045 |
Â
.webiste-groups { padding:10px 20px; }
|
| 1046 |
Â
.group-stores { padding:2px 10px; }
|
| 1047 |
Â
|
| 1473 |
Â
#catalog-wysiwyg-editor .magento_message { padding:0 7px; }
|
| 1474 |
Â
#catalog-wysiwyg-editor .magento_buttons { padding-left:7px; padding-right:7px; }
|
| 1475 |
Â
|
| 1476 |
+
/* Backups */
|
| 1477 |
+
.backup-dialog { background-color:#6f8992; background:rgba(111, 137, 146, 0.5); cursor:default; left:50%; margin:0 0 0 -271px; position:fixed; top:50%; width:470px; padding:8px; z-index:400; -moz-box-shadow:0 0 100px #ccc; -webkit-box-shadow:0 0 100px #ccc; box-shadow:0 0 100px #ccc; }
|
| 1478 |
+
.backup-dialog .entry-edit { border:1px solid #6f8992; }
|
| 1479 |
+
.backup-dialog .content { background:#fff; border-bottom:1px solid #ccc; max-height:400px; overflow:auto; }
|
| 1480 |
+
.backup-dialog .question {margin-top: 15px;}
|
| 1481 |
+
.backup-dialog .buttons-set { border-top:1px solid #ddd; background:#eee; margin:0; overflow:hidden; padding:7px 10px 8px; width:448px; }
|
| 1482 |
+
.backup-dialog .buttons-set button { margin:0 0 0 5px; }
|
| 1483 |
+
.backup-dialog #ftp-credentials-container {margin-top: 25px;}
|
| 1484 |
+
.backup-dialog .password-box-container {margin-top: 15px;}
|
| 1485 |
+
.backup-dialog #ftp-credentials-container fieldset {margin-bottom: 0;}
|
| 1486 |
+
.backup-dialog input[type=text], .backup-dialog input[type=password] {width: 180px}
|
| 1487 |
+
.backup-dialog .exclude-media-checkbox-container {margin-top: 15px;}
|
| 1488 |
+
.backup-dialog td.maintenance-checkbox-container {margin-top: 0; padding-top: 4px;}
|
| 1489 |
Â
|
| 1490 |
Â
/*****************************************/
|
| 1491 |
Â
/******** ALIGNMENTS AND CLEARS **********/
|
| 1518 |
Â
.normal { font-weight:normal !important; }
|
| 1519 |
Â
|
| 1520 |
Â
/* Clear */ /* This keeps our HTML free of buncha clearing elements */
|
| 1521 |
+
.side-col .switcher:after,
|
| 1522 |
Â
.message-popup .message-popup-head:after,
|
| 1523 |
Â
.message-popup .message-popup-content .message:after,
|
| 1524 |
Â
.login-form .form-buttons:after,
|
| 1550 |
Â
.notification-global:after,
|
| 1551 |
Â
.files .row:after,
|
| 1552 |
Â
.files-wide .row:after,
|
| 1553 |
+
.grid tr.filter .range .range-line:after,
|
| 1554 |
+
.store-scope:after { display:block; clear:both; content:"."; font-size:0; line-height:0; height:0; overflow:hidden; }
|
skin/adminhtml/default/default/iestyles.css
CHANGED
|
@@ -59,7 +59,8 @@ ul.tabs li a,
|
|
| 59 |
Â
.grid tr.filter .range .range-line,
|
| 60 |
Â
.centinel .authentication,
|
| 61 |
Â
.paypal-payment-notice,
|
| 62 |
-
.product-options .options-list li
|
|
Â
|
|
| 63 |
Â
|
| 64 |
Â
.clear { display:block; clear:both; height:0; font-size:0; line-height:0; overflow:hidden; }
|
| 65 |
Â
|
|
@@ -93,7 +94,7 @@ button, .form-button { width:auto; margin-left:5px; overflow:visible;
|
|
| 93 |
Â
button.icon-btn { width:31px; }
|
| 94 |
Â
|
| 95 |
Â
.nested-content .content-header { position:relative; zoom:1; }
|
| 96 |
-
dl.accordion dt a,
|
| 97 |
Â
div.collapseable a { width:100%; }
|
| 98 |
Â
.product-image-gallery .grid tbody td { padding: 4px !important; }
|
| 99 |
Â
.massaction .entry-edit fieldset{ float: right;}
|
|
@@ -108,4 +109,6 @@ div.collapseable a { width:100%; }
|
|
| 108 |
Â
|
| 109 |
Â
.grid-severity-critical,
|
| 110 |
Â
.grid-severity-major,
|
| 111 |
-
.grid-severity-minor { margin:3px 0; }
|
|
Â
|
|
|
Â
|
| 59 |
Â
.grid tr.filter .range .range-line,
|
| 60 |
Â
.centinel .authentication,
|
| 61 |
Â
.paypal-payment-notice,
|
| 62 |
+
.product-options .options-list li,
|
| 63 |
+
.store-scope { zoom:1; }
|
| 64 |
Â
|
| 65 |
Â
.clear { display:block; clear:both; height:0; font-size:0; line-height:0; overflow:hidden; }
|
| 66 |
Â
|
| 94 |
Â
button.icon-btn { width:31px; }
|
| 95 |
Â
|
| 96 |
Â
.nested-content .content-header { position:relative; zoom:1; }
|
| 97 |
+
dl.accordion dt a,
|
| 98 |
Â
div.collapseable a { width:100%; }
|
| 99 |
Â
.product-image-gallery .grid tbody td { padding: 4px !important; }
|
| 100 |
Â
.massaction .entry-edit fieldset{ float: right;}
|
| 109 |
Â
|
| 110 |
Â
.grid-severity-critical,
|
| 111 |
Â
.grid-severity-major,
|
| 112 |
+
.grid-severity-minor { margin:3px 0; }
|
| 113 |
+
button.add span,
|
| 114 |
+
button.delete span { display:inline-block; height:16px;}
|
skin/adminhtml/default/default/images/btn_gr_bg.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/images/btn_gr_on.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/images/btn_gr_over.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/images/btn_loading-icon.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/images/i_question-mark.png
ADDED
|
Binary file
|
skin/adminhtml/default/default/images/login_box_bg_auth.jpg
ADDED
|
Binary file
|
skin/adminhtml/default/default/images/reload.png
ADDED
|
Binary file
|
skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
.dialog { border:1px solid #555; }
|
| 2 |
+
.dialog .bot { display:none !important; }
|
| 3 |
+
.overlay_magento { background-color:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; }
|
| 4 |
+
.top.table_window { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; }
|
| 5 |
+
|
| 6 |
+
.magento_nw { width:6px; height:28px; }
|
| 7 |
+
.magento_n { height:28px; }
|
| 8 |
+
.magento_ne { width:6px; height:28px; }
|
| 9 |
+
|
| 10 |
+
.magento_w { width:6px; }
|
| 11 |
+
.magento_e { width:6px; }
|
| 12 |
+
.magento_w,
|
| 13 |
+
.magento_e,
|
| 14 |
+
.magento_content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; }
|
| 15 |
+
|
| 16 |
+
.magento_sw { background:#deebf0; width:5px; height:3px; }
|
| 17 |
+
.magento_s { background:#deebf0; height:3px; }
|
| 18 |
+
.magento_se,
|
| 19 |
+
|
| 20 |
+
.magento_sizer { background:#deebf0; width:5px; height:3px; }
|
| 21 |
+
.magento_sizer { cursor:se-resize; }
|
| 22 |
+
|
| 23 |
+
.magento_close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; }
|
| 24 |
+
.magento_minimize { width:16px; height:16px; background:url(magento/window_minimize.png) 0 0 no-repeat; position:absolute; top:5px; right:28px; cursor:pointer; z-index:1000; }
|
| 25 |
+
.magento_maximize { width:16px; height:16px; background:url(magento/window_maximize.png)0 0 no-repeat; position:absolute; top:5px; right:49px; cursor:pointer; z-index:1000; }
|
| 26 |
+
|
| 27 |
+
.magento_title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; }
|
| 28 |
+
|
| 29 |
+
.magento_content { overflow:auto; font-size:12px; }
|
| 30 |
+
.magento_content,
|
| 31 |
+
.magento_content label { color:#333; font-family:Arial, sans-serif; }
|
| 32 |
+
|
| 33 |
+
.magento_buttons { padding:10px; text-align:right; }
|
| 34 |
+
.magento_buttons input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; }
|
| 35 |
+
|
| 36 |
+
/* FOR IE */
|
| 37 |
+
* html .magento_close { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_maximize.png", sizingMethod="crop"); }
|
| 38 |
+
* html .magento_minimize { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_close.png", sizingMethod="crop");}
|
| 39 |
+
* html .magento_maximize { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_minimize.png", sizingMethod="crop"); }
|
skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif
ADDED
|
Binary file
|
skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png
ADDED
|
Binary file
|
skin/adminhtml/default/default/oauth-simple.css
ADDED
|
@@ -0,0 +1,239 @@
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
|
|
Â
|
| 1 |
+
/**
|
| 2 |
+
* Magento
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 7 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 8 |
+
* It is also available through the world-wide-web at this URL:
|
| 9 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 10 |
+
* If you did not receive a copy of the license and are unable to
|
| 11 |
+
* obtain it through the world-wide-web, please send an email
|
| 12 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 13 |
+
*
|
| 14 |
+
* DISCLAIMER
|
| 15 |
+
*
|
| 16 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 17 |
+
* versions in the future. If you wish to customize Magento for your
|
| 18 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 19 |
+
*
|
| 20 |
+
* @category design
|
| 21 |
+
* @package base_default
|
| 22 |
+
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 23 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 24 |
+
*/
|
| 25 |
+
|
| 26 |
+
/* Reset ================================================================================= */
|
| 27 |
+
* { margin:0; padding:0; }
|
| 28 |
+
body { background:#496778 50% 0 repeat-y; font:12px/1.55 Arial, Helvetica, sans-serif; color:#2f2f2f; text-align:center; }
|
| 29 |
+
img { border:0; vertical-align:top; }
|
| 30 |
+
a { color:#1e7ec8; text-decoration:underline; }
|
| 31 |
+
a:hover { text-decoration:none; }
|
| 32 |
+
:focus { outline:0; }
|
| 33 |
+
|
| 34 |
+
/* Headings */
|
| 35 |
+
h1,h2,h3,
|
| 36 |
+
h4,h5,h6 { margin:0 0 5px; line-height:1.35; color:#0a263c; }
|
| 37 |
+
h1 { font-size:20px; font-weight:normal; }
|
| 38 |
+
h2 { font-size:18px; font-weight:normal; }
|
| 39 |
+
h3 { font-size:16px; font-weight:bold; }
|
| 40 |
+
h4 { font-size:14px; font-weight:bold; }
|
| 41 |
+
h5 { font-size:12px; font-weight:bold; }
|
| 42 |
+
h6 { font-size:11px; font-weight:bold; }
|
| 43 |
+
|
| 44 |
+
/* Forms */
|
| 45 |
+
form { display:inline; }
|
| 46 |
+
fieldset { border:0; }
|
| 47 |
+
legend { display:none; }
|
| 48 |
+
|
| 49 |
+
/* Table */
|
| 50 |
+
table { border:0; /*border-collapse:collapse;*/ border-spacing:0; empty-cells:show; font-size:100%; }
|
| 51 |
+
caption,th,td { vertical-align:top; text-align:left; font-weight:normal; }
|
| 52 |
+
|
| 53 |
+
/* Content */
|
| 54 |
+
p { margin:0 0 10px; }
|
| 55 |
+
strong { font-weight:bold; }
|
| 56 |
+
address { font-style:normal; line-height:1.35; }
|
| 57 |
+
cite { font-style:normal; }
|
| 58 |
+
q,
|
| 59 |
+
blockquote { quotes:none; }
|
| 60 |
+
q:before,
|
| 61 |
+
q:after { content:''; }
|
| 62 |
+
small,big { font-size:1em; }
|
| 63 |
+
/*sup { font-size:1em; vertical-align:top; }*/
|
| 64 |
+
|
| 65 |
+
/* Lists */
|
| 66 |
+
ul,ol { list-style:none; }
|
| 67 |
+
|
| 68 |
+
/* Tools */
|
| 69 |
+
.hidden { display:block !important; border:0 !important; margin:0 !important; padding:0 !important; font-size:0 !important; line-height:0 !important; width:0 !important; height:0 !important; overflow:hidden !important; }
|
| 70 |
+
.nobr { white-space:nowrap !important; }
|
| 71 |
+
.wrap { white-space:normal !important; }
|
| 72 |
+
.a-left { text-align:left !important; }
|
| 73 |
+
.a-center { text-align:center !important; }
|
| 74 |
+
.a-right { text-align:right !important; }
|
| 75 |
+
.v-top { vertical-align:top; }
|
| 76 |
+
.v-middle { vertical-align:middle; }
|
| 77 |
+
.f-left,
|
| 78 |
+
.left { float:left !important; }
|
| 79 |
+
.f-right,
|
| 80 |
+
.right { float:right !important; }
|
| 81 |
+
.f-none { float:none !important; }
|
| 82 |
+
.f-fix { float:left; width:100%; }
|
| 83 |
+
.no-display { display:none; }
|
| 84 |
+
.no-margin { margin:0 !important; }
|
| 85 |
+
.no-padding { padding:0 !important; }
|
| 86 |
+
.no-bg { background:none !important; }
|
| 87 |
+
/* ======================================================================================= */
|
| 88 |
+
|
| 89 |
+
/* Default styles ======================================================================== */
|
| 90 |
+
/* boxes.css*/
|
| 91 |
+
.notification-global {
|
| 92 |
+
background: url("./images/error_msg_icon.gif") no-repeat scroll 27px 5px #FFF9E9;
|
| 93 |
+
border-bottom: 1px solid #EEE2BE;
|
| 94 |
+
border-top: 1px solid #EEE2BE;
|
| 95 |
+
color: #444444;
|
| 96 |
+
font-size: 11px;
|
| 97 |
+
line-height: 16px;
|
| 98 |
+
margin: 0 0 -3px;
|
| 99 |
+
padding: 5px 27px 5px 47px;
|
| 100 |
+
position: relative;
|
| 101 |
+
}
|
| 102 |
+
.notification-global-notice {
|
| 103 |
+
background-image: url("./images/note_msg_icon.gif");
|
| 104 |
+
}
|
| 105 |
+
.notification-global .label {
|
| 106 |
+
color: #EB5E00;
|
| 107 |
+
}
|
| 108 |
+
.notification-global .clickable {
|
| 109 |
+
cursor: pointer;
|
| 110 |
+
}
|
| 111 |
+
.notification-global span.critical {
|
| 112 |
+
color: #D20000;
|
| 113 |
+
}
|
| 114 |
+
.notification-global a:hover {
|
| 115 |
+
text-decoration: none;
|
| 116 |
+
}
|
| 117 |
+
.error, a.error span, .required, .validation-advice {
|
| 118 |
+
color: #D40707 !important;
|
| 119 |
+
font-weight: bold !important;
|
| 120 |
+
}
|
| 121 |
+
.notice {
|
| 122 |
+
color: #EA7601;
|
| 123 |
+
}
|
| 124 |
+
.messages ul {
|
| 125 |
+
border: 0 none !important;
|
| 126 |
+
}
|
| 127 |
+
.messages li {
|
| 128 |
+
font-size: 0.95em !important;
|
| 129 |
+
font-weight: bold !important;
|
| 130 |
+
margin-bottom: 11px !important;
|
| 131 |
+
min-height: 23px !important;
|
| 132 |
+
padding: 8px 8px 2px 32px !important;
|
| 133 |
+
}
|
| 134 |
+
.messages ul li {
|
| 135 |
+
border: 0 none !important;
|
| 136 |
+
margin: 0 0 3px !important;
|
| 137 |
+
padding: 0 !important;
|
| 138 |
+
}
|
| 139 |
+
.error-msg {
|
| 140 |
+
background: url("./images/error_msg_icon.gif") no-repeat scroll 10px 10px #FAEBE7 !important;
|
| 141 |
+
border: 1px solid #F16048 !important;
|
| 142 |
+
color: #DF280A !important;
|
| 143 |
+
}
|
| 144 |
+
.success-msg {
|
| 145 |
+
background: url("./images/success_msg_icon.gif") no-repeat scroll 10px 10px #EFF5EA !important;
|
| 146 |
+
border: 1px solid #95A486 !important;
|
| 147 |
+
color: #3D6611 !important;
|
| 148 |
+
}
|
| 149 |
+
.notice-msg {
|
| 150 |
+
background: url("./images/note_msg_icon.gif") no-repeat scroll 10px 10px #FFFBF0 !important;
|
| 151 |
+
border: 1px solid #FFD967 !important;
|
| 152 |
+
color: #3D6611 !important;
|
| 153 |
+
}
|
| 154 |
+
.warning-msg {
|
| 155 |
+
background: url("./images/warning_msg_icon.gif") no-repeat scroll 10px 10px #E6E6E6 !important;
|
| 156 |
+
border: 1px solid #666E73 !important;
|
| 157 |
+
color: #000000 !important;
|
| 158 |
+
}
|
| 159 |
+
|
| 160 |
+
button:hover, .form-button:hover {
|
| 161 |
+
background: url("./images/btn_over_bg.gif") repeat-x scroll 0 0 #F77C16;
|
| 162 |
+
}
|
| 163 |
+
button:active, .form-button:active {
|
| 164 |
+
background: url("./images/btn_on_bg.gif") repeat-x scroll 0 0 #F77C16;
|
| 165 |
+
}
|
| 166 |
+
button span {
|
| 167 |
+
background-position: 0 50%;
|
| 168 |
+
background-repeat: no-repeat;
|
| 169 |
+
line-height: 1.35em;
|
| 170 |
+
}
|
| 171 |
+
button span span {
|
| 172 |
+
background: none repeat scroll 0 0 transparent !important;
|
| 173 |
+
display: inline !important;
|
| 174 |
+
margin: 0 !important;
|
| 175 |
+
padding: 0 !important;
|
| 176 |
+
}
|
| 177 |
+
|
| 178 |
+
|
| 179 |
+
input.input-text, textarea, select {
|
| 180 |
+
background: none repeat scroll 0 0 #FFFFFF;
|
| 181 |
+
border-color: #AAAAAA #C8C8C8 #C8C8C8 #AAAAAA;
|
| 182 |
+
border-style: solid;
|
| 183 |
+
border-width: 1px;
|
| 184 |
+
font: 12px arial,helvetica,sans-serif;
|
| 185 |
+
}
|
| 186 |
+
input.input-text, textarea {
|
| 187 |
+
padding: 2px;
|
| 188 |
+
}
|
| 189 |
+
button, .form-button {
|
| 190 |
+
background: url("./images/btn_bg.gif") repeat-x scroll 0 100% #FFAC47;
|
| 191 |
+
border-color: #ED6502 #A04300 #A04300 #ED6502;
|
| 192 |
+
border-style: solid;
|
| 193 |
+
border-width: 1px;
|
| 194 |
+
color: #FFFFFF;
|
| 195 |
+
cursor: pointer;
|
| 196 |
+
font: bold 12px arial,helvetica,sans-serif;
|
| 197 |
+
padding: 0 7px 1px;
|
| 198 |
+
text-align: center !important;
|
| 199 |
+
white-space: nowrap;
|
| 200 |
+
}
|
| 201 |
+
/* ======================================================================================= */
|
| 202 |
+
|
| 203 |
+
|
| 204 |
+
*, html {text-align: left;}
|
| 205 |
+
|
| 206 |
+
h1 {
|
| 207 |
+
color: #D12C01;
|
| 208 |
+
font-size: 22px;
|
| 209 |
+
font-weight: normal;
|
| 210 |
+
margin: 0;
|
| 211 |
+
text-align: left;
|
| 212 |
+
}
|
| 213 |
+
|
| 214 |
+
h2 {
|
| 215 |
+
color: #444444;
|
| 216 |
+
font: 16px Arial,Helvetica,sans-serif;
|
| 217 |
+
margin: 0 0 5px;
|
| 218 |
+
text-align: left;
|
| 219 |
+
}
|
| 220 |
+
|
| 221 |
+
body,
|
| 222 |
+
.main-container,
|
| 223 |
+
.header-container {background: none;}
|
| 224 |
+
|
| 225 |
+
.header-simple {height: 60px; text-align: left; padding: 10px 10px 0 10px; border-bottom: 1px solid #CFCFCF;}
|
| 226 |
+
.header-top img {height: 60px;}
|
| 227 |
+
|
| 228 |
+
.login-box > div {padding: 10px;}
|
| 229 |
+
.page-title {margin-bottom: 0; border-bottom: 1px solid #CFCFCF;}
|
| 230 |
+
|
| 231 |
+
.form-box {border-bottom: 1px solid #CFCFCF;}
|
| 232 |
+
.form-box .fieldset, .form-box fieldset {width: 320px; margin: 0 auto;}
|
| 233 |
+
|
| 234 |
+
.input-box {margin-bottom: 10px;}
|
| 235 |
+
.input-box label {width: 95px; font-weight: bold; display: block; float: left; text-align: right; padding-right: 10px;}
|
| 236 |
+
.input-box input {width: 209px;}
|
| 237 |
+
|
| 238 |
+
.required {font-weight: normal; color: #D40707 !important; font-size: 11px;}
|
| 239 |
+
.form-buttons {text-align: right;}
|
