summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-07-29 16:00:46 -0400
committerMichael Gapczynski <mtgap@owncloud.com>2012-07-29 18:02:08 -0400
commite18639551d4c2915af706c70f98c67aa04b9c89e (patch)
tree471734250e4376838bddd06f3c06a3693199f5e8
parent0836366d8703b2663d11e2989f8dbbb3f7c0c18b (diff)
downloadnextcloud-server-e18639551d4c2915af706c70f98c67aa04b9c89e.tar.gz
nextcloud-server-e18639551d4c2915af706c70f98c67aa04b9c89e.zip
Tweak appearance of undo delete notification
-rw-r--r--apps/files/css/files.css1
-rw-r--r--apps/files/js/filelist.js5
-rw-r--r--core/css/styles.css2
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index dc298e4d440..e08d69f08d2 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -89,3 +89,4 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
#navigation>ul>li:first-child+li { padding-top:2.9em; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
+#notification .undo { cursor:pointer; font-weight:bold; margin-left:1em; } \ No newline at end of file
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3645258f98f..aaf2e681abb 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -183,7 +183,7 @@ FileList={
procesSelection();
FileList.deleteCanceled=false;
FileList.deleteFiles=files;
- $('#notification').text(t('files','undo deletion'));
+ $('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
$('#notification').data('deletefile',true);
$('#notification').fadeIn();
},
@@ -214,12 +214,11 @@ FileList={
$(document).ready(function(){
$('#notification').hide();
- $('#notification').click(function(){
+ $('#notification .undo').live('click', function(){
if($('#notification').data('deletefile'))
{
$.each(FileList.deleteFiles,function(index,file){
$('tr').filterAttr('data-file',file).show();
-// alert(file);
});
FileList.deleteCanceled=true;
FileList.deleteFiles=null;
diff --git a/core/css/styles.css b/core/css/styles.css
index b818caa279f..c61d0a9a1ab 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -108,7 +108,7 @@ label.infield { cursor: text !important; }
.bold { font-weight: bold; }
.center { text-align: center; }
-#notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
.action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
.action { width: 16px; height: 16px; }