Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

- Updates UI based on @rafaehlers review comments

Browse Source 
- Closes #323
This commit is contained in:
Vlad
2016-02-24 20:21:58 -05:00
parent a883e1176c
commit 7f291d80b9
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/js/src/subscribers/importExport/export.js
View File

@@ -107,6 +107,7 @@ define(
exportConfirmedOptionElement.change(function () { exportConfirmedOptionElement.change(function () {
var selectedSegments = segmentsContainerElement.val(); var selectedSegments = segmentsContainerElement.val();
console.log(selectedSegments);
if (this.value == 1) { if (this.value == 1) {
exportData.exportConfirmedOption = true; exportData.exportConfirmedOption = true;
renderSegmentsAndFields(segmentsContainerElement, segmentsWithConfirmedSubscribers); renderSegmentsAndFields(segmentsContainerElement, segmentsWithConfirmedSubscribers);
@@ -115,7 +116,7 @@ define(
exportData.exportConfirmedOption = false; exportData.exportConfirmedOption = false;
renderSegmentsAndFields(segmentsContainerElement, segments); renderSegmentsAndFields(segmentsContainerElement, segments);
} }
segmentsContainerElement.select2('val', selectedSegments); segmentsContainerElement.val(selectedSegments).trigger('change');
}); });
function toggleNextStepButton(condition) { function toggleNextStepButton(condition) {

40
views/subscribers/importExport/export.html
View File

@@ -25,6 +25,26 @@
</div> </div>
<table class="form-table"> <table class="form-table">
<tbody> <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}} {{#if segments}}
<tr> <tr>
<th scope="row"> <th scope="row">
@@ -57,26 +77,6 @@
</td> </td>
</tr> </tr>
{{/if}} {{/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> <tr>
<th scope="row"> <th scope="row">
<%= __('Format') %> <%= __('Format') %>