Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename

Conflicts:
	apps/files/js/filelist.js

diff --cc apps/files/js/filelist.js
index 694ddb0c803b956660a67b6c54bb0d4f1bb26b6c,39b27ec9f3a78e49a487bdbb1627668eefa1ae08..78eaa9761a06f9f221ed64bf4be7cfab216740c4
--- 1/apps/files/js/filelist.js
--- 2/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@@ -252,11 -251,36 +252,37 @@@ var FileList=
                $('.creatable').toggleClass('hidden', !isCreatable);
                $('.notCreatable').toggleClass('hidden', isCreatable);
        },
-       remove:function(name) {
-               $('tr[data-file="'+name+'"]').find('td.filename').draggable('destroy');
-               $('tr[data-file="'+name+'"]').remove();
++
+       /**
+        * Shows/hides action buttons
+        *
+        * @param show true for enabling, false for disabling
+        */
+       showActions: function(show){
+               $('.actions,#file_action_panel').toggleClass('hidden', !show);
+               if (show){
+                       // make sure to display according to permissions
+                       var permissions =  $('#permissions').val();
+                       var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+                       $('.creatable').toggleClass('hidden', !isCreatable);
+                       $('.notCreatable').toggleClass('hidden', isCreatable);
+               }
+       },
+       /**
+        * Enables/disables viewer mode.
+        * In viewer mode, apps can embed themselves under the controls bar.
+        * In viewer mode, the actions of the file list will be hidden.
+        * @param show true for enabling, false for disabling
+        */
+       setViewerMode: function(show){
+               this.showActions(!show);
+               $('#filestable').toggleClass('hidden', show);
+       },
+       remove:function(name){
+               $('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
+               $('tr').filterAttr('data-file',name).remove();
                FileList.updateFileSummary();
 -              if($('tr[data-file]').length==0){
 +              if ( ! $('tr[data-file]').exists() ) {
                        $('#emptycontent').removeClass('hidden');
                }
        },