mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename action now appears as pencil icon

This commit is contained in:
raghunayyar 2013-10-03 00:39:03 +05:30 committed by Vincent Petry
parent 299a8285bd
commit 85e67be0aa
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/css/files.css
View File

@ -258,6 +258,7 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
position: absolute; position: absolute;
top: 14px; top: 14px;
right: 0; right: 0;
font-size: 11px;
} }
#fileList img.move2trash { display:inline; margin:-8px 0; padding:16px 8px 16px 8px !important; float:right; } #fileList img.move2trash { display:inline; margin:-8px 0; padding:16px 8px 16px 8px !important; float:right; }

21
apps/files/js/fileactions.js
View File

@ -71,13 +71,15 @@ var FileActions = {
FileActions.currentFile = parent; FileActions.currentFile = parent;
var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions()); var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var file = FileActions.getCurrentFile(); var file = FileActions.getCurrentFile();
var nameLinks;
if (FileList.findFileEl(file).data('renaming')) { if (FileList.findFileEl(file).data('renaming')) {
return; return;
} }
// recreate fileactions // recreate fileactions
parent.children('a.name').find('.fileactions').remove(); nameLinks = parent.children('a.name');
parent.children('a.name').append('<span class="fileactions" />'); nameLinks.find('.fileactions, .nametext .action').remove();
nameLinks.append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions()); var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var actionHandler = function (event) { var actionHandler = function (event) {
@ -97,7 +99,16 @@ var FileActions = {
} }
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') { if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name]; var img = FileActions.icons[name],
actionText = t('files', name),
actionContainer = 'a.name>span.fileactions';
if (name === 'Rename') {
// rename has only an icon which appears behind
// the file name
actionText = '';
actionContainer = 'a.name span.nametext';
}
if (img.call) { if (img.call) {
img = img(file); img = img(file);
} }
@ -105,13 +116,13 @@ var FileActions = {
if (img) { if (img) {
html += '<img class ="svg" src="' + img + '" />'; html += '<img class ="svg" src="' + img + '" />';
} }
html += '<span> ' + t('files', name) + '</span></a>'; html += '<span> ' + actionText + '</span></a>';
var element = $(html); var element = $(html);
element.data('action', name); element.data('action', name);
//alert(element); //alert(element);
element.on('click', {a: null, elem: parent, actionFunc: actions[name]}, actionHandler); element.on('click', {a: null, elem: parent, actionFunc: actions[name]}, actionHandler);
parent.find('a.name>span.fileactions').append(element); parent.find(actionContainer).append(element);
} }
}; };

1
apps/files/js/filelist.js
View File

@ -477,6 +477,7 @@ var FileList={
td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.'))); td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
} }
form.remove(); form.remove();
FileActions.display( tr.find('td.filename'), true);
td.children('a.name').show(); td.children('a.name').show();
} catch (error) { } catch (error) {
input.attr('title', error); input.attr('title', error);