Skip to content
Snippets Groups Projects
Commit 7ece8ed3 authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

added global action class for icons

parent b2768637
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
apps/contacts/templates/part.details.php
+ 2
− 2
View file @ 7ece8ed3
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
<?php endforeach; ?> <?php endforeach; ?>
<div id="contacts_cardoptions"> <div id="contacts_cardoptions">
<a id="contacts_deletecard"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a> <a id="contacts_deletecard"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
<a id="contacts_addproperty"><img class="svg" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a> <a id="contacts_addproperty"><img class="svg action" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
</div> </div>
apps/contacts/templates/part.property.php
+ 10
− 10
View file @ 7ece8ed3
...@@ -3,27 +3,27 @@ ...@@ -3,27 +3,27 @@
<div class="contacts_propertyname"><?php echo $l->t('Name'); ?></div> <div class="contacts_propertyname"><?php echo $l->t('Name'); ?></div>
<div class="contacts_propertyvalue"> <div class="contacts_propertyvalue">
<?php echo $_['property']['value']; ?> <?php echo $_['property']['value']; ?>
<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
</div> </div>
<?php elseif($_['property']['name'] == 'BDAY'): ?> <?php elseif($_['property']['name'] == 'BDAY'): ?>
<div class="contacts_propertyname"><?php echo $l->t('Birthday'); ?></div> <div class="contacts_propertyname"><?php echo $l->t('Birthday'); ?></div>
<div class="contacts_propertyvalue"> <div class="contacts_propertyvalue">
<?php echo $l->l('date',new DateTime($_['property']['value'])); ?> <?php echo $l->l('date',new DateTime($_['property']['value'])); ?>
<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
</div> </div>
<?php elseif($_['property']['name'] == 'ORG'): ?> <?php elseif($_['property']['name'] == 'ORG'): ?>
<div class="contacts_propertyname"><?php echo $l->t('Organisation'); ?></div> <div class="contacts_propertyname"><?php echo $l->t('Organisation'); ?></div>
<div class="contacts_propertyvalue"> <div class="contacts_propertyvalue">
<?php echo $_['property']['value']; ?> <?php echo $_['property']['value']; ?>
<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
</div> </div>
<?php elseif($_['property']['name'] == 'EMAIL'): ?> <?php elseif($_['property']['name'] == 'EMAIL'): ?>
<div class="contacts_propertyname"><?php echo $l->t('Email'); ?></div> <div class="contacts_propertyname"><?php echo $l->t('Email'); ?></div>
<div class="contacts_propertyvalue"> <div class="contacts_propertyvalue">
<?php echo $_['property']['value']; ?> <?php echo $_['property']['value']; ?>
<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
</div> </div>
<?php elseif($_['property']['name'] == 'TEL'): ?> <?php elseif($_['property']['name'] == 'TEL'): ?>
<div class="contacts_propertyname"><?php echo $l->t('Telephone'); ?></div> <div class="contacts_propertyname"><?php echo $l->t('Telephone'); ?></div>
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<?php if(isset($_['property']['parameters']['TYPE'])): ?> <?php if(isset($_['property']['parameters']['TYPE'])): ?>
(<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>) (<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
<?php endif; ?> <?php endif; ?>
<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
</div> </div>
<?php elseif($_['property']['name'] == 'ADR'): ?> <?php elseif($_['property']['name'] == 'ADR'): ?>
<div class="contacts_propertyname"> <div class="contacts_propertyname">
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br> <?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br>
<?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br> <?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br>
<?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> <?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?>
<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
</div> </div>
<?php endif; ?> <?php endif; ?>
</div> </div>
apps/media/js/playlist.js
+ 1
− 1
View file @ 7ece8ed3
...@@ -5,7 +5,7 @@ PlayList.render=function(){ ...@@ -5,7 +5,7 @@ PlayList.render=function(){
var item=PlayList.items[i]; var item=PlayList.items[i];
var li=$('<li/>'); var li=$('<li/>');
li.append(item.name); li.append(item.name);
var img=$('<img class="remove" src="'+OC.imagePath('core','actions/delete')+'"/>'); var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
img.click(function(event){ img.click(function(event){
event.stopPropagation(); event.stopPropagation();
PlayList.remove($(this).parent().data('index')); PlayList.remove($(this).parent().data('index'));
......
core/css/styles.css
+ 2
− 2
View file @ 7ece8ed3
...@@ -102,5 +102,5 @@ li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ff ...@@ -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-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; } -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
.file_action, .selectedActions a, #logout { opacity:.5; } .action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
.file_action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
files/css/files.css
+ 1
− 1
View file @ 7ece8ed3
...@@ -60,7 +60,7 @@ table thead.fixed { height:2em; } ...@@ -60,7 +60,7 @@ table thead.fixed { height:2em; }
#fileList tr.selected td.filename, #fileList tr:hover td.filename { background-image:url('') !important; } #fileList tr.selected td.filename, #fileList tr:hover td.filename { background-image:url('') !important; }
#select_all { float:left; margin:.2em; margin-left:.6em; } #select_all { float:left; margin:.2em; margin-left:.6em; }
#uploadsize-message,#delete-confirm { display:none; } #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; } .selectedActions { display:none; }
/* add breadcrumb divider to the File item in navigation panel */ /* add breadcrumb divider to the File item in navigation panel */
......
files/js/fileactions.js
+ 6
− 6
View file @ 7ece8ed3
...@@ -53,7 +53,7 @@ FileActions={ ...@@ -53,7 +53,7 @@ FileActions={
}, },
display:function(parent){ display:function(parent){
FileActions.currentFile=parent; FileActions.currentFile=parent;
$('.file_action').remove(); $('.action').remove();
var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType()); var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
var file=FileActions.getCurrentFile(); var file=FileActions.getCurrentFile();
if($('tr[data-file="'+file+'"]').data('renaming')){ if($('tr[data-file="'+file+'"]').data('renaming')){
...@@ -66,7 +66,7 @@ FileActions={ ...@@ -66,7 +66,7 @@ FileActions={
if(img.call){ if(img.call){
img=img(file); img=img(file);
} }
var html='<a href="#" title="'+name+'" class="file_action"/>'; var html='<a href="#" title="'+name+'" class="action" />';
var element=$(html); var element=$(html);
if(img){ if(img){
element.append($('<img src="'+img+'"/>')); element.append($('<img src="'+img+'"/>'));
...@@ -85,7 +85,7 @@ FileActions={ ...@@ -85,7 +85,7 @@ FileActions={
} }
if(actions['Delete']){ if(actions['Delete']){
var img=FileActions.icons['Delete']; var img=FileActions.icons['Delete'];
var html='<a href="#" title="Delete" class="file_action"/>'; var html='<a href="#" title="Delete" class="action" />';
var element=$(html); var element=$(html);
if(img){ if(img){
element.append($('<img src="'+img+'"/>')); element.append($('<img src="'+img+'"/>'));
...@@ -101,12 +101,12 @@ FileActions={ ...@@ -101,12 +101,12 @@ FileActions={
}); });
parent.parent().children().last().append(element); parent.parent().children().last().append(element);
} }
$('.file_action').hide(); $('.action').hide();
$('.file_action').fadeIn(200); $('.action').fadeIn(200);
return false; return false;
}, },
hide:function(){ hide:function(){
$('.file_action').fadeOut(200,function(){ $('.action').fadeOut(200,function(){
$(this).remove(); $(this).remove();
}); });
}, },
......
settings/js/users.js
+ 1
− 1
View file @ 7ece8ed3
...@@ -104,7 +104,7 @@ $(document).ready(function(){ ...@@ -104,7 +104,7 @@ $(document).ready(function(){
}); });
tr.find('td.groups').append(select); tr.find('td.groups').append(select);
if(tr.find('td.remve img').length==0){ if(tr.find('td.remve img').length==0){
tr.find('td.remove').append($('<img alt="Remove" title="'+t('admin','Remove')+'" class="svg" src="'+OC.imagePath('core','actions/delete')+'"/>')); tr.find('td.remove').append($('<img alt="Remove" title="'+t('admin','Remove')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
} }
applyMultiplySelect(select); applyMultiplySelect(select);
$('#content table tr').last().after(tr); $('#content table tr').last().after(tr);
......
settings/templates/users.php
+ 2
− 2
View file @ 7ece8ed3
...@@ -22,7 +22,7 @@ foreach($_["groups"] as $group) { ...@@ -22,7 +22,7 @@ foreach($_["groups"] as $group) {
<td class="name"><?php echo $user["name"]; ?></td> <td class="name"><?php echo $user["name"]; ?></td>
<td class="password"> <td class="password">
<span>●●●●●●●</span> <span>●●●●●●●</span>
<img class="svg" src="<?php echo image_path('core','actions/rename')?>"/> <img class="svg action" src="<?php echo image_path('core','actions/rename')?>"/>
</td> </td>
<td class="groups"> <td class="groups">
<select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple"> <select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
...@@ -33,7 +33,7 @@ foreach($_["groups"] as $group) { ...@@ -33,7 +33,7 @@ foreach($_["groups"] as $group) {
</td> </td>
<td class="remove"> <td class="remove">
<?php if($user['name']!=OC_User::getUser()):?> <?php if($user['name']!=OC_User::getUser()):?>
<img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg" src="<?php echo image_path('core','actions/delete') ?>" /> <img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg action" src="<?php echo image_path('core','actions/delete') ?>" />
<?php endif;?> <?php endif;?>
</td> </td>
</tr> </tr>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment