Commit ee6ad66a authored by Chenu Denis's avatar Chenu Denis

[feature] Allow to show descrition on whole page

parent 19d7e894
......@@ -16,12 +16,12 @@
<supportUrl>https://extensions.sondages.pro/themes-and-templates/skelvanilla-a11y-and-usuability/</supportUrl>
<copyright>Copyright (C) 2018-2019 Denis Chenu / Sondages Pro</copyright>
<license>GNU General Public License version 3 or later</license>
<version>9.1.1</version>
<version>9.2.0</version>
<apiVersion>3</apiVersion>
<description><![CDATA[<strong>LimeSurvey Bootstrap Vanilla Survey Theme with Accessibility and Options</strong><br>Base on vanilla theme, usage of more aria, fix some role and aria from core.<br>Allow usage of a lot of variations, list of variation can be updated. Some decoration option using boostrap class.]]></description>
<extends>vanilla</extends>
<last_update>2020-06-10 10:04:52</last_update>
<lastUpdate>2020-06-10 10:04:52</lastUpdate>
<last_update>2020-06-26 13:58:32</last_update>
<lastUpdate>2020-06-26 13:58:32</lastUpdate>
</metadata>
<files>
......@@ -282,7 +282,6 @@
<question>
<screen_title type="data" role="title" twig="on"><![CDATA[ {{gT('Question')}} ]]></screen_title>
<file type="view" role="layout">layout_global.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="view" role="content">./subviews/content/main.twig</file>
<file type="view" role="subview">./subviews/survey/group.twig</file>
<file type="view" role="subview">./subviews/survey/group_subviews/group_container.twig</file>
......@@ -295,6 +294,7 @@
<file type="view" role="subview">./subviews/survey/question_subviews/answers.twig</file>
<file type="view" role="subview">./subviews/survey/question_subviews/survey_question_help.twig</file>
<file type="view" role="subview">./subviews/survey/question_subviews/valid_message_and_help.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="css">./css/bootstrap.css</file>
<file type="css">./css/skelvanilla.css</file>
<file type="css">./css/theme.css</file>
......@@ -308,10 +308,10 @@
<surveylist>
<screen_title type="data" role="title" twig="on"><![CDATA[ {{gT('Survey list')}} ]]></screen_title>
<file type="view" role="layout">layout_survey_list.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="view" role="subview">./subviews/content/mainrow.twig</file>
<file type="view" role="subview">./subviews/content/outerframe.twig</file>
<file type="view" role="subview">./subviews/navigation/language_changer_form.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="css">./css/bootstrap.css</file>
<file type="css">./css/skelvanilla.css</file>
<file type="css">./css/theme.css</file>
......@@ -325,19 +325,20 @@
<welcome>
<screen_title type="data" role="title" twig="on"><![CDATA[ {{gT('Welcome')}} ]]></screen_title>
<file type="view" role="layout">layout_global.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="view" role="subview">./subviews/content/mainrow.twig</file>
<file type="view" role="subview">./subviews/content/outerframe.twig</file>
<file type="view" role="content">./subviews/content/firstpage.twig</file>
<file type="view" role="subview">./subviews/header/head.twig</file>
<file type="view" role="subview">./subviews/header/custom_header.twig</file>
<file type="view" role="subview">./subviews/header/nav_bar.twig</file>
<file type="view" role="subview">./subviews/header/description.twig</file>
<file type="view" role="subview">./subviews/header/progress_bar.twig</file>
<file type="view" role="subview">./subviews/messages/welcome.twig</file>
<file type="view" role="subview">./subviews/messages/warnings.twig</file>
<file type="view" role="subview">./subviews/messages/no_js_alert.twig</file>
<file type="view" role="subview">./subviews/privacy/privacy.twig</file>
<file type="view" role="subview">./subviews/navigation/language_changer.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="css">./css/bootstrap.css</file>
<file type="css">./css/theme.css</file>
<file type="js">./scripts/aria-live.js</file>
......@@ -349,10 +350,12 @@
<completed>
<screen_title type="data" role="title" twig="on"><![CDATA[ {{gT('Completed')}} ]]></screen_title>
<file type="view" role="layout">layout_global.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="view" role="subview">./subviews/header/nav_bar.twig</file>
<file type="view" role="subview">./subviews/header/description.twig</file>
<file type="view" role="subview">./subviews/content/mainrow.twig</file>
<file type="view" role="subview">./subviews/content/outerframe.twig</file>
<file type="view" role="content">./subviews/content/submit.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="css">./css/bootstrap.css</file>
<file type="css">./css/theme.css</file>
<file type="js">./scripts/theme.js</file>
......@@ -378,9 +381,11 @@
<error>
<screen_title type="data" role="title" twig="on"><![CDATA[ {{gT('Error')}} ]]></screen_title>
<file type="view" role="layout">layout_errors.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
<file type="view" role="subview">./subviews/header/nav_bar.twig</file>
<file type="view" role="subview">./subviews/header/description.twig</file>
<file type="view" role="subview">./subviews/messages/warnings.twig</file>
<file type="view" role="subview">./subviews/messages/bootstrap_alert_modal.twig</file>
<file type="view" role="subview">./subviews/footer/footer.twig</file>
</error>
<clearall>
......
......@@ -656,7 +656,34 @@
<div class="row action_hide_on_inherit">
<hr/>
</div>
<h3 class="h3 action_hide_on_inherit">{{ gT("Content") }}</h3>
<div class="row action_hide_on_inherit">
{# Description #}
<div class='col-sm-12 col-md-6 col-lg-6'>
<div class='form-group row'>
<label for='simple_edit_options_descriptiondisplay' class='control-label col-xs-4'> {{ gT("Survey description display") }} </label>
<div class='col-xs-8'>
<div class="btn-group" data-toggle="buttons" role='radiogroup' aria-labelledby='simple_edit_options_descriptiondisplay' data-default='welcome'>
<label class="btn btn-default">
<input type='radio' name='descriptiondisplay' value='all' class='selector_option_radio_field simple_edit_options_descriptiondisplay ' data-id='descriptiondisplay'/>
{{ gT("All page") }}
</label>
<label class="btn btn-default">
<input type='radio' name='descriptiondisplay' value='welcome' class='selector_option_radio_field simple_edit_options_descriptiondisplay ' data-id='descriptiondisplay'/>
{{ gT("Only on welcome page") }}
</label>
{# If this is a root template setting, don't show the inherit button #}
{% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
<label class="btn btn-default">
<input type='radio' name='descriptiondisplay' value='inherit' class='selector_option_radio_field simple_edit_options_descriptiondisplay ' data-id='descriptiondisplay'/>
{{ gT("Inherit") }}
</label>
{% endif %}
</div>
</div>
</div>
</div>
</div>
<!-- Brand Logo -->
<h3 class="h3 action_hide_on_inherit">{{ gT("Logos") }}</h3>
<div class="row action_hide_on_inherit">
......
......@@ -12,7 +12,9 @@
{% block head %}
{{ parent() }}
{% endblock %}
{% block body %}
{{ parent() }}
{% endblock %}
{% block content %}
<main class="{{ aSurveyInfo.class.outerframe }} {% if (aSurveyInfo.options.container == "on") %} container {% else %} container-fluid {% endif %} " id="{{ aSurveyInfo.id.outerframe }}" {{ aSurveyInfo.attr.outerframe }} >
<div class="well">
......@@ -36,7 +38,4 @@
</p>
</div>
</main>
{% endblock %}
......@@ -33,7 +33,9 @@
{% block nav_bar %}
{{ include('./subviews/header/nav_bar.twig') }}
{% endblock %}
{% block description %}
{{ include('./subviews/header/description.twig') }}
{% endblock %}
<!-- Outer Frame Container -->
{% block content %}
{#
......
{# Include the form opening tag #}
{{ include('./subviews/header/start_form.twig') }} <!-- main form -->
{# This will display the script and the hidden inputs needed for Expression Manager #}
{{ aSurveyInfo.EM.ScriptsAndHiddenInputs }}
{# Include the alert for no JavaScript #}
{{ include('./subviews/messages/no_js_alert.twig') }}
{# Include the language changer selector #}
{{ include('./subviews/navigation/language_changer.twig') }}
{# If survey mode is "All in One", this will add the welcome/privacy messages (if activated) #}
{{ include('./subviews/messages/welcome.twig') }}
{{ include('./subviews/privacy/privacy.twig') }}
{# Presents the navigator #}
{{ include('./subviews/navigation/navigator.twig') }}
</form> <!-- main form -->
{% if aSurveyInfo.options.descriptiondisplay == 'all' %}
{% if processString(aSurveyInfo.description,1) %}
<div class="description-wrapper">
<div class="text-info {{ aSurveyInfo.class.description }} {% if (aSurveyInfo.options.container == "on") %} container {% else %} container-fluid {% endif %}" {{ aSurveyInfo.attr.description }}>
{{ processString(aSurveyInfo.description,1) }}
</div>
</div>
{% endif %}
{% endif %}
......@@ -20,7 +20,6 @@
<!-- Bootstrap Navigation Bar -->
{% if(aSurveyInfo.class.navbar) %}
{% if(aSurveyInfo.options.fixedheader == 'on') %}
{{ aSurveyInfo.class.navbar }}
<div class="invisible navbar navbar-inverse navbar-static-top" aria-hidden="true">
<div class="container-fluid">
<div class="{{ aSurveyInfo.class.navbarheader }}">
......
......@@ -17,7 +17,7 @@
In this file, you have access to the array aSurveyInfo that contains the datas of the current survey
To see what's inside aSurveyInfo, turn debug mode on and copy the following line to the end of this file:
{{ dump(aSurveyInfo) }}
#}
......@@ -28,12 +28,12 @@
<h1 class="{{ aSurveyInfo.class.surveyname }} text-center" {{ aSurveyInfo.attr.surveyname }} >
{{ processString(aSurveyInfo.name,1) }}
</h1>
<!-- Survey description -->
<div class="{{ aSurveyInfo.class.description }} text-info text-center" {{ aSurveyInfo.attr.description }}>
{{ processString(aSurveyInfo.description,1) }}
</div>
{% if (aSurveyInfo.options.descriptiondisplay == 'welcome' or aSurveyInfo.options.descriptiondisplay is empty) %}
<!-- Survey description -->
<div class="{{ aSurveyInfo.class.description }} text-info" {{ aSurveyInfo.attr.description }}>
{{ processString(aSurveyInfo.description,1) }}
</div>
{% endif %}
<!-- Welcome text -->
<div class="{{ aSurveyInfo.class.welcome }}" {{ aSurveyInfo.attr.welcome }}>
{{ processString(aSurveyInfo.welcome,1) }}
......
{#
LimeSurvey
Copyright (C) 2007-2017 The LimeSurvey Project Team / Louis Gac
All rights reserved.
License: GNU/GPL License v2 or later, see LICENSE.php
LimeSurvey is free software. This version may have been modified pursuant
to the GNU General Public License, and as distributed it includes or
is derivative of works licensed under the GNU General Public License or
other free or open source software licenses.
See COPYRIGHT.php for copyright notices and details.
(¯`·._.·(¯`·._.· Privacy ·._.·´¯)·._.·´¯)
Show the privacy message (in All in One Mode)
see: allinone_mode_welcome_privacy.twig
#}
<!-- Privacy message -->
<div class="{{ aSurveyInfo.class.privacycontainer }} row" {{ aSurveyInfo.attr.privacycontainer }}>
<div class="{{ aSurveyInfo.class.privacycol }} col-sm-12 col-centered" {{ aSurveyInfo.attr.privacycol }}>
{% if (aSurveyInfo.options.hideprivacyinfo == "off" ) %}
{% block anonymous %}
{% if (aSurveyInfo.anonymized == "Y") %}
<div class="{{ aSurveyInfo.class.privacyhead }} h4 text-primary " {{ aSurveyInfo.attr.privacyhead }}>
{{ gT("This survey is anonymous.") }}
</div>
<div>
<p class="{{ aSurveyInfo.class.privacybody }}" {{ aSurveyInfo.attr.privacybody }}>
{{
gT("The record of your survey responses does not contain any identifying information about you, unless a specific survey question explicitly asked for it.")
}}
</p>
<p class="{{ aSurveyInfo.class.privacybody }}">
{{
gT("If you used an identifying token to access this survey, please rest assured that this token will not be stored together with your responses. It is managed in a separate database and will only be updated to indicate whether you did (or did not) complete this survey. There is no way of matching identification tokens with survey responses.")
}}
</p>
</div>
{% endif %}
{% endblock %}
{% endif %}
{% block datasecurity %}
{% if (aSurveyInfo.showsurveypolicynotice == 1) %}
{{include('./subviews/privacy/privacy_text.twig')}}
{% elseif (aSurveyInfo.showsurveypolicynotice == 2) %}
{{include( './subviews/privacy/privacy_modal.twig')}}
{% endif %}
{% endblock %}
</div>
</div>
Markdown is supported
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