diff --git a/application/config/version.php b/application/config/version.php index d70cf885150..c6a5a7651d1 100644 --- a/application/config/version.php +++ b/application/config/version.php @@ -16,5 +16,5 @@ $config['dbversionnumber'] = 403; $config['buildnumber'] = ''; $config['updatable'] = true; -$config['assetsversionnumber'] = '30063'; +$config['assetsversionnumber'] = '30065'; return $config; diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php index a62723115e4..64dce11736e 100644 --- a/application/controllers/admin/surveyadmin.php +++ b/application/controllers/admin/surveyadmin.php @@ -1145,15 +1145,17 @@ public function copy() LimeExpressionManager::SetDirtyFlag(); LimeExpressionManager::singleton(); // Why this @ ! - @LimeExpressionManager::UpgradeConditionsToRelevance($aImportResults['newsid']); - @LimeExpressionManager::StartSurvey($oSurvey->sid, 'survey', $oSurvey->attributes, true); - @LimeExpressionManager::StartProcessingPage(true, true); + LimeExpressionManager::SetSurveyId($aImportResults['newsid']); + LimeExpressionManager::RevertUpgradeConditionsToRelevance($aImportResults['newsid']); + LimeExpressionManager::UpgradeConditionsToRelevance($aImportResults['newsid']); + LimeExpressionManager::StartSurvey($oSurvey->sid, 'survey', $oSurvey->attributes, true); + LimeExpressionManager::StartProcessingPage(true, true); $aGrouplist = QuestionGroup::model()->findAllByAttributes(['sid'=>$aImportResults['newsid']]); foreach ($aGrouplist as $aGroup) { - @LimeExpressionManager::StartProcessingGroup($aGroup['gid'], $oSurvey->anonymized != 'Y', $aImportResults['newsid']); - @LimeExpressionManager::FinishProcessingGroup(); + LimeExpressionManager::StartProcessingGroup($aGroup['gid'], $oSurvey->anonymized != 'Y', $aImportResults['newsid']); + LimeExpressionManager::FinishProcessingGroup(); } - @LimeExpressionManager::FinishProcessingPage(); + LimeExpressionManager::FinishProcessingPage(); } $this->_renderWrappedTemplate('survey', 'importSurvey_view', $aData); diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index 3358423a756..63d6ab73594 100644 --- a/application/controllers/admin/tokens.php +++ b/application/controllers/admin/tokens.php @@ -241,9 +241,11 @@ public function bounceprocessing($iSurveyId) */ public function deleteMultiple() { - // TODO: permission checks $aTokenIds = json_decode(Yii::app()->getRequest()->getPost('sItems')); $iSid = Yii::app()->getRequest()->getPost('sid'); + if (!Permission::model()->hasSurveyPermission($iSid, 'tokens', 'delete')) { + throw new CHttpException(403, gT("You do not have permission to access this page.")); + } TokenDynamic::model($iSid)->deleteRecords($aTokenIds); return true; } @@ -253,9 +255,11 @@ public function deleteMultiple() */ public function deleteToken() { - // TODO: permission checks $aTokenId = Yii::app()->getRequest()->getParam('sItem'); $iSid = Yii::app()->getRequest()->getParam('sid'); + if (!Permission::model()->hasSurveyPermission($iSid, 'tokens', 'delete')) { + throw new CHttpException(403, gT("You do not have permission to access this page.")); + } TokenDynamic::model($iSid)->deleteRecords(array($aTokenId)); return true; } diff --git a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js index f57686d8f67..575f41ae38e 100644 --- a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js +++ b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js @@ -16,6 +16,9 @@ * perform an ajax request and show the result in the modal */ var onClickListAction = function () { + if($(this).data('disabled')) { + return; + } var $that = $(this); // The clicked link var $actionUrl = $that.data('url'); // The url of the Survey Controller action to call var onSuccess = $that.data('on-success'); @@ -282,6 +285,7 @@ function getDefaultDateTimePickerSettings() { function bindListItemclick(){ $( '.listActions a').off('click.listactions').on('click.listactions', onClickListAction); + $( '.listActions .disabled a').off('click.listactions').on('click.listactions', function(e){ e.preventDefault(); }); } diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/selector.php b/application/extensions/admin/grid/MassiveActionsWidget/views/selector.php index bb16e3c10ea..7bb9df3eeb1 100644 --- a/application/extensions/admin/grid/MassiveActionsWidget/views/selector.php +++ b/application/extensions/admin/grid/MassiveActionsWidget/views/selector.php @@ -37,8 +37,15 @@ -
  • +
  • + class='disabled' + + > + data-disabled='1' + data-url="" data-on-success="" @@ -49,7 +56,6 @@ data-action="" data-type="" data-grid-reload="" - request->getParam('browselang', '')); $sViewUrl = App()->createUrl("/admin/responses/sa/view/surveyid/".self::$sid."/id/".$this->id); $sViewPDFUrl = App()->createUrl("/admin/responses/sa/viewquexmlpdf/surveyid/".self::$sid."/id/".$this->id); $sEditUrl = App()->createUrl("admin/dataentry/sa/editdata/subaction/edit/surveyid/".self::$sid."/id/".$this->id); $sDownloadUrl = App()->createUrl("admin/responses", array("sa"=>"actionDownloadfiles", "surveyid"=>self::$sid, "sResponseId"=>$this->id)); $sDeleteUrl = convertGETtoPOST(App()->createUrl("admin/responses/sa/actionDelete/surveyid/".self::$sid."?surveyid=".self::$sid."&sResponseId=".$this->id)); $sAttachmentDeleteUrl = convertGETtoPOST(App()->createUrl("admin/responses/sa/actionDeleteAttachments/?surveyid=".self::$sid."&sResponseId=".$this->id)); + if (!empty($sBrowseLanguage)) { + $sViewUrl.='?browselang='.$sBrowseLanguage; + $sViewPDFUrl.='?browselang='.$sBrowseLanguage; + $sEditUrl.='?browselang='.$sBrowseLanguage; + } $button = ""; // View detail icon diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php index 258796f0bc5..c14d5d75d80 100644 --- a/application/models/TemplateConfig.php +++ b/application/models/TemplateConfig.php @@ -501,7 +501,7 @@ public function getClassAndAttributes() $aClassAndAttributes['attr']['maincolformdivainput'] = ' type="password" id="token" name="token" value="" required '; $aClassAndAttributes['attr']['maincoldivdivbul'] = ' role="alert" '; - $aClassAndAttributes['attr']['maincolformlabel'] = ' for="loadname"'; + $aClassAndAttributes['attr']['maincolformlabel'] = ' for="token"'; $aClassAndAttributes['attr']['maincolformlabelsmall'] = ' aria-hidden="true" '; $aClassAndAttributes['attr']['maincolformdivblabel'] = ' for="loadsecurity" '; $aClassAndAttributes['attr']['maincolformdivblabelsmall'] = ' aria-hidden="true" '; diff --git a/application/views/admin/token/massive_actions/_selector.php b/application/views/admin/token/massive_actions/_selector.php index bfc8d0a6d50..3c11bf7b927 100644 --- a/application/views/admin/token/massive_actions/_selector.php +++ b/application/views/admin/token/massive_actions/_selector.php @@ -15,17 +15,16 @@ 'dropUpText' => gT('Selected participant(s)...'), 'aActions' => array( - // Massive update array( // li element 'type' => 'action', 'action' => 'edit', + 'disabled' => !Permission::model()->hasSurveyPermission($surveyid, 'tokens', 'update'), 'url' => App()->createUrl('/admin/tokens/sa/editMultiple/'), 'iconClasses' => 'fa fa-pencil text-success', 'text' => gT('Batch-edit participants'), 'grid-reload' => 'yes', - // modal 'actionType' => 'modal', 'modalType' => 'yes-no', @@ -41,6 +40,7 @@ // li element 'type' => 'action', 'action' => 'delete', + 'disabled' => !Permission::model()->hasSurveyPermission($surveyid, 'tokens', 'delete'), 'url' => App()->createUrl('/admin/tokens/sa/deleteMultiple/'), 'iconClasses' => 'text-danger fa fa-trash', 'text' => gT('Delete'), @@ -53,7 +53,7 @@ 'sModalTitle' => gT('Delete survey participants'), 'htmlModalBody' => gT('Are you sure you want to delete the selected participants?'), 'aCustomDatas' => array( - array( 'name'=>'sid', 'value'=> $_GET['surveyid']), + array( 'name'=>'sid', 'value'=> $surveyid), ), ), @@ -77,7 +77,8 @@ // li element 'type' => 'action', 'action' => 'invite', - 'url' => App()->createUrl('/admin/tokens/sa/email/surveyid/'.$_GET['surveyid']), + 'disabled' => !Permission::model()->hasSurveyPermission($surveyid, 'tokens', 'update'), + 'url' => App()->createUrl('/admin/tokens/sa/email/surveyid/'.$surveyid), 'iconClasses' => 'icon-invite text-success', 'text' => gT('Send email invitations'), @@ -94,7 +95,8 @@ // li element 'type' => 'action', 'action' => 'remind', - 'url' => App()->createUrl('/admin/tokens/sa/email/action/remind/surveyid/'.$_GET['surveyid']), + 'disabled' => !Permission::model()->hasSurveyPermission($surveyid, 'tokens', 'update'), + 'url' => App()->createUrl('/admin/tokens/sa/email/action/remind/surveyid/'.$surveyid), 'iconClasses' => 'icon-remind text-success', 'text' => gT('Send email reminder'), @@ -126,10 +128,10 @@ // li element 'type' => 'action', 'action' => 'addCPDB', - 'url' => App()->createUrl('admin/participants/sa/attributeMapToken/sid/'.$_GET['surveyid']), + 'url' => App()->createUrl('admin/participants/sa/attributeMapToken/sid/'.$surveyid), 'iconClasses' => 'ui-icon ui-add-to-cpdb-link', 'text' => gT('Add participants to central database'), - + 'disabled' => !Permission::model()->hasGlobalPermission('participantpanel', 'create'), 'aLinkSpecificDatas' => array( 'input-name' => 'tokenids', ), diff --git a/assets/packages/limesurvey/survey.js b/assets/packages/limesurvey/survey.js index 8dbb833c4b0..a9fc0da5492 100644 --- a/assets/packages/limesurvey/survey.js +++ b/assets/packages/limesurvey/survey.js @@ -155,14 +155,15 @@ function activateLanguageChanger(){ * @param {string} lang Language to change to. */ var applyChangeAndSubmit = function(lang) { - // Remove existing lang input. - limesurveyForm.find('input[name="lang"]').remove(); + // Remove existing onsubmitbuttoninput, no need to remove lang : last one is the submitted + $("#onsubmitbuttoninput").remove(); // Append new input. $('') .attr('name', 'lang') .val(lang) .appendTo(limesurveyForm); // Append move type. + /* onsubmitbuttoninput is related to template (and ajax) : MUST move to template with ajax … */ $('').appendTo(limesurveyForm); limesurveyForm.submit(); }; @@ -210,7 +211,7 @@ function activateLanguageChanger(){ } }); /* Language changer dropdown */ - $('.form-change-lang [name="lang"]').on('change', function() { + $('.form-change-lang [name="lang"] option:not(selected)').on('click', function(event) { var closestForm = $(this).closest('form'); var newLang = $(this).val(); if (!closestForm.length) { @@ -222,9 +223,9 @@ function activateLanguageChanger(){ // Answer : remind user can put language changer everywhere, not only in home page, but for example in clear all page etc … } else { // If there are no form : we can't use it */ - if($(this).data('targeturl')){ + if($(this).parent().data('targeturl')){ /* If we have a target url : just move location to this url with lang set */ - var target=$(this).data('targeturl'); + var target=$(this).parent().data('targeturl'); /* adding lang in get param manually */ if(target.indexOf("?") >=0){ target+="&lang="+$(this).val(); @@ -247,7 +248,7 @@ function activateLanguageChanger(){ } }else{ /* we are inside a form : just submit : but remove other lang input if exist : be sure it's this one send */ - $(this).closest('form').find("[name='lang']").not($(this)).remove(); + $(this).closest('form').find("[name='lang']").not($(this).parent()).remove(); $(this).closest('.form-change-lang').find(':submit').click(); } }); diff --git a/docs/release_notes.txt b/docs/release_notes.txt index 07e44cfc96e..4c1eb509262 100644 --- a/docs/release_notes.txt +++ b/docs/release_notes.txt @@ -35,6 +35,79 @@ Thank you to everyone who helped with this new release! CHANGE LOG ------------------------------------------------------ +Changes from 3.15.1 (build 181017) to 3.15.2 (build 181107) November 07, 2018 + +-New feature: allow to change config file location (LouisGac) +-New feature: allow to change config file location, part 2 (LouisGac) +-New feature: configuration option to use a single upload directory for all surveys (LouisGac) +-Fixed issue #10162: new visit on a survey with token deletes last entry (Dominik Vitt) +-Fixed issue #11787: filtered question with multiple column (Denis Chenu) +-Fixed issue #13982: Allow kcfinder use with CHttpSession derived classes (#1112) (Casey Lucas) +-Fixed issue #14062: No languages list when clicking the hamburger icon in Token page (Dominik Vitt) +-Fixed issue #14066: Broken link on reset button from mass-action response export (Anton Victorson) +-Fixed issue #14098: Subquestion incorrectly named 'Sub-question' (Carsten Schmitz) +-Fixed issue #14101: Missing CSS-class "form-horizontal" for multiple-short-text-questions (Denis Chenu) +-Fixed issue #14106: Button "Add new question to group" does not work (Dominik Vitt) +-Fixed issue #14124: Changing invitation/reminder dates for a certain tokens changes the date format at the database (Dominik Vitt) +-Fixed issue #14150: Wrong survey menu id entry (Carsten Schmitz) +-Fixed issue #14162: Functionality ranking questions breaks with relev… (#1154) (Denis Chenu) +-Fixed issue #14167: Double Quotes are not allowed (title) = File upload (Dominik Vitt) +-Fixed issue #14168: PHP7.2.0 Removed plugins throw error in plugin manager (Denis Chenu) +-Fixed issue #14191: Broken question view if sum of width !=12 (Denis Chenu) +-Fixed issue #14192: Mass action on Survey listing doesn't work on second page (Dominik Vitt) +-Fixed issue #14196: Unable to use dynamic mindate and maxdate (Denis Chenu) +-Fixed issue #14205: Unable to save, clearall (and maybe load) without javascript (Denis Chenu) +-Fixed issue #14209: Long answer options for array question types not line-breaked in mobile view (Dominik Vitt) +-Fixed issue #14212: Deleting or editing details of a to be attached file at token emails is not doable (Dominik Vitt) +-Fixed issue #14216: Users without rights to delete tokens can still delete them (Denis Chenu) +-Fixed issue : Same choice height work again (Denis Chenu) +-Fixed issue : aria-label for warning and error not translated (Denis Chenu) +-Fixed issue : broken HTML validatio on welcome page (Denis Chenu) +-Fixed issue : class and title broken in array number (text layout) (Denis Chenu) +-Fixed issue : hidden column in multiple short text (Denis Chenu) +-Fixed issue : label usage broken in token form (Denis Chenu) +-Fixed issue : no "No answser" in list with comment , dropdown (Denis Chenu) +-Fixed issue : no label related for Yes No button (a11y related) (Denis Chenu) +-Fixed issue: EM variables are shown in red color after survey copy (Dominik Vitt) +-Fixed issue: JSON editor options to load the right content (#1130) (yent) +-Fixed issue: Not possible to save or load saved survey when in anonymized mode (Dominik Vitt) +-Fixed issue: PHP7 compatibility (Markus Flür) +-Fixed issue: PHP7 compatibility 2 (Markus Flür) +-Fixed issue: Survey groups not being wiped (Carsten Schmitz) +-Fixed issue: can't extract large zip file (LouisGac) +-Fixed issue: child survey group could become parent (LouisGac) +-Fixed issue: content, whatever its type, was passed to CHtml::encode which expects a string due to lack of encode htmlOption for CHtml::textarea. Also added needed json_encode so that textarea value is a string in the end. (yent) +-Fixed issue: corrected the icon class on the footer help icon (Markus Flür) +-Fixed issue: datefield from mssql database always contains milliseconds (Markus Flür) +-Fixed issue: more php7 issues fixed (count, etc) (Markus Flür) +-Fixed issue: multiple design issues in question edit (Markus Flür) +-Fixed issue: resumed survey lose saved values after click on "Next" (Dominik Vitt) +-Fixed issue: unable to check all questions on survey statistics page (Dominik Vitt) +-Fixed issue: upload to generalfiles fails (Markus Flür) +-Fixed issue: wrong path for adminstyle-rtl.css (Dominik Vitt) +#Updated translation: Arabic by AbdelmalekTEBBOUB +#Updated translation: Catalan by qualitatuvic +#Updated translation: Chinese (Simplified) by johnxan +#Updated translation: Croatian by dominikvitt +#Updated translation: Czech by jelen1 +#Updated translation: Dutch (Informal) by Han +#Updated translation: Dutch by Han +#Updated translation: Dutch by kpadm, Han +#Updated translation: German (Informal) by c_schmitz +#Updated translation: German by actxcellence, c_schmitz +#Updated translation: Hebrew by vis_kerem +#Updated translation: Hungarian by kkd +#Updated translation: Italian (Informal) by lfanfoni +#Updated translation: Italian by lfanfoni +#Updated translation: Norwegian (Bokmål) by peterhol, pmonstad +#Updated translation: Norwegian (Bokmål) by pmonstad +#Updated translation: Polish (Informal) by elissa +#Updated translation: Polish by elissa +#Updated translation: Romanian by cdorin +#Updated translation: Russian by ddrmoscow +#Updated translation: Spanish (Argentina) by Eescudero +#Updated translation: Thai by tomzt + Changes from 3.15.0 (build 181008) to 3.15.1 (build 181017) to October 17, 2018 -Fixed issue #13928: script (and tag) are not filtered or encoded if question is in same group (Denis Chenu) diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot index d5e91a21fe5..432b79ee1ac 100644 --- a/locale/_template/limesurvey.pot +++ b/locale/_template/limesurvey.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: LimeSurvey language file\n" "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n" -"POT-Creation-Date: 2018-11-01 14:46:01+00:00\n" +"POT-Creation-Date: 2018-11-06 11:20:02+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -466,7 +466,7 @@ msgid "ID" msgstr "" #: application/controllers/RegisterController.php:165 -#: application/helpers/SurveyRuntimeHelper.php:1505 +#: application/helpers/SurveyRuntimeHelper.php:1513 msgid "Your answer to the security question was not correct - please try again." msgstr "" @@ -1083,6 +1083,8 @@ msgstr "" #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:49 #: application/helpers/replacements_helper.php:344 #: application/helpers/replacements_helper.php:476 +#: application/models/TemplateConfig.php:725 +#: application/models/TemplateConfig.php:726 #: application/views/admin/assessments/assessments_delete.php:24 #: application/views/admin/assessments/assessments_edit.php:141 #: application/views/admin/conditions/conditionshead_view.php:74 @@ -1134,7 +1136,7 @@ msgstr "" #: application/views/admin/token/token_bar.php:237 #: application/views/admin/usergroup/usergroupbar_view.php:55 #: application/views/survey/questions/question_help/error-tip.php:12 -#: tmp/twig_translate.php:143 tmp/twig_translate.php:170 +#: tmp/twig_translate.php:143 tmp/twig_translate.php:171 msgid "Close" msgstr "" @@ -1758,10 +1760,10 @@ msgstr "" #: application/views/admin/quotas/_form.php:63 #: application/views/admin/responses/listResponses_view.php:121 #: application/views/admin/super/footer.php:158 -#: application/views/admin/survey/Question/editQuestion_view.php:153 -#: application/views/admin/survey/Question/editQuestion_view.php:165 -#: application/views/admin/survey/Question/editQuestion_view.php:177 -#: application/views/admin/survey/Question/editQuestion_view.php:189 +#: application/views/admin/survey/Question/editQuestion_view.php:147 +#: application/views/admin/survey/Question/editQuestion_view.php:159 +#: application/views/admin/survey/Question/editQuestion_view.php:171 +#: application/views/admin/survey/Question/editQuestion_view.php:183 #: application/views/admin/survey/Question/question_view.php:138 #: application/views/admin/survey/Question/question_view.php:156 #: application/views/admin/survey/Question/yesNo_defaultvalue_widget.php:63 @@ -1802,7 +1804,7 @@ msgstr "" #: tmp/twig_translate.php:96 tmp/twig_translate.php:102 #: tmp/twig_translate.php:113 tmp/twig_translate.php:116 #: tmp/twig_translate.php:120 tmp/twig_translate.php:124 -#: tmp/twig_translate.php:174 tmp/twig_translate.php:184 +#: tmp/twig_translate.php:175 tmp/twig_translate.php:185 msgid "Yes" msgstr "" @@ -1820,7 +1822,7 @@ msgstr "" #: application/helpers/userstatistics_helper.php:1218 #: application/views/admin/dataentry/content_view.php:711 #: application/views/admin/export/statistics_subviews/_question.php:460 -#: tmp/twig_translate.php:186 +#: tmp/twig_translate.php:187 msgid "Uncertain" msgstr "" @@ -1928,10 +1930,10 @@ msgstr "" #: application/views/admin/quotas/_form.php:64 #: application/views/admin/responses/listResponses_view.php:121 #: application/views/admin/super/footer.php:159 -#: application/views/admin/survey/Question/editQuestion_view.php:154 -#: application/views/admin/survey/Question/editQuestion_view.php:166 -#: application/views/admin/survey/Question/editQuestion_view.php:178 -#: application/views/admin/survey/Question/editQuestion_view.php:190 +#: application/views/admin/survey/Question/editQuestion_view.php:148 +#: application/views/admin/survey/Question/editQuestion_view.php:160 +#: application/views/admin/survey/Question/editQuestion_view.php:172 +#: application/views/admin/survey/Question/editQuestion_view.php:184 #: application/views/admin/survey/Question/question_view.php:140 #: application/views/admin/survey/Question/question_view.php:158 #: application/views/admin/survey/Question/yesNo_defaultvalue_widget.php:62 @@ -1972,7 +1974,7 @@ msgstr "" #: tmp/twig_translate.php:103 tmp/twig_translate.php:114 #: tmp/twig_translate.php:117 tmp/twig_translate.php:121 #: tmp/twig_translate.php:125 tmp/twig_translate.php:132 -#: tmp/twig_translate.php:175 tmp/twig_translate.php:185 +#: tmp/twig_translate.php:176 tmp/twig_translate.php:186 msgid "No" msgstr "" @@ -1989,7 +1991,7 @@ msgstr "" #: application/helpers/userstatistics_helper.php:1235 #: application/views/admin/dataentry/content_view.php:735 #: application/views/admin/export/statistics_subviews/_question.php:500 -#: tmp/twig_translate.php:176 +#: tmp/twig_translate.php:177 msgid "Increase" msgstr "" @@ -2006,7 +2008,7 @@ msgstr "" #: application/helpers/userstatistics_helper.php:1236 #: application/views/admin/dataentry/content_view.php:736 #: application/views/admin/export/statistics_subviews/_question.php:505 -#: tmp/twig_translate.php:177 +#: tmp/twig_translate.php:178 msgid "Same" msgstr "" @@ -2023,7 +2025,7 @@ msgstr "" #: application/helpers/userstatistics_helper.php:1237 #: application/views/admin/dataentry/content_view.php:737 #: application/views/admin/export/statistics_subviews/_question.php:510 -#: tmp/twig_translate.php:178 +#: tmp/twig_translate.php:179 msgid "Decrease" msgstr "" @@ -2067,7 +2069,7 @@ msgstr "" #: application/helpers/userstatistics_helper.php:1331 #: application/views/admin/dataentry/content_view.php:104 #: application/views/admin/export/statistics_subviews/_question.php:293 -#: tmp/twig_translate.php:183 +#: tmp/twig_translate.php:184 msgid "Female" msgstr "" @@ -2085,7 +2087,7 @@ msgstr "" #: application/helpers/userstatistics_helper.php:1332 #: application/views/admin/dataentry/content_view.php:105 #: application/views/admin/export/statistics_subviews/_question.php:299 -#: tmp/twig_translate.php:182 +#: tmp/twig_translate.php:183 msgid "Male" msgstr "" @@ -2453,8 +2455,8 @@ msgstr "" #: application/views/admin/responses/browsemenubar_view.php:178 #: application/views/admin/responses/listResponses_view.php:278 #: application/views/admin/super/fullpagebar_view.php:21 +#: application/views/admin/survey/Question/editQuestion_view.php:379 #: application/views/admin/survey/Question/editQuestion_view.php:385 -#: application/views/admin/survey/Question/editQuestion_view.php:391 #: application/views/admin/survey/Question/editdefaultvalues_view.php:194 #: application/views/admin/survey/Question/question_subviews/_tabs.php:125 #: application/views/admin/survey/Question/questionbar_view.php:227 @@ -3346,7 +3348,7 @@ msgid "Please choose the appropriate response for each item:" msgstr "" #: application/controllers/admin/printablesurvey.php:1302 -#: tmp/twig_translate.php:169 +#: tmp/twig_translate.php:170 msgid "There are %s questions in this survey." msgstr "" @@ -3492,7 +3494,7 @@ msgstr "" #: application/controllers/admin/questions.php:1171 #: application/views/admin/survey/Question/editQuestion_view.php:80 -#: application/views/admin/survey/Question/editQuestion_view.php:381 +#: application/views/admin/survey/Question/editQuestion_view.php:375 msgid "Copy question" msgstr "" @@ -3627,7 +3629,7 @@ msgstr "" #: application/views/admin/responses/listResponses_view.php:136 #: application/views/admin/themes/templateeditor_register_view.php:3 #: application/views/admin/token/dummytokenform.php:40 -#: tmp/twig_translate.php:215 +#: tmp/twig_translate.php:216 msgid "First name" msgstr "" @@ -3640,7 +3642,7 @@ msgstr "" #: application/views/admin/responses/listResponses_view.php:147 #: application/views/admin/themes/templateeditor_register_view.php:7 #: application/views/admin/token/dummytokenform.php:48 -#: tmp/twig_translate.php:216 +#: tmp/twig_translate.php:217 msgid "Last name" msgstr "" @@ -4154,7 +4156,7 @@ msgstr "" #: application/controllers/admin/surveypermission.php:504 #: application/views/survey/frontpage/saveForm/form.php:72 -#: tmp/twig_translate.php:194 +#: tmp/twig_translate.php:195 msgid "Save Now" msgstr "" @@ -6013,7 +6015,7 @@ msgstr "" #: application/views/installer/license_view.php:16 #: application/views/installer/precheck_view.php:147 #: application/views/survey/system/actionButton/movePrevious.php:11 -#: tmp/twig_translate.php:158 tmp/twig_translate.php:210 +#: tmp/twig_translate.php:158 tmp/twig_translate.php:211 msgid "Previous" msgstr "" @@ -6852,9 +6854,9 @@ msgstr "" #: application/views/admin/homepagesettings/index.php:59 #: application/views/admin/homepagesettings/index.php:69 #: application/views/admin/labels/editlabel_view.php:106 -#: application/views/admin/survey/Question/advanced_settings_view.php:64 -#: application/views/admin/survey/Question/editQuestion_view.php:305 -#: application/views/admin/survey/Question/editQuestion_view.php:323 +#: application/views/admin/survey/Question/advanced_settings_view.php:58 +#: application/views/admin/survey/Question/editQuestion_view.php:293 +#: application/views/admin/survey/Question/editQuestion_view.php:311 #: application/views/admin/survey/Question/importQuestion_view.php:36 #: application/views/admin/survey/Question/importQuestion_view.php:48 #: application/views/admin/survey/Question/massive_actions/_set_questions_mandatory.php:22 @@ -6953,9 +6955,9 @@ msgstr "" #: application/views/admin/homepagesettings/index.php:59 #: application/views/admin/homepagesettings/index.php:69 #: application/views/admin/labels/editlabel_view.php:107 -#: application/views/admin/survey/Question/advanced_settings_view.php:65 -#: application/views/admin/survey/Question/editQuestion_view.php:306 -#: application/views/admin/survey/Question/editQuestion_view.php:323 +#: application/views/admin/survey/Question/advanced_settings_view.php:59 +#: application/views/admin/survey/Question/editQuestion_view.php:294 +#: application/views/admin/survey/Question/editQuestion_view.php:311 #: application/views/admin/survey/Question/importQuestion_view.php:37 #: application/views/admin/survey/Question/importQuestion_view.php:49 #: application/views/admin/survey/Question/massive_actions/_set_questions_mandatory.php:23 @@ -7525,7 +7527,7 @@ msgstr "" msgid "Your responses were successfully saved." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1133 tmp/twig_translate.php:200 +#: application/helpers/SurveyRuntimeHelper.php:1133 tmp/twig_translate.php:201 msgid "Print your answers." msgstr "" @@ -7543,23 +7545,23 @@ msgstr "" msgid "One or more uploaded files are not in proper format/size. You cannot proceed until these files are valid." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1508 +#: application/helpers/SurveyRuntimeHelper.php:1516 msgid "Your have to answer the security question - please try again." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1609 +#: application/helpers/SurveyRuntimeHelper.php:1617 msgid "Invalid group number for this survey: " msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1615 +#: application/helpers/SurveyRuntimeHelper.php:1623 msgid "This group contains no questions. You must add questions to this group before you can preview it" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1639 +#: application/helpers/SurveyRuntimeHelper.php:1647 msgid "Submit your answers" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1640 +#: application/helpers/SurveyRuntimeHelper.php:1648 msgid "There are no more questions. Please press the button to finish this survey." msgstr "" @@ -7609,7 +7611,7 @@ msgstr "" msgid "Survey response %d" msgstr "" -#: application/helpers/admin/htmleditor_helper.php:170 +#: application/helpers/admin/htmleditor_helper.php:187 msgid "Start HTML editor in a popup window" msgstr "" @@ -8241,7 +8243,7 @@ msgstr "" #: application/views/admin/export/exportresult_panels/_token-control.php:29 #: application/views/admin/saved/savedlist_view.php:22 #: application/views/admin/themes/templateeditor_register_view.php:11 -#: tmp/twig_translate.php:217 +#: tmp/twig_translate.php:218 msgid "Email address" msgstr "" @@ -9240,7 +9242,7 @@ msgstr "" msgid "The minimum number of files has not been uploaded." msgstr "" -#: application/helpers/frontend_helper.php:691 tmp/twig_translate.php:197 +#: application/helpers/frontend_helper.php:691 tmp/twig_translate.php:198 msgid "Did Not Save" msgstr "" @@ -9285,7 +9287,7 @@ msgstr "" msgid "This survey cannot be tested or completed for the following reason(s):" msgstr "" -#: application/helpers/frontend_helper.php:1403 tmp/twig_translate.php:167 +#: application/helpers/frontend_helper.php:1403 tmp/twig_translate.php:168 msgid "There are no questions in this survey." msgstr "" @@ -9485,7 +9487,7 @@ msgstr "" #: application/helpers/qanda_helper.php:2310 #: application/views/admin/survey/activateSurvey_view.php:36 -#: tmp/twig_translate.php:195 tmp/twig_translate.php:209 +#: tmp/twig_translate.php:196 tmp/twig_translate.php:210 msgid "Return to survey" msgstr "" @@ -10922,7 +10924,7 @@ msgid "Display type" msgstr "" #: application/helpers/questionHelper.php:1571 -#: application/views/admin/survey/Question/editQuestion_view.php:260 +#: application/views/admin/survey/Question/editQuestion_view.php:248 msgid "Use a customized question theme for this question" msgstr "" @@ -10951,11 +10953,11 @@ msgstr "" msgid "Note: Print will not include items on this page" msgstr "" -#: application/helpers/replacements_helper.php:297 tmp/twig_translate.php:202 +#: application/helpers/replacements_helper.php:297 tmp/twig_translate.php:203 msgid "Answers cleared" msgstr "" -#: application/helpers/replacements_helper.php:298 tmp/twig_translate.php:166 +#: application/helpers/replacements_helper.php:298 tmp/twig_translate.php:167 msgid "Your assessment" msgstr "" @@ -11448,20 +11450,20 @@ msgid "Config file is malformed or null." msgstr "" #: application/libraries/PluginManager/Question/QuestionBase.php:101 -#: application/views/admin/survey/Question/editQuestion_view.php:224 +#: application/views/admin/survey/Question/editQuestion_view.php:212 msgid "Question type:" msgstr "" #: application/libraries/PluginManager/Question/QuestionBase.php:114 #: application/views/admin/assessments/assessments_edit.php:39 -#: application/views/admin/survey/Question/editQuestion_view.php:287 +#: application/views/admin/survey/Question/editQuestion_view.php:275 #: application/views/admin/survey/Question/question_subviews/_accordion_container.php:94 #: application/views/admin/survey/Question/question_view.php:11 msgid "Question group:" msgstr "" #: application/libraries/PluginManager/Question/QuestionBase.php:123 -#: application/views/admin/survey/Question/editQuestion_view.php:328 +#: application/views/admin/survey/Question/editQuestion_view.php:316 #: application/views/admin/survey/Question/question_subviews/_accordion_container.php:111 #: application/views/admin/survey/Question/question_view.php:167 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:77 @@ -12985,8 +12987,8 @@ msgstr "" #: application/views/admin/emailtemplates/emailtemplates_view.php:63 #: application/views/admin/pluginmanager/configure.php:28 #: application/views/admin/super/fullpagebar_view.php:29 +#: application/views/admin/survey/Question/editQuestion_view.php:380 #: application/views/admin/survey/Question/editQuestion_view.php:386 -#: application/views/admin/survey/Question/editQuestion_view.php:392 #: application/views/admin/survey/Question/question_subviews/_tabs.php:126 #: application/views/admin/survey/Question/questionbar_view.php:233 #: application/views/admin/survey/Question/questionbar_view.php:281 @@ -13260,7 +13262,7 @@ msgstr "" #: application/views/admin/update/manage/subscribe.php:38 #: application/views/admin/update/updater/welcome/_subscribe.php:44 #: application/views/survey/system/actionButton/moveSubmit.php:11 -#: tmp/twig_translate.php:159 tmp/twig_translate.php:211 +#: tmp/twig_translate.php:159 tmp/twig_translate.php:212 msgid "Submit" msgstr "" @@ -16357,7 +16359,7 @@ msgid "Structure" msgstr "" #: application/views/admin/super/sidemenu.php:60 -#: application/views/admin/survey/Question/editQuestion_view.php:377 +#: application/views/admin/survey/Question/editQuestion_view.php:371 #: application/views/admin/survey/subview/_survey_quickaction.php:119 #: application/views/admin/survey/subview/_survey_quickaction.php:167 #: application/views/admin/survey/subview/_survey_quickaction.php:193 @@ -16479,13 +16481,6 @@ msgstr "" msgid "Error: You are trying to use duplicate answer codes." msgstr "" -#: application/views/admin/survey/Question/advanced_settings_view.php:23 -#: application/views/admin/survey/Question/editQuestion_view.php:137 -#: application/views/admin/survey/Question/editQuestion_view.php:206 -#: application/views/admin/survey/subview/accordion/_plugin_panel.php:27 -msgid "Expand/Collapse" -msgstr "" - #: application/views/admin/survey/Question/answerOptions_view.php:16 msgid "Duplicate label set name" msgstr "" @@ -16498,66 +16493,66 @@ msgstr "" msgid "Preview question type" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:140 +#: application/views/admin/survey/Question/editQuestion_view.php:135 msgid "Copy options" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:147 +#: application/views/admin/survey/Question/editQuestion_view.php:141 msgid "Copy subquestions?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:159 +#: application/views/admin/survey/Question/editQuestion_view.php:153 msgid "Copy answer options?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:171 +#: application/views/admin/survey/Question/editQuestion_view.php:165 msgid "Copy default answers?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:183 +#: application/views/admin/survey/Question/editQuestion_view.php:177 msgid "Copy advanced settings?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:209 +#: application/views/admin/survey/Question/editQuestion_view.php:198 #: application/views/admin/survey/Question/question_subviews/_accordion_container.php:11 #: application/views/admin/survey/subview/accordion/_accordion_container.php:29 msgid "General options" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:255 +#: application/views/admin/survey/Question/editQuestion_view.php:243 msgid "Question theme:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:277 +#: application/views/admin/survey/Question/editQuestion_view.php:265 #: application/views/admin/themes/templatesummary_view.php:206 msgid "Preview:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:299 +#: application/views/admin/survey/Question/editQuestion_view.php:287 #: application/views/admin/survey/Question/massive_actions/_set_questions_other.php:8 #: application/views/admin/survey/Question/question_subviews/_accordion_container.php:101 #: application/views/admin/survey/Question/question_view.php:133 msgid "Option 'Other':" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:315 +#: application/views/admin/survey/Question/editQuestion_view.php:303 #: application/views/admin/survey/Question/massive_actions/_set_questions_mandatory.php:9 #: application/views/admin/survey/Question/question_subviews/_accordion_container.php:106 #: application/views/admin/survey/Question/question_view.php:151 msgid "Mandatory:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:320 +#: application/views/admin/survey/Question/editQuestion_view.php:308 #: application/views/admin/survey/Question/massive_actions/_selector.php:78 #: application/views/admin/survey/Question/massive_actions/_selector.php:87 msgid "Set \"Mandatory\" state" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:336 +#: application/views/admin/survey/Question/editQuestion_view.php:324 msgid "Note: You can't edit the relevance equation because there are currently conditions set for this question." msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:342 +#: application/views/admin/survey/Question/editQuestion_view.php:330 #: application/views/admin/survey/Question/question_subviews/_accordion_container.php:116 #: application/views/admin/survey/Question/question_view.php:74 msgid "Validation:" @@ -16653,9 +16648,9 @@ msgstr "" #: application/views/admin/survey/Question/listquestions.php:105 #: application/views/survey/system/required.php:6 tmp/twig_translate.php:145 #: tmp/twig_translate.php:146 tmp/twig_translate.php:149 -#: tmp/twig_translate.php:191 tmp/twig_translate.php:192 -#: tmp/twig_translate.php:193 tmp/twig_translate.php:206 -#: tmp/twig_translate.php:207 tmp/twig_translate.php:220 +#: tmp/twig_translate.php:192 tmp/twig_translate.php:193 +#: tmp/twig_translate.php:194 tmp/twig_translate.php:207 +#: tmp/twig_translate.php:208 tmp/twig_translate.php:221 msgid "Mandatory" msgstr "" @@ -17932,6 +17927,10 @@ msgstr "" msgid "Survey-SID/Group" msgstr "" +#: application/views/admin/survey/subview/accordion/_plugin_panel.php:27 +msgid "Expand/Collapse" +msgstr "" + #: application/views/admin/survey/subview/accordion/_presentation_panel.php:29 msgid "Navigation delay (seconds):" msgstr "" @@ -18938,7 +18937,7 @@ msgid "Thank you!" msgstr "" #: application/views/admin/themes/templateeditor_completed_view.php:4 -#: tmp/twig_translate.php:196 tmp/twig_translate.php:199 +#: tmp/twig_translate.php:197 tmp/twig_translate.php:200 msgid "Your survey responses have been recorded." msgstr "" @@ -20851,7 +20850,7 @@ msgstr "" #: application/views/survey/frontpage/clearallForm/heading.php:7 #: application/views/survey/system/actionButton/clearAll.php:16 #: application/views/survey/system/actionLink/clearAll.php:11 -#: tmp/twig_translate.php:165 +#: tmp/twig_translate.php:166 msgid "Exit and clear survey" msgstr "" @@ -20866,7 +20865,7 @@ msgid "Security question:" msgstr "" #: application/views/survey/frontpage/loadForm/form.php:35 -#: tmp/twig_translate.php:208 +#: tmp/twig_translate.php:209 msgid "Load now" msgstr "" @@ -20874,12 +20873,12 @@ msgstr "" #: application/views/survey/system/actionButton/saveLoad.php:11 #: application/views/survey/system/actionLink/saveLoad.php:11 #: tmp/twig_translate.php:156 tmp/twig_translate.php:163 -#: tmp/twig_translate.php:204 +#: tmp/twig_translate.php:205 msgid "Load unfinished survey" msgstr "" #: application/views/survey/frontpage/loadForm/message.php:7 -#: tmp/twig_translate.php:205 +#: tmp/twig_translate.php:206 msgid "You can load a survey that you have previously saved from this screen." msgstr "" @@ -20900,7 +20899,7 @@ msgid "You may register for this survey but you have to wait for the %s before s msgstr "" #: application/views/survey/frontpage/registerForm/message.php:10 -#: tmp/twig_translate.php:214 +#: tmp/twig_translate.php:215 msgid "You may register for this survey if you wish to take part." msgstr "" @@ -20921,12 +20920,12 @@ msgid "Your email address:" msgstr "" #: application/views/survey/frontpage/saveForm/heading.php:7 -#: tmp/twig_translate.php:188 +#: tmp/twig_translate.php:189 msgid "Save your unfinished survey" msgstr "" #: application/views/survey/frontpage/saveForm/message.php:7 -#: tmp/twig_translate.php:189 +#: tmp/twig_translate.php:190 msgid "Enter a name and password for this survey and click save below." msgstr "" @@ -20939,7 +20938,7 @@ msgid "If you give an email address, an email containing the details will be sen msgstr "" #: application/views/survey/frontpage/saveForm/message.php:10 -#: tmp/twig_translate.php:190 +#: tmp/twig_translate.php:191 msgid "After having clicked the save button you can either close this browser window or continue filling out the survey." msgstr "" @@ -21165,7 +21164,7 @@ msgid "Accept" msgstr "" #: tmp/twig_translate.php:147 tmp/twig_translate.php:150 -#: tmp/twig_translate.php:218 +#: tmp/twig_translate.php:219 msgid "Reload captcha" msgstr "" @@ -21173,58 +21172,62 @@ msgstr "" msgid "Question by question mode not yet supported." msgstr "" -#: tmp/twig_translate.php:168 +#: tmp/twig_translate.php:165 +msgid "This action need to be confirmed." +msgstr "" + +#: tmp/twig_translate.php:169 msgid "There is 1 question in this survey." msgstr "" -#: tmp/twig_translate.php:171 +#: tmp/twig_translate.php:172 msgid "This survey is currently not active. You will not be able to save your responses." msgstr "" -#: tmp/twig_translate.php:172 +#: tmp/twig_translate.php:173 msgid "PDF export" msgstr "" -#: tmp/twig_translate.php:173 +#: tmp/twig_translate.php:174 msgid "queXMLPDF export" msgstr "" -#: tmp/twig_translate.php:179 +#: tmp/twig_translate.php:180 msgid "No comment" msgstr "" -#: tmp/twig_translate.php:180 +#: tmp/twig_translate.php:181 msgid "File type" msgstr "" -#: tmp/twig_translate.php:181 +#: tmp/twig_translate.php:182 msgid "Rank" msgstr "" -#: tmp/twig_translate.php:187 +#: tmp/twig_translate.php:188 msgid "default" msgstr "" -#: tmp/twig_translate.php:198 +#: tmp/twig_translate.php:199 msgid "Your survey responses have not been recorded. This survey is not yet active." msgstr "" -#: tmp/twig_translate.php:201 +#: tmp/twig_translate.php:202 msgid "View the statistics for this survey." msgstr "" -#: tmp/twig_translate.php:203 +#: tmp/twig_translate.php:204 msgid "Restart this survey" msgstr "" -#: tmp/twig_translate.php:212 +#: tmp/twig_translate.php:213 msgid "Thank you for registering. You will receive an email shortly." msgstr "" -#: tmp/twig_translate.php:213 +#: tmp/twig_translate.php:214 msgid "You may register for this survey but you have to wait for the {{sStartDate}} before starting the survey." msgstr "" -#: tmp/twig_translate.php:219 +#: tmp/twig_translate.php:220 msgid "Fields marked with an asterisk are mandatory." msgstr "" \ No newline at end of file diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo index 472f3b7a170..02cd33cc594 100644 Binary files a/locale/ca/ca.mo and b/locale/ca/ca.mo differ diff --git a/locale/hr/hr.mo b/locale/hr/hr.mo index 1c34231cb74..de0cf982972 100644 Binary files a/locale/hr/hr.mo and b/locale/hr/hr.mo differ diff --git a/locale/nb/nb.mo b/locale/nb/nb.mo index 36b073a6edc..e0e61b19aac 100644 Binary files a/locale/nb/nb.mo and b/locale/nb/nb.mo differ diff --git a/locale/pl/pl.mo b/locale/pl/pl.mo index f0aeecb1198..91ab609bacd 100644 Binary files a/locale/pl/pl.mo and b/locale/pl/pl.mo differ diff --git a/locale/th/th.mo b/locale/th/th.mo index 8457cc36cea..2e877eddbe9 100644 Binary files a/locale/th/th.mo and b/locale/th/th.mo differ diff --git a/themes/survey/vanilla/scripts/theme.js b/themes/survey/vanilla/scripts/theme.js index 89dcba5c3f2..8eb13b08153 100644 --- a/themes/survey/vanilla/scripts/theme.js +++ b/themes/survey/vanilla/scripts/theme.js @@ -107,25 +107,6 @@ var ThemeScripts = function(){ }); }; - var initLanguageChanger = function(selectorItem){ - $(selectorItem).on('change',function(e) { - var lang = $(this).val(); - var parser = document.createElement('a'); - parser.href = window.location.href; - var url = parser.protocol+'//'+parser.host+parse.search; - logObject.log(lang, 'changed'); - // If there are no form : we can't use it - // No form, not targeturl : just see what happen - - $('
    ', { - 'class':'ls-js-hidden', - 'html': '', - 'action' : url, - 'method': 'get' - }).appendTo('body').submit(); - }); - }; - var initTopMenuLanguageChanger = function(selectorItem, selectorGlobalForm){ // $(selectorContainer).height($('#main-row').height()); $(selectorItem).on('click', function(){ @@ -317,7 +298,6 @@ var ThemeScripts = function(){ initUserForms: initUserForms, initGlobal: initGlobal, initWelcomePage: initWelcomePage, - initLanguageChanger: initLanguageChanger, focusFirst: focusFirst, sliderSuffixClone : sliderSuffixClone, fixBodyPadding : fixBodyPadding, diff --git a/themes/survey/vanilla/views/subviews/navigation/language_changer.twig b/themes/survey/vanilla/views/subviews/navigation/language_changer.twig index 4e301e633db..dadc5731fb1 100644 --- a/themes/survey/vanilla/views/subviews/navigation/language_changer.twig +++ b/themes/survey/vanilla/views/subviews/navigation/language_changer.twig @@ -42,7 +42,7 @@ 'type' : 'submit', 'value' : 'changelang', 'name' : 'move', - 'class' : 'btn btn-info ls-js-hidden ls-language-changer-item ', + 'class' : 'btn btn-info ls-language-changer-item ', } %} {{