Skip to content

Commit

Permalink
Fix for info format and button displacement
Browse files Browse the repository at this point in the history
- Info message has a new display format
- Info button displacement on click fix
  • Loading branch information
nadir committed Nov 12, 2015
1 parent a9b4781 commit 81b63a3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions apps/files/css/files.css
Original file line number Diff line number Diff line change
Expand Up @@ -300,15 +300,14 @@ table td.filename .nametext {
}

.pathtext {
font-weight:bold;
opacity: 0.5;
padding:0;
margin:0;
line-height:normal;
}

.projecttext {
font-weight:bold;
color:#01A9DB;
opacity: 0.5;
padding:0;
margin:0;
line-height:normal;
Expand Down
8 changes: 4 additions & 4 deletions apps/files_sharing/js/share.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@
showInfoDropDown: function(fileId, eospath, projectname, appendTo) {
OCA.Sharing.Util.infoDropDownShown = true;
var html = '<div id="dropdown" class="drop shareDropDown" data-item-id="'+fileId+'">';
html += '<p class="pathtext"><u>EOS Path</u>: ' + eospath + '</p>';
html += '<p class="pathtext">EOS Path: ' + eospath + '</p>';
if(projectname && projectname != 'undefined') {
html += '<p class="pathtext"><u>Project EGroups permissions</u></p>';
html += '<p class="pathtext">Project EGroups permissions</p>';
html += '<p class="projecttext">cernbox-project-' + projectname + '-readers</p>';
html += '<p class="projecttext">cernbox-project-' + projectname + '-writers</p>';
}
Expand Down Expand Up @@ -232,14 +232,14 @@
var curFileId = $tr.attr('data-item-id');
if($('#dropdown').data('item-id') != curFileId) {
OCA.Sharing.Util.hideInfoDropDown(function () {
OCA.Sharing.Util.showInfoDropDown(curFileId, $tr.attr('eospath'), $tr.attr('projectname'), $(this));
OCA.Sharing.Util.showInfoDropDown(curFileId, $tr.attr('eospath'), $tr.attr('projectname'), $tr.find('td.filename'));
});
} else {
OCA.Sharing.Util.hideInfoDropDown();
OCA.Sharing.Util.infoDropDownShown = false;
}
} else {
OCA.Sharing.Util.showInfoDropDown($tr.attr('data-item-id'), $tr.attr('eospath'), $tr.attr('projectname'), $(this));
OCA.Sharing.Util.showInfoDropDown($tr.attr('data-item-id'), $tr.attr('eospath'), $tr.attr('projectname'), $tr.find('td.filename'));
OCA.Sharing.Util.infoDropDownShown = true;
}

Expand Down

0 comments on commit 81b63a3

Please sign in to comment.