Browse Source

[svn r20692] use better icons because: grey icons means not available, no background, consistency in style for build, organize and display.
Grouping build, organize and display together
more clearly indicating current mode

Patrick Cool 16 years ago
parent
commit
5dcd632414

BIN
main/img/learnpath_build.png


BIN
main/img/learnpath_organize.gif


BIN
main/img/learnpath_organize.png


+ 19 - 17
main/newscorm/learnpath.class.php

@@ -2670,6 +2670,8 @@ class learnpath {
     {
 		$charset = api_get_setting('platform_charset');
 
+		$display_action_links_with_icons = false;
+
 		if($this->debug>0){error_log('New LP - In learnpath::get_html_toc()',0);}
     	$list = $this->get_toc();
     	//echo $this->current;
@@ -2682,15 +2684,18 @@ class learnpath {
     	{
     		$gradebook=Security::remove_XSS($_GET['gradebook']);
     		$html	.='<div class="actions_lp">';
-    		//the icon it was removed in display (build)
-    		//$html 	.= "<a href='lp_controller.php?".api_get_cidreq()."&amp;action=build&amp;lp_id=".$this->lp_id."' target='_parent'>".Display::return_icon('learnpath_build.gif', get_lang('Build')).' '.get_lang('Build')."</a>";
+    		if ($display_action_links_with_icons)
+    		{
+				$html 	.= "<a href='lp_controller.php?".api_get_cidreq()."&amp;action=build&amp;lp_id=".$this->lp_id."' target='_parent'>".Display::return_icon('learnpath_build.gif', get_lang('Build')).' '.get_lang('Build')."</a>";
+				$html 	.= "<a href='lp_controller.php?".api_get_cidreq()."&amp;action=admin_view&amp;lp_id=".$this->lp_id."' target='_parent'>".Display::return_icon('learnpath_organize.gif', get_lang('BasicOverview')).' '.get_lang('BasicOverview')."</a>";
+				$html 	.= '<span>'.Display::return_icon('learnpath_view.gif', get_lang("Display")).' <b>'.get_lang("Display").'</b></span>';
+    		}
+    		else 
+    		{
     		$html 	.= "<a href='lp_controller.php?".api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=build&amp;lp_id=".$this->lp_id."' target='_parent'>".get_lang('Build')."</a>";
-    		//the icon it was removed in display (organize)
-    		//$html 	.= "<a href='lp_controller.php?".api_get_cidreq()."&amp;action=admin_view&amp;lp_id=".$this->lp_id."' target='_parent'>".Display::return_icon('learnpath_organize.gif', get_lang('BasicOverview')).' '.get_lang('BasicOverview')."</a>";
     		$html 	.= "<a href='lp_controller.php?".api_get_cidreq()."&amp;action=admin_view&amp;lp_id=".$this->lp_id."' target='_parent'>".get_lang('BasicOverview')."</a>";
-    		//the icon it was removed in display (display)
-    		//$html 	.= '<span>'.Display::return_icon('learnpath_view.gif', get_lang("Display")).' '.get_lang("Display").'</span>';
-    		$html 	.= '<span>'.get_lang("Display").'</span>';
+    			$html 	.= '<span><b>'.get_lang('Display').'</b></span>';
+    		}
     		$html 	.= '</div>';
     	}
 
@@ -4440,11 +4445,9 @@ class learnpath {
 			$gradebook=Security::remove_XSS($_GET['gradebook']);
 			$return .= '<div class="actions">';
 			
-			//$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;gradebook='.$gradebook.'&amp;action=build&amp;lp_id=' . $this->lp_id . '" title="'.get_lang("Build").'">'.Display::return_icon('learnpath_build.gif', get_lang('Build')).' '.get_lang('Build').'</a>';
-			$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;gradebook='.$gradebook.'&amp;action=build&amp;lp_id=' . $this->lp_id . '" title="'.get_lang("Build").'"><img alt="'.get_lang("Build").'" src="../img/learnpath_build.png" title="'.get_lang("Build").'" />'.get_lang("Build").'</a>';
-			//$return .= '<span>'.Display::return_icon('learnpath_organize.gif', get_lang("BasicOverview")).' '.get_lang("BasicOverview").'</span>';
-			$return .= '<span><img alt="'.get_lang("BasicOverview").'" src="../img/learnpath_organize.png" title="'.get_lang("BasicOverview").'" />'.' '.get_lang('BasicOverview').'</span>';		
-			$return .= '<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$this->lp_id.'">'.Display::return_icon('learnpath_view.gif', get_lang("Display")).' '.get_lang("Display").'</a>';			
+			$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;gradebook='.$gradebook.'&amp;action=build&amp;lp_id=' . $this->lp_id . '" title="'.get_lang("Build").'">'.Display::return_icon('learnpath_build.gif', get_lang('Build')).' '.get_lang('Build').'</a>';
+			$return .= '<span>'.Display::return_icon('learnpath_organize.gif', get_lang("BasicOverview")).' <b>'.get_lang('BasicOverview').'</b></span>';
+			$return .= '<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$this->lp_id.'">'.Display::return_icon('learnpath_view.gif', get_lang("Display")).' '.get_lang('Display').'</a> '.Display::return_icon('i.gif');			
 			
 			$return .= '<a href="'.api_get_self().'?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;action='.Security::remove_XSS($_GET['action']).'&amp;lp_id='.Security::remove_XSS($_GET['lp_id']).'&amp;updateaudio=true">'.Display::return_icon('audio.gif', get_lang('UpdateAllAudioFragments')).' '.get_lang('UpdateAllAudioFragments').'</a>';
 			$return .= '</div>';
@@ -4612,11 +4615,10 @@ class learnpath {
 		$gradebook = Security::remove_XSS($_GET['gradebook']);
 		echo '<div class="actions">';
 		//echo '<span>'.Display::return_icon('learnpath_build.gif').' '.get_lang('Build').'</span>';
-		echo '<span><img alt="'.get_lang("Build").'" src="../img/learnpath_build.png" title="'.get_lang("Build").'" />'.' '.get_lang('Build').'</span>';
-		//echo '<a href="' .api_get_self(). '?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&amp;gradebook='.$gradebook.'&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.Display::return_icon('learnpath_organize.gif').' '.get_lang("BasicOverview").'</a>';
-		echo '<a href="' .api_get_self(). '?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&amp;gradebook='.$gradebook.'&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("BasicOverview").'"><img alt="'.get_lang("BasicOverview").'" src="../img/learnpath_organize.png" title="'.get_lang("BasicOverview").'" />'.get_lang("BasicOverview").'</a>';
-		//echo '<a href="lp_controller.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;gradebook='.$gradebook.'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'">'.Display::return_icon('learnpath_view.gif').' '.get_lang('Display').'</a>';
-		echo '<a href="lp_controller.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;gradebook='.$gradebook.'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'" title="'.get_lang("Display").'"><img alt="'.get_lang("Display").'" src="../img/learnpath_view.gif" title="'.get_lang("Display").'" />'.get_lang("Display").'</a>';
+		echo '<span>'.Display::return_icon('learnpath_build.gif',get_lang('Build')).' <b>'.get_lang('Build').'</b></span>';
+		echo '<a href="' .api_get_self(). '?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&amp;gradebook='.$gradebook.'&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("BasicOverview").'">'.Display::return_icon('learnpath_organize.gif', get_lang('BasicOverview')).' '.get_lang('BasicOverview').'</a>';
+		echo '<a href="lp_controller.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;gradebook='.$gradebook.'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'">'.Display::return_icon('learnpath_view.gif', get_lang('Display')).' '.get_lang('Display').'</a>';
+		Display::display_icon('i.gif');
 		echo '<a href="' .api_get_self(). '?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&amp;gradebook='.$gradebook.'&amp;action=add_item&amp;type=chapter&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("NewChapter").'"><img alt="'.get_lang("NewChapter").'" src="../img/lp_dokeos_chapter_add.gif" title="'.get_lang("NewChapter").'" />'.get_lang("NewChapter").'</a>';
 		echo '<a href="' .api_get_self(). '?cidReq=' . Security::remove_XSS($_GET['cidReq']) . '&amp;gradebook='.$gradebook.'&amp;action=add_item&amp;type=step&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("NewStep").'"><img alt="'.get_lang("NewStep").'" src="../img/new_test.gif" title="'.get_lang("NewStep").'" />'.get_lang("NewStep").'</a>';
 		echo '</div>';