From e39e6a5584e04d998f75e987aef398dd572b8538 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 6 Jun 2014 15:33:33 +0200
Subject: [PATCH] Fixed delete button CSS in ext storage list

---
 apps/files/css/files.css                 | 11 ++++++-----
 apps/files_external/js/mountsfilelist.js |  6 +++---
 apps/files_external/templates/list.php   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 55f3d17ac2b..4dac2b66a59 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -186,7 +186,8 @@ table th#headerSize, table td.filesize {
 table table td.filesize {
 	padding: 0 16px;
 }
-table th#headerDate, table td.date {
+table th#headerDate, table td.date,
+table th.column-last, table td.column-last {
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 	position: relative;
@@ -237,9 +238,9 @@ table td.filename input.filename {
 	cursor: text;
 }
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
-table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0; }
+table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:14px 0; }
 
-.modified {
+.modified, .column-last>span:first-child {
 	position: relative;
 	padding-left: 15px;
 	overflow: hidden;
@@ -247,8 +248,8 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0
 	width: 90%;
 }
 /* ellipsize long modified dates to make room for showing delete button */
-#fileList tr:hover .modified,
-#fileList tr:focus .modified {
+#fileList tr:hover .modified, #fileList tr:hover .column-last>span:first-child,
+#fileList tr:focus .modified, #fileList tr:focus .column-last>span:first-child {
 	width: 75%;
 }
 
diff --git a/apps/files_external/js/mountsfilelist.js b/apps/files_external/js/mountsfilelist.js
index 95b596bca8d..70b5b81e65b 100644
--- a/apps/files_external/js/mountsfilelist.js
+++ b/apps/files_external/js/mountsfilelist.js
@@ -29,14 +29,14 @@
 		_createRow: function(fileData) {
 			// TODO: hook earlier and render the whole row here
 			var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
-			var $scopeColumn = $('<td></td>');
-			var $backendColumn = $('<td></td>');
+			var $scopeColumn = $('<td class="column-scope column-last"><span></span></td>');
+			var $backendColumn = $('<td class="column-backend"></td>');
 			var scopeText = t('files_external', 'Personal');
 			if (fileData.scope === 'system') {
 				scopeText = t('files_external', 'System');
 			}
 			$tr.find('.filesize,.date').remove();
-			$scopeColumn.text(scopeText);
+			$scopeColumn.find('span').text(scopeText);
 			$backendColumn.text(fileData.backend);
 			$tr.find('td.filename').after($scopeColumn).after($backendColumn);
 			$tr.find('td.filename input:checkbox').remove();
diff --git a/apps/files_external/templates/list.php b/apps/files_external/templates/list.php
index 900a17be717..4e06bc7024c 100644
--- a/apps/files_external/templates/list.php
+++ b/apps/files_external/templates/list.php
@@ -19,7 +19,7 @@
 			<th id="headerBackend" class="hidden column-backend">
 				<a class="backend sort columntitle" data-sort="backend"><span><?php p($l->t('Storage type')); ?></span><span class="sort-indicator"></span></a>
 			</th>
-			<th id="headerScope" class="hidden column-size">
+			<th id="headerScope" class="hidden column-scope column-last">
 				<a class="scope sort columntitle" data-sort="scope"><span><?php p($l->t('Scope')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
-- 
2.39.5