From 74985fd0f2b97b78c3d26c073ad8555881de8217 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 23 Oct 2017 15:12:27 +0200
Subject: [PATCH] Use text for the addUser button in polls

---
 customize.dist/pages.js                    |  2 +-
 customize.dist/translations/messages.fr.js |  2 +-
 customize.dist/translations/messages.js    |  2 +-
 www/poll/app-poll.less                     | 26 +++++++++++++++++-----
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 756f80caa..793f2133e 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -660,7 +660,7 @@ define([
                             h('div#cp-app-poll-table-scroll', [h('table')]),
                             h('button#cp-app-poll-create-user.btn.btn-secondary', {
                                 title: Msg.poll_create_user
-                            }, h('span.fa.fa-plus')),
+                            }, Msg.poll_commit),
                             h('button#cp-app-poll-create-option.btn.btn-secondary', {
                                 title: Msg.poll_create_option
                             }, h('span.fa.fa-plus')),
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 0dedd63fb..c21a7bb52 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -234,7 +234,7 @@ define(function () {
     out.poll_admin_button = "Administrer";
     out.poll_create_user = "Ajouter un utilisateur";
     out.poll_create_option = "Ajouter une option";
-    out.poll_commit = "Valider";
+    out.poll_commit = "Ajouter";
 
     out.poll_closeWizardButton = "Fermer l'assistant";
     out.poll_closeWizardButtonTitle = "Fermer l'assistant";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index ef81fe642..9e9531627 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -238,7 +238,7 @@ define(function () {
     out.poll_admin_button = "Admin";
     out.poll_create_user = "Add a new user";
     out.poll_create_option = "Add a new option";
-    out.poll_commit = "Commit";
+    out.poll_commit = "Submit";
 
     out.poll_closeWizardButton = "Close wizard";
     out.poll_closeWizardButtonTitle = "Close wizard";
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 3ec34719b..978709a94 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -35,6 +35,10 @@
 @poll-option-yellow: #ff5;
 @poll-option-gray: #ccc;
 
+@poll-add-color: #fff;
+@poll-add-bg: #777;
+@poll-add-bg-alt: #444;
+
 .bottom-left(@s: 5px) { border-bottom-left-radius: @s; }
 .top-left(@s: 5px) { border-top-left-radius: @s; }
 
@@ -97,17 +101,29 @@ table#cp-app-poll-table {
 }
 #cp-app-poll-create-user {
     display: inline-flex;
-    height: 24px;
-    padding: 0;
-    width: 50px;
+    height: 20px;
+    padding: 0 5px;
+    margin: 2px auto;
+    width: auto;
     overflow: hidden;
+    color: @poll-add-color;
+    background: @poll-add-bg;
+    &:hover {
+        background: @poll-add-bg-alt;
+    }
 }
 #cp-app-poll-create-option {
     order: 3;
     display: inline-flex;
-    width: 50px;
-    height: 24px;
+    width: 46px;
+    height: 20px;
+    margin: 2px;
     padding: 0;
+    color: @poll-add-color;
+    background: @poll-add-bg;
+    &:hover {
+        background: @poll-add-bg-alt;
+    }
 }
 #cp-app-poll-table-scroll {
     overflow-y: hidden;