From 3d50c59e89dfe0420d95f7615c9ece12863696d9 Mon Sep 17 00:00:00 2001 From: mike-esokia Date: Fri, 1 Jun 2018 11:29:09 +0400 Subject: [PATCH] add download function refactored code of personalisation logo section wip - file upload --- .../Controller/Admin/SetupController.php | 2 + .../Form/Configuration/GeneralFormType.php | 15 ------- .../Configuration/PersonalisationLogoForm.php | 4 +- resources/www/admin/styles/main.scss | 7 ++-- .../web/admin/personalisation_logo.html.twig | 41 ++++++++++++++----- templates/web/admin/setup.html.twig | 3 +- 6 files changed, 41 insertions(+), 31 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php index a8e585d88a..c6bdf0c5c8 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php @@ -46,6 +46,8 @@ class SetupController extends Controller } if ('POST' === $request->getMethod()) { + var_dump($request); + die('here'); $form->submit($request->request->all()); if ($form->isValid()) { diff --git a/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php index cf4d55188d..904a261a90 100644 --- a/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php +++ b/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php @@ -62,21 +62,6 @@ class GeneralFormType extends AbstractType 'id' => 'personalize-logo-container' ] ]); -// $builder->add('personalize-logo-choice', 'choice', [ -// 'label' => 'Design of personalization logo section', -// 'choices' => ['original' => 'original', 'personalize' => 'personalize'], -// 'required'=>true, -// 'expanded'=>true, -// 'multiple'=>false, -// 'placeholder'=>false, -// 'attr' => [ -// 'id' => 'personalize-logo-container' -// ] -// -// ]); -// $builder->add('personalize-logo', 'file', [ -// 'label' => false, -// ]); } public function getName() diff --git a/lib/Alchemy/Phrasea/Form/Configuration/PersonalisationLogoForm.php b/lib/Alchemy/Phrasea/Form/Configuration/PersonalisationLogoForm.php index 0036ab0f50..eb9f7eae07 100644 --- a/lib/Alchemy/Phrasea/Form/Configuration/PersonalisationLogoForm.php +++ b/lib/Alchemy/Phrasea/Form/Configuration/PersonalisationLogoForm.php @@ -19,13 +19,13 @@ class PersonalisationLogoForm extends AbstractType { $builder->add('originalChoiceInput', 'choice', [ 'label' => false, - 'choices' => ['original' => 'original'], + 'choices' => ['original' => 'original-choice-label'], 'expanded' => true, ]); $builder->add('personaliseChoiceInput', 'choice', [ 'label' => false, - 'choices' => ['personalise' => 'personalise'], + 'choices' => ['personalise' => 'personalise-choice-label'], 'expanded' => true, ]); diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index d54760491e..57a271b416 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -685,6 +685,7 @@ span.simplecolorpicker.picker { margin-top: 10px; padding: 3px 20px; line-height: 11px; + margin-left: 0; } #help-text { font-family: Roboto; @@ -704,9 +705,9 @@ span.simplecolorpicker.picker { text-align: left; color: #ff0404; } - //input[type="file"] { - // display: none; - //} + input[type="file"] { + display: none; + } } } diff --git a/templates/web/admin/personalisation_logo.html.twig b/templates/web/admin/personalisation_logo.html.twig index 44f75eee26..90cfcfa7b2 100644 --- a/templates/web/admin/personalisation_logo.html.twig +++ b/templates/web/admin/personalisation_logo.html.twig @@ -3,9 +3,10 @@ {{ form_widget(form.originalChoiceInput, { 'attr': {'class': 'choice-radio'} }) }}
- + gabari
- {{ 'prod::setup: download gabari' | trans }} + {{ 'prod::setup: download gabari' | trans }} {{ form_widget(form.personaliseChoiceInput) }} @@ -16,7 +17,8 @@
{{ form_widget(form.personalizeLogoInput) }} - +
@@ -25,6 +27,7 @@ + diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index fbb3fb598a..0dd7e11dde 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -80,7 +80,8 @@
- +
{{ form_end(form) }}