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

# Conflicts:
#	.bowerrc

.bowerrc

@@ -1,3 +1,3 @@
 {
-    "directory": "www/bower_components"
+  "directory": "www/bower_components"
 }

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/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']),

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',

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;

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

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

@@ -37,16 +37,16 @@
     {% if daform.vars['label'] != null %}
         <fieldset>
             <legend>{{ daform.vars['label'] }}</legend>
-            {%  for formdata in daform %}
+            {% for formdata in daform %}
                 <div class="control-group">
                     {{ form_errors(formdata) }}
-                    {{  form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }}
+                    {{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }}
                     <div class="controls">
-                        {{  form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }}
+                        {{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }}
                     </div>
 
                     <div>{{ formdata.vars['help_message'] }}</div>
-                    {{  form_rest(formdata) }}
+                    {{ form_rest(formdata) }}
                 </div>
             {% 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 === "") {

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>