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

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>