diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php index a29146cac7..5137d3f219 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php @@ -153,6 +153,7 @@ class LanguageController 'title notice' => $translator->trans('prod:mapboxgl: title notice'), 'description notice' => $translator->trans('prod:mapboxgl: description notice'), 'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'), + 'create new user' => $translator->trans('prod:push: create new user'), ]); } } diff --git a/resources/www/common/images/icons/delete-black.png b/resources/www/common/images/icons/delete-black.png new file mode 100644 index 0000000000..b4a5e8004e Binary files /dev/null and b/resources/www/common/images/icons/delete-black.png differ diff --git a/resources/www/common/images/icons/delete-white.png b/resources/www/common/images/icons/delete-white.png new file mode 100644 index 0000000000..fb8bf3868e Binary files /dev/null and b/resources/www/common/images/icons/delete-white.png differ diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig index f2cfa27b18..3dda889f64 100644 --- a/templates/web/prod/User/Add.html.twig +++ b/templates/web/prod/User/Add.html.twig @@ -4,57 +4,39 @@ + + + - - - - - - - - - - - - - - diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig index e612dd31b8..9fea29dcf1 100644 --- a/templates/web/prod/actions/Push.html.twig +++ b/templates/web/prod/actions/Push.html.twig @@ -42,7 +42,8 @@ {% endif %}
  • @@ -50,11 +51,11 @@
    - {{ 'Lists' | trans }} + + {{ 'Lists' | trans }} @@ -147,8 +151,10 @@
    {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %} - {{ 'Add user' | trans }} + + + + {{ 'Add user' | trans }} {% endif %}
    @@ -192,6 +198,7 @@
    - + - + +
    +
    - + - +
    - + - +
    - - - -
    - - - -
    - - - -
    - - + + +
    +
    @@ -216,8 +223,10 @@
    -
    diff --git a/templates/web/prod/templates/push.html.twig b/templates/web/prod/templates/push.html.twig index 9e5521ac7a..13ed64b37a 100644 --- a/templates/web/prod/templates/push.html.twig +++ b/templates/web/prod/templates/push.html.twig @@ -143,12 +143,12 @@
    - - +
    - - +