From 81266c0eba01ddd82ab3a630d0f64c0edca58866 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 16 Mar 2020 12:45:47 +0100
Subject: [PATCH] Remove ro_image from template as it will be taken care of by
 css class anyway

---
 filemanager/js/app.js                   | 36 ++++++++++++-------------
 filemanager/js/app.ts                   |  8 +-----
 filemanager/templates/default/index.xet | 10 +++----
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 877b536e53..8bd527d0f9 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -513,7 +513,7 @@ var filemanagerAPP = /** @class */ (function (_super) {
      * @param _data
      */
     filemanagerAPP.prototype._do_action_callback = function (_data) {
-		window.egw_refresh(_data.msg, filemanagerAPP.appname);
+        window.egw_refresh(_data.msg, filemanagerAPP.appname);
     };
     /**
      * Force download of a file by appending '?download' to it's download url
@@ -724,8 +724,8 @@ var filemanagerAPP = /** @class */ (function (_super) {
                 (dir && dir.data && dir.data.class && dir.data.class.indexOf('noEdit') === -1 || !dir)
         });
         // Last 10 folders
-		var previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
-		var action_index = 0;
+        var previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
+        var action_index = 0;
         for (var i = 0; i < 10; i++) {
             var path = i < previous_dsts.length ? previous_dsts[i] : '';
             actions.push({
@@ -806,10 +806,10 @@ var filemanagerAPP = /** @class */ (function (_super) {
             }
         }
         // Remember the target for next time
-		var previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
+        var previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
         previous_dsts.unshift(dst);
-		previous_dsts = Array.from(new Set(previous_dsts)).slice(0, 9);
-		egw.set_preference(filemanagerAPP.appname, 'drop_history', previous_dsts);
+        previous_dsts = Array.from(new Set(previous_dsts)).slice(0, 9);
+        egw.set_preference(filemanagerAPP.appname, 'drop_history', previous_dsts);
         // Actual action id will be something like file_drop_{move|copy|link}[_other_id],
         // but we need to send move, copy or link
         var action_id = _action.id.replace("file_drop_", '').split('_', 1)[0];
@@ -976,7 +976,7 @@ var filemanagerAPP = /** @class */ (function (_super) {
      */
     filemanagerAPP.prototype._share_link_callback = function (_data) {
         if (_data.msg || _data.share_link)
-			window.egw_refresh(_data.msg, filemanagerAPP.appname);
+            window.egw_refresh(_data.msg, filemanagerAPP.appname);
         console.log("_data", _data);
         var app = this;
         var copy_link_to_clipboard = function (evt) {
@@ -1091,17 +1091,17 @@ var filemanagerAPP = /** @class */ (function (_super) {
      * @param {object} _selected either widget or selected row
      *
      * @return {boolean} returns true
-	 */
-	filemanagerAPP.prototype.create_new = function (_action, _selected) {
-		var fe = egw.link_get_registry('filemanager-editor');
-		if (fe && fe["edit"]) {
-			egw.open_link(egw.link('/index.php', {
-				menuaction: fe["edit"].menuaction
-			}), '', fe["popup_edit"]);
-		}
-		return true;
-	};
-	filemanagerAPP.appname = 'filemanager';
+     */
+    filemanagerAPP.prototype.create_new = function (_action, _selected) {
+        var fe = egw.link_get_registry('filemanager-editor');
+        if (fe && fe["edit"]) {
+            egw.open_link(egw.link('/index.php', {
+                menuaction: fe["edit"].menuaction
+            }), '', fe["popup_edit"]);
+        }
+        return true;
+    };
+    filemanagerAPP.appname = 'filemanager';
     return filemanagerAPP;
 }(egw_app_1.EgwApp));
 exports.filemanagerAPP = filemanagerAPP;
diff --git a/filemanager/js/app.ts b/filemanager/js/app.ts
index 1af1a2dc23..cfca3c49ae 100644
--- a/filemanager/js/app.ts
+++ b/filemanager/js/app.ts
@@ -364,13 +364,7 @@ export class filemanagerAPP extends EgwApp
 			if(_data.uploaded[file].confirm && !_data.uploaded[file].confirmed)
 			{
 				let buttons = [
-					{
-						text: this.egw.lang("Yes"),
-						id: "overwrite",
-						class: "ui-priority-primary",
-						"default": true,
-						image: 'check'
-					},
+					{text: this.egw.lang("Yes"), id: "overwrite",	class: "ui-priority-primary", "default": true, image: 'check'},
 					{text: this.egw.lang("Rename"), id: "rename", image: 'edit'},
 					{text: this.egw.lang("Cancel"), id: "cancel"}
 				];
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index 2251cb6dc9..ec0e7bd764 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -56,11 +56,11 @@
 	<template id="filemanager.index.header_right" template="" lang="" group="0" version="1.9.003">
 		<dropdown_button id="new" onchange="app.filemanager.create_new" label="New" onclick="app.filemanager.create_new"/>
 		<buttononly statustext="Rename, change permissions or ownership" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" background_image="true"/>
-		<buttononly statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" ro_image="createdir_disabled" background_image="true"/>
-		<buttononly statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" ro_image="link_disabled" background_image="true"/>
-		<!--buttononly statustext="Paste" id="button[paste]" onclick="app.filemanager.paste('paste');" image="editpaste" ro_image="editpaste_disabled" background_image="true"/>
-		<buttononly statustext="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" image="linkpaste" ro_image="linkpaste_disabled" background_image="true"/>
-		<buttononly statustext="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" image="mailpaste" ro_image="mailpaste_disabled" background_image="true"/-->
+		<buttononly statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" background_image="true"/>
+		<buttononly statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" background_image="true"/>
+		<!--buttononly statustext="Paste" id="button[paste]" onclick="app.filemanager.paste('paste');" image="editpaste" background_image="true"/>
+		<buttononly statustext="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" image="linkpaste" background_image="true"/>
+		<buttononly statustext="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" image="mailpaste" background_image="true"/-->
 		<buttononly statustext="File a file" onclick="app.filemanager.fileafile" image="upload" background_image="true"/>
 	</template>
 	<template id="filemanager.index" template="" lang="" group="0" version="1.9.003">