Various code cleanup.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

resources/views/budgets/show.twig

@@ -48,7 +48,8 @@
             {% for limit in limits %}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title"><a href="{{ route('budgets.showWithRepetition',[budget.id,limit.id]) }}">{{ limit.startdate.formatLocalized(monthFormat) }}</a>
+                        <h3 class="box-title"><a
+                                    href="{{ route('budgets.showWithRepetition',[budget.id,limit.id]) }}">{{ limit.startdate.formatLocalized(monthFormat) }}</a>
                         </h3>
                     </div>
                     <div class="box-body">

resources/views/currency/index.twig

@@ -37,7 +37,8 @@
                                         {% if currency.id == defaultCurrency.id %}
                                             <span class="label label-success">{{ 'default_currency'|_ }}</span>
                                         {% else %}
-                                            <a class="btn btn-info btn-xs" href="{{ route('currency.default',currency.id) }}">{{ 'make_default_currency'|_ }}</a>
+                                            <a class="btn btn-info btn-xs"
+                                               href="{{ route('currency.default',currency.id) }}">{{ 'make_default_currency'|_ }}</a>
                                         {% endif %}
                                     </td>
                                 </tr>

resources/views/emails/confirm-account-html.twig

@@ -11,7 +11,8 @@
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
+    To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is
+    valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

resources/views/errors/503.twig

@@ -12,6 +12,7 @@
             display: table;
             font-family: 'Roboto', sans-serif;
         }
+
         p {
             color: #575e62;
             font-size: 1.5em;

resources/views/export/index.twig

@@ -33,7 +33,8 @@
                         </div>
                         <div id="export-download" style="display:none;">
                             <p class="text-center text-info" id="download-holder">
-                                <a id="download-link" class="btn btn-lg btn-success" href="{{ route('export.download', job.key) }}"><i class="fa fa-fw fa-download"></i> Download</a>
+                                <a id="download-link" class="btn btn-lg btn-success" href="{{ route('export.download', job.key) }}"><i
+                                            class="fa fa-fw fa-download"></i> Download</a>
                             </p>
                         </div>
                         <div id="export-error" style="display:none;">

resources/views/import/complete.twig

@@ -19,10 +19,12 @@
                     </p>
                     <div class="row">
                         <div class="col-lg-4">
-                            <a href="{{ route('import.download', [job.key]) }}" class="btn btn-default"><i class="fa fa-fw fa-download"></i> {{ 'import_download_config'|_ }}</a>
+                            <a href="{{ route('import.download', [job.key]) }}" class="btn btn-default"><i
+                                        class="fa fa-fw fa-download"></i> {{ 'import_download_config'|_ }}</a>
                         </div>
                         <div class="col-lg-4">
-                            <a href="{{ route('import.status', [job.key]) }}" class="btn btn-success"><i class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</a>
+                            <a href="{{ route('import.status', [job.key]) }}" class="btn btn-success"><i
+                                        class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</a>
                         </div>
                     </div>
                 </div>

resources/views/partials/menu-sidebar.twig

@@ -130,7 +130,7 @@
     </li>
 
     <!-- options and preferences -->
-    <li id="option-menu" class="{{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
+    <li id="option-menu" class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
         <a href="#">
             <i class="fa fa-gears fa-fw"></i>
             <span>{{ 'options'|_ }}</span>
@@ -147,6 +147,12 @@
             <li class="{{ activeRoutePartial('currency') }}">
                 <a class="{{ activeRoutePartial('currency') }}" href="{{ route('currency.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>
             </li>
+            <!-- admin (if user admin) -->
+            {% if Auth.user.hasRole('owner') %}
+            <li class="{{ activeRoutePartial('admin') }}">
+                <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i class="fa fa-hand-spock-o fa-fw"></i> {{ 'administration'|_ }}</a>
+            </li>
+            {% endif %}
         </ul>
 
 

resources/views/popup/report/category-entry.twig

@@ -3,7 +3,8 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
+            <h4 class="modal-title"
+                id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
         <div class="modal-body">
             {% set hideCategory = true %}

resources/views/popup/report/expense-entry.twig

@@ -3,7 +3,8 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
+            <h4 class="modal-title"
+                id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
         <div class="modal-body">
             {% set hideDestination = true %}

resources/views/popup/report/income-entry.twig

@@ -3,7 +3,8 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
+            <h4 class="modal-title"
+                id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
         <div class="modal-body">
             {% set hideBudget = true %}

resources/views/preferences/index.twig

@@ -200,7 +200,6 @@
         </div>
 
 
-
     </div>
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">

resources/views/reports/audit/report.twig

@@ -18,7 +18,8 @@
                         {% for hide in hideable %}
                             <li><input
                                         {% if hide in defaultShow %}checked{% endif %}
-                                        type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}" /> <label for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li>
+                                        type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}"/> <label
+                                        for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li>
                         {% endfor %}
 
                     </ul>
@@ -46,8 +47,7 @@
                                     url: url,
                                     start: start.formatLocalized(monthAndDayFormat),
                                     end: end.formatLocalized(monthAndDayFormat),
-                                    })|raw
+                                })|raw }}
-                                }}
                             </em>
                         </div>
                     {% else %}
@@ -60,8 +60,7 @@
                                     url: url,
                                     end: auditData[account.id].end,
                                     balance: auditData[account.id].endBalance|formatAmount
-                                })|raw
+                                })|raw }}
-                                }}
                             </p>
                             {% include 'reports/partials/journals-audit.twig'  with {'journals': auditData[account.id].journals,'account':account} %}
                             <p style="padding:10px;">
@@ -71,8 +70,7 @@
                                     url: url,
                                     end: auditData[account.id].dayBefore,
                                     balance: auditData[account.id].dayBeforeBalance|formatAmount
-                                })|raw
+                                })|raw }}
-                                }}
                             </p>
                         </div>
                     {% endif %}

resources/views/reports/default/multi-year.twig

@@ -62,7 +62,8 @@
                         <h3 class="box-title">{{ 'Asset account'|_ }}: {{ account.name }}</h3>
                     </div>
                     <div class="box-body">
-                        <canvas id="account-chart-{{ account.id }}" class="account-chart" data-id="{{ account.id }}" style="width:100%;height:400px;" height="400"></canvas>
+                        <canvas id="account-chart-{{ account.id }}" class="account-chart" data-id="{{ account.id }}" style="width:100%;height:400px;"
+                                height="400"></canvas>
                     </div>
                 </div>
             </div>

resources/views/reports/partials/expenses.twig

@@ -17,7 +17,8 @@
                         <br/>
                         <small>
                             {{ expense.count }} {{ 'transactions'|_|lower }}
-                            <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="expense-entry" data-account-id="{{ expense.id }}"></i>
+                            <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="expense-entry"
+                               data-account-id="{{ expense.id }}"></i>
                         </small>
                     {% endif %}
                 </td>

resources/views/reports/partials/income.twig

@@ -17,7 +17,8 @@
                         <br/>
                         <small>
                             {{ income.count }} {{ 'transactions'|_|lower }}
-                            <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry" data-account-id="{{ income.id }}"></i>
+                            <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
+                               data-account-id="{{ income.id }}"></i>
                         </small>
 
                     {% endif %}

resources/views/reports/partials/journals-audit.twig

@@ -34,10 +34,12 @@
             <td class="hide-buttons">
                 <div class="btn-group btn-group-xs">
                     <a href="{{ route('transactions.edit',journal.id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
-                <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div></td>
+                    <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div>
+            </td>
             <td class="hide-icon">{{ journal|typeIcon }}</td>
 
-            <td class="hide-description"><a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a></td>
+            <td class="hide-description"><a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
+            </td>
             <td class="hide-balance_before">{{ journal.before|formatAmount }}</td>
             <td class="hide-amount">{{ journal|formatJournal }}</td>
             <td class="hide-balance_after">{{ journal.after|formatAmount }}</td>

resources/views/split/journals/create.twig

@@ -143,7 +143,8 @@
                                     <!-- deposit has several source names -->
                                     {% if preFilled.what == 'deposit' %}
                                         <td>
-                                            <input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}" class="form-control"/>
+                                            <input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}"
+                                                   class="form-control"/>
                                         </td>
                                     {% endif %}
 

resources/views/split/journals/edit.twig

@@ -126,7 +126,8 @@
                                     <!-- deposit has several source names -->
                                     {% if preFilled.what == 'deposit' %}
                                         <td>
-                                        <input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}" class="form-control"/>
+                                            <input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}"
+                                                   class="form-control"/>
                                         </td>
                                     {% endif %}
 

resources/views/transactions/create.twig

@@ -67,7 +67,6 @@
                         {% endif %}
 
 
-
                         <!-- CATEGORY ALWAYS -->
                         {{ ExpandedForm.text('category') }}
 

resources/views/transactions/edit.twig

@@ -88,7 +88,6 @@
                         {{ ExpandedForm.date('process_date',data['process_date']) }}
 
 
-
                         <!-- TAGS -->
                         {{ ExpandedForm.text('tags') }}