Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fgrcon fix 2077 #101

Merged
merged 2 commits into from
Jun 17, 2017
Merged

Fgrcon fix 2077 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4e921
further fixes for plip 1734-attribute-renames
fgrcon Jun 16, 2017
d4458b0
fixing https://github.com/plone/Products.CMFPlone/issues/2077
fgrcon Jun 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ New features:

Bug fixes:

- fixed css-classes for thumb scales ...
https://github.com/plone/Products.CMFPlone/issues/2077
[fgrcon]

- Fix regression where navigation portlet ignored unlimited setting for
*Navigation tree depth* setting
[datakurre]
Expand Down
2 changes: 1 addition & 1 deletion plone/app/portlets/portlets/navigation_recurse.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
src python:view.getMimeTypeIcon(node);">

<img tal:condition="python:has_thumb and thumb_scale"
tal:replace="structure python:image_scale.tag(item, 'image', scale=thumb_scale, css_class='pull-right image-'+thumb_scale)">
tal:replace="structure python:image_scale.tag(item, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)">

<span tal:replace="node/Title">Selected Item Title</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion plone/app/portlets/portlets/news.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
tal:attributes="href obj/getURL;
title obj/Description">
<img tal:condition="python:obj.getIcon and thumb_scale"
tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right image-'+thumb_scale)" />
tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)" />

<span tal:replace="obj/pretty_title_or_id">
Plone 5.1 announced!
Expand Down
2 changes: 1 addition & 1 deletion plone/app/portlets/portlets/recent.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
src python:view.getMimeTypeIcon(obj);">

<img tal:condition="python:obj.getIcon and thumb_scale and not supress_thumb and image_scale"
tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right image-'+thumb_scale)" />
tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)" />

<span tal:content="obj/pretty_title_or_id">
Title
Expand Down
2 changes: 1 addition & 1 deletion plone/app/portlets/portlets/recent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class IRecentPortlet(IPortletDataProvider):
default=False)

thumb_scale = schema.TextLine(
title=_(u"Override thumb size"),
title=_(u"Override thumb scale"),
description=_(
u"Enter a valid scale name"
u" (see 'Image Handling' control panel) to override"
Expand Down
2 changes: 1 addition & 1 deletion plone/app/portlets/portlets/review.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
class string:$review_state_class tile $item_class">

<img tal:condition="python:hasImage and thumb_scale!='none' and imagescale is not None"
tal:replace="structure python:image.scale('image', scale=thumb_scale).tag(css_class='pull-right image-'+thumb_scale)"/>
tal:replace="structure python:image.scale('image', scale=thumb_scale).tag(css_class='pull-right thumb-'+thumb_scale)"/>

<span tal:replace="obj/title">
Title
Expand Down
2 changes: 1 addition & 1 deletion plone/app/portlets/portlets/review.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class IReviewPortlet(IPortletDataProvider):
default=False)

thumb_scale = schema.TextLine(
title=_(u"Override thumb size"),
title=_(u"Override thumb scale"),
description=_(
u"Enter a valid scale name"
u" (see 'Image Handling' control panel) to override"
Expand Down