Make it easier to switch between v1/v2 layout.

resources/lang/en_US/firefly.php

@@ -1337,6 +1337,7 @@ return [
     'automation'                                => 'Automation',
     'others'                                    => 'Others',
     'classification'                            => 'Classification',
+    'store_transaction'                         => 'Store transaction',
 
     // reports:
     'report_default'                            => 'Default financial report between :start and :end',

resources/views/v1/accounts/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
 {% endblock %}

resources/views/v1/accounts/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account) }}

resources/views/v1/accounts/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), account) }}

resources/views/v1/accounts/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
@@ -32,7 +32,7 @@
                             <a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
                         </div>
 
-                        {% include 'list.accounts' %}
+                        {% include 'v1.list.accounts' %}
                     </div>
                     <div class="box-footer">
                         <p>
@@ -66,7 +66,7 @@
         </div>
     {% endif %}
     {% if accounts.count() == 0 and page == 1 %}
-        {% include 'partials.empty' with {objectType: objectType, type: 'accounts',route: route('accounts.create', [objectType])} %}
+        {% include 'v1.partials.empty' with {objectType: objectType, type: 'accounts',route: route('accounts.create', [objectType])} %}
     {% endif %}
 {% endblock %}
 

resources/views/v1/accounts/reconcile/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}

resources/views/v1/accounts/reconcile/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, start, end) }}

resources/views/v1/accounts/reconcile/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, journal) }}

resources/views/v1/accounts/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, start, end) }}
@@ -41,7 +41,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -142,7 +142,7 @@
                         {% set showReconcile = false %}
                     {% endif %}
 
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                     <p>
                         <i class="fa fa-calendar"></i>
                         {% if periods|length > 0 %}
@@ -160,7 +160,7 @@
         </div>
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
     </div>

resources/views/v1/admin/configuration/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/link/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/admin/link/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}

resources/views/v1/admin/link/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}

resources/views/v1/admin/link/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/link/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}

resources/views/v1/admin/telemetry/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/telemetry/view.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/update/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/users/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}

resources/views/v1/admin/users/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}

resources/views/v1/admin/users/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/admin/users/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}

resources/views/v1/attachments/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}

resources/views/v1/attachments/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}

resources/views/v1/attachments/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/auth/lost-two-factor.twig

@@ -12,7 +12,7 @@
     <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">

resources/views/v1/auth/register.twig

@@ -48,6 +48,6 @@
         <a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
     </div>
 
-    {% include 'partials.password-modal' %}
+    {% include 'v1.partials.password-modal' %}
 
 {% endblock %}

resources/views/v1/bills/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}

resources/views/v1/bills/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}

resources/views/v1/bills/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}

resources/views/v1/bills/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -6,7 +6,7 @@
 
 {% block content %}
     {% if total == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %}
     {% else %}
 <div class="row">
     <div class="col-lg-12 col-sm-12 col-md-12">
@@ -26,7 +26,7 @@
                 <div style="padding:8px;">
                     <a class="btn btn-success" href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_bill'|_ }}</a>
                 </div>
-                {% include 'list/bills' %}
+                {% include 'v1.list/bills' %}
             </div>
             <div class="box-footer">
                 <a class="btn btn-success" href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_bill'|_ }}</a>

resources/views/v1/bills/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
@@ -122,7 +122,7 @@
                         <h3 class="box-title">{{ 'attachments'|_ }}</h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             {% endif %}
@@ -149,7 +149,7 @@
                     <h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                 </div>
             </div>
         </div>

resources/views/v1/budgets/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/budgets/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}

resources/views/v1/budgets/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}

resources/views/v1/budgets/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -203,7 +203,7 @@
         </div>
     {% endif %}
     {% if budgets|length == 0 and inactive.count() == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %}
         {# make FF ignore demo for now. #}
         {% set shownDemo = true %}
     {% else %}

resources/views/v1/budgets/no-budget.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
@@ -24,13 +24,13 @@
                 <div class="box-body ">
 
                     {% if periods|length > 0 %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget-all') }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
@@ -42,7 +42,7 @@
 
         {% if periods|length > 0 %}
             <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
 

resources/views/v1/budgets/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget, budgetLimit) }}
@@ -47,7 +47,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -128,7 +128,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                     {% if budgetLimit %}
                         <p>
                             <i class="fa fa-calendar"></i>

resources/views/v1/categories/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/categories/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}

resources/views/v1/categories/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}

resources/views/v1/categories/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -25,7 +25,7 @@
                 <div style="padding:8px;">
                     <a class="btn btn-success" href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a>
                 </div>
-                {% include 'list/categories' %}
+                {% include 'v1.list/categories' %}
             </div>
             <div class="box-footer">
                 <a class="btn btn-success" href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a>
@@ -35,7 +35,7 @@
     </div>
 </div>
 {% else %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %}
     {% endif %}
 {% endblock %}
 

resources/views/v1/categories/no-category.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
@@ -24,13 +24,13 @@
                 <div class="box-body ">
 
                     {% if periods|length > 0 %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category.all') }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
@@ -42,7 +42,7 @@
 
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
 

resources/views/v1/categories/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, start, end) }}
@@ -57,7 +57,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -80,7 +80,7 @@
                 </div>
                 <div class="box-body">
                     {% if periods|length > 0 %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show.all', [category.id]) }}">
@@ -88,7 +88,7 @@
                             </a>
                         </p>
                     {% else %}
-                        {% include 'list.groups'  %}
+                        {% include 'v1.list.groups'  %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show', [category.id]) }}">
@@ -101,7 +101,7 @@
         </div>
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
     </div>

resources/views/v1/currencies/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/currencies/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}

resources/views/v1/currencies/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}

resources/views/v1/currencies/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/emails/access-token-created-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.access_token_created_body') }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/access-token-created-text.twig

@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.access_token_created_body')|raw }}
 
 {{ trans('email.access_token_created_explanation')|striptags|raw }}
 
 {{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/admin-test-html.twig

@@ -1,5 +1,5 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.admin_test_body', {email: email })}}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/admin-test-text.twig

@@ -1,3 +1,3 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.admin_test_body', {email: email })|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/confirm-email-change-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_body_to_new')}}
 </p>
@@ -15,4 +15,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     <a href="{{ uri }}">{{ uri }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/confirm-email-change-text.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.email_change_body_to_new')|raw }}
 
 {{trans('email.email_change_old', { email: oldEmail })|raw }}
@@ -7,4 +7,4 @@
 
 {{ trans('email.email_change_instructions')|raw }}
 {{ uri }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/error-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
 </p>
@@ -42,4 +42,4 @@
 <p style="font-family: monospace;font-size:11px;color:#aaa">
     {{ stackTrace|nl2br }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/error-text.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}
 
 {{ trans('email.error_type', {class: class })|raw }}
@@ -24,4 +24,4 @@
 {{ trans('email.error_stacktrace_below')|raw }}
 
 {{ stackTrace|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/new-ip-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.new_ip_body') }}
 </p>
@@ -13,4 +13,4 @@
     {{ trans('email.new_ip_warning') }}
 </p>
 
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/new-ip-text.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.new_ip_body') }}
 
 {{ trans('email.ip_address') }}: {{ ipAddress }}
@@ -7,4 +7,4 @@
 
 {{ trans('email.new_ip_warning') }}
 
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/oauth-client-created-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.oauth_created_undo', { url:route('profile.index')}) }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/oauth-client-created-text.twig

@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.oauth_created_body', {name:  client.name, url: client.redirect })|striptags|raw }}
 
 {{ trans('email.oauth_created_explanation')|striptags|raw }}
 
 {{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/password-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.reset_pw_instructions') }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     <a href="{{ url }}">{{ url }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/password-text.twig

@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.reset_pw_instructions')|raw }}
 
 {{ trans('email.reset_pw_warning')|striptags|raw }}
 
 {{ url }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/registered-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.registered_welcome', {address: address})|raw }}
 </p>
@@ -17,4 +17,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.registered_closing')}}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/registered-text.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 
 {{ trans('email.registered_welcome')|striptags|raw }}
 
@@ -18,4 +18,4 @@
 https://github.com/firefly-iii/firefly-iii
 https://firefly-iii.org/
 
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/report-new-journals-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans_choice('email.new_journals_header', transformed|length ) }}
 </p>
@@ -75,4 +75,4 @@
     {% endfor %}
 </ol>
 
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/report-new-journals-text.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans_choice('email.new_journals_header', transformed|length )|raw }}
 
 
@@ -13,4 +13,4 @@
 {% endfor %}
 {% endif %}
 {% endfor %}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/emails/undo-email-change-html.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_body_to_old')|raw }}
 </p>
@@ -14,4 +14,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}

resources/views/v1/emails/undo-email-change-text.twig

@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.email_change_body_to_old')|striptags|raw }}
 
 {{ trans('email.email_change_ignore')|raw }}
@@ -8,4 +8,4 @@
 {{trans('email.email_change_new', { email: newEmail })|raw }}
 
 {{ trans('email.email_change_undo_link')|raw }} {{ uri }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}

resources/views/v1/errors/404.twig

@@ -23,7 +23,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">

resources/views/v1/errors/500.twig

@@ -23,7 +23,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">

resources/views/v1/errors/503.twig

@@ -19,7 +19,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">

resources/views/v1/errors/FireflyException.twig

@@ -23,7 +23,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">

resources/views/v1/export/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/index.twig

@@ -1,10 +1,10 @@
-{% extends "./layout/default" %}
+{% extends "./v1/layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
-    {% include 'partials.boxes' %}
+    {% include 'v1.partials.boxes' %}
     <div class="row">
         <div class="col-lg-8 col-md-12 col-sm-12">
             {# ACCOUNTS #}
@@ -65,7 +65,7 @@
 
                         {% if data.transactions|length > 0 %}
                             <div class="box-body no-padding">
-                                {% include 'list.groups-tiny' with {'transactions': data.transactions,'account': data.account} %}
+                                {% include 'v1.list.groups-tiny' with {'transactions': data.transactions,'account': data.account} %}
                             </div>
                         {% else %}
                             <div class="box-body">

resources/views/v1/layout/default.twig

@@ -49,7 +49,7 @@
     <script type="text/javascript" nonce="{{ JS_NONCE }}">var forceDemoOff = false;</script>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include 'v1.partials.favicons' %}
 
 </head>
 <body class="skin-blue-light sidebar-mini hold-transition">
@@ -107,13 +107,13 @@
               </span>
                 </div>
             </form>
-            {% include('partials.menu-sidebar') %}
+            {% include('v1.partials.menu-sidebar') %}
         </section>
     </aside>
 
     <div class="content-wrapper">
         <section class="content-header">
-            {% include('partials.page-header') %}
+            {% include('v1.partials.page-header') %}
             {% block breadcrumbs %}{% endblock %}
         </section>
 
@@ -128,7 +128,7 @@
                 </div>
             {% endif %}
 
-            {% include('partials.flashes') %}
+            {% include('v1.partials.flashes') %}
 
             {% block content %}{% endblock %}
         </section>
@@ -143,7 +143,7 @@
         {% if FF_IS_BETA %}<small class="text-warning hidden-xs"><br>{{ 'is_beta_warning'|_ }}</small>{% endif %}
     </footer>
 
-    {% include('partials.control-bar') %}
+    {% include('v1.partials.control-bar') %}
 
 </div>
 <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">

resources/views/v1/layout/empty.twig

@@ -30,7 +30,7 @@
     <![endif]-->
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="login-page">

resources/views/v1/layout/guest.twig

@@ -40,7 +40,7 @@
     <![endif]-->
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="login-page">

resources/views/v1/layout/install.twig

@@ -23,7 +23,7 @@
     <![endif]-->
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="login-page">

resources/views/v1/new-user/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/object-groups/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectGroup) }}

resources/views/v1/object-groups/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectGroup) }}

resources/views/v1/object-groups/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}

resources/views/v1/piggy-banks/add-mobile.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}

resources/views/v1/piggy-banks/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/piggy-banks/delete.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}

resources/views/v1/piggy-banks/edit.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}

resources/views/v1/piggy-banks/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -6,7 +6,7 @@
 
 {% block content %}
     {% if piggyBanks|length == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
     {% else %}
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
@@ -18,7 +18,7 @@
                 <div style="padding:8px;">
                     <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_piggy_bank'|_ }}</a>
                 </div>
-                {% include 'list/piggy-banks' %}
+                {% include 'v1.list/piggy-banks' %}
             </div>
             <div class="box-footer">
                 <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_piggy_bank'|_ }}</a>

resources/views/v1/piggy-banks/remove-mobile.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}

resources/views/v1/piggy-banks/show.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@@ -97,7 +97,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body no-padding" id="piggyEvents">
-                    {% include 'list/piggy-bank-events' %}
+                    {% include 'v1.list/piggy-bank-events' %}
                 </div>
             </div>
         </div>
@@ -126,7 +126,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>

resources/views/v1/preferences/index.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/profile/change-email.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/profile/change-password.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -65,5 +65,5 @@
             </div>
         </div>
     </form>
-    {% include 'partials.password-modal' %}
+    {% include 'v1.partials.password-modal' %}
 {% endblock %}

resources/views/v1/profile/code.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/profile/delete-account.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/profile/index.twig

@@ -1,5 +1,5 @@
 {% set VUE_SCRIPT_NAME = 'profile' %}
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/profile/logout-other-sessions.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -31,5 +31,5 @@
             </div>
         </div>
     </form>
-    {% include 'partials.password-modal' %}
+    {% include 'v1.partials.password-modal' %}
 {% endblock %}

resources/views/v1/profile/new-backup-codes.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}

resources/views/v1/recurring/create.twig

@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}