-
Notifications
You must be signed in to change notification settings - Fork 985
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: application/config/version.php application/helpers/expressions/em_manager_helper.php application/views/admin/survey/Question/editQuestion_view.php
- Loading branch information
Showing
11 changed files
with
178 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
themes/survey/vanilla/views/subviews/navigation/clearall_buttons.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| {# | ||
| This file is part of LimeSurvey | ||
| Copyright (C) 2007-2018 The LimeSurvey Project Team | ||
| This file render the exit button accessible without javascript | ||
| #} | ||
|
|
||
| <div class="{{ aSurveyInfo.class.clearallwrapper }} form-inline"> | ||
| <label class="form-group ls-js-hidden"> | ||
| <input {{ aSurveyInfo.attr.clearallconfirm }} class="{{ aSurveyInfo.class.clearallconfirm }}"><span class="control-label">{{gT("Please confirm you want to clear your response?")}}</span> | ||
| </label> | ||
| <button {{ aSurveyInfo.attr.clearallbutton }} class="{{ aSurveyInfo.class.clearallbutton }} btn btn-link" data-confirmedby="confirm-clearall" title="{{ gT('This action need confirmation.') }}">{{gT("Exit and clear survey")}}</button> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| {# | ||
| This file is part of LimeSurvey | ||
| Copyright (C) 2018 The LimeSurvey Project Team | ||
| This file render extra part for navigator | ||
| #} | ||
| <!-- extra tools, can be shown with javascript too (just remove ls-js-hidden class --> | ||
| <div class="row ls-js-hidden"> | ||
| <!-- Extra button container --> | ||
| <div class="col-xs-6 clearall-saveall-wrapper"> | ||
| {% if aSurveyInfo.aNavigator.load.show == "Y" or aSurveyInfo.bShowClearAll == true %} | ||
| {{ include('./subviews/navigation/save_buttons.twig') }} | ||
| {% endif %} | ||
| {% if aSurveyInfo.bShowClearAll == true %} | ||
| {{ include('./subviews/navigation/clearall_buttons.twig') }} | ||
| {% endif %} | ||
| </div> | ||
| <!-- Index container --> | ||
| {% if (aSurveyInfo.aQuestionIndex.bShow == true) %} | ||
| {{ include('./subviews/navigation/question_index_buttons.twig') }} | ||
| {% endif %} | ||
| </div> |
16 changes: 16 additions & 0 deletions
16
themes/survey/vanilla/views/subviews/navigation/question_index_buttons.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| {# | ||
| This file is part of LimeSurvey | ||
| Copyright (C) 2007-2018 The LimeSurvey Project Team | ||
| Show the question index in navigator | ||
| #} | ||
|
|
||
| <div class="col-sm-6 index-wrapper"> | ||
| {% if aSurveyInfo.format == 'G' %} | ||
| {{ include('./subviews/navigation/question_index_groups_buttons.twig') }} | ||
| {% endif %} | ||
|
|
||
| {% if aSurveyInfo.format == 'S' %} | ||
| {{ include('./subviews/navigation/question_index_questions_buttons.twig') }} | ||
| {% endif %} | ||
| </div> |
23 changes: 23 additions & 0 deletions
23
themes/survey/vanilla/views/subviews/navigation/question_index_groups_buttons.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| {# | ||
| This file is part of LimeSurvey | ||
| Copyright (C) 2018 The LimeSurvey Project Team | ||
| This file render group index | ||
| #} | ||
| <div class="list-group index-button-full"> | ||
| <div class="list-group-item"> | ||
| <div class="h4 list-group-item-heading">{{ gT("Question index") }}</div> | ||
| </div> | ||
| {% for step, indexItem in aSurveyInfo.aQuestionIndex.items %} | ||
| {% set templateClass = '' %} | ||
| {% if attribute(indexItem.stepStatus, 'index-item-unanswered') is defined and attribute(indexItem.stepStatus, 'index-item-unanswered') == true %} | ||
| {% set templateClass = templateClass ~ ' list-group-item-warning' %} | ||
| {% endif %} | ||
| {% if attribute(indexItem.stepStatus, 'index-item-error') is defined and attribute(indexItem.stepStatus, 'index-item-error') == true %} | ||
| {% set templateClass = templateClass ~ ' list-group-item-danger' %} | ||
| {% endif %} | ||
| {% if attribute(indexItem.stepStatus, 'index-item-current') is defined and attribute(indexItem.stepStatus, 'index-item-current') == true %} | ||
| {% set templateClass = statusClass ~ ' disabled' %} | ||
| {% endif %} | ||
| <button type="submit" name="move" value="{{ indexItem.step }}" class="list-group-item {{ indexItem.coreClass }} {{ templateClass }}" >{{ indexItem.text }}</button> | ||
| {% endfor %} | ||
| </div> |
33 changes: 33 additions & 0 deletions
33
themes/survey/vanilla/views/subviews/navigation/question_index_questions_buttons.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| {# | ||
| This file is part of LimeSurvey | ||
| Copyright (C) 2018 The LimeSurvey Project Team | ||
| This file render question index | ||
| #} | ||
| <div class="list-group index-button index-button-{{ aSurveyInfo.aQuestionIndex.type }}"> | ||
| <div class="list-group-item"> | ||
| <div class="h4 list-group-item-heading">{{ gT("Question index") }}</div> | ||
| </div> | ||
| {% for indexGroup in aSurveyInfo.aQuestionIndex.items %} | ||
| <div class="list-group" data-gid="{{ indexGroup.gid }}"> | ||
| <div class="list-group-item"> | ||
| <div class="h5 list-group-item-heading">{{ indexGroup.text }}</div> | ||
| </div> | ||
| {% for indexQuestion in indexGroup.questions %} | ||
| {% set templateClass = '' %} | ||
| {% if attribute(indexQuestion.stepStatus, 'index-item-unanswered') is defined and attribute(indexQuestion.stepStatus, 'index-item-unanswered') == true %} | ||
| {% set templateClass = templateClass ~ ' list-group-item-warning' %} | ||
| {% endif %} | ||
| {% if attribute(indexQuestion.stepStatus, 'index-item-error') is defined and attribute(indexQuestion.stepStatus, 'index-item-error') == true %} | ||
| {% set templateClass = templateClass ~ ' list-group-item-danger' %} | ||
| {% endif %} | ||
| {% if attribute(indexQuestion.stepStatus, 'index-item-current') is defined and attribute(indexQuestion.stepStatus, 'index-item-current') == true %} | ||
| {% set templateClass = statusClass ~ ' disabled' %} | ||
| {% endif %} | ||
| <button type="submit" name="move" value="{{ indexQuestion.step }}" class="list-group-item {{ indexQuestion.coreClass }} {{ templateClass }}" data-qid="{{ indexQuestion.qid }}"> | ||
| {{ indexQuestion.text }} | ||
| {# flatEllipsizeText(indexQuestion.text, true, 30, " … ", 0.6 ) broken currently : class 'viewHelper' not found #} | ||
| </button> | ||
| {% endfor %} | ||
| </div> | ||
| {% endfor %} | ||
| </div> |
11 changes: 11 additions & 0 deletions
11
themes/survey/vanilla/views/subviews/navigation/save_buttons.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| {# | ||
| This file is part of LimeSurvey | ||
| Copyright (C) 2007-2018 The LimeSurvey Project Team | ||
| This file render the load or save buttons without javascript needed | ||
| #} | ||
| {% if aSurveyInfo.aNavigator.load.show == "Y" %} | ||
| <button {{ aSurveyInfo.attr.loadbutton }} class="{{ aSurveyInfo.class.loadbutton }} btn btn-default">{{ gT("Load unfinished survey") }}</button> | ||
| {% endif %} | ||
| {% if aSurveyInfo.aNavigator.save.show == "Y" %} | ||
| <button {{ aSurveyInfo.attr.savebutton }} class="{{ aSurveyInfo.class.loadbutton }} btn btn-default">{{ gT("Resume later") }}</button> | ||
| {% endif %} |