diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 0ac8a4e580..a1e6ac294d 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -88,9 +88,10 @@ class CurrencyController extends Controller Session::put('currency.delete.url', URL::previous()); Session::flash('gaEventCategory', 'currency'); Session::flash('gaEventAction', 'delete'); + $subTitle = trans('form.delete_currency', ['name' => $currency->name]); - return view('currency.delete', compact('currency')); + return view('currency.delete', compact('currency', 'subTitle')); } /** diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index faf3f118ca..70126b332d 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -170,6 +170,13 @@ Breadcrumbs::register( } ); +Breadcrumbs::register( + 'currency.create', function (Generator $breadcrumbs) { + $breadcrumbs->parent('currency.index'); + $breadcrumbs->push(trans('firefly.create_currency'), route('currency.create')); +} +); + Breadcrumbs::register( 'currency.edit', function (Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); diff --git a/resources/twig/categories/create.twig b/resources/twig/categories/create.twig index 15435fe5aa..aa9b3967f5 100644 --- a/resources/twig/categories/create.twig +++ b/resources/twig/categories/create.twig @@ -7,43 +7,37 @@ {% block content %} {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('categories.store')}) }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('name') }} -
-
-
- -
- - -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','category') }} +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name') }} +
-
-
-
-
-

- -

-
-
+
- + +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','category') }} +
+
+ +
+
+
+
+ {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/currency/create.twig b/resources/twig/currency/create.twig index 72575e2f4c..956febad3c 100644 --- a/resources/twig/currency/create.twig +++ b/resources/twig/currency/create.twig @@ -6,43 +6,39 @@ {% block content %} {{ Form.open({'class' : 'form-horizontal','id' : 'store','route' : 'currency.store'}) }} -
-
-
-
- {{ 'mandatoryFields'|_ }} -
-
- {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} - {{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }} - {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }} +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} + {{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }} + {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }} +
+
-
+
-
+ +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','currency') }} +
+
+ +
+
- -
-
- {{ 'options'|_ }} -
-
- {{ ExpandedForm.optionsList('create','currency') }} -
-
-
-
-
-

- -

-
-
- + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/currency/delete.twig b/resources/twig/currency/delete.twig index 1c51ca2dec..7097eb7573 100644 --- a/resources/twig/currency/delete.twig +++ b/resources/twig/currency/delete.twig @@ -11,8 +11,7 @@
- - {{ trans('form.delete_currency', {'name': currency.name}) }} +

{{ trans('form.delete_currency', {'name': currency.name}) }}

@@ -21,15 +20,15 @@

{{ trans('form.currency_areYouSure', {'name': currency.name}) }}

-

- - {{ trans('form.cancel') }} -

+
+
+ + {{ trans('form.cancel') }}
- +{{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/currency/edit.twig b/resources/twig/currency/edit.twig index 30538b8bc0..5444860dc2 100644 --- a/resources/twig/currency/edit.twig +++ b/resources/twig/currency/edit.twig @@ -7,43 +7,39 @@ {% block content %} {{ Form.model(currency, {'class' : 'form-horizontal','id' : 'update','url' : route('currency.update',currency.id)}) }} - -
-
-
-
- {{ 'mandatoryFields'|_ }} -
-
- {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} - {{ ExpandedForm.text('symbol',null,{'maxlength' : 8}) }} - {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }} -
-
-
- -
- - -
-
- {{ 'options'|_ }} -
-
- {{ ExpandedForm.optionsList('update','currency') }} + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} + {{ ExpandedForm.text('symbol',null,{'maxlength' : 8}) }} + {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }} +
+
+ + +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','currency') }} +
+
+ +
+
+ +
-
-
-
-

- -

-
-
- + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/currency/index.twig b/resources/twig/currency/index.twig index b269645a11..8449d1a9fa 100644 --- a/resources/twig/currency/index.twig +++ b/resources/twig/currency/index.twig @@ -9,42 +9,45 @@
- Currencies +

Currencies

Firefly III supports various currencies which you can set and enable here.

-
    - {% if currencies|length > 0 %} - + {% if currencies|length > 0 %} +
    + + + + + + + + {% for currency in currencies %} - - - - {% for currency in currencies %} - - - - + + - - + + {% endfor %} -
     Currency
     Currency
    -
    - - -
    -     		{{ currency.name }} ({{ currency.code }}) ({{ currency.symbol|raw }}) + +
    + + +
    +     		{{ currency.name }} ({{ currency.code }}) ({{ currency.symbol|raw }}) {% if currency.id == defaultCurrency.id %} default {% else %} - make default + make default {% endif %} -
    - {% endif %} -

    Add another currency

    - + + + {% endif %} +
+
+ Add another currency
diff --git a/resources/twig/errors/404.twig b/resources/twig/errors/404.twig new file mode 100644 index 0000000000..00a360d391 --- /dev/null +++ b/resources/twig/errors/404.twig @@ -0,0 +1,74 @@ + + + + + + + + + +
+

Sorry, the page you are looking for could not be found.

+ +
+ + \ No newline at end of file diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig index b2ce742226..2b9c8ca942 100644 --- a/resources/twig/layout/default.twig +++ b/resources/twig/layout/default.twig @@ -106,11 +106,12 @@
{% include('partials/page-header.twig') %} {% block breadcrumbs %}{% endblock %} +
- + {% include('partials/flashes.twig') %} {% block content %}{% endblock %}