-
-
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-17T11:35:45+02:00 Author: Franz Gerhard Reinisch (fgrcon) <[email protected]> Commit: plone/plone.app.layout@80274e7 fixing plone/Products.CMFPlone#2077 Files changed: M CHANGES.rst M plone/app/layout/viewlets/document_relateditems.pt Repository: plone.app.layout Branch: refs/heads/master Date: 2017-06-17T23:39:47+02:00 Author: Johannes Raggam (thet) <[email protected]> Commit: plone/plone.app.layout@6acbcaa Merge pull request #125 from plone/fgrcon-fix-2077 fixing plone/Products.CMFPlone#2077 Files changed: M CHANGES.rst M plone/app/layout/viewlets/document_relateditems.pt
- Loading branch information
Showing
1 changed file
with
45 additions
and
75 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,120 +1,90 @@ | ||
| Repository: mockup | ||
| Repository: plone.app.layout | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-06-17T11:26:04+02:00 | ||
| Date: 2017-06-17T11:35:45+02:00 | ||
| Author: Franz Gerhard Reinisch (fgrcon) <[email protected]> | ||
| Commit: https://github.com/plone/mockup/commit/1922b8c43afc2e49894543c5d3af104eb4e5e125 | ||
| Commit: https://github.com/plone/plone.app.layout/commit/80274e75de4c438b25993690582bc510b731ff5a | ||
|
|
||
| fixing https://github.com/plone/Products.CMFPlone/issues/2077 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M mockup/patterns/structure/templates/tablerow.xml | ||
| M mockup/tests/pattern-structure-test.js | ||
| M plone/app/layout/viewlets/document_relateditems.pt | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 9cb139ae..da9837d7 100644 | ||
| index dde2e5a..b0f3557 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -50,6 +50,11 @@ New features: | ||
| @@ -20,6 +20,10 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| +- fixed css-classes for thumb scales ... | ||
| + https://github.com/plone/Products.CMFPlone/issues/2077 | ||
| + [fgrcon] | ||
| + | ||
| + | ||
| - modal: Fixed duplicate window.confirm on form unload. | ||
| Fixes `issue 777 <https://github.com/plone/mockup/issues/777>`_. | ||
| [seanupton] | ||
| diff --git a/mockup/patterns/structure/templates/tablerow.xml b/mockup/patterns/structure/templates/tablerow.xml | ||
| index 82215a26..cffb48d5 100644 | ||
| --- a/mockup/patterns/structure/templates/tablerow.xml | ||
| +++ b/mockup/patterns/structure/templates/tablerow.xml | ||
| @@ -28,7 +28,7 @@ | ||
| <% } %> | ||
| </div> | ||
| <% if(attributes["getIcon"] && thumb_scale) { %> | ||
| - <img class="image-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>"> | ||
| + <img class="thumb-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>"> | ||
| <% } %> | ||
| </td> | ||
|
|
||
| diff --git a/mockup/tests/pattern-structure-test.js b/mockup/tests/pattern-structure-test.js | ||
| index e018c652..dcf2b148 100644 | ||
| --- a/mockup/tests/pattern-structure-test.js | ||
| +++ b/mockup/tests/pattern-structure-test.js | ||
| @@ -628,7 +628,7 @@ define([ | ||
| var el = row.render().el; | ||
|
|
||
| expect($('.title img', el).length).to.equal(1); | ||
| - expect($('.title img', el).attr('class')).to.have.string('image-tile'); | ||
| + expect($('.title img', el).attr('class')).to.have.string('thumb-tile'); | ||
| }); | ||
|
|
||
| it('should display no icon for contents without images', function() { | ||
| - Deprecating getIcon() in @@plone_layout | ||
| see https://github.com/plone/Products.CMFPlone/issues/1734 | ||
| [fgrcon] | ||
| diff --git a/plone/app/layout/viewlets/document_relateditems.pt b/plone/app/layout/viewlets/document_relateditems.pt | ||
| index 2e5dc5f..f5ed395 100644 | ||
| --- a/plone/app/layout/viewlets/document_relateditems.pt | ||
| +++ b/plone/app/layout/viewlets/document_relateditems.pt | ||
| @@ -22,7 +22,7 @@ | ||
| item_has_image python:item.getIcon" | ||
| tal:attributes="title item_type"> | ||
| <a tal:attributes="href item_url"> | ||
| - <img class="image-icon" | ||
| + <img class="thumb-icon" | ||
| tal:define="getIcon python:item.getURL() +'/@@images/image/icon'" | ||
| tal:condition="item_has_image" | ||
| tal:attributes="src string:$getIcon"> | ||
|
|
||
|
|
||
| Repository: mockup | ||
| Repository: plone.app.layout | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-06-17T23:39:50+02:00 | ||
| Date: 2017-06-17T23:39:47+02:00 | ||
| Author: Johannes Raggam (thet) <[email protected]> | ||
| Commit: https://github.com/plone/mockup/commit/3c14abc439af6031ee01f084be4d111df79d1e41 | ||
| Commit: https://github.com/plone/plone.app.layout/commit/6acbcaa9387dffde98d8aa90c64d8c2400f734e0 | ||
|
|
||
| Merge pull request #779 from plone/fgrcon-fix-2077 | ||
| Merge pull request #125 from plone/fgrcon-fix-2077 | ||
|
|
||
| fixing https://github.com/plone/Products.CMFPlone/issues/2077 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M mockup/patterns/structure/templates/tablerow.xml | ||
| M mockup/tests/pattern-structure-test.js | ||
| M plone/app/layout/viewlets/document_relateditems.pt | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 9cb139ae..da9837d7 100644 | ||
| index 4623a14..9f0156e 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -50,6 +50,11 @@ New features: | ||
| @@ -32,6 +32,10 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| +- fixed css-classes for thumb scales ... | ||
| + https://github.com/plone/Products.CMFPlone/issues/2077 | ||
| + [fgrcon] | ||
| + | ||
| + | ||
| - modal: Fixed duplicate window.confirm on form unload. | ||
| Fixes `issue 777 <https://github.com/plone/mockup/issues/777>`_. | ||
| [seanupton] | ||
| diff --git a/mockup/patterns/structure/templates/tablerow.xml b/mockup/patterns/structure/templates/tablerow.xml | ||
| index 82215a26..cffb48d5 100644 | ||
| --- a/mockup/patterns/structure/templates/tablerow.xml | ||
| +++ b/mockup/patterns/structure/templates/tablerow.xml | ||
| @@ -28,7 +28,7 @@ | ||
| <% } %> | ||
| </div> | ||
| <% if(attributes["getIcon"] && thumb_scale) { %> | ||
| - <img class="image-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>"> | ||
| + <img class="thumb-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>"> | ||
| <% } %> | ||
| </td> | ||
|
|
||
| diff --git a/mockup/tests/pattern-structure-test.js b/mockup/tests/pattern-structure-test.js | ||
| index e018c652..dcf2b148 100644 | ||
| --- a/mockup/tests/pattern-structure-test.js | ||
| +++ b/mockup/tests/pattern-structure-test.js | ||
| @@ -628,7 +628,7 @@ define([ | ||
| var el = row.render().el; | ||
|
|
||
| expect($('.title img', el).length).to.equal(1); | ||
| - expect($('.title img', el).attr('class')).to.have.string('image-tile'); | ||
| + expect($('.title img', el).attr('class')).to.have.string('thumb-tile'); | ||
| }); | ||
|
|
||
| it('should display no icon for contents without images', function() { | ||
| - Deprecating getIcon() in @@plone_layout | ||
| see https://github.com/plone/Products.CMFPlone/issues/1734 | ||
| [fgrcon] | ||
| diff --git a/plone/app/layout/viewlets/document_relateditems.pt b/plone/app/layout/viewlets/document_relateditems.pt | ||
| index 2e5dc5f..f5ed395 100644 | ||
| --- a/plone/app/layout/viewlets/document_relateditems.pt | ||
| +++ b/plone/app/layout/viewlets/document_relateditems.pt | ||
| @@ -22,7 +22,7 @@ | ||
| item_has_image python:item.getIcon" | ||
| tal:attributes="title item_type"> | ||
| <a tal:attributes="href item_url"> | ||
| - <img class="image-icon" | ||
| + <img class="thumb-icon" | ||
| tal:define="getIcon python:item.getURL() +'/@@images/image/icon'" | ||
| tal:condition="item_has_image" | ||
| tal:attributes="src string:$getIcon"> | ||
|
|
||
|
|