Merge pull request #246 from collective/css-registry

Move CSS to css_registry (closes #244)
collective · Aug 7, 2013 · 66632da · 66632da
2 parents e7e5890 + 6d3f29c
commit 66632da
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 11 deletions.
diff --git 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]
+
 - Collection tile now fulfills the configured image size (fixes `#239`_).
   [cleberjsantos]
 

diff --git a/src/collective/cover/profiles.zcml b/src/collective/cover/profiles.zcml
@@ -91,4 +91,17 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="4"
+      destination="5"
+      profile="collective.cover:default">
+
+      <genericsetup:upgradeStep
+          title="Solves issue 244"
+          description="Add cover.css to css_registry"
+          handler=".upgrades.issue_244"
+          />
+
+  </genericsetup:upgradeSteps>
+
 </configure>
diff --git a/src/collective/cover/profiles/default/cssregistry.xml b/src/collective/cover/profiles/default/cssregistry.xml
@@ -6,4 +6,7 @@
  <stylesheet title="" cacheable="True" compression="safe" cookable="True"
     enabled="1" expression="" id="++resource++collective.cover/bootstrap.min.css" media="screen"
     rel="stylesheet" rendering="link"/>
+ <stylesheet title="" cacheable="True" compression="safe" cookable="True"
+    enabled="1" expression="" id="++resource++collective.cover/cover.css" media="screen"
+    rel="stylesheet" rendering="link"/>
 </object>
diff --git 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">
 
-<metal:js fill-slot="javascript_head_slot">
-
-</metal:js>
-
-<metal:styles fill-slot="style_slot">
-  <link rel="stylesheet" type="text/css" media="screen" href=""
-        tal:define="navroot context/@@plone_portal_state/navigation_root_url"
-        tal:attributes="href string:${navroot}/++resource++collective.cover/cover.css"
-        />
-</metal:styles>
 <body>
 
 <metal:main fill-slot="main">
     <div tal:define="layout nocall:context/@@layout"
-        tal:replace="structure layout/render_view" />
+         tal:replace="structure layout/render_view" />
 </metal:main>
 
 </body>

diff --git 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
@@ -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))