diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Export.php b/lib/Alchemy/Phrasea/Controller/Prod/Export.php index b4bcf7b87f..94edf99897 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Export.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Export.php @@ -297,7 +297,7 @@ class Export implements ControllerProviderInterface $mail->setButtonUrl($url); $mail->setExpiration($endDateObject); - $app['notification.deliverer']->deliver($mail); + $app['notification.deliverer']->deliver($mail, !!$request->request->get('reading_confirm', false)); unset($remaingEmails[$key]); } diff --git a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php index a9abce7441..675e35ba17 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php @@ -77,7 +77,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface ), 'address' => array( 'label' => _('admin::compte-utilisateur adresse'), - 'type' => 'textarea', + 'type' => 'text', 'constraints' => array( new Assert\NotBlank(), ) @@ -96,7 +96,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface new Assert\NotBlank(), ) ), - 'position' => array( + 'job' => array( 'label' => _('admin::compte-utilisateur poste'), 'type' => 'text', 'constraints' => array( @@ -110,7 +110,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface new Assert\NotBlank(), ) ), - 'job' => array( + 'position' => array( 'label' => _('admin::compte-utilisateur activite'), 'type' => 'text', 'constraints' => array( diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index 17a1d93564..9ae65cc4aa 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -35,7 +35,7 @@ -
+ {% for section in GV %}
{{ section['section'] }} @@ -63,7 +63,10 @@ {% elseif value['type'] == 'string' %}
{% elseif value['type'] == 'password' %} -
+
+ {# input type=password is double because of chrome and autofill issue see http://stackoverflow.com/questions/10938891/disable-autofill-in-chrome-without-disabling-autocomplete #} + + {% elseif value['type'] == 'text' %}
{% elseif value['type'] == 'enum' %} diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig index 6eb2b714ba..3bd1794632 100644 --- a/templates/web/prod/actions/edit_default.html.twig +++ b/templates/web/prod/actions/edit_default.html.twig @@ -31,7 +31,7 @@ {% set class_status = '' %} {% endif %} -
+
{{ record.get_original_name() }}
diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index 21a4f63091..8a9d5b8f49 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -6,7 +6,7 @@
  • - {{ par.get_title() }} + {{ par.get_title() }}
  • {% endfor %} diff --git a/www/skins/login/less/skin.less b/www/skins/login/less/skin.less index fd32830027..aeaaaa80b8 100644 --- a/www/skins/login/less/skin.less +++ b/www/skins/login/less/skin.less @@ -514,7 +514,7 @@ button[type=submit] { box-radius: @inputBorderRadius !important; } -.input-table input { +.input-table input, .input-table select, .input-table textarea { border: @inputBorder !important; background-color: @inputBackground !important; color: @textColor !important; diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index f472f948f3..f54b6b8eb8 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -2200,7 +2200,6 @@ DIV.thesaurus U.w { } .GRP_IMAGE_REP { - background-color: #B1B1B1; margin: 5px; padding: 5px; position: absolute; diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index 00c35bf4fc..94aa87bb55 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -2244,7 +2244,6 @@ DIV.thesaurus U.w { } .GRP_IMAGE_REP { - background-color: #B1B1B1; margin: 5px; padding: 5px; position: absolute;