Browse Source

[svn r15520] Remove header from learnpath tool, replace with short link in left column - see FS#2611

Yannick Warnier 17 years ago
parent
commit
960987b7a3
3 changed files with 29 additions and 22 deletions
  1. 13 1
      main/newscorm/lp_controller.php
  2. 2 3
      main/newscorm/lp_header.php
  3. 14 18
      main/newscorm/lp_view.php

+ 13 - 1
main/newscorm/lp_controller.php

@@ -769,7 +769,19 @@ switch($_REQUEST['action'])
 		}
 		require('lp_message.php');
 		break;	
-		
+	case 'return_to_course_homepage':
+        if(!$lp_found){ error_log('New LP - No learnpath given for stats',0); require('lp_list.php'); }
+        else{
+            $_SESSION['oLP']->save_current();
+            $_SESSION['oLP']->save_last();
+            //declare variables to be used in lp_stats.php
+            $lp_id = $_SESSION['oLP']->get_id();
+            $list = $_SESSION['oLP']->get_flat_ordered_items_list($lp_id);
+            $user_id = api_get_user_id();
+            $stats_charset = $_SESSION['oLP']->encoding;
+            header('location: ../course_home/course_home.php?'.api_get_cidreq());
+        }
+        break;        
 	default:
 		if($debug>0) error_log('New LP - default action triggered',0);
 		//$_SESSION['refresh'] = 1;

+ 2 - 3
main/newscorm/lp_header.php

@@ -58,9 +58,8 @@ if($show_link)
 $interbreadcrumb[] = array("url"=>"./lp_controller.php?action=view&lp_id=".$path_id,'name'=>$path_name);
 $noPHP_SELF = true;
 $lp_theme_css=$_SESSION['oLP']->get_theme();
-Display::display_header($nameTools,"Path", null);
-
+include('../inc/reduced_header.inc.php');
+echo '<a class="link" href="./lp_controller.php?action=return_to_course_homepage" target="_top" onclick="window.parent.API.save_asset();">'.get_lang('CourseHomepageLink').'</a>';
 ?>
-</div>
 </body>
 </html>

+ 14 - 18
main/newscorm/lp_view.php

@@ -137,22 +137,20 @@ if($_SESSION['oLP']->mode == 'fullscreen')
 	//set flag to ensure lp_header.php is loaded by this script (flag is unset in lp_header.php)
 	$_SESSION['loaded_lp_view'] = true;
 	?>
-	<frameset rows="130,*">
-		<frame id="header" src="lp_header.php" border="0" frameborder="0" scrolling="no" />
-		<frameset cols="270,*">
-			<frameset rows="475,95,80,*">
-				<frame id="toc_id" name="toc_name" class="lp_toc" src="lp_toc.php" border="0" frameborder="0" scrolling="no"/>
-				<frame id="nav_id" name="nav_name" class="lp_nav" src="lp_nav.php" border="0" frameborder="0" />
-				<frame id="message_id" name="message_name" class="message" src="lp_message.php" border="0" frameborder="0" />
-				<frame id="lp_log_id" name="lp_log_name" class="lp_log" src="lp_log.php" border="0" frameborder="0" />
-			</frameset>
-			<frame id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0">
-			</frame>
+	<frameset cols="270,*">
+		<frameset rows="20,475,95,80,*">
+            <frame id="header" src="lp_header.php"  border="0" frameborder="0" scrolling="no"/>
+			<frame id="toc_id" name="toc_name" class="lp_toc" src="lp_toc.php" border="0" frameborder="0" scrolling="no"/>
+			<frame id="nav_id" name="nav_name" class="lp_nav" src="lp_nav.php" border="0" frameborder="0" />
+			<frame id="message_id" name="message_name" class="message" src="lp_message.php" border="0" frameborder="0" />
+			<frame id="lp_log_id" name="lp_log_name" class="lp_log" src="lp_log.php" border="0" frameborder="0" />
 		</frameset>
-		<noframes>
-		This page relies heavily on frames. If your browser doesn't support frames, please try to find a better one. Some are available for free and run on multiple platforms. We recommend you try <a href="http://www.mozilla.com/firefox/">Firefox</a>. Get it from its official website by clicking the link.
-		</noframes>
+		<frame id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0">
+		</frame>
 	</frameset>
+	<noframes>
+	This page relies heavily on frames. If your browser doesn't support frames, please try to find a better one. Some are available for free and run on multiple platforms. We recommend you try <a href="http://www.mozilla.com/firefox/">Firefox</a>. Get it from its official website by clicking the link.
+	</noframes>
 </html>
 <?php
 }
@@ -173,10 +171,9 @@ else
 	//set flag to ensure lp_header.php is loaded by this script (flag is unset in lp_header.php)
 	$_SESSION['loaded_lp_view'] = true;
 	?>
-	<frameset rows="130,*">
-		<frame id="header" src="lp_header.php<?php echo (!empty($_GET['lp_id'])?'?lp_id='.intval($_GET['lp_id']):'');?>" border="0" frameborder="0" scrolling="no" />
 		<frameset cols="270,*">
-			<frameset rows="<?php echo($displayAudioRecorder?'60,':'');?>600,70,80,*">
+			<frameset rows="20,<?php echo($displayAudioRecorder?'60,':'');?>600,70,80,*">
+                <frame id="header" src="lp_header.php"  border="0" frameborder="0" scrolling="no"/>
 				<?php
 				if($displayAudioRecorder) //if audio recorder is required (set a few lines above)
 					echo '<frame id="audiorecorder_id" name="audiorecorder_name" src="display_audiorecorder.php" border="0" frameborder="0" scrolling="no"/>';
@@ -192,7 +189,6 @@ else
 		<noframes>
 		This page relies heavily on frames. If your browser doesn't support frames, please try to find a better one. Some are available for free and run on multiple platforms. We recommend you try <a href="http://www.mozilla.com/firefox/">Firefox</a>. Get it from its official website by clicking the link.
 		</noframes>
-	</frameset>
 </html>
 <?php
 	/*