Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

# Conflicts:
#	.bowerrc

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();
         }
 

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;

resources/gulp/build.js

@@ -50,4 +50,5 @@ gulp.task('build-vendors', [
     'build-jquery-lazyload',
     'build-jquery-test-paths',
     'build-simple-colorpicker'
-], function() {});
+], function () {
+});

templates/web/admin/setup.html.twig

@@ -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 === "") {

templates/web/common/index_bootstrap.html.twig

@@ -25,7 +25,8 @@
         <script type="text/javascript">
             google.charts.load('42', {packages: ['corechart']});
         </script>
-        <script type="text/javascript" src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
+        <script type="text/javascript"
+                src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
         {% block rss %}{% endblock %}
         {% block javascript %}{% endblock %}
     </head>