From c059bdecbbde290c6d8bf22aa939f93257569e7e Mon Sep 17 00:00:00 2001 From: thet Date: Sat, 17 Jun 2017 23:39:47 +0200 Subject: [PATCH] [fc] Repository: plone.app.layout Branch: refs/heads/master Date: 2017-06-17T11:35:45+02:00 Author: Franz Gerhard Reinisch (fgrcon) 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 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) Commit: https://github.com/plone/plone.app.layout/commit/6acbcaa9387dffde98d8aa90c64d8c2400f734e0 Merge pull request #125 from plone/fgrcon-fix-2077 fixing https://github.com/plone/Products.CMFPlone/issues/2077 Files changed: M CHANGES.rst M plone/app/layout/viewlets/document_relateditems.pt --- last_commit.txt | 120 ++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 75 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 515ee3b427..bbc047d46d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,23 +1,22 @@ -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) -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: @@ -25,60 +24,45 @@ index 9cb139ae..da9837d7 100644 + https://github.com/plone/Products.CMFPlone/issues/2077 + [fgrcon] + -+ - - modal: Fixed duplicate window.confirm on form unload. - Fixes `issue 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 @@ - <% } %> - - <% if(attributes["getIcon"] && thumb_scale) { %> -- -+ - <% } %> - - -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"> + +- -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) -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: @@ -86,35 +70,21 @@ index 9cb139ae..da9837d7 100644 + https://github.com/plone/Products.CMFPlone/issues/2077 + [fgrcon] + -+ - - modal: Fixed duplicate window.confirm on form unload. - Fixes `issue 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 @@ - <% } %> - - <% if(attributes["getIcon"] && thumb_scale) { %> -- -+ - <% } %> - - -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"> + +-