From 7ece8ed31439df9b321ff1800483079a6a7dcfac Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sat, 13 Aug 2011 05:27:50 +0200 Subject: [PATCH] added global action class for icons --- apps/contacts/templates/part.details.php | 4 ++-- apps/contacts/templates/part.property.php | 20 ++++++++++---------- apps/media/js/playlist.js | 2 +- core/css/styles.css | 4 ++-- files/css/files.css | 2 +- files/js/fileactions.js | 12 ++++++------ settings/js/users.js | 2 +- settings/templates/users.php | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php index 4277357b759..119c88486ac 100644 --- a/apps/contacts/templates/part.details.php +++ b/apps/contacts/templates/part.details.php @@ -24,6 +24,6 @@
- - + +
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php index 06587269202..cdb03068128 100644 --- a/apps/contacts/templates/part.property.php +++ b/apps/contacts/templates/part.property.php @@ -3,27 +3,27 @@
t('Name'); ?>
- +
t('Birthday'); ?>
l('date',new DateTime($_['property']['value'])); ?> - +
t('Organisation'); ?>
- - + +
t('Email'); ?>
- - + +
t('Telephone'); ?>
@@ -32,8 +32,8 @@ (t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>) - - + +
@@ -51,8 +51,8 @@ t('Region'); ?>
t('Postal Code'); ?>
t('Country'); ?> - - + +
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js index 778939db01c..cb7f24522a4 100644 --- a/apps/media/js/playlist.js +++ b/apps/media/js/playlist.js @@ -5,7 +5,7 @@ PlayList.render=function(){ var item=PlayList.items[i]; var li=$('
  • '); li.append(item.name); - var img=$(''); + var img=$(''); img.click(function(event){ event.stopPropagation(); PlayList.remove($(this).parent().data('index')); diff --git a/core/css/styles.css b/core/css/styles.css index ff12ab1e07c..6ea08d529d8 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -102,5 +102,5 @@ li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ff -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; } -.file_action, .selectedActions a, #logout { opacity:.5; } -.file_action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } +.action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +.action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } diff --git a/files/css/files.css b/files/css/files.css index ef86664cf2d..af860d60b9a 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -60,7 +60,7 @@ table thead.fixed { height:2em; } #fileList tr.selected td.filename, #fileList tr:hover td.filename { background-image:url('') !important; } #select_all { float:left; margin:.2em; margin-left:.6em; } #uploadsize-message,#delete-confirm { display:none; } -.selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } +.selectedActions a, a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } .selectedActions { display:none; } /* add breadcrumb divider to the File item in navigation panel */ diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 2bc79abe723..a0a04ff1662 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -53,7 +53,7 @@ FileActions={ }, display:function(parent){ FileActions.currentFile=parent; - $('.file_action').remove(); + $('.action').remove(); var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType()); var file=FileActions.getCurrentFile(); if($('tr[data-file="'+file+'"]').data('renaming')){ @@ -66,7 +66,7 @@ FileActions={ if(img.call){ img=img(file); } - var html=''; + var html=''; var element=$(html); if(img){ element.append($('')); @@ -85,7 +85,7 @@ FileActions={ } if(actions['Delete']){ var img=FileActions.icons['Delete']; - var html=''; + var html=''; var element=$(html); if(img){ element.append($('')); @@ -101,12 +101,12 @@ FileActions={ }); parent.parent().children().last().append(element); } - $('.file_action').hide(); - $('.file_action').fadeIn(200); + $('.action').hide(); + $('.action').fadeIn(200); return false; }, hide:function(){ - $('.file_action').fadeOut(200,function(){ + $('.action').fadeOut(200,function(){ $(this).remove(); }); }, diff --git a/settings/js/users.js b/settings/js/users.js index addf1c2d65f..efa08cd0ba1 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -104,7 +104,7 @@ $(document).ready(function(){ }); tr.find('td.groups').append(select); if(tr.find('td.remve img').length==0){ - tr.find('td.remove').append($('Remove')); + tr.find('td.remove').append($('Remove')); } applyMultiplySelect(select); $('#content table tr').last().after(tr); diff --git a/settings/templates/users.php b/settings/templates/users.php index 0009c85fa38..7a99c0eb412 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -22,7 +22,7 @@ foreach($_["groups"] as $group) { ●●●●●●● - +