Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update as of 7/3/2012

* Refactored backend (admin) menu generation:
  * Menu is separated from `adminhtml.xml` files into `menu.xml` files
  * Rendering menu became responsibility of `Mage_Backend` instead of `Mage_Adminhtml` module
  * Implemented XML-Schema for `menu.xml`
  * Actions with menu items defined in schema: add, remove, move, update, change parent and position
* Refactored customers import feature. New ability to provide import data in 3 files: master file (key customer information) + address file (customer id + address info) + financial file (customer id + reward points & store credit)
* Optimized memory consumption in integration tests:
  * Found and eliminated memory leaks in `Mage_Core_Model_App_Area`, `Mage_Core_Model_Layout`
  * Manually unset objects from PHPUnit test case object in `tearDown()` in integration tests. Garbage collector didn't purge them because of these references
  * Disabled running `integrity` test suite by default in integration tests
* Improvements in visual design editor JavaScript:
  * eliminated dependency of code on HTML-literals, reduced code coupling between templates and JavaScript files
  * implemented blocking unwanted JavaScript activity in visual design editor mode
* Various fixes in UX, code stability, modularity
* GitHub requests:
  * [#23](#23) -- added `Mage_Customer_Block_Account_Navigation::removeLink()`
  • Loading branch information...
commit 3330e258c428b08d5e5e64a4fedbd2acb0cf1396 1 parent 0c3e67e
@mage2-team mage2-team authored
Showing with 7,937 additions and 2,271 deletions.
  1. +22 −3 CHANGELOG.markdown
  2. +0 −16 app/code/core/Mage/Admin/Model/Config.php
  3. +0 −11 app/code/core/Mage/AdminNotification/etc/adminhtml.xml
  4. +32 −0 app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml
  5. +1 −1  app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php
  6. +6 −2 app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
  7. +1 −1  app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
  8. +1 −1  app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
  9. +1 −1  app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
  10. +56 −105 app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
  11. +1 −1  app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
  12. +1 −1  app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
  13. +1 −1  app/code/core/Mage/Adminhtml/controllers/CacheController.php
  14. +1 −1  app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
  15. +1 −1  app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
  16. +4 −4 app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
  17. +3 −3 app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
  18. +2 −2 app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
  19. +1 −1  app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
  20. +1 −1  app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
  21. +1 −1  app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
  22. +1 −1  app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
  23. +2 −2 app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
  24. +1 −1  app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php
  25. +2 −2 app/code/core/Mage/Adminhtml/controllers/CustomerController.php
  26. +1 −1  app/code/core/Mage/Adminhtml/controllers/DashboardController.php
  27. +1 −1  app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php
  28. +2 −2 app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php
  29. +1 −1  app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
  30. +2 −2 app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
  31. +1 −1  app/code/core/Mage/Adminhtml/controllers/NotificationController.php
  32. +1 −1  app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php
  33. +2 −2 app/code/core/Mage/Adminhtml/controllers/PollController.php
  34. +1 −1  app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
  35. +1 −1  app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
  36. +1 −1  app/code/core/Mage/Adminhtml/controllers/PromoController.php
  37. +2 −2 app/code/core/Mage/Adminhtml/controllers/RatingController.php
  38. +3 −3 app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
  39. +4 −4 app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
  40. +3 −3 app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
  41. +7 −7 app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
  42. +3 −3 app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php
  43. +1 −1  app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
  44. +6 −6 app/code/core/Mage/Adminhtml/controllers/Report/TagController.php
  45. +1 −57 app/code/core/Mage/Adminhtml/controllers/ReportController.php
  46. +2 −2 app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php
  47. +1 −1  app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
  48. +2 −2 app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
  49. +1 −1  app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php
  50. +2 −2 app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
  51. +2 −2 app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
  52. +1 −1  app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
  53. +1 −1  app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
  54. +2 −2 app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php
  55. +2 −2 app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php
  56. +1 −1  app/code/core/Mage/Adminhtml/controllers/SitemapController.php
  57. +1 −1  app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
  58. +1 −1  app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
  59. +1 −1  app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
  60. +2 −2 app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
  61. +2 −2 app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
  62. +1 −1  app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
  63. +2 −2 app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
  64. +2 −2 app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
  65. +1 −1  app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
  66. +1 −1  app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
  67. +1 −1  app/code/core/Mage/Adminhtml/controllers/SystemController.php
  68. +3 −3 app/code/core/Mage/Adminhtml/controllers/TagController.php
  69. +1 −1  app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
  70. +1 −1  app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
  71. +2 −2 app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
  72. +1 −1  app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
  73. +2 −2 app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
  74. +0 −80 app/code/core/Mage/Adminhtml/etc/adminhtml.xml
  75. +46 −0 app/code/core/Mage/Adminhtml/etc/adminhtml/menu.xml
  76. +1 −1  app/code/core/Mage/Adminhtml/view/adminhtml/admin/page.phtml
  77. +1 −1  app/code/core/Mage/Adminhtml/view/adminhtml/admin/popup.phtml
  78. +2 −1  app/code/core/Mage/Adminhtml/view/adminhtml/catalog.xml
  79. +1 −0  app/code/core/Mage/Adminhtml/view/adminhtml/customer.xml
  80. +0 −1  app/code/core/Mage/Adminhtml/view/adminhtml/main.xml
  81. +2 −0  app/code/core/Mage/Adminhtml/view/adminhtml/tag.xml
  82. +0 −22 app/code/core/Mage/Api/etc/adminhtml.xml
  83. +34 −0 app/code/core/Mage/Api/etc/adminhtml/menu.xml
  84. +2 −2 app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php
  85. +3 −3 app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
  86. +0 −20 app/code/core/Mage/Api2/etc/adminhtml.xml
  87. +33 −0 app/code/core/Mage/Api2/etc/adminhtml/menu.xml
  88. +74 −231 app/code/core/Mage/Backend/Block/Menu.php
  89. +99 −0 app/code/core/Mage/Backend/Block/Menu/Container.php
  90. +115 −0 app/code/core/Mage/Backend/Block/Menu/Item.php
  91. +1 −1  app/code/core/Mage/Backend/Block/Widget/Grid.php
  92. +3 −3 app/code/core/Mage/Backend/Controller/ActionAbstract.php
  93. +239 −0 app/code/core/Mage/Backend/Model/Menu.php
  94. +124 −0 app/code/core/Mage/Backend/Model/Menu/Builder.php
  95. +71 −0 app/code/core/Mage/Backend/Model/Menu/Builder/Command/Add.php
  96. +44 −0 app/code/core/Mage/Backend/Model/Menu/Builder/Command/Remove.php
  97. +45 −0 app/code/core/Mage/Backend/Model/Menu/Builder/Command/Update.php
  98. +116 −0 app/code/core/Mage/Backend/Model/Menu/Builder/CommandAbstract.php
  99. +174 −0 app/code/core/Mage/Backend/Model/Menu/Config.php
  100. +115 −0 app/code/core/Mage/Backend/Model/Menu/Config/Menu.php
  101. +47 −0 app/code/core/Mage/Backend/Model/Menu/Config/Menu/Dom.php
  102. +169 −0 app/code/core/Mage/Backend/Model/Menu/Config/menu.xsd
  103. +153 −0 app/code/core/Mage/Backend/Model/Menu/Director/Dom.php
  104. +66 −0 app/code/core/Mage/Backend/Model/Menu/DirectorAbstract.php
  105. +39 −0 app/code/core/Mage/Backend/Model/Menu/Factory.php
  106. +41 −0 app/code/core/Mage/Backend/Model/Menu/Filter/Iterator.php
  107. +479 −0 app/code/core/Mage/Backend/Model/Menu/Item.php
  108. +150 −0 app/code/core/Mage/Backend/Model/Menu/Item/Factory.php
  109. +147 −0 app/code/core/Mage/Backend/Model/Menu/Item/Validator.php
  110. +11 −9 app/code/core/Mage/{Adminhtml/Block/Page/Menu.php → Backend/Model/Menu/Iterator.php}
  111. +62 −0 app/code/core/Mage/Backend/Model/Menu/Logger.php
  112. +36 −37 app/code/core/Mage/Backend/Model/Url.php
  113. +7 −0 app/code/core/Mage/Backend/etc/config.xml
  114. +11 −0 app/code/core/Mage/Backend/view/adminhtml/layout.xml
  115. +1 −5 app/code/core/Mage/Backend/view/adminhtml/menu.phtml
  116. +32 −0 app/code/core/Mage/Backend/view/adminhtml/menu/container.phtml
  117. +37 −0 app/code/core/Mage/Backend/view/adminhtml/menu/item.phtml
  118. +0 −14 app/code/core/Mage/Backup/etc/adminhtml.xml
  119. +32 −0 app/code/core/Mage/Backup/etc/adminhtml/menu.xml
  120. +17 −1 app/code/core/Mage/Bundle/view/frontend/layout.xml
  121. +125 −9 app/code/core/Mage/Captcha/Helper/Data.php
  122. +70 −35 app/code/core/Mage/Captcha/Model/Zend.php
  123. +3 −1 app/code/core/Mage/Captcha/view/frontend/layout.xml
  124. +58 −0 app/code/core/Mage/Captcha/view/frontend/onepage.js
  125. +2 −2 app/code/core/Mage/Captcha/view/frontend/zend.phtml
  126. +36 −10 app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
  127. +0 −41 app/code/core/Mage/Catalog/etc/adminhtml.xml
  128. +38 −0 app/code/core/Mage/Catalog/etc/adminhtml/menu.xml
  129. +0 −13 app/code/core/Mage/CatalogRule/etc/adminhtml.xml
  130. +33 −0 app/code/core/Mage/CatalogRule/etc/adminhtml/menu.xml
  131. +0 −11 app/code/core/Mage/CatalogSearch/etc/adminhtml.xml
  132. +32 −0 app/code/core/Mage/CatalogSearch/etc/adminhtml/menu.xml
  133. +0 −11 app/code/core/Mage/Checkout/etc/adminhtml.xml
  134. +32 −0 app/code/core/Mage/Checkout/etc/adminhtml/menu.xml
  135. +0 −12 app/code/core/Mage/Checkout/view/frontend/layout.xml
  136. +1 −1  app/code/core/Mage/Checkout/view/frontend/onepage/login.phtml
  137. +0 −18 app/code/core/Mage/Cms/etc/adminhtml.xml
  138. +34 −0 app/code/core/Mage/Cms/etc/adminhtml/menu.xml
  139. +1 −1  app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php
  140. +0 −20 app/code/core/Mage/Connect/etc/adminhtml.xml
  141. +34 −0 app/code/core/Mage/Connect/etc/adminhtml/menu.xml
  142. +2 −3 app/code/core/Mage/Connect/view/adminhtml/layout.xml
  143. +13 −0 app/code/core/Mage/Core/Block/Abstract.php
  144. +18 −1 app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
  145. +1 −1  app/code/core/Mage/Core/Model/App.php
  146. +3 −16 app/code/core/Mage/Core/Model/App/Area.php
  147. +43 −0 app/code/core/Mage/Core/Model/Event/Manager.php
  148. +11 −0 app/code/core/Mage/Core/Model/Layout.php
  149. +58 −0 app/code/core/Mage/Core/Model/Logger.php
  150. +50 −0 app/code/core/Mage/Core/Model/Store/Config.php
  151. +1 −1  app/code/core/Mage/Core/etc/config.xml
  152. +2 −2 app/code/core/Mage/Core/etc/system.xml
  153. +1 −1  app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
  154. +0 −22 app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml
  155. +34 −0 app/code/core/Mage/CurrencySymbol/etc/adminhtml/menu.xml
  156. +12 −0 app/code/core/Mage/Customer/Block/Account/Navigation.php
  157. +0 −24 app/code/core/Mage/Customer/etc/adminhtml.xml
  158. +35 −0 app/code/core/Mage/Customer/etc/adminhtml/menu.xml
  159. +2 −2 app/code/core/Mage/Customer/view/frontend/widget/name.phtml
  160. +1 −1  app/code/core/Mage/DesignEditor/controllers/Adminhtml/System/Design/EditorController.php
  161. +0 −15 app/code/core/Mage/DesignEditor/etc/adminhtml.xml
  162. +32 −0 app/code/core/Mage/DesignEditor/etc/adminhtml/menu.xml
  163. +136 −166 app/code/core/Mage/DesignEditor/view/frontend/js/base.js
  164. +181 −186 app/code/core/Mage/DesignEditor/view/frontend/js/design_editor.js
  165. +77 −0 app/code/core/Mage/DesignEditor/view/frontend/js/settimeout_override.js
  166. +1 −0  app/code/core/Mage/DesignEditor/view/frontend/layout.xml
  167. +24 −24 app/code/core/Mage/DesignEditor/view/frontend/toolbar.phtml
  168. +0 −14 app/code/core/Mage/Downloadable/etc/adminhtml.xml
  169. +32 −0 app/code/core/Mage/Downloadable/etc/adminhtml/menu.xml
  170. +10 −0 app/code/core/Mage/Downloadable/view/frontend/layout.xml
  171. +1 −1  app/code/core/Mage/GoogleShopping/controllers/Adminhtml/Googleshopping/ItemsController.php
  172. +1 −1  app/code/core/Mage/GoogleShopping/controllers/Adminhtml/Googleshopping/TypesController.php
  173. +0 −20 app/code/core/Mage/GoogleShopping/etc/adminhtml.xml
  174. +34 −0 app/code/core/Mage/GoogleShopping/etc/adminhtml/menu.xml
  175. +1 −1  app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php
  176. +49 −0 app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Before.php
  177. +48 −5 app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php
  178. +30 −0 app/code/core/Mage/ImportExport/Helper/Data.php
  179. +32 −3 app/code/core/Mage/ImportExport/Model/Export/Entity/V2/Eav/Customer/Address.php
  180. +102 −37 app/code/core/Mage/ImportExport/Model/Import.php
  181. +28 −14 app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php
  182. +661 −0 app/code/core/Mage/ImportExport/Model/Import/Entity/V2/Abstract.php
  183. +195 −0 app/code/core/Mage/ImportExport/Model/Import/Entity/V2/Eav/Abstract.php
  184. +362 −0 app/code/core/Mage/ImportExport/Model/Import/Entity/V2/Eav/Customer.php
  185. +158 −0 app/code/core/Mage/ImportExport/Model/Import/Entity/V2/Eav/Customer/Abstract.php
  186. +504 −0 app/code/core/Mage/ImportExport/Model/Import/Entity/V2/Eav/Customer/Address.php
  187. +30 −18 app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php
  188. +10 −9 app/code/core/Mage/ImportExport/Model/Source/{Export → }/Format/Version.php
  189. +4 −0 app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php
  190. +47 −0 app/code/core/Mage/ImportExport/Model/Source/Import/Customer/Entity.php
  191. +3 −8 app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php
  192. +1 −1  app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php
  193. +15 −4 app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
  194. +0 −20 app/code/core/Mage/ImportExport/etc/adminhtml.xml
  195. +33 −0 app/code/core/Mage/ImportExport/etc/adminhtml/menu.xml
  196. +11 −1 app/code/core/Mage/ImportExport/etc/config.xml
  197. +37 −0 app/code/core/Mage/ImportExport/sql/importexport_setup/upgrade-1.6.0.2-1.6.0.3.php
  198. +3 −3 app/code/core/Mage/ImportExport/view/adminhtml/export/form/before.phtml
  199. +10 −1 app/code/core/Mage/ImportExport/view/adminhtml/import/form/after.phtml
  200. +128 −2 app/code/core/Mage/ImportExport/view/adminhtml/import/form/before.phtml
  201. +1 −1  app/code/core/Mage/ImportExport/view/adminhtml/layout.xml
  202. +1 −1  app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
  203. +0 −11 app/code/core/Mage/Index/etc/adminhtml.xml
  204. +32 −0 app/code/core/Mage/Index/etc/adminhtml/menu.xml
  205. +7 −9 app/code/core/Mage/Install/Model/Installer/Console.php
  206. +8 −0 app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
  207. +18 −0 app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php
  208. +0 −24 app/code/core/Mage/Newsletter/etc/adminhtml.xml
  209. +36 −0 app/code/core/Mage/Newsletter/etc/adminhtml/menu.xml
  210. +13 −1 app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
  211. +1 −1  app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
  212. +14 −3 app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
  213. +0 −25 app/code/core/Mage/Oauth/etc/adminhtml.xml
  214. +34 −0 app/code/core/Mage/Oauth/etc/adminhtml/menu.xml
  215. +1 −1  app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php
  216. +0 −15 app/code/core/Mage/Paypal/etc/adminhtml.xml
  217. +32 −0 app/code/core/Mage/Paypal/etc/adminhtml/menu.xml
  218. +1 −1  app/code/core/Mage/Persistent/view/frontend/checkout/onepage/login.phtml
  219. +0 −11 app/code/core/Mage/Poll/etc/adminhtml.xml
  220. +32 −0 app/code/core/Mage/Poll/etc/adminhtml/menu.xml
  221. +0 −80 app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php
  222. +0 −124 app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php
  223. +0 −106 app/code/core/Mage/Reports/etc/adminhtml.xml
  224. +53 −0 app/code/core/Mage/Reports/etc/adminhtml/menu.xml
  225. +0 −47 app/code/core/Mage/Review/etc/adminhtml.xml
  226. +39 −0 app/code/core/Mage/Review/etc/adminhtml/menu.xml
  227. +0 −53 app/code/core/Mage/Sales/etc/adminhtml.xml
  228. +40 −0 app/code/core/Mage/Sales/etc/adminhtml/menu.xml
  229. +0 −11 app/code/core/Mage/SalesRule/etc/adminhtml.xml
  230. +32 −0 app/code/core/Mage/SalesRule/etc/adminhtml/menu.xml
  231. +0 −11 app/code/core/Mage/Sitemap/etc/adminhtml.xml
  232. +32 −0 app/code/core/Mage/Sitemap/etc/adminhtml/menu.xml
  233. +0 −46 app/code/core/Mage/Tag/etc/adminhtml.xml
  234. +38 −0 app/code/core/Mage/Tag/etc/adminhtml/menu.xml
  235. +0 −32 app/code/core/Mage/Tax/etc/adminhtml.xml
  236. +37 −0 app/code/core/Mage/Tax/etc/adminhtml/menu.xml
  237. +1 −1  app/code/core/Mage/User/controllers/Adminhtml/User/RoleController.php
  238. +1 −1  app/code/core/Mage/User/controllers/Adminhtml/UserController.php
  239. +0 −21 app/code/core/Mage/User/etc/adminhtml.xml
  240. +34 −0 app/code/core/Mage/User/etc/adminhtml/menu.xml
  241. +1 −1  app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
  242. +0 −11 app/code/core/Mage/Widget/etc/adminhtml.xml
  243. +32 −0 app/code/core/Mage/Widget/etc/adminhtml/menu.xml
  244. +10 −10 app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
  245. +0 −28 app/code/core/Mage/XmlConnect/etc/adminhtml.xml
  246. +36 −0 app/code/core/Mage/XmlConnect/etc/adminhtml/menu.xml
  247. +1 −1  app/design/frontend/default/iphone/Mage_Persistent/checkout/onepage/login.phtml
  248. +1 −0  app/etc/modules/Mage_Captcha.xml
  249. +6 −0 dev/tests/integration/framework/Magento/Test/Bootstrap.php
  250. +6 −0 dev/tests/integration/framework/Magento/Test/TestCase/ControllerAbstract.php
  251. +1 −1  dev/tests/integration/framework/bootstrap.php
  252. +1 −0  dev/tests/integration/phpunit.xml.dist
  253. +5 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Customer/Edit/Tab/View/AccordionTest.php
  254. +5 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Dashboard/GraphTest.php
  255. +5 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Page/HeaderTest.php
  256. +5 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php
  257. +5 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Controller/ActionTest.php
  258. +5 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Model/Sales/Order/CreateTest.php
  259. +50 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Model/System/Config/Source/Admin/PageTest.php
  260. +3 −0  dev/tests/integration/testsuite/Mage/Adminhtml/Utility/Controller.php
  261. +5 −0 dev/tests/integration/testsuite/Mage/Backend/Block/TemplateTest.php
  262. +8 −2 dev/tests/integration/testsuite/Mage/Backend/Controller/Router/DefaultTest.php
  263. +10 −6 dev/tests/integration/testsuite/Mage/Backend/Helper/DataTest.php
  264. +6 −1 dev/tests/integration/testsuite/Mage/Backend/Model/Auth/SessionTest.php
  265. +5 −0 dev/tests/integration/testsuite/Mage/Backend/Model/AuthTest.php
  266. +85 −0 dev/tests/integration/testsuite/Mage/Backend/Model/MenuTest.php
  267. +5 −0 dev/tests/integration/testsuite/Mage/Backend/Model/ObserverTest.php
  268. +5 −0 dev/tests/integration/testsuite/Mage/Backend/Model/UrlTest.php
  269. +6 −22 dev/tests/integration/testsuite/Mage/Backend/controllers/Adminhtml/AuthControllerTest.php
  270. +6 −0 dev/tests/integration/testsuite/Mage/Backend/controllers/Adminhtml/IndexControllerTest.php
  271. +5 −0 dev/tests/integration/testsuite/Mage/Bundle/Model/ProductTest.php
  272. +6 −0 dev/tests/integration/testsuite/Mage/Catalog/Block/Product/AbstractTest.php
  273. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Block/Product/ListTest.php
  274. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Block/Product/NewTest.php
  275. +6 −0 dev/tests/integration/testsuite/Mage/Catalog/Block/Product/ViewTest.php
  276. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/Category/FlatTest.php
  277. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/CategoryTest.php
  278. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/DataTest.php
  279. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/ImageTest.php
  280. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/MapTest.php
  281. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/OutputTest.php
  282. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/Product/CompareTest.php
  283. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/Product/FlatTest.php
  284. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/Product/UrlTest.php
  285. +2 −0  dev/tests/integration/testsuite/Mage/Catalog/Helper/Product/ViewTest.php
  286. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Helper/ProductTest.php
  287. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/AbstractTest.php
  288. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Category/Api/V2Test.php
  289. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Category/ApiTest.php
  290. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Category/Attribute/ApiTest.php
  291. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Category/CategoryImageTest.php
  292. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/CategoryTest.php
  293. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/CategoryTreeTest.php
  294. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/DesignTest.php
  295. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Layer/Filter/AttributeTest.php
  296. +6 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Layer/Filter/CategoryTest.php
  297. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Layer/Filter/DecimalTest.php
  298. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Layer/Filter/ItemTest.php
  299. +5 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php
  300. +7 −0 dev/tests/integration/testsuite/Mage/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
Sorry, we could not display the entire diff because too many files (533) changed.
View
25 CHANGELOG.markdown
@@ -1,3 +1,22 @@
+Update as of 7/3/2012
+=====================
+* Refactored backend (admin) menu generation:
+ * Menu is separated from `adminhtml.xml` files into `menu.xml` files
+ * Rendering menu became responsibility of `Mage_Backend` instead of `Mage_Adminhtml` module
+ * Implemented XML-Schema for `menu.xml`
+ * Actions with menu items defined in schema: add, remove, move, update, change parent and position
+* Refactored customers import feature. New ability to provide import data in 3 files: master file (key customer information) + address file (customer id + address info) + financial file (customer id + reward points & store credit)
+* Optimized memory consumption in integration tests:
+ * Found and eliminated memory leaks in `Mage_Core_Model_App_Area`, `Mage_Core_Model_Layout`
+ * Manually unset objects from PHPUnit test case object in `tearDown()` in integration tests. Garbage collector didn't purge them because of these references
+ * Disabled running `integrity` test suite by default in integration tests
+* Improvements in visual design editor JavaScript:
+ * eliminated dependency of code on HTML-literals, reduced code coupling between templates and JavaScript files
+ * implemented blocking unwanted JavaScript activity in visual design editor mode
+* Various fixes in UX, code stability, modularity
+* GitHub requests:
+ * [#23](https://github.com/magento/magento2/pull/23) -- added `Mage_Customer_Block_Account_Navigation::removeLink()`
+
Update as of 6/20/2012
=====================
* Implemented locale translation inheritance
@@ -8,7 +27,7 @@ Update as of 6/20/2012
* Implemented optional tracking of changes in view files fallback - cached by default, tracked in developer mode
* Introduced `@magentoDbIsolation` annotation in integration tests - isolates DB modifications made by tests
* Started refactoring of Visual Design Editor Javascript architecture
-* Github requests:
+* GitHub requests:
* [#25](https://github.com/magento/magento2/issues/25) Removed unused `Mage_Core_Block_Abstract::getHelper()` method
* Fixed:
* "$_FILES array is empty" messages in exception log upon installation
@@ -26,8 +45,8 @@ Update as of 6/7/2012
* Eliminated "after commit callback" workaround from integration tests by implementing "transparent transactions" capability in integration testing framework
* Refactored admin authentication/authorization in RSS module. Removed program termination and covered the controllers with tests
* Removed HTML-report feature of copy-paste detector which never worked anyway (`dev/tests/static/framework/Inspection/CopyPasteDetector/html_report.xslt` and all related code)
-* Github requests:
-** [#19](https://github.com/magento/magento2/pull/19) Implemented "soft" dependency between modules and performed several improvements in the related code, covered with tests
+* GitHub requests:
+ * [#19](https://github.com/magento/magento2/pull/19) Implemented "soft" dependency between modules and performed several improvements in the related code, covered with tests
Update as of 5/31/2012
======================
View
16 app/code/core/Mage/Admin/Model/Config.php
@@ -333,20 +333,4 @@ public function getAdminhtmlConfig()
{
return $this->_adminhtmlConfig;
}
-
- /**
- * Get menu item label by item path
- *
- * @param string $path
- * @return string
- */
- public function getMenuItemLabel($path)
- {
- $moduleName = 'Mage_Adminhtml_Helper_Data';
- $menuNode = $this->getAdminhtmlConfig()->getNode('menu/' . str_replace('/', '/children/', trim($path, '/')));
- if ($menuNode->getAttribute('module')) {
- $moduleName = (string)$menuNode->getAttribute('module');
- }
- return $this->_getHelper($moduleName)->__((string)$menuNode->title);
- }
}
View
11 app/code/core/Mage/AdminNotification/etc/adminhtml.xml
@@ -60,15 +60,4 @@
</admin>
</resources>
</acl>
- <menu>
- <system>
- <children>
- <adminnotification translate="title" module="Mage_AdminNotification">
- <title>Notifications</title>
- <action>adminhtml/notification</action>
- <sort_order>15</sort_order>
- </adminnotification>
- </children>
- </system>
- </menu>
</config>
View
32 app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Mage
+ * @package Mage_AdminNotification
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <menu>
+ <add id="Mage_AdminNotification::system_adminnotification" title="Notifications" module="Mage_AdminNotification" sortOrder="15" parent="Mage_Adminhtml::system" action="adminhtml/notification" />
+ </menu>
+</config>
View
2  app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php
@@ -45,7 +45,7 @@ class Mage_Adminhtml_Block_Report_Product_Viewed_Grid extends Mage_Adminhtml_Blo
*
* @var string
*/
- protected $_resourceCollectionName = 'Mage_Reports_Model_Resource_Product_Viewed_Collection';
+ protected $_resourceCollectionName = 'Mage_Reports_Model_Resource_Report_Product_Viewed_Collection';
/**
* Init grid parameters
View
8 app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -350,12 +350,16 @@ protected function _getSystemConfigPathsParts($paths)
$result = $urlParams = $prefixParts = array();
$scopeLabel = Mage::helper('Mage_Adminhtml_Helper_Data')->__('GLOBAL');
if ($paths) {
+ /** @var $menu Mage_Backend_Model_Menu */
+ $menu = Mage::getSingleton('Mage_Backend_Model_Menu_Config')->getMenu();
+ $item = $menu->get('Mage_Adminhtml::system');
// create prefix path parts
$prefixParts[] = array(
- 'title' => Mage::getSingleton('Mage_Admin_Model_Config')->getMenuItemLabel('system'),
+ 'title' => $item->getModuleHelper()->__($item->getTitle()),
);
+ $item = $menu->get('Mage_Adminhtml::system_config');
$prefixParts[] = array(
- 'title' => Mage::getSingleton('Mage_Admin_Model_Config')->getMenuItemLabel('system/config'),
+ 'title' => $item->getModuleHelper()->__($item->getTitle()),
'url' => $this->getUrl('adminhtml/system_config/'),
);
View
2  app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
@@ -48,7 +48,7 @@ protected function _construct()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('sales/order')
+ ->_setActiveMenu('Mage_Sales::sales_order')
->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
->_addBreadcrumb($this->__('Credit Memos'),$this->__('Credit Memos'));
return $this;
View
2  app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
@@ -48,7 +48,7 @@ protected function _construct()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('sales/order')
+ ->_setActiveMenu('Mage_Sales::sales_order')
->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
->_addBreadcrumb($this->__('Invoices'),$this->__('Invoices'));
return $this;
View
2  app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
@@ -48,7 +48,7 @@ protected function _construct()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('sales/order')
+ ->_setActiveMenu('Mage_Sales::sales_order')
->_addBreadcrumb($this->__('Sales'), $this->__('Sales'))
->_addBreadcrumb($this->__('Shipments'),$this->__('Shipments'));
return $this;
View
161 app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
@@ -34,136 +34,87 @@
*/
class Mage_Adminhtml_Model_System_Config_Source_Admin_Page
{
- protected $_url;
+ /**
+ * Menu model
+ *
+ * @var Mage_Backend_Model_Menu
+ */
+ protected $_menu;
+
+ /**
+ * Object factory
+ *
+ * @var Mage_Core_Model_Config
+ */
+ protected $_objectFactory;
+
+ /**
+ * Default construct
+ */
+ public function __construct(array $data = array())
+ {
+ $this->_menu = isset($data['menu']) ?
+ $data['menu'] :
+ Mage::getSingleton('Mage_Backend_Model_Menu_Config')->getMenu();
+
+ $this->_objectFactory = isset($data['objectFactory']) ? $data['objectFactory'] : Mage::getConfig();
+ }
public function toOptionArray()
{
$options = array();
- $menu = $this->_buildMenuArray();
-
- $this->_createOptions($options, $menu);
-
+ $this->_createOptions($options, $this->_menu);
return $options;
}
- protected function _createOptions(&$optionArray, $menuNode)
+ /**
+ * Get menu filter iterator
+ *
+ * @param Mage_Backend_Model_Menu $menu menu model
+ * @return Mage_Backend_Model_Menu_Filter_Iterator
+ */
+ protected function _getMenuIterator(Mage_Backend_Model_Menu $menu)
+ {
+ return $this->_objectFactory->getModelInstance('Mage_Backend_Model_Menu_Filter_Iterator', $menu->getIterator());
+ }
+
+ /**
+ * Create options array
+ *
+ * @param array $optionArray
+ * @param Mage_Backend_Model_Menu $menu
+ * @param int $level
+ */
+ protected function _createOptions(&$optionArray, Mage_Backend_Model_Menu $menu, $level = 0)
{
$nonEscapableNbspChar = html_entity_decode('&#160;', ENT_NOQUOTES, 'UTF-8');
+ $paddingString = str_repeat($nonEscapableNbspChar, ($level * 4));
- foreach ($menuNode as $menu) {
+ foreach ($this->_getMenuIterator($menu) as $menuItem) {
- if (!empty($menu['url'])) {
+ /**@var $menuItem Mage_Backend_Model_Menu_Item */
+ if ($menuItem->getAction()) {
$optionArray[] = array(
- 'label' => str_repeat($nonEscapableNbspChar, ($menu['level'] * 4)) . $menu['label'],
- 'value' => $menu['path'],
+ 'label' => $paddingString . $menuItem->getTitle(),
+ 'value' => $menuItem->getId(),
);
- if (isset($menu['children'])) {
- $this->_createOptions($optionArray, $menu['children']);
+ if ($menuItem->hasChildren()) {
+ $this->_createOptions($optionArray, $menuItem->getChildren(), $level + 1);
}
}
else {
$children = array();
- if(isset($menu['children'])) {
- $this->_createOptions($children, $menu['children']);
+ if($menuItem->hasChildren()) {
+ $this->_createOptions($children, $menuItem->getChildren(), $level + 1);
}
$optionArray[] = array(
- 'label' => str_repeat($nonEscapableNbspChar, ($menu['level'] * 4)) . $menu['label'],
+ 'label' => $paddingString . $menuItem->getTitle(),
'value' => $children,
);
}
}
}
-
- protected function _getUrlModel()
- {
- if (is_null($this->_url)) {
- $this->_url = Mage::getModel('Mage_Adminhtml_Model_Url');
- }
- return $this->_url;
- }
-
- protected function _buildMenuArray(Varien_Simplexml_Element $parent=null, $path='', $level=0)
- {
- if (is_null($parent)) {
- $parent = Mage::getSingleton('Mage_Admin_Model_Config')->getAdminhtmlConfig()->getNode('menu');
- }
-
- $parentArr = array();
- $sortOrder = 0;
- foreach ($parent->children() as $childName=>$child) {
- if ((1 == $child->disabled)
- || ($child->depends && !$this->_checkDepends($child->depends))
- ) {
- continue;
- }
-
- $menuArr = array();
- $menuArr['label'] = $this->_getHelperValue($child);
-
- $menuArr['sort_order'] = $child->sort_order ? (int)$child->sort_order : $sortOrder;
-
- if ($child->action) {
- $menuArr['url'] = (string)$child->action;
- } else {
- $menuArr['url'] = '';
- }
-
- $menuArr['level'] = $level;
- $menuArr['path'] = $path . $childName;
-
- if ($child->children) {
- $menuArr['children'] = $this->_buildMenuArray($child->children, $path.$childName.'/', $level+1);
- }
- $parentArr[$childName] = $menuArr;
-
- $sortOrder++;
- }
-
- uasort($parentArr, array($this, '_sortMenu'));
-
- while (list($key, $value) = each($parentArr)) {
- $last = $key;
- }
- if (isset($last)) {
- $parentArr[$last]['last'] = true;
- }
-
- return $parentArr;
- }
-
- protected function _sortMenu($a, $b)
- {
- return $a['sort_order']<$b['sort_order'] ? -1 : ($a['sort_order']>$b['sort_order'] ? 1 : 0);
- }
-
- protected function _checkDepends(Varien_Simplexml_Element $depends)
- {
- if ($depends->module) {
- $modulesConfig = Mage::getConfig()->getNode('modules');
- foreach ($depends->module as $module) {
- if (!$modulesConfig->$module || !$modulesConfig->$module->is('active')) {
- return false;
- }
- }
- }
-
- return true;
- }
-
- protected function _getHelperValue(Varien_Simplexml_Element $child)
- {
- $helperName = 'Mage_Adminhtml_Helper_Data';
- $titleNodeName = 'title';
- $childAttributes = $child->attributes();
- if (isset($childAttributes['module'])) {
- $helperName = (string)$childAttributes['module'];
- }
-
- $titleNodeName = 'title';
-
- return Mage::helper($helperName)->__((string)$child->$titleNodeName);
- }
}
View
2  app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
@@ -37,7 +37,7 @@ class Mage_Adminhtml_Api_RoleController extends Mage_Adminhtml_Controller_Action
protected function _initAction()
{
$this->loadLayout();
- $this->_setActiveMenu('system/services/roles');
+ $this->_setActiveMenu('Mage_Api::system_api_roles');
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
$this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
View
2  app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
@@ -29,7 +29,7 @@ class Mage_Adminhtml_Api_UserController extends Mage_Adminhtml_Controller_Action
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('system/services/users')
+ ->_setActiveMenu('Mage_Api::system_api_users')
->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services'))
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
->_addBreadcrumb($this->__('Users'), $this->__('Users'))
View
2  app/code/core/Mage/Adminhtml/controllers/CacheController.php
@@ -44,7 +44,7 @@ public function indexAction()
$this->_title($this->__('System'))->_title($this->__('Cache Management'));
$this->loadLayout()
- ->_setActiveMenu('system/cache')
+ ->_setActiveMenu('Mage_Adminhtml::system_cache')
->renderLayout();
}
View
2  app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
@@ -199,7 +199,7 @@ public function editAction()
}
$this->loadLayout();
- $this->_setActiveMenu('catalog/categories');
+ $this->_setActiveMenu('Mage_Catalog::catalog_categories');
$this->getLayout()->getBlock('head')->setCanLoadExtJs(true)
->setContainerCssClass('catalog-categories');
View
2  app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
@@ -53,7 +53,7 @@ protected function _initAction()
$this->loadLayout('popup');
} else {
$this->loadLayout()
- ->_setActiveMenu('catalog/attributes')
+ ->_setActiveMenu('Mage_Catalog::catalog_attributes')
->_addBreadcrumb(Mage::helper('Mage_Catalog_Helper_Data')->__('Catalog'), Mage::helper('Mage_Catalog_Helper_Data')->__('Catalog'))
->_addBreadcrumb(
Mage::helper('Mage_Catalog_Helper_Data')->__('Manage Product Attributes'),
View
8 app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
@@ -54,7 +54,7 @@ public function indexAction()
}
$this->loadLayout();
- $this->_setActiveMenu('catalog/review');
+ $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_all');
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Main'));
@@ -75,7 +75,7 @@ public function pendingAction()
}
$this->loadLayout();
- $this->_setActiveMenu('catalog/review');
+ $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_pending');
Mage::register('usePendingFilter', true);
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Main'));
@@ -92,7 +92,7 @@ public function editAction()
$this->_title($this->__('Edit Review'));
$this->loadLayout();
- $this->_setActiveMenu('catalog/review');
+ $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_all');
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Edit'));
@@ -108,7 +108,7 @@ public function newAction()
$this->_title($this->__('New Review'));
$this->loadLayout();
- $this->_setActiveMenu('catalog/review');
+ $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_all');
$this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
View
6 app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
@@ -43,7 +43,7 @@ public function indexAction()
$this->_setTypeId();
$this->loadLayout();
- $this->_setActiveMenu('catalog/sets');
+ $this->_setActiveMenu('Mage_Catalog::catalog_attributes_sets');
$this->_addBreadcrumb(Mage::helper('Mage_Catalog_Helper_Data')->__('Catalog'), Mage::helper('Mage_Catalog_Helper_Data')->__('Catalog'));
$this->_addBreadcrumb(
@@ -80,7 +80,7 @@ public function editAction()
Mage::register('current_attribute_set', $attributeSet);
$this->loadLayout();
- $this->_setActiveMenu('catalog/sets');
+ $this->_setActiveMenu('Mage_Catalog::catalog_attributes_sets');
$this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
$this->_addBreadcrumb(Mage::helper('Mage_Catalog_Helper_Data')->__('Catalog'), Mage::helper('Mage_Catalog_Helper_Data')->__('Catalog'));
@@ -189,7 +189,7 @@ public function addAction()
$this->_setTypeId();
$this->loadLayout();
- $this->_setActiveMenu('catalog/sets');
+ $this->_setActiveMenu('Mage_Catalog::catalog_attributes_sets');
$this->_addContent(
$this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add')
View
4 app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -206,7 +206,7 @@ public function newAction()
strtolower($this->getFullActionName()),
'adminhtml_catalog_product_'.$product->getTypeId() . $_additionalLayoutPart
));
- $this->_setActiveMenu('catalog/products');
+ $this->_setActiveMenu('Mage_Catalog::catalog_products');
}
$this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
@@ -250,7 +250,7 @@ public function editAction()
'adminhtml_catalog_product_'.$product->getTypeId() . $_additionalLayoutPart
));
- $this->_setActiveMenu('catalog/products');
+ $this->_setActiveMenu('Mage_Catalog::catalog_products');
if (!Mage::app()->isSingleStoreMode() && ($switchBlock = $this->getLayout()->getBlock('store_switcher'))) {
$switchBlock->setDefaultStoreName($this->__('Default Values'))
View
2  app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
@@ -30,7 +30,7 @@ class Mage_Adminhtml_Catalog_SearchController extends Mage_Adminhtml_Controller_
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('catalog/search')
+ ->_setActiveMenu('Mage_CatalogSearch::catalog_search')
->_addBreadcrumb(Mage::helper('Mage_Catalog_Helper_Data')->__('Search'), Mage::helper('Mage_Catalog_Helper_Data')->__('Search'))
;
return $this;
View
2  app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
@@ -153,7 +153,7 @@ public function deleteAction()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('sales/checkoutagreement')
+ ->_setActiveMenu('Mage_Checkout::sales_checkoutagreement')
->_addBreadcrumb(Mage::helper('Mage_Checkout_Helper_Data')->__('Sales'), Mage::helper('Mage_Checkout_Helper_Data')->__('Sales'))
->_addBreadcrumb(Mage::helper('Mage_Checkout_Helper_Data')->__('Checkout Conditions'), Mage::helper('Mage_Checkout_Helper_Data')->__('Checkout Terms and Conditions'))
;
View
2  app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
@@ -43,7 +43,7 @@ protected function _initAction()
{
// load layout, set active menu and breadcrumbs
$this->loadLayout()
- ->_setActiveMenu('cms/block')
+ ->_setActiveMenu('Mage_Cms::cms_block')
->_addBreadcrumb(Mage::helper('Mage_Cms_Helper_Data')->__('CMS'), Mage::helper('Mage_Cms_Helper_Data')->__('CMS'))
->_addBreadcrumb(Mage::helper('Mage_Cms_Helper_Data')->__('Static Blocks'), Mage::helper('Mage_Cms_Helper_Data')->__('Static Blocks'))
;
View
2  app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
@@ -44,7 +44,7 @@ protected function _initAction()
{
// load layout, set active menu and breadcrumbs
$this->loadLayout()
- ->_setActiveMenu('cms/page')
+ ->_setActiveMenu('Mage_Cms::cms_page')
->_addBreadcrumb(Mage::helper('Mage_Cms_Helper_Data')->__('CMS'), Mage::helper('Mage_Cms_Helper_Data')->__('CMS'))
->_addBreadcrumb(Mage::helper('Mage_Cms_Helper_Data')->__('Manage Pages'), Mage::helper('Mage_Cms_Helper_Data')->__('Manage Pages'))
;
View
4 app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
@@ -52,7 +52,7 @@ public function indexAction()
$this->_title($this->__('Customers'))->_title($this->__('Customer Groups'));
$this->loadLayout();
- $this->_setActiveMenu('customer/group');
+ $this->_setActiveMenu('Mage_Customer::customer_group');
$this->_addBreadcrumb(Mage::helper('Mage_Customer_Helper_Data')->__('Customers'), Mage::helper('Mage_Customer_Helper_Data')->__('Customers'));
$this->_addBreadcrumb(Mage::helper('Mage_Customer_Helper_Data')->__('Customer Groups'), Mage::helper('Mage_Customer_Helper_Data')->__('Customer Groups'));
$this->renderLayout();
@@ -65,7 +65,7 @@ public function newAction()
{
$this->_initGroup();
$this->loadLayout();
- $this->_setActiveMenu('customer/group');
+ $this->_setActiveMenu('Mage_Customer::customer_group');
$this->_addBreadcrumb(Mage::helper('Mage_Customer_Helper_Data')->__('Customers'), Mage::helper('Mage_Customer_Helper_Data')->__('Customers'));
$this->_addBreadcrumb(Mage::helper('Mage_Customer_Helper_Data')->__('Customer Groups'), Mage::helper('Mage_Customer_Helper_Data')->__('Customer Groups'), $this->getUrl('*/customer_group'));
View
2  app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php
@@ -37,7 +37,7 @@ public function indexAction()
$this->loadLayout();
- $this->_setActiveMenu('customer/online');
+ $this->_setActiveMenu('Mage_Customer::customer_online');
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Customer_Online', 'customers'));
View
4 app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -65,7 +65,7 @@ public function indexAction()
/**
* Set active menu item
*/
- $this->_setActiveMenu('customer/manage');
+ $this->_setActiveMenu('Mage_Customer::customer_manage');
/**
* Append customers block to content
@@ -146,7 +146,7 @@ public function editAction()
/**
* Set active menu item
*/
- $this->_setActiveMenu('customer/new');
+ $this->_setActiveMenu('Mage_Customer::customer');
$this->renderLayout();
}
View
2  app/code/core/Mage/Adminhtml/controllers/DashboardController.php
@@ -38,7 +38,7 @@ public function indexAction()
$this->_title($this->__('Dashboard'));
$this->loadLayout();
- $this->_setActiveMenu('dashboard');
+ $this->_setActiveMenu('Mage_Adminhtml::dashboard');
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Dashboard'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Dashboard'));
$this->renderLayout();
}
View
2  app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php
@@ -47,7 +47,7 @@ public function indexAction()
);
$this->loadLayout();
- $this->_setActiveMenu('newsletter/problem');
+ $this->_setActiveMenu('Mage_Newsletter::newsletter_problem');
$this->_addBreadcrumb(Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter Problem Reports'), Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter Problem Reports'));
View
4 app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php
@@ -47,7 +47,7 @@ public function indexAction()
$this->loadLayout();
- $this->_setActiveMenu('newsletter/queue');
+ $this->_setActiveMenu('Mage_Newsletter::newsletter_queue');
$this->_addContent(
$this->getLayout()->createBlock('Mage_Adminhtml_Block_Newsletter_Queue', 'queue')
@@ -203,7 +203,7 @@ public function editAction()
$this->loadLayout();
- $this->_setActiveMenu('newsletter/queue');
+ $this->_setActiveMenu('Mage_Newsletter::newsletter_queue');
$this->_addBreadcrumb(
Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter Queue'),
View
2  app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
@@ -45,7 +45,7 @@ public function indexAction()
$this->loadLayout();
- $this->_setActiveMenu('newsletter/subscriber');
+ $this->_setActiveMenu('Mage_Newsletter::newsletter_subscriber');
$this->_addBreadcrumb(Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter'), Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter'));
$this->_addBreadcrumb(Mage::helper('Mage_Newsletter_Helper_Data')->__('Subscribers'), Mage::helper('Mage_Newsletter_Helper_Data')->__('Subscribers'));
View
4 app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
@@ -66,7 +66,7 @@ public function indexAction ()
return;
}
$this->loadLayout();
- $this->_setActiveMenu('newsletter/template');
+ $this->_setActiveMenu('Mage_Newsletter::newsletter_template');
$this->_addBreadcrumb(Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter Templates'), Mage::helper('Mage_Newsletter_Helper_Data')->__('Newsletter Templates'));
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Newsletter_Template', 'template'));
$this->renderLayout();
@@ -109,7 +109,7 @@ public function editAction ()
Mage::register('_current_template', $model);
$this->loadLayout();
- $this->_setActiveMenu('newsletter/template');
+ $this->_setActiveMenu('Mage_Newsletter::newsletter_template');
if ($model->getId()) {
$breadcrumbTitle = Mage::helper('Mage_Newsletter_Helper_Data')->__('Edit Template');
View
2  app/code/core/Mage/Adminhtml/controllers/NotificationController.php
@@ -39,7 +39,7 @@ public function indexAction()
$this->_title($this->__('System'))->_title($this->__('Notifications'));
$this->loadLayout()
- ->_setActiveMenu('system/notification')
+ ->_setActiveMenu('Mage_AdminNotification::system_adminnotification')
->_addBreadcrumb(Mage::helper('Mage_AdminNotification_Helper_Data')->__('Messages Inbox'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Messages Inbox'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Notification_Inbox'))
->renderLayout();
View
2  app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php
@@ -38,7 +38,7 @@ public function editAction()
{
$this->loadLayout();
- $this->_setActiveMenu('cms/poll');
+ $this->_setActiveMenu('Mage_Poll::cms_poll');
$this->_addBreadcrumb(Mage::helper('Mage_Poll_Helper_Data')->__('Poll Manager'),
Mage::helper('Mage_Poll_Helper_Data')->__('Poll Manager'), $this->getUrl('*/*/'));
$this->_addBreadcrumb(Mage::helper('Mage_Poll_Helper_Data')->__('Edit Poll Answer'),
View
4 app/code/core/Mage/Adminhtml/controllers/PollController.php
@@ -39,7 +39,7 @@ public function indexAction()
$this->_title($this->__('CMS'))->_title($this->__('Polls'));
$this->loadLayout();
- $this->_setActiveMenu('cms/poll');
+ $this->_setActiveMenu('Mage_Poll::cms_poll');
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Poll Manager'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Poll Manager'));
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Poll_Poll'));
@@ -59,7 +59,7 @@ public function editAction()
Mage::register('poll_data', $pollModel);
$this->loadLayout();
- $this->_setActiveMenu('cms/poll');
+ $this->_setActiveMenu('Mage_Poll::cms_poll');
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Poll Manager'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Poll Manager'), $this->getUrl('*/*/'));
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit Poll'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit Poll'));
View
2  app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
@@ -43,7 +43,7 @@ class Mage_Adminhtml_Promo_CatalogController extends Mage_Adminhtml_Controller_A
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('promo/catalog')
+ ->_setActiveMenu('Mage_CatalogRule::promo_catalog')
->_addBreadcrumb(
Mage::helper('Mage_CatalogRule_Helper_Data')->__('Promotions'),
Mage::helper('Mage_CatalogRule_Helper_Data')->__('Promotions')
View
2  app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
@@ -46,7 +46,7 @@ protected function _initRule()
protected function _initAction()
{
$this->loadLayout()
- ->_setActiveMenu('promo/quote')
+ ->_setActiveMenu('Mage_SalesRule::promo_quote')
->_addBreadcrumb(Mage::helper('Mage_SalesRule_Helper_Data')->__('Promotions'), Mage::helper('Mage_SalesRule_Helper_Data')->__('Promotions'))
;
return $this;
View
2  app/code/core/Mage/Adminhtml/controllers/PromoController.php
@@ -37,7 +37,7 @@ class Mage_Adminhtml_PromoController extends Mage_Adminhtml_Controller_Action
public function indexAction()
{
$this->loadLayout();
- $this->_setActiveMenu('promo');
+ $this->_setActiveMenu('Mage_CatalogRule::promo');
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Promotions'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Promo'));
$this->renderLayout();
}
View
4 app/code/core/Mage/Adminhtml/controllers/RatingController.php
@@ -39,7 +39,7 @@ public function indexAction()
$this->_initEnityId();
$this->loadLayout();
- $this->_setActiveMenu('catalog/ratings');
+ $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_ratings');
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Manage Ratings'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Manage Ratings'));
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Rating_Rating'));
@@ -58,7 +58,7 @@ public function editAction()
$this->_title($ratingModel->getId() ? $ratingModel->getRatingCode() : $this->__('New Rating'));
- $this->_setActiveMenu('catalog/ratings');
+ $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_ratings');
$this->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Manage Ratings'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Manage Ratings'));
$this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Rating_Edit'))
View
6 app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
@@ -53,7 +53,7 @@ public function accountsAction()
->_title($this->__('New Accounts'));
$this->_initAction()
- ->_setActiveMenu('report/customer/accounts')
+ ->_setActiveMenu('Mage_Reports::report_customers_accounts')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('New Accounts'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('New Accounts'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Customer_Accounts'))
->renderLayout();
@@ -90,7 +90,7 @@ public function ordersAction()
->_title($this->__('Customers by Number of Orders'));
$this->_initAction()
- ->_setActiveMenu('report/customer/orders')
+ ->_setActiveMenu('Mage_Reports::report_customers_orders')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customers by Number of Orders'),
Mage::helper('Mage_Reports_Helper_Data')->__('Customers by Number of Orders'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Customer_Orders'))
@@ -128,7 +128,7 @@ public function totalsAction()
->_title($this->__('Customers by Orders Total'));
$this->_initAction()
- ->_setActiveMenu('report/customer/totals')
+ ->_setActiveMenu('Mage_Reports::report_customers_totals')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customers by Orders Total'),
Mage::helper('Mage_Reports_Helper_Data')->__('Customers by Orders Total'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Customer_Totals'))
View
8 app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
@@ -57,7 +57,7 @@ public function soldAction()
->_title($this->__('Products Ordered'));
$this->_initAction()
- ->_setActiveMenu('report/product/sold')
+ ->_setActiveMenu('Mage_Reports::report_products_sold')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Products Ordered'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Ordered'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Product_Sold'))
->renderLayout();
@@ -102,7 +102,7 @@ public function viewedAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_PRODUCT_VIEWED_FLAG_CODE, 'viewed');
$this->_initAction()
- ->_setActiveMenu('report/products/viewed')
+ ->_setActiveMenu('Mage_Reports::report_products_viewed')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Products Most Viewed Report'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Products Most Viewed Report'));
$gridBlock = $this->getLayout()->getBlock('report_product_viewed.grid');
@@ -151,7 +151,7 @@ public function lowstockAction()
->_title($this->__('Low Stock'));
$this->_initAction()
- ->_setActiveMenu('report/product/lowstock')
+ ->_setActiveMenu('Mage_Reports::report_products_lowstock')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Low Stock'), Mage::helper('Mage_Reports_Helper_Data')->__('Low Stock'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Product_Lowstock'))
->renderLayout();
@@ -196,7 +196,7 @@ public function downloadsAction()
->_title($this->__('Downloads'));
$this->_initAction()
- ->_setActiveMenu('report/product/downloads')
+ ->_setActiveMenu('Mage_Downloadable::report_products_downloads')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Downloads'), Mage::helper('Mage_Reports_Helper_Data')->__('Downloads'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Product_Downloads'))
->renderLayout();
View
6 app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
@@ -52,7 +52,7 @@ public function customerAction()
->_title($this->__('Customer Reviews'));
$this->_initAction()
- ->_setActiveMenu('report/review/customer')
+ ->_setActiveMenu('Mage_Review::report_review_customer')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Review_Customer'))
->renderLayout();
@@ -89,7 +89,7 @@ public function productAction()
->_title($this->__('Product Reviews'));
$this->_initAction()
- ->_setActiveMenu('report/review/product')
+ ->_setActiveMenu('Mage_Review::report_review_product')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Review_Product'))
->renderLayout();
@@ -127,7 +127,7 @@ public function productDetailAction()
->_title($this->__('Details'));
$this->_initAction()
- ->_setActiveMenu('report/review/productDetail')
+ ->_setActiveMenu('Mage_Review::report_review')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'))
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Product Reviews'), Mage::helper('Mage_Reports_Helper_Data')->__('Product Reviews'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Review_Detail'))
View
14 app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -52,7 +52,7 @@ public function salesAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_ORDER_FLAG_CODE, 'sales');
$this->_initAction()
- ->_setActiveMenu('report/sales/sales')
+ ->_setActiveMenu('Mage_Reports::report_salesroot_sales')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Sales Report'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Sales Report'));
$gridBlock = $this->getLayout()->getBlock('report_sales_sales.grid');
@@ -73,7 +73,7 @@ public function bestsellersAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_BESTSELLERS_FLAG_CODE, 'bestsellers');
$this->_initAction()
- ->_setActiveMenu('report/products/bestsellers')
+ ->_setActiveMenu('Mage_Reports::report_products_bestsellers')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Products Bestsellers Report'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Products Bestsellers Report'));
$gridBlock = $this->getLayout()->getBlock('report_sales_bestsellers.grid');
@@ -158,7 +158,7 @@ public function taxAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_TAX_FLAG_CODE, 'tax');
$this->_initAction()
- ->_setActiveMenu('report/sales/tax')
+ ->_setActiveMenu('Mage_Reports::report_salesroot_tax')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Tax'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Tax'));
$gridBlock = $this->getLayout()->getBlock('report_sales_tax.grid');
@@ -201,7 +201,7 @@ public function shippingAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_SHIPPING_FLAG_CODE, 'shipping');
$this->_initAction()
- ->_setActiveMenu('report/sales/shipping')
+ ->_setActiveMenu('Mage_Reports::report_salesroot_shipping')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Shipping'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Shipping'));
$gridBlock = $this->getLayout()->getBlock('report_sales_shipping.grid');
@@ -244,7 +244,7 @@ public function invoicedAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_INVOICE_FLAG_CODE, 'invoiced');
$this->_initAction()
- ->_setActiveMenu('report/sales/invoiced')
+ ->_setActiveMenu('Mage_Reports::report_salesroot_invoiced')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total Invoiced'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total Invoiced'));
$gridBlock = $this->getLayout()->getBlock('report_sales_invoiced.grid');
@@ -287,7 +287,7 @@ public function refundedAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_REFUNDED_FLAG_CODE, 'refunded');
$this->_initAction()
- ->_setActiveMenu('report/sales/refunded')
+ ->_setActiveMenu('Mage_Reports::report_salesroot_refunded')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total Refunded'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total Refunded'));
$gridBlock = $this->getLayout()->getBlock('report_sales_refunded.grid');
@@ -330,7 +330,7 @@ public function couponsAction()
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_COUPONS_FLAG_CODE, 'coupons');
$this->_initAction()
- ->_setActiveMenu('report/sales/coupons')
+ ->_setActiveMenu('Mage_Reports::report_salesroot_coupons')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Coupons'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Coupons'));
$gridBlock = $this->getLayout()->getBlock('report_sales_coupons.grid');
View
6 app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php
@@ -49,7 +49,7 @@ public function customerAction()
->_title($this->__('Customer Shopping Carts'));
$this->_initAction()
- ->_setActiveMenu('report/shopcart/customer')
+ ->_setActiveMenu('Mage_Reports::report_shopcart_customer')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Shopcart_Customer'))
->renderLayout();
@@ -86,7 +86,7 @@ public function productAction()
->_title($this->__('Products in Carts'));
$this->_initAction()
- ->_setActiveMenu('report/shopcart/product')
+ ->_setActiveMenu('Mage_Reports::report_shopcart_product')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Shopcart_Product'))
->renderLayout();
@@ -123,7 +123,7 @@ public function abandonedAction()
->_title($this->__('Abandoned Carts'));
$this->_initAction()
- ->_setActiveMenu('report/shopcart/abandoned')
+ ->_setActiveMenu('Mage_Reports::report_shopcart_abandoned')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Abandoned Carts'), Mage::helper('Mage_Reports_Helper_Data')->__('Abandoned Carts'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Shopcart_Abandoned'))
->renderLayout();
View
2  app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
@@ -179,7 +179,7 @@ public function indexAction()
$this->_title($this->__('Reports'))->_title($this->__('Sales'))->_title($this->__('Refresh Statistics'));
$this->_initAction()
- ->_setActiveMenu('report/statistics/refreshstatistics')
+ ->_setActiveMenu('Mage_Reports::report_statistics')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Refresh Statistics'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Refresh Statistics'))
->renderLayout();
}
View
12 app/code/core/Mage/Adminhtml/controllers/Report/TagController.php
@@ -52,7 +52,7 @@ public function customerAction()
->_title($this->__('Customers'));
$this->_initAction()
- ->_setActiveMenu('report/tag/customer')
+ ->_setActiveMenu('Mage_Tag::report_tags_customer')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Tag_Customer'))
->renderLayout();
@@ -89,7 +89,7 @@ public function productAction()
->_title($this->__('Products'));
$this->_initAction()
- ->_setActiveMenu('report/tag/product')
+ ->_setActiveMenu('Mage_Tag::report_tags_product')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Poducts Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Tag_Product'))
->renderLayout();
@@ -127,7 +127,7 @@ public function popularAction()
->_title($this->__('Popular'));
$this->_initAction()
- ->_setActiveMenu('report/tag/popular')
+ ->_setActiveMenu('Mage_Tag::report_tags_popular')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Popular Tags'), Mage::helper('Mage_Reports_Helper_Data')->__('Popular Tags'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Tag_Popular'))
->renderLayout();
@@ -167,7 +167,7 @@ public function customerDetailAction()
->_title($detailBlock->getHeaderText());
$this->_initAction()
- ->_setActiveMenu('report/tag/customerDetail')
+ ->_setActiveMenu('Mage_Tag::report_tags')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'))
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Customer Tags'), Mage::helper('Mage_Reports_Helper_Data')->__('Customer Tags'))
->_addContent($detailBlock)
@@ -208,7 +208,7 @@ public function productDetailAction()
->_title($detailBlock->getHeaderText());
$this->_initAction()
- ->_setActiveMenu('report/tag/productDetail')
+ ->_setActiveMenu('Mage_Tag::report_tags')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'))
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Product Tags'), Mage::helper('Mage_Reports_Helper_Data')->__('Product Tags'))
->_addContent($detailBlock)
@@ -249,7 +249,7 @@ public function tagDetailAction()
->_title($detailBlock->getHeaderText());
$this->_initAction()
- ->_setActiveMenu('report/tag/tagDetail')
+ ->_setActiveMenu('Mage_Tag::report_tags')
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Popular Tags'), Mage::helper('Mage_Reports_Helper_Data')->__('Popular Tags'))
->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Tag Detail'), Mage::helper('Mage_Reports_Helper_Data')->__('Tag Detail'))
->_addContent($detailBlock)
View
58 app/code/core/Mage/Adminhtml/controllers/ReportController.php
@@ -41,40 +41,6 @@ public function _initAction()
}
-/*
- public function wishlistAction()
- {
- $this->_initAction()
- ->_setActiveMenu('report/wishlist')
- ->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Wishlist Report'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Wishlist Report'))
- ->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Wishlist'))
- ->renderLayout();
- }
-
- /**
- * Export wishlist report grid to CSV format
- * /
- public function exportWishlistCsvAction()
- {
- $fileName = 'wishlist.csv';
- $content = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Wishlist_Grid')
- ->getCsvFile();
-
- $this->_prepareDownloadResponse($fileName, $content);
- }
-
- /**
- * Export wishlist report to Excel XML format
- * /
- public function exportWishlistExcelAction()
- {
- $fileName = 'wishlist.xml';
- $content = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Wishlist_Grid')
- ->getExcelFile($fileName);
-
- $this->_prepareDownloadResponse($fileName, $content);
- }
-*/
public function searchAction()
{
$this->_title($this->__('Reports'))->_title($this->__('Search Terms'));
@@ -82,7 +48,7 @@ public function searchAction()
Mage::dispatchEvent('on_view_report', array('report' => 'search'));
$this->_initAction()
- ->_setActiveMenu('report/search')
+ ->_setActiveMenu('Mage_Reports::report_search')
->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Search Terms'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Search Terms'))
->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Search'))
->renderLayout();
@@ -111,23 +77,6 @@ public function exportSearchExcelAction()
$this->_prepareDownloadResponse($fileName, $content);
}
-/*
- public function ordersAction()
- {
- $this->_initAction()
- ->_setActiveMenu('report/orders')
- ->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Recent Orders'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Recent Orders'))
- ->renderLayout();
- }
-
- public function totalsAction()
- {
- $this->_initAction()
- ->_setActiveMenu('report/totals')
- ->_addBreadcrumb(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Order Totals'), Mage::helper('Mage_Adminhtml_Helper_Data')->__('Order Totals'))
- ->renderLayout();
- }
-*/
protected function _isAllowed()
{
@@ -135,11 +84,6 @@ protected function _isAllowed()
case 'search':
return Mage::getSingleton('Mage_Backend_Model_Auth_Session')->isAllowed('report/search');
break;
- /*
- case 'customers':
- return Mage::getSingleton('Mage_Backend_Model_Auth_Session')->isAllowed('report/shopcart');
- break;
- */
default:
return Mage::getSingleton('Mage_Backend_Model_Auth_Session')->isAllowed('report');
break;
View
4 app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php
@@ -41,7 +41,7 @@ public function indexAction()
->_title($this->__('Billing Agreements'));
$this->loadLayout()
- ->_setActiveMenu('sales/billing_agreement')
+ ->_setActiveMenu('Mage_Sales::sales_billing_agreement')
->renderLayout();
}
@@ -69,7 +69,7 @@ public function viewAction()
->_title(sprintf("#%s", $agreementModel->getReferenceId()));
$this->loadLayout()
- ->_setActiveMenu('sales/billing_agreement')
+ ->_setActiveMenu('Mage_Sales::sales_billing_agreement')
->renderLayout();
return;
}
View
2  app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
@@ -332,7 +332,7 @@ public function indexAction()
$this->_initSession();
$this->loadLayout();
- $this->_setActiveMenu('sales/order')
+ $this->_setActiveMenu('Mage_Sales::sales_order')
->renderLayout();
}
View
4 app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
@@ -196,7 +196,7 @@ public function viewAction()
$this->loadLayout();
$this->getLayout()->getBlock('sales_creditmemo_view')
->updateBackButtonUrl($this