From c2b40e0961e049b75efbbde186a365e816f59d98 Mon Sep 17 00:00:00 2001 From: thet Date: Sat, 17 Jun 2017 23:39:50 +0200 Subject: [PATCH] [fc] Repository: mockup Branch: refs/heads/master Date: 2017-06-17T11:26:04+02:00 Author: Franz Gerhard Reinisch (fgrcon) Commit: https://github.com/plone/mockup/commit/1922b8c43afc2e49894543c5d3af104eb4e5e125 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 Repository: mockup Branch: refs/heads/master Date: 2017-06-17T23:39:50+02:00 Author: Johannes Raggam (thet) Commit: https://github.com/plone/mockup/commit/3c14abc439af6031ee01f084be4d111df79d1e41 Merge pull request #779 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 --- last_commit.txt | 206 ++++++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 130 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index d7ab2c509d..515ee3b427 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,25 +1,23 @@ -Repository: plone.app.portlets +Repository: mockup Branch: refs/heads/master -Date: 2017-06-17T11:59:36+02:00 +Date: 2017-06-17T11:26:04+02:00 Author: Franz Gerhard Reinisch (fgrcon) -Commit: https://github.com/plone/plone.app.portlets/commit/d4458b057b70d1913e5a494e8bc227c270f95eae +Commit: https://github.com/plone/mockup/commit/1922b8c43afc2e49894543c5d3af104eb4e5e125 fixing https://github.com/plone/Products.CMFPlone/issues/2077 Files changed: M CHANGES.rst -M plone/app/portlets/portlets/navigation_recurse.pt -M plone/app/portlets/portlets/news.pt -M plone/app/portlets/portlets/recent.pt -M plone/app/portlets/portlets/review.pt +M mockup/patterns/structure/templates/tablerow.xml +M mockup/tests/pattern-structure-test.js diff --git a/CHANGES.rst b/CHANGES.rst -index 69a3438..f634f0e 100644 +index 9cb139ae..da9837d7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst -@@ -40,6 +40,10 @@ New features: +@@ -50,6 +50,11 @@ New features: Bug fixes: @@ -27,87 +25,60 @@ index 69a3438..f634f0e 100644 + 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 -index f022048..4bef550 100644 ---- 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);"> - - -+ tal:replace="structure python:image_scale.tag(item, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)"> - - Selected Item Title - -diff --git a/plone/app/portlets/portlets/news.pt b/plone/app/portlets/portlets/news.pt -index de7c05e..33fa54c 100644 ---- 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"> - -+ tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)" /> - - - Plone 5.1 announced! -diff --git a/plone/app/portlets/portlets/recent.pt b/plone/app/portlets/portlets/recent.pt -index c9492fd..6a5fe80 100644 ---- a/plone/app/portlets/portlets/recent.pt -+++ b/plone/app/portlets/portlets/recent.pt -@@ -41,7 +41,7 @@ - src python:view.getMimeTypeIcon(obj);"> - - -+ tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)" /> - - - Title -diff --git a/plone/app/portlets/portlets/review.pt b/plone/app/portlets/portlets/review.pt -index 8e7f1f9..e150d5f 100644 ---- 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"> - - -+ tal:replace="structure python:image.scale('image', scale=thumb_scale).tag(css_class='pull-right thumb-'+thumb_scale)"/> - - - Title ++ + - 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() { -Repository: plone.app.portlets +Repository: mockup Branch: refs/heads/master -Date: 2017-06-17T23:39:42+02:00 +Date: 2017-06-17T23:39:50+02:00 Author: Johannes Raggam (thet) -Commit: https://github.com/plone/plone.app.portlets/commit/9bdd2b23a8427731d491bcf1306f78459393df62 +Commit: https://github.com/plone/mockup/commit/3c14abc439af6031ee01f084be4d111df79d1e41 -Merge pull request #101 from plone/fgrcon-fix-2077 +Merge pull request #779 from plone/fgrcon-fix-2077 -Fgrcon fix 2077 +fixing https://github.com/plone/Products.CMFPlone/issues/2077 Files changed: M CHANGES.rst -M plone/app/portlets/portlets/navigation_recurse.pt -M plone/app/portlets/portlets/news.pt -M plone/app/portlets/portlets/recent.pt -M plone/app/portlets/portlets/review.pt +M mockup/patterns/structure/templates/tablerow.xml +M mockup/tests/pattern-structure-test.js diff --git a/CHANGES.rst b/CHANGES.rst -index 69a3438..f634f0e 100644 +index 9cb139ae..da9837d7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst -@@ -40,6 +40,10 @@ New features: +@@ -50,6 +50,11 @@ New features: Bug fixes: @@ -115,60 +86,35 @@ index 69a3438..f634f0e 100644 + 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 -index f022048..4bef550 100644 ---- 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);"> - - -+ tal:replace="structure python:image_scale.tag(item, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)"> - - Selected Item Title - -diff --git a/plone/app/portlets/portlets/news.pt b/plone/app/portlets/portlets/news.pt -index de7c05e..33fa54c 100644 ---- 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"> - -+ tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)" /> - - - Plone 5.1 announced! -diff --git a/plone/app/portlets/portlets/recent.pt b/plone/app/portlets/portlets/recent.pt -index c9492fd..6a5fe80 100644 ---- a/plone/app/portlets/portlets/recent.pt -+++ b/plone/app/portlets/portlets/recent.pt -@@ -41,7 +41,7 @@ - src python:view.getMimeTypeIcon(obj);"> - - -+ tal:replace="structure python:image_scale.tag(obj, 'image', scale=thumb_scale, css_class='pull-right thumb-'+thumb_scale)" /> - - - Title -diff --git a/plone/app/portlets/portlets/review.pt b/plone/app/portlets/portlets/review.pt -index 8e7f1f9..e150d5f 100644 ---- 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"> - - -+ tal:replace="structure python:image.scale('image', scale=thumb_scale).tag(css_class='pull-right thumb-'+thumb_scale)"/> - - - Title ++ + - 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() {