1.10.x
Julio Montoya 9 years ago
parent a7ccea28af
commit b4f436f589
  1. 10
      main/document/showinframes.php
  2. 7
      main/inc/lib/document.lib.php

@ -271,10 +271,12 @@ if ($jplayer_supported) {
supplied: "'.$extension.'",
useStateClassSkin: true,
autoBlur: false,
smoothPlayBar: true,
keyEnabled: false,
remainingDuration: true,
toggleDuration: true
toggleDuration: true,
solution: "html, flash",
errorAlerts: false,
warningAlerts: false
});
';
@ -361,9 +363,11 @@ if ($show_web_odf) {
echo '</div>';
if ($jplayer_supported) {
echo '<br /><div align="center">';
echo '<br />';
echo '<div class="col-md-3 col-md-offset-3">';
echo DocumentManager::generate_video_preview($document_data);
echo '</div>';
// media_element blocks jplayer disable it
Display::$global_template->assign('show_media_element', 0);
}

@ -3208,7 +3208,6 @@ class DocumentManager
<div id="jquery_jplayer_1" class="jp-jplayer"></div>
<div class="jp-gui">
<div class="jp-video-play">
</div>
<div class="jp-interface">
<div class="jp-progress">
@ -3226,9 +3225,9 @@ class DocumentManager
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>

Loading…
Cancel
Save