From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 22 Aug 2011 17:33:21 +0000 (+0200)
Subject: hints for file actions
X-Git-Tag: v3.0~267^2~58
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e78d1dd676a12e0a26960f0bf131975c7559298a;p=nextcloud-server.git

hints for file actions
---

diff --git a/files/css/files.css b/files/css/files.css
index 787efa49e04..9418ec23a63 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -29,9 +29,10 @@ table { position:relative; top:37px; width:100%; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
 tbody tr.selected { background-color:#eee; }
 tbody a { color:#000; }
-span.extention, td.date { color:#999; }
-span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+span.extention,span.actionHint, td.date { color:#999; }
+span.extention,span.actionHint { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 tr:hover span.extention { opacity:1; }
+tr:hover span.actionHint { opacity:1; }
 div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
 div.crumb:first-child { padding-left:1.5em; }
 div.crumb:last-child { font-weight:bold; }
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 04943abf74a..0faecf593b8 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -82,6 +82,11 @@ FileActions={
 				});
 				parent.children('a.name').append(element);
 			}
+			element.hover(function(e){
+				$('span.actionHint').text($(this).data('action'));
+			}, function(e){
+				$('span.actionHint').text('');
+			});
 		}
 		if(actions['Delete']){
 			var img=FileActions.icons['Delete'];
@@ -136,6 +141,11 @@ FileActions.register('all','Rename',function(){return OC.imagePath('core','actio
 	FileList.rename(filename);
 });
 
+// preparation for encryption embeeding in user interface
+//FileActions.register('all', 'Encrypt', function(){return OC.imagePath('core', 'actions/play-add')},function(filename){
+//	alert(filename);
+//});
+
 //FileActions.setDefault('all','Download');
 
 FileActions.register('dir','Open','',function(filename){
diff --git a/files/js/filelist.js b/files/js/filelist.js
index b89bc9b57b6..b166d946e16 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -50,7 +50,7 @@ FileList={
 		html+='<td class="filesize" title="'+humanFileSize(size)+'" style="color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')">'+simpleSize+'</td>';
 		html+='<td class="date" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</td>';
 		html+='</tr>';
-		
+
 		FileList.insertElement(name,'dir',$(html));
 		$('tr[data-file="'+name+'"] td.filename').draggable(dragOptions);
 		$('tr[data-file="'+name+'"] td.filename').droppable(folderDropOptions);
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 5995976f73a..a08b7bebb38 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -16,6 +16,7 @@
 							<?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span>
 						<?php endif;?>
 					</span>
+					<span class="actionHint"></span>
 					</a>
 				</td>
 				<td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>