kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 18:54:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #907

Browse Source
This commit is contained in:
James Cole
2018-09-06 12:28:15 +02:00
parent 32ed9c59ea
commit 013c8707ac
4 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en_US/firefly.php
View File

@@ -28,6 +28,8 @@ return [
'actions' => 'Actions',
'edit' => 'Edit',
'delete' => 'Delete',
'split' => 'Split',
'clone' => 'Clone',
'welcomeBack' => 'What\'s playing?',
'everything' => 'Everything',
'today' => 'today',

4
resources/views/javascript/variables.twig
View File

@@ -50,6 +50,10 @@ var helpPageTitle = "{{ trans('firefly.help_for_this_page')|escape('js') }}";
var noHelpForPage = "{{ trans('firefly.no_help_could_be_found')|escape('js') }}";
var noHelpForPageTitle = "{{ trans('firefly.no_help_title')|escape('js') }}";
var edit_selected_txt = "{{ trans('firefly.edit')|escape('js') }}";
var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
var delete_selected_txt = "{{ trans('firefly.delete')|escape('js') }}";
// for demo:
var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}";
var prevLabel = "{{ trans('firefly.intro_prev_label')|escape('js') }}";

17
resources/views/list/transactions.twig
View File

@@ -4,8 +4,11 @@
<table class="table table-hover table-condensed {% if sorting %}sortable-table{% endif %}">
<thead>
<tr class="ignore">
<th class="hidden-xs no_select_boxes" colspan="2">&nbsp;</th>
<th class="hidden-xs select_boxes" colspan="2" style="display: none;"><input name="select_all" class="select_all" type="checkbox"/></th>
{# hidden row for checkboxes #}
<th class="hidden-xs select_boxes" style="display: none;"><input name="select_all" class="select_all" type="checkbox"/></th>
{# header for icon #}
<th class="hidden-xs"></th>
<th>{{ trans('list.description') }}</th>
<th style="text-align:right;">{{ trans('list.amount') }}</th>
<th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th>
@@ -26,6 +29,9 @@
{% if showBill %}
<th class="hidden-xs"><i class="fa fa-fw fa-calendar-o" title="{{ trans('list.bill') }}"></i></th>
{% endif %}
{# visible row for edit/delete buttons #}
<th class="hidden-xs no_select_boxes">&nbsp;</th>
</tr>
</thead>
<tbody>
@@ -71,9 +77,4 @@
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
{{ transactions.render|raw }}
</div>
</div>
<script type="text/javascript">
var edit_selected_txt = "{{ trans('firefly.edit')|escape('js') }}";
var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
var delete_selected_txt = "{{ trans('firefly.delete')|escape('js') }}";
</script>
</div>

27
resources/views/partials/transaction-row.twig
View File

@@ -1,11 +1,12 @@
<tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}" data-transaction-id="{{ transaction.id }}">
{# input buttons #}
<td class="hidden-xs">
{# select buttons #}
<td class="hidden-xs select_boxes" style="display: none;">
<div class="select_single" style="display:none;">
<input name="select_all_single[]" class="select_all_single" data-transaction="{{ transaction.id }}" value="{{ transaction.journal_id }}" type="checkbox"/>
<input name="select_all_single[]" class="select_all_single" data-transaction="{{ transaction.id }}" value="{{ transaction.journal_id }}"
type="checkbox"/>
</div>
<div class="btn-group btn-group-xs edit_buttons edit_tr_buttons">{% if sorting %}<a href="#" class="handle btn btn-default btn-xs"><i class="fa fa-fw fa-arrows-v"></i></a>{% endif %}<a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a><a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div>
</td>
{# icon #}
@@ -69,4 +70,22 @@
{% endif %}
</td>
{% endif %}
<td class="hidden-xs pull-right">
<div class="btn-group btn-group-xs">
{% if sorting %}<a href="#" class="handle btn btn-default"><i class="fa fa-fw fa-arrows-v"></i></a>{% endif %}
<div class="btn-group btn-group-xs">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('transactions.edit',transaction.journal_id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete',transaction.journal_id) }}"><i class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li>
<li role="separator" class="divider"></li>
<li><a href="{{ route('transactions.clone',transaction.journal_id) }}"><i class="fa fa-copy fa-fw"></i> {{ 'clone'|_ }}</a></li>
<li><a href="{{ route('transactions.split.edit',transaction.journal_id) }}"><i class="fa fa-unsorted fa-fw"></i> {{ 'split'|_ }}</a></li>
</ul>
</div>
</div>
</td>
</tr>