Moved Remove button from list of subcollections in collection on the listing page to the collection page to be consistent with datasets.

Author: lmarini

app/views/collections/listchildcollection.scala.html

@@ -53,16 +53,6 @@ <h3><a href="@(routes.Collections.collection(collection.id))">@Html(collection.n
                                             <span class='glyphicon glyphicon-star-empty'></span> Unfollow</a>
                                 </div>
                             }
-                            <!-- If user can delete, the button is enabled, otherwise the button is present but disabled to provide consistent UE. -->
-                            @if( user.get.id.equals(collection.author.id) || Permission.checkPermission(Permission.RemoveResourceFromCollection, ResourceRef(ResourceRef.collection, collection.id))){
-                                <button onclick="confirmRemoveResourceFromResource('collection','collection','@(parent.id)','collection','@(collection.id)','@(collection.name)',true,'@(redirect)')"
-                                class="btn btn-link" title="Remove the child collection from the collection @parent.name">
-                                    <span class="glyphicon glyphicon-remove"></span> Remove</button>
-                            } else {
-                                <div class="inline" title="No permission to delete the child collection">
-                                    <button class="btn btn-link btn-sm disabled"><span class="glyphicon glyphicon-remove"></span> Remove</button>
-                                </div>
-                            }
                         }
                     </div>
                 </div>

app/views/collections/parentAllocation.scala.html

@@ -26,6 +26,16 @@ <h4>Parent collections</h4>
                     } else {
                         @p.childCollectionsCount collections
                     }
+                    <!-- If the user can edit the collection, the elements are enabled, otherwise they are present but disabled to provide consistent UE. -->
+                        @if(Permission.checkPermission(Permission.RemoveResourceFromCollection, ResourceRef(ResourceRef.collection, currentCollection.id))){
+                            | <button onclick="confirmRemoveResourceFromResource('collection','collection','@(p.id)','collection','@(currentCollection.id)','@(currentCollection.name)',true,'@(routes.Collections.collection(currentCollection.id))')"
+                            class="btn btn-link btn-xs" title="Remove the child collection from the collection @p.name">
+                                <span class="glyphicon glyphicon-remove"></span> Remove</button>
+                        } else {
+                            | <div class="inline" title="No permission to delete the child collection">
+                                <button class="btn btn-link btn-xs disabled"><span class="glyphicon glyphicon-remove"></span> Remove</button>
+                            </div>
+                        }
                     </div>
                 </div>
             </div>