Fix for #907

resources/lang/en_US/firefly.php

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

resources/views/javascript/variables.twig

@@ -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') }}";

resources/views/list/transactions.twig

@@ -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>
+        {# hidden row for checkboxes #}
-        <th class="hidden-xs select_boxes" colspan="2" style="display: none;"><input name="select_all" class="select_all" type="checkbox"/></th>
+        <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>
@@ -72,8 +78,3 @@
         {{ 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>

resources/views/partials/transaction-row.twig

@@ -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 #}
+    {# select buttons #}
-    <td class="hidden-xs">
+    <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>