Merge branch 'master' into no-transformer-searchable

.travis.yml

@@ -1,5 +1,9 @@
 language: python
 python: 2.7
+sudo: false
+cache:
+  directories:
+    - eggs
 env:
   global:
     - ARTIFACTS_AWS_REGION=sa-east-1
@@ -16,11 +20,11 @@ matrix:
     - env: PLONE_VERSION=5.0
   fast_finish: true
 install:
-  - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
-  - sed -ie "s#versions-4.x.cfg#versions-$PLONE_VERSION.x.cfg#" travis.cfg
+  - sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg
+  - sed -ie "s#versions-4.3#versions-$PLONE_VERSION#" buildout.cfg
   - test $JQUERY && sed -ie "s#plone.app.jquery = 1.7.2#plone.app.jquery = $JQUERY#" versions-4.3.x.cfg || true
   - mkdir -p buildout-cache/downloads
-  - python bootstrap.py -c travis.cfg
+  - python bootstrap.py -c travis.cfg -v 2.2.1
   - bin/buildout -c travis.cfg annotate
   - bin/buildout -c travis.cfg -N -q
 before_script:

CHANGES.rst

@@ -3,11 +3,55 @@ Changelog
 
 There's a frood who really knows where his towel is.
 
-1.0a10 (unreleased)
+1.0a11 (unreleased)
 ^^^^^^^^^^^^^^^^^^^
 - Fix the indexing of richtext tiles by manually transform the text/html to text/plain
   [puittenbroek]
 
+- Don't ignore dropped objects on carousel tiles if the image is added to the object using a Dexterity behavior. (fixes '#473`_`).
+  [fredvd]
+
+- Fix to check if custom attributes were changed from default value (closes `#476`_).
+  [rodfersou]
+
+- Allow new empty carousel tiles to be edited in compose mode. (fixes `#472`_).
+  [fredvd]
+
+- Add warning in the developer docs that switching the default grid system also means you should pay extra attention to the preset/saved cover layouts as these can contain invalid grid sizes.
+  [fredvd]
+
+- Add upgrade step for reverting tiles already migrated to PersistentMapping in 1.0a10
+  [frapell]
+
+- Extend upgrade step to update the structure of all tiles inheriting from the list tile (fixes `#466`_).
+  Fix upgrade step to use a dict instead of a PersistentMapping.
+  [hvelarde]
+
+- Fix to show dates for results in collection tile (fixes `#463`_).
+  [kcleong]
+
+- Allow to choose a custom title and description on items in a carousel tile (closes `#459`_).
+  [rodfersou]
+
+1.0a10 (2014-10-31)
+^^^^^^^^^^^^^^^^^^^
+
+- Allow to set a custom URL on elements for a Carousel (fixes `#377`_).
+  [frapell]
+
+- If an Image content is included, redirect to view and not the image itself
+  [frapell]
+
+- Modifying annotations, while iterating through them, caused their size to be reduced and the loop to end early, leaving annotations in the object.
+  [cguardia]
+
+- Add an option to extend JS configuration to reload tile in custom tiles (outside of collective.cover).
+  [rodfersou]
+
+- Include a behavior to add a couple of fields that enable reloading the current page after a certain amount of time.
+  Typical use case is a news portal that wants to keep the front page updated and increase the number of page views.
+  [hvelarde]
+
 - Fix modification time disappearing from context data and handling missing value (fixes `#449`_).
   [mhora]
 
@@ -546,6 +590,7 @@ There's a frood who really knows where his towel is.
 .. _`#351`: https://github.com/collective/collective.cover/issues/351
 .. _`#371`: https://github.com/collective/collective.cover/issues/371
 .. _`#374`: https://github.com/collective/collective.cover/issues/374
+.. _`#377`: https://github.com/collective/collective.cover/issues/377
 .. _`#381`: https://github.com/collective/collective.cover/issues/381
 .. _`#383`: https://github.com/collective/collective.cover/issues/383
 .. _`#393`: https://github.com/collective/collective.cover/issues/393
@@ -558,5 +603,10 @@ There's a frood who really knows where his towel is.
 .. _`#421`: https://github.com/collective/collective.cover/issues/421
 .. _`#423`: https://github.com/collective/collective.cover/issues/423
 .. _`#426`: https://github.com/collective/collective.cover/issues/426
+.. _`#438`: https://github.com/collective/collective.cover/issues/438
 .. _`#449`: https://github.com/collective/collective.cover/issues/449
+.. _`#459`: https://github.com/collective/collective.cover/issues/459
+.. _`#463`: https://github.com/collective/collective.cover/issues/463
+.. _`#466`: https://github.com/collective/collective.cover/issues/466
+.. _`#476`: https://github.com/collective/collective.cover/issues/476
 .. _`PloneFormGen`: https://pypi.python.org/pypi/Products.PloneFormGen

README.rst

@@ -14,12 +14,7 @@ offer. However, despite offering rich resources to build a cover,
 ``collective.cover`` also provides a very easy mechanism for managing its
 contents, built around a drag-and-drop interface.
 
-``collective.cover`` is based on `Blocks`_ and `Tiles`_, like `Deco`_, the new
-layout composition system for Plone.
-
-.. TODO: explain why we need cover instead of just using Deco itself.
-
-.. TODO: add a comparison between Deco and collective.cover
+``collective.cover`` is based on `Blocks`_ and `Tiles`_, like `Deco`_, the layout composition system proposed for Plone.
 
 .. _`Blocks`: https://github.com/plone/plone.app.blocks
 .. _`Deco`: https://github.com/plone/plone.app.deco
@@ -28,17 +23,19 @@ layout composition system for Plone.
 Demo
 ^^^^
 
-For impatient types, here is a demo installation of collective.cover: http://collective-cover.herokuapp.com.
+For impatient types, there is a demo installation of collective.cover on `Heroku`_.
 It needs about 60 seconds to spin up and it will purge all changes after about an hour of non-usage.
 
+.. _`Heroku`: http://collective-cover.herokuapp.com
+
 Use cases
 ^^^^^^^^^
 
-Suppose you are running The Planet, a news site that has a bunch of editors
+Suppose you are running The Planet, a news portal that has a bunch of editors
 focused on getting news on different topics, like Economy, Health or Sports.
 
 If you are the main publisher of the site, you may want to delegate the
-construction of the cover page of the Economy section to the people working on
+construction of the front page of the Economy section to the people working on
 that content area, but you might not want them messing around the Sports
 section as well.
 
@@ -78,13 +75,17 @@ Mostly Harmless
     :alt: Travis CI badge
     :target: http://travis-ci.org/collective/collective.cover
 
+.. image:: https://badge.waffle.io/collective/collective.cover.png?label=ready&title=Ready
+    :alt: Stories in Ready
+    :target: https://waffle.io/collective/collective.cover
+
 .. image:: https://coveralls.io/repos/collective/collective.cover/badge.png?branch=master
     :alt: Coveralls badge
     :target: https://coveralls.io/r/collective/collective.cover
 
 .. image:: https://pypip.in/d/collective.cover/badge.png
-    :target: https://pypi.python.org/pypi/collective.cover/
     :alt: Downloads
+    :target: https://pypi.python.org/pypi/collective.cover/
 
 Got an idea? Found a bug? Let us know by `opening a support ticket`_.
 
@@ -114,8 +115,7 @@ See the `complete list of bugs on GitHub`_.
 Don't Panic
 -----------
 
-We are currently working on the documentation of the package; this is what we
-have right now (contributions are always welcomed):
+We are currently working on the documentation of the package; this is what we have right now (contributions are always welcomed):
 
 * `Quick Tour video on YouTube`_.
 * `End user documentation`_

buildout.cfg

@@ -41,6 +41,8 @@ eggs = z3c.dependencychecker
 
 [instance]
 zcml += iw.debug
+zope-conf-additional += publisher-profile-file ${buildout:directory}/var/instance/profile.dat
+environment-vars += PROFILE_PUBLISHER 1
 
 [i18ndude]
 recipe = zc.recipe.egg

docs/developer.rst

@@ -240,3 +240,15 @@ WARNING: Switching the grid system will apply to all new and existing
 covers.  If you already made layouts for a 16 column grid and switch to
 e.g. a 12 column grid, you will have to manually update all existing
 covers (their layout is not recalculated automatically).
+
+WARNING 2: Cover support saving layout designs by exporting them to a
+json/python dictionairy which is stored in the Plone registry. Cover also
+inserts a few of these saved preset layouts upon installation, check
+registry.xml in collective.cover source.
+
+You always start a new cover by selecting one of these layout designs on the
+Cover add page. If you switch from the default 16 column deco grid to another
+grid with another maximum cover size, these saved layouts however will probably
+still contain a 16 width column and this can mock up your design in small ways.
+If you do swith grid system, make sure you clear the default cover layouts
+and/or insert your own with the correct max column size.

docs/end-user.rst

@@ -252,6 +252,11 @@ The changes will be applied to your cover immediately.
 Behaviors
 ^^^^^^^^^
 
+To enable behaviors go to 'Site Setup' and select 'Dexterity content types'.
+Look for 'Cover' content type, select it and then select 'Behaviors'.
+
+The following behaviors are included in this package:
+
 Refresh
 +++++++
 

setup.py

@@ -3,7 +3,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.0a10.dev0'
+version = '1.0a11.dev0'
 description = 'A sane, working, editor-friendly way of creating front pages and other composite pages. Working now, for mere mortals.'
 long_description = (
     open('README.rst').read() + '\n' +

src/collective/cover/events.py

@@ -23,7 +23,8 @@ def override_object_annotations(cover, event):
     old_annotations = IAnnotations(event.baseline)
     new_annotations = IAnnotations(event.object)
 
-    for key in old_annotations:
+    old_keys = list(old_annotations.keys())
+    for key in old_keys:
         # First remove all annotations in relation to tiles
         if key.startswith('plone.tiles.'):
             del old_annotations[key]

src/collective/cover/locales/zh_TW/LC_MESSAGES/collective.cover.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: collective.cover\n"
 "POT-Creation-Date: 2014-08-22 20:31+0000\n"
-"PO-Revision-Date: 2014-06-23 10:50+0800\n"
+"PO-Revision-Date: 2014-11-02 13:10+0800\n"
 "Last-Translator: TsungWei Hu <marr.tw@gmail.com>\n"
 "Language-Team: Plone I18N <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgstr ""
 
 #: collective/cover/controlpanel.py:25
 msgid "Available tiles"
-msgstr ""
+msgstr "圖磚選項"
 
 #: tiles/configure.zcml
 msgid "Banner Tile"
@@ -102,7 +102,7 @@ msgstr "輪播磚"
 
 #: collective/cover/controlpanel.py:57
 msgid "Choose a grid system"
-msgstr ""
+msgstr "網格設計的選項。"
 
 #: collective/cover/models/cover.xml
 msgid "Choose one of the predefined layouts"
@@ -153,7 +153,7 @@ msgstr "日期"
 
 #: collective/cover/layout.py:240
 msgid "Deco (16 columns, default)"
-msgstr ""
+msgstr "Deco (預設 16 欄)"
 
 #: collective/cover/tiles/basic.py:27
 #: collective/cover/tiles/collection.py:39
@@ -192,7 +192,7 @@ msgstr "內嵌程式碼"
 
 #: collective/cover/controlpanel.py:47
 msgid "Enter a list of styles to appear in the style pulldown. Format is title|className, one per line."
-msgstr ""
+msgstr "下拉選單裡的風格樣式，格式是 title|className 逐行輸入。"
 
 #: collective/cover/browser/templates/layoutedit.pt:79
 msgid "Export layout"
@@ -228,7 +228,7 @@ msgstr ""
 
 #: collective/cover/controlpanel.py:56
 msgid "Grid System"
-msgstr ""
+msgstr "網格設計"
 
 #: collective/cover/tiles/configuration_widgets/textline.pt:63
 msgid "HTML tag"
@@ -303,7 +303,7 @@ msgstr ""
 
 #: collective/cover/controlpanel.py:35
 msgid "Only objects of these content types will be searched on the content chooser."
-msgstr ""
+msgstr "搜尋內容時可供選擇的型別。"
 
 #: collective/cover/tiles/configuration_widgets/basewidget.pt:39
 #: collective/cover/tiles/configuration_widgets/list.pt:47
@@ -368,11 +368,11 @@ msgstr ""
 
 #: collective/cover/controlpanel.py:34
 msgid "Searchable Content Types"
-msgstr ""
+msgstr "型別選項"
 
 #: collective/cover/controlpanel.py:67
 msgid "Settings for the collective.cover package"
-msgstr ""
+msgstr "collective.cover 模組設定"
 
 #: collective/cover/tiles/list.py:82
 msgid "Show more... link"
@@ -392,7 +392,7 @@ msgstr ""
 
 #: collective/cover/controlpanel.py:46
 msgid "Styles"
-msgstr ""
+msgstr "風格選項"
 
 #: collective/cover/tiles/configuration_widgets/richtext.pt:50
 msgid "Text length"
@@ -420,7 +420,7 @@ msgstr ""
 
 #: collective/cover/controlpanel.py:26
 msgid "This tiles will be available for layout creation."
-msgstr ""
+msgstr "建置佈局時可供選擇的圖磚類型。"
 
 #: collective/cover/tiles/list.py:78
 msgid "Tile Title"

src/collective/cover/profiles.zcml

@@ -111,4 +111,30 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="9"
+      destination="10"
+      profile="collective.cover:default">
+
+    <genericsetup:upgradeStep
+        title="Upgrade carousel tiles"
+        description="Carousel tile now allows to set a custom URL to items. Upgrade existing ones to support this."
+        handler=".upgrades.upgrade_carousel_tiles_custom_url"
+        />
+
+  </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      source="10"
+      destination="11"
+      profile="collective.cover:default">
+
+    <genericsetup:upgradeStep
+        title="Revert PersistentMapping back to dict"
+        description="Initial structure should not be a PersistentMapping, but regular dictionaries."
+        handler=".upgrades.fix_persistentmap_to_dict"
+        />
+
+  </genericsetup:upgradeSteps>
+
 </configure>

src/collective/cover/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>9</version>
+  <version>11</version>
   <dependencies>
     <dependency>profile-collective.js.galleria:default</dependency>
     <dependency>profile-collective.js.jqueryui:default</dependency>