From 07c899adc36481a649e74734c8b11851e31fd446 Mon Sep 17 00:00:00 2001
From: Chad Day <billdacat@gmail.com>
Date: Tue, 4 Jul 2017 01:59:12 -0400
Subject: [PATCH] Dev: working on admin 508  (#729)

---
 .../views/admin/dataentry/vvimport.php        |  4 +--
 .../views/admin/export/exportresults_view.php | 28 +++++++++----------
 .../statistics_subviews/_dataselection.php    |  2 +-
 .../statistics_subviews/_outputformat.php     |  2 +-
 .../statistics_subviews/_outputoptions.php    |  2 +-
 .../statistics_subviews/_responseid.php       |  2 +-
 .../statistics_subviews/_submissiondate.php   |  2 +-
 application/views/admin/export/vv_view.php    |  8 +++---
 .../labels/_labelviewrightcontent_view.php    |  4 +--
 .../Question/advanced_settings_view.php       |  5 ++--
 .../survey/Question/editQuestion_view.php     | 10 ++++---
 .../_accordion_container.php                  |  8 +++---
 .../Question/question_subviews/_tabs.php      |  2 +-
 .../admin/survey/Question/question_view.php   |  6 ++--
 .../survey/QuestionGroups/addGroup_view.php   |  4 +--
 .../survey/QuestionGroups/editGroup_view.php  |  4 +--
 .../survey/QuestionGroups/group_view.php      |  6 ++--
 .../survey/subview/_template_carousel.php     |  2 +-
 .../subview/accordion/_plugin_panel.php       |  5 ++--
 .../views/admin/survey/surveySummary_view.php | 18 +++++++++---
 20 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/application/views/admin/dataentry/vvimport.php b/application/views/admin/dataentry/vvimport.php
index c42acdf4ca9..baee635b08d 100644
--- a/application/views/admin/dataentry/vvimport.php
+++ b/application/views/admin/dataentry/vvimport.php
@@ -13,9 +13,9 @@
 
     <div class="panel panel-primary" id="panel-1">
         <div class="panel-heading">
-            <h4 class="panel-title">
+            <div class="panel-title h4">
                 <?php eT("General");?>
-            </h4>
+            </div>
         </div>
 
         <div class="panel-body">
diff --git a/application/views/admin/export/exportresults_view.php b/application/views/admin/export/exportresults_view.php
index 9bad3830f3f..5071dd24399 100644
--- a/application/views/admin/export/exportresults_view.php
+++ b/application/views/admin/export/exportresults_view.php
@@ -28,9 +28,9 @@
                         <!-- Format -->
                         <div class="panel panel-primary" id="panel-1">
                             <div class="panel-heading">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <?php eT("Format");?>
-                                </h4>
+                                </div>
                             </div>
                             <div class="panel-body">
                                 <div class="form-group">
@@ -54,9 +54,9 @@
                         <!-- Range -->
                         <div class="panel panel-primary" id="panel-2" <?php  if ($SingleResponse) { echo 'style="display:none"';} ?> >
                             <div class="panel-heading">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <?php eT("Range");?>
-                                </h4>
+                                </div>
                             </div>
                             <div class="panel-body">
                                 <div class="form-group">
@@ -101,9 +101,9 @@ class="form-control"
                         <!-- General -->
                         <div class="panel panel-primary" id="panel-3">
                             <div class="panel-heading">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <?php eT("General"); ?>
-                                </h4>
+                                </div>
                             </div>
                             <div class="panel-body">
                                 <div class="form-group">
@@ -132,9 +132,9 @@ class="form-control"
                         <!-- Heading -->
                         <div class="panel panel-primary" id="panel-4">
                             <div class="panel-heading">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <?php eT("Headings");?>
-                                </h4>
+                                </div>
                             </div>
                             <div class="panel-body">
 
@@ -242,9 +242,9 @@ class="form-control"
 
                         <div class="panel panel-primary" id="panel-5">
                             <div class="panel-heading">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <?php eT("Responses");?>
-                                </h4>
+                                </div>
                             </div>
                             <div class="panel-body">
                                 <!-- Answer codes / Full answers -->
@@ -292,9 +292,9 @@ class="form-control"
                         <!-- Column control -->
                         <div class="panel panel-primary" id="panel-6">
                             <div class="panel-heading">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <?php eT("Columns");?>
-                                </h4>
+                                </div>
                             </div>
                             <div class="panel-body">
                                 <input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
@@ -320,9 +320,9 @@ class="form-control"
                         <?php if ($thissurvey['anonymized'] == "N" && tableExists("{{tokens_$surveyid}}") && Permission::model()->hasSurveyPermission($surveyid,'tokens','read')): ?>
                             <div class="panel panel-primary" id="panel-7">
                                 <div class="panel-heading">
-                                    <h4 class="panel-title">
+                                    <div class="panel-title h4">
                                         <?php eT("Token control");?>
-                                    </h4>
+                                    </div>
                                 </div>
                                 <div class="panel-body">
                                     <div class="alert alert-info alert-dismissible" role="alert">
diff --git a/application/views/admin/export/statistics_subviews/_dataselection.php b/application/views/admin/export/statistics_subviews/_dataselection.php
index b450d852e9d..a040f793bea 100644
--- a/application/views/admin/export/statistics_subviews/_dataselection.php
+++ b/application/views/admin/export/statistics_subviews/_dataselection.php
@@ -1,6 +1,6 @@
 <div class="panel panel-primary" id="panel-1">
     <div class="panel-heading">
-        <h4 class="panel-title"><?php eT("Data selection"); ?></h4>
+        <div class="panel-title h4"><?php eT("Data selection"); ?></div>
     </div>
 
     <div class="panel-body">
diff --git a/application/views/admin/export/statistics_subviews/_outputformat.php b/application/views/admin/export/statistics_subviews/_outputformat.php
index c573e1da8a3..867d54c6118 100644
--- a/application/views/admin/export/statistics_subviews/_outputformat.php
+++ b/application/views/admin/export/statistics_subviews/_outputformat.php
@@ -1,6 +1,6 @@
     <div class="panel panel-primary " id="panel-1">
         <div class="panel-heading">
-            <h4 class="panel-title"><?php eT("Output format"); ?></h4>
+            <div class="panel-title h4"><?php eT("Output format"); ?></div>
         </div>
         <div class="panel-body">
             <div class="btn-group" data-toggle="buttons">
diff --git a/application/views/admin/export/statistics_subviews/_outputoptions.php b/application/views/admin/export/statistics_subviews/_outputoptions.php
index a17dc392f66..d59b6bbbef6 100644
--- a/application/views/admin/export/statistics_subviews/_outputoptions.php
+++ b/application/views/admin/export/statistics_subviews/_outputoptions.php
@@ -1,6 +1,6 @@
     <div class="panel panel-primary" id="panel-1">
         <div class="panel-heading">
-            <h4 class="panel-title"><?php eT("Output options"); ?></h4>
+            <div class="panel-title h4"><?php eT("Output options"); ?></div>
         </div>
         <div class="panel-body">
             <div class='form-group'>
diff --git a/application/views/admin/export/statistics_subviews/_responseid.php b/application/views/admin/export/statistics_subviews/_responseid.php
index 993ffedb438..46a30bdd19e 100644
--- a/application/views/admin/export/statistics_subviews/_responseid.php
+++ b/application/views/admin/export/statistics_subviews/_responseid.php
@@ -1,6 +1,6 @@
     <div class="panel panel-primary" id="panel-1">
         <div class="panel-heading">
-            <h4 class="panel-title"><?php eT("Response ID"); ?></h4>
+            <div class="panel-title h4"><?php eT("Response ID"); ?></div>
         </div>
         <div class="panel-body">
             <div class='form-group'>
diff --git a/application/views/admin/export/statistics_subviews/_submissiondate.php b/application/views/admin/export/statistics_subviews/_submissiondate.php
index 9acac3279bf..7fe0347b768 100644
--- a/application/views/admin/export/statistics_subviews/_submissiondate.php
+++ b/application/views/admin/export/statistics_subviews/_submissiondate.php
@@ -1,7 +1,7 @@
 <?php if (isset($datestamp) && $datestamp == "Y"): ?>
     <div class="panel panel-primary " id="panel-1">
         <div class="panel-heading">
-            <h4 class="panel-title"><?php eT("Submission date"); ?></h4>
+            <div class="panel-title h4"><?php eT("Submission date"); ?></div>
         </div>
         <div class="panel-body">
             <div class='form-group'>
diff --git a/application/views/admin/export/vv_view.php b/application/views/admin/export/vv_view.php
index acfbd0222cd..a6ef3eeaccc 100644
--- a/application/views/admin/export/vv_view.php
+++ b/application/views/admin/export/vv_view.php
@@ -7,9 +7,9 @@
 
                 <div class="panel panel-primary" id="panel-1" style="opacity: 1; top: 0px;">
                     <div class="panel-heading">
-                        <h4 class="panel-title">
+                        <div class="panel-title h4">
                             <?php eT("Export survey");?>
-                        </h4>
+                        </div>
                     </div>
 
                     <div class="panel-body">
@@ -67,9 +67,9 @@
 
                 <div class="panel panel-primary" id="panel-1" style="opacity: 1; top: 0px;">
                     <div class="panel-heading">
-                        <h4 class="panel-title">
+                        <div class="panel-title h4">
                             <?php eT("Format");?>
-                        </h4>
+                        </div>
                     </div>
                     <div class="panel-body">
                         <div class="form-group">
diff --git a/application/views/admin/labels/_labelviewrightcontent_view.php b/application/views/admin/labels/_labelviewrightcontent_view.php
index 2408f775118..e4635e3f10e 100644
--- a/application/views/admin/labels/_labelviewrightcontent_view.php
+++ b/application/views/admin/labels/_labelviewrightcontent_view.php
@@ -5,11 +5,11 @@
 
                 <!-- Uploaded resources management -->
                 <div class="panel-heading" role="tab" id="headingOne">
-                    <h4 class="panel-title">
+                    <div class="panel-title h4">
                         <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
                             <?php eT("Uploaded resources management"); ?>
                         </a>
-                    </h4>
+                    </div>
                 </div> <!-- headingOne -->
 
                 <!-- Body -->
diff --git a/application/views/admin/survey/Question/advanced_settings_view.php b/application/views/admin/survey/Question/advanced_settings_view.php
index 4ffb3cba716..7dc4b8271ec 100644
--- a/application/views/admin/survey/Question/advanced_settings_view.php
+++ b/application/views/admin/survey/Question/advanced_settings_view.php
@@ -17,14 +17,15 @@
         <?php endif; ?>
         <div class="panel panel-default panel-advancedquestionsettings">
             <div class="panel-heading" role="tab">
-                <h4 class="panel-title">
+                <div class="panel-title h4">
                     <a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
                         <span class="fa fa-chevron-left"></span>
+			<span class="sr-only"><?php eT("Expand/Collapse");?></span>
                     </a>
                     <a id="button-collapse<?php echo $categoryNum ?>" class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-cat<?php echo $categoryNum ?>" aria-expanded="false" aria-controls="collapse-cat<?php echo $categoryNum ?>">
                         <?php echo $aAttribute['category']; ?>
                     </a>
-                </h4>
+                </div>
             </div>
             <div id="collapse-cat<?php echo $categoryNum ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="button-collapse<?php echo $categoryNum ?>">
                 <div class="panel-body">
diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php
index 03ee90c80cf..fe1ea1ca1ac 100644
--- a/application/views/admin/survey/Question/editQuestion_view.php
+++ b/application/views/admin/survey/Question/editQuestion_view.php
@@ -90,14 +90,15 @@
                     <?php if ($copying): ?>
                         <div class="panel panel-default">
                             <div class="panel-heading" role="tab" id="heading-copy">
-                                <h4 class="panel-title">
+                                <div class="panel-title h4">
                                     <a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
                                         <span class="fa fa-chevron-left"></span>
+					<span class="sr-only"><?php eT("Expand/Collapse");?></span>
                                     </a>
                                     <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-copy" aria-expanded="false" aria-controls="collapse-copy">
                                         <?php eT("Copy options"); ?>
                                     </a>
-                                </h4>
+                                </div>
                             </div>
                             <div id="collapse-copy" class="panel-collapse collapse  in" role="tabpanel" aria-labelledby="heading-copy">
                                 <div class="panel-body">
@@ -147,14 +148,15 @@
 
                         <!-- General Options : Header  -->
                         <div class="panel-heading" role="tab" id="headingOne">
-                            <h4 class="panel-title">
+                            <div class="panel-title h4">
                                 <a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
                                     <span class="fa fa-chevron-left"></span>
+				    <span class="sr-only"><?php eT("Expand/Collapse");?></span>
                                 </a>
                                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-question" aria-expanded="true" aria-controls="collapse-question">
                                     <?php eT("General options");?>
                                 </a>
-                            </h4>
+                            </div>
                         </div>
 
                         <div id="collapse-question" class="panel-collapse collapse <?php if (!$copying){echo ' in '; } ?>" role="tabpanel" aria-labelledby="headingOne">
diff --git a/application/views/admin/survey/Question/question_subviews/_accordion_container.php b/application/views/admin/survey/Question/question_subviews/_accordion_container.php
index 9293529d518..2c188427b96 100644
--- a/application/views/admin/survey/Question/question_subviews/_accordion_container.php
+++ b/application/views/admin/survey/Question/question_subviews/_accordion_container.php
@@ -2,14 +2,14 @@
     <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
         <div class="panel panel-default" id="questionTypeContainer">
             <div class="panel-heading" role="tab" id="headingOne">
-              <h4 class="panel-title">
+              <div class="panel-title h4">
                   <a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
                       <span class="fa fa-chevron-left"></span>
                   </a>
                 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
                  <?php eT("General options");?>
                 </a>
-              </h4>
+              </div>
             </div>
             <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
                 <div class="panel-body">
@@ -122,14 +122,14 @@
 
         <div class="panel panel-default">
             <div class="panel-heading" role="tab" id="headingTwo">
-                <h4 class="panel-title">
+                <div class="panel-title h4">
                     <a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
                         <span class="fa fa-chevron-left"></span>
                     </a>
                     <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
                         <?php eT("Advanced settings"); ?>
                     </a>
-                </h4>
+                </div>
             </div>
             <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
                 <div class="panel-body">
diff --git a/application/views/admin/survey/Question/question_subviews/_tabs.php b/application/views/admin/survey/Question/question_subviews/_tabs.php
index cd7d49beb79..82dab354298 100644
--- a/application/views/admin/survey/Question/question_subviews/_tabs.php
+++ b/application/views/admin/survey/Question/question_subviews/_tabs.php
@@ -9,7 +9,7 @@
 <!-- New question language tabs -->
 <ul class="nav nav-tabs" style="margin-right: 8px;" >
     <li role="presentation" class="active">
-        <a data-toggle="tab" href="#<?php echo $eqrow['language']; ?>">
+        <a role="tab" data-toggle="tab" href="#<?php echo $eqrow['language']; ?>">
             <?php echo getLanguageNameFromCode($eqrow['language'],false); ?> (<?php eT("Base language"); ?>)
         </a>
     </li>
diff --git a/application/views/admin/survey/Question/question_view.php b/application/views/admin/survey/Question/question_view.php
index bdddd009b16..1c1fbe5dc25 100644
--- a/application/views/admin/survey/Question/question_view.php
+++ b/application/views/admin/survey/Question/question_view.php
@@ -1,6 +1,6 @@
 <div class='side-body <?php echo getSideBodyClass(true); ?>'>
     <?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestion'=>$oQuestion)); ?>
-    <h3><?php eT('Question summary'); ?>  <small><em><?php echo  $qrrow['title'];?></em> (ID: <?php echo  $qid;?>)</small></h3>
+    <div class="pagetitle h3"><?php eT('Question summary'); ?>  <small><em><?php echo  $qrrow['title'];?></em> (ID: <?php echo  $qid;?>)</small></div>
     <div class="row">
         <div class="col-lg-12 content-right">
 
@@ -197,7 +197,7 @@
 
             <!-- Quick Actions -->
             <?php if (Permission::model()->hasSurveyPermission($iSurveyId, 'surveycontent', 'update')): ?>
-                <h3 id="survey-action-title"><?php eT('Question quick actions'); ?></h3>
+                <div id="survey-action-title" class="pagetitle h3"><?php eT('Question quick actions'); ?></div>
                 <div class="row welcome survey-action">
                     <div class="col-lg-12 content-right">
 
@@ -205,7 +205,7 @@
                         <div class="col-lg-3">
                             <div class="panel panel-primary <?php if ($surveyIsActive) { echo 'disabled'; } else { echo 'panel-clickable'; } ?>" id="panel-1" data-url="<?php echo $this->createUrl('admin/questions/sa/newquestion/surveyid/'.$surveyid.'/gid/'.$gid); ?>">
                                 <div class="panel-heading">
-                                    <h4 class="panel-title"><?php eT("Add new question to group");?></h4>
+                                    <div class="panel-title h4"><?php eT("Add new question to group");?></div>
                                 </div>
                                 <div class="panel-body">
                                     <span class="icon-add text-success"  style="font-size: 3em;"></span>
diff --git a/application/views/admin/survey/QuestionGroups/addGroup_view.php b/application/views/admin/survey/QuestionGroups/addGroup_view.php
index acd1e69e3fc..7efd7ff340d 100644
--- a/application/views/admin/survey/QuestionGroups/addGroup_view.php
+++ b/application/views/admin/survey/QuestionGroups/addGroup_view.php
@@ -11,14 +11,14 @@
 
 <?php echo PrepareEditorScript(false, $this); $active = 1;?>
 <div id='edit-survey-text-element' class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <h3><?php eT("Add question group"); ?></h3>
+    <div class="pagetitle h3"><?php eT("Add question group"); ?></div>
     <div class="row">
 
         <!-- Tabs -->
         <ul class="nav nav-tabs" >
             <?php foreach ($grplangs as $grouplang): ?>
                 <li role="presentation" class="<?php if($active){ echo 'active'; $active=0; }?>">
-                    <a data-toggle="tab" href="#<?php echo $grouplang; ?>">
+                    <a role="tab" data-toggle="tab" href="#<?php echo $grouplang; ?>">
                             <?php echo getLanguageNameFromCode($grouplang,false);
                             if ($grouplang==$baselang) { ?> (<?php eT("Base language"); ?>) <?php } ?>
                     </a>
diff --git a/application/views/admin/survey/QuestionGroups/editGroup_view.php b/application/views/admin/survey/QuestionGroups/editGroup_view.php
index b993d3b84c2..af14db30413 100644
--- a/application/views/admin/survey/QuestionGroups/editGroup_view.php
+++ b/application/views/admin/survey/QuestionGroups/editGroup_view.php
@@ -6,11 +6,11 @@
     <div class="row">
         <div class="col-sm-12 content-right">
             <?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestionGroup'=>$oQuestionGroup, 'active'=>gT("Edit Group"))); ?>
-            <h3><?php eT("Edit Group"); ?></h3>
+            <div class="pagetitle h3"><?php eT("Edit Group"); ?></div>
             <ul class="nav nav-tabs" id="edit-group-language-selection">
                 <?php foreach ($tabtitles as $i=>$eachtitle):?>
                     <li role="presentation" class="<?php if($count==0) {echo "active"; $count++;}?>">
-                        <a data-toggle="tab" href="#editgrp_<?php echo $i;?>">
+                        <a role="tab" data-toggle="tab" href="#editgrp_<?php echo $i;?>">
                             <?php echo $eachtitle;?>
                         </a>
                     </li>
diff --git a/application/views/admin/survey/QuestionGroups/group_view.php b/application/views/admin/survey/QuestionGroups/group_view.php
index 532e391ca6a..0245938d7f2 100644
--- a/application/views/admin/survey/QuestionGroups/group_view.php
+++ b/application/views/admin/survey/QuestionGroups/group_view.php
@@ -1,6 +1,6 @@
 <div class='side-body <?php echo getSideBodyClass(true); ?>'>
     <?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestionGroup'=>$oQuestionGroup)); ?>
-    <h3><?php eT('Group summary'); ?></h3>
+    <div class="pagetitle h3"><?php eT('Group summary'); ?></div>
     <div class="row">
         <div class="col-lg-12 content-right">
 
@@ -64,7 +64,7 @@
     </div>
 
     <?php if (Permission::model()->hasSurveyPermission($iSurveyId, 'surveycontent', 'update')): ?>
-        <h3 id="survey-action-title"><?php eT('Group quick actions'); ?></h3>
+        <div id="survey-action-title" class="pagetitle h3"><?php eT('Group quick actions'); ?></div>
         <div class="row welcome survey-action">
             <div class="col-lg-12 content-right">
 
@@ -72,7 +72,7 @@
                 <div class="col-lg-3">
                     <div class="panel panel-primary <?php if ($surveyIsActive) { echo 'disabled'; } else { echo 'panel-clickable'; } ?>" id="panel-1" data-url="<?php echo $this->createUrl('admin/questions/sa/newquestion/surveyid/'.$surveyid.'/gid/'.$gid); ?>">
                         <div class="panel-heading">
-                            <h4 class="panel-title"><?php eT("Add new question to group");?></h4>
+                            <div class="panel-title h4"><?php eT("Add new question to group");?></div>
                         </div>
                         <div class="panel-body">
                             <span class="icon-add text-success"  style="font-size: 3em;"></span>
diff --git a/application/views/admin/survey/subview/_template_carousel.php b/application/views/admin/survey/subview/_template_carousel.php
index 7adbded17cf..0aed4b703cd 100644
--- a/application/views/admin/survey/subview/_template_carousel.php
+++ b/application/views/admin/survey/subview/_template_carousel.php
@@ -13,7 +13,7 @@
     <div class="col-sm-12" id='carrousel-container'>
         <div class="row">
             <div class="col-sm-12" id="item-container"> <!-- width defined in css -->
-                <h4 class="panel-title"><?php eT('Select your template:'); ?></h4>
+                <div class="h4"><?php eT('Select your template:'); ?></div>
 
                 <?php foreach($templates as $key=>$template):?>
                     <?php if (Permission::model()->hasGlobalPermission('superadmin','read') || Permission::model()->hasGlobalPermission('templates','read') || hasTemplateManageRights(Yii::app()->session["loginID"], $key) == 1 || $surveyinfo['template']==htmlspecialchars($key) ): ?>
diff --git a/application/views/admin/survey/subview/accordion/_plugin_panel.php b/application/views/admin/survey/subview/accordion/_plugin_panel.php
index ed90156f93b..ea1ad2beeef 100644
--- a/application/views/admin/survey/subview/accordion/_plugin_panel.php
+++ b/application/views/admin/survey/subview/accordion/_plugin_panel.php
@@ -16,14 +16,15 @@
 <?php if (!empty($plugin['settings'])): ?>
         <div class="panel panel-default">
             <div class="panel-heading" role="tab" id="heading-plugin<?php echo $id; ?>">
-                <h4 class="panel-title">
+                <div class="panel-title h4">
                     <a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion hidden-sm">
                         <span class="fa fa-chevron-left"></span>
+			<span class="sr-only"><?php eT("Expand/Collapse");?></span>
                     </a>
                     <a id="button-plugin<?php echo $id; ?>" class="collapsed" data-parent="#accordion" role="button" data-toggle="collapse" href="#plugin<?php echo $id; ?>" aria-expanded="false" aria-controls="plugin<?php echo $id; ?>">
                         <?php printf(gT("Settings for plugin %s"), $plugin['name']); ?>
                     </a>
-                </h4>
+                </div>
             </div>
             <div id="plugin<?php echo $id; ?>" class="panel-collapse collapse" role="tabpanel">
                 <div class="panel-body">
diff --git a/application/views/admin/survey/surveySummary_view.php b/application/views/admin/survey/surveySummary_view.php
index 9be76983f05..155f8003fdf 100644
--- a/application/views/admin/survey/surveySummary_view.php
+++ b/application/views/admin/survey/surveySummary_view.php
@@ -23,12 +23,12 @@
 ?>
     <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey)); ?>
     <!-- Quick Actions -->
-    <h3 id="survey-action-title">
+    <div id="survey-action-title" class="h3 pagetitle">
     <button data-url="<?php echo Yii::app()->urlManager->createUrl("admin/survey/sa/togglequickaction/");?>" id="survey-action-chevron" class="btn btn-default btn-tiny">
         <i class="fa fa-caret-down"></i>
     </button>&nbsp;&nbsp;
     <?php eT('Survey quick actions'); ?>
-    </h3>
+    </div>
         <div class="row welcome survey-action" id="survey-action-container" style="<?php if($quickactionstate==0){echo 'display:none';}?>">
             <div class="col-sm-12 content-right">
 
@@ -109,6 +109,7 @@
                                                 <div class="panel-body-ico">
                                                     <a  href="#" data-toggle="tooltip" data-placement="bottom" title="<?php eT("This survey is currently active."); ?>" style="display: inline-block" data-toggle="tooltip">
                                                         <span class="icon-add text-success"  style="font-size: 3em;"></span>
+							<span class="sr-only"><?php eT('Add new group');?></span>
                                                     </a>
                                                 </div>
                                                 <div  class="panel-body-link">
@@ -128,6 +129,7 @@
                                                 <div class="panel-body-ico">
                                                     <a href="#" data-toggle="tooltip" data-placement="bottom" title="<?php eT("This survey is currently active."); ?>" style="display: inline-block" data-toggle="tooltip">
                                                         <span class="icon-add text-success"  style="font-size: 3em;"></span>
+							<span class="sr-only"><?php eT('Add new question');?></span>
                                                     </a>
                                                 </div>
                                                 <div  class="panel-body-link">
@@ -154,6 +156,7 @@
                                                 <div class="panel-body-ico">
                                                     <a  href="<?php echo $this->createUrl("admin/questiongroups/sa/add/surveyid/".$surveyinfo['sid']); ?>" >
                                                         <span class="icon-add text-success"  style="font-size: 3em;"></span>
+							<span class="sr-only"><?php eT('Add new group');?></span>
                                                     </a>
                                                 </div>
                                                 <div  class="panel-body-link">
@@ -174,12 +177,14 @@
                                                     <div class="panel-body-ico">
                                                         <a href="#" data-toggle="tooltip" data-placement="bottom" title="<?php eT("You must first create a question group."); ?>" style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title="<?php eT('Survey cannot be activated. Either you have no permission or there are no questions.'); ?>">
                                                             <span class="icon-add text-success"  style="font-size: 3em;"></span>
+							    <span class="sr-only"><?php eT("You must first create a question group."); ?></span>
                                                         </a>
                                                     </div>
                                                     <div  class="panel-body-link">
                                                         <p>
                                                             <a  href="#" data-toggle="tooltip" data-placement="bottom" title="<?php eT("You must first create a question group."); ?>" style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title="<?php eT('Survey cannot be activated. Either you have no permission or there are no questions.'); ?>" >
                                                                 <?php eT("Add new question"); ?>
+								<span class="sr-only"><?php eT("Add new question"); ?></span>
                                                             </a>
                                                         </p>
                                                     </div>
@@ -198,6 +203,7 @@
                                                     <div class="panel-body-ico">
                                                         <a  href="<?php echo $this->createUrl("admin/questions/sa/newquestion/surveyid/".$surveyinfo['sid']); ?>" >
                                                             <span class="icon-add text-success"  style="font-size: 3em;"></span>
+							    <span class="sr-only"><?php eT('Add question');?></span>
                                                         </a>
                                                     </div>
                                                     <div  class="panel-body-link">
@@ -224,6 +230,7 @@
                                             <div class="panel-body-ico">
                                                 <a  href="<?php echo $this->createUrl("admin/survey/sa/editlocalsettings/surveyid/".$surveyinfo['sid']); ?>" >
                                                     <span class="icon-edit text-success"  style="font-size: 3em;"></span>
+						    <span class="sr-only"><?php eT('Edit text elements and general settings');?></span>
                                                 </a>
                                             </div>
                                             <div  class="panel-body-link">
@@ -240,6 +247,7 @@
                                             <div class="panel-body-ico">
                                                 <a href="#" data-toggle="tooltip" data-placement="bottom" title="<?php eT("We are sorry but you don't have permissions to do this."); ?>" style="display: inline-block" data-toggle="tooltip" >
                                                     <span class="icon-edit text-success"  style="font-size: 3em;"></span>
+						    <span class="sr-only"><?php eT('Edit text elements and general settings');?></span>
                                                 </a>
                                             </div>
                                             <div  class="panel-body-link">
@@ -262,6 +270,7 @@
                                             <div class="panel-body-ico">
                                                 <a  href="<?php echo $this->createUrl("admin/statistics/sa/simpleStatistics/surveyid/".$surveyinfo['sid']); ?>" >
                                                     <span class="fa fa-stats text-success"  style="font-size: 3em;"></span>
+						    <span class="sr-only"><?php eT("Statistics");?></span>
                                                 </a>
                                             </div>
                                             <div  class="panel-body-link">
@@ -284,6 +293,7 @@
                                             <div class="panel-body-ico">
                                                 <a  href="#" >
                                                     <span class="fa fa-stats text-success"  style="font-size: 3em;"></span>
+						    <span class="sr-only"><?php eT("Responses & statistics");?></span>
                                                 </a>
                                             </div>
                                             <div  class="panel-body-link">
@@ -330,9 +340,9 @@
 
     <div class="row">
         <!-- Survey summary -->
-        <h3 class="col-sm-12"><?php eT('Survey summary'); ?></h3>
+        <div class="col-sm-12 h3 pagetitle"><?php eT('Survey summary'); ?></div>
 
-        <h4 class="col-sm-12"><?php echo flattenText($surveyinfo['surveyls_title'])." (".gT("ID")." ".$surveyinfo['sid'].")";?></h4>
+        <div class="col-sm-12 h4"><?php echo flattenText($surveyinfo['surveyls_title'])." (".gT("ID")." ".$surveyinfo['sid'].")";?></div>
         <div class="col-sm-12 col-md-6">
             <div class="panel panel-default">
                 <!-- Default panel contents -->