Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@olleharstedt
olleharstedt committed Nov 14, 2022
2 parents 83e44bc + 61f353e commit e521c4f
Show file tree
Hide file tree
Showing 13 changed files with 434 additions and 421 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
View file
Expand Up @@ -16,5 +16,5 @@
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['templateapiversion'] = 3;
$config['assetsversionnumber'] = '30305';
$config['assetsversionnumber'] = '30306';
return $config;
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_header.php
View file
@@ -1,5 +1,5 @@
<!-- views/admin/export/statistics_subviews/_header.php -->
<h3 id="survey-action-title">
<?php eT("General filters"); ?>
<span data-url="/LimeSurveyNext/index.php/surveyAdministration/toggleQuickAction" id="generalfilters-chevron" class="fa fa-chevron-up"></span>
<span id="generalfilters-chevron" class="fa fa-chevron-up"></span>
</h3>
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_response_filter_header.php
View file
@@ -1,5 +1,5 @@
<!-- views/admin/export/statistics_subviews/_header.php -->
<h3 id="survey-response-filters">
<?php eT("Response filters"); ?>
<span data-url="/LimeSurveyNext/index.php/surveyAdministration/toggleQuickAction" id="responsefilters-chevron" class="fa fa-chevron-up"></span>
<span id="responsefilters-chevron" class="fa fa-chevron-up"></span>
</h3>
51 changes: 27 additions & 24 deletions application/views/admin/super/welcome.php
View file
@@ -1,4 +1,5 @@
<?php

/**
* The welcome page is the home page
* TODO : make a recursive function, taking any number of box in the database, calculating how much rows are needed.
Expand Down Expand Up @@ -27,7 +28,7 @@
<div class="container-fluid welcome full-page-wrapper">

<!-- Logo & Presentation -->
<?php if($bShowLogo):?>
<?php if ($bShowLogo) :?>
<div class="row">
<div class="jumbotron" id="welcome-jumbotron">
<img alt="logo" src="<?php echo LOGO_URL;?>" id="lime-logo" class="profile-img-card img-responsive center-block" />
Expand All @@ -37,7 +38,7 @@
<?php endif;?>

<!-- Message when first start -->
<?php if($countSurveyList==0 && Permission::model()->hasGlobalPermission('surveys','create') ):?>
<?php if ($countSurveyList == 0 && Permission::model()->hasGlobalPermission('surveys', 'create')) :?>
<script type="text/javascript">
$(window).load(function(){
$('#welcomeModal').modal('show');
Expand All @@ -56,19 +57,21 @@
<div class="row" id="selector__welcome-modal--simplesteps">
<p><?php eT("Some piece-of-cake steps to create your very own first survey:"); ?></p>
<ol>
<li><?php echo sprintf(gT('Create a new survey by clicking on the %s icon.'),
"<i class='icon-add text-success'></i>"); ?></li>
<li><?php echo sprintf(
gT('Create a new survey by clicking on the %s icon.'),
"<i class='icon-add text-success'></i>"
); ?></li>
<li><?php eT('Create a new question group inside your survey.'); ?></li>
<li><?php eT('Create one or more questions inside the new question group.'); ?></li>
<li><?php echo sprintf(gT('Done. Test your survey using the %s icon.'), "<i class='icon-do text-success'></i>"); ?></li>
</ol>
</div>
<div class="row"><hr/></div>

<?php
<?php
// Hide this until we have fixed the tutorial
// @TODO FIX TUTORIAL
if(Permission::model()->hasGlobalPermission('surveys','create') && 1==2) { ?>
if (Permission::model()->hasGlobalPermission('surveys', 'create') && 1 == 2) { ?>
<div class="row" id="selector__welcome-modal--tutorial">
<p><?php eT('Or, try out our interactive tutorial tour'); ?> </p>
<p class="text-center"><button class="btn btn-primary btn-lg" id="selector__welcome-modal--starttour"><?php eT("Start the tour"); ?></button></p>
Expand All @@ -86,10 +89,10 @@

<?php endif;?>

<?php
<?php
//Check for IE and show a warning box
if (preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || (strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/7.0') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'rv:11.0') !== false)) {
?>
if (preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || (strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/7.0') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'rv:11.0') !== false)) {
?>
<div class="container">
<div class="alert alert-danger" role="alert" id="warningIE11">
<div class="container-fluid">
Expand All @@ -98,36 +101,36 @@
</div>
<div class="row">
<div class="col-xs-12">
<?php eT("You are using Microsoft Internet Explorer."); ?><br/><br/>
<?php eT("LimeSurvey 3.x or newer does not support Internet Explorer for the LimeSurvey administration, anymore. However most of the functionality should still work."); ?><br/>
<?php eT("If you have any issues, please try using a modern browser first, before reporting it.");?>
<?php eT("You are using Microsoft Internet Explorer."); ?><br/><br/>
<?php eT("LimeSurvey 3.x or newer does not support Internet Explorer for the LimeSurvey administration, anymore. However most of the functionality should still work."); ?><br/>
<?php eT("If you have any issues, please try using a modern browser first, before reporting it.");?>
</div>
</div>
</div>
</div>
</div>

<?php
<?php
}
App()->getClientScript()->registerScript('WelcomeCheckIESafety', "
if(!/(MSIE|Trident\/)/i.test(navigator.userAgent)) {
$('#warningIE11').remove();
}
", LSYii_ClientScript::POS_POSTSCRIPT);
", LSYii_ClientScript::POS_POSTSCRIPT);
?>
<!-- Last visited survey/question -->
<?php if( $bShowLastSurveyAndQuestion && ($showLastSurvey || $showLastQuestion)): // bShowLastSurveyAndQuestion is the homepage setting, showLastSurvey & showLastQuestion are about if infos are available ?>
<?php if ($bShowLastSurveyAndQuestion && ($showLastSurvey || $showLastQuestion)) : // bShowLastSurveyAndQuestion is the homepage setting, showLastSurvey & showLastQuestion are about if infos are available ?>
<div class="row text-right">
<div class="col-lg-9 col-sm-9 ">
<div class='pull-right'>
<?php if($showLastSurvey):?>
<?php if ($showLastSurvey) :?>
<span id="last_survey" class=""> <!-- to enable rotation again set class back to "rotateShown" -->
<?php eT("Last visited survey:");?>
<a href="<?php echo $surveyUrl;?>" class=""><?php echo viewHelper::flatEllipsizeText($surveyTitle, true, 60);?></a>
</span>
<?php endif; ?>

<?php if($showLastQuestion):?>
<?php if ($showLastQuestion) :?>
<span id="last_question" class=""> <!-- to enable rotation again set class back to "rotateHidden" -->
<?php eT("Last visited question:");?>
<a href="<?php echo $last_question_link;?>" class=""><?php echo viewHelper::flatEllipsizeText($last_question_name, true, 60); ?></a>
Expand All @@ -141,14 +144,14 @@

<!-- Rendering all boxes in database -->
<?php $this->widget('ext.PanelBoxWidget.PanelBoxWidget', array(
'display'=>'allboxesinrows',
'boxesbyrow'=>$iBoxesByRow,
'offset'=>$sBoxesOffSet,
'display' => 'allboxesinrows',
'boxesbyrow' => $iBoxesByRow,
'offset' => $sBoxesOffSet,
'boxesincontainer' => $bBoxesInContainer
));
?>
?>

<?php if( $bShowSurveyList ): ?>
<?php if ($bShowSurveyList) : ?>
<div class="col-sm-12 list-surveys">
<h2><?php eT('Survey list'); ?></h2>
<?php
Expand All @@ -163,7 +166,7 @@

<!-- Boxes for smartphones -->
<div class="row hidden-sm hidden-md hidden-lg ">
<div class="panel panel-primary panel-clickable" id="panel-7" data-url="/limesurvey/LimeSurveyNext/index.php/surveyAdministration//listsurveys" style="opacity: 1; top: 0px;">
<div class="panel panel-primary panel-clickable" id="panel-7" data-url="<?php echo $this->createUrl("surveyAdministration/listSurveys") ?>" style="opacity: 1; top: 0px;">
<div class="panel-heading">
<div class="panel-title"><?php eT('List surveys');?></div>
</div>
Expand All @@ -176,7 +179,7 @@
</div>
</div>

<div class="panel panel-primary panel-clickable" id="panel-8" data-url="/limesurvey/LimeSurveyNext/index.php/admin/globalsettings" style="opacity: 1; top: 0px;">
<div class="panel panel-primary panel-clickable" id="panel-8" data-url="<?php echo $this->createUrl("admin/globalsettings") ?>" style="opacity: 1; top: 0px;">
<div class="panel-heading">
<div class="panel-title"><?php eT('Edit global settings');?></div>
</div>
Expand Down
35 changes: 16 additions & 19 deletions application/views/admin/token/bounce.php
View file
Expand Up @@ -3,7 +3,7 @@
<div class="row">
<div class="col-sm-12">
<div id='bouncesettingsdiv'>
<?php echo CHtml::form(array("admin/tokens/sa/bouncesettings/surveyid/$surveyid"), 'post',array('class'=>'form-core settingswidget ','id'=>'bouncesettings','name'=>'frmeditquestion')); ?>
<?php echo CHtml::form(array("admin/tokens/sa/bouncesettings/surveyid/$surveyid"), 'post', array('class' => 'form-core settingswidget ','id' => 'bouncesettings','name' => 'frmeditquestion')); ?>

<div class="settings-list">

Expand All @@ -25,11 +25,11 @@
<div class="default controls">
<?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
'name' => 'bounceprocessing',
'value'=> $settings['bounceprocessing'] ,
'selectOptions'=>array(
"N"=>gT("None",'unescaped'),
"L"=>gT("Use settings below",'unescaped'),
"G"=>gT("Use global settings",'unescaped')
'value' => $settings['bounceprocessing'] ,
'selectOptions' => array(
"N" => gT("None", 'unescaped'),
"L" => gT("Use settings below", 'unescaped'),
"G" => gT("Use global settings", 'unescaped')
)
));?>
</div>
Expand All @@ -45,10 +45,10 @@
<div class="default controls">
<?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
'name' => 'bounceaccounttype',
'value'=> $settings['bounceaccounttype'] ,
'selectOptions'=>array(
"IMAP"=>gT("IMAP",'unescaped'),
"POP"=>gT("POP",'unescaped')
'value' => $settings['bounceaccounttype'] ,
'selectOptions' => array(
"IMAP" => gT("IMAP", 'unescaped'),
"POP" => gT("POP", 'unescaped')
)
));?>
</div>
Expand Down Expand Up @@ -96,11 +96,11 @@
<div class="default controls">
<?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
'name' => 'bounceaccountencryption',
'value'=> strtolower($settings['bounceaccountencryption']),
'selectOptions'=>array(
"off"=>gT("Off (unsafe)",'unescaped'),
"ssl"=>gT("SSL/TLS",'unescaped'),
"tls"=>gT("StartTLS",'unescaped')
'value' => strtolower($settings['bounceaccountencryption']),
'selectOptions' => array(
"off" => gT("Off (unsafe)", 'unescaped'),
"ssl" => gT("SSL/TLS", 'unescaped'),
"tls" => gT("StartTLS", 'unescaped')
)
));?>
</div>
Expand All @@ -111,14 +111,11 @@
<!-- buttons -->
<div class="buttons control-group hidden">
<button name="save" value="save" class="btn" type="submit">Save bounce settings</button>
<a class="btn btn-link button" href="/LimeSurveyNext/index.php/admin/tokens?sa=index&amp;surveyid=274928">
Cancel
</a>
</div>
</form>
</div> <!-- bouncesettingsdiv -->
</div> <!-- col -->
</div> <!-- Row -->
</div> <!-- Side body -->

<?php App()->getClientScript()->registerScriptFile( App()->getConfig('adminscripts') . 'tokenbounce.js'); ?>
<?php App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts') . 'tokenbounce.js'); ?>
13 changes: 13 additions & 0 deletions docs/release_notes.txt
View file
Expand Up @@ -34,6 +34,19 @@ Thank you to everyone who helped with this new release!

CHANGE LOG
------------------------------------------------------
Changes from 5.4.10 (build 221107) to 5.4.11 (build 221114) November 14, 2022
-Fixed issue: Survey gets into a state where it seems to be active but isn't - to fix this run integrity check (Carsten Schmitz)
-Fixed issue: Start boxes having invalid links on small screens (Carsten Schmitz)
-Fixed issue: Division by zero on survey preview when no answer options exist (Carsten Schmitz)
-Fixed issue #15195: Expiration date can be set before start date (#2714) (Gabriel Jenik)
#Updated translation: Slovak by jelen1
#Updated translation: Portuguese (Portugal) by samarta
#Updated translation: Finnish by Jmantysalo
#Updated translation: Czech by jelen1
#Updated translation: Czech (Informal) by jelen1
#Updated translation: Catalan by qualitatuvic


Changes from 5.4.9 (build 221101) to 5.4.10 (build 221107) November 7, 2022
-Fixed issue #18451: Plugin uploading omit translation files (Bartosz Marganiec)
-Fixed issue #18338: For participants, expiration date can be set before start date (#2679) (Gabriel Jenik)
Expand Down

0 comments on commit e521c4f

Please sign in to comment.