Bug 1794912: Fixing W3.org validation issues for iframes

behatnotneeded

Change-Id: If8b9eabe97ebc9cd0a272b7bb4bc60b08685c56f
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/artefact/file/blocktype/pdf/lib.php

@@ -75,7 +75,7 @@ class PluginBlocktypePdf extends MaharaCoreBlocktype {
             }
             $result = '<iframe src="' . $urlbase . 'artefact/file/blocktype/pdf/viewer.php?editing=' . $editing . '&ingroup=' . !empty($group) . '&file=' . $artefactid . '&lang=' . $language . '&view=' . $instance->get('view')
                  . ($versioning ? '&versioning=true' : '')
-                 . '" width="100%" height="500" frameborder="0"></iframe>';
+                 . '" class="pdfiframe"></iframe>';
 
             require_once(get_config('docroot') . 'artefact/comment/lib.php');
             require_once(get_config('docroot') . 'lib/view.php');

htdocs/blocktype/externalvideo/lib.php

@@ -111,7 +111,7 @@ class PluginBlocktypeExternalvideo extends MaharaCoreBlocktype {
         $width = (int) $width;
         $height = (int) $height;
         $url = hsc($url);
-        return '<iframe width="' . $width . '" height="' . $height . '" src="' . $url . '" frameborder=0 allowfullscreen mozallowfullscreen webkitallowfullscreen></iframe>';
+        return '<iframe class="externalvideoiframe" width="' . $width . '" height="' . $height . '" src="' . $url . '" allowfullscreen="1"></iframe>';
     }
 
     public static function get_blocktype_type_content_types() {

htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/photobucketshow.tpl

 {if $images}
-<iframe marginheight="0" marginwidth="0" width="{$width}" height="{$height}" scrolling="no" frameborder="0" src="{$images.url}/{$images.user}/{$images.album}?albumview=slideshow"></iframe>
+<iframe width="{$width}" height="{$height}" src="{$images.url}/{$images.user}/{$images.album}?albumview=slideshow"></iframe>
 {else}
   {str tag=cannotdisplayslideshow section=blocktype.file/gallery}
 {/if}

htdocs/theme/raw/plugintype/artefact/file/templates/extract-progress.tpl

 {include file="header.tpl"}
 <div id="extract">
     <h3>{str tag=pleasewaitwhileyourfilesarebeingunzipped section=artefact.file}</h3>
-    <iframe src="{$WWWROOT}artefact/file/extract-progress.php" id="progress-iframe" scrolling="no" frameborder="none"></iframe>
+    <iframe src="{$WWWROOT}artefact/file/extract-progress.php" id="progress-iframe"></iframe>
 </div>
 {include file="footer.tpl"}

htdocs/theme/raw/plugintype/blocktype/externalvideo/templates/content.tpl

@@ -25,7 +25,7 @@
                                .attr('value', '{$jsflashvars}')
                                .appendTo(embedobj);
                 $j('<embed />').attr('src', '{$jsurl}')
-                               .attr('allowfullscreen', 'true')
+                               .attr('allow', 'fullscreen')
                                .attr('wmode', 'transparent')
                                .attr('allowscriptaccess', 'always')
                                .attr('width', '{$width}')
@@ -40,10 +40,7 @@
                 $j('<iframe />').attr('src', jsurl)
                                 .attr('width', '{$width}')
                                 .attr('height', '{$height}')
-                                .attr('frameborder', '0')
                                 .attr('allowfullscreen', '')
-                                .attr('mozallowfullscreen', '')
-                                .attr('webkitallowfullscreen', '')
                                 .appendTo($j('#vid_{$blockid}'))
                                 .on("load", function() {
                                     blockinstance_{$blockid}_loaded = true;

htdocs/theme/raw/plugintype/blocktype/externalvideo/templates/embedly.tpl

@@ -9,11 +9,11 @@
 {/if}
 
 {if $type == 'div'}
-    <div class="embedly-responsive" style="{$style1}"><iframe class="embedly-embed" frameborder="0" scrolling="no" allowfullscreen src="{$src}" width="{$width}" height="{$height}" style="{$style2}"></iframe></div>
+    <div class="embedly-responsive" style="{$style1}"><iframe class="embedly-embed" allowfullscreen="1" src="{$src}" width="{$width}" height="{$height}" style="{$style2}"></iframe></div>
 {/if}
 
 {if $type == 'iframe'}
-    <iframe class="embedly-embed" frameborder="0" scrolling="no" allowfullscreen src="{$src}" width="{$width}" height="{$height}"></iframe>
+    <iframe class="embedly-embed" allowfullscreen="1" src="{$src}" width="{$width}" height="{$height}"></iframe>
 {/if}
 
 </div>

htdocs/theme/raw/plugintype/blocktype/googleapps/templates/iframe.tpl

 <div class="googleapps-container text-center">
     <div class="googleapps">
-        <iframe width="100%" height="{$height}" frameborder="0" src="{$url}"></iframe>
+        <iframe width="100%" height="{$height}" src="{$url}"></iframe>
     </div>
 </div>

htdocs/theme/raw/sass/layout/_layout.scss

@@ -82,6 +82,16 @@ body {
   }
 }
 
+iframe {
+    &.pdfiframe {
+        width: 100%;
+        height: 500px;
+    }
+    &.externalvideoiframe {
+        width: 100%;
+    }
+    border: 0;
+}
 // Limit the width of external media
 // to fit the width of the column
 .mediaplayer-container iframe {

htdocs/theme/raw/templates/admin/users/bulkdownload.tpl

 {include file="header.tpl"}
 <div id="exportgeneration">
     <h3>{str tag=pleasewaitwhileyourexportisbeinggenerated section=export}</h3>
-    <iframe src="{$WWWROOT}admin/users/bulkdownload.php" id="progress-iframe" scrolling="no" frameborder="none"></iframe>
+    <iframe src="{$WWWROOT}admin/users/bulkdownload.php" id="progress-iframe"></iframe>
 </div>
 {include file="footer.tpl"}

htdocs/theme/raw/templates/export/export.tpl

 {include file="header.tpl"}
 <div id="exportgeneration">
     <h3>{str tag=pleasewaitwhileyourexportisbeinggenerated section=export}</h3>
-    <iframe src="{$WWWROOT}export/download.php" id="progress-iframe" scrolling="no" frameborder="none"></iframe>
+    <iframe src="{$WWWROOT}export/download.php" id="progress-iframe"></iframe>
 </div>
 {include file="footer.tpl"}