Merge remote-tracking branch 'origin/master' into rand

Conflicts: application/helpers/frontend_helper.php
LimeSurvey · Sep 1, 2016 · 9d27351 · 9d27351
2 parents 503c976 + 1802837
commit 9d27351
Show file tree

Hide file tree

Showing 29 changed files with 278 additions and 280 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -1810,13 +1810,15 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
         $fieldmap["startlanguage"]['group_name']="";
     }
 
+    /*
     $fieldmap['seed'] = array('fieldname' => 'seed', 'sid' => $surveyid, 'type' => 'seed', 'gid' => '', 'qid' => '', 'aid' => '');
     if ($style == 'full')
     {
         $fieldmap["seed"]['title']="";
         $fieldmap["seed"]['question']=gT("Seed");
         $fieldmap["seed"]['group_name']="";
     }
+    */
 
     //Check for any additional fields for this survey and create necessary fields (token and datestamp and ipaddr)
     $prow = Survey::model()->findByPk($surveyid)->getAttributes(); //Checked

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -1063,8 +1063,6 @@ function buildsurveysession($surveyid,$preview=false)
     $qtypes=getQuestionTypeList('','array');
     $fieldmap=createFieldMap($surveyid,'full',true,false,$_SESSION['survey_'.$surveyid]['s_lang']);
 
-    //$fieldmap = randomizationGroupsAndQuestions($surveyid, $preview, $fieldmap);
-
     $_SESSION['survey_'.$surveyid]['fieldmap'] = $fieldmap;
 
     initFieldArray($surveyid, $fieldmap);

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -688,7 +688,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     $coreReplacements['ASSESSMENTS'] = $assessmenthtml;
     $coreReplacements['ASSESSMENT_CURRENT_TOTAL'] = $_assessment_current_total;
     $coreReplacements['ASSESSMENT_HEADING'] = gT("Your assessment");
-    $coreReplacements['CHECKJAVASCRIPT'] = "<noscript><span class='warningjs'>".gT("Caution: JavaScript execution is disabled in your browser. You may not be able to answer all questions in this survey. Please, verify your browser parameters.")."</span></noscript>";
+    $coreReplacements['CHECKJAVASCRIPT'] = "<p class='alert alert-danger warningjs'>".gT("Caution: JavaScript execution is disabled in your browser. You may not be able to answer all questions in this survey. Please, verify your browser parameters.")."</p>";
     $coreReplacements['CLEARALL'] = $_clearall;
     $coreReplacements['CLEARALL_LINKS'] = $_clearalllinks;
     $coreReplacements['CLOSEWINDOW'] = ''; // Obsolete tag - keep this line for compatibility reaons

diff --git a/application/views/admin/update/updater/_error.php b/application/views/admin/update/updater/_error.php
@@ -42,13 +42,13 @@
 
     case 'out_of_updates':
         $title = gT("Your update key has exceeded the maximum number updates!");
-        $message = gT("You should first renew this key before using it or try to enter a new one!");
+        $message = gT("Please buy a new one!");
         $buttons = 1;
         break;
 
     case 'expired':
         $title = gT("Your update key has expired!");
-        $message = gT("You should first renew this key before using it or try to enter a new one!");
+        $message = gT("Please buy a new one!");
         $buttons = 1;
         break;
 
@@ -146,7 +146,7 @@
 
 <?php if( $buttons == 1 ): ?>
         <a class="btn btn-default" href="https://www.limesurvey.org/en/" role="button" aria-disabled="false" target="_blank">
-            <?php eT("Renew this key"); ?>
+            <?php eT("Buy a new key"); ?>
         </a>
 
         <a class="btn btn-default" href="<?php echo $urlNew;?>" role="button" aria-disabled="false">

diff --git a/application/views/admin/update/updater/welcome/_error.php b/application/views/admin/update/updater/welcome/_error.php
@@ -71,7 +71,7 @@
 
 <?php if( $buttons == 1 ): ?>
         <a class="btn btn-default" href="https://www.limesurvey.org/en/" role="button" aria-disabled="false" target="_blank">
-            <?php eT("Renew this key"); ?>
+            <?php eT("Buy a new key"); ?>
         </a>
 
         <a class="btn btn-default" href="<?php echo $urlNew;?>" role="button" aria-disabled="false">

diff --git a/application/views/admin/update/updater/welcome/_welcome.php b/application/views/admin/update/updater/welcome/_welcome.php
@@ -48,7 +48,7 @@
         <?php endif;?>
 
         <strong><?php eT('Your update key:');?> <?php echo $serverAnswer->key_infos->keyid; ?></strong><br/>
-        <strong><?php eT('Valid until:');?> <?php echo $sValidityDate; ?></strong><br/>        
+        <strong><?php eT('Valid until:');?> <?php echo $sValidityDate; ?></strong><br/>
         <?php  if ($serverAnswer->key_infos->remaining_updates!=-999) { ?>
             <strong><?php eT('Remaining updates:');?> <?php echo $serverAnswer->key_infos->remaining_updates;?></strong><br/>
         <?php } ?>
@@ -57,7 +57,7 @@
             <br/>
             <?php  if ($serverAnswer->key_infos->remaining_updates!=-999):?>
                 <a class="btn btn-default" href="https://www.limesurvey.org/en/" role="button" aria-disabled="false" target="_blank">
-                    <?php eT("Renew this key"); ?>
+                    <?php eT("Buy a new key"); ?>
                 </a>
             <?php endif; ?>