Interface_Adminhtml_Default - Version 1.7.0.0

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

Files changed (440) hide show
  1. app/design/adminhtml/default/default/layout/admin.xml +14 -1
  2. app/design/adminhtml/default/default/layout/adminnotification.xml +1 -1
  3. app/design/adminhtml/default/default/layout/api2.xml +147 -0
  4. app/design/adminhtml/default/default/layout/authorizenet.xml +1 -1
  5. app/design/adminhtml/default/default/layout/bundle.xml +1 -1
  6. app/design/adminhtml/default/default/layout/captcha.xml +48 -0
  7. app/design/adminhtml/default/default/layout/catalog.xml +1 -1
  8. app/design/adminhtml/default/default/layout/cms.xml +1 -1
  9. app/design/adminhtml/default/default/layout/connect.xml +1 -1
  10. app/design/adminhtml/default/default/layout/currencysymbol.xml +34 -0
  11. app/design/adminhtml/default/default/layout/customer.xml +67 -1
  12. app/design/adminhtml/default/default/layout/dataflow.xml +1 -1
  13. app/design/adminhtml/default/default/layout/downloadable.xml +1 -1
  14. app/design/adminhtml/default/default/layout/giftmessage.xml +1 -1
  15. app/design/adminhtml/default/default/layout/index.xml +1 -1
  16. app/design/adminhtml/default/default/layout/main.xml +38 -3
  17. app/design/adminhtml/default/default/layout/newsletter.xml +1 -1
  18. app/design/adminhtml/default/default/layout/oauth.xml +194 -0
  19. app/design/adminhtml/default/default/layout/pagecache.xml +1 -1
  20. app/design/adminhtml/default/default/layout/promo.xml +12 -1
  21. app/design/adminhtml/default/default/layout/report.xml +21 -1
  22. app/design/adminhtml/default/default/layout/rss.xml +1 -1
  23. app/design/adminhtml/default/default/layout/sales.xml +2 -2
  24. app/design/adminhtml/default/default/layout/search.xml +1 -1
  25. app/design/adminhtml/default/default/layout/tag.xml +37 -1
  26. app/design/adminhtml/default/default/layout/widget.xml +2 -2
  27. app/design/adminhtml/default/default/template/access_denied.phtml +1 -1
  28. app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +1 -1
  29. app/design/adminhtml/default/default/template/api/roleinfo.phtml +4 -2
  30. app/design/adminhtml/default/default/template/api/roles.phtml +2 -2
  31. app/design/adminhtml/default/default/template/api/rolesedit.phtml +1 -1
  32. app/design/adminhtml/default/default/template/api/rolesusers.phtml +1 -1
  33. app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +1 -1
  34. app/design/adminhtml/default/default/template/api/userinfo.phtml +1 -1
  35. app/design/adminhtml/default/default/template/api/usernroles.phtml +1 -1
  36. app/design/adminhtml/default/default/template/api/userroles.phtml +1 -1
  37. app/design/adminhtml/default/default/template/api/users.phtml +2 -2
  38. app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml +53 -0
  39. app/design/adminhtml/default/default/template/api2/attribute/resource.phtml +158 -0
  40. app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml +59 -0
  41. app/design/adminhtml/default/default/template/api2/role/buttons.phtml +52 -0
  42. app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml +122 -0
  43. app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml +1 -1
  44. app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml +1 -1
  45. app/design/adminhtml/default/default/template/backup/dialogs.phtml +164 -0
  46. app/design/adminhtml/default/default/template/backup/left.phtml +1 -1
  47. app/design/adminhtml/default/default/template/backup/list.phtml +7 -2
  48. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml +1 -1
  49. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml +4 -3
  50. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml +4 -3
  51. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml +4 -3
  52. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml +4 -3
  53. app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml +1 -1
  54. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml +2 -1
  55. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml +1 -1
  56. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml +1 -1
  57. app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml +1 -1
  58. app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml +1 -1
  59. app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml +1 -1
  60. app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml +1 -1
  61. app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml +3 -3
  62. app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml +1 -1
  63. app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml +1 -1
  64. app/design/adminhtml/default/default/template/captcha/zend.phtml +56 -0
  65. app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml +1 -1
  66. app/design/adminhtml/default/default/template/catalog/category/edit.phtml +1 -1
  67. app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml +1 -1
  68. app/design/adminhtml/default/default/template/catalog/category/tree.phtml +1 -1
  69. app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml +1 -1
  70. app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml +1 -1
  71. app/design/adminhtml/default/default/template/catalog/product.phtml +1 -1
  72. app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml +25 -18
  73. app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml +1 -1
  74. app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml +15 -4
  75. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml +1 -1
  76. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml +1 -1
  77. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml +1 -1
  78. app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml +1 -1
  79. app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml +1 -1
  80. app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml +3 -3
  81. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml +3 -2
  82. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml +10 -9
  83. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml +1 -1
  84. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml +1 -1
  85. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml +1 -1
  86. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml +1 -1
  87. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml +1 -1
  88. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml +1 -1
  89. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml +1 -1
  90. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml +1 -1
  91. app/design/adminhtml/default/default/template/catalog/product/created.phtml +1 -1
  92. app/design/adminhtml/default/default/template/catalog/product/edit.phtml +1 -1
  93. app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml +1 -1
  94. app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml +12 -12
  95. app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml +1 -1
  96. app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml +1 -1
  97. app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml +1 -1
  98. app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml +2 -2
  99. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml +2 -2
  100. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml +17 -13
  101. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml +2 -2
  102. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml +1 -1
  103. app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml +169 -0
  104. app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml +4 -4
  105. app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml +1 -1
  106. app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml +5 -5
  107. app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml +29 -26
  108. app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml +1 -1
  109. app/design/adminhtml/default/default/template/catalog/product/js.phtml +1 -1
  110. app/design/adminhtml/default/default/template/catalog/product/price.phtml +8 -8
  111. app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml +1 -1
  112. app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml +92 -62
  113. app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml +1 -1
  114. app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml +1 -1
  115. app/design/adminhtml/default/default/template/cms/browser/content.phtml +1 -1
  116. app/design/adminhtml/default/default/template/cms/browser/content/files.phtml +1 -1
  117. app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml +1 -1
  118. app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml +1 -4
  119. app/design/adminhtml/default/default/template/cms/browser/js.phtml +1 -1
  120. app/design/adminhtml/default/default/template/cms/browser/tree.phtml +1 -1
  121. app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml +1 -1
  122. app/design/adminhtml/default/default/template/coming.phtml +1 -1
  123. app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml +1 -1
  124. app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml +1 -1
  125. app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml +1 -1
  126. app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml +1 -1
  127. app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml +1 -1
  128. app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml +1 -1
  129. app/design/adminhtml/default/default/template/currencysymbol/grid.phtml +100 -0
  130. app/design/adminhtml/default/default/template/customer/edit/js.phtml +1 -1
  131. app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml +52 -0
  132. app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml +1 -1
  133. app/design/adminhtml/default/default/template/customer/online.phtml +1 -1
  134. app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml +52 -0
  135. app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml +65 -0
  136. app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +78 -3
  137. app/design/adminhtml/default/default/template/customer/tab/cart.phtml +1 -1
  138. app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml +1 -1
  139. app/design/adminhtml/default/default/template/customer/tab/view.phtml +1 -1
  140. app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml +1 -1
  141. app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml +1 -1
  142. app/design/adminhtml/default/default/template/dashboard/graph.phtml +1 -1
  143. app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml +1 -1
  144. app/design/adminhtml/default/default/template/dashboard/grid.phtml +1 -1
  145. app/design/adminhtml/default/default/template/dashboard/index.phtml +1 -1
  146. app/design/adminhtml/default/default/template/dashboard/salebar.phtml +1 -1
  147. app/design/adminhtml/default/default/template/dashboard/searches.phtml +1 -1
  148. app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml +3 -2
  149. app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +1 -1
  150. app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml +1 -1
  151. app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml +4 -3
  152. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml +1 -1
  153. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +4 -4
  154. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml +3 -3
  155. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml +2 -2
  156. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml +2 -2
  157. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml +2 -2
  158. app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +1 -1
  159. app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +1 -1
  160. app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +1 -1
  161. app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +1 -1
  162. app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +1 -1
  163. app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml +1 -1
  164. app/design/adminhtml/default/default/template/email/order/items.phtml +1 -1
  165. app/design/adminhtml/default/default/template/empty.phtml +42 -0
  166. app/design/adminhtml/default/default/template/example.phtml +1 -1
  167. app/design/adminhtml/default/default/template/forgotpassword.phtml +4 -2
  168. app/design/adminhtml/default/default/template/formkey.phtml +1 -1
  169. app/design/adminhtml/default/default/template/giftmessage/form.phtml +1 -1
  170. app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml +1 -1
  171. app/design/adminhtml/default/default/template/giftmessage/helper.phtml +1 -1
  172. app/design/adminhtml/default/default/template/giftmessage/popup.phtml +3 -3
  173. app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml +1 -1
  174. app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml +1 -1
  175. app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml +1 -1
  176. app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml +1 -1
  177. app/design/adminhtml/default/default/template/googlebase/captcha.phtml +1 -1
  178. app/design/adminhtml/default/default/template/googlebase/items.phtml +1 -1
  179. app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +1 -1
  180. app/design/adminhtml/default/default/template/importexport/busy.phtml +1 -1
  181. app/design/adminhtml/default/default/template/importexport/export/form/after.phtml +2 -2
  182. app/design/adminhtml/default/default/template/importexport/export/form/before.phtml +5 -3
  183. app/design/adminhtml/default/default/template/importexport/import/form/after.phtml +1 -1
  184. app/design/adminhtml/default/default/template/importexport/import/form/before.phtml +1 -1
  185. app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml +1 -1
  186. app/design/adminhtml/default/default/template/index/notifications.phtml +1 -1
  187. app/design/adminhtml/default/default/template/login.phtml +3 -1
  188. app/design/adminhtml/default/default/template/media/editor.phtml +4 -5
  189. app/design/adminhtml/default/default/template/media/uploader.phtml +4 -6
  190. app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml +2 -2
  191. app/design/adminhtml/default/default/template/newsletter/preview/store.phtml +3 -2
  192. app/design/adminhtml/default/default/template/newsletter/problem/list.phtml +3 -3
  193. app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml +1 -1
  194. app/design/adminhtml/default/default/template/newsletter/queue/list.phtml +1 -1
  195. app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml +1 -1
  196. app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml +2 -2
  197. app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +1 -1
  198. app/design/adminhtml/default/default/template/newsletter/template/list.phtml +2 -2
  199. app/design/adminhtml/default/default/template/newsletter/template/preview.phtml +1 -1
  200. app/design/adminhtml/default/default/template/notification/baseurl.phtml +1 -1
  201. app/design/adminhtml/default/default/template/notification/security.phtml +1 -1
  202. app/design/adminhtml/default/default/template/notification/survey.phtml +1 -1
  203. app/design/adminhtml/default/default/template/notification/toolbar.phtml +3 -11
  204. app/design/adminhtml/default/default/template/notification/window.phtml +1 -1
  205. app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml +62 -0
  206. app/design/adminhtml/default/default/template/oauth/authorize/button.phtml +59 -0
  207. app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml +52 -0
  208. app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml +46 -0
  209. app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml +77 -0
  210. app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml +67 -0
  211. app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml +50 -0
  212. app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml +47 -0
  213. app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml +44 -0
  214. app/design/adminhtml/default/default/template/overlay_popup.phtml +1 -1
  215. app/design/adminhtml/default/default/template/page.phtml +2 -2
  216. app/design/adminhtml/default/default/template/page/footer.phtml +1 -1
  217. app/design/adminhtml/default/default/template/page/head.phtml +0 -3
  218. app/design/adminhtml/default/default/template/page/header.phtml +1 -1
  219. app/design/adminhtml/default/default/template/page/js/calendar.phtml +1 -1
  220. app/design/adminhtml/default/default/template/page/js/translate.phtml +10 -6
  221. app/design/adminhtml/default/default/template/page/menu.phtml +3 -16
  222. app/design/adminhtml/default/default/template/page/notices.phtml +2 -2
  223. app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml +1 -1
  224. app/design/adminhtml/default/default/template/paygate/form/cc.phtml +1 -1
  225. app/design/adminhtml/default/default/template/paygate/info/cc.phtml +1 -1
  226. app/design/adminhtml/default/default/template/paygate/info/pdf.phtml +1 -1
  227. app/design/adminhtml/default/default/template/payment/form/cc.phtml +1 -1
  228. app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +1 -1
  229. app/design/adminhtml/default/default/template/payment/form/checkmo.phtml +1 -1
  230. app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml +1 -1
  231. app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml +41 -0
  232. app/design/adminhtml/default/default/template/payment/info/checkmo.phtml +1 -1
  233. app/design/adminhtml/default/default/template/payment/info/default.phtml +1 -1
  234. app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml +1 -1
  235. app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml +1 -1
  236. app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml +1 -1
  237. app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml +1 -1
  238. app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml +3 -3
  239. app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml +1 -1
  240. app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml +1 -1
  241. app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml +1 -1
  242. app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml +1 -1
  243. app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml +1 -1
  244. app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml +15 -18
  245. app/design/adminhtml/default/default/template/permissions/roleinfo.phtml +2 -2
  246. app/design/adminhtml/default/default/template/permissions/roles.phtml +2 -2
  247. app/design/adminhtml/default/default/template/permissions/rolesedit.phtml +1 -1
  248. app/design/adminhtml/default/default/template/permissions/rolesusers.phtml +1 -1
  249. app/design/adminhtml/default/default/template/permissions/userinfo.phtml +1 -1
  250. app/design/adminhtml/default/default/template/permissions/usernroles.phtml +1 -1
  251. app/design/adminhtml/default/default/template/permissions/userroles.phtml +1 -1
  252. app/design/adminhtml/default/default/template/permissions/users.phtml +2 -2
  253. app/design/adminhtml/default/default/template/poll/answers/list.phtml +2 -2
  254. app/design/adminhtml/default/default/template/popup.phtml +1 -1
  255. app/design/adminhtml/default/default/template/promo/fieldset.phtml +1 -1
  256. app/design/adminhtml/default/default/template/promo/form.phtml +1 -1
  257. app/design/adminhtml/default/default/template/promo/js.phtml +11 -9
  258. app/design/adminhtml/default/default/template/promo/salesrulejs.phtml +114 -0
  259. app/design/adminhtml/default/default/template/rating/detailed.phtml +1 -1
  260. app/design/adminhtml/default/default/template/rating/options.phtml +1 -1
  261. app/design/adminhtml/default/default/template/rating/stars/detailed.phtml +1 -1
  262. app/design/adminhtml/default/default/template/rating/stars/summary.phtml +1 -1
  263. app/design/adminhtml/default/default/template/report/grid.phtml +1 -1
  264. app/design/adminhtml/default/default/template/report/grid/container.phtml +3 -1
  265. app/design/adminhtml/default/default/template/report/refresh/statistics.phtml +1 -1
  266. app/design/adminhtml/default/default/template/report/store/switcher.phtml +3 -2
  267. app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml +6 -5
  268. app/design/adminhtml/default/default/template/report/wishlist.phtml +1 -1
  269. app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +2 -2
  270. app/design/adminhtml/default/default/template/review/add.phtml +1 -1
  271. app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml +1 -1
  272. app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml +1 -1
  273. app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml +1 -1
  274. app/design/adminhtml/default/default/template/sales/items/column/name.phtml +1 -1
  275. app/design/adminhtml/default/default/template/sales/items/column/qty.phtml +1 -1
  276. app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml +1 -1
  277. app/design/adminhtml/default/default/template/sales/order/address/form.phtml +1 -1
  278. app/design/adminhtml/default/default/template/sales/order/comments/view.phtml +1 -1
  279. app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml +1 -1
  280. app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml +2 -2
  281. app/design/adminhtml/default/default/template/sales/order/create/comment.phtml +1 -1
  282. app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml +2 -2
  283. app/design/adminhtml/default/default/template/sales/order/create/data.phtml +3 -1
  284. app/design/adminhtml/default/default/template/sales/order/create/form.phtml +1 -1
  285. app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml +1 -1
  286. app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml +1 -1
  287. app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml +1 -1
  288. app/design/adminhtml/default/default/template/sales/order/create/items.phtml +1 -1
  289. app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +15 -6
  290. app/design/adminhtml/default/default/template/sales/order/create/js.phtml +1 -1
  291. app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml +1 -1
  292. app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml +10 -8
  293. app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml +1 -1
  294. app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml +4 -1
  295. app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml +26 -20
  296. app/design/adminhtml/default/default/template/sales/order/create/totals.phtml +1 -1
  297. app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml +2 -2
  298. app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml +1 -1
  299. app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml +2 -2
  300. app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml +1 -1
  301. app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +2 -2
  302. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml +2 -2
  303. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml +1 -1
  304. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +16 -17
  305. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +1 -2
  306. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml +1 -1
  307. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml +2 -2
  308. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml +1 -1
  309. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +16 -17
  310. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +1 -2
  311. app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml +1 -1
  312. app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml +2 -2
  313. app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml +1 -1
  314. app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +17 -17
  315. app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +1 -2
  316. app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml +6 -3
  317. app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml +2 -2
  318. app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml +1 -1
  319. app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml +1 -2
  320. app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml +1 -2
  321. app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml +2 -2
  322. app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +1 -1
  323. app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml +1 -1
  324. app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml +1 -1
  325. app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml +6 -8
  326. app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml +2 -2
  327. app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml +5 -5
  328. app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml +7 -7
  329. app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml +2 -2
  330. app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml +2 -2
  331. app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml +1 -1
  332. app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml +1 -1
  333. app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml +1 -1
  334. app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml +8 -10
  335. app/design/adminhtml/default/default/template/sales/order/totalbar.phtml +1 -1
  336. app/design/adminhtml/default/default/template/sales/order/totals.phtml +20 -20
  337. app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml +1 -1
  338. app/design/adminhtml/default/default/template/sales/order/totals/due.phtml +1 -1
  339. app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml +1 -1
  340. app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml +1 -1
  341. app/design/adminhtml/default/default/template/sales/order/totals/item.phtml +1 -1
  342. app/design/adminhtml/default/default/template/sales/order/totals/main.phtml +1 -1
  343. app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml +1 -1
  344. app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml +1 -1
  345. app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml +1 -1
  346. app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml +1 -1
  347. app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +3 -3
  348. app/design/adminhtml/default/default/template/sales/order/view/form.phtml +1 -1
  349. app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml +1 -1
  350. app/design/adminhtml/default/default/template/sales/order/view/history.phtml +1 -1
  351. app/design/adminhtml/default/default/template/sales/order/view/info.phtml +3 -3
  352. app/design/adminhtml/default/default/template/sales/order/view/items.phtml +1 -1
  353. app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +1 -1
  354. app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml +8 -5
  355. app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +3 -2
  356. app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml +12 -11
  357. app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml +1 -1
  358. app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml +1 -1
  359. app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml +1 -1
  360. app/design/adminhtml/default/default/template/sales/transactions/detail.phtml +1 -1
  361. app/design/adminhtml/default/default/template/store/switcher.phtml +18 -17
  362. app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml +3 -2
  363. app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml +63 -0
  364. app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml +50 -0
  365. app/design/adminhtml/default/default/template/system/autocomplete.phtml +1 -1
  366. app/design/adminhtml/default/default/template/system/cache/additional.phtml +3 -3
  367. app/design/adminhtml/default/default/template/system/cache/edit.phtml +3 -3
  368. app/design/adminhtml/default/default/template/system/cache/notifications.phtml +1 -1
  369. app/design/adminhtml/default/default/template/system/config/edit.phtml +1 -1
  370. app/design/adminhtml/default/default/template/system/config/form/field/array.phtml +5 -5
  371. app/design/adminhtml/default/default/template/system/config/js.phtml +2 -7
  372. app/design/adminhtml/default/default/template/system/config/switcher.phtml +31 -4
  373. app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml +1 -1
  374. app/design/adminhtml/default/default/template/system/config/tabs.phtml +1 -1
  375. app/design/adminhtml/default/default/template/system/convert/profile/process.phtml +1 -1
  376. app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml +1 -1
  377. app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml +2 -2
  378. app/design/adminhtml/default/default/template/system/currency/rate/services.phtml +1 -1
  379. app/design/adminhtml/default/default/template/system/currency/rates.phtml +1 -1
  380. app/design/adminhtml/default/default/template/system/design/edit.phtml +1 -1
  381. app/design/adminhtml/default/default/template/system/design/index.phtml +1 -1
  382. app/design/adminhtml/default/default/template/system/email/template/edit.phtml +1 -1
  383. app/design/adminhtml/default/default/template/system/email/template/list.phtml +1 -1
  384. app/design/adminhtml/default/default/template/system/email/template/preview.phtml +1 -1
  385. app/design/adminhtml/default/default/template/system/info.phtml +1 -1
  386. app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml +1 -1
  387. app/design/adminhtml/default/default/template/system/shipping/ups.phtml +98 -125
  388. app/design/adminhtml/default/default/template/system/variable/js.phtml +1 -1
  389. app/design/adminhtml/default/default/template/tag/edit/container.phtml +1 -1
  390. app/design/adminhtml/default/default/template/tag/index.phtml +1 -1
  391. app/design/adminhtml/default/default/template/tax/class/page/edit.phtml +1 -1
  392. app/design/adminhtml/default/default/template/tax/importExport.phtml +1 -1
  393. app/design/adminhtml/default/default/template/tax/rate/form.phtml +1 -1
  394. app/design/adminhtml/default/default/template/tax/rate/title.phtml +1 -1
  395. app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml +2 -2
  396. app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml +1 -1
  397. app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml +1 -1
  398. app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml +1 -1
  399. app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml +2 -2
  400. app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml +1 -1
  401. app/design/adminhtml/default/default/template/urlrewrite/categories.phtml +1 -1
  402. app/design/adminhtml/default/default/template/urlrewrite/edit.phtml +1 -1
  403. app/design/adminhtml/default/default/template/urlrewrite/selector.phtml +1 -1
  404. app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml +53 -0
  405. app/design/adminhtml/default/default/template/weee/renderer/tax.phtml +3 -3
  406. app/design/adminhtml/default/default/template/widget/accordion.phtml +3 -3
  407. app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml +1 -1
  408. app/design/adminhtml/default/default/template/widget/form.phtml +1 -1
  409. app/design/adminhtml/default/default/template/widget/form/container.phtml +1 -1
  410. app/design/adminhtml/default/default/template/widget/form/element.phtml +1 -1
  411. app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml +1 -1
  412. app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml +1 -1
  413. app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml +1 -1
  414. app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml +1 -1
  415. app/design/adminhtml/default/default/template/widget/grid.phtml +1 -1
  416. app/design/adminhtml/default/default/template/widget/grid/container.phtml +1 -1
  417. app/design/adminhtml/default/default/template/widget/grid/massaction.phtml +5 -1
  418. app/design/adminhtml/default/default/template/widget/grid/serializer.phtml +1 -1
  419. app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml +56 -24
  420. app/design/adminhtml/default/default/template/widget/instance/js.phtml +10 -10
  421. app/design/adminhtml/default/default/template/widget/tabs.phtml +1 -1
  422. app/design/adminhtml/default/default/template/widget/tabshoriz.phtml +1 -1
  423. app/design/adminhtml/default/default/template/widget/tabsleft.phtml +1 -1
  424. app/design/adminhtml/default/default/template/widget/view/container.phtml +1 -1
  425. package.xml +6 -6
  426. skin/adminhtml/default/default/boxes.css +81 -16
  427. skin/adminhtml/default/default/iestyles.css +6 -3
  428. skin/adminhtml/default/default/images/btn_gr_bg.gif +0 -0
  429. skin/adminhtml/default/default/images/btn_gr_on.gif +0 -0
  430. skin/adminhtml/default/default/images/btn_gr_over.gif +0 -0
  431. skin/adminhtml/default/default/images/btn_loading-icon.gif +0 -0
  432. skin/adminhtml/default/default/images/i_question-mark.png +0 -0
  433. skin/adminhtml/default/default/images/login_box_bg_auth.jpg +0 -0
  434. skin/adminhtml/default/default/images/reload.png +0 -0
  435. skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css +39 -0
  436. skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif +0 -0
  437. skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif +0 -0
  438. skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif +0 -0
  439. skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png +0 -0
  440. 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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
28
 
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -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="addItem"><type>js_css</type><name>prototype/windows/themes/magento.css</name></action>
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -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/adminhtml_report_filter_form" name="grid.filter.form">
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -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) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -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="addItem"><type>js_css</type><name>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" />
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
 
 
26
  ?>
27
  <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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)