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

Merge branch 'feature/hide-optionnal-parameters' into 'develop' 

Collapse by default optional parameters

To be cherry-picked on `release`.

See merge request !147
parents 469d2881 18dd7f58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
css/app/create_poll.css
+ 28
− 0
View file @ c5b9c415
.form-horizontal .radio label { .form-horizontal .radio label {
width: 100%; width: 100%;
}
.optionnal-parameters:hover, .optionnal-parameters:focus {
text-decoration: none;
}
.optionnal-parameters:active, .optionnal-parameters:focus {
outline: none;
}
.optionnal-parameters .caret, .optionnal-parameters.collapsed .caret.caret-up {
display: none;
}
.optionnal-parameters .caret.caret-up, .optionnal-parameters.collapsed .caret {
display: inline-block;
}
.caret.caret-up {
border-bottom: 4px dashed;
border-top: 0 none;
content: "";
}
@media (max-width: 767px) {
#optionnal {
margin-top: 15px;
}
} }
\ No newline at end of file
tpl/create_poll.tpl
+ 145
− 122
View file @ c5b9c415
...@@ -101,166 +101,189 @@ ...@@ -101,166 +101,189 @@
</div> </div>
{/if} {/if}
{* Poll identifier *} {* Optionnal parameters *}
<div class="col-sm-offset-3 col-sm-1 hidden-xs">
<div class="form-group {$errors['customized_url']['class']}"> <p class="lead">
<label for="poll_id" class="col-sm-4 control-label"> <i class="glyphicon glyphicon-cog" aria-hidden="true"></i>
{__('Step 1', 'Poll id')}<br/> </p>
</label> </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 collapsed lead" role="button" data-toggle="collapse" href="#optionnal" aria-expanded="false" aria-controls="optionnal">
Paramètres optionnels
<i class="caret" aria-hidden="true"></i>
<i class="caret caret-up" aria-hidden="true"></i>
</a>
<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>
<div id="customized_url_options" {if !$use_customized_url}class="hidden"{/if}> <div class="clearfix"></div>
<div class="collapse" id="optionnal">
{* Poll identifier *}
<div class="form-group {$errors['customized_url']['class']}"> <div class="form-group {$errors['customized_url']['class']}">
<label for="customized_url" class="col-sm-4 control-label"> <label for="poll_id" class="col-sm-4 control-label">
<span id="pollUrlDesc" class="small">{__('Step 1', 'Poll id rules')}</span> {__('Step 1', 'Poll id')}<br/>
</label> </label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="checkbox">
<span class="input-group-addon"> <label>
{$SERVER_URL} <input id="use_customized_url" name="use_customized_url" type="checkbox" {if $use_customized_url}checked{/if}/>
</span> {__('Step 1', 'Customize the URL')}
<input id="customized_url" type="text" name="customized_url" class="form-control" {$errors['customized_url']['aria']} </label>
value="{$customized_url|html}" aria-describedBy="pollUrlDesc" maxlength="64"
pattern="[A-Za-z0-9-]+"/>
</div> </div>
<span class="help-block text-warning">{__('Step 1', 'Poll id warning')}</span>
</div> </div>
</div> </div>
{if !empty($errors['customized_url']['msg'])} <div id="customized_url_options" {if !$use_customized_url}class="hidden"{/if}>
<div class="alert alert-danger"> <div class="form-group {$errors['customized_url']['class']}">
<p id="poll_customized_url_error"> <label for="customized_url" class="col-sm-4 control-label">
{$errors['customized_url']['msg']} <span id="pollUrlDesc" class="small">{__('Step 1', 'Poll id rules')}</span>
</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> </label>
</div>
</div>
<div id="password_options"{if !$poll_use_password} class="hidden"{/if}> <div class="col-sm-8">
<div class="col-sm-offset-4 col-sm-8"> <div class="input-group">
<div class="input-group"> <span class="input-group-addon">
<input id="poll_password" type="password" name="password" class="form-control" {$errors['password']['aria']}/> {$SERVER_URL}
<label for="poll_password" class="input-group-addon">{__('Step 1', 'Password choice')}</label> </span>
</div> <input id="customized_url" type="text" name="customized_url" class="form-control" {$errors['customized_url']['aria']}
</div> value="{$customized_url|html}" aria-describedBy="pollUrlDesc" maxlength="64"
{if !empty($errors['password']['msg'])} pattern="[A-Za-z0-9-]+"/>
<div class="alert alert-danger"> </div>
<p id="poll_password_error"> <span class="help-block text-warning">{__('Step 1', 'Poll id warning')}</span>
{$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>
</div> </div>
{if !empty($errors['password_repeat']['msg'])} {if !empty($errors['customized_url']['msg'])}
<div class="alert alert-danger"> <div class="alert alert-danger">
<p id="poll_password_repeat_error"> <p id="poll_customized_url_error">
{$errors['password_repeat']['msg']} {$errors['customized_url']['msg']}
</p> </p>
</div> </div>
{/if} {/if}
<div class="col-sm-offset-4 col-sm-8"> </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"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="results_publicly_visible" <input type="checkbox" name="use_password" {if $poll_use_password}checked{/if}
{if $poll_results_publicly_visible}checked{/if} id="results_publicly_visible"/> id="use_password">
{__('Step 1', "The results are publicly visible")} {__('Step 1', "Use a password to restrict access")}
</label> </label>
</div> </div>
</div> </div>
</div>
</div>
<div class="form-group"> <div id="password_options"{if !$poll_use_password} class="hidden"{/if}>
<label for="poll_id" class="col-sm-4 control-label"> <div class="col-sm-offset-4 col-sm-8">
{__('Step 1', 'Permissions')} <div class="input-group">
</label> <input id="poll_password" type="password" name="password" class="form-control" {$errors['password']['aria']}/>
<div class="col-sm-8"> <label for="poll_password" class="input-group-addon">{__('Step 1', 'Password choice')}</label>
<div class="radio"> </div>
<label> </div>
<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")}"> {if !empty($errors['password']['msg'])}
{__('Step 1', 'All voters can modify any vote')} <div class="alert alert-danger">
</label> <p id="poll_password_error">
<label> {$errors['password']['msg']}
<input type="radio" name="editable" {if $poll_editable==constant("Framadate\Editable::EDITABLE_BY_OWN")}checked{/if} value="{constant("Framadate\Editable::EDITABLE_BY_OWN")}"> </p>
{__('Step 1', 'Voters can modify their vote themselves')} </div>
</label> {/if}
<label> <div class="col-sm-offset-4 col-sm-8">
<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")}"> <div class="input-group">
{__('Step 1', 'Votes cannot be modified')} <input id="poll_password_repeat" type="password" name="password_repeat" class="form-control" {$errors['password_repeat']['aria']}/>
</label> <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> </div>
</div>
{if $use_smtp}
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-4 col-sm-8"> <label for="poll_id" class="col-sm-4 control-label">
<div class="checkbox"> {__('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> <label>
<input type="checkbox" name="receiveNewVotes" {if $poll_receiveNewVotes}checked{/if} <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")}">
id="receiveNewVotes"> {__('Step 1', 'Votes cannot be modified')}
{__('Step 1', 'To receive an email for each new vote')}
</label> </label>
</div> </div>
</div> </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="form-group">
<div class="col-sm-offset-4 col-sm-8"> <div class="col-sm-offset-4 col-sm-8">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="receiveNewComments" {if $poll_receiveNewComments}checked{/if} <input type="checkbox" name="hidden" {if $poll_hidden}checked{/if}
id="receiveNewComments"> id="hidden">
{__('Step 1', 'To receive an email for each new comment')} {__('Step 1', "Only the poll maker can see the poll's results")}
</label> </label>
</div> </div>
</div> <div id="hiddenWithBadEditionModeError" class="alert alert-danger hidden">
</div> <p>
{/if} {__('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 class="form-group"> </div>
<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> </div>
</div> </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