Fixed delete button CSS in ext storage list

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 55f3d17ac2bb8d63cc315335a3889f638335d573..4dac2b66a59e65a7e032bd459c3761026d2e1380 100644 (file)
--- 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 95b596bca8d6a265fa2b839a2ab68e418d20d5f1..70b5b81e65b00627a56af21ae9ac365a7bae2076 100644 (file)
--- 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 900a17be71790076c58618ce68c6f15ef2b28adc..4e06bc7024c36aeb11d7b951724a1b405a21a206 100644 (file)
--- 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>