diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php index c6bdf0c5c8..a8e585d88a 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php @@ -46,8 +46,6 @@ class SetupController extends Controller } if ('POST' === $request->getMethod()) { - var_dump($request); - die('here'); $form->submit($request->request->all()); if ($form->isValid()) { diff --git a/templates/web/admin/personalisation_logo.html.twig b/templates/web/admin/personalisation_logo.html.twig index 90cfcfa7b2..4224814a32 100644 --- a/templates/web/admin/personalisation_logo.html.twig +++ b/templates/web/admin/personalisation_logo.html.twig @@ -82,16 +82,6 @@ var height = this.height; var width = this.width; - //check dimensions - if (height > 42 || width > 52) { - $('#error-text').text(errorDimension); - $('#error-text').show(); - $('#help-text').hide(); - $('#personalize-image-container').hide(); - $('#general_personalize-logo-choice_personalizeLogoInput').val(""); - return false; - } - //check file extension var ext = $('#general_personalize-logo-choice_personalizeLogoInput').val().split('.').pop().toLowerCase(); if (ext != 'png') { @@ -102,6 +92,17 @@ $('#personalize-image-container').hide(); return false; } + + //check dimensions + if (height > 42 || width > 52) { + $('#error-text').text(errorDimension); + $('#error-text').show(); + $('#help-text').hide(); + $('#personalize-image-container').hide(); + $('#general_personalize-logo-choice_personalizeLogoInput').val(""); + return false; + } + fileToUpload = input.files[0]; $('#personalize-image-container').show(); $('#error-text').hide(); diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index 0dd7e11dde..098c35625c 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -30,8 +30,7 @@ - -{{ form_start(form, {'method': 'POST', 'action' : path('setup_display_globals'), 'attr': {'class' : 'form-horizontal'}}) }} +{{ form_start(form, {'method': 'POST', 'action' : path('setup_display_globals'), 'attr': {'class' : 'form-horizontal', 'id': 'setupForm'}}) }} {{ form_errors(form) }} {% for daform in form %} {% if daform.vars['label'] != null %}