From 59fd10ce84f34710843204dcb7caacd166b9ad71 Mon Sep 17 00:00:00 2001 From: Carlos Vargas Date: Thu, 30 Apr 2009 02:11:19 +0200 Subject: [PATCH] [svn r20209] breadcrumb in work see FS#3696 --- main/work/work.lib.php | 59 +++++++++++++++++++++--------------------- main/work/work.php | 36 ++++++++++++++++---------- 2 files changed, 52 insertions(+), 43 deletions(-) diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 6daf282e8e..5b72aff33d 100644 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -1,4 +1,4 @@ -, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default. * @author Roan Embrechts, code refactoring and virtual course support * @author Frederic Vauthier, directories management -* @version $Id: work.lib.php 20164 2009-04-28 21:02:46Z cvargas1 $ +* @version $Id: work.lib.php 20209 2009-04-30 00:11:19Z cvargas1 $ */ /** * Displays action links (for admins, authorized groups members and authorized students) @@ -21,12 +21,12 @@ require_once '../inc/lib/fileDisplay.lib.php'; function display_action_links($cur_dir_path, $always_show_tool_options, $always_show_upload_form) { - + global $gradebook; $display_output = ""; isset($_GET['origin'])?$origin = Security::remove_XSS($_GET['origin']):$origin=''; if (strlen($cur_dir_path) > 0 && $cur_dir_path != '/') { $parent_dir = dirname($cur_dir_path); - $display_output .= ''.Display::return_icon('folder_up.gif', get_lang('Up')).' '.get_lang('Up').''; + $display_output .= ''.Display::return_icon('folder_up.gif', get_lang('Up')).' '.get_lang('Up').''; } echo '
'; if ($_GET['display_tool_options'] == 'true' OR $_GET['display_upload_form'] == 'true' ) @@ -37,21 +37,21 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_ } if (! $always_show_tool_options && api_is_allowed_to_edit()) { // Create dir - $display_output .= ''.get_lang('CreateDir').' '.get_lang('CreateAssignment').' '; + $display_output .= ''.get_lang('CreateDir').' '.get_lang('CreateAssignment').' '; // Options - $display_output .= "".Display::return_icon('acces_tool.gif', get_lang("EditToolOptions")).' ' . get_lang("EditToolOptions") . ""; + $display_output .= "".Display::return_icon('acces_tool.gif', get_lang("EditToolOptions")).' ' . get_lang("EditToolOptions") . ""; } if (! $always_show_upload_form ) { - $display_output .= "".Display::return_icon('submit_file.gif', get_lang("UploadADocument"))." ". get_lang("UploadADocument") .''; + $display_output .= "".Display::return_icon('submit_file.gif', get_lang("UploadADocument"))." ". get_lang("UploadADocument") .''; } if (api_is_allowed_to_edit()) { // delete all files - $display_output .= "". Display::return_icon('delete.gif', get_lang('Delete')).' '.get_lang('DeleteAllFiles').""; @@ -64,11 +64,11 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_ $columnStatus = mysql_fetch_array($sql_result); if ($columnStatus['Default'] == 1) { - $display_output .= "". + $display_output .= "". Display::return_icon('invisible.gif', get_lang('Invisible')).' '.get_lang('MakeInvisible'). "\n"; } else { - $display_output .= "". + $display_output .= "". Display::return_icon('visible.gif', get_lang('Visible')).' '.get_lang('MakeVisible'). "\n"; } @@ -96,14 +96,14 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_ * @param $cur_dir_path_url Current subdirectory of 'work/', url-encoded */ function display_tool_options($uploadvisibledisabled, $origin,$base_work_dir,$cur_dir_path,$cur_dir_path_url) { - global $charset, $group_properties; + global $charset, $group_properties,$gradebook; $is_allowed_to_edit = api_is_allowed_to_edit(); $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION); if (! $is_allowed_to_edit) { return; } - echo '
'; + echo ''; echo '
'.get_lang('EditToolOptions').'
'; display_default_visibility_form($uploadvisibledisabled); echo '
@@ -161,9 +161,9 @@ function display_user_link($user_id, $name='') $result=api_sql_query($sql,__FILE__,__LINE__); $row=Database::fetch_array($result); if ($name=='') { - return "".$row['firstname']." ".$row['lastname'].""; + return "".$row['firstname']." ".$row['lastname'].""; } else { - return "".$name.""; + return "".$name.""; } } else { return $name.' ('.get_lang('Anonymous').')'; @@ -236,7 +236,7 @@ function create_group_date_select($prefix='') */ function display_student_publications_list($work_dir,$sub_course_dir,$currentCourseRepositoryWeb, $link_target_parameter, $dateFormatLong, $origin,$add_in_where_query='') { - global $charset,$timeNoSecFormat,$dateFormatShort; + global $charset,$timeNoSecFormat,$dateFormatShort,$gradebook; // Database table names $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION); $iprop_table = Database::get_course_table(TABLE_ITEM_PROPERTY); @@ -408,7 +408,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou $homework = mysql_fetch_array($sql); } - $form_folder = new FormValidator('edit_dir', 'post', api_get_self().'?curdirpath='.$my_sub_dir.'&origin='.$origin.'&edit_dir='.$mydir); + $form_folder = new FormValidator('edit_dir', 'post', api_get_self().'?curdirpath='.$my_sub_dir.'&origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$mydir); $group_name[] = FormValidator :: createElement('text','dir_name'); //$group_name[] = FormValidator :: createElement('submit','submit_edit_dir',get_lang('Ok')); @@ -614,9 +614,9 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou $show_as_icon = get_work_id($mydir); //true or false if ($show_as_icon) { - $row[] = ''.get_lang('Save').''.$dir.''.$add_to_name.'
'.$cant_files.' '.$text_file.$dirtext; + $row[] = ''.get_lang('Save').''.$dir.''.$add_to_name.'
'.$cant_files.' '.$text_file.$dirtext; } else { - $row[] = ''.$dir.''.$add_to_name.'
'.$cant_files.' '.$text_file.$dirtext; + $row[] = ''.$dir.''.$add_to_name.'
'.$cant_files.' '.$text_file.$dirtext; } } @@ -634,8 +634,8 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou if( $is_allowed_to_edit) { $action .= ''.get_lang('Modify').''; - $action .= ''.get_lang('DirDelete').''; + '&curdirpath='.$my_sub_dir.'&origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$mydir.'">'.get_lang('Modify').''; + $action .= ''.get_lang('DirDelete').''; $row[] = $action; } else { $row[] = ""; @@ -691,20 +691,20 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou if( $is_allowed_to_edit) { $action = ''; - $action .= ''.get_lang('Modify').''; - $action .= ''.get_lang('WorkDelete').''; - $action .= ''.get_lang('Move').''; + $action .= ''.get_lang('Modify').''; + $action .= ''.get_lang('WorkDelete').''; + $action .= ''.get_lang('Move').''; if($work->accepted == '1') { - $action .= ''.get_lang('Invisible').''; + $action .= ''.get_lang('Invisible').''; } else { - $action .= ''.get_lang('Visible').''; + $action .= ''.get_lang('Visible').''; } $row[] = $action; } elseif($is_author) { $action = ''; - $action .= ''.get_lang('Modify').''; - $action .= ''.get_lang('WorkDelete').''; + $action .= ''.get_lang('Modify').''; + $action .= ''.get_lang('WorkDelete').''; $row[] = $action; } else { @@ -819,8 +819,9 @@ function build_work_move_to_selector($folders,$curdirpath,$move_file,$group_dir= $sql = "SELECT title FROM $tbl_work WHERE id ='".(int)$move_file."'"; $result = api_sql_query($sql,__FILE__,__LINE__); $title = Database::fetch_row($result); + global $gradebook; - $form = ''."\n"; + $form = ''."\n"; $form .= '
'.get_lang('MoveFile').'
'; $form .= ''."\n"; $form .= '
@@ -1316,7 +1317,7 @@ function to_javascript_work() { } } - document.form1.action = "work.php?origin='.Security::remove_XSS($_REQUEST['origin']).'"; + document.form1.action = "work.php?origin='.Security::remove_XSS($_REQUEST['origin']).'&gradebook='.Security::remove_XSS($_GET['gradebook']).'"; document.form1.submit(); } diff --git a/main/work/work.php b/main/work/work.php index 6f84fa2a41..d9a78301a8 100644 --- a/main/work/work.php +++ b/main/work/work.php @@ -1,4 +1,4 @@ -, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default. * @author Roan Embrechts, code refactoring and virtual course support * @author Frederic Vauthier, directories management -* @version $Id: work.php 20164 2009-04-28 21:02:46Z cvargas1 $ +* @version $Id: work.php 20209 2009-04-30 00:11:19Z cvargas1 $ * * @todo refactor more code into functions, use quickforms, coding standards, ... */ @@ -203,7 +203,7 @@ api_protect_course_script(true); */ if (isset ($_POST['cancelForm']) && !empty ($_POST['cancelForm'])) { - header('Location: ' . api_get_self() . "?origin=$origin"); + header('Location: ' . api_get_self() . "?origin=$origin&gradebook=$gradebook"); exit (); } @@ -247,8 +247,23 @@ if(isset($_GET['action']) && $_GET['action']=="downloadfolder") Header ----------------------------------------------------------- */ -isset($_GET['gradebook'])?$gradebook=Security::remove_XSS($_GET['gradebook']):$gradebook=''; - + + +if (isset($_GET['gradebook']) && $_GET['gradebook']='view' ) { + $_SESSION['gradebook']=Security::remove_XSS($_GET['gradebook']); + $gradebook= $_SESSION['gradebook']; +} elseif (empty($_GET['gradebook'])) { + unset($_SESSION['gradebook']); + $gradebook= ''; +} + +if (!empty($gradebook) && $gradebook=='view') { + $interbreadcrumb[] = array ( + 'url' => '../gradebook/' . $_SESSION['gradebook_dest'], + 'name' => get_lang('Gradebook') + ); +} + if (!empty($_SESSION['toolgroup'])){ $_clean['toolgroup']=(int)$_SESSION['toolgroup']; $group_properties = GroupManager :: get_group_properties($_clean['toolgroup']); @@ -306,14 +321,7 @@ if (!empty($_SESSION['toolgroup'])){ } else { - - if (isset($origin) && $origin != 'learnpath') { - - if (isset($_GET['gradebook']) and $_GET['gradebook']=='view'){ - $interbreadcrumb[]= array ( - 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], - 'name' => get_lang('Gradebook')); - } + if (isset($origin) && $origin != 'learnpath') { $url_dir =''; $interbreadcrumb[] = array ('url' => $url_dir,'name' => get_lang('StudentPublications')); //if (!$display_tool_options && !$display_upload_form) @@ -1388,7 +1396,7 @@ if (!$display_upload_form && !$display_tool_options) { isset($_GET['cidreq'])?$cidreq = Security::Remove_XSS($_GET['cidreq']):$cidreq=''; isset($_GET['curdirpath'])?$curdirpath = Security::Remove_XSS($_GET['curdirpath']):$curdirpath=''; isset($_REQUEST['filter'])?$filter = (int)$_REQUEST['filter']:$filter=''; - $form_filter = ''; + $form_filter = ''; $form_filter .= make_select('filter',array(0=>get_lang('SelectAFilter'),1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised'),3=>get_lang('FilterByNotExpired')),$filter); $form_filter .= ''; echo $form_filter;