Dev: update $sgq ro $basename : mpore clear, send always and use it

Dev: move descrivedby by arialabelledby : it's the case
LimeSurvey · Nov 21, 2016 · de062d9 · de062d9
1 parent 1183e49
commit de062d9
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 68 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
diff --git a/application/views/survey/questions/5pointchoice/answer.php b/application/views/survey/questions/5pointchoice/answer.php
@@ -15,7 +15,7 @@
 <!-- 5 point choice -->
 
 <!-- answer -->
-<ul class="<?php echo $coreClass;?> list-unstyled form-inline" role="radio-group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<ul class="<?php echo $coreClass;?> list-unstyled form-inline" role="radio-group" aria-labelledby="ls-question-text-<?php echo $name; ?>">
     <?php
         // item_row.php
         echo $sRows;

diff --git a/application/views/survey/questions/date/dropdown/answer.php b/application/views/survey/questions/date/dropdown/answer.php
@@ -15,7 +15,7 @@
 <!-- Date, dropdown layout -->
 
 <!-- answer -->
-<div class="<?php echo $coreClass;?> form-group form-inline" role="group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<div class="<?php echo $coreClass;?> form-group form-inline" role="group" aria-labelledby="ls-question-text-<?php echo $name; ?>">
     <?php
         // rows/*.php
         echo $sRows;

diff --git a/application/views/survey/questions/gender/buttons/answer.php b/application/views/survey/questions/gender/buttons/answer.php
@@ -13,7 +13,7 @@
 
 <!--Gender question, buttons display -->
 <!-- answer -->
-<ul class="<?php echo $coreClass;?> list-unstyled form-inline btn-group btn-group-justified" data-toggle="buttons" role="radio-group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<ul class="<?php echo $coreClass;?> list-unstyled form-inline btn-group btn-group-justified" data-toggle="buttons" role="radio-group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <!-- Female -->
     <li id="javatbd<?php echo $name;?>F" class="button-item btn btn-primary <?php if($fChecked!=''){echo 'active';}?>">
         <input

diff --git a/application/views/survey/questions/gender/radio/answer.php b/application/views/survey/questions/gender/radio/answer.php
@@ -14,7 +14,7 @@
 <!--Gender question, radio display -->
 
 <!-- answer -->
-<ul class="<?php echo $coreClass;?> list-unstyled form-inline" role="radio-group" aria-describedby="ls-question-text-<?php echo $name; ?>" >
+<ul class="<?php echo $coreClass;?> list-unstyled form-inline" role="radio-group" aria-labelledby="ls-question-text-<?php echo $basename; ?>" >
     <!-- Female -->
     <li id='javatbd<?php echo $name; ?>F' class="form-group answer-item radio-item">
         <input

diff --git a/application/views/survey/questions/list_dropdown/answer.php b/application/views/survey/questions/list_dropdown/answer.php
@@ -23,7 +23,7 @@ class="form-control list-question-select"
             name="<?php echo $name; ?>"
             id="answer<?php echo $name; ?>"
             <?php  echo ($dropdownSize) ? "size=$dropdownSize" : "" ; ?>
-            aria-labelledby="ls-question-text-<?php echo $name; ?>"
+            aria-labelledby="ls-question-text-<?php echo $basename; ?>"
     >
         <?php
             // rows/option.php

diff --git a/application/views/survey/questions/list_with_comment/dropdown/answer.php b/application/views/survey/questions/list_with_comment/dropdown/answer.php
@@ -20,7 +20,7 @@
  */
 ?>
 
-<div class="ls-answers row" role="group" aria-labelledby="ls-question-text-<?php echo $sgq; ?>">
+<div class="ls-answers row" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
 
     <div class="answer-item dropdown-item col-sm-6 col-xs-12">
         <select

diff --git a/application/views/survey/questions/list_with_comment/list/answer.php b/application/views/survey/questions/list_with_comment/list/answer.php
@@ -19,7 +19,7 @@
 <!-- List with comment, list style, -->
 
 <!-- answer -->
-<div class="<?php echo $coreClass; ?> row" role="group" aria-labelledby="ls-question-text-<?php echo $sgq; ?>">
+<div class="<?php echo $coreClass; ?> row" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <div class="answers-list radio-list col-sm-6 col-xs-12">
         <ul class="list-unstyled" role="radio-group">
             <?php

diff --git a/application/views/survey/questions/listradio/answer.php b/application/views/survey/questions/listradio/answer.php
@@ -12,7 +12,7 @@
 <!-- answer -->
 <?php echo $sTimer; ?>
 
-<div class="<?php echo $coreClass;?> row" role="radio-group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<div class="<?php echo $coreClass;?> row" role="radio-group" aria-labelledby="ls-question-text-<?php echo $name; ?>">
 <?php
     // rows/answer_row.php
     echo $sRows;
@@ -23,5 +23,6 @@
     name="java<?php echo $name; ?>"
     id="java<?php echo $name; ?>"
     value="<?php echo $value;?>"
+    disabled
 />
 <!-- end of answer -->
diff --git a/application/views/survey/questions/longfreetext/answer.php b/application/views/survey/questions/longfreetext/answer.php
@@ -27,7 +27,7 @@ class="form-control <?php echo $kpclass; ?>"
         rows="<?php echo $drows; ?>"
         <?php echo ($inputsize ? 'cols="'.$inputsize.'"': '') ; ?>
         <?php echo ($maxlength ? 'maxlength='.$maxlength: ''); ?>
-        aria-labelledby="ls-question-text-<?php echo $name; ?>"
+        aria-labelledby="ls-question-text-<?php echo $basename; ?>"
     ><?php echo $dispVal;?></textarea>
 <?php if($withColumn): ?>
     </div>

diff --git a/application/views/survey/questions/multiplechoice/answer.php b/application/views/survey/questions/multiplechoice/answer.php
@@ -13,7 +13,7 @@
 <!-- answer -->
 <?php /* What is the usage of this input ? */ ?>
 <input type="hidden" name="MULTI<?php echo $name; ?>" value="<?php echo $anscount; ?>" />
-<div class="<?php echo $coreClass;?> row" role="group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<div class="<?php echo $coreClass;?> row" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
 <?php
     // rows/answer_row*.php
     echo $sRows;

diff --git a/application/views/survey/questions/multiplechoice_with_comments/answer.php b/application/views/survey/questions/multiplechoice_with_comments/answer.php
@@ -12,7 +12,7 @@
 
 <!-- answer -->
 <input type='hidden' name='<?php echo $name; ?>' value='<?php echo $value;?>' />
-<ul class="<?php echo $coreClass; ?> list-unstyled" role="group" aria-describedby="ls-question-text-<?php echo $sgq; ?>">
+<ul class="<?php echo $coreClass; ?> list-unstyled" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <?php
         // rows/answer_row.php
         echo $sRows;

diff --git a/application/views/survey/questions/multiplenumeric/answer.php b/application/views/survey/questions/multiplenumeric/answer.php
@@ -16,7 +16,7 @@
 ?>
 <!-- Multiple Numerical with slider -->
 <!-- answer -->
-<ul class='<?php echo $coreClass?> list-unstyled form-horizontal' role="group" aria-describedby="ls-question-text-<?php echo $sgq; ?>">
+<ul class='<?php echo $coreClass?> list-unstyled form-horizontal' role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <?php
         // rows/answer_row.php
         echo $sRows;

diff --git a/application/views/survey/questions/multiplenumeric/answer_input.php b/application/views/survey/questions/multiplenumeric/answer_input.php
@@ -17,7 +17,7 @@
 <!-- Multiple Numerical -->
 
 <!-- answer -->
-<ul class='<?php echo $coreClass?> list-unstyled form-horizontal' role="group" aria-describedby="ls-question-text-<?php echo $sgq; ?>">
+<ul class='<?php echo $coreClass?> list-unstyled form-horizontal' role="group" aria-describedby="ls-question-text-<?php echo $basename; ?>">
 <?php
     // rows/answer_row.php
     echo $sRows;

diff --git a/application/views/survey/questions/multipleshorttext/answer.php b/application/views/survey/questions/multipleshorttext/answer.php
@@ -9,7 +9,7 @@
 <!-- Multiple Shor Text -->
 
 <!-- answer -->
-<ul class="<?php echo $coreClass?> list-unstyled form-horizontal" role="group" aria-describedby="ls-question-text-<?php echo $sgq; ?>">
+<ul class="<?php echo $coreClass?> list-unstyled form-horizontal" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <?php
         echo $sRows;
     ?>

diff --git a/application/views/survey/questions/numerical/answer.php b/application/views/survey/questions/numerical/answer.php
@@ -42,7 +42,7 @@ class='form-control <?php echo $answertypeclass; ?>'
         <?php echo ($maxlength ? 'maxlength='.$maxlength: ''); ?>
         data-number='1'
         data-integer='<?php echo $integeronly; ?>'
-        aria-labelledby="ls-question-text-<?php echo $name; ?>"
+        aria-labelledby="ls-question-text-<?php echo $basename; ?>"
         />
     <!-- Suffix -->
     <?php if ($suffix !== ''): ?>

diff --git a/application/views/survey/questions/ranking/answer.php b/application/views/survey/questions/ranking/answer.php
@@ -24,7 +24,7 @@
 
 <!-- answer -->
 <div class="<?php echo $coreClass; ?>">
-    <ul class="list-unstyled ls-js-hidden-sr answers-list select-list form-horizontal">
+    <ul class="list-unstyled ls-js-hidden-sr answers-list select-list form-horizontal" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
         <?php
             // rows/answer_row.php
             echo  $sSelects;

diff --git a/application/views/survey/questions/shortfreetext/location_mapservice/item.php b/application/views/survey/questions/shortfreetext/location_mapservice/item.php
@@ -22,7 +22,7 @@
     zoom['<?php echo $name;?>'] = <?php echo $location_mapzoom;?>;
 </script>
 
-<div class="<?php echo $coreClass; ?> <?php echo $extraclass;?>" row" role="group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<div class="<?php echo $coreClass; ?> <?php echo $extraclass;?>" row" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <!-- Input Text Location -->
     <div class="col-sm-12" >
             <input

diff --git a/application/views/survey/questions/shortfreetext/location_mapservice/item_100.php b/application/views/survey/questions/shortfreetext/location_mapservice/item_100.php
@@ -17,7 +17,7 @@
  */
 ?>
 
-<div class="<?php echo $coreClass; ?> <?php echo $extraclass; ?> row" role="group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<div class="<?php echo $coreClass; ?> <?php echo $extraclass; ?> row" role="group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
 
     <div class="geoname_search col-sm-12 " >
         <div class="input-group">

diff --git a/application/views/survey/questions/shortfreetext/text/item.php b/application/views/survey/questions/shortfreetext/text/item.php
@@ -37,7 +37,7 @@ class="form-control <?php echo $kpclass;?>"
             value="<?php echo $dispVal; ?>"
             <?php echo ($inputsize ? 'size="'.$inputsize.'"': '') ; ?>
             <?php echo ($maxlength ? 'maxlength='.$maxlength: ''); ?>
-            aria-labelledby="ls-question-text-<?php echo $name; ?>"
+            aria-labelledby="ls-question-text-<?php echo $basename; ?>"
         />
 
         <!-- Suffix -->

diff --git a/application/views/survey/questions/shortfreetext/textarea/item.php b/application/views/survey/questions/shortfreetext/textarea/item.php
@@ -35,7 +35,7 @@ class="form-control textarea <?php echo $kpclass; ?>"
                 rows="<?php echo $drows; ?>"
                 <?php echo ($inputsize ? 'cols="'.$inputsize.'"': '') ; ?>
                 <?php echo ($maxlength ? 'maxlength='.$maxlength: ''); ?>
-                aria-labelledby="ls-question-text-<?php echo $name; ?>"
+                aria-labelledby="ls-question-text-<?php echo $basename; ?>"
             ><?php echo $dispVal; ?></textarea>
 
             <!-- Suffix -->

diff --git a/application/views/survey/questions/yesno/buttons/item.php b/application/views/survey/questions/yesno/buttons/item.php
@@ -10,7 +10,7 @@
  * @var $value                          $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$name]
  */
 ?>
-<ul class="<?php echo $coreClass;?> list-unstyled form-inline btn-group btn-group-justified" data-toggle="buttons" role="radio-group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<ul class="<?php echo $coreClass;?> list-unstyled form-inline btn-group btn-group-justified" data-toggle="buttons" role="radio-group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <!-- Yes -->
     <li id="javatbd<?php echo $name;?>Y" class="button-item form-group btn btn-primary <?php if($yChecked){ echo "active";}?>">
         <input

diff --git a/application/views/survey/questions/yesno/radio/item.php b/application/views/survey/questions/yesno/radio/item.php
@@ -12,7 +12,7 @@
  */
 ?>
 
-<ul class="<?php echo $coreClass;?> list-unstyled form-inline" role="radio-group" aria-describedby="ls-question-text-<?php echo $name; ?>">
+<ul class="<?php echo $coreClass;?> list-unstyled form-inline" role="radio-group" aria-labelledby="ls-question-text-<?php echo $basename; ?>">
     <!-- Yes -->
     <li id="javatbd<?php echo $name;?>Y"  class="form-group answer-item radio-item">
         <input