Skip to content
Snippets Groups Projects
Commit 76c56a69 authored by Olivier Perez's avatar Olivier Perez
Browse files

Merge branch 'master' into 'master' 

If SMTP is enabled, 'private result' option is still activated.

'private result' option was hidded when the SMTP was not used.

See merge request !67
parents 73af05cf 0e8ee276
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 15 deletions
tpl/create_poll.tpl
+ 17
− 15
View file @ 76c56a69
......@@ -136,23 +136,25 @@
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8">
<div class="checkbox">
<label>
<input type="checkbox" name="hidden" {if $poll_hidden}checked{/if}
id="hidden">
{__('Step 1', 'Only the poll maker can see the poll\'s results')}
</label>
</div>
<div id="hiddenWithBadEditionModeError" class="alert alert-danger hidden">
<p>
{__('Error', 'You can\'t create a poll with hidden results with the following edition option:')}"{__('Step 1', 'All voters can modify any vote')}"
</p>
</div>
{/if}
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8">
<div class="checkbox">
<label>
<input type="checkbox" name="hidden" {if $poll_hidden}checked{/if}
id="hidden">
{__('Step 1', 'Only the poll maker can see the poll\'s results')}
</label>
</div>
<div id="hiddenWithBadEditionModeError" class="alert alert-danger hidden">
<p>
{__('Error', 'You can\'t create a poll with hidden results with the following edition option:')}"{__('Step 1', 'All voters can modify any vote')}"
</p>
</div>
</div>
{/if}
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment