Skip to content

Commit

Permalink
Dev: move back to view Bootstrap classes
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Oct 16, 2017
1 parent ccd1d86 commit fd504ca
Show file tree
Hide file tree
Showing 25 changed files with 368 additions and 367 deletions.
371 changes: 186 additions & 185 deletions application/models/TemplateConfig.php
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions templates/default/views/layout_global.twig
View file
Expand Up @@ -22,7 +22,7 @@
{{ include('./subviews/head.twig') }}

<body class=" {{ aSurveyInfo.class.body }} lang-{{aSurveyInfo.languagecode}} {{aSurveyInfo.surveyformat}} {% if( aSurveyInfo.options.brandlogo == "on") %}brand-logo{%endif%}" {{ aSurveyInfo.attr.body }} >
{% if (aSurveyInfo.options.ajaxmode == "on" and aSurveyInfo.printPdf != 1) %}
{% if (aSurveyInfo.options.ajaxmode == "on" and aSurveyInfo.printPdf != 1) %}
<div class="progress ajax_loading_indicator" id="ajax_loading_indicator">
<div class="progress-bar progress-bar-info ajax_loading_indicator_bar" id="ajax_loading_indicator_bar" role="progressbar">
</div>
Expand Down Expand Up @@ -60,12 +60,12 @@
{% endblock %}

<!-- Outer Frame Container -->
<div class="{{ aSurveyInfo.class.outerframe }} {% if (aSurveyInfo.options.animatebody == "on") %} animated {{ aSurveyInfo.options.bodyanimation }} {%endif%}" id="{{ aSurveyInfo.id.outerframe }}" {{ aSurveyInfo.attr.outerframe }} >
<div class="{{ aSurveyInfo.class.outerframe }} container {% if (aSurveyInfo.options.animatebody == "on") %} animated {{ aSurveyInfo.options.bodyanimation }} {%endif%}" id="{{ aSurveyInfo.id.outerframe }}" {{ aSurveyInfo.attr.outerframe }} >

<!-- Main Row -->
<div id="{{ aSurveyInfo.id.mainrow }}" {{ aSurveyInfo.attr.mainrow }} >
<!-- Main Col -->
<div class="{{ aSurveyInfo.class.maincol }} " id="{{ aSurveyInfo.id.maincol }}" {{ aSurveyInfo.attr.maincol }}>
<div class="{{ aSurveyInfo.class.maincol }} col-centered " id="{{ aSurveyInfo.id.maincol }}" {{ aSurveyInfo.attr.maincol }}>

{# This is the main block that will be replaced/extended by other layouts#}
{% block content %}
Expand Down
40 changes: 20 additions & 20 deletions templates/default/views/layout_load.twig
View file
Expand Up @@ -41,9 +41,9 @@
{# This will display the script and the hidden inputs needed for Expression Manager #}
{{ aSurveyInfo.EM.ScriptsAndHiddenInputs }}

<div class="{{ aSurveyInfo.class.savemessage }}" {{ aSurveyInfo.attr.savemessage }}>
<div class="{{ aSurveyInfo.class.savemessagetitle }}" {{ aSurveyInfo.attr.savemessagetitle }}>{{ "Load unfinished survey" | t }}</div>
<div class="{{ aSurveyInfo.class.savemessagetext }}" {{ aSurveyInfo.attr.savemessagetext }}>
<div class="{{ aSurveyInfo.class.savemessage }} well clearfix" {{ aSurveyInfo.attr.savemessage }}>
<div class="{{ aSurveyInfo.class.savemessagetitle }} h2" {{ aSurveyInfo.attr.savemessagetitle }}>{{ "Load unfinished survey" | t }}</div>
<div class="{{ aSurveyInfo.class.savemessagetext }} text-info" {{ aSurveyInfo.attr.savemessagetext }}>
<p {{ aSurveyInfo.attr.savemessagetextp }} > {{ "You can load a survey that you have previously saved from this screen." | t }} </p>
<p {{ aSurveyInfo.attr.savemessagetextpb }} > {{ "Type in the 'name' you used to save the survey, and the password." | t }} </p>
</div>
Expand All @@ -52,7 +52,7 @@
<div class="{{ aSurveyInfo.class.loadform }}" {{ aSurveyInfo.attr.loadform }}>

{% if count(aSurveyInfo.aLoadForm.aErrors) > 0 %}
<ul class="{{ aSurveyInfo.class.loadformul }}" {{ aSurveyInfo.attr.loadformul }} >
<ul class="{{ aSurveyInfo.class.loadformul }} alert alert-danger list-unstyled " {{ aSurveyInfo.attr.loadformul }} >
{% for key,error in aSurveyInfo.aLoadForm.aErrors %}
<li {{ aSurveyInfo.attr.loadformulli }}>{{ error }}</li>
{% endfor %}
Expand Down Expand Up @@ -92,22 +92,22 @@

<!-- Saved name -->
<div class="{{ aSurveyInfo.class.saveformrow }}" {{ aSurveyInfo.attr.saveformrow }}>
<label class="{{ aSurveyInfo.class.saveformrowlabel }}" {{ aSurveyInfo.attr.saveformrowlabel }}>
<label class="{{ aSurveyInfo.class.saveformrowlabel }} control-label col-sm-3 " {{ aSurveyInfo.attr.saveformrowlabel }}>
{{ "Saved name:" | t }}
<small class="{{ aSurveyInfo.class.saveformrowlabelsmall }}" {{ aSurveyInfo.attr.saveformrowlabelsmall }} ></small>
<span class="{{ aSurveyInfo.class.saveformrowlabelspan }}" {{ aSurveyInfo.attr.saveformrowlabelspan }} >{{ "Mandatory" | t }}<span>
<small class="{{ aSurveyInfo.class.saveformrowlabelsmall }} text-danger asterisk fa fa-asterisk pull-left small" {{ aSurveyInfo.attr.saveformrowlabelsmall }} ></small>
<span class="{{ aSurveyInfo.class.saveformrowlabelspan }} sr-only text-danger asterisk" {{ aSurveyInfo.attr.saveformrowlabelspan }} >{{ "Mandatory" | t }}<span>
</label>
<div class="{{ aSurveyInfo.class.saveformrowcol }}" {{ aSurveyInfo.attr.saveformrowcol }}>
<input class="{{ aSurveyInfo.class.saveformrowcolinput }}" {{ aSurveyInfo.attr.saveformrowcolinput }} id="{{ aSurveyInfo.id.saveformrowcolinput }}" >
<div class="{{ aSurveyInfo.class.saveformrowcol }} col-sm-7 input-cell" {{ aSurveyInfo.attr.saveformrowcol }}>
<input class="{{ aSurveyInfo.class.saveformrowcolinput }} form-control" {{ aSurveyInfo.attr.saveformrowcolinput }} id="{{ aSurveyInfo.id.saveformrowcolinput }}" >
</div>
</div>

<!-- Password -->
<div class="{{ aSurveyInfo.class.passwordrow }}" {{ aSurveyInfo.attr.passwordrow }}>
<label class='{{ aSurveyInfo.class.passwordrowcol }}' {{ aSurveyInfo.attr.passwordrowcol }} >
<div class="{{ aSurveyInfo.class.passwordrow }} row form-group " {{ aSurveyInfo.attr.passwordrow }}>
<label class='{{ aSurveyInfo.class.passwordrowcol }} control-label col-sm-3 ' {{ aSurveyInfo.attr.passwordrowcol }} >
{{ "Password:" | t }}
<small class="{{ aSurveyInfo.class.passwordrowcolsmall }}" {{ aSurveyInfo.attr.passwordrowcolsmall }}></small>
<span class="{{ aSurveyInfo.class.passwordrowcolspan }}" {{ aSurveyInfo.attr.passwordrowcolspan }}>{{ "Mandatory" | t }}<span>
<small class="{{ aSurveyInfo.class.passwordrowcolsmall }} text-danger asterisk fa fa-asterisk pull-left small" {{ aSurveyInfo.attr.passwordrowcolsmall }}></small>
<span class="{{ aSurveyInfo.class.passwordrowcolspan }} sr-only text-danger asterisk" {{ aSurveyInfo.attr.passwordrowcolspan }}>{{ "Mandatory" | t }}<span>
</label>

<div class='col-sm-7 save-survey-input input-cell'>
Expand All @@ -117,25 +117,25 @@

{% if aSurveyInfo.aLoadForm.aCaptcha.show %}
<!-- Captcha -->
<div class='{{ aSurveyInfo.class.captcharow }}' {{ aSurveyInfo.attr.captcharow }}>
<label class='{{ aSurveyInfo.class.captcharowlabel }}' {{ aSurveyInfo.attr.captcharowlabel }}>
<div class='{{ aSurveyInfo.class.captcharow }} row form-group ' {{ aSurveyInfo.attr.captcharow }}>
<label class='{{ aSurveyInfo.class.captcharowlabel }} control-label col-sm-3 ' {{ aSurveyInfo.attr.captcharowlabel }}>
{{ "Security question:" | t }}
</label>
<div class='{{ aSurveyInfo.class.captcharowcol }}' {{ aSurveyInfo.attr.captcharowcol }}>
<div class='{{ aSurveyInfo.class.captcharowcol }} col-sm-7 ' {{ aSurveyInfo.attr.captcharowcol }}>
<div class='{{ aSurveyInfo.class.captcharowcoldiv }}' {{ aSurveyInfo.attr.captcharowcoldiv }}>
<div class='{{ aSurveyInfo.class.captcharowcoldivdiv }}' {{ aSurveyInfo.attr.captcharowcoldivdiv }} >
<img src="{{ aSurveyInfo.aLoadForm.aCaptcha.sImageUrl }}" {{ aSurveyInfo.attr.captcharowcoldivdivimg }} />
</div>
<input id="{{ aSurveyInfo.id.captcharowcoldivinput }}" class='{{ aSurveyInfo.class.captcharowcoldivinput }}' {{ aSurveyInfo.attr.captcharowcoldivinput }} />
<input id="{{ aSurveyInfo.id.captcharowcoldivinput }}" class='{{ aSurveyInfo.class.captcharowcoldivinput }} form-control' {{ aSurveyInfo.attr.captcharowcoldivinput }} />
</div>
</div>
</div>
{% endif %}

<!-- load button -->
<div class='{{ aSurveyInfo.class.loadrow }}' {{ aSurveyInfo.attr.loadrow }}>
<div class='{{ aSurveyInfo.class.loadrowcol }}' {{ aSurveyInfo.attr.loadrowcol }}>
<button class='{{ aSurveyInfo.class.loadrowcolbutton }}' {{ aSurveyInfo.attr.loadrowcolbutton }} >
<div class='{{ aSurveyInfo.class.loadrow }} row form-group ' {{ aSurveyInfo.attr.loadrow }}>
<div class='{{ aSurveyInfo.class.loadrowcol }} col-sm-7 col-md-offset-3 ' {{ aSurveyInfo.attr.loadrowcol }}>
<button class='{{ aSurveyInfo.class.loadrowcolbutton }} btn btn-default' {{ aSurveyInfo.attr.loadrowcolbutton }} >
{{ "Load now" | t }}
</button>
</div>
Expand Down
10 changes: 5 additions & 5 deletions templates/default/views/layout_quotas.twig
View file
Expand Up @@ -73,19 +73,19 @@
)
}}

<div class="{{ aSurveyInfo.class.navigator }}" id="{{ aSurveyInfo.id.navigator }}" {{ aSurveyInfo.attr.navigator }}>
<div class="{{ aSurveyInfo.class.navigator }} row" id="{{ aSurveyInfo.id.navigator }}" {{ aSurveyInfo.attr.navigator }}>

<!-- Previous button container -->
<div class="{{ aSurveyInfo.class.navigatorcoll }}" {{ aSurveyInfo.attr.navigatorcoll }}>
<div class="{{ aSurveyInfo.class.navigatorcoll }} col-xs-6 text-left" {{ aSurveyInfo.attr.navigatorcoll }}>
<!-- Button previous -->
<button value="{{ aSurveyInfo.aQuotas.sQuotaStep }}" class=" {{ aSurveyInfo.class.navigatorcollbutton }} " {{ aSurveyInfo.attr.navigatorcollbutton }} >
<button value="{{ aSurveyInfo.aQuotas.sQuotaStep }}" class=" {{ aSurveyInfo.class.navigatorcollbutton }} btn btn-lg btn-default " {{ aSurveyInfo.attr.navigatorcollbutton }} >
{{ "Previous" | t }}
</button>
</div>

<div class=" {{ aSurveyInfo.class.navigatorcolr }} " {{ aSurveyInfo.attr.navigatorcolr }}>
<div class=" {{ aSurveyInfo.class.navigatorcolr }} col-xs-6 text-right " {{ aSurveyInfo.attr.navigatorcolr }}>
<!-- Button submit -->
<button {{ aSurveyInfo.attr.navigatorcolrbutton}} class=" {{ aSurveyInfo.class.navigatorcolrbutton}} " >
<button {{ aSurveyInfo.attr.navigatorcolrbutton}} class=" {{ aSurveyInfo.class.navigatorcolrbutton}} btn btn-lg btn-primary " >
{{ "Submit" | t }}
</button>
</div>
Expand Down
8 changes: 4 additions & 4 deletions templates/default/views/layout_register.twig
View file
Expand Up @@ -24,20 +24,20 @@
{# render the layout_global content block #}
{{ parent() }}

<div class="{{ aSurveyInfo.class.register }}" {{ aSurveyInfo.attr.register }}>
<div class="{{ aSurveyInfo.class.register }} container" {{ aSurveyInfo.attr.register }}>
{# This will display the script and the hidden inputs needed for Expression Manager #}
{{ aSurveyInfo.EM.ScriptsAndHiddenInputs }}

<div class="{{ aSurveyInfo.class.registerrow }}" {{ aSurveyInfo.attr.registerrow }}>
<div class="{{ aSurveyInfo.class.registerrow }} row" {{ aSurveyInfo.attr.registerrow }}>
<div class='{{ aSurveyInfo.class.registerrowjumbotron }}' {{ aSurveyInfo.attr.registerrowjumbotron }}>
{{ include('./subviews/registration/register_head.twig') }}
<div class="{{ aSurveyInfo.class.registerrowjumbotrondiv }}" {{ aSurveyInfo.attr.registerrowjumbotrondiv }}>
<div class="{{ aSurveyInfo.class.registerrowjumbotrondiv }} container clearfix " {{ aSurveyInfo.attr.registerrowjumbotrondiv }}>
{{ include('./subviews/registration/register_message.twig') }}
</div>
</div>
</div>
{{ include('./subviews/registration/register_error.twig') }}
<div class="{{ aSurveyInfo.class.registerform }}" {{ aSurveyInfo.attr.registerform }}>
<div class="{{ aSurveyInfo.class.registerform }} row" {{ aSurveyInfo.attr.registerform }}>
{{ include('./subviews/registration/register_form.twig') }}
</div>
</div>
Expand Down

0 comments on commit fd504ca

Please sign in to comment.