Skip to content

Filepicker styling #1756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Oct 14, 2016
Merged

Filepicker styling #1756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d093e9
use mimetype icons in filepicker if there is no preview
icewind1991 Oct 14, 2016
6d43942
filepicker styling
icewind1991 Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/css/jquery.ocdialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
background: white;
font-weight: bold;
font-size: 110%;
margin-bottom: 10px;
margin-bottom: 5px;
margin-top: -9px;
}
.oc-dialog-content {
z-index: 1000;
Expand Down
22 changes: 16 additions & 6 deletions core/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,29 +774,39 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }

/* ---- DIALOGS ---- */
#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
#oc-dialog-filepicker-content .dirtree .home {
#oc-dialog-filepicker-content .dirtree {
width:92%;
float: left;
margin-left: 15px;
overflow:hidden;
}
#oc-dialog-filepicker-content .dirtree div:first-child a {
background-image:url('../img/places/home.svg?v=1');
background-repeat:no-repeat;
background-position: left center;
width: 30px;
display: inline-block;
}
#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
#oc-dialog-filepicker-content .filelist {
overflow-y:auto;
height: 300px;
height: 290px;
background-color:white;
width:100%;
}

#oc-dialog-filepicker-content .filelist li:first-child {
border-top: 1px solid #eee;
}
#oc-dialog-filepicker-content .filelist li {
position: relative;
height: 40px;
padding: 5px;
border-bottom: 1px solid #eee;
}
#oc-dialog-filepicker-content .filelist .filename {
position: absolute;
top: 8px;
padding-top: 9px;
max-width: 60%;
overflow: hidden;
white-space: nowrap;
Expand Down
24 changes: 16 additions & 8 deletions core/js/oc-dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ var OCdialogs = {
self.$filePicker.ready(function() {
self.$filelist = self.$filePicker.find('.filelist');
self.$dirTree = self.$filePicker.find('.dirtree');
self.$dirTree.on('click', 'span:not(:last-child)', self, self._handleTreeListSelect);
self.$dirTree.on('click', 'div:not(:last-child)', self, self._handleTreeListSelect.bind(self));
self.$filelist.on('click', 'li', function(event) {
self._handlePickerClick(event, $(this));
});
Expand Down Expand Up @@ -769,10 +769,17 @@ var OCdialogs = {
});
if (entry.type === 'file') {
var urlSpec = {
file: dir + '/' + entry.name
file: dir + '/' + entry.name,
};
$li.find('img').attr('src', OC.MimeType.getIconUrl(entry.mimetype));
var img = new Image();
var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
$li.find('img').attr('src', previewUrl);
img.onload = function() {
if (img.width > 5) {
$li.find('img').attr('src', previewUrl);
}
};
img.src = previewUrl;
}
else {
$li.find('img').attr('src', OC.Util.replaceSVGIcon(entry.icon));
Expand All @@ -792,8 +799,9 @@ var OCdialogs = {
_fillSlug: function() {
this.$dirTree.empty();
var self = this;
var dir;
var path = this.$filePicker.data('path');
var $template = $('<span data-dir="{dir}">{name}</span>');
var $template = $('<div data-dir="{dir}"><a>{name}</a></div>').addClass('crumb');
if(path) {
var paths = path.split('/');
$.each(paths, function(index, dir) {
Expand All @@ -809,17 +817,17 @@ var OCdialogs = {
}
$template.octemplate({
dir: '',
name: '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' // Ugly but works ;)
}, {escapeFunction: null}).addClass('home svg').prependTo(this.$dirTree);
name: '' // Ugly but works ;)
}, {escapeFunction: null}).prependTo(this.$dirTree);
},
/**
* handle selection made in the tree list
*/
_handleTreeListSelect:function(event) {
var self = event.data;
var dir = $(event.target).data('dir');
var dir = $(event.target).parent().data('dir');
self._fillFilePicker(dir);
var getOcDialog = this.closest('.oc-dialog');
var getOcDialog = (event.target).closest('.oc-dialog');
var buttonEnableDisable = $('.primary', getOcDialog);
if (this.$filePicker.data('mimetype') === "http/unix-directory") {
buttonEnableDisable.prop("disabled", false);
Expand Down
2 changes: 1 addition & 1 deletion core/templates/filepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="{dialog_name}" title="{title}">
<span class="dirtree"></span>
<span class="dirtree breadcrumb"></span>
<ul class="filelist">
<li data-entryname="{filename}" data-type="{type}">
<img />
Expand Down