[svn r17320] minor - logic changes - fixed option save zip leave the page in blank see FS#3367 (by cvargas)

skala
Cristian Fasanando 16 years ago
parent 86c6428a0c
commit be7f785a2a
  1. 12
      main/document/document.inc.php
  2. 7
      main/document/document.php
  3. 16
      main/document/slideshow.php

@ -1,4 +1,4 @@
<?php // $Id: document.inc.php 17099 2008-12-08 02:46:36Z ivantcholakov $
<?php // $Id: document.inc.php 17320 2008-12-16 14:47:36Z cfasanando $
/*
==============================================================================
@ -66,10 +66,12 @@ function build_directory_selector($folders,$curdirpath,$group_dir='',$changeRend
}
else
{
foreach($folders as $folder)
{
$folder_titles[$folder] = basename($folder);
}
if (!isset($folders)){
foreach($folders as $folder)
{
$folder_titles[$folder] = basename($folder);
}
}
}
require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');

@ -1,4 +1,4 @@
<?php // $Id: document.php 17099 2008-12-08 02:46:36Z ivantcholakov $
<?php // $Id: document.php 17320 2008-12-16 14:47:36Z cfasanando $
/*
==============================================================================
@ -645,11 +645,14 @@ if($folders===false)
<a href="quota.php?<?php echo api_get_cidreq();?>"><?php Display::display_icon('statistics.gif', get_lang("ShowCourseQuotaUse")); ?><?php echo get_lang("ShowCourseQuotaUse"); ?></a>
<?php
}
if ($docs_and_folders!=null) {
?>
<!-- download zipped folder -->
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&action=downloadfolder&amp;path=<?php echo $curdirpathurl.$req_gid; ?>"><img src="../img/zip_save.gif" border="0" title="<?php echo get_lang("Save"); ?> (ZIP)" alt="" /></a>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&action=downloadfolder&amp;path=<?php echo $curdirpathurl.$req_gid; ?>"><?php echo get_lang("Save"); ?> (ZIP)</a>&nbsp;
<?php
<?php
}
// Slideshow by Patrick Cool, May 2004
include("document_slideshow.inc.php");
if ($image_present)

@ -1,4 +1,4 @@
<?php // $Id: slideshow.php 16725 2008-11-12 15:43:21Z pcool $
<?php // $Id: slideshow.php 17320 2008-12-16 14:47:36Z cfasanando $
/*
==============================================================================
@ -150,22 +150,18 @@ function MM_openBrWindow(theURL,winName,features) { //v2.0
}
// exit the slideshow
echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.get_lang('_exit_slideshow').'</a> ';
echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'"><img src="'.api_get_path(WEB_IMG_PATH).'parent.gif" alt="">'.get_lang('_exit_slideshow').'</a>&nbsp;';
// show thumbnails
if ($slide_id <> "all")
{
echo "<a href='slideshow.php?slide_id=all&curdirpath=".$pathurl."'>".get_lang('_show_thumbnails')."</a> ";
}
else
{
if ($slide_id <> "all") {
echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'"><img src="'.api_get_path(WEB_IMG_PATH).'scormexitfullscreen.jpg" alt="">'.get_lang('_show_thumbnails').'</a>&nbsp;';
} else {
echo get_lang('_show_thumbnails').' ';
}
$image = $sys_course_path.$_course['path']."/document/".$folder.$image_files_only[$slide];
// slideshow options
echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'">'.get_lang('_set_slideshow_options').'</a> ';
echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'"><img src="'.api_get_path(WEB_IMG_PATH).'acces_tool.gif" alt="">'.get_lang('_set_slideshow_options').'</a> &nbsp;';
?>
</div>

Loading…
Cancel
Save