68d5b64180
Modification de la BDD : ajout de la colonne mail dans la table vote Modification de la BDD : ajout de la colonne mail dans la table vote (bis) MAJ de VoteRepository : méthode insert et update MAJ de PollService : méthodes updateVote, addVote et splitVotes Modification studs.php, adminstuds.php et vote_table_date.tpl : OK pour l'ajout d'un vote avec nom + mail Modification de vote_table_classic.tpl : OK pour l'ajout d'un vote avec nom + mail Ajout d'un bouton enveloppe pour chaque colonne avec méthode de traitement pour test Le numéro de la colonne est enfin récupéré correctement Implémentation récupération des adresses mails des sondés intéressants dans adminstuds.php et appel d'un fichier display_mails.tpl qui affichent ces adresses mails. Extension du traitement pour les sondages classic Ajout récupération des adresses des non aussi, et ajouts de tests pour l'affichage Changement des input type=text en type=email Corrections automatiques pour passage pipelines Corrections suite aux remarques sur la merge request Corrections 2 suite aux remarques sur la merge request Corrections 3 suite aux remarques sur la merge request Modif BDD : ajout colonne collect_mail dans poll Modif classes Form, PollRepository Passage de la collecte des mails des sondés en fonctionalité optionnelle Si la collecte de mail est activée, la saisie du mail est obligatoire Ajout avertissements collect_mail + editableByAll dans création de sondage et tableaux de vote Update create poll string and put a danger background on warning Signed-off-by: Thomas Citharel <tcit@tcit.fr> Translation strings updated and better position for the email public warning message Also, a CSS tweak and cleanup Signed-off-by: Thomas Citharel <tcit@tcit.fr> CS Signed-off-by: Thomas Citharel <tcit@tcit.fr>
372 lines
20 KiB
Smarty
372 lines
20 KiB
Smarty
{extends file='page.tpl'}
|
|
|
|
{block name="header"}
|
|
<script src="{"js/simplemde.min.js"|resource}" type="text/javascript"></script>
|
|
<script src="{"js/mde-wrapper.js"|resource}" type="text/javascript"></script>
|
|
<script src="{"js/app/create_poll.js"|resource}" type="text/javascript"></script>
|
|
<link rel="stylesheet" href="{"css/app/create_poll.css"|resource}">
|
|
<link rel="stylesheet" href="{"css/simplemde.min.css"|resource}">
|
|
|
|
{/block}
|
|
|
|
{block name=main}
|
|
<div class="row" style="display:none" id="form-block">
|
|
<div class="col-md-8 col-md-offset-2">
|
|
<form name="formulaire" id="formulaire" action="" method="POST" class="form-horizontal" role="form">
|
|
|
|
<div class="alert alert-info">
|
|
<p>
|
|
{__('Step 1', 'You are in the poll creation section.')}<br/>
|
|
{__('Step 1', 'Required fields cannot be left blank.')}
|
|
</p>
|
|
</div>
|
|
|
|
<div class="form-group {$errors['name']['class']}">
|
|
<label for="yourname" class="col-sm-4 control-label">{__('Generic', 'Your name')} *</label>
|
|
|
|
<div class="col-sm-8">
|
|
{if $useRemoteUser}
|
|
<input type="hidden" name="name" value="{$form->admin_name}" />{$form->admin_name}
|
|
{else}
|
|
<input id="yourname" type="text" required name="name" class="form-control" {$errors['name']['aria']} value="{$poll_name|html}" />
|
|
{/if}
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['name']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_title_error">
|
|
{$errors['name']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
{if $use_smtp}
|
|
<div class="form-group {$errors['email']['class']}">
|
|
<label for="email" class="col-sm-4 control-label">
|
|
{__('Generic', 'Your email address')} *<br/>
|
|
<span class="small">{__('Generic', '(in the format name@mail.com)')}</span>
|
|
</label>
|
|
|
|
<div class="col-sm-8">
|
|
{if $useRemoteUser}
|
|
<input type="hidden" name="mail" value="{$form->admin_mail}">{$form->admin_mail}
|
|
{else}
|
|
<input id="email" required type="email" name="mail" class="form-control" {$errors['email']['aria']} value="{$poll_mail|html}" />
|
|
{/if}
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['email']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_title_error">
|
|
{$errors['email']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
{/if}
|
|
|
|
<div class="form-group {$errors['title']['class']}">
|
|
<label for="poll_title" class="col-sm-4 control-label">{__('Step 1', 'Poll title')} *</label>
|
|
|
|
<div class="col-sm-8">
|
|
<input id="poll_title" type="text" name="title" class="form-control" required {$errors['title']['aria']}
|
|
value="{$poll_title|html}"/>
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['title']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_title_error">
|
|
{$errors['title']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
<div class="form-group {$errors['description']['class']}">
|
|
<label for="poll_comments" class="col-sm-4 control-label">{__('Generic', 'Description')}</label>
|
|
|
|
<div class="col-sm-8">
|
|
{include 'part/description_markdown.tpl'}
|
|
<div>
|
|
<textarea id="poll_comments" name="description"
|
|
class="form-control" {$errors['description']['aria']}
|
|
rows="5">{$poll_description|escape}</textarea>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['description']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_title_error">
|
|
{$errors['description']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
{* Optionnal parameters *}
|
|
<div class="col-sm-offset-3 col-sm-1 hidden-xs">
|
|
<p class="lead">
|
|
<i class="glyphicon glyphicon-cog" aria-hidden="true"></i>
|
|
</p>
|
|
</div>
|
|
<div class="col-sm-8 col-xs-12">
|
|
<span class="lead visible-xs-inline">
|
|
<i class="glyphicon glyphicon-cog" aria-hidden="true"></i>
|
|
</span>
|
|
<a class="optionnal-parameters {if !$advanced_errors}collapsed{/if} lead" role="button" data-toggle="collapse" href="#optionnal" aria-expanded="{if $advanced_errors}false{else}true{/if}" aria-controls="optionnal">
|
|
{__('Step 1', "Optional parameters")}
|
|
<i class="caret" aria-hidden="true"></i>
|
|
<i class="caret caret-up" aria-hidden="true"></i>
|
|
</a>
|
|
|
|
</div>
|
|
<div class="clearfix"></div>
|
|
|
|
|
|
<div class="collapse{if $advanced_errors} in{/if}" id="optionnal" {if $advanced_errors}aria-expanded="true"{/if}>
|
|
{* Poll identifier *}
|
|
|
|
<div class="form-group {$errors['customized_url']['class']}">
|
|
|
|
{* Value MAX *}
|
|
<div class="form-group {$errors['ValueMax']['class']}">
|
|
<label for="use_valueMax" class="col-sm-4 control-label">
|
|
{__('Step 1', 'Value Max')}<br/>
|
|
</label>
|
|
<div class="col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input id="use_ValueMax" name="use_ValueMax" type="checkbox" {if $use_ValueMax}checked{/if}>
|
|
{__('Step 1', "Limit the amount of voters per option")}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group {$errors['ValueMax']['class']}">
|
|
<div id="ValueMax" {if !$use_ValueMax}class="hidden"{/if}>
|
|
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<label>
|
|
<input id="ValueMax" type="number" min="0" name="ValueMax" value="{$ValueMax|html}" {$errors['ValueMax']['aria']}>
|
|
|
|
{__('Step 1', "ValueMax instructions")}
|
|
</label>
|
|
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{if !empty($errors['ValueMax']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_customized_url_error">
|
|
{$errors['ValueMax']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
|
|
{* Poll identifier *}
|
|
<div class="form-group {$errors['customized_url']['class']}">
|
|
<label for="poll_id" class="col-sm-4 control-label">
|
|
{__('Step 1', 'Poll id')}<br/>
|
|
</label>
|
|
|
|
<div class="col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input id="use_customized_url" name="use_customized_url" type="checkbox" {if $use_customized_url}checked{/if}/>
|
|
{__('Step 1', 'Customize the URL')}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="customized_url_options" {if !$use_customized_url}class="hidden"{/if}>
|
|
<div class="form-group {$errors['customized_url']['class']}">
|
|
<label for="customized_url" class="col-sm-4 control-label">
|
|
<span id="pollUrlDesc" class="small">{__('Step 1', 'Poll id rules')}</span>
|
|
</label>
|
|
<div class="col-sm-8">
|
|
<div class="input-group">
|
|
<span class="input-group-addon">
|
|
{$SERVER_URL}
|
|
</span>
|
|
<input id="customized_url" type="text" name="customized_url" class="form-control" {$errors['customized_url']['aria']}
|
|
value="{$customized_url|html}" aria-describedBy="pollUrlDesc" maxlength="64"
|
|
pattern="[A-Za-z0-9-]+"/>
|
|
</div>
|
|
<span class="help-block text-warning">{__('Step 1', 'Poll id warning')}</span>
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['customized_url']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_customized_url_error">
|
|
{$errors['customized_url']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
</div>
|
|
|
|
{* Password *}
|
|
|
|
<div class="form-group">
|
|
<label for="poll_id" class="col-sm-4 control-label">
|
|
{__('Step 1', 'Poll password')}
|
|
</label>
|
|
|
|
<div class="col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input type="checkbox" name="use_password" {if $poll_use_password}checked{/if}
|
|
id="use_password">
|
|
{__('Step 1', "Use a password to restrict access")}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div id="password_options"{if !$poll_use_password} class="hidden"{/if}>
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<div class="input-group">
|
|
<input id="poll_password" type="password" name="password" class="form-control" {$errors['password']['aria']}/>
|
|
<label for="poll_password" class="input-group-addon">{__('Step 1', 'Password choice')}</label>
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['password']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_password_error">
|
|
{$errors['password']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<div class="input-group">
|
|
<input id="poll_password_repeat" type="password" name="password_repeat" class="form-control" {$errors['password_repeat']['aria']}/>
|
|
<label for="poll_password_repeat" class="input-group-addon">{__('Step 1', 'Password confirmation')}</label>
|
|
</div>
|
|
</div>
|
|
{if !empty($errors['password_repeat']['msg'])}
|
|
<div class="alert alert-danger">
|
|
<p id="poll_password_repeat_error">
|
|
{$errors['password_repeat']['msg']}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input type="checkbox" name="results_publicly_visible"
|
|
{if $poll_results_publicly_visible}checked{/if} id="results_publicly_visible"/>
|
|
{__('Step 1', "The results are publicly visible")}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="poll_id" class="col-sm-4 control-label">
|
|
{__('Step 1', 'Permissions')}
|
|
</label>
|
|
<div class="col-sm-8">
|
|
<div class="radio">
|
|
<label>
|
|
<input type="radio" name="editable" id="editableByAll" {if $poll_editable==constant("Framadate\Editable::EDITABLE_BY_ALL")}checked{/if} value="{constant("Framadate\Editable::EDITABLE_BY_ALL")}">
|
|
{__('Step 1', 'All voters can modify any vote')}
|
|
</label>
|
|
<label>
|
|
<input type="radio" name="editable" {if $poll_editable==constant("Framadate\Editable::EDITABLE_BY_OWN")}checked{/if} value="{constant("Framadate\Editable::EDITABLE_BY_OWN")}">
|
|
{__('Step 1', 'Voters can modify their vote themselves')}
|
|
</label>
|
|
<label>
|
|
<input type="radio" name="editable" {if empty($poll_editable) or $poll_editable==constant("Framadate\Editable::NOT_EDITABLE")}checked{/if} value="{constant("Framadate\Editable::NOT_EDITABLE")}">
|
|
{__('Step 1', 'Votes cannot be modified')}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
{if $use_smtp}
|
|
<div class="form-group">
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input type="checkbox" name="receiveNewVotes" {if $poll_receiveNewVotes}checked{/if}
|
|
id="receiveNewVotes">
|
|
{__('Step 1', 'To receive an email for each new vote')}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="form-group">
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input type="checkbox" name="receiveNewComments" {if $poll_receiveNewComments}checked{/if}
|
|
id="receiveNewComments">
|
|
{__('Step 1', 'To receive an email for each new comment')}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
</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>
|
|
</div>
|
|
{* Collect users email *}
|
|
|
|
<div class="form-group">
|
|
<label for="collect_mail" class="col-sm-4 control-label">
|
|
{__('Step 1', 'Collect users email')}
|
|
</label>
|
|
|
|
<div class="col-sm-8">
|
|
<div class="checkbox">
|
|
<label>
|
|
<input type="checkbox" name="collect_users_mail"
|
|
id="collect_users_mail">
|
|
{__('Step 1', "Collect the polled users email addresses")}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div id="collect_warning" class="hidden">
|
|
<div class="col-sm-offset-4 col-sm-8">
|
|
<label class="bg-danger"><i class="glyphicon glyphicon-alert"> </i> {__('Step 1', 'Warning: anyone can access the polled users email addresses since all voters can modify any vote. You should restrict permission rules.')} </label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<p class="text-right">
|
|
<input type="hidden" name="type" value="$poll_type"/>
|
|
<button name="{$goToStep2}" value="{$poll_type}" type="submit"
|
|
class="btn btn-success">{__('Step 1', 'Go to step 2')}</button>
|
|
</p>
|
|
|
|
<script type="text/javascript">document.formulaire.title.focus();</script>
|
|
|
|
</form>
|
|
</div>
|
|
</div>
|
|
<noscript>
|
|
<div class="alert alert-danger">
|
|
{__('Step 1', 'Javascript is disabled on your browser. Its activation is required to create a poll.')}
|
|
</div>
|
|
</noscript>
|
|
<div id="cookie-warning" class="alert alert-danger" style="display:none">
|
|
{__('Step 1', 'Cookies are disabled on your browser. Theirs activation is required to create a poll.')}
|
|
</div>
|
|
{/block}
|