From 410727bcf0d87ec55e6ccbd147c444211c4fc417 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 1 Jun 2020 16:06:09 +0400 Subject: [PATCH 1/3] PHRAS-3111 --- templates/web/prod/templates/upload.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/prod/templates/upload.html.twig b/templates/web/prod/templates/upload.html.twig index b9acb1766a..b90a96f401 100644 --- a/templates/web/prod/templates/upload.html.twig +++ b/templates/web/prod/templates/upload.html.twig @@ -42,10 +42,10 @@ From c67e0c02f2130e3447c7224e204888a9fe4865e0 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 1 Jun 2020 18:12:38 +0400 Subject: [PATCH 2/3] PHRAS-3111 --- templates/web/prod/templates/upload.html.twig | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/templates/web/prod/templates/upload.html.twig b/templates/web/prod/templates/upload.html.twig index b90a96f401..19b6608bf0 100644 --- a/templates/web/prod/templates/upload.html.twig +++ b/templates/web/prod/templates/upload.html.twig @@ -42,10 +42,19 @@ + From c34fe529608d699da5a1cdb4ad8459c29f58cdf1 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 1 Jun 2020 18:33:06 +0400 Subject: [PATCH 3/3] PHRAS-3113 Admin user replace icons --- .../www/common/images/icons/info-circle-green.svg | 1 + .../www/common/images/icons/info-circle-grey.svg | 1 + .../www/common/images/icons/info-circle-red.svg | 1 + templates/web/admin/editusers.html.twig | 14 +++++++------- 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 resources/www/common/images/icons/info-circle-green.svg create mode 100644 resources/www/common/images/icons/info-circle-grey.svg create mode 100644 resources/www/common/images/icons/info-circle-red.svg diff --git a/resources/www/common/images/icons/info-circle-green.svg b/resources/www/common/images/icons/info-circle-green.svg new file mode 100644 index 0000000000..e22a29406f --- /dev/null +++ b/resources/www/common/images/icons/info-circle-green.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/common/images/icons/info-circle-grey.svg b/resources/www/common/images/icons/info-circle-grey.svg new file mode 100644 index 0000000000..b3ad509b40 --- /dev/null +++ b/resources/www/common/images/icons/info-circle-grey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/common/images/icons/info-circle-red.svg b/resources/www/common/images/icons/info-circle-red.svg new file mode 100644 index 0000000000..95f5bde9ab --- /dev/null +++ b/resources/www/common/images/icons/info-circle-red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index e83482ed26..be5512cbe0 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -203,7 +203,7 @@
- +
@@ -336,9 +336,9 @@
{% if rights[constant('\\ACL::RESTRICT_DWNLD')] > 0 %} - + {% else %} - + {% endif %}
@@ -346,9 +346,9 @@
{% if rights['time_limited'] > 0 %} - + {% else %} - + {% endif %}
@@ -356,9 +356,9 @@
{% if rights['masks'] > 0 %} - + {% else %} - + {% endif %}