From 7f291d80b95ebade33f2888351e90eb4dc585ae2 Mon Sep 17 00:00:00 2001
From: Vlad <vlad@mailpoet.com>
Date: Wed, 24 Feb 2016 20:21:58 -0500
Subject: [PATCH] - Updates UI based on @rafaehlers review comments - Closes
 #323

---
 .../js/src/subscribers/importExport/export.js |  3 +-
 views/subscribers/importExport/export.html    | 40 +++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/assets/js/src/subscribers/importExport/export.js b/assets/js/src/subscribers/importExport/export.js
index 1608784341..1680bcf4b5 100644
--- a/assets/js/src/subscribers/importExport/export.js
+++ b/assets/js/src/subscribers/importExport/export.js
@@ -107,6 +107,7 @@ define(
 
      exportConfirmedOptionElement.change(function () {
        var selectedSegments = segmentsContainerElement.val();
+       console.log(selectedSegments);
        if (this.value == 1) {
          exportData.exportConfirmedOption = true;
          renderSegmentsAndFields(segmentsContainerElement, segmentsWithConfirmedSubscribers);
@@ -115,7 +116,7 @@ define(
          exportData.exportConfirmedOption = false;
          renderSegmentsAndFields(segmentsContainerElement, segments);
        }
-       segmentsContainerElement.select2('val', selectedSegments);
+       segmentsContainerElement.val(selectedSegments).trigger('change');
      });
 
      function toggleNextStepButton(condition) {
diff --git a/views/subscribers/importExport/export.html b/views/subscribers/importExport/export.html
index 3d20881662..27a775e44e 100644
--- a/views/subscribers/importExport/export.html
+++ b/views/subscribers/importExport/export.html
@@ -25,6 +25,26 @@
   </div>
   <table class="form-table">
     <tbody>
+    {{#if exportConfirmedOption}}
+    <tr>
+      <th scope="row">
+        <%= __('Export confirmed subscribers only') %>
+      </th>
+      <td>
+        <div>
+          <label>
+            <input type="radio"
+                   name="option_confirmed" value=1><%= __('Yes') %>
+          </label>
+          &nbsp;
+          <label>
+            <input type="radio"
+                   name="option_confirmed" value=0 checked><%= __('No') %>
+          </label>
+        </div>
+      </td>
+    </tr>
+    {{/if}}
     {{#if segments}}
     <tr>
       <th scope="row">
@@ -57,26 +77,6 @@
       </td>
     </tr>
     {{/if}}
-    {{#if exportConfirmedOption}}
-    <tr>
-      <th scope="row">
-        <%= __('Export confirmed subscribers only') %>
-      </th>
-      <td>
-        <div>
-          <label>
-            <input type="radio"
-             name="option_confirmed" value=1><%= __('Yes') %>
-          </label>
-          &nbsp;
-          <label>
-            <input type="radio"
-             name="option_confirmed" value=0 checked><%= __('No') %>
-          </label>
-        </div>
-      </td>
-    </tr>
-    {{/if}}
     <tr>
       <th scope="row">
         <%= __('Format') %>