Dev: Move noscript tag into replacements helper

LimeSurvey · Sep 6, 2016 · 1af0068 · 1af0068
1 parent 6d98e16
commit 1af0068
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
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'] = "<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['CHECKJAVASCRIPT'] = "<noscript id='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></noscript>";
     $coreReplacements['CLEARALL'] = $_clearall;
     $coreReplacements['CLEARALL_LINKS'] = $_clearalllinks;
     $coreReplacements['CLOSEWINDOW'] = ''; // Obsolete tag - keep this line for compatibility reaons

diff --git a/templates/default/views/survey.pstpl b/templates/default/views/survey.pstpl
@@ -1,4 +1,2 @@
 <!-- Survey Description survey.pstpl -->
-<noscript role="alert"  id="checkjavascript">
-    {CHECKJAVASCRIPT}
-</noscript>
+{CHECKJAVASCRIPT}
diff --git a/templates/default/views/surveylist.pstpl b/templates/default/views/surveylist.pstpl
@@ -1,7 +1,5 @@
 
-<noscript class="alert alert-danger" role="alert"  id="checkjavascript">
-    {CHECKJAVASCRIPT}
-</noscript>
+{CHECKJAVASCRIPT}
 
 <div class="row" id="surveys-list-container">
     <div class="jumbotron" id="surveys-list-jumbotron">

diff --git a/templates/news_paper/views/survey.pstpl b/templates/news_paper/views/survey.pstpl
@@ -1,4 +1,2 @@
 <!-- Survey Description survey.pstpl -->
-<noscript role="alert"  id="checkjavascript">
-    {CHECKJAVASCRIPT}
-</noscript>
+{CHECKJAVASCRIPT}
diff --git a/templates/news_paper/views/surveylist.pstpl b/templates/news_paper/views/surveylist.pstpl
@@ -1,7 +1,5 @@
 
-<noscript class="alert alert-danger" role="alert"  id="checkjavascript">
-    {CHECKJAVASCRIPT}
-</noscript>
+{CHECKJAVASCRIPT}
 
 <div class="row" id="surveys-list-container">
     <div class="jumbotron" id="surveys-list-jumbotron">

diff --git a/templates/ubuntu_orange/views/survey.pstpl b/templates/ubuntu_orange/views/survey.pstpl
@@ -1,4 +1,2 @@
 <!-- Survey Description survey.pstpl -->
-<noscript role="alert"  id="checkjavascript">
-    {CHECKJAVASCRIPT}
-</noscript>
+{CHECKJAVASCRIPT}
diff --git a/templates/ubuntu_orange/views/surveylist.pstpl b/templates/ubuntu_orange/views/surveylist.pstpl
@@ -1,7 +1,5 @@
 
-<noscript class="alert alert-danger" role="alert"  id="checkjavascript">
-    {CHECKJAVASCRIPT}
-</noscript>
+{CHECKJAVASCRIPT}
 
 <div class="row" id="surveys-list-container">
     <div class="jumbotron" id="surveys-list-jumbotron">