From a08a55b58e795c9198fbc7292bc291d81b80a5e2 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Mon, 8 Jan 2018 16:37:46 +0400 Subject: [PATCH] Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log # Conflicts: # .bowerrc --- .bowerrc | 2 +- .../Phrasea/Controller/Admin/SetupController.php | 6 ++---- lib/Alchemy/Phrasea/Controller/Api/V1Controller.php | 2 +- .../Core/Configuration/RegistryFormManipulator.php | 6 +++--- .../Phrasea/Form/Configuration/CustomLinkFormType.php | 4 ++++ .../Form/Configuration/MainConfigurationFormType.php | 2 +- resources/gulp/build.js | 3 ++- templates/web/admin/setup.html.twig | 10 ++++++---- templates/web/common/index_bootstrap.html.twig | 3 ++- 9 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.bowerrc b/.bowerrc index 28ccb8a9e0..db7db5ca95 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "www/bower_components" + "directory": "www/bower_components" } diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php index ad045207d8..a8e585d88a 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SetupController.php @@ -38,12 +38,10 @@ class SetupController extends Controller public function submitGlobalsAction(Request $request) { - if (null !== $this->configuration->get('registry')) - { + if (null !== $this->configuration->get('registry')) { $form = $this->registryFormManipulator->createForm($this->configuration); } - else - { + else { $form = $this->registryFormManipulator->createForm(); } diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php index b521d80a7b..a3022272c2 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php @@ -376,7 +376,7 @@ class V1Controller extends Controller 'password' => $conf->get(['registry', 'email', 'smtp-password']), ], ], - 'custom-links' => $conf->get(['registry', 'custom-links']), + 'custom-links' => $conf->get(['registry', 'custom-links']), 'ftp' => [ 'active' => $conf->get(['registry', 'ftp', 'ftp-enabled']), 'activeForUser' => $conf->get(['registry', 'ftp', 'ftp-user-access']), diff --git a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php index ead1dcc964..973db4f6e5 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php @@ -147,7 +147,7 @@ class RegistryFormManipulator 'recaptcha-public-key' => '', 'recaptcha-private-key' => '', ], - 'executables' => [ + 'executables' => [ 'h264-streaming-enabled' => false, 'auth-token-directory' => null, 'auth-token-directory-path' => null, @@ -162,7 +162,7 @@ class RegistryFormManipulator 'default-query' => '', 'default-query-type' => 0, ], - 'email' => [ + 'email' => [ 'emitter-email' => 'phraseanet@example.com', 'prefix' => null, 'smtp-enabled' => false, @@ -173,7 +173,7 @@ class RegistryFormManipulator 'smtp-user' => null, 'smtp-password' => isset($config['email']['smtp-password']) ? $config['email']['smtp-password'] : null, ], - 'custom-links' => [ + 'custom-links' => [ [ 'linkName' => 'Phraseanet store', 'linkLanguage' => 'fr', diff --git a/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php index 30838d9c28..d57a25efc2 100644 --- a/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php +++ b/lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php @@ -7,9 +7,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ + namespace Alchemy\Phrasea\Form\Configuration; + use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; + class CustomLinkFormType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) @@ -83,6 +86,7 @@ class CustomLinkFormType extends AbstractType ] ]); } + public function getName() { return null; diff --git a/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php index bf97379934..2d3fed341e 100644 --- a/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php +++ b/lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php @@ -74,7 +74,7 @@ class MainConfigurationFormType extends AbstractType public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults([ - 'required' => false, + 'required' => false, 'allow_extra_fields' => true ]); } diff --git a/resources/gulp/build.js b/resources/gulp/build.js index aba6843cc5..ac19e96789 100644 --- a/resources/gulp/build.js +++ b/resources/gulp/build.js @@ -50,4 +50,5 @@ gulp.task('build-vendors', [ 'build-jquery-lazyload', 'build-jquery-test-paths', 'build-simple-colorpicker' -], function() {}); +], function () { +}); diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index 40efe7d47f..020cc46753 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -37,16 +37,16 @@ {% if daform.vars['label'] != null %}
{{ daform.vars['label'] }} - {% for formdata in daform %} + {% for formdata in daform %}
{{ form_errors(formdata) }} - {{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }} + {{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }}
- {{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }} + {{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }}
{{ formdata.vars['help_message'] }}
- {{ form_rest(formdata) }} + {{ form_rest(formdata) }}
{% endfor %} {{ form_rest(daform) }} @@ -157,6 +157,7 @@ updateInputNameColor($(element).parent().siblings(':first').find("input"), $(element).val()); }); } + $("#custom-link-table").on('click', '.close-row', function () { $(this).closest('tr').remove(); var rowCount = $('#custom-link-table tr').length; @@ -179,6 +180,7 @@ element.css("background", color); } } + function updateInputNameColor(element, color) { element.css("background-color", color); if (color === "") { diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig index 9ebaf7f8c7..46b9a66668 100644 --- a/templates/web/common/index_bootstrap.html.twig +++ b/templates/web/common/index_bootstrap.html.twig @@ -25,7 +25,8 @@ - + {% block rss %}{% endblock %} {% block javascript %}{% endblock %}