Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #557

Browse Source
This commit is contained in:
Hillel Coren 2015-12-09 18:08:24 +02:00
parent 3a5f2ebaf7
commit d98a185c04
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Services/DatatableService.php
View File

@ -44,14 +44,14 @@ class DatatableService
$str = '<center>';
if (property_exists($model, 'is_deleted') && $model->is_deleted) {
$str .= '<button type="button" class="btn btn-sm btn-danger tr-status" style="display:inline-block; width:100px">'.trans('texts.deleted').'</button>';
$str .= '<button type="button" class="btn btn-sm btn-danger tr-status">'.trans('texts.deleted').'</button>';
} elseif ($model->deleted_at && $model->deleted_at !== '0000-00-00') {
$str .= '<button type="button" class="btn btn-sm btn-warning tr-status" style="display:inline-block; width:100px">'.trans('texts.archived').'</button>';
$str .= '<button type="button" class="btn btn-sm btn-warning tr-status">'.trans('texts.archived').'</button>';
} else {
$str .= '<div class="tr-status" style="display:inline-block; width:100px"></div>';
$str .= '<div class="tr-status"></div>';
}
$str .= '<div class="btn-group tr-action" style="display:none;">
$str .= '<div class="btn-group tr-action" style="height:auto;visibility:hidden">
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" style="width:100px">
'.trans('texts.select').' <span class="caret"></span>
</button>

8
public/js/built.js
View File

@ -30867,13 +30867,13 @@ function truncate(string, length){
// Show/hide the 'Select' option in the datalists
function actionListHandler() {
$('tbody tr').mouseover(function() {
$(this).closest('tr').find('.tr-action').css('display', 'inline-block');
$(this).closest('tr').find('.tr-status').css('display', 'none');
$(this).closest('tr').find('.tr-action').css('visibility', 'visible');
$(this).closest('tr').find('.tr-status').css('visibility', 'hidden');
}).mouseout(function() {
$dropdown = $(this).closest('tr').find('.tr-action');
if (!$dropdown.hasClass('open')) {
$dropdown.css('display', 'none');
$(this).closest('tr').find('.tr-status').css('display', 'inline-block');
$dropdown.css('visibility', 'hidden');
$(this).closest('tr').find('.tr-status').css('visibility', 'visible');
}
});
}

8
public/js/script.js
View File

@ -989,13 +989,13 @@ function truncate(string, length){
// Show/hide the 'Select' option in the datalists
function actionListHandler() {
$('tbody tr').mouseover(function() {
$(this).closest('tr').find('.tr-action').css('display', 'inline-block');
$(this).closest('tr').find('.tr-status').css('display', 'none');
$(this).closest('tr').find('.tr-action').css('visibility', 'visible');
$(this).closest('tr').find('.tr-status').css('visibility', 'hidden');
}).mouseout(function() {
$dropdown = $(this).closest('tr').find('.tr-action');
if (!$dropdown.hasClass('open')) {
$dropdown.css('display', 'none');
$(this).closest('tr').find('.tr-status').css('display', 'inline-block');
$dropdown.css('visibility', 'hidden');
$(this).closest('tr').find('.tr-status').css('visibility', 'visible');
}
});
}