Merge branch 'master' into dist/envole/6/master

2020-05-15 16:03:17 +02:00 · 2020-05-15 16:03:17 +02:00 · 2d2d8f0938
commit 2d2d8f0938
parent 3f10684027 90cd03196d
1 changed files with 2 additions and 0 deletions
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig
@ -97,6 +97,7 @@
                        </div>
                    {% endfor %}

+                    {% if canadd %}
                    <div class="grid-item {{ stylegrid }}">
                         <div onClick="addBookmark({{ entity.id }},false)" class="grid-item-content" style="background-color: #{{color['main']}};cursor:pointer;">
                            <div class="item-link clearfix">
@ -109,6 +110,7 @@
                            </div>
                         </div>
                    </div>
+                    {% endif %}
                </div>
            </div>
        </div>