Skip to content

Commit

Permalink
Fixed issue #12762: Consistent position of labels above fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@lacrioque
lacrioque committed Oct 12, 2017
1 parent bc09ab8 commit 8048f5f
Showing 1 changed file with 47 additions and 46 deletions.
93 changes: 47 additions & 46 deletions templates/default/options/options.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,22 +181,24 @@
<div style="position:absolute; left:49%;top:35%;" class="text-center"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div>
</div>
{# Begin template option form #}
<form class='form form-horizontal action_update_options_string_form' action=''>
<form class='form action_update_options_string_form' action=''>

{# If this is a surveyspecific settings page, offer the possibility to do a full inheritance of the parent template #}
{% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
<div class='row'>
<div class='form-group'>
<label for='simple_edit_options_general_inherit' class='col-sm-3 control-label'>Inherit everything</label>
<div class="btn-group col-sm-8" data-toggle="buttons">
<label class="btn btn-primary">
<input id="general_inherit_on" name='general_inherit' type='radio' value='on' class='form-control selector_option_general_inherit ' data-id='simple_edit_options_general_inherit'/>
Yes
</label>
<label class="btn btn-primary">
<input id="general_inherit_off" name='general_inherit' type='radio' value='off' class='form-control selector_option_general_inherit ' data-id='simple_edit_options_general_inherit'/>
No
</label>
<div class='form-group row'>
<label for='simple_edit_options_general_inherit' class='control-label'>Inherit everything</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input id="general_inherit_on" name='general_inherit' type='radio' value='on' class='form-control selector_option_general_inherit ' data-id='simple_edit_options_general_inherit'/>
Yes
</label>
<label class="btn btn-primary">
<input id="general_inherit_off" name='general_inherit' type='radio' value='off' class='form-control selector_option_general_inherit ' data-id='simple_edit_options_general_inherit'/>
No
</label>
</div>
</div>
</div>
</div>
Expand All @@ -208,11 +210,10 @@
{# First settings row #}
<div class='row action_hide_on_inherit'>
<div class='col-sm-12 col-md-6'>

{# Ajaxmode setting #}
<div class='form-group'>
<label for='simple_edit_options_ajaxmode' class='col-sm-6 control-label'>Ajaxmode</label>
<div class='col-sm-6'>
<div class='form-group row'>
<label for='simple_edit_options_ajaxmode' class='control-label'>Ajaxmode</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input name='ajaxmode' type='radio' value='on' class='form-control selector_option_radio_field ' data-id='simple_edit_options_ajaxmode'/>
Expand All @@ -236,9 +237,9 @@

<div class='col-sm-12 col-md-6'>
{# Brandlogo #}
<div class='form-group'>
<label for='simple_edit_options_brandlogo' class='col-sm-6 control-label'>Brandlogo</label>
<div class='col-sm-6'>
<div class='form-group row'>
<label for='simple_edit_options_brandlogo' class='control-label'>Brandlogo</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type='radio' name='brandlogo' value='on' class='form-control selector_option_radio_field ' data-id='simple_edit_options_brandlogo' />
Expand All @@ -262,9 +263,9 @@

<div class='col-sm-12 col-md-6'>
{# Background image #}
<div class='form-group'>
<label for='simple_edit_options_backgroundimage' class='col-sm-6 control-label'>Background image</label>
<div class='col-sm-6'>
<div class='form-group row'>
<label for='simple_edit_options_backgroundimage' class='control-label'>Background image</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type='radio' name='backgroundimage' value='on' class='form-control selector_option_radio_field simple_edit_options_backgroundimage ' data-id='backgroundimage' />
Expand All @@ -288,9 +289,9 @@

<div class='col-sm-12 col-md-6'>
{# Box container #}
<div class='form-group'>
<label for='simple_edit_options_backgroundimage' class='col-sm-6 control-label'>Box container</label>
<div class='col-sm-6'>
<div class='form-group row'>
<label for='simple_edit_options_backgroundimage' class='control-label'>Box container</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type='radio' name='boxcontainer' value='on' class='form-control selector_option_radio_field simple_edit_options_boxcontainer ' data-id='boxcontainer' />
Expand All @@ -317,10 +318,10 @@
</div>
<div class='row action_hide_on_inherit' >
<div class='col-sm-12 col-md-4'>
<div class='form-group'>
<div class='form-group row'>
{# Animate body On/Off #}
<label for='simple_edit_options_animatebody' class='col-sm-6 control-label'>Animate body</label>
<div class='col-sm-6'>
<label for='simple_edit_options_animatebody' class='control-label'>Animate body</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type='radio' value='on' class='form-control selector_option_radio_field ' data-id='simple_edit_options_animatebody' name='animatebody' />
Expand All @@ -345,9 +346,9 @@
</div>
<div class='col-sm-12 col-md-8'>
{# Animate body -> Animation type #}
<div class='form-group'>
<label for='simple_edit_options_bodyanimation' class='col-sm-2 control-label'>Body animation</label>
<div class='col-sm-10'>
<div class='form-group row'>
<label for='simple_edit_options_bodyanimation' class='control-label'>Body animation</label>
<div class='col-sm-12'>
<select class='form-control selector_option_value_field' id='simple_edit_options_bodyanimation' name='bodyanimation'>
{{animationOptions}}
</select>
Expand All @@ -358,9 +359,9 @@
<div class='row action_hide_on_inherit'>
<div class='col-sm-12 col-md-4'>
{# Animate question -> On/Off #}
<div class='form-group'>
<label for='simple_edit_options_animatequestion' class='col-sm-6 control-label'>Animate question</label>
<div class='col-sm-6'>
<div class='form-group row'>
<label for='simple_edit_options_animatequestion' class='control-label'>Animate question</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type='radio' value='on' class='form-control selector_option_radio_field ' data-id='simple_edit_options_animatequestion' name='animatequestion' />
Expand All @@ -383,9 +384,9 @@
</div>
<div class='col-sm-12 col-md-8'>
{# Animate question -> Animation type #}
<div class='form-group'>
<label for='simple_edit_options_questionanimation' class='col-sm-2 control-label'>Question animation</label>
<div class='col-sm-10'>
<div class='form-group row'>
<label for='simple_edit_options_questionanimation' class='control-label'>Question animation</label>
<div class='col-sm-12'>
<select class='form-control selector_option_value_field' id='simple_edit_options_questionanimation' name='questionanimation'>
{{animationOptions}}
</select>
Expand All @@ -396,9 +397,9 @@
<div class='row action_hide_on_inherit'>
<div class='col-sm-12 col-md-4'>
{# Animate alert -> On/Off #}
<div class='form-group'>
<label for='simple_edit_options_animatealert' class='col-sm-6 control-label'>Animate alert</label>
<div class='col-sm-6'>
<div class='form-group row'>
<label for='simple_edit_options_animatealert' class='control-label'>Animate alert</label>
<div class='col-sm-12'>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type='radio' value='on' class='form-control selector_option_radio_field ' data-id='simple_edit_options_animatealert' name='animatealert' />
Expand All @@ -421,9 +422,9 @@
</div>
<div class='col-sm-12 col-md-8'>
{# Animate alert -> Animation options #}
<div class='form-group'>
<label for='simple_edit_options_alertanimation' class='col-sm-2 control-label'>Alert animation</label>
<div class='col-sm-10'>
<div class='form-group row'>
<label for='simple_edit_options_alertanimation' class='control-label'>Alert animation</label>
<div class='col-sm-12'>
<select class='form-control selector_option_value_field' id='simple_edit_options_alertanimation' name='alertanimation'>
{{animationOptions}}
</select>
Expand All @@ -440,9 +441,9 @@
<div class='panel-heading'>Bootstrap theme</div>
<div class='panel-body'>
{# Bootstrap Bootswatch theme #}
<div class='form-group'>
<label for='simple_edit_cssframework' class='col-sm-2 control-label'>Bootswatch theme</label>
<div class='col-sm-10'>
<div class='form-group row'>
<label for='simple_edit_cssframework' class='control-label'>Bootswatch theme</label>
<div class='col-sm-12'>
<select class='form-control selector_cssframework_value_field' id='simple_edit_cssframework' name='cssframework'>
{{bootswatchOption}}
</select>
Expand Down

0 comments on commit 8048f5f

Please sign in to comment.