Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

2.0.0.0-dev29

* Implemented and verified ability to upgrade DB from CE 1.7 (EE 1.12) to 2.x
* Replaced calendar UI component with jQuery calendar
* Restored back the public access to `pub/cron.php` entry point (in the previous patch it was denied by mistake)
* Fixed typo in label of "Catalog Search" index in UI
  • Loading branch information...
commit 21af2d4e2e8377bec92a6a08212c2304147997b2 1 parent 784be09
@mage2-team mage2-team authored
Showing with 4,438 additions and 5,776 deletions.
  1. +77 −58 CHANGELOG.markdown
  2. +1 −1  app/Mage.php
  3. +3 −5 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
  4. +6 −5 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
  5. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Grid.php
  6. +3 −3 app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php
  7. +3 −3 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php
  8. +3 −3 app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php
  9. +6 −1 app/code/core/Mage/Adminhtml/Block/Report/Grid.php
  10. +1 −1  app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php
  11. +1 −1  app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
  12. +3 −3 app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php
  13. +6 −3 app/code/core/Mage/Adminhtml/view/adminhtml/main.xml
  14. +35 −58 app/code/core/Mage/Adminhtml/view/adminhtml/page/js/calendar.phtml
  15. +27 −38 app/code/core/Mage/Adminhtml/view/adminhtml/report/grid.phtml
  16. +17 −32 app/code/core/Mage/Adminhtml/view/adminhtml/system/convert/profile/wizard.phtml
  17. +11 −0 app/code/core/Mage/Backend/Block/Widget.php
  18. +1 −1  app/code/core/Mage/Backend/Block/Widget/Form.php
  19. +16 −47 app/code/core/Mage/Backend/Block/Widget/Grid/Column/Filter/Date.php
  20. +20 −26 app/code/core/Mage/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
  21. +2 −2 app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php
  22. +2 −0  app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php
  23. +1 −4 app/code/core/Mage/Catalog/view/frontend/layout.xml
  24. +1 −1  app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
  25. +1 −1  app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php
  26. +1 −3 app/code/core/Mage/CatalogSearch/view/frontend/layout.xml
  27. +2 −2 app/code/core/Mage/Core/Block/Html/Calendar.php
  28. +17 −29 app/code/core/Mage/Core/Block/Html/Date.php
  29. +1 −1  app/code/core/Mage/Core/Controller/Varien/Exception.php
  30. +0 −22 app/code/core/Mage/Core/Model/Locale.php
  31. +36 −0 app/code/core/Mage/Core/data/core_setup/data-upgrade-1.6.0.4-1.6.0.5.php
  32. +1 −1  app/code/core/Mage/Core/etc/config.xml
  33. +1 −1  app/code/core/Mage/Customer/Block/Widget/Dob.php
  34. +1 −1  app/code/core/Mage/Customer/etc/config.xml
  35. +30 −0 app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.3.php
  36. +0 −4 app/code/core/Mage/DesignEditor/view/frontend/layout.xml
  37. +2 −2 app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php
  38. +28 −26 app/code/core/Mage/Eav/Model/Entity/Setup.php
  39. +1 −1  app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
  40. +10 −7 app/code/core/Mage/ImportExport/Model/Import/Entity/Eav/Customer.php
  41. +2 −23 app/code/core/Mage/ImportExport/Model/Import/Entity/Eav/Customer/Address.php
  42. +2 −2 app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
  43. +7 −3 app/code/core/Mage/Oauth/view/adminhtml/layout.xml
  44. +32 −55 app/code/core/Mage/Page/view/frontend/js/calendar.phtml
  45. +1 −21 app/code/core/Mage/Page/view/frontend/layout.xml
  46. +34 −0 app/code/core/Mage/Page/view/frontend/layout_addons.xml
  47. +2 −3 app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php
  48. +1 −1  app/code/core/Mage/Rule/Model/Condition/Abstract.php
  49. +35 −0 app/code/core/Mage/Sales/Model/Resource/Setup.php
  50. +1 −27 app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php
  51. +2 −0  app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php
  52. +43 −14 app/code/core/Mage/User/data/user_setup/data-install-1.6.0.0.php
  53. +266 −0 app/code/core/Mage/User/data/user_setup/data-upgrade-1.6.1.1-1.6.1.2.php
  54. +1 −1  app/code/core/Mage/User/etc/config.xml
  55. +156 −147 app/code/core/Mage/User/sql/user_setup/install-1.6.0.0.php
  56. +16 −21 app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
  57. +2 −2 app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
  58. +1 −1  app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
  59. +1 −4 app/design/frontend/default/iphone/Mage_Catalog/layout.xml
  60. +1 −3 app/design/frontend/default/iphone/Mage_CatalogSearch/layout.xml
  61. +4 −24 app/design/frontend/default/iphone/Mage_Page/layout.xml
  62. +262 −265 app/design/frontend/default/modern/Mage_Catalog/layout.xml
  63. +1 −3 app/design/frontend/default/modern/Mage_CatalogSearch/layout.xml
  64. +4 −0 app/design/frontend/default/modern/Mage_Page/layout.xml
  65. +54 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/DesignTest.php
  66. +55 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php
  67. +49 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Poll/GridTest.php
  68. +54 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/MainTest.php
  69. +54 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/MainTest.php
  70. +49 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Report/Filter/FormTest.php
  71. +38 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Report/GridTest.php
  72. +58 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/Sales/Order/Create/Form/AbstractTest.php
  73. +38 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/WizardTest.php
  74. +53 −0 dev/tests/integration/testsuite/Mage/Adminhtml/Block/System/Design/Edit/Tab/GeneralTest.php
  75. +57 −0 dev/tests/integration/testsuite/Mage/Backend/Block/Widget/FormTest.php
  76. +39 −0 dev/tests/integration/testsuite/Mage/Backend/Block/WidgetTest.php
  77. +7 −7 dev/tests/integration/testsuite/Mage/Core/Model/Design/PackageMergingTest.php
  78. +12 −10 dev/tests/integration/testsuite/Mage/Core/Model/Design/PackageTest.php
  79. +38 −0 dev/tests/integration/testsuite/Mage/Customer/Block/Widget/DobTest.php
  80. +56 −0 dev/tests/integration/testsuite/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractTest.php
  81. +58 −0 dev/tests/integration/testsuite/Mage/ImportExport/Block/Adminhtml/Export/FilterTest.php
  82. +6 −0 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/Eav/CustomerImportTest.php
  83. +3 −2 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/EavAbstractTest.php
  84. +41 −0 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/ProductTest.php
  85. +4 −0 ...sts/integration/testsuite/Mage/ImportExport/Model/Import/Entity/_files/products_to_import_with_datetime.csv
  86. +1 −1  dev/tests/integration/testsuite/Mage/ImportExport/_files/import_data.php
  87. +52 −0 dev/tests/integration/testsuite/Mage/Payment/Block/Catalog/Product/View/ProfileTest.php
  88. +53 −0 dev/tests/integration/testsuite/Mage/Rule/Model/Condition/AbstractTest.php
  89. +2 −0  dev/tests/js/jsTestDriver.php.dist
  90. +111 −0 dev/tests/js/testsuite/mage/calendar/calendarTest.js
  91. +83 −0 dev/tests/js/testsuite/mage/calendar/daterangeTest.js
  92. +3 −0  dev/tests/static/testsuite/Legacy/_files/obsolete_methods.php
  93. +20 −14 lib/Varien/Data/Form/Element/Date.php
  94. +0 −56 lib/Varien/Date.php
  95. +1 −8 pub/.htaccess
  96. +0 −232 pub/lib/calendar/calendar-blue.css
  97. +0 −236 pub/lib/calendar/calendar-blue2.css
  98. +0 −225 pub/lib/calendar/calendar-brown.css
  99. +0 −229 pub/lib/calendar/calendar-green.css
  100. +0 −21 pub/lib/calendar/calendar-setup.js
  101. +0 −251 pub/lib/calendar/calendar-system.css
  102. +0 −239 pub/lib/calendar/calendar-tas.css
  103. +0 −271 pub/lib/calendar/calendar-win2k-1.css
  104. +0 −271 pub/lib/calendar/calendar-win2k-2.css
  105. +0 −265 pub/lib/calendar/calendar-win2k-cold-1.css
  106. +0 −271 pub/lib/calendar/calendar-win2k-cold-2.css
  107. +0 −1,912 pub/lib/calendar/calendar.js
  108. BIN  pub/lib/calendar/img.gif
  109. BIN  pub/lib/calendar/menuarrow.gif
  110. BIN  pub/lib/calendar/menuarrow2.gif
  111. BIN  pub/lib/calendar/skins/aqua/active-bg.gif
  112. BIN  pub/lib/calendar/skins/aqua/dark-bg.gif
  113. BIN  pub/lib/calendar/skins/aqua/hover-bg.gif
  114. BIN  pub/lib/calendar/skins/aqua/menuarrow.gif
  115. BIN  pub/lib/calendar/skins/aqua/normal-bg.gif
  116. BIN  pub/lib/calendar/skins/aqua/rowhover-bg.gif
  117. BIN  pub/lib/calendar/skins/aqua/status-bg.gif
  118. +0 −236 pub/lib/calendar/skins/aqua/theme.css
  119. BIN  pub/lib/calendar/skins/aqua/title-bg.gif
  120. BIN  pub/lib/calendar/skins/aqua/today-bg.gif
  121. +1,530 −0 pub/lib/jquery/jquery-ui-timepicker-addon.js
  122. +289 −0 pub/lib/mage/calendar.css
  123. +213 −0 pub/lib/mage/calendar.js
View
135 CHANGELOG.markdown
@@ -1,5 +1,12 @@
-Update as of 10/16/2012
-======================
+2.0.0.0-dev29
+=============
+* Implemented and verified ability to upgrade DB from CE 1.7 (EE 1.12) to 2.x
+* Replaced calendar UI component with jQuery calendar
+* Restored back the public access to `pub/cron.php` entry point (in the previous patch it was denied by mistake)
+* Fixed typo in label of "Catalog Search" index in UI
+
+2.0.0.0-dev28
+=============
* Introduced block arguments to the layout syntax:
* Introduced the "object" block argument type to specify a grid data source
* Introduced the "options" block argument type to accommodate key-value pairs
@@ -21,8 +28,8 @@ Update as of 10/16/2012
* Fixed preserving selected rows after searching in the Sales Order grid
* Fixed "column not found" SQL error while sorting by the "Product Name" in the Catalog Pending Reviews grid
-Update as of 10/11/2012
-======================
+2.0.0.0-dev27
+=============
* Removed unused `Mage_DesignEditor_Model_History_Compact_Diff` class
* Fixes:
* Incorrect title for Manage Products page
@@ -31,8 +38,8 @@ Update as of 10/11/2012
* Error message is displayed twice, when restoring admin password with captcha enabled
* Impossible to retrieve admin password, when captcha is enabled
-Update as of 10/09/2012
-======================
+2.0.0.0-dev26
+=============
* Performance Testing Framework improvements:
* Added ability to specify fixtures per scenario
* Implemented Magento application cleanup between scenarios
@@ -80,8 +87,8 @@ Update as of 10/09/2012
* [#64](https://github.com/magento/magento2/pull/64) -- fixed EAV text attribute validation for "0" value
* [#72](https://github.com/magento/magento2/pull/72) -- fixed collecting shipping totals for case, when previous invoice value is 0
-Update as of 9/27/2012
-======================
+2.0.0.0-dev25
+=============
* Refactoring Magento 2 to use jQuery instead of Prototype:
* Implemented simple lazy-loading functionality
* Converted decorator mechanism to jQuery
@@ -102,8 +109,8 @@ Update as of 9/27/2012
* "Promotions" tab is missing on Configuration page
* Wrong format of performance tests config
-Update as of 9/13/2012
-======================
+2.0.0.0-dev24
+=============
* Implemented the option to enable the single store mode in the system configuration, which simplifies the back-end GUI:
* Hiding scope labels from the system configuration
* Hiding the scope switcher from the CMS management pages and the system configuration
@@ -131,8 +138,8 @@ Update as of 9/13/2012
* [#60](https://github.com/magento/magento2/issues/60) -- fixed taking bind parameters into account in `Mage_Core_Model_Resource_Db_Collection_Abstract::getAllIds()`
* [#61](https://github.com/magento/magento2/pull/61) -- relocated declaration of the "Google Checkout" payment method into `Mage_GoogleCheckout` module from `Mage_Sales`
-Update as of 9/05/2012
-======================
+2.0.0.0-dev23
+=============
* Implemented encryption of the credit card name and expiration date for the payment method "Credit Card (saved)"
* Implemented console utility `dev/tools/migration/get_aliases_map.php`, which generates map file "M1 class alias" to "M2 class name"
* Implemented automatic data upgrades for replacing "M1 class aliases" to "M2 class names" in a database
@@ -162,14 +169,14 @@ Update as of 9/05/2012
* Introduced `Magento_Data_Graph` library class and utilized it for finding cycles in "before" and "after" declarations
* Implemented tests for totals sorting including the ambiguous cases
-Update as of 8/30/2012
-======================
+2.0.0.0-dev22
+=============
* Fixes:
* Fixed name, title, markup, styles at "Orders and Returns" homepage
* Fixed displaying products in the shopping cart item block at the backend
-Update as of 8/26/2012
-======================
+2.0.0.0-dev21
+=============
* Decoupled Tag module functionality from other modules
* Visual Design Editor:
* Implemented tracking of user changes history and rendering the actions at VDE toolbar
@@ -190,8 +197,8 @@ Update as of 8/26/2012
* GitHub requests:
* [#48](https://github.com/magento/magento2/pull/48) -- fixed usage of a collection at the place, where just a single object was needed
-Update as of 8/15/2012
-======================
+2.0.0.0-dev20
+=============
* Refactored ACL functionality:
* Implementation is not bound to backend area anymore and moved to `Mage_Core` module
* Covered backwards-incompatible changes with additional migration tool (`dev/tools/migration/Acl`)
@@ -201,8 +208,8 @@ Update as of 8/15/2012
* Fixed caching mechanism of loading modules declaration to not cause additional performance overhead
* Adjusted include path in unit tests to use the original include path at the end, rather than at the beginning
-Update as of 8/9/2012
-=====================
+2.0.0.0-dev19
+=============
* Improvements:
* Implemented "multi-file" scheduled import/export of customers, deleted legacy implementation
* Ability to import amendments to complex product data, such as custom options
@@ -233,8 +240,8 @@ Update as of 8/9/2012
* Applied Zend framework security hotfix against XML external entity injection via XMLRPC API
* Fixed inappropriate displaying of credit card credentials to admin user after "reorder" action with Authorize.net and PayPal payment methods involved
-Update as of 8/2/2012
-=====================
+2.0.0.0-dev18
+=============
* Refactored ACL for the backend
* ACL resources
* Strict configuration format, validated by XSD schema
@@ -260,8 +267,8 @@ Update as of 8/2/2012
* [#35](https://github.com/magento/magento2/issues/35) -- removed non-used `Mage_Core_Block_Flush` block
* [#41](https://github.com/magento/magento2/pull/41) -- implemented ability to extends `app/etc/local.xml` by specifying additional config file via `MAGE_LOCAL_CONFIG` environment variable
-Update as of 7/26/2012
-=====================
+2.0.0.0-dev17
+=============
* Implemented Magento Validator library in order to have clear solid mechanism and formal rules of input data validation
* Moved translations to module directories, so that it is much more convenient to manage module resources
* Updated inline translation mechanism to support locales inheritance
@@ -275,8 +282,8 @@ Update as of 7/26/2012
* GitHub requests:
* [#39](https://github.com/magento/magento2/pull/39) -- added `composer.json`, which was announced at previous update, but mistakenly omitted from publishing
-Update as of 7/19/2012
-=====================
+2.0.0.0-dev16
+=============
* Implemented inheritance of locales. Inheritance is declared in `app/locale/<locale_name>/config.xml`
* Moved declaration of modules from `app/etc/modules/<module>.xml` to `app/code/<pool>/<namespace>/<module>/config.xml`
* Implemented ability to match URLs in format `protocol://base_url/area/module/controller/action` (as opposite to only `module/controller/action`), utilized this feature in backend (admin) area
@@ -305,8 +312,8 @@ Update as of 7/19/2012
* [#39](https://github.com/magento/magento2/pull/39) -- added `composer.json` (actually, doesn't come with this update due to a mistake in publishing process)
* [#40](https://github.com/magento/magento2/pull/40) -- fixed generation of "secret key" in backend URLs to honor `_forward` in controllers
-Update as of 7/3/2012
-=====================
+2.0.0.0-dev15
+=============
* 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
@@ -324,8 +331,8 @@ Update as of 7/3/2012
* GitHub requests:
* [#23](https://github.com/magento/magento2/pull/23) -- added `Mage_Customer_Block_Account_Navigation::removeLink()`
-Update as of 6/20/2012
-=====================
+2.0.0.0-dev14
+=============
* Implemented locale translation inheritance
* Implemented new format for exporting customer data
* Added initial Javascript code for globalization and localization
@@ -345,8 +352,8 @@ Update as of 6/20/2012
* ACL tables aliases interference with other table aliases
* Several tests are made incomplete temporary, appropriate bugs to be fixed in the nearest future
-Update as of 6/7/2012
-=====================
+2.0.0.0-dev13
+=============
* Fixed various crashes of visual design editor
* Fixed some layouts that caused visual design editor toolbar disappearing, also fixed some confusing page type labels
* Eliminated "after commit callback" workaround from integration tests by implementing "transparent transactions" capability in integration testing framework
@@ -355,8 +362,8 @@ Update as of 6/7/2012
* 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
-======================
+2.0.0.0-dev12
+=============
* Implemented backend authentication independent of `Mage_Adminhtml` module. Authentication can be disabled
* Authentication logic is moved to `Mage_Backend` module and being performed in controller instead of observer
* `Mage_Adminhtml_Controller_Action` is changed to `Mage_Backend_Controller_ActionAbstract`, `Mage_Admin_Model_Session` is changed to `Mage_Backend_Model_Auth_Session`, `Mage_User_Model_Role` and `Mage_User_Model_Roles` classes are unified into one `Mage_User_Model_Role` class
@@ -377,8 +384,8 @@ Update as of 5/31/2012
* Fixed ability to separate CDN server setup for static and media content
* Other small fixes
-Update as of 5/23/2012
-======================
+2.0.0.0-dev11
+=============
* Published performance tests (`dev/tests/performance`)
* Implemented support of ImageMagick library for processing images
* Distinguished "Page Fragments" and "Pages" in layout handles declaration
@@ -395,7 +402,7 @@ Update as of 5/23/2012
* Fixed broken category page when "Use Flat Catalog Product" is enabled
* Fixed incorrect applying of discount to a sub-product, if more two rules are being applied
* Fixed broken "Edit" product link in Wishlist and Shopping Cart
- * Fixed broken installation when "pub/media" is not writable
+ * Fixed broken installation when `pub/media` is not writable
* Fixed resetting Design Theme configuration option when User-Agent Exception is added
* Fixed error while running unit tests, when Zend Framework is installed with PEAR
* Fixed incorrect processing of "before" and "after" layout instructions in case, when the instruction refers to a node, which is not processed yet
@@ -407,8 +414,8 @@ Update as of 5/23/2012
* Fixed broken design when database is used as media storage
* Other small changes
-Update as of 5/09/2012
-======================
+2.0.0.0-dev10
+=============
* Implemented configuration option that enables the page types hierarchy usage during the page generation
* Removed theme/view config files caching in favour of the view files map to be implemented in the future
* Fixed some issues:
@@ -420,8 +427,8 @@ Update as of 5/09/2012
* Fixed Web API for product to category assignment by SKU containing digits only
* Implemented new tests
-Update as of 5/05/2012
-======================
+2.0.0.0-dev09
+=============
* Added theme inheritance ability
* Removed @group annotation usage in integration tests
* Introduced keeping of highlighting state while switching between pages in Visual Design Editor
@@ -431,8 +438,8 @@ Update as of 5/05/2012
* Fixed broken "Customer My Account My OAuth Applications" page type in Visual Design Editor
* Fetched updates from Magento 1.x up to April 30 2012. Refer to [Magento 1 release notes](http://www.magentocommerce.com/download/release_notes) for details
-Update as of 4/26/2012
-======================
+2.0.0.0-dev08
+=============
* Introduced `Mage_Backend` module and relocated backend area routing model there (was `Mage_Core_Controller_Varien_Router_Admin`). The "adminhtml" area is also declared in the `Mage_Backend` module.
* Introduced declaration of application area in config.xml with the following requirements:
* Must declare with a router class in `config/global/areas/<area_code>/routers/<router_code>/class`
@@ -440,9 +447,8 @@ Update as of 4/26/2012
* Refined styling of the visual design editor toolbar. Subtle improvements of toolbar usability.
* Fetched updates from Magento 1.x up to April 11 2012. Refer to [Magento 1 release notes](http://www.magentocommerce.com/download/release_notes) for details
-Update as of 4/13/2012
-======================
-
+2.0.0.0-dev07
+=============
* Implemented a tool for migrating factory table names from 1.x to 2.x. The tool replaces table names by list of names associations
* Changed Unit tests suite running from usage AllTests.php in each directory to configuration in phpunit.xml.dist. Now all tests in `testsuite` directory are launched, there is no necessity to add new tests to the config
* Implemented in Visual Desig Editor:
@@ -456,9 +462,8 @@ Update as of 4/13/2012
* Fixed elements' duplication on pages (downloadable, bundle product view)
* Fetched updates from Magento 1 up to April 6 2012. Refer to [Magento 1 release notes](http://www.magentocommerce.com/download/release_notes) for details
-Update as of 3/26/2012
-======================
-
+2.0.0.0-dev06
+=============
* Introduced concept of containers and "page types" in layout.
* Containers replace `Mage_Core_Block_Text_List` and `Mage_Page_Block_Html_Wrapper`
* Widgets now utilize page types and containers instead of "handles" and "block references"
@@ -477,10 +482,9 @@ Update as of 3/26/2012
* Addressed pull requests and issues from Github
* Fetched updates from Magento 1 up to March 2 2012. Refer to [Magento 1 release notes](http://www.magentocommerce.com/download/release_notes) for details.
-Update as of 2/29/2012
-======================
-
-* Added jQuery to Magento 2. It has not been made a main library yet, however all new features are developed using jQuery.
+2.0.0.0-dev05
+=============
+* Added jQuery library. It has not been made a main library yet, however all new features are developed using jQuery.
* Added support for new versions of testing tools - PHPUnit 3.6, PHPMD 1.3.0. Confirmed compatibility with latest PHPCS 1.3.2 and PHPCPD 1.3.5.
* Improved legacy tests:
* Refactored Integrity_ClassesTest and Legacy_ClassesTest.
@@ -492,12 +496,11 @@ Update as of 2/29/2012
* Fixed docblock for Mage_Core_Model_Design_Package.
* Fixed static code analysis failures related to case-sensitivity.
* Fixed several typos and minor mistakes.
- * Fixed integration test's failures due to specifics of xpath library version.
+ * Fixed integration tests' failures due to specifics of xpath library version.
* Imported fresh features and bug fixes from Magento 1.x.
-Additional Tests and Fixes
-==========================
-
+2.0.0.0-dev04
+=============
* Various code integrity fixes in different places:
* Fixed obsolete references to classes
* Fixed broken references to template and static view files
@@ -513,4 +516,20 @@ Additional Tests and Fixes
* Simplified and reorganized the "Exemplar" and self-assessment tests for static code analysis
* Covered previously made backwards-incompatible changes with legacy tests
* Changed storage of class map from a PHP-file with array into a better-performing text file with serialized array.
-* Published dev/tests/static and dev/tests/unit
+* Published `dev/tests/static` and `dev/tests/unit`
+
+2.0.0.0-dev03
+=============
+* A test release just to verify deployment scripts
+
+2.0.0.0-dev02
+=============
+Deprecated code & minor fixes update:
+* Eliminated remnants of `htmlescape` implementation
+* Eliminated usage of `pub/js/index.php` entry point (used to be `js/index.php`)
+* Disbanded the shell root directory: moved scripts into `dev/shell` and classes into app
+* Minor refactoring of data fixtures rollback capability in integration testing framework
+
+2.0.0.0-dev01
+=============
+* Added initial version of Magento 2.x CE to public repository
View
2  app/Mage.php
@@ -149,7 +149,7 @@ public static function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '1',
+ 'number' => '29',
);
}
View
8 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
@@ -80,15 +80,13 @@ protected function _prepareForm()
'disabled' => $isElementDisabled
));
- $dateFormatIso = Mage::app()->getLocale()->getDateFormat(
- Mage_Core_Model_Locale::FORMAT_TYPE_SHORT
- );
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$designFieldset->addField('custom_theme_from', 'date', array(
'name' => 'custom_theme_from',
'label' => Mage::helper('Mage_Cms_Helper_Data')->__('Custom Design From'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
- 'format' => $dateFormatIso,
+ 'date_format' => $dateFormat,
'disabled' => $isElementDisabled,
'class' => 'validate-date validate-date-range date-range-custom_theme-from'
));
@@ -97,7 +95,7 @@ protected function _prepareForm()
'name' => 'custom_theme_to',
'label' => Mage::helper('Mage_Cms_Helper_Data')->__('Custom Design To'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
- 'format' => $dateFormatIso,
+ 'date_format' => $dateFormat,
'disabled' => $isElementDisabled,
'class' => 'validate-date validate-date-range date-range-custom_theme-to'
));
View
11 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
@@ -54,13 +54,14 @@ protected function _prepareForm()
'class' => 'fieldset-wide'
));
- $outputFormat = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM);
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM);
+ $timeFormat = Mage::app()->getLocale()->getTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM);
if($queue->getQueueStatus() == Mage_Newsletter_Model_Queue::STATUS_NEVER) {
$fieldset->addField('date', 'date',array(
'name' => 'start_at',
- 'time' => true,
- 'format' => $outputFormat,
+ 'date_format' => $dateFormat,
+ 'time_format' => $timeFormat,
'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Queue Date Start'),
'image' => $this->getSkinUrl('images/grid-cal.gif')
));
@@ -83,10 +84,10 @@ protected function _prepareForm()
} else {
$fieldset->addField('date','date',array(
'name' => 'start_at',
- 'time' => true,
'disabled' => 'true',
'style' => 'width:38%;',
- 'format' => $outputFormat,
+ 'date_format' => $dateFormat,
+ 'time_format' => $timeFormat,
'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Queue Date Start'),
'image' => $this->getSkinUrl('images/grid-cal.gif')
));
View
4 app/code/core/Mage/Adminhtml/Block/Poll/Grid.php
@@ -84,7 +84,7 @@ protected function _prepareColumns()
'width' => '120px',
'type' => 'datetime',
'index' => 'date_posted',
- 'format' => Mage::app()->getLocale()->getDateFormat()
+ 'date_format' => Mage::app()->getLocale()->getDateFormat()
));
$this->addColumn('date_closed', array(
@@ -94,7 +94,7 @@ protected function _prepareColumns()
'type' => 'datetime',
'default' => '--',
'index' => 'date_closed',
- 'format' => Mage::app()->getLocale()->getDateFormat()
+ 'date_format' => Mage::app()->getLocale()->getDateFormat()
));
if (!Mage::app()->isSingleStoreMode()) {
View
6 app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php
@@ -149,14 +149,14 @@ protected function _prepareForm()
'values' => Mage::getResourceModel('Mage_Customer_Model_Resource_Group_Collection')->toOptionArray()
));
- $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$fieldset->addField('from_date', 'date', array(
'name' => 'from_date',
'label' => Mage::helper('Mage_CatalogRule_Helper_Data')->__('From Date'),
'title' => Mage::helper('Mage_CatalogRule_Helper_Data')->__('From Date'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'input_format' => Varien_Date::DATE_INTERNAL_FORMAT,
- 'format' => $dateFormatIso
+ 'date_format' => $dateFormat
));
$fieldset->addField('to_date', 'date', array(
'name' => 'to_date',
@@ -164,7 +164,7 @@ protected function _prepareForm()
'title' => Mage::helper('Mage_CatalogRule_Helper_Data')->__('To Date'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'input_format' => Varien_Date::DATE_INTERNAL_FORMAT,
- 'format' => $dateFormatIso
+ 'date_format' => $dateFormat
));
$fieldset->addField('sort_order', 'text', array(
View
6 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php
@@ -202,14 +202,14 @@ protected function _prepareForm()
'label' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Uses per Customer'),
));
- $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$fieldset->addField('from_date', 'date', array(
'name' => 'from_date',
'label' => Mage::helper('Mage_SalesRule_Helper_Data')->__('From Date'),
'title' => Mage::helper('Mage_SalesRule_Helper_Data')->__('From Date'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'input_format' => Varien_Date::DATE_INTERNAL_FORMAT,
- 'format' => $dateFormatIso
+ 'date_format' => $dateFormat
));
$fieldset->addField('to_date', 'date', array(
'name' => 'to_date',
@@ -217,7 +217,7 @@ protected function _prepareForm()
'title' => Mage::helper('Mage_SalesRule_Helper_Data')->__('To Date'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'input_format' => Varien_Date::DATE_INTERNAL_FORMAT,
- 'format' => $dateFormatIso
+ 'date_format' => $dateFormat
));
$fieldset->addField('sort_order', 'text', array(
View
6 app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php
@@ -124,7 +124,7 @@ protected function _prepareForm()
$form->setHtmlIdPrefix($htmlIdPrefix);
$fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('Mage_Reports_Helper_Data')->__('Filter')));
- $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$fieldset->addField('store_ids', 'hidden', array(
'name' => 'store_ids'
@@ -149,7 +149,7 @@ protected function _prepareForm()
$fieldset->addField('from', 'date', array(
'name' => 'from',
- 'format' => $dateFormatIso,
+ 'date_format' => $dateFormat,
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'label' => Mage::helper('Mage_Reports_Helper_Data')->__('From'),
'title' => Mage::helper('Mage_Reports_Helper_Data')->__('From'),
@@ -158,7 +158,7 @@ protected function _prepareForm()
$fieldset->addField('to', 'date', array(
'name' => 'to',
- 'format' => $dateFormatIso,
+ 'date_format' => $dateFormat,
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'label' => Mage::helper('Mage_Reports_Helper_Data')->__('To'),
'title' => Mage::helper('Mage_Reports_Helper_Data')->__('To'),
View
7 app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -43,6 +43,11 @@ class Mage_Adminhtml_Block_Report_Grid extends Mage_Adminhtml_Block_Widget_Grid
protected $_filters = array();
+ /**
+ * @var Mage_Core_Model_Locale
+ */
+ protected $_locale;
+
protected $_defaultFilters = array(
'report_from' => '',
'report_to' => '',
@@ -292,7 +297,7 @@ public function getPeriods()
public function getDateFormat()
{
- return $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ return $this->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
}
/**
View
2  app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php
@@ -176,7 +176,7 @@ protected function _addAttributesToForm($attributes, Varien_Data_Form_Abstract $
} else if ($inputType == 'date') {
$format = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$element->setImage($this->getSkinUrl('images/grid-cal.gif'));
- $element->setFormat($format);
+ $element->setDateFormat($format);
}
}
}
View
2  app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
@@ -228,7 +228,7 @@ public function getStoreCollection()
public function getShortDateFormat()
{
if (!$this->_shortDateFormat) {
- $this->_shortDateFormat = Mage::app()->getLocale()->getDateStrFormat(
+ $this->_shortDateFormat = Mage::app()->getLocale()->getDateFormat(
Mage_Core_Model_Locale::FORMAT_TYPE_SHORT
);
}
View
6 app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php
@@ -57,13 +57,13 @@ protected function _prepareForm()
'required' => true,
));
- $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$fieldset->addField('date_from', 'date', array(
'label' => Mage::helper('Mage_Core_Helper_Data')->__('Date From'),
'title' => Mage::helper('Mage_Core_Helper_Data')->__('Date From'),
'name' => 'date_from',
'image' => $this->getSkinUrl('images/grid-cal.gif'),
- 'format' => $dateFormatIso,
+ 'date_format' => $dateFormat,
//'required' => true,
));
$fieldset->addField('date_to', 'date', array(
@@ -71,7 +71,7 @@ protected function _prepareForm()
'title' => Mage::helper('Mage_Core_Helper_Data')->__('Date To'),
'name' => 'date_to',
'image' => $this->getSkinUrl('images/grid-cal.gif'),
- 'format' => $dateFormatIso,
+ 'date_format' => $dateFormat,
//'required' => true,
));
View
9 app/code/core/Mage/Adminhtml/view/adminhtml/main.xml
@@ -87,9 +87,12 @@ Supported layout update handles (special):
<action method="addJs"><file>lib/ds-sleight.js</file><params>defer</params><if>lt IE 7</if></action>
- <action method="addCss"><file>calendar/calendar-win2k-1.css</file><params/><!--<if/><condition>can_load_calendar_js</condition>--></action>
- <action method="addJs"><file>calendar/calendar.js</file><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
- <action method="addJs"><file>calendar/calendar-setup.js</file><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
+ <action method="addCss"><file>mage/calendar.css</file><params/></action>
+ <action method="addJs"><file>jquery/jquery-1.7.1.min.js</file></action>
+ <action method="addJs"><file>mage/jquery-no-conflict.js</file></action>
+ <action method="addJs"><file>jquery/jquery-ui-1.8.18.custom.min.js</file></action>
+ <action method="addJs"><file>jquery/jquery-ui-timepicker-addon.js</file><!--<if/><condition>can_load_calendar_js</condition>--></action>
+ <action method="addJs"><file>mage/calendar.js</file><!--<if/><condition>can_load_calendar_js</condition>--></action>
<action method="addJs"><file>extjs/ext-tree.js</file><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addJs"><file>mage/adminhtml/fix-extjs-defer.js</file><params/><if/><condition>can_load_ext_js</condition></action>
View
93 app/code/core/Mage/Adminhtml/view/adminhtml/page/js/calendar.phtml
@@ -36,65 +36,42 @@
<script type="text/javascript">
//<![CDATA[
-enUS = <?php echo $enUS?>; // en_US locale reference
-Calendar._DN = <?php echo $days['wide']?>; // full day names
-Calendar._SDN = <?php echo $days['abbreviated']?>; // short day names
-Calendar._FD = <?php echo $firstDay?>; // First day of the week. "0" means display Sunday first, "1" means display Monday first, etc.
-Calendar._MN = <?php echo $months['wide']?>; // full month names
-Calendar._SMN = <?php echo $months['abbreviated']?>; // short month names
-Calendar._am = <?php echo $am ?>; // am/pm
-Calendar._pm = <?php echo $pm ?>;
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "<?php echo $this->__('About the calendar');?>";
-
-Calendar._TT["ABOUT"] =
-"<?php echo $this->__('DHTML Date/Time Selector')?>\n" +
-"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
-"<?php echo $this->__('For latest version visit: %s', 'http://www.dynarch.com/projects/calendar/')?>\n" +
-"<?php echo $this->__('Distributed under GNU LGPL. See %s for details.', 'http://gnu.org/licenses/lgpl.html')?>" +
-"\n\n" +
-"<?php echo $this->__('Date selection:')?>\n" +
-"<?php echo $this->__('- Use the %s, %s buttons to select year', '\\xab', '\xbb')?>\n" +
-"<?php echo $this->__('- Use the %s buttons to select month', '" + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "')?>\n" +
-"<?php echo $this->__('- Hold mouse button on any of the above buttons for faster selection.')?>";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"<?php echo $this->__('Time selection:')?>\n" +
-"<?php echo $this->__('- Click on any of the time parts to increase it')?>\n" +
-"<?php echo $this->__('- or Shift-click to decrease it')?>\n" +
-"<?php echo $this->__('- or click and drag for faster selection.')?>";
-
-Calendar._TT["PREV_YEAR"] = "<?php echo $this->__('Prev. year (hold for menu)');?>";
-Calendar._TT["PREV_MONTH"] = "<?php echo $this->__('Prev. month (hold for menu)');?>";
-Calendar._TT["GO_TODAY"] = "<?php echo $this->__('Go Today');?>";
-Calendar._TT["NEXT_MONTH"] = "<?php echo $this->__('Next month (hold for menu)');?>";
-Calendar._TT["NEXT_YEAR"] = "<?php echo $this->__('Next year (hold for menu)');?>";
-Calendar._TT["SEL_DATE"] = "<?php echo $this->__('Select date');?>";
-Calendar._TT["DRAG_TO_MOVE"] = "<?php echo $this->__('Drag to move');?>";
-Calendar._TT["PART_TODAY"] = ' (' + <?php echo $today ?> + ')';
-
-// the following is to inform that "%s" is to be the first day of week
-Calendar._TT["DAY_FIRST"] = "<?php echo $this->__('Display %s first', '%s');?>";
+(function($) {
+ $.extend(true, $, {
+ calendarConfig: {
+ dayNames: <?php echo $days['wide']?>,
+ dayNamesMin: <?php echo $days['abbreviated']?>,
+ monthNames: <?php echo $months['wide']?>,
+ monthNamesShort: <?php echo $months['abbreviated']?>,
+ infoTitle: "<?php echo $this->__('About the calendar');?>",
+ firstDay: <?php echo $firstDay?>,
+ closeText: "<?php echo $this->__('Close');?>",
+ currentText: "<?php echo $this->__('Go Today'); ?>",
+ prevText: "<?php echo $this->__('Previous');?>",
+ nextText: "<?php echo $this->__('Next');?>",
+ weekHeader: "<?php echo $this->__('WK'); ?>",
+ timeText: "<?php echo $this->__('Time');?>",
+ hourText: "<?php echo $this->__('Hour');?>",
+ minuteText: "<?php echo $this->__('Minute');?>",
+ dateFormat: $.datepicker.RFC_2822,
+ showOn: "button",
+ showAnim: "",
+ changeMonth: true,
+ changeYear: true,
+ buttonImageOnly: true,
+ showButtonPanel: true,
+ showWeek: true,
+ timeFormat: '',
+ showTime: false,
+ showHour: false,
+ showMinute: false,
+ localTimezone: <?php echo $this->getTimezoneOffsetSeconds() ?>,
+ serverTimezoneSeconds:<?php echo $this->getStoreTimestamp() ?>
+ }
+ });
+})(jQuery);
-// This may be locale-dependent. It specifies the week-end days, as an array
-// of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
-// means Monday, etc.
-Calendar._TT["WEEKEND"] = <?php echo $weekendDays?>;
-
-Calendar._TT["CLOSE"] = "<?php echo $this->__('Close');?>";
-Calendar._TT["TODAY"] = <?php echo $today ?>;
-Calendar._TT["TIME_PART"] = "<?php echo $this->__('(Shift-)Click or drag to change value');?>";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = <?php echo $defaultFormat?>;
-Calendar._TT["TT_DATE_FORMAT"] = <?php echo $toolTipFormat?>;
-
-Calendar._TT["WK"] = <?php echo $week ?>;
-Calendar._TT["TIME"] = "<?php echo $this->__('Time:');?>";
-
-CalendarDateObject._LOCAL_TIMZEONE_OFFSET_SECONDS = <?php echo $this->getTimezoneOffsetSeconds() ?>;
-CalendarDateObject._SERVER_TIMZEONE_SECONDS = <?php echo $this->getStoreTimestamp() ?>;
+enUS = <?php echo $enUS?>; // en_US locale reference
//]]>
</script>
View
65 app/code/core/Mage/Adminhtml/view/adminhtml/report/grid.phtml
@@ -25,15 +25,7 @@
*/
?>
<?php
-/**
- * Template for Mage_Block_Adminhtml_Report_Grid
- *
- * getId()
- * getCollection()
- * getColumns()
- * getPagerVisibility()
- * getVarNamePage()
- */
+/** @var $this Mage_Adminhtml_Block_Report_Grid */
$numColumns = sizeof($this->getColumns());
?>
<?php if($this->getCollection()): ?>
@@ -58,20 +50,20 @@ $numColumns = sizeof($this->getColumns());
<table cellspacing="0" class="actions">
<tr>
<?php if($this->getDateFilterVisibility()): ?>
- <td class="a-left filter">
+ <td class="a-left filter" id="<?php echo $this->getSuffixId('period_date_range')?>">
<div class="f-left">
- <div><?php echo $this->__('From') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="period_date_from" name="report_from" value="<?php echo $this->getFilter('report_from') ?>" style="width:5em" /> <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" title="<?php echo $this->__('Select Date') ?>" id="period_date_from_trig" alt="<?php echo $this->__('Select Date') ?>" class="v-middle"/>&nbsp;&nbsp;</div>
- <div id="period_date_from_advaice"></div>
+ <div><?php echo $this->__('From') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="<?php echo $this->getSuffixId('period_date_from')?>" name="report_from" value="<?php echo $this->getFilter('report_from') ?>" style="width:5em" />&nbsp;&nbsp;</div>
+ <div id="<?php echo $this->getSuffixId('period_date_from_advice')?>"></div>
</div>
<div class="f-left">
- <div><?php echo $this->__('To') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="period_date_to" name="report_to" value="<?php echo $this->getFilter('report_to') ?>" style="width:5em" /> <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" class="v-middle" title="<?php echo $this->__('Select Date') ?>"id="period_date_to_trig" alt="<?php echo $this->__('Select Date') ?>"/>&nbsp;&nbsp;</div>
- <div id="period_date_to_advaice"></div>
+ <div><?php echo $this->__('To') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="<?php echo $this->getSuffixId('period_date_to')?>" name="report_to" value="<?php echo $this->getFilter('report_to') ?>" style="width:5em" />&nbsp;&nbsp;</div>
+ <div id="<?php echo $this->getSuffixId('period_date_to_advice')?>"></div>
</div>
<div class="f-left">
<?php echo $this->__('Show By') ?>:
- <select name="report_period" id="report_period" style="width:6em;">
+ <select name="report_period" id="<?php echo $this->getSuffixId('report_period')?>" style="width:6em;">
<?php foreach ($this->getPeriods() as $_value=>$_label): ?>
<option value="<?php echo $_value ?>" <?php if($this->getFilter('report_period')==$_value): ?> selected<?php endif; ?>><?php echo $_label ?></option>
<?php endforeach; ?>
@@ -79,29 +71,26 @@ $numColumns = sizeof($this->getColumns());
<?php echo $this->getRefreshButtonHtml() ?>
</div>
<script type="text/javascript">
- <!--
- Calendar.setup({
- inputField : 'period_date_from',
- ifFormat : '<?php echo $this->getDateFormat() ?>',
- button : 'period_date_from_trig',
- align : 'Bl',
- singleClick : true
- });
- Calendar.setup({
- inputField : 'period_date_to',
- ifFormat : '<?php echo $this->getDateFormat() ?>',
- button : 'period_date_to_trig',
- align : 'Bl',
- singleClick : true
- });
- //-->
+ (function( $ ) {
+ $("#<?php echo $this->getSuffixId('period_date_range') ?>").dateRange({
+ dateFormat: "<?php echo $this->getDateFormat() ?>",
+ buttonImage: "<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>",
+ buttonText: "<?php echo $this->__('Select Date') ?>",
+ from: {
+ id: "<?php echo $this->getSuffixId('period_date_from')?>"
+ },
+ to: {
+ id: "<?php echo $this->getSuffixId('period_date_to')?>"
+ }
+ })
+ })(jQuery)
</script>
</td>
<?php endif; ?>
<?php if($this->getExportVisibility()): ?>
<td class="a-right">
<img src="<?php echo $this->getSkinUrl('images/icon_export.gif') ?>" alt="" class="v-middle"/>&nbsp; <?php echo $this->__('Export to:') ?>
- <select name="<?php echo $this->getId() ?>_export" id="<?php echo $this->getId() ?>_export" style="width:8em;">
+ <select name="<?php echo $this->getSuffixId('export')?>" id="<?php echo $this->getSuffixId('export')?>" style="width:8em;">
<?php foreach ($this->getExportTypes() as $_type): ?>
<option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
<?php endforeach; ?>
@@ -114,7 +103,7 @@ $numColumns = sizeof($this->getColumns());
<?php endif; ?>
<div class="grid">
- <table cellspacing="0" class="data" id="<?php echo $this->getId() ?>_table">
+ <table cellspacing="0" class="data" id="<?php echo $this->getSuffixId('table')?>">
<col/>
<?php foreach ($this->getColumns() as $_column): ?>
<col <?php echo $_column->getHtmlProperty() ?>/>
@@ -191,10 +180,10 @@ $numColumns = sizeof($this->getColumns());
<?php echo $this->getJsObjectName() ?>.useAjax = '<?php echo $this->getUseAjax() ?>';
<?php if($this->getDateFilterVisibility()):?>
<?php echo $this->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
- var period_date_from = $('period_date_from');
- var period_date_to = $('period_date_to');
- period_date_from.advaiceContainer = $('period_date_from_advaice');
- period_date_to.advaiceContainer = $('period_date_to_advaice');
+ var period_date_from = $('<?php echo $this->getSuffixId('period_date_from')?>');
+ var period_date_to = $('<?php echo $this->getSuffixId('period_date_to')?>');
+ period_date_from.adviceContainer = $('<?php echo $this->getSuffixId('period_date_from_advice')?>');
+ period_date_to.adviceContainer = $('<?php echo $this->getSuffixId('period_date_to_advice')?>');
function validateFilterDate()
{
@@ -219,7 +208,7 @@ $numColumns = sizeof($this->getColumns());
if(obj.switchParams){
storeParam+= obj.switchParams;
}
- var formParam = new Array('period_date_from', 'period_date_to', 'report_period');
+ var formParam = new Array('<?php echo $this->getSuffixId('period_date_from')?>', '<?php echo $this->getSuffixId('period_date_to')?>', '<?php echo $this->getSuffixId('report_period')?>');
var paramURL = '';
var switchURL = '<?php echo $this->getAbsoluteGridUrl(array('_current' => false)); ?>'.replace(/(store|group|website)\/\d+\//,'');
View
49 app/code/core/Mage/Adminhtml/view/adminhtml/system/convert/profile/wizard.phtml
@@ -24,19 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php
-/**
- * @methods
- * - getValue($key, $default)
- * - getSelected($key, $value)
- * - getChecked($key)
- * - getAttributes()
- * - getMappings()
- * - getAddMapButtonHtml()
- * - getRemoveMapButtonHtml()
- */
-?>
-
+<?php /** @var $this Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard */ ?>
<script type="text/javascript">
//<![CDATA[
var profileImportOnly = ['profile_number_of_records', 'profile_decimal_separator'];
@@ -527,30 +515,27 @@ Event.observe(window, 'load', function(){
<input class="input-text" id="customer_filter_region" name="gui_data[customer][filter][region]" value="<?php echo $this->getValue('gui_data/customer/filter/region') ?>"/>
<?php echo $this->__('(For US 2-letter state names)') ?>
</span>
- <span class="field-row">
+ <span class="field-row" id="customer_filter_created_at_range">
<label for="customer_filter_created_at_from"><?php echo $this->__("Customer Since:") ?></label>
<input class="input-text" style="width:5em" id="customer_filter_created_at_from" name="gui_data[customer][filter][created_at][from]" value="<?php echo $this->getValue('gui_data/customer/filter/created_at/from') ?>"/>
- <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" alt="" class="v-middle" id="customer_filter_created_at_from_trig" title="<?php echo $this->__('Date selector') ?>" />
<?php echo $this->__('to') ?>
<input class="input-text" style="width:5em" id="customer_filter_created_at_to" name="gui_data[customer][filter][created_at][to]" value="<?php echo $this->getValue('gui_data/customer/filter/created_at/to') ?>"/>
- <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" alt="" class="v-middle" id="customer_filter_created_at_to_trig" title="<?php echo $this->__('Date selector') ?>" />
-<script type="text/javascript">
- Calendar.setup({
- inputField : "customer_filter_created_at_from",
- ifFormat : "<?php echo $this->getShortDateFormat() ?>",
- button : "customer_filter_created_at_from_trig",
- align : "Bl",
- singleClick : true
- });
- Calendar.setup({
- inputField : "customer_filter_created_at_to",
- ifFormat : "<?php echo $this->getShortDateFormat() ?>",
- button : "customer_filter_created_at_to_trig",
- align : "Bl",
- singleClick : true
- });
-</script>
</span>
+ <script type="text/javascript">
+ (function( $ ) {
+ $("#customer_filter_created_at_range").dateRange({
+ dateFormat: "<?php echo $this->getShortDateFormat() ?>",
+ buttonImage: "<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>",
+ buttonText: "<?php echo $this->__('Date selector') ?>",
+ from: {
+ id: "customer_filter_created_at_from"
+ },
+ to: {
+ id: "customer_filter_created_at_to"
+ }
+ })
+ })(jQuery)
+ </script>
</div>
</fieldset>
</div>
View
11 app/code/core/Mage/Backend/Block/Widget.php
@@ -41,6 +41,17 @@ public function getId()
return $this->getData('id');
}
+ /**
+ * Get HTML ID with specified suffix
+ *
+ * @param string $suffix
+ * @return string
+ */
+ public function getSuffixId($suffix)
+ {
+ return "{$this->getId()}_{$suffix}";
+ }
+
public function getHtmlId()
{
return $this->getId();
View
2  app/code/core/Mage/Backend/Block/Widget/Form.php
@@ -201,7 +201,7 @@ protected function _setFieldset($attributes, $fieldset, $exclude=array())
$element->setCanBeEmpty(true);
} else if ($inputType == 'date') {
$element->setImage($this->getSkinUrl('images/grid-cal.gif'));
- $element->setFormat(Mage::app()->getLocale()->getDateFormatWithLongYear());
+ $element->setDateFormat(Mage::app()->getLocale()->getDateFormatWithLongYear());
} else if ($inputType == 'multiline') {
$element->setLineCount($attribute->getMultilineCount());
}
View
63 app/code/core/Mage/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -46,65 +46,34 @@ protected function _prepareLayout()
public function getHtml()
{
- $htmlId = $this->_getHtmlId() . microtime(true);
- $format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
- $html = '<div class="range"><div class="range-line date">'
+ $htmlId = Mage::helper('Mage_Core_Helper_Data')->uniqHash($this->_getHtmlId());
+ $format = $this->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $html = '<div class="range" id="'.$htmlId.'_range"><div class="range-line date">'
. '<span class="label">' . Mage::helper('Mage_Backend_Helper_Data')->__('From').':</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
. ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes" ' . $this->getUiId('filter', $this->_getHtmlName(), 'from') . '/>'
- . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
- . ' id="'.$htmlId.'_from_trig"'
- . ' title="' . $this->escapeHtml(Mage::helper('Mage_Backend_Helper_Data')->__('Date selector')) . '"/>'
. '</div>';
$html.= '<div class="range-line date">'
. '<span class="label">' . Mage::helper('Mage_Backend_Helper_Data')->__('To').' :</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
. ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes" ' . $this->getUiId('filter', $this->_getHtmlName(), 'to') . '/>'
- . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
- . ' id="'.$htmlId.'_to_trig"'
- . ' title="'.$this->escapeHtml(Mage::helper('Mage_Backend_Helper_Data')->__('Date selector')).'"/>'
. '</div></div>';
$html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]"'
. ' value="'.$this->getLocale()->getLocaleCode().'"/>';
$html.= '<script type="text/javascript">
- Calendar.setup({
- inputField : "'.$htmlId.'_from",
- ifFormat : "'.$format.'",
- button : "'.$htmlId.'_from_trig",
- align : "Bl",
- singleClick : true
- });
- Calendar.setup({
- inputField : "'.$htmlId.'_to",
- ifFormat : "'.$format.'",
- button : "'.$htmlId.'_to_trig",
- align : "Bl",
- singleClick : true
- });
-
- $("'.$htmlId.'_to_trig").observe("click", showCalendar);
- $("'.$htmlId.'_from_trig").observe("click", showCalendar);
-
- function showCalendar(event){
- var element = event.element(event);
- var offset = $(element).viewportOffset();
- var scrollOffset = $(element).cumulativeScrollOffset();
- var dimensionsButton = $(element).getDimensions();
- var index = $("widget-chooser").getStyle("zIndex");
-
- $$("div.calendar").each(function(item){
- if ($(item).visible()) {
- var dimensionsCalendar = $(item).getDimensions();
-
- $(item).setStyle({
- "zIndex" : index + 1,
- "left" : offset[0] + scrollOffset[0] - dimensionsCalendar.width
- + dimensionsButton.width + "px",
- "top" : offset[1] + scrollOffset[1] + dimensionsButton.height + "px"
- });
- };
- });
- };
+ (function( $ ) {
+ $("#'.$htmlId.'_range").dateRange({
+ dateFormat: "'.$format.'",
+ buttonImage: "' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '",
+ buttonText: "'.$this->escapeHtml(Mage::helper('Mage_Backend_Helper_Data')->__('Date selector')).'",
+ from: {
+ id: "'.$htmlId.'_from"
+ },
+ to: {
+ id: "'.$htmlId.'_to"
+ }
+ })
+ })(jQuery)
</script>';
return $html;
}
View
46 app/code/core/Mage/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -107,48 +107,42 @@ protected function _convertDate($date, $locale)
*/
public function getHtml()
{
- $htmlId = $this->_getHtmlId() . microtime(true);
- $format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $htmlId = Mage::helper('Mage_Core_Helper_Data')->uniqHash($this->_getHtmlId());
+ $format = $this->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $timeFormat = '';
if ($this->getColumn()->getFilterTime()) {
- $format .= ' ' . $this->getLocale()->getTimeStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $timeFormat = $this->getLocale()->getTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
}
- $html = '<div class="range"><div class="range-line date">'
+ $html = '<div class="range" id="'.$htmlId.'_range"><div class="range-line date">'
. '<span class="label">' . Mage::helper('Mage_Backend_Helper_Data')->__('From').':</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
. ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes" ' . $this->getUiId('filter', $this->_getHtmlName(), 'from') . '/>'
- . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
- . ' id="'.$htmlId.'_from_trig"'
- . ' title="'.$this->escapeHtml(Mage::helper('Mage_Backend_Helper_Data')->__('Date selector')).'"/>'
. '</div>';
$html.= '<div class="range-line date">'
. '<span class="label">' . Mage::helper('Mage_Backend_Helper_Data')->__('To').' :</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
. ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes" ' . $this->getUiId('filter', $this->_getHtmlName(), 'to') . '/>'
- . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
- . ' id="'.$htmlId.'_to_trig"'
- . ' title="'.$this->escapeHtml(Mage::helper('Mage_Backend_Helper_Data')->__('Date selector')).'"/>'
. '</div></div>';
$html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]"'
. ' value="'.$this->getLocale()->getLocaleCode().'"/>';
$html.= '<script type="text/javascript">
- Calendar.setup({
- inputField : "'.$htmlId.'_from",
- ifFormat : "'.$format.'",
- button : "'.$htmlId.'_from_trig",
- showsTime: '. ( $this->getColumn()->getFilterTime() ? 'true' : 'false') .',
- align : "Bl",
- singleClick : true
- });
- Calendar.setup({
- inputField : "'.$htmlId.'_to",
- ifFormat : "'.$format.'",
- button : "'.$htmlId.'_to_trig",
- showsTime: '. ( $this->getColumn()->getFilterTime() ? 'true' : 'false') .',
- align : "Bl",
- singleClick : true
- });
+ (function( $ ) {
+ $("#'.$htmlId.'_range").dateRange({
+ dateFormat: "' . $format . '",
+ timeFormat: "' . $timeFormat . '",
+ showsTime: '. ( $this->getColumn()->getFilterTime() ? 'true' : 'false') .',
+ buttonImage: "'. Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '",
+ buttonText: "'.$this->escapeHtml(Mage::helper('Mage_Backend_Helper_Data')->__('Date selector')).'",
+ from: {
+ id: "'.$htmlId.'_from"
+ },
+ to: {
+ id: "'.$htmlId.'_to"
+ }
+ })
+ })(jQuery)
</script>';
return $html;
}
View
4 app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php
@@ -96,9 +96,9 @@ public function getCalendarDateHtml()
->setName('options['.$this->getOption()->getId().'][date]')
->setClass('product-custom-option datetime-picker input-text' . $require)
->setImage($this->getSkinUrl('Mage_Core::calendar.gif'))
- ->setFormat(Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT))
+ ->setDateFormat(Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT))
->setValue($value)
- ->setYearsRange('[' . $yearStart . ', ' . $yearEnd . ']');
+ ->setYearsRange($yearStart . ':' . $yearEnd);
if (!$this->getSkipJsReloadPrice()) {
$calendar->setExtraParams('onchange="opConfig.reloadPrice()"');
}
View
2  app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php
@@ -27,6 +27,8 @@
$installer = $this;
/** @var $installer Mage_Catalog_Model_Resource_Setup */
+$installer->installEntities();
+
foreach (array('news_from_date', 'custom_design_from') as $attributeCode) {
$installer->updateAttribute(
Mage_Catalog_Model_Product::ENTITY,
View
5 app/code/core/Mage/Catalog/view/frontend/layout.xml
@@ -161,11 +161,8 @@ Product view
<reference name="head">
<action method="addJs"><file>varien/product.js</file></action>
<action method="addJs"><file>varien/configurable.js</file></action>
-
- <action method="addCss"><file>calendar/calendar-win2k-1.css</file><params/><!--<if/><condition>can_load_calendar_js</condition>--></action>
- <action method="addJs"><file>calendar/calendar.js</file><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
- <action method="addJs"><file>calendar/calendar-setup.js</file><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
</reference>
+ <update handle="page_calendar"/>
<reference name="content">
<block type="Mage_Catalog_Block_Product_View" name="product.info" template="product/view.phtml">
<!--
View
2  app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
@@ -305,7 +305,7 @@ public function getDateInput($attribute, $part = 'from')
->setTitle($this->getAttributeLabel($attribute))
->setValue($value)
->setImage($this->getSkinUrl('Mage_Core::calendar.gif'))
- ->setFormat('%m/%d/%y')
+ ->setDateFormat(Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT))
->setClass('input-text')
->getHtml();
}
View
2  app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php
@@ -115,7 +115,7 @@ protected function _getIndexer()
*/
public function getName()
{
- return Mage::helper('Mage_CatalogSearch_Helper_Data')->__('Catalog Search Index');
+ return Mage::helper('Mage_CatalogSearch_Helper_Data')->__('Catalog Search');
}
/**
View
4 app/code/core/Mage/CatalogSearch/view/frontend/layout.xml
@@ -82,10 +82,8 @@
</reference>
<reference name="head">
<action method="setTitle" translate="title" module="Mage_CatalogSearch"><title>Advanced Search</title></action>
- <action method="addCss"><file>calendar/calendar-win2k-1.css</file><params/><!--<if/><condition>can_load_calendar_js</condition>--></action>
- <action method="addJs"><file>calendar/calendar.js</file><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
- <action method="addJs"><file>calendar/calendar-setup.js</file><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
</reference>
+ <update handle="page_calendar"/>
<reference name="content">
<block type="Mage_CatalogSearch_Block_Advanced_Form" name="catalogsearch_advanced_form" template="advanced/form.phtml"/>
<block type="Mage_Core_Block_Html_Calendar" name="html_calendar" as="html_calendar" template="Mage_Page::js/calendar.phtml"/>
View
4 app/code/core/Mage/Core/Block/Html/Calendar.php
@@ -68,11 +68,11 @@ protected function _toHtml()
// define default format and tooltip format
$this->assign(
'defaultFormat',
- $helper->jsonEncode(Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM))
+ $helper->jsonEncode(Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM))
);
$this->assign(
'toolTipFormat',
- $helper->jsonEncode(Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_LONG))
+ $helper->jsonEncode(Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_LONG))
);
// get days and months for en_US locale - calendar will parse exactly in this locale
View
46 app/code/core/Mage/Core/Block/Html/Date.php
@@ -37,38 +37,26 @@ class Mage_Core_Block_Html_Date extends Mage_Core_Block_Template
protected function _toHtml()
{
- $displayFormat = Varien_Date::convertZendToStrFtime($this->getFormat(), true, (bool)$this->getTime());
-
$html = '<input type="text" name="' . $this->getName() . '" id="' . $this->getId() . '" ';
$html .= 'value="' . $this->escapeHtml($this->getValue()) . '" class="' . $this->getClass() . '" ' . $this->getExtraParams() . '/> ';
-
- $html .= '<img src="' . $this->getImage() . '" alt="' . $this->helper('Mage_Core_Helper_Data')->__('Select Date') . '" class="v-middle" ';
- $html .= 'title="' . $this->helper('Mage_Core_Helper_Data')->__('Select Date') . '" id="' . $this->getId() . '_trig" />';
-
- $html .=
- '<script type="text/javascript">
- //<![CDATA[
- var calendarSetupObject = {
- inputField : "' . $this->getId() . '",
- ifFormat : "' . $displayFormat . '",
- showsTime : "' . ($this->getTime() ? 'true' : 'false') . '",
- button : "' . $this->getId() . '_trig",
- align : "Bl",
- singleClick : true
- }';
-
$calendarYearsRange = $this->getYearsRange();
- if ($calendarYearsRange) {
- $html .= '
- calendarSetupObject.range = ' . $calendarYearsRange . '
- ';
- }
-
- $html .= '
- Calendar.setup(calendarSetupObject);
- //]]>
- </script>';
-
+ $html .=
+ '<script type="text/javascript">
+ //<![CDATA[
+ (function($) {
+ $(document).ready(function(){
+ $("#' . $this->getId() . '").calendar({
+ showsTime: ' . ($this->getTimeFormat() ? 'true' : 'false') . ',
+ ' . ($this->getTimeFormat() ? ('timeFormat: "' . $this->getTimeFormat() . '",') : '') . '
+ dateFormat: "' . $this->getDateFormat() . '",
+ buttonImage: "' . $this->getImage() . '",
+ ' . ($calendarYearsRange ? 'yearRange: "' . $calendarYearsRange . '",' : '') . '
+ buttonText: "' . $this->helper('Mage_Core_Helper_Data')->__('Select Date') . '"
+ })
+ });
+ })(jQuery)
+ //]]>
+ </script>';
return $html;
}
View
2  app/code/core/Mage/Core/Controller/Varien/Exception.php
@@ -67,7 +67,7 @@ public function prepareForward($actionName = null, $controllerName = null, $modu
public function prepareRedirect($path, $arguments = array())
{
$this->_resultCallback = self::RESULT_REDIRECT;
- $this->_resultCallbackParams($path, $arguments);
+ $this->_resultCallbackParams = array($path, $arguments);
return $this;
}
View
22 app/code/core/Mage/Core/Model/Locale.php
@@ -447,28 +447,6 @@ public function getDateTimeFormat($type)
}
/**
- * Retrieve date format by strftime function
- *
- * @param string $type
- * @return string
- */
- public function getDateStrFormat($type)
- {
- return Varien_Date::convertZendToStrftime($this->getDateFormat($type), true, false);
- }
-
- /**
- * Retrieve time format by strftime function
- *
- * @param string $type
- * @return string
- */
- public function getTimeStrFormat($type)
- {
- return Varien_Date::convertZendToStrftime($this->getTimeFormat($type), false, true);
- }
-
- /**
* Create Zend_Date object for current locale
*
* @param mixed $date
View
36 app/code/core/Mage/Core/data/core_setup/data-upgrade-1.6.0.4-1.6.0.5.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-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_Core
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+$installer->startSetup();
+
+$tableName = $installer->getTable('admin_rule');
+if ($tableName) {
+ $installer->getConnection()->delete($tableName, array('resource_id = ?' => 'admin/system/tools/compiler'));
+}
+
+$installer->endSetup();
View
2  app/code/core/Mage/Core/etc/config.xml
@@ -28,7 +28,7 @@
<config>
<modules>
<Mage_Core>
- <version>1.6.0.4</version>
+ <version>1.6.0.5</version>
<active>true</active>
<codePool>core</codePool>
</Mage_Core>
View
2  app/code/core/Mage/Customer/Block/Widget/Dob.php
@@ -80,7 +80,7 @@ public function getYear()
*/
public function getDateFormat()
{
- return Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ return Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
}
/**
View
2  app/code/core/Mage/Customer/etc/config.xml
@@ -28,7 +28,7 @@
<config>
<modules>
<Mage_Customer>
- <version>1.6.2.0.2</version>
+ <version>1.6.2.0.3</version>
<active>true</active>
<codePool>core</codePool>
<depends>
View
30 app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.3.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-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_Customer
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var $installer Mage_Customer_Model_Resource_Setup */
+$installer = $this;
+
+$installer->installEntities();
View
4 app/code/core/Mage/DesignEditor/view/frontend/layout.xml
@@ -29,15 +29,11 @@
<design_editor_toolbar>
<reference name="head">
<action method="addJs"><file>Mage_DesignEditor::js/settimeout_override.js</file></action>
- <action method="addJs"><file>jquery/jquery-ui-1.8.18.custom.min.js</file></action>
<action method="addJs"><file>Mage_DesignEditor::js/base.js</file></action>
<action method="addJs"><file>Mage_DesignEditor::js/design_editor.js</file></action>
<action method="addJs"><file>Mage_DesignEditor::js/change/layout.js</file></action>
<action method="addJs"><file>jquery/jstree/jquery.jstree.js</file></action>
<action method="addJs"><file>jquery/slimScroll/slimScroll.min.js</file></action>
- <action method="addJs"><file>prototype/prototype.js</file></action>
- <action method="addJs"><file>mage/translate.js</file></action>
- <action method="addJs"><file>Mage_Page::js/cookies.js</file></action>
<action method="addCss"><file>Mage_DesignEditor::css/styles.css</file></action>
</reference>
<!-- Toolbar block has been intentionally declared outside of containers to be rendered manually -->
View
4 app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php
@@ -114,14 +114,14 @@ protected function _prepareForm()
'value' => $attributeObject->getDefaultValue(),
));
- $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+ $dateFormat = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$fieldset->addField('default_value_date', 'date', array(
'name' => 'default_value_date',
'label' => Mage::helper('Mage_Eav_Helper_Data')->__('Default Value'),
'title' => Mage::helper('Mage_Eav_Helper_Data')->__('Default Value'),
'image' => $this->getSkinUrl('images/grid-cal.gif'),
'value' => $attributeObject->getDefaultValue(),
- 'format' => $dateFormatIso
+ 'date_format' => $dateFormat
));
$fieldset->addField('default_value_textarea', 'textarea', array(
View
54 app/code/core/Mage/Eav/Model/Entity/Setup.php
@@ -1177,36 +1177,38 @@ public function installEntities($entities = null)
$backendPrefix = isset($entity['backend_prefix']) ? $entity['backend_prefix'] : '';
$sourcePrefix = isset($entity['source_prefix']) ? $entity['source_prefix'] : '';
- foreach ($entity['attributes'] as $attrCode => $attr) {
- if (!empty($attr['backend'])) {
- if ('_' === $attr['backend']) {
- $attr['backend'] = $backendPrefix;
- } elseif ('_' === $attr['backend']{0}) {
- $attr['backend'] = $backendPrefix.$attr['backend'];
- } else {
- $attr['backend'] = $attr['backend'];
+ if (is_array($entity['attributes']) && !empty($entity['attributes'])) {
+ foreach ($entity['attributes'] as $attrCode => $attr) {
+ if (!empty($attr['backend'])) {
+ if ('_' === $attr['backend']) {
+ $attr['backend'] = $backendPrefix;
+ } elseif ('_' === $attr['backend']{0}) {
+ $attr['backend'] = $backendPrefix.$attr['backend'];
+ } else {
+ $attr['backend'] = $attr['backend'];
+ }
}
- }
- if (!empty($attr['frontend'])) {
- if ('_' === $attr['frontend']) {
- $attr['frontend'] = $frontendPrefix;
- } elseif ('_' === $attr['frontend']{0}) {
- $attr['frontend'] = $frontendPrefix.$attr['frontend'];
- } else {
- $attr['frontend'] = $attr['frontend'];
+ if (!empty($attr['frontend'])) {
+ if ('_' === $attr['frontend']) {
+ $attr['frontend'] = $frontendPrefix;
+ } elseif ('_' === $attr['frontend']{0}) {
+ $attr['frontend'] = $frontendPrefix.$attr['frontend'];
+ } else {
+ $attr['frontend'] = $attr['frontend'];
+ }
}
- }
- if (!empty($attr['source'])) {
- if ('_' === $attr['source']) {
- $attr['source'] = $sourcePrefix;
- } elseif ('_' === $attr['source']{0}) {
- $attr['source'] = $sourcePrefix . $attr['source'];
- } else {
- $attr['source'] = $attr['source'];
+ if (!empty($attr['source'])) {
+ if ('_' === $attr['source']) {
+ $attr['source'] = $sourcePrefix;
+ } elseif ('_' === $attr['source']{0}) {
+ $attr['source'] = $sourcePrefix . $attr['source'];
+ } else {
+ $attr['source'] = $attr['source'];
+ }
}
- }
- $this->addAttribute($entityName, $attrCode, $attr);
+ $this->addAttribute($entityName, $attrCode, $attr);
+ }
}
$this->setDefaultSetToEntityType($entityName);
}
View
2  app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -71,7 +71,7 @@ protected function _getDateFromToHtmlWithValue(Mage_Eav_Model_Entity_Attribute $
'name' => $this->getFilterElementName($attribute->getAttributeCode()) . '[]',
'id' => $this->getFilterElementId($attribute->getAttributeCode()),
'class' => 'input-text input-text-range-date',
- 'format' => Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT),
+ 'date_format' => Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT),
'image' => $this->getSkinUrl('images/grid-cal.gif')
));
$fromValue = null;
View
17 app/code/core/Mage/ImportExport/Model/Import/Entity/Eav/Customer.php
@@ -267,13 +267,17 @@ protected function _prepareDataForUpdate(array $rowData)
$passwordAttributeId = $passwordAttribute->getId();
$passwordStorageTable = $passwordAttribute->getBackend()->getTable();
- $dateTimeFormat = Varien_Date::convertZendToStrftime(Varien_Date::DATETIME_INTERNAL_FORMAT, true, true);
-
$entitiesToCreate = array();
$entitiesToUpdate = array();
$attributesToSave = array();
// entity table data
+ $now = new DateTime('@' . time());
+ if (empty($rowData['created_at'])) {
+ $createdAt = $now;
+ } else {
+ $createdAt = new DateTime('@' . strtotime($rowData['created_at']));
+ }
$entityRow = array(
'group_id' => empty($rowData['group_id'])
? self::DEFAULT_GROUP_ID : $rowData['group_id'],
@@ -281,10 +285,8 @@ protected function _prepareDataForUpdate(array $rowData)
'store_id' => empty($rowData[self::COLUMN_STORE])
? 0 : $this->_storeCodeToId[$rowData[self::COLUMN_STORE]],
- 'created_at' => empty($rowData['created_at'])
- ? now() : gmstrftime($dateTimeFormat, strtotime($rowData['created_at'])),
-
- 'updated_at' => now()
+ 'created_at' => $createdAt->format(Varien_Date::DATETIME_PHP_FORMAT),
+ 'updated_at' => $now->format(Varien_Date::DATETIME_PHP_FORMAT),
);
$emailInLowercase = strtolower($rowData[self::COLUMN_EMAIL]);
@@ -315,7 +317,8 @@ protected function _prepareDataForUpdate(array $rowData)
if ('select' == $attributeParameters['type']) {
$value = $attributeParameters['options'][strtolower($value)];
} elseif ('datetime' == $attributeParameters['type']) {
- $value = gmstrftime($dateTimeFormat, strtotime($value));
+ $value = new DateTime('@' . strtotime($value));
+ $value = $value->format(Varien_Date::DATETIME_PHP_FORMAT);
} elseif ($backendModel) {
$attribute->getBackend()->beforeSave($this->_customerModel->setData($attributeCode, $value));
$value = $this->_customerModel->getData($attributeCode);
View
25 app/code/core/Mage/ImportExport/Model/Import/Entity/Eav/Customer/Address.php
@@ -168,13 +168,6 @@ class Mage_ImportExport_Model_Import_Entity_Eav_Customer_Address
protected $_customerEntity;
/**
- * Date/time format to import
- *
- * @var string
- */
- protected $_dateTimeFormat;
-
- /**
* Entity ID incremented value
*
* @var int