From 65d83c73de5374347f18d696580bf2715a4d8775 Mon Sep 17 00:00:00 2001 From: Andre Nogueira Date: Tue, 6 Aug 2013 17:57:29 -0300 Subject: [PATCH] Move CSS to css_registry --- docs/CHANGES.rst | 3 +++ src/collective/cover/profiles.zcml | 13 +++++++++++++ .../cover/profiles/default/cssregistry.xml | 3 +++ src/collective/cover/templates/view.pt | 12 +----------- src/collective/cover/tests/test_upgrades.py | 17 +++++++++++++++++ src/collective/cover/upgrades.py | 18 ++++++++++++++++++ 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst index 3fe2b2a90..ce92f6a38 100644 --- a/docs/CHANGES.rst +++ b/docs/CHANGES.rst @@ -4,6 +4,8 @@ There's a frood who really knows where his towel is 1.0a5 (unreleased) ^^^^^^^^^^^^^^^^^^ +- Move CSS to registry_css (closes `#244`_). [agnogueira] + - Friendly layout for tile configuration (closes `#133`_). [agnogueira] - Fix configuration tile (closes `#239`_). [cleberjsantos] @@ -214,3 +216,4 @@ There's a frood who really knows where his towel is .. _`#206`: https://github.com/collective/collective.cover/issues/206 .. _`#218`: https://github.com/collective/collective.cover/issues/218 .. _`#239`: https://github.com/collective/collective.cover/issues/239 +.. _`#239`: https://github.com/collective/collective.cover/issues/244 diff --git a/src/collective/cover/profiles.zcml b/src/collective/cover/profiles.zcml index dadbc24e2..04220ebd9 100644 --- a/src/collective/cover/profiles.zcml +++ b/src/collective/cover/profiles.zcml @@ -91,4 +91,17 @@ + + + + + + diff --git a/src/collective/cover/profiles/default/cssregistry.xml b/src/collective/cover/profiles/default/cssregistry.xml index f5085f53c..8e292de5c 100644 --- a/src/collective/cover/profiles/default/cssregistry.xml +++ b/src/collective/cover/profiles/default/cssregistry.xml @@ -6,4 +6,7 @@ + diff --git a/src/collective/cover/templates/view.pt b/src/collective/cover/templates/view.pt index ee41e0f75..d033d0843 100644 --- a/src/collective/cover/templates/view.pt +++ b/src/collective/cover/templates/view.pt @@ -6,21 +6,11 @@ metal:use-macro="context/main_template/macros/master" i18n:domain="collective.cover"> - - - - - - -
+ tal:replace="structure layout/render_view" /> diff --git a/src/collective/cover/tests/test_upgrades.py b/src/collective/cover/tests/test_upgrades.py index 920245de8..c741202bf 100644 --- a/src/collective/cover/tests/test_upgrades.py +++ b/src/collective/cover/tests/test_upgrades.py @@ -4,6 +4,7 @@ from collective.cover.upgrades import register_available_tiles_record from collective.cover.upgrades import register_styles_record from collective.cover.upgrades import rename_content_chooser_resources +from collective.cover.upgrades import issue_244 from plone.registry.interfaces import IRecordAddedEvent from plone.registry.interfaces import IRegistry from zope.component import eventtesting @@ -107,3 +108,19 @@ def test_issue_218(self): self.assertIn(u'collective.cover.banner', registry[record]) self.assertNotIn(u'collective.cover.image', registry[record]) self.assertNotIn(u'collective.cover.link', registry[record]) + + +class Upgrade2to3TestCase(unittest.TestCase): + + layer = INTEGRATION_TESTING + + def setUp(self): + self.portal = self.layer['portal'] + + def test_issue_244(self): + css_tool = self.portal['portal_css'] + id = '++resource++collective.cover/cover.css' + css_tool.unregisterResource(id) + self.assertNotIn(id, css_tool.getResourceIds()) + issue_244(self.portal) + self.assertIn(id, css_tool.getResourceIds()) diff --git a/src/collective/cover/upgrades.py b/src/collective/cover/upgrades.py index 2d7e2320b..2bf788600 100644 --- a/src/collective/cover/upgrades.py +++ b/src/collective/cover/upgrades.py @@ -124,3 +124,21 @@ def upgrade_record(): if u'collective.cover.image' in record or \ u'collective.cover.link' in record: upgrade_record() + + +def issue_244(context, logger=None): + """Handler for upgrade step from 4 to 5; Add cover.css to css_registry. + See: https://github.com/collective/collective.cover/issues/244 + """ + if logger is None: + logger = logging.getLogger(PROJECTNAME) + + css_tool = getToolByName(context, 'portal_css') + id = '++resource++collective.cover/cover.css' + if id not in css_tool.getResourceIds(): + css_tool.registerStylesheet(id) + logger.info("{0} resource was added".format(id)) + css_tool.cookResources() + logger.info("CSS resources were cooked") + else: + logger.debug("{0} resource already in portal_css".format(id))