Skip to content

Commit

Permalink
Merge pull request #2078 from plone/fgrcon-fix-2077
Browse files Browse the repository at this point in the history
fix css classes and handling for thumbs
  • Loading branch information
thet authored Jun 17, 2017
2 parents 0c1916c + 4bc1ef3 commit 69c2413
Show file tree
Hide file tree
Showing 19 changed files with 730 additions and 103,287 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ New features:

Bug fixes:

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

- Fix current value in group details edit form.
[Gagaro]

Expand Down
4 changes: 2 additions & 2 deletions Products/CMFPlone/browser/templates/search.pt
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@
<tal:results repeat="item batch">
<li tal:define="hasIcon item/getIcon">
<span class="result-title">
<img class="image-icon"
<img class="thumb-icon"
tal:condition="hasIcon"
tal:replace="structure python: image_scale.tag(item, 'image', scale='icon', css_class='image-icon')">
tal:replace="structure python: image_scale.tag(item, 'image', scale='icon', css_class='thumb-icon')">
<a href="#"
tal:define="item_url item/getURL;
item_type item/PortalType"
Expand Down
4 changes: 2 additions & 2 deletions Products/CMFPlone/profiles/dependencies/registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@
<value key="enabled">True</value>
<value key="jscompilation">++plone++static/plone-compiled.min.js</value>
<value key="csscompilation">++plone++static/plone-compiled.css</value>
<value key="last_compilation">2017-05-23 00:45:00</value>
<value key="last_compilation">2017-06-17 11:02:33</value>
<value key="stub_js_modules">
<element>jquery</element>
</value>
Expand All @@ -1077,7 +1077,7 @@
<value key="expression">python: member is not None</value>
<value key="jscompilation">++plone++static/plone-logged-in-compiled.min.js</value>
<value key="csscompilation">++plone++static/plone-logged-in-compiled.css</value>
<value key="last_compilation">2017-06-14 16:06:00</value>
<value key="last_compilation">2017-06-17 11:03:20</value>
<value key="depends">plone</value>
<value key="stub_js_modules">
<element>backbone</element>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
item_type_class python:'contenttype-' + normalizeString(result.portal_type)">
<a tal:attributes="href result/getURL">
<img tal:condition="python:result.getIcon"
tal:replace="structure python: image_scale.tag(result, 'image', scale='tile', css_class='image-tile')">
tal:replace="structure python: image_scale.tag(result, 'image', scale='tile', css_class='thumb-tile')">
<span tal:content="result/pretty_title_or_id"
tal:attributes="class string:$item_type_class $item_wf_state_class" >
Title</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
item_wf_state_class python:'state-' + normalize(item_wf_state);">
<a tal:attributes="href result/getURL">
<img tal:condition="python:result.getIcon"
tal:replace="structure python: image_scale.tag(result, 'image', scale='tile', css_class='image-tile')">
tal:replace="structure python: image_scale.tag(result, 'image', scale='tile', css_class='thumb-tile')">
<span tal:content="result/pretty_title_or_id"
tal:attributes="class string:$item_class $item_wf_state_class">
Title</span>
Expand Down
2 changes: 1 addition & 1 deletion Products/CMFPlone/static/plone-compiled.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Products/CMFPlone/static/plone-compiled.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit 69c2413

Please sign in to comment.