Merge pull request #307 from fulv/master

Issue 301 "Remove code from Image and Link tiles"
collective · Oct 8, 2013 · 25d9c89 · 25d9c89
2 parents e39b4ce + 899df5f
commit 25d9c89
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 459 deletions.
diff --git a/src/collective/cover/profiles/upgrade_2_to_3/registry.xml b/src/collective/cover/profiles/upgrade_2_to_3/registry.xml
@@ -9,12 +9,10 @@
         <element>collective.cover.contentbody</element>
         <element>collective.cover.embed</element>
         <element>collective.cover.file</element>
-        <element>collective.cover.image</element>
-        <element>collective.cover.link</element>
         <element>collective.cover.list</element>
         <element>collective.cover.richtext</element>
       </default>
-      <description>This tiles will be available for layout creation.</description>
+      <description>These tiles will be available for layout creation.</description>
       <required>False</required>
       <title>Available tiles</title>
       <value_type type="plone.registry.field.Choice">
@@ -28,8 +26,6 @@
       <element>collective.cover.contentbody</element>
       <element>collective.cover.embed</element>
       <element>collective.cover.file</element>
-      <element>collective.cover.image</element>
-      <element>collective.cover.link</element>
       <element>collective.cover.list</element>
       <element>collective.cover.richtext</element>
     </value>

diff --git a/src/collective/cover/static/tile-image.png b/src/collective/cover/static/tile-image.png
diff --git a/src/collective/cover/static/tile-link.png b/src/collective/cover/static/tile-link.png
diff --git a/src/collective/cover/tests/test_image_tile.py b/src/collective/cover/tests/test_image_tile.py
diff --git a/src/collective/cover/tests/test_link_tile.py b/src/collective/cover/tests/test_link_tile.py
diff --git a/src/collective/cover/tests/test_tiles.py b/src/collective/cover/tests/test_tiles.py
@@ -30,6 +30,5 @@ def test_tiles_removed_on_uninstall(self):
         self.assertTrue(u'collective.cover.collection' not in tiles)
         self.assertTrue(u'collective.cover.embed' not in tiles)
         self.assertTrue(u'collective.cover.file' not in tiles)
-        self.assertTrue(u'collective.cover.link' not in tiles)
         self.assertTrue(u'collective.cover.list' not in tiles)
         self.assertTrue(u'collective.cover.richtext' not in tiles)
diff --git a/src/collective/cover/tiles/image.py b/src/collective/cover/tiles/image.py
diff --git a/src/collective/cover/tiles/link.py b/src/collective/cover/tiles/link.py