Skip to content

Commit

Permalink
cancel btns for config pages fix #116 fix #98 fix #62
Browse files Browse the repository at this point in the history
  • Loading branch information
@eeemarv
eeemarv committed Jul 12, 2021
1 parent 0c14870 commit 21910be
Show file tree
Hide file tree
Showing 17 changed files with 48 additions and 88 deletions.
4 changes: 4 additions & 0 deletions src/Controller/Transactions/TransactionsAutoMinLimitController.php
View file
Expand Up @@ -157,6 +157,10 @@ public function __invoke(
$out .= 'Account Codes gescheiden door comma\'s</p>';
$out .= '</div>';

$out .= $link_render->btn_cancel('transactions_autominlimit', $pp->ary(), []);

$out .= '&nbsp;';

$out .= '<input type="submit" value="Aanpassen" name="zend" class="btn btn-primary btn-lg">';
$out .= $form_token_service->get_hidden_input();

Expand Down
6 changes: 4 additions & 2 deletions src/Controller/Transactions/TransactionsMassController.php
View file
Expand Up @@ -12,6 +12,7 @@
use App\Service\AutoMinLimitService;
use App\Service\ConfigService;
use App\Service\FormTokenService;
use App\Service\ItemAccessService;
use App\Service\MailAddrSystemService;
use App\Service\MailAddrUserService;
use App\Service\MenuService;
Expand Down Expand Up @@ -101,6 +102,7 @@ public function __invoke(
LoggerInterface $logger,
AlertService $alert_service,
FormTokenService $form_token_service,
ItemAccessService $item_access_service,
ConfigService $config_service,
MenuService $menu_service,
LinkRender $link_render,
Expand Down Expand Up @@ -813,7 +815,7 @@ public function __invoke(
$out .= '">';

$out .= '</div>';
$out .= '<p>Gebruik dit voor een "Eén naar veel" transactie.';
$out .= '<p>Vul dit enkel in bij een "Eén naar veel" transactie.';
$out .= 'Alle ingevulde bedragen hieronder ';
$out .= 'worden van dit Account gehaald.</p>';
$out .= '</div>';
Expand Down Expand Up @@ -964,7 +966,7 @@ public function __invoke(
$out .= '" ';
$out .= 'data-typeahead-source="from_code">';
$out .= '</div>';
$out .= '<p>Gebruik dit voor een "Veel naar één" transactie. ';
$out .= '<p>Vul dit enkel in bij een "Veel naar één" transactie. ';
$out .= 'Bijvoorbeeld, een ledenbijdrage. ';
$out .= 'Alle ingevulde bedragen hierboven ';
$out .= 'gaan naar dit Account.</p>';
Expand Down
7 changes: 7 additions & 0 deletions templates/config/base/config_form.html.twig
View file
Expand Up @@ -48,6 +48,13 @@
{%- block form_content -%}
{%- endblock -%}

{%- block cancel_btn -%}
<a href="{{- path(app.request.attributes.get('_route'), pp_ary()) -}}" class="btn btn-lg btn-default">
{{- 'btn.cancel'|trans -}}
</a>
&nbsp;
{%- endblock -%}

{%- block submit_btn -%}
{{- form_widget(form.submit, {
'label': 'btn.edit',
Expand Down
7 changes: 7 additions & 0 deletions templates/messages/base/messages_form.html.twig
View file
Expand Up @@ -14,6 +14,13 @@
{%- block form_content -%}
{%- endblock -%}

{%- block cancel_btn -%}
<a href="{{- path(app.request.attributes.get('_route'), pp_ary()) -}}" class="btn btn-lg btn-default">
{{- 'btn.cancel'|trans -}}
</a>
&nbsp;
{%- endblock -%}

{%- block submit_btn -%}
{{- form_widget(form.submit, {
'label': 'btn.edit',
Expand Down
2 changes: 1 addition & 1 deletion templates/news/base/news_form.html.twig
View file
Expand Up @@ -15,7 +15,7 @@
{%- endblock -%}

{%- block cancel_btn -%}
<a href="{{- path(cancel_route, pp_ary()) -}}" class="btn btn-lg btn-default">
<a href="{{- path(app.request.attributes.get('_route'), pp_ary()) -}}" class="btn btn-lg btn-default">
{{- 'btn.cancel'|trans -}}
</a>
&nbsp;
Expand Down
2 changes: 0 additions & 2 deletions templates/news/news_sort.html.twig
View file
Expand Up @@ -9,8 +9,6 @@
{{- 'news_sort.title'|trans -}}
{%- endblock heading_title -%}

{%- set cancel_route = 'news_sort' -%}

{%- block form_content -%}
{{- form_row(form.sort_asc, {
'label': 'news_sort.sort_asc',
Expand Down
20 changes: 15 additions & 5 deletions templates/transactions/base/transactions_form.html.twig
View file
@@ -1,4 +1,5 @@
{%- extends 'transactions/base/transactions_base.html.twig' -%}

{%- if form is defined -%}
{%- form_theme form 'form_3.html.twig' -%}
{%- endif -%}
Expand All @@ -14,11 +15,20 @@
{%- block form_content -%}
{%- endblock -%}

{{- form_widget(form.submit, {
'label': 'Aanpassen',
'attr': {'class': 'btn-primary btn-lg'},
'translation_domain': false
}) -}}
{%- block cancel_btn -%}
<a href="{{- path(app.request.attributes.get('_route'), pp_ary()) -}}" class="btn btn-lg btn-default">
{{- 'btn.cancel'|trans -}}
</a>
&nbsp;
{%- endblock -%}

{%- block submit_btn -%}
{{- form_widget(form.submit, {
'label': 'Aanpassen',
'attr': {'class': 'btn-primary btn-lg'},
'translation_domain': false
}) -}}
{%- endblock submit_btn -%}

<input type="hidden" name="form_token" value="{{ form_token }}">
</div>
Expand Down
24 changes: 3 additions & 21 deletions templates/transactions/transactions_currency.html.twig
View file
@@ -1,4 +1,4 @@
{%- extends 'transactions/base/transactions_base.html.twig' -%}
{%- extends 'transactions/base/transactions_form.html.twig' -%}
{%- form_theme form 'form_3.html.twig' -%}

{%- block heading_fa -%}
Expand All @@ -9,14 +9,7 @@
{{- 'transactions_currency.title'|trans -}}
{%- endblock heading_title -%}

{%- block content -%}

<div class="panel panel-info">
<div class="panel-heading">

{{- form_start(form) -}}
<div class="custom-checkbox">

{%- block form_content -%}
{{- form_row(form.currency, {
'label': 'transactions_currency.currency.label',
'pre_addon': {
Expand All @@ -39,15 +32,4 @@
'required': false
}) -}}

{{- form_widget(form.submit, {
'label': 'btn.edit',
'attr': {'class': 'btn-primary btn-lg'},
}) -}}

<input type="hidden" name="form_token" value="{{ form_token }}">
</div>
{{- form_end(form) -}}

</div>
</div>
{%- endblock content -%}
{%- endblock form_content -%}
25 changes: 3 additions & 22 deletions templates/transactions/transactions_leaving_eq.html.twig
View file
@@ -1,4 +1,4 @@
{%- extends 'transactions/base/transactions_base.html.twig' -%}
{%- extends 'transactions/base/transactions_form.html.twig' -%}
{%- form_theme form 'form_3.html.twig' -%}

{%- block heading_fa -%}
Expand All @@ -9,31 +9,12 @@
{{- 'transactions_leaving_eq.title'|trans -}}
{%- endblock heading_title -%}

{%- block content -%}

<div class="panel panel-info">
<div class="panel-heading">

{{- form_start(form) -}}
<div class="custom-checkbox">

{%- block form_content -%}
{{- form_row(form.eq, {
'label': 'transactions_leaving_eq.leaving_eq.label',
'pre_addon': {
'text': config_str('transactions.currency.name', schema)
},
'help': 'transactions_leaving_eq.leaving_eq.help',
}) -}}

{{- form_widget(form.submit, {
'label': 'btn.edit',
'attr': {'class': 'btn-primary btn-lg'},
}) -}}

<input type="hidden" name="form_token" value="{{ form_token }}">
</div>
{{- form_end(form) -}}

</div>
</div>
{%- endblock content -%}
{%- endblock form_content -%}
25 changes: 3 additions & 22 deletions templates/transactions/transactions_system_limits.html.twig
View file
@@ -1,4 +1,4 @@
{%- extends 'transactions/base/transactions_base.html.twig' -%}
{%- extends 'transactions/base/transactions_form.html.twig' -%}
{%- form_theme form 'form_3.html.twig' -%}

{%- block heading_fa -%}
Expand All @@ -9,14 +9,7 @@
{{- 'transactions_system_limits.title'|trans -}}
{%- endblock heading_title -%}

{%- block content -%}

<div class="panel panel-info">
<div class="panel-heading">

{{- form_start(form) -}}
<div class="custom-checkbox">

{%- block form_content -%}
{{- form_row(form.min, {
'label': 'transactions_system_limits.min.label',
'pre_addon': {
Expand All @@ -36,16 +29,4 @@
'help': 'transactions_system_limits.max.help',
'required': false
}) -}}

{{- form_widget(form.submit, {
'label': 'btn.edit',
'attr': {'class': 'btn-primary btn-lg'},
}) -}}

<input type="hidden" name="form_token" value="{{ form_token }}">
</div>
{{- form_end(form) -}}

</div>
</div>
{%- endblock content -%}
{%- endblock form_content -%}
2 changes: 1 addition & 1 deletion templates/users/base/users_form.html.twig
View file
Expand Up @@ -15,7 +15,7 @@
{%- endblock -%}

{%- block cancel_btn -%}
<a href="{{- path(cancel_route, pp_ary()) -}}" class="btn btn-lg btn-default">
<a href="{{- path(app.request.attributes.get('_route'), pp_ary()) -}}" class="btn btn-lg btn-default">
{{- 'btn.cancel'|trans -}}
</a>
&nbsp;
Expand Down
2 changes: 0 additions & 2 deletions templates/users/users_config_leaving.html.twig
View file
Expand Up @@ -10,8 +10,6 @@
user-times
{%- endblock heading_fa -%}

{%- set cancel_route = 'users_config_leaving' -%}

{%- block form_content -%}
{{- form_row(form.equilibrium, {
'label': 'users_config_leaving.equilibrium.label',
Expand Down
2 changes: 0 additions & 2 deletions templates/users/users_config_new.html.twig
View file
Expand Up @@ -10,8 +10,6 @@
user-plus
{%- endblock heading_fa -%}

{%- set cancel_route = 'users_config_new' -%}

{%- block form_content -%}
{{- form_row(form.days, {
'label': 'users_config_new.days.label',
Expand Down
2 changes: 0 additions & 2 deletions templates/users/users_full_name.html.twig
View file
Expand Up @@ -9,8 +9,6 @@
{{- 'users_full_name.title'|trans -}}
{%- endblock heading_title -%}

{%- set cancel_route = 'users_full_name' -%}

{%- block form_content -%}
{{- form_row(form.self_edit, {
'label': 'users_full_name.self_edit',
Expand Down
2 changes: 0 additions & 2 deletions templates/users/users_modules.html.twig
View file
Expand Up @@ -5,8 +5,6 @@
{{- 'users_modules.title'|trans -}}
{%- endblock heading_title -%}

{%- set cancel_route = 'users_modules' -%}

{%- block form_content -%}
{{- form_row(form.users_fields_full_name_enabled, {
'label': 'label.full_name',
Expand Down
2 changes: 0 additions & 2 deletions templates/users/users_periodic_mail.html.twig
View file
Expand Up @@ -9,8 +9,6 @@
envelope-o
{%- endblock heading_fa -%}

{%- set cancel_route = 'users_periodic_mail' -%}

{%- block form_content -%}

{{- form_row(form.days, {
Expand Down
2 changes: 0 additions & 2 deletions templates/users/users_username.html.twig
View file
Expand Up @@ -9,8 +9,6 @@
{{- 'users_username.title'|trans -}}
{%- endblock heading_title -%}

{%- set cancel_route = 'users_username' -%}

{%- block form_content -%}
{{- form_row(form.self_edit, {
'label': 'users_username.self_edit',
Expand Down

0 comments on commit 21910be

Please sign in to comment.