From 5b35612be0cc8d99dddd46d13ab5b113b347db73 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 7 Nov 2020 14:05:42 +0100 Subject: [PATCH] Expand v2 views --- resources/views/v2/admin/index.twig | 2 +- resources/views/v2/bills/index.twig | 2 +- resources/views/v2/budgets/index.twig | 2 +- resources/views/v2/categories/index.twig | 2 +- resources/views/v2/currencies/index.twig | 2 +- resources/views/v2/export/index.twig | 2 +- resources/views/v2/index.twig | 6 ++++++ resources/views/v2/layout/default.twig | 9 +++++---- resources/views/v2/partials/layout/favicons.twig | 11 +++++++++++ resources/views/v2/piggy-banks/index.twig | 2 +- resources/views/v2/recurring/index.twig | 2 +- resources/views/v2/reports/index.twig | 2 +- resources/views/v2/rules/index.twig | 2 +- resources/views/v2/tags/index.twig | 2 +- resources/views/v2/transactions/index.twig | 2 +- 15 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 resources/views/v2/partials/layout/favicons.twig diff --git a/resources/views/v2/admin/index.twig b/resources/views/v2/admin/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/admin/index.twig +++ b/resources/views/v2/admin/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# #} + {% endblock %} diff --git a/resources/views/v2/bills/index.twig b/resources/views/v2/bills/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/bills/index.twig +++ b/resources/views/v2/bills/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# #} + {% endblock %} diff --git a/resources/views/v2/budgets/index.twig b/resources/views/v2/budgets/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/budgets/index.twig +++ b/resources/views/v2/budgets/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# #} + {% endblock %} diff --git a/resources/views/v2/categories/index.twig b/resources/views/v2/categories/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/categories/index.twig +++ b/resources/views/v2/categories/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# #} + {% endblock %} diff --git a/resources/views/v2/currencies/index.twig b/resources/views/v2/currencies/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/currencies/index.twig +++ b/resources/views/v2/currencies/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# #} + {% endblock %} diff --git a/resources/views/v2/export/index.twig b/resources/views/v2/export/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/export/index.twig +++ b/resources/views/v2/export/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# #} + {% endblock %} diff --git a/resources/views/v2/index.twig b/resources/views/v2/index.twig index 832f15de7c..2b033af3a0 100644 --- a/resources/views/v2/index.twig +++ b/resources/views/v2/index.twig @@ -1,4 +1,10 @@ {% extends "./layout/default" %} +{% block breadcrumbs %} + +{% endblock %} {% block content %} diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig index 0d3556cc80..fb86e2b66b 100644 --- a/resources/views/v2/layout/default.twig +++ b/resources/views/v2/layout/default.twig @@ -8,6 +8,10 @@ + + {# favicons #} + {% include('partials.layout.favicons') %} + {% if subTitle %} {{ subTitle }} ยป @@ -45,10 +49,7 @@ {{ subTitle }}</small></h1> </div><!-- /.col --> <div class="col-sm-6"> - <ol class="breadcrumb float-sm-right"> - <li class="breadcrumb-item"><a href="#">Home</a></li> - <li class="breadcrumb-item active">Bread crumbs v1</li> - </ol> + {% block breadcrumbs %}{% endblock %} </div><!-- /.col --> </div><!-- /.row --> </div><!-- /.container-fluid --> diff --git a/resources/views/v2/partials/layout/favicons.twig b/resources/views/v2/partials/layout/favicons.twig new file mode 100644 index 0000000000..3d7760d7e3 --- /dev/null +++ b/resources/views/v2/partials/layout/favicons.twig @@ -0,0 +1,11 @@ +<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png"> +<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=3e8AboOwbd"> +<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=3e8AboOwbd"> +<link rel="manifest" href="manifest.webmanifest?v=3e8AboOwbd"> +<link rel="mask-icon" href="safari-pinned-tab.svg" color="#3c8dbc"> +<link rel="shortcut icon" href="favicon.ico?v=3e8AboOwbd"> +<meta name="apple-mobile-web-app-title" content="Firefly III"> +<meta name="application-name" content="Firefly III"> +<meta name="msapplication-TileColor" content="#3c8dbc"> +<meta name="msapplication-TileImage" content="mstile-144x144.png?v=3e8AboOwbd"> +<meta name="theme-color" content="#3c8dbc"> diff --git a/resources/views/v2/piggy-banks/index.twig b/resources/views/v2/piggy-banks/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/piggy-banks/index.twig +++ b/resources/views/v2/piggy-banks/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# <script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script> #} + <script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script> {% endblock %} diff --git a/resources/views/v2/recurring/index.twig b/resources/views/v2/recurring/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/recurring/index.twig +++ b/resources/views/v2/recurring/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# <script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script> #} + <script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script> {% endblock %} diff --git a/resources/views/v2/reports/index.twig b/resources/views/v2/reports/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/reports/index.twig +++ b/resources/views/v2/reports/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# <script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script> #} + <script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script> {% endblock %} diff --git a/resources/views/v2/rules/index.twig b/resources/views/v2/rules/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/rules/index.twig +++ b/resources/views/v2/rules/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# <script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script> #} + <script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script> {% endblock %} diff --git a/resources/views/v2/tags/index.twig b/resources/views/v2/tags/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/tags/index.twig +++ b/resources/views/v2/tags/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# <script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script> #} + <script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script> {% endblock %} diff --git a/resources/views/v2/transactions/index.twig b/resources/views/v2/transactions/index.twig index 7d47e18afe..f942d4ebc0 100644 --- a/resources/views/v2/transactions/index.twig +++ b/resources/views/v2/transactions/index.twig @@ -12,5 +12,5 @@ {% endblock %} {% block scripts %} - {# <script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script> #} + <script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script> {% endblock %}