-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2017-06-17T12:17:02+02:00 Author: Franz Gerhard Reinisch (fgrcon) <[email protected]> Commit: plone/plone.app.event@63ab986 fixing plone/Products.CMFPlone#2077 Files changed: M CHANGES.rst M plone/app/event/portlets/portlet_events.pt Repository: plone.app.event Branch: refs/heads/master Date: 2017-06-17T23:39:36+02:00 Author: Johannes Raggam (thet) <[email protected]> Commit: plone/plone.app.event@bb43233 Merge pull request #259 from plone/fgrcon-fix-2077 fixing plone/Products.CMFPlone#2077 Files changed: M CHANGES.rst M plone/app/event/portlets/portlet_events.pt
- Loading branch information
Showing
1 changed file
with
69 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,94 @@ | ||
| Repository: plone.app.contenttypes | ||
| Repository: plone.app.event | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-06-16T11:23:06+02:00 | ||
| Date: 2017-06-17T12:17:02+02:00 | ||
| Author: Franz Gerhard Reinisch (fgrcon) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/5f8a24f95144f4cac12ef450e0b24f9fd5595a8d | ||
| Commit: https://github.com/plone/plone.app.event/commit/63ab98654a259c01938d9c4303999f59d394e98c | ||
|
|
||
| further fixes for plip 1734-attribute-renames | ||
| fixing https://github.com/plone/Products.CMFPlone/issues/2077 | ||
|
|
||
| Files changed: | ||
| M plone/app/contenttypes/behaviors/thumb_icon.py | ||
| M CHANGES.rst | ||
| M plone/app/event/portlets/portlet_events.pt | ||
|
|
||
| diff --git a/plone/app/contenttypes/behaviors/thumb_icon.py b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| index 89a4da1e..b63e4e8e 100644 | ||
| --- a/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| +++ b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| @@ -25,7 +25,7 @@ class IThumbIconHandling(model.Schema): | ||
| ) | ||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index e5f7e932..38d991cf 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -16,8 +16,10 @@ New features: | ||
| [fgrcon] | ||
|
|
||
| Bug fixes: | ||
| - | ||
| -- *add item here* | ||
| +- | ||
| +- fixed css-classes for thumb scales ... | ||
| + https://github.com/plone/Products.CMFPlone/issues/2077 | ||
| + [fgrcon] | ||
|
|
||
| thumb_scale_list = schema.TextLine( | ||
| - title=_(u'Override thumb size for list view'), | ||
| + title=_(u'Override thumb scale for list view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| @@ -36,7 +36,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale_table = schema.TextLine( | ||
| - title=_(u'Override thumb size for table view'), | ||
| + title=_(u'Override thumb scale for table view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| @@ -47,7 +47,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale_summary = schema.TextLine( | ||
| - title=_(u'Override thumb size for summary view'), | ||
| + title=_(u'Override thumb scale for summary view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| 3.0.4 (2017-02-12) | ||
| diff --git a/plone/app/event/portlets/portlet_events.pt b/plone/app/event/portlets/portlet_events.pt | ||
| index e6aa5cde..72643942 100644 | ||
| --- a/plone/app/event/portlets/portlet_events.pt | ||
| +++ b/plone/app/event/portlets/portlet_events.pt | ||
| @@ -30,7 +30,7 @@ | ||
| title item_descr" | ||
| tal:define="scale item/context/@@images|nothing;"> | ||
| <span tal:condition="item_hasimage"> | ||
| - <img tal:define="img_tag python:scale.scale('image', scale=thumb_scale).tag(css_class='pull-right image-'+thumb_scale)" | ||
| + <img tal:define="img_tag python:scale.scale('image', scale=thumb_scale).tag(css_class='pull-right thumb-'+thumb_scale)" | ||
| tal:replace="structure img_tag" /> | ||
| </span> | ||
| <span tal:replace="item_title">Some Event</span> | ||
|
|
||
|
|
||
| Repository: plone.app.contenttypes | ||
| Repository: plone.app.event | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-06-17T22:58:10+02:00 | ||
| Date: 2017-06-17T23:39:36+02:00 | ||
| Author: Johannes Raggam (thet) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/5166c9306e8a69ce702d64f0021c7122ec1599ee | ||
| Commit: https://github.com/plone/plone.app.event/commit/bb4323314035aeb060c18af6fb940262590d56fc | ||
|
|
||
| Merge pull request #411 from plone/fgrcon-cleanup_2-1734 | ||
| Merge pull request #259 from plone/fgrcon-fix-2077 | ||
|
|
||
| further fixes for plip 1734-attribute-renames | ||
| fixing https://github.com/plone/Products.CMFPlone/issues/2077 | ||
|
|
||
| Files changed: | ||
| M plone/app/contenttypes/behaviors/thumb_icon.py | ||
| M CHANGES.rst | ||
| M plone/app/event/portlets/portlet_events.pt | ||
|
|
||
| diff --git a/plone/app/contenttypes/behaviors/thumb_icon.py b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| index 89a4da1e..b63e4e8e 100644 | ||
| --- a/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| +++ b/plone/app/contenttypes/behaviors/thumb_icon.py | ||
| @@ -25,7 +25,7 @@ class IThumbIconHandling(model.Schema): | ||
| ) | ||
|
|
||
| thumb_scale_list = schema.TextLine( | ||
| - title=_(u'Override thumb size for list view'), | ||
| + title=_(u'Override thumb scale for list view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| @@ -36,7 +36,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index e5f7e932..38d991cf 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -16,8 +16,10 @@ New features: | ||
| [fgrcon] | ||
|
|
||
| Bug fixes: | ||
| - | ||
| -- *add item here* | ||
| +- | ||
| +- fixed css-classes for thumb scales ... | ||
| + https://github.com/plone/Products.CMFPlone/issues/2077 | ||
| + [fgrcon] | ||
|
|
||
| thumb_scale_table = schema.TextLine( | ||
| - title=_(u'Override thumb size for table view'), | ||
| + title=_(u'Override thumb scale for table view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| @@ -47,7 +47,7 @@ class IThumbIconHandling(model.Schema): | ||
| default=u'') | ||
|
|
||
| thumb_scale_summary = schema.TextLine( | ||
| - title=_(u'Override thumb size for summary view'), | ||
| + title=_(u'Override thumb scale for summary view'), | ||
| description=_( | ||
| u"Enter a valid scale name" | ||
| u" (see 'Image Handling' control panel) to override" | ||
| 3.0.4 (2017-02-12) | ||
| diff --git a/plone/app/event/portlets/portlet_events.pt b/plone/app/event/portlets/portlet_events.pt | ||
| index e6aa5cde..72643942 100644 | ||
| --- a/plone/app/event/portlets/portlet_events.pt | ||
| +++ b/plone/app/event/portlets/portlet_events.pt | ||
| @@ -30,7 +30,7 @@ | ||
| title item_descr" | ||
| tal:define="scale item/context/@@images|nothing;"> | ||
| <span tal:condition="item_hasimage"> | ||
| - <img tal:define="img_tag python:scale.scale('image', scale=thumb_scale).tag(css_class='pull-right image-'+thumb_scale)" | ||
| + <img tal:define="img_tag python:scale.scale('image', scale=thumb_scale).tag(css_class='pull-right thumb-'+thumb_scale)" | ||
| tal:replace="structure img_tag" /> | ||
| </span> | ||
| <span tal:replace="item_title">Some Event</span> | ||
|
|
||
|
|