Merge pull request #101 from plone/fgrcon-fix-2077

Fgrcon fix 2077
plone · Jun 17, 2017 · 9bdd2b2 · 9bdd2b2
2 parents 624fb27 + d4458b0
commit 9bdd2b2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -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]

diff --git a/plone/app/portlets/portlets/navigation_recurse.pt b/plone/app/portlets/portlets/navigation_recurse.pt
@@ -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>

diff --git a/plone/app/portlets/portlets/news.pt b/plone/app/portlets/portlets/news.pt
@@ -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!

diff --git a/plone/app/portlets/portlets/recent.pt b/plone/app/portlets/portlets/recent.pt
@@ -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

diff --git a/plone/app/portlets/portlets/review.pt b/plone/app/portlets/portlets/review.pt
@@ -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