Dev: more 508 fixes (#730)

LimeSurvey · Jun 29, 2017 · 50f593b · 50f593b
1 parent cae66f8
commit 50f593b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/application/views/admin/super/footer.php b/application/views/admin/super/footer.php
@@ -53,7 +53,7 @@ class='btn btn-warning btn-sm'
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h3 class="modal-title"><?php eT("Confirm"); ?></h3>
+                <div class="h3 modal-title"><?php eT("Confirm"); ?></div>
             </div>
             <div class="modal-body">
                 <p class='modal-body-text'><?php eT("Are you sure?"); ?></p>
@@ -91,7 +91,7 @@ class='btn btn-warning btn-sm'
         <div class="modal-content panel-danger">
             <div class="modal-header panel-heading">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h3 class="modal-title"><?php eT("Error"); ?></h3>
+                <div class="h3 modal-title"><?php eT("Error"); ?></div>
             </div>
             <div class="modal-body">
                 <p class='modal-body-text'><?php eT("An error occurred."); ?></p>
@@ -110,7 +110,7 @@ class='btn btn-warning btn-sm'
         <div class="modal-content panel-success">
             <div class="modal-header panel-heading">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h3 class="modal-title"><?php eT("Success"); ?></h3>
+                <div class="h3 modal-title"><?php eT("Success"); ?></div>
             </div>
             <div class="modal-body">
                 <p class='modal-body-text'><?php /* This must be set in Javascript */ ?></p>
@@ -129,9 +129,9 @@ class='btn btn-warning btn-sm'
         <div class="modal-content">  <?php // JS add not.type as panel-type, e.g. panel-default, panel-danger ?>
             <div class="modal-header panel-heading">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h3 class="modal-title">
-			<span class="sr-only">Notifications</span>
-		</h3>
+                <div class="h3 modal-title">
+			<span class="sr-only"><?php eT("Notifications"); ?></span>
+		</div>
                 <span class='notification-date text-muted'></span>
             </div>
             <div class="modal-body">

diff --git a/application/views/admin/survey/subview/tab_survey_view.php b/application/views/admin/survey/subview/tab_survey_view.php
@@ -25,7 +25,7 @@
 
     <!-- Create -->
     <li role="presentation" <?php if($active=='create'){echo 'class="active"';}?>>
-        <a data-toggle="tab" href='#general'>
+        <a role="tab" data-toggle="tab" href='#general'>
             <?php  eT("Create"); ?>
         </a>
     </li>
@@ -34,14 +34,14 @@
     <?php if ($action == "newsurvey"): ?>
         <!-- Import -->
         <li role="presentation" <?php if($active=='import'){echo 'class="active"';}?>>
-            <a data-toggle="tab" href="#import">
+            <a role="tab" data-toggle="tab" href="#import">
                 <?php  eT("Import"); ?>
             </a>
         </li>
 
         <!-- Copy -->
         <li role="presentation" <?php if($active=='copy'){echo 'class="active"';}?>>
-            <a data-toggle="tab" href="#copy">
+            <a role="tab" data-toggle="tab" href="#copy">
                 <?php  eT("Copy"); ?>
             </a>
         </li>
@@ -50,22 +50,22 @@
 
         <!-- Panel integration -->
         <li role="presentation">
-            <a data-toggle="tab" href="#panelintegration">
+            <a role="tab" data-toggle="tab" href="#panelintegration">
                 <?php  eT("Panel integration"); ?>
             </a>
         </li>
 
         <!-- Resources -->
         <li role="presentation">
-            <a data-toggle="tab" href="#resources">
+            <a role="tab" data-toggle="tab" href="#resources">
                 <?php  eT("Resources"); ?>
             </a>
         </li>
 
         <!-- Plugins -->
         <?php if(isset($pluginSettings)): ?>
             <li role="presentation">
-                <a data-toggle="tab" href="#pluginsettings">
+                <a role="tab" data-toggle="tab" href="#pluginsettings">
                     <?php  eT("Plugins"); ?>
                 </a>
             </li>

diff --git a/assets/scripts/admin/admin_core.js b/assets/scripts/admin/admin_core.js
@@ -698,7 +698,7 @@ if ('ab'.substr(-1) != 'b') {
 function linksInDialog()
 {
     $(function () {
-        var iframe = $('<iframe id="dialog" allowfullscreen></iframe>');
+        var iframe = $('<iframe id="dialog" title='+$(this).attr("title")+' allowfullscreen></iframe>');
         var dialog = $("<div></div>").append(iframe).appendTo("body").dialog({
             autoOpen: false,
             modal: false,
@@ -710,7 +710,9 @@ function linksInDialog()
             }
         });
 
+	// 508 fixes
 	iframe.contents().find('head').append('<title>'+$(this).attr("title")+'</title>');
+	$('.ui-dialog-titlebar-close').append('<span class="sr-only">Close</span>');
 
         $(document).on('click','a[target=dialog]',function(event){
             event.preventDefault();