From 0c8d3939bca90e48fc8c228f71b8282aaaa61f3c Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Thu, 30 Jun 2011 19:29:07 +0800 Subject: [PATCH] MDL-28061 mediaplugins filter: add aac audio node to filetypes.mm, fixed string mistype within the admin setting page (acc -> aac) and add mediaplugin_html5audio css class to align the player/link like the rest. --- filter/mediaplugin/lang/en/filter_mediaplugin.php | 6 +++--- filter/mediaplugin/styles.css | 2 +- lib/filestorage/file_types.mm | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/filter/mediaplugin/lang/en/filter_mediaplugin.php b/filter/mediaplugin/lang/en/filter_mediaplugin.php index 5729301e587..de7e98e34d0 100644 --- a/filter/mediaplugin/lang/en/filter_mediaplugin.php +++ b/filter/mediaplugin/lang/en/filter_mediaplugin.php @@ -30,11 +30,11 @@ $string['flashanimation_help'] = 'Files with extension *.swf. For security reaso $string['flashvideo'] = 'Flash video'; $string['flashvideo_help'] = 'Files with extension *.flv and *.f4v. Plays video clips using Flowplayer, requires Flash plugin and javascript. Uses HTML 5 video fallback if multiple sources psecified.'; $string['html5audio'] = 'HTML 5 audio'; -$string['html5audio_help'] = 'Audio files with extension *.ogg, *.acc and others. It is compatible with latest web browsers only, unfortunately there is no format that is supported by all browsers. -Workaround is to specify fallbacks separated with # (ex: http://example.org/audio.acc#http://example.org/audio.acc#http://example.org/audio.mp3#), QuickTime player is used as a fallback for old browsers, fallback can be any audio type.'; +$string['html5audio_help'] = 'Audio files with extension *.ogg, *.aac and others. It is compatible with latest web browsers only, unfortunately there is no format that is supported by all browsers. +Workaround is to specify fallbacks separated with # (ex: http://example.org/audio.aac#http://example.org/audio.aac#http://example.org/audio.mp3#), QuickTime player is used as a fallback for old browsers, fallback can be any audio type.'; $string['html5video'] = 'HTML 5 video'; $string['html5video_help'] = 'Video files with extension *.webm, *.m4v, *.ogv, *.mp4 and others. It is compatible with latest web browsers only, unfortunately there is no format that is supported by all browsers. -Workaround is to specify fallbacks sources separated with # (ex: http://example.org/video.m4v#http://example.org/video.acc#http://example.org/video.ogv#d=640x480), QuickTime player is used as a fallback for old browsers.'; +Workaround is to specify fallbacks sources separated with # (ex: http://example.org/video.m4v#http://example.org/video.aac#http://example.org/video.ogv#d=640x480), QuickTime player is used as a fallback for old browsers.'; $string['mp3audio'] = 'MP3 audio'; $string['mp3audio_help'] = 'Files with extension *.mp3. Plays audio using Flowplayer, requires Flash plugin.'; $string['legacyquicktime'] = 'QuickTime player'; diff --git a/filter/mediaplugin/styles.css b/filter/mediaplugin/styles.css index 7048fdfa089..bb39c835d6e 100644 --- a/filter/mediaplugin/styles.css +++ b/filter/mediaplugin/styles.css @@ -1,7 +1,7 @@ /** * Filters */ -.mediaplugin_html5video, .mediaplugin_swf, .mediaplugin_flv, .mediaplugin_real, .mediaplugin_youtube, .mediaplugin_vimeo, .mediaplugin_wmp, .mediaplugin_qt +.mediaplugin_html5audio, .mediaplugin_html5video, .mediaplugin_swf, .mediaplugin_flv, .mediaplugin_real, .mediaplugin_youtube, .mediaplugin_vimeo, .mediaplugin_wmp, .mediaplugin_qt {display:block;margin-top:5px;margin-bottom:5px;text-align: center;} .mediaplugin.mediaplugin_mp3 object {display:inline;height:15px;width:180px;margin-left:0.5em;} diff --git a/lib/filestorage/file_types.mm b/lib/filestorage/file_types.mm index 841fce7e774..64a12bbc916 100644 --- a/lib/filestorage/file_types.mm +++ b/lib/filestorage/file_types.mm @@ -19,6 +19,7 @@ +