Browse Source

[svn r17442] style changes - i added links interbreadcrumb - (see FS#3396)

Isaac Flores 16 years ago
parent
commit
6e165ceb7f
2 changed files with 19 additions and 9 deletions
  1. 14 3
      main/gradebook/gradebook.php
  2. 5 6
      main/gradebook/gradebook_edit_all.php

+ 14 - 3
main/gradebook/gradebook.php

@@ -28,7 +28,7 @@ $language_file= 'gradebook';
 $cidReset= true;
 $_in_course = false;
 //make sure the destination for scripts is index.php instead of gradebook.php
-require_once ('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 $_SESSION['gradebook_dest'] = 'gradebook.php';
 $this_section = SECTION_MYGRADEBOOK;
 require_once ('lib/be.inc.php');
@@ -401,8 +401,19 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
 			'name' => get_lang('Gradebook')
 		);
 		Display :: display_header(get_lang('SearchResults'));
-	} else{
-		Display :: display_header(get_lang('Gradebook'));
+	} else {
+			$interbreadcrumb[]= array (
+				'url' => $_SESSION['gradebook_dest'],
+				'name' => get_lang('Gradebook')
+			);	
+
+		if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {
+			$interbreadcrumb[]= array (
+				'url' => $_SESSION['gradebook_dest'].'?selectcat=0',
+				'name' => get_lang('Details')
+			);	
+		}
+	 Display :: display_header('');
 	}
 }
 

+ 5 - 6
main/gradebook/gradebook_edit_all.php

@@ -46,23 +46,23 @@ if (!api_is_allowed_to_create_course()) {
 if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
 	if (isset ($_GET['studentoverview'])) {
 		$interbreadcrumb[]= array (
-			'url' => 'gradebook.php?selectcat=' . Security::remove_XSS($_GET['selectcat']),
+			'url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
 			'name' => get_lang('Gradebook')
 		);
 		Display :: display_header(get_lang('FlatView'));
 	} elseif (isset ($_GET['search'])) {
 		$interbreadcrumb[]= array (
-			'url' => 'gradebook.php?selectcat=' . Security::remove_XSS($_GET['selectcat']),
+			'url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
 			'name' => get_lang('Gradebook')
 		);
 		Display :: display_header(get_lang('SearchResults'));
 	} else {
 		$interbreadcrumb[]= array (
-			'url' => 'index.php?',
+			'url' => $_SESSION['gradebook_dest'].'?',
 			'name' => get_lang('Gradebook'));
 		
 		$interbreadcrumb[]= array (
-			'url' => 'index.php?&selectcat='.Security::remove_XSS($_GET['selectcat']),
+			'url' => $_SESSION['gradebook_dest'].'?&selectcat='.Security::remove_XSS($_GET['selectcat']),
 			'name' => get_lang('Details'));
 
 		Display :: display_header('');
@@ -162,8 +162,7 @@ if ($my_api_cidreq=='') {
 	$my_api_cidreq='cidReq='.$my_category['course_code'];
 }
 ?>
-<a href="../gradebook/index.php?<?php echo $my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?>
-<!--<a href="/main/gradebook/index.php?<?php echo $my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?></a>-->
+<a href="<?php echo $_SESSION['gradebook_dest'].'?'.$my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?>
 <form method="post" action="gradebook_edit_all.php?<?php echo $my_api_cidreq ?>&selectcat=<?php echo $category_id?>">
 <table class="data_table">
 		 <tr class="row_odd">