chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor changes

Browse Source
skala
Julio Montoya 15 years ago
parent eaaea6a254
commit 089ee2ba08
5 changed files with 18 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      main/document/document.inc.php
  2. 26
      main/document/document.php
  3. 5
      main/document/showinframesmin.php
  4. 17
      main/inc/footer.inc.php
  5. 5
      main/inc/header.inc.php

6
main/document/document.inc.php
Unescape View File

@ -241,7 +241,7 @@ function create_document_link($document_data, $show_as_icon = false, $counter =
if ( preg_match('/mp3$/i', urldecode($url)) ||
preg_match('/wav$/i', urldecode($url)) ||
preg_match('/ogg$/i', urldecode($url))) {
return '<span style="float:left" '.$visibility_class.' style="float:left">'.$title.'</span>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
return '<span style="float:left" '.$visibility_class.'>'.$title.'</span>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
} elseif (
//Show preview sith yoxview
preg_match('/swf$/i', urldecode($url)) ||
@ -249,10 +249,10 @@ function create_document_link($document_data, $show_as_icon = false, $counter =
preg_match('/htm$/i', urldecode($url)) //|| (preg_match('/wav$/', urldecode($url)) && api_get_setting('enable_nanogong') == 'true')
) {
$url = 'showinframesmin.php?'.api_get_cidreq().'&id='.$document_data['id'].$req_gid;
return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.'>'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
} else {
//Show preview sith yoxview
return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.' >'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
}
} else {
return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;

26
main/document/document.php
Unescape View File

@ -328,18 +328,6 @@ if ($is_certificate_mode) {
$dir_array = explode('/', $curdirpath);
$array_len = count($dir_array);
/*
TODO:check and delete this code
if (!$is_certificate_mode) {
if ($array_len > 1) {
if (empty($_SESSION['_gid'])) {
$url_dir = 'document.php?&amp;curdirpath=/';
$interbreadcrumb[] = array('url' => $url_dir, 'name' => get_lang('HomeDirectory'));
}
}
}
*/
$dir_acum = '';
for ($i = 0; $i < $array_len; $i++) {
@ -368,15 +356,12 @@ if (isset($_GET['createdir'])) {
$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('CreateDir'));
}
//jquery thickbox already called from main/inc/header.inc.php
$htmlHeadXtra[] = api_get_jquery_js();
$htmlHeadXtra[] = api_get_jquery_ui_js();
$htmlHeadXtra[] = api_get_js('yoxview/yoxview-init.js');
$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
$htmlHeadXtra[] = '<link rel="stylesheet" href="'.$js_path.'yoxview/yoxview.css" type="text/css">';
$htmlHeadXtra[] = '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skins/chamilo/jplayer.blue.monday.css" type="text/css">';
$htmlHeadXtra[] = '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jquery.jplayer.min.js"></script>';
@ -421,13 +406,14 @@ foreach ($docs_and_folders as $file) {
}
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready( function() {
$(document).ready( function() {
$(".yoxview").yoxview({
lang: "'.$lang_yoxview.'",
flashVideoPlayerPath: "'.$mediaplayer_path.'",
renderMenu: "false",
defaultDimensions: { iframe: { width: 800 }},
titleAttribute:"alt"
flashVideoPlayerPath: "'.$mediaplayer_path.'",
allowInternalLinks:true,
defaultDimensions: { iframe: { width: 800}},
titleAttribute : "alt"
});
//Experimental changes to preview mp3, ogg files

5
main/document/showinframesmin.php
Unescape View File

@ -113,15 +113,14 @@ if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
);
// });';
}
$htmlHeadXtra[] = '<script type="text/javascript">
<!--
var jQueryFrameReadyConfigPath = \''.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.min.js\';
-->
</script>';
$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js"></script>';
$htmlHeadXtra[] = '
<script type="text/javascript">
<!--
var updateContentHeight = function() {
@ -142,7 +141,7 @@ $htmlHeadXtra[] = '
</script>';
Display::display_reduced_header();
echo "<div align=\"center\">";
echo '<div align="center">';
$file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
$pathinfo = pathinfo($header_file);

17
main/inc/footer.inc.php
Unescape View File

@ -148,20 +148,13 @@ if (api_is_platform_admin()) {
echo get_lang('MemoryUsage').': '.number_format((memory_get_usage()/1048576), 3, '.', '') .' Mb' ;
echo '<br />';
echo get_lang('MemoryUsagePeak').': '.number_format((memory_get_peak_usage()/1048576), 3, '.', '').' Mb';
/*
global $_user, $_course;
if (!empty($_user)) {
echo "<h2>Current user info</h2>";
var_dump($_user);
}
if (!empty($_course)) {
echo "<h2>Current course info</h2>";
var_dump($_course);
}*/
}
}
?>
<script> $(".chzn-select").chosen(); </script>
<script>
$(document).ready( function() {
$(".chzn-select").chosen();
});
</script>
</body>
</html>

5
main/inc/header.inc.php
Unescape View File

@ -114,6 +114,7 @@ if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=
?>
/*]]>*/
</style>
<script src="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/jquery.min.js" type="text/javascript" ></script>
<script src="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chosen/chosen.jquery.min.js" type="text/javascript" ></script>
@ -121,7 +122,6 @@ if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=
<link rel="stylesheet" href="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/thickbox.css" type="text/css" media="projection, screen" />
<link rel="stylesheet" href="<?php echo api_get_path(WEB_LIBRARY_PATH);?>javascript/chosen/chosen.css" type="text/css" media="projection, screen" />
<link rel="top" href="<?php echo api_get_path(WEB_PATH); ?>index.php" title="" />
<link rel="courses" href="<?php echo api_get_path(WEB_CODE_PATH); ?>auth/courses.php" title="<?php echo api_htmlentities(get_lang('OtherCourses'), ENT_QUOTES); ?>" />
<link rel="profil" href="<?php echo api_get_path(WEB_CODE_PATH); ?>auth/profile.php" title="<?php echo api_htmlentities(get_lang('ModifyProfile'), ENT_QUOTES); ?>" />
@ -145,8 +145,7 @@ if ( ( navigator.userAgent.toLowerCase().indexOf('msie') != -1 ) && ( navigator.
} catch ( flashEx ) {
}
} ;
}
) ;
});
}
//]]>
</script>

Write Preview
Loading…
Cancel
Save