From 12829cdb9cd29a8e2218b2745ff73bcfdf8b4c10 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 31 Jul 2014 16:56:19 +0200 Subject: [PATCH 1/3] fix long filename display in filepicker --- core/css/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index 5c1b46e0c07..0321614ce7b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -767,6 +767,10 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .filelist .filename { position: absolute; top: 8px; + max-width: 60%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } #oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; From b9468825eb60a8dc7f4ef0f3045a2571fa7475a1 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 31 Jul 2014 16:57:44 +0200 Subject: [PATCH 2/3] fix date display in filepicker --- core/css/styles.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 0321614ce7b..6c4c9181be5 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -777,8 +777,9 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin } #oc-dialog-filepicker-content .filelist .date { float: right; - margin-right: 1em; - margin-top: 8px; + margin-right: 10px; + margin-top: 0; + padding-top: 9px; } #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} From 79305a0476a42cc0068eb77320553f2d26dada28 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 31 Jul 2014 17:35:32 +0200 Subject: [PATCH 3/3] also fix filepicker for smaller screen sizes --- core/css/mobile.css | 9 +++++++++ core/js/oc-dialogs.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/css/mobile.css b/core/css/mobile.css index 21090d08cb7..0310b0228e2 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -152,6 +152,15 @@ table.multiselect thead { } +/* do not show dates in filepicker */ +#oc-dialog-filepicker-content .filelist .date { + display: none; +} +#oc-dialog-filepicker-content .filelist .filename { + max-width: 80%; +} + + /* fix controls bar jumping when navigation is slid out */ .snapjs-left #app-navigation-toggle, .snapjs-left #controls { diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 9920cc58e23..9b767930c10 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -206,7 +206,7 @@ var OCdialogs = { self.$filePicker.ocdialog({ closeOnEscape: true, - width: (4/9)*$(document).width(), + width: (4/5)*$(document).width(), height: 420, modal: modal, buttons: buttonlist,