"FILTER/MDL-17703, use classname instead of inline style, merged from 1.9"

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index 2aac32b0401ae16395689178c576e316892d023f..1d4bb2e7cf3ff9be3b3f76accd1d58190120e892 100644 (file)
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -135,7 +135,7 @@ function mediaplugin_filter_mp3_callback($link) {
 
     return $link[0].
 '<span class="mediaplugin mediaplugin_mp3" id="'.$id.'">('.get_string('mp3audio', 'mediaplugin').')</span>
-<div id="'.$div_id.'" style="display:inline"></div>
+<div id="'.$div_id.'" class="mediaplugin_mp3"></div>
 <script type="text/javascript">
 //<![CDATA[
   var FO = { movie:"'.$CFG->wwwroot.'/filter/mediaplugin/mp3player.swf?src='.$url.'",
@@ -157,7 +157,7 @@ function mediaplugin_filter_swf_callback($link) {
 
     return $link[0].
 '<span class="mediaplugin mediaplugin_swf" id="'.$id.'">('.get_string('flashanimation', 'mediaplugin').')</span>
-<div id="'.$div_id.'" style="display:inline"></div>
+<div id="'.$div_id.'" class="mediaplugin_swf"></div>
 <script type="text/javascript">
 //<![CDATA[
   var FO = { movie:"'.$url.'", width:"'.$width.'", height:"'.$height.'", majorversion:"6", build:"40",
@@ -181,7 +181,7 @@ function mediaplugin_filter_flv_callback($link) {
 
     return $link[0].
 '<span class="mediaplugin mediaplugin_flv" id="'.$id.'">('.get_string('flashvideo', 'mediaplugin').')</span>
-<div id="'.$div_id.'" style="display:inline"></div>
+<div id="'.$div_id.'" class="mediaplugin_flv"></div>
 <script type="text/javascript">
 //<![CDATA[
   var FO = { movie:"'.$CFG->wwwroot.'/filter/mediaplugin/flvplayer.swf?file='.$url.'",

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 77e1fba98bcd7686ceb0846a2172668548eb7606..6f8fce6e781be8486bd9378cec58d8a73f5a06ce 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -926,14 +926,14 @@ table.navbar {
 /***
  *** Filters
  ***/
-span.mediaplugin {
+.mediaplugin {
   display:block;
   clear:both;
   margin-top:5px;
   margin-bottom:5px;
 }
 
-span.mediaplugin_mp3 {
+.mediaplugin_mp3, .mediaplugin_swf, .mediaplugin_flv {
   display:inline;
   clear:none;
   margin:0px;