Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-07-25 19:03:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
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
This commit is contained in:
Olivier Perez 2015-10-12 23:36:35 +02:00
commit 76c56a69ec
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tpl/create_poll.tpl
View file

@ -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>