From fd91a8eee60c4854c6af59a94020e931aa0cbe50 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 15 Jun 2016 21:21:17 +0800
Subject: [PATCH] Bunch of UX changes for polls builder.

---
 .../discourse/templates/modals/poll-ui-builder.hbs    | 10 +++++-----
 .../assets/stylesheets/common/poll-ui-builder.scss    |  7 +++++++
 plugins/poll/config/locales/client.en.yml             | 11 +++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
index c800db9aff9..bdb14b28528 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
@@ -1,12 +1,12 @@
 <div class="modal-body poll-ui-builder">
   <form class="poll-ui-builder-form form-horizontal">
     <div class="input-group">
-      <label>{{i18n 'poll.ui_builder.poll_name.label'}}</label>
+      <label class="input-group-label">{{i18n 'poll.ui_builder.poll_name.label'}}</label>
       {{input name="poll-name" value=pollName placeholder=pollNamePlaceholder}}
     </div>
 
     <div class="input-group">
-      <label>{{i18n 'poll.ui_builder.poll_type.label'}}</label>
+      <label class="input-group-label">{{i18n 'poll.ui_builder.poll_type.label'}}</label>
       {{combo-box content=pollTypes
                   value=pollType
                   valueAttribute="value"
@@ -36,7 +36,7 @@
     </div>
 
     <div class="input-group">
-      <label for="poll-public">
+      <label>
         {{input type='checkbox' checked=publicPoll}}
         {{i18n "poll.ui_builder.poll_public.label"}}
       </label>
@@ -46,12 +46,12 @@
       <div class="input-group">
         <label>{{i18n 'poll.ui_builder.poll_options.label'}}</label>
         {{input-tip validation=minNumOfOptionsValidation}}
-        {{d-editor value=pollOptions}}
+        {{textarea value=pollOptions}}
       </div>
     {{/unless}}
   </form>
 </div>
 
 <div class="modal-footer">
-  {{d-button action="insertPoll" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
+  {{d-button action="insertPoll" icon="bar-chart-o" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
 </div>
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
index a8467a3abbd..184cd20573d 100644
--- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -1,4 +1,6 @@
 .poll-ui-builder-form {
+  margin: 0px;
+
   .input-group {
     padding: 10px;
   }
@@ -8,6 +10,11 @@
     display: inline;
   }
 
+  .input-group-label {
+    display: inline-block;
+    width: 45px;
+  }
+
   .combobox {
     margin-right: 5px;
   }
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index 7113b022d74..fe219800968 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -72,14 +72,13 @@ en:
       ui_builder:
         title: Poll Builder
         insert: Insert Poll
-        reset: Reset Poll
         help:
           options_count: You must provide a minimum of 2 options.
         poll_name:
-          label: Poll Name
-          placeholder: Enter Poll Name
+          label: Name
+          placeholder: Enter Name
         poll_type:
-          label: Poll Type
+          label: Type
           regular: regular
           multiple: multiple
           number: number
@@ -88,6 +87,6 @@ en:
           min: Min
           step: Step
         poll_public:
-          label: Make Public Poll
+          label: Show who voted
         poll_options:
-          label: "Poll Choices: (one option per line)"
+          label: Enter one poll option per line