Dotclear

Changeset 3138:fdc62ca291e0 for admin


Ignore:
Timestamp:
11/17/15 13:22:52 (10 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Message:

Make Flash player fallback insertion optional, not anymore needed with modern browsers supporting <video> and <audio> HTML5 tags.

Location:
admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • admin/blog_pref.php

    r3115 r3138  
    264264          $blog_settings->system->put('media_video_width',$media_video_width); 
    265265          $blog_settings->system->put('media_video_height',$media_video_height); 
     266          $blog_settings->system->put('media_flash_fallback',!empty($_POST['media_flash_fallback'])); 
    266267          $blog_settings->system->put('media_img_title_pattern',$_POST['media_img_title_pattern']); 
    267268          $blog_settings->system->put('media_img_use_dto_first',!empty($_POST['media_img_use_dto_first'])); 
     
    610611     '<p class="field"><label for="media_video_height">'.__('Height').'</label> '. 
    611612     form::field('media_video_height',3,3,$blog_settings->system->media_video_height).'</p>'. 
     613 
     614     '<h5>'.__('Flash player').'</h5>'. 
     615     '<p><label for="media_flash_fallback">'. 
     616     form::checkbox('media_flash_fallback','1',$blog_settings->system->media_flash_fallback). 
     617     __('Insert Flash player fallback for video (mp4 or m4v) and audio (mp3) media').'</label></p>'. 
     618     '<p class="form-note info">'.__('For flv video, the Flash player will be anyway inserted.').'</p>'. 
    612619     '</div>'. 
    613620 
  • admin/media.php

    r3136 r3138  
    832832          if ($file_type[0] == 'audio') 
    833833          { 
    834                $lst .= '<li>'.dcMedia::audioPlayer($f->type,$f->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf'))).'</li>'; 
     834               $lst .= '<li>'.dcMedia::audioPlayer($f->type,$f->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf')),null,$core->blog->settings->system->media_flash_fallback).'</li>'; 
    835835          } 
    836836 
  • admin/media_item.php

    r3112 r3138  
    379379 
    380380          $public_player_style = unserialize($core->blog->settings->themes->mp3player_style); 
    381           $public_player = dcMedia::audioPlayer($file->type,$file->file_url,$core->blog->getQmarkURL().'pf=player_mp3.swf',$public_player_style); 
     381          $public_player = dcMedia::audioPlayer($file->type,$file->file_url,$core->blog->getQmarkURL().'pf=player_mp3.swf',$public_player_style,null,$core->blog->settings->system->media_flash_fallback); 
    382382          echo form::hidden('public_player',html::escapeHTML($public_player)); 
    383383          echo '</p>'; 
     
    419419 
    420420          $public_player_style = unserialize($core->blog->settings->themes->flvplayer_style); 
    421           $public_player = dcMedia::videoPlayer($file->type,$file->file_url,$core->blog->getQmarkURL().'pf=player_flv.swf',$public_player_style); 
     421          $public_player = dcMedia::videoPlayer($file->type,$file->file_url,$core->blog->getQmarkURL().'pf=player_flv.swf',$public_player_style,null,$core->blog->settings->system->media_flash_fallback); 
    422422          echo form::hidden('public_player',html::escapeHTML($public_player)); 
    423423          echo '</p>'; 
     
    521521if ($file_type[0] == 'audio') 
    522522{ 
    523      echo dcMedia::audioPlayer($file->type,$file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf'))); 
     523     echo dcMedia::audioPlayer($file->type,$file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf')), 
     524          null,$core->blog->settings->system->media_flash_fallback); 
    524525} 
    525526if ($file_type[0] == 'video') 
    526527{ 
    527      echo dcMedia::videoPlayer($file->type,$file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_flv.swf'))); 
     528     echo dcMedia::videoPlayer($file->type,$file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_flv.swf')), 
     529          null,$core->blog->settings->system->media_flash_fallback); 
    528530} 
    529531 
Note: See TracChangeset for help on using the changeset viewer.

Sites map