diff --git a/CHANGES.rst b/CHANGES.rst index a7753e2f9..c4eb00bb6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,6 +6,9 @@ There's a frood who really knows where his towel is. 1.6b2 (unreleased) ^^^^^^^^^^^^^^^^^^ +- Use correct ``image/x-icon`` MIME type for ICO file format (fixes `#750 `_). + [hvelarde] + - Fix IDatetimeWidget tile override if using plone.app.contenttypes >= 1.1.1: collective.z3cform.datetimewidget is merged into plone.formwidget.datetime, so the zcml must override the template from plone.formwidget.datetime.z3cform.interfaces.IDatetimeWidget diff --git a/src/collective/cover/static/css/contentchooser.css b/src/collective/cover/static/css/contentchooser.css index 155af59c7..037f45eda 100644 --- a/src/collective/cover/static/css/contentchooser.css +++ b/src/collective/cover/static/css/contentchooser.css @@ -48,7 +48,7 @@ list-style-type: none; list-style-image: none; - cursor: url('data:image/vnd.microsoft.icon;base64,AAACAAEAICACAAcABQAwAQAAFgAAACgAAAAgAAAAQAAAAAEAAQAAAAAAAAEAAAAAAAAAAAAAAgAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAA/AAAAfwAAAP+AAAH/gAAB/8AAA//AAAd/wAAGf+AAAH9gAADbYAAA2yAAAZsAAAGbAAAAGAAAAAAAAA//////////////////////////////////////////////////////////////////////////////////////gH///4B///8Af//+AD///AA///wAH//4AB//8AAf//AAD//5AA///gAP//4AD//8AF///AB///5A////5///8='), all-scroll; + cursor: url('data:image/x-icon;base64,AAACAAEAICACAAcABQAwAQAAFgAAACgAAAAgAAAAQAAAAAEAAQAAAAAAAAEAAAAAAAAAAAAAAgAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAA/AAAAfwAAAP+AAAH/gAAB/8AAA//AAAd/wAAGf+AAAH9gAADbYAAA2yAAAZsAAAGbAAAAGAAAAAAAAA//////////////////////////////////////////////////////////////////////////////////////gH///4B///8Af//+AD///AA///wAH//4AB//8AAf//AAD//5AA///gAP//4AD//8AF///AB///5A////5///8='), all-scroll; cursor: -webkit-grab; cursor: -moz-grab; cursor: -o-grab; @@ -58,7 +58,7 @@ #contentchooser-content-search .item-list li.ui-draggable-dragging { - cursor: url('data:image/vnd.microsoft.icon;base64,AAACAAEAICACAAcABQAwAQAAFgAAACgAAAAgAAAAQAAAAAEAAQAAAAAAAAEAAAAAAAAAAAAAAgAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAA/AAAAfwAAAP+AAAH/gAAB/8AAAH/AAAB/wAAA/0AAANsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////////////////////////////////////////////////////////////////////gH///4B///8Af//+AD///AA///wAH//+AB///wAf//4AH//+AD///yT/////////////////////////////8='), all-scroll; + cursor: url('data:image/x-icon;base64,AAACAAEAICACAAcABQAwAQAAFgAAACgAAAAgAAAAQAAAAAEAAQAAAAAAAAEAAAAAAAAAAAAAAgAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8AAAA/AAAAfwAAAP+AAAH/gAAB/8AAAH/AAAB/wAAA/0AAANsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////////////////////////////////////////////////////////////////////gH///4B///8Af//+AD///AA///wAH//+AB///wAf//4AH//+AD///yT/////////////////////////////8='), all-scroll; cursor: -webkit-grabbing; cursor: -moz-grabbing; cursor: -o-grabbing; diff --git a/src/collective/cover/tests/test_upgrades.py b/src/collective/cover/tests/test_upgrades.py index a2a216138..7aab454ac 100644 --- a/src/collective/cover/tests/test_upgrades.py +++ b/src/collective/cover/tests/test_upgrades.py @@ -653,4 +653,4 @@ def setUp(self): def test_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] self.assertGreaterEqual(int(version), int(self.to_version)) - self.assertEqual(self._how_many_upgrades_to_do(), 1) + self.assertEqual(self._how_many_upgrades_to_do(), 2) diff --git a/src/collective/cover/upgrades/v18/configure.zcml b/src/collective/cover/upgrades/v18/configure.zcml index 7b96c4cb6..8aa594d9a 100644 --- a/src/collective/cover/upgrades/v18/configure.zcml +++ b/src/collective/cover/upgrades/v18/configure.zcml @@ -9,6 +9,12 @@ destination="18" profile="collective.cover:default"> + +