Styling fixes + hightlight in files sidebar
Sidebar scrolls with contents Highlight currently show file
This commit is contained in:
parent
ff614a7dbd
commit
ad90ba27cd
|
@ -8,9 +8,9 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 350px;
|
width: 350px;
|
||||||
top: 0;
|
top: 0;
|
||||||
bottom: 0;
|
|
||||||
right: 0;
|
right: 0;
|
||||||
left: auto;
|
left: auto;
|
||||||
|
min-height: 100%;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
-webkit-transition: margin-right 300ms;
|
-webkit-transition: margin-right 300ms;
|
||||||
-moz-transition: margin-right 300ms;
|
-moz-transition: margin-right 300ms;
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.app-files .detailsView .detailFileInfoContainer {
|
.app-files .detailsView .detailFileInfoContainer {
|
||||||
min-height: 200px;
|
min-height: 80px;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -143,6 +143,7 @@
|
||||||
#filestable tbody tr:active {
|
#filestable tbody tr:active {
|
||||||
background-color: rgb(240,240,240);
|
background-color: rgb(240,240,240);
|
||||||
}
|
}
|
||||||
|
#filestable tbody tr.highlighted,
|
||||||
#filestable tbody tr.selected {
|
#filestable tbody tr.selected {
|
||||||
background-color: rgb(230,230,230);
|
background-color: rgb(230,230,230);
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,6 +153,7 @@
|
||||||
setFileInfo: function(fileInfo) {
|
setFileInfo: function(fileInfo) {
|
||||||
this._fileInfo = fileInfo;
|
this._fileInfo = fileInfo;
|
||||||
|
|
||||||
|
// FIXME: this will render panels twice
|
||||||
this.render();
|
this.render();
|
||||||
|
|
||||||
// notify all panels
|
// notify all panels
|
||||||
|
|
|
@ -286,12 +286,19 @@
|
||||||
*/
|
*/
|
||||||
_updateDetailsView: function(fileInfo) {
|
_updateDetailsView: function(fileInfo) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
var oldFileInfo = this._detailsView.getFileInfo();
|
||||||
|
if (oldFileInfo) {
|
||||||
|
// TODO: use more efficient way, maybe track the highlight
|
||||||
|
this.$fileList.children().filterAttr('data-id', '' + oldFileInfo.id).removeClass('highlighted');
|
||||||
|
}
|
||||||
|
|
||||||
if (!fileInfo) {
|
if (!fileInfo) {
|
||||||
this._detailsView.$el.addClass('disappear');
|
this._detailsView.$el.addClass('disappear');
|
||||||
this._detailsView.setFileInfo(null);
|
this._detailsView.setFileInfo(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.$fileList.children().filterAttr('data-id', '' + fileInfo.id).addClass('highlighted');
|
||||||
this._detailsView.setFileInfo(_.extend({
|
this._detailsView.setFileInfo(_.extend({
|
||||||
path: this.getCurrentDirectory()
|
path: this.getCurrentDirectory()
|
||||||
}, fileInfo));
|
}, fileInfo));
|
||||||
|
|
|
@ -56,6 +56,7 @@ $application->setupPropagation();
|
||||||
|
|
||||||
\OCP\Util::addScript('files_sharing', 'share');
|
\OCP\Util::addScript('files_sharing', 'share');
|
||||||
\OCP\Util::addScript('files_sharing', 'external');
|
\OCP\Util::addScript('files_sharing', 'external');
|
||||||
|
\OCP\Util::addStyle('files_sharing', 'sharetabview');
|
||||||
|
|
||||||
// FIXME: registering a job here will cause additional useless SQL queries
|
// FIXME: registering a job here will cause additional useless SQL queries
|
||||||
// when the route is not cron.php, needs a better way
|
// when the route is not cron.php, needs a better way
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
.app-files .shareTabView {
|
||||||
|
min-height: 200px;
|
||||||
|
}
|
|
@ -55,6 +55,7 @@
|
||||||
this.$el.append(this._template({
|
this.$el.append(this._template({
|
||||||
owner: this._fileInfo.shareOwner || OC.currentUser
|
owner: this._fileInfo.shareOwner || OC.currentUser
|
||||||
}));
|
}));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// TODO: render placeholder text?
|
// TODO: render placeholder text?
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue