Ver Fonte

[svn r16739] second part of css cleanup (currently only the css/corporate style)

Patrick Cool há 16 anos atrás
pai
commit
7cff858189

+ 12 - 15
main/link/link.php

@@ -1,11 +1,10 @@
-<?php
+<?php // $Id: link.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003-2005 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -17,10 +16,10 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 ==============================================================================
 * Main script for the links tool.
@@ -186,7 +185,7 @@ if(isset($_GET['action']))
 	Introduction section
 -----------------------------------------------------------
 */
-Display::display_introduction_section(TOOL_LINK);
+Display::display_introduction_section(TOOL_LINK,'left');
 
 
 if (is_allowed_to_edit() and isset($_GET['action']))
@@ -195,12 +194,10 @@ if (is_allowed_to_edit() and isset($_GET['action']))
 	// has been submitted yet, hence !isset($submitLink)
 	if (($_GET['action']=="addlink" or $_GET['action']=="editlink") and empty($_POST['submitLink']))
 	{
-		echo "<h4>";
 		if ($_GET['action']=="addlink")
-			{echo get_lang("LinkAdd");}
+			{echo '<div class="form_header">'.get_lang("LinkAdd").'</div>';}
 		else
-			{echo get_lang("LinkMod");}
-		echo "</h4>\n\n";
+			{echo '<div class="form_header">'.get_lang("LinkMod").'</div>';}
 		if ($category=="")
 			{$category=0;}
 		echo "<form method=\"post\" action=\"".api_get_self()."?action=".$_GET['action']."&amp;urlview=".$urlview."\">";
@@ -250,9 +247,9 @@ if (is_allowed_to_edit() and isset($_GET['action']))
 	{
 		echo "<h4>";
 		if ($_GET['action']=="addcategory")
-			{echo get_lang("CategoryAdd");}
+			{echo '<div class="form_header">'.get_lang('CategoryAdd').'</div>';}
 		else
-			{echo get_lang("CategoryMod");}
+			{echo '<div class="form_header">'.get_lang('CategoryMod').'</div>';}
 		echo "</h4>\n\n";
 		echo "<form method=\"post\" action=\"".api_get_self()."?action=".$_GET['action']."&amp;urlview=".$urlview."\">";
 		if ($_GET['action']=="editcategory")
@@ -298,7 +295,7 @@ if (empty($_GET['action']) || ($_GET['action']!='editlink' && $_GET['action']!='
 		Action Links
 	-----------------------------------------------------------
 	*/
-	
+	echo '<div class="actions">';
 	if(is_allowed_to_edit())
 	{
 		echo Display::return_icon('file_html_new.gif')." <a href=\"".api_get_self()."?".api_get_cidreq()."&action=addlink&amp;category=".(!empty($category)?$category:'')."&amp;urlview=$urlview\">".get_lang("LinkAdd")."</a>\n";
@@ -322,13 +319,13 @@ if (empty($_GET['action']) || ($_GET['action']!='editlink' && $_GET['action']!='
 	echo "1";
 	}
 	echo "\">$showall</a>";
+	echo '</div>';
 
 	//Starting the table which contains the categories
-	
 	$sqlcategories="SELECT * FROM ".$tbl_categories." ORDER BY display_order DESC";
 	$resultcategories=api_sql_query($sqlcategories);
 	
-	echo '<br /><br /><table class="data_table">';
+	echo '<table class="data_table">';
 	// displaying the links which have no category (thus category = 0 or NULL), if none present this will not be displayed
 		$sqlLinks = "SELECT * FROM ".$tbl_link." WHERE category_id=0 or category_id IS NULL";
 		$result = api_sql_query($sqlLinks);

+ 10 - 14
main/mySpace/index.php

@@ -1,9 +1,10 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -15,8 +16,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
 
@@ -173,6 +173,7 @@ if($_user['status']==DRH)
 	$menu_items[] = '<a href="'.api_get_self().'?view=drh">'.get_lang('DrhInterface').'</a>';
 }
 
+echo '<div class="actions">';
 $nb_menu_items = count($menu_items);
 if($nb_menu_items>1)
 {
@@ -184,14 +185,13 @@ if($nb_menu_items>1)
 			echo ' | ';
 		}
 	}
-	echo '<br />';
 }
-echo '<div align="left" style="float:left"><h4>'.$title.'</h4></div>
-	  <div align="right">
+echo '
 		<a href="#" onclick="window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
-		<a href="'.api_get_self().'?export=csv&amp;view='.$view.'&amp;display='.Security::remove_XSS($_GET['display']).'">'.'<img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
-	  </div>
-	  <div class="clear"></div>';
+		<a href="'.api_get_self().'?export=csv&view='.$view.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
+';
+echo '</div>';
+echo '<h4>'.$title.'</h4>';
 
 if($_user['status']==DRH && $view=='drh')
 {
@@ -742,11 +742,7 @@ if($export_csv)
 	Export :: export_table_csv($csv_content, 'reporting_index');
 }
  
-/*
-==============================================================================
-FOOTER
-==============================================================================
-*/
+//footer
 if(!$export_csv)
 {
 	Display::display_footer();

+ 55 - 70
main/mySpace/myStudents.php

@@ -1,10 +1,10 @@
-<?php //$Id: myStudents.php 16554 2008-10-17 08:29:59Z elixir_inter $
+<?php // $Id: myStudents.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006-2008 Dokeos SPRL
-	Copyright (c) 2006-2008 Elixir Interactive http://www.elixir-interactive.com
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,8 +16,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
  
@@ -200,9 +199,9 @@ if(!empty($_GET['student']))
 	
 	$a_infosUser['name'] = $a_infosUser['firstname'].' '.$a_infosUser['lastname'];
 	
-	echo '<div align="right">
-		<a href="#" onclick="window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
-		<a href="'.api_get_self().'?'.$_SERVER['QUERY_STRING'].'&export=csv"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
+	echo '<div class="actions">
+		<a href="#" onclick="window.print()"><img src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
+		<a href="'.api_get_self().'?'.$_SERVER['QUERY_STRING'].'&export=csv"><img src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
 	  </div>';
 	  
 	  
@@ -285,9 +284,6 @@ if(!empty($_GET['student']))
 	
 ?>
 	<a name="infosStudent"></a>
-	<table class="data_table">
-		<tr>
-			<td class="border">
 				<table width="100%" border="0" >
 					<tr>
 						
@@ -298,15 +294,16 @@ if(!empty($_GET['student']))
 								echo '</td>';
 							?>
 						
-						<td class="none" width="40%" valign="top">
-							<table width="100%">
+			<td width="40%" valign="top">
+			
+				<table width="100%" class="data_table">
 								<tr>
 									<th>
 										<?php echo get_lang('Informations'); ?>
 									</th>
 								</tr>
 								<tr>
-									<td class="none">
+						<td>
 										<?php 
 											echo get_lang('Name').' : ';
 											echo $a_infosUser['name']; 
@@ -314,7 +311,7 @@ if(!empty($_GET['student']))
 									</td>
 								</tr>
 								<tr>
-									<td class="none">
+						<td>
 										<?php
 											echo get_lang('Email').' : ';
 											if(!empty($a_infosUser['email']))
@@ -329,7 +326,7 @@ if(!empty($_GET['student']))
 									</td>
 								</tr>
 								<tr>
-									<td class="none">
+						<td>
 										<?php
 											echo get_lang('Tel').'. ';
 											
@@ -345,7 +342,7 @@ if(!empty($_GET['student']))
 									</td>
 								</tr>
 								<tr>
-									<td class="none">
+						<td>
 										<?php
 											echo get_lang('OfficialCode').' : ';
 											
@@ -361,7 +358,7 @@ if(!empty($_GET['student']))
 									</td>
 								</tr>
 								<tr>
-									<td class="none">
+						<td>
 										<?php
 											echo get_lang('OnLine').' : ';
 											echo $online;
@@ -371,69 +368,65 @@ if(!empty($_GET['student']))
 							</table>
 						</td>
 						<td class="borderLeft" width="35%" valign="top">
-							<table width="100%">
+				
+				<table width="100%" class="data_table">
 								<tr>
-									<th>
+						<th colspan="2">
 										<?php echo get_lang('Tracking'); ?>
 									</th>
 								</tr>
 								<tr>
-									<td>
-										<table>
-											<tr>
-												<td class="none" align="right">
+						<td align="right">
 													<?php echo get_lang('FirstLogin') ?>
 												</td>
-												<td class="none" align="left">
+						<td align="left">
 													<?php echo $first_connection_date ?>
 												</td>
 											</tr>
 											<tr>
-												<td class="none" align="right">
+						<td align="right">
 													<?php echo get_lang('LatestLogin') ?>
 												</td>
-												<td class="none" align="left">
+						<td align="left">
 													<?php echo $last_connection_date ?>
 												</td>
 											</tr>
 											<tr>
-												<td class="none" align="right">
+						<td align="right">
 													<?php echo get_lang('TimeSpentOnThePlatform') ?>
 												</td>
-												<td class="none" align="left">
+						<td align="left">
 													<?php echo $time_spent_on_the_platform ?>
 												</td>
 											</tr>
 											<tr>
-												<td class="none" align="right">
+						<td align="right">
 													<?php echo get_lang('Progress') ?>
 												</td>
-												<td class="none" align="left">
+						<td align="left">
 													<?php echo $avg_student_progress.' %' ?>
 												</td>
 											</tr>
 											<tr>
-												<td class="none" align="right">
+						<td align="right">
 													<?php 
 													echo get_lang('Score');
 													Display :: display_icon('info2.gif',get_lang('ScormAndLPTestTotalAverage') , array ('style' => 'margin-bottom:-5px;'));
 													?>
 												</td>
-												<td class="none" align="left">
+						<td align="left">
 													<?php  echo $avg_student_score.' %' ?>
 												</td>
 											</tr>
 										</table>
 									</td>
-								</tr>
-							</table>
-						</td>
 					<?php
 							$sendMail = Display::encrypted_mailto_link($a_infosUser['email'], ' '.get_lang('SendMail'));
-						
 					?>
 						<td class="borderLeft" width="15%" valign="top">
-							<table width="100%">
+				
+						
+				<table width="100%" class="data_table">
 								<tr>
 									<th>
 										<?php echo get_lang('Actions'); ?>
@@ -445,13 +438,13 @@ if(!empty($_GET['student']))
 											if(!empty($a_infosUser['email']))
 											{
 												echo "<td class='none'>";
-												echo '<img align="absbottom" src="../img/send_mail.gif">&nbsp;'.$sendMail;
+									echo '<img src="../img/send_mail.gif">&nbsp;'.$sendMail;
 												echo "</td>";
 											}
 											else
 											{
 												echo "<td class='noLink none'>";
-												echo '<img align="absbottom" src="../img/send_mail.gif">&nbsp; <strong> > '.get_lang('SendMail').'</strong>';
+									echo '<img src="../img/send_mail.gif">&nbsp; <strong> > '.get_lang('SendMail').'</strong>';
 												echo "</td>";
 											}
 										?>
@@ -462,7 +455,7 @@ if(!empty($_GET['student']))
                                             {   //only show link to connection details if course and student were defined in the URL
                                                 echo '<tr>';
                                                 echo '<td class="noLink none">';
-                                                echo '<img align="absbottom" src="../img/statistics.gif">&nbsp; <strong> <a href="access_details.php?student='.$_GET['student'].'&course='.$_GET['course'].'">'.get_lang('AccessDetails').'</a> </strong>';
+							echo '<img src="../img/statistics.gif">&nbsp; <strong> <a href="access_details.php?student='.$_GET['student'].'&course='.$_GET['course'].'">'.get_lang('AccessDetails').'</a> </strong>';
                                                 echo '</td>';
                                                 echo '</tr>';
                                             }
@@ -471,9 +464,7 @@ if(!empty($_GET['student']))
 						</td>
 					</tr>
 				</table>
-			</td>
-		</tr>
-	</table>
+
 	<table class="data_table">
 		<tr>
 			<td colspan="5" style="border-width: 0px;">&nbsp;</td>
@@ -552,13 +543,14 @@ if(!empty($_GET['student']))
 				$csv_content[] = array(str_replace('&nbsp;','',$tableTitle));	
 				
 ?>
-		<tr class="tableName">
+		<tr>
 			<td colspan="6">
 					<strong><?php echo $tableTitle; ?></strong>
 			</td>
 		</tr>
-		<tr> <!-- line about learnpaths -->
-			<td>
+	</table>
+		
+	<!-- line about learnpaths -->
 				<table class="data_table">
 					<tr>
 						<th>
@@ -566,9 +558,6 @@ if(!empty($_GET['student']))
 						</th>
 						<th>
 							<?php echo get_lang('Time'); ?>
-						</th>
-						<th>
-							<?php echo get_lang('Progress'); ?>
 						</th>
 						<th>
 							<?php 
@@ -576,7 +565,9 @@ if(!empty($_GET['student']))
 							Display :: display_icon('info3.gif',get_lang('LPTestScore') , array ('style' => 'margin-bottom:-5px;')); 
 							?>
 						</th>
-						
+						<th>
+							<?php echo get_lang('Progress'); ?>
+						</th>
 						<th>
 							<?php echo get_lang('LastConnexion'); ?>
 						</th>
@@ -774,15 +765,13 @@ if(!empty($_GET['student']))
 						</td>
 						<td align="right">
 						<?php echo api_time_to_hms($total_time) ?>
-						</td>
-						<td align="right">
-							<?php echo $progress ?>
-						</td>
-						
+						</td>
 						<td align="right">
-							<?php echo ($total_weighting>0 && $progress!='0%') ? $score.'%' : '-' ?>
+							<?php echo $total_weighting>0 ? $score.'%' : '-' ?>
+						</td>
+						<td align="right">
+							<?php echo $progress ?>
 						</td>
-						
 						<td align="center">
 							<?php if($start_time!='' && $start_time>0) echo format_locale_date(get_lang('DateFormatLongWithoutDay'),$start_time); else echo '-'; ?>
 						</td>
@@ -818,10 +807,8 @@ if(!empty($_GET['student']))
 				}
 ?>
 				</table>
-			</td>
-		</tr>
-		<tr> <!-- line about exercises -->
-			<td>
+
+	<!-- line about exercises -->
 			<table class="data_table">
 				<tr>
 					<th>
@@ -854,7 +841,6 @@ if(!empty($_GET['student']))
 									FROM ".$t_quiz." AS quiz
 									WHERE active='1' ORDER BY quiz.title ASC
 									";
-		
 				$resultExercices = api_sql_query($sqlExercices,__FILE__,__LINE__);
 				$i = 0;
 				if(Database::num_rows($resultExercices)>0)
@@ -876,7 +862,6 @@ if(!empty($_GET['student']))
 									 AND exe_cours_id = '".$a_infosCours['code']."'
 									 AND exe_exo_id = ".$a_exercices['id']."
 									 ORDER BY exe_date DESC LIMIT 1";
-	
 						$resultScore = api_sql_query($sqlScore,__FILE__,__LINE__);
 						$score = 0; 
 						while($a_score = Database::fetch_array($resultScore))
@@ -904,9 +889,9 @@ if(!empty($_GET['student']))
 						
 						$i++;
 						
-						echo "<tr class='$s_css_class'>
+				echo '<tr class="'.$s_css_class.'">
 								<td>
-							 ";
+					 ';
 						echo 		$a_exercices['title'];
 						echo "	</td>
 							 ";
@@ -963,11 +948,11 @@ if(!empty($_GET['student']))
 					
 ?>					
 					</table>
-				</td>
-			</tr>
-		<tr><!-- line about other tools -->
-			<td>
+
+	<!-- line about other tools -->
 			<table class="data_table">
+	<tr>
+		<td>
 			<?php
 			$csv_content[] = array();
 			

+ 5 - 7
main/newscorm/document.php

@@ -1,13 +1,10 @@
-<?php //$id:$
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2005 Dokeos S.A.
-	Copyright (c) 2004 Dokeos S.A.
-	Copyright (c) 2004 Denes Nagy
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -19,9 +16,10 @@
 
 	See the GNU General Public License for more details.
 
-	Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 ==============================================================================
 * This file was origially the copy of document.php, but many modifications happened since then ;
@@ -266,7 +264,7 @@ if ($curDirPath)
   <tr>
     <td colspan="<?php echo $colspan ?>" align="left" bgcolor="#4171B5">
       <img src="../img/opendir.gif" align="absbottom" vspace="2" hspace="3" alt="open_dir" />
-      <font color="#ffffff"><b><?php echo $tmpcurDirPath ?></b></font>
+      <?php echo $tmpcurDirPath ?>
     </td>
   </tr>
   <?php

+ 217 - 155
main/newscorm/learnpath.class.php

@@ -1,4 +1,25 @@
-<?php //$id:$
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
+==============================================================================
+*/
+
 /**
  * This (abstract?) class defines the parent attributes and methods for the dokeos learnpaths and scorm
  * learnpaths. It is used by the scorm class as well as the dokeos_lp class.
@@ -544,11 +565,12 @@ class learnpath {
     	}
     	
 		// upload audio
-		if (!empty($_FILES['mp3']['tmp_name']))
+		if (!empty($_FILES['mp3']['name']))
 		{
 			// create the audio folder if it does not exist yet
 			global $_course;
 			$filepath = api_get_path('SYS_COURSE_PATH').$_course['path'].'/document/';
+						
 			if(!is_dir($filepath.'audio'))
 			{
 				$perm = api_get_setting('permissions_for_new_directories');
@@ -560,6 +582,7 @@ class learnpath {
 			
 			// upload the file in the documents tool			
 			include_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
+			
 			$file_path = handle_uploaded_document($_course, $_FILES['mp3'],api_get_path('SYS_COURSE_PATH').$_course['path'].'/document','/audio',api_get_user_id(),'','','','','',false);			
 			
 			// getting the filename only
@@ -1995,20 +2018,24 @@ class learnpath {
 		$sql = "SELECT * FROM " . $tbl_lp_item . " as lp WHERE lp.id = '" . $_SESSION['oLP']->current."'";
 		$result = api_sql_query($sql, __FILE__, __LINE__);
 		$row= mysql_fetch_assoc($result);
-		
+		$output='';		
+		if (!empty($row['audio']))
+		{
 		// the mp3 player	
-		$output .= '<div id="container"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.</div>';
-		$output .= '<script type="text/javascript" src="../inc/lib/mediaplayer/swfobject.js"></script>';
-		$output .= '<script type="text/javascript">
+			$output = '<div id="container"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.</div>';
+			$output .= '<script type="text/javascript" src="../inc/lib/mediaplayer/swfobject.js"></script>';
+			$output .= '<script type="text/javascript">
 						var s1 = new SWFObject("../inc/lib/mediaplayer/player.swf","ply","250","20","9","#FFFFFF");
 						s1.addParam("allowscriptaccess","always");
-						s1.addParam("flashvars","file=../../courses/'.$_course['path'].'/document/audio/'.$row['audio'].'&image=preview.jpg&autostart=true");
+							s1.addParam("flashvars","file='.api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/audio/'.$row['audio'].'&image=preview.jpg&autostart=true");
 						s1.write("container");
 					</script>';
+		}
 		return $output;		
 	}
 
 	
+	
     /**
      * Gets a progress bar for the learnpath by counting the number of items in it and the number of items
      * completed so far.
@@ -2587,15 +2614,23 @@ class learnpath {
     	//echo $this->current;
     	//$parent = $this->items[$this->current]->get_parent();
     	//if(empty($parent)){$parent = $this->ordered_items[$this->items[$this->current]->get_previous_index()];}
-    	$html = '<div class="inner_lp_toc">'."\n" ;
-    	$html.= '<div class="scorm_title"><div class="scorm_title_text">'.mb_convert_encoding($this->get_name(),$this->encoding,$mych).'</div></div>';
+    	$html= '<div class="scorm_title"><div class="scorm_title_text">'.mb_convert_encoding($this->get_name(),$this->encoding,$mych).'</div></div>';
     	
     	// build, display
     	if(api_is_allowed_to_edit())
     	{
-    		$html.='<div class="scorm_title_text"><br />'."<a  target='_parent' href='lp_controller.php?".api_get_cidreq()."&action=build&lp_id=".$this->lp_id."' style= target='_parent'>".mb_convert_encoding(get_lang("Build"),$this->encoding,$mych)."</a>&nbsp;&#124;&nbsp;<a href='lp_controller.php?".api_get_cidreq()."&action=admin_view&lp_id=".$this->lp_id."' target='_parent'>".mb_convert_encoding(get_lang("BasicOverview"),$this->encoding,$mych)."</a>&nbsp;&#124;&nbsp;".mb_convert_encoding(get_lang("Display"),$this->encoding,$mych).'<br /><br /></div>';
+    		$html	.='<div class="actions_lp">';
+    		$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').' '.mb_convert_encoding(get_lang('Build'),$this->encoding,$mych)."</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').' '.mb_convert_encoding(get_lang('BasicOverview'),$this->encoding,$mych)."</a>";
+    		$html 	.= '<span>'.Display::return_icon('learnpath_view.gif').' '.mb_convert_encoding(get_lang("Display"),$this->encoding,$mych).'</span>';
+    		$html 	.= '</div>';
 			unset($mych);
     	}
+    	
+    	$html.= '<div class="inner_lp_toc">'."\n" ;
+    	//$html.= '<div class="scorm_title"><div class="scorm_title_text">'.mb_convert_encoding($this->get_name(),$this->encoding,$mych).'</div></div>';
+    	
+    
     	//		" onchange=\"javascript:document.getElementById('toc_$parent').focus();\">\n";
 		require_once('resourcelinker.inc.php');
 		
@@ -2683,7 +2718,7 @@ class learnpath {
     			$html .= stripslashes($title);
     		}   		
     		
-    		$html .= "<img id='toc_img_".$item['id']."' src='".$icon_name[$item['status']]."' alt='".substr($item['status'],0,1)."' />"; 		
+    		$html .= "&nbsp;<img id='toc_img_".$item['id']."' src='".$icon_name[$item['status']]."' alt='".substr($item['status'],0,1)."' />"; 		
     		$html .= "</div>";
     		
     		if ($scorm_color_background!='')
@@ -4197,11 +4232,12 @@ class learnpath {
 		
 		if(api_is_allowed_to_edit())
 		{
-			$return .= '<p>';
-			$return = '<span style="float:right;"><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">'.get_lang('UpdateAllAudioFragments').'</a></span>';
-			$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=build&amp;lp_id=' . $this->lp_id . '">'.get_lang("Advanced").'</a>'."\n";
-			$return .= '&nbsp;&#124;&nbsp;'.get_lang("BasicOverview").'&nbsp;&#124;&nbsp;';
-			$return .= '<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$this->lp_id.'">'.get_lang("Display").'</a></p>';
+			$return .= '<div class="actions">';
+			$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=build&amp;lp_id=' . $this->lp_id . '">'.Display::return_icon('learnpath_build.gif').' '.get_lang('Advanced').'</a>';
+			$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=admin_overview&amp;lp_id=' . $this->lp_id . '">'.Display::return_icon('learnpath_organize.gif').' '.get_lang('BasicOverview').'</a>';
+			$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").'</a>';
+			$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').'</a>';
+			$return .= '</div>';
 		}
 		
 		// we need to start a form when we want to update all the mp3 files
@@ -4797,13 +4833,13 @@ class learnpath {
 	{
 		global $_course; //TODO: don't use globals
 		
-		$return = '<div style="margin:3px 12px;">' . "\n";
+			$return .= '<div class="sectiontitle">'.get_lang('CreateNewStep').'</div>';
 		
-			$return .= '<p class="lp_title" style="margin-top:0;">'.get_lang("CreateNewStep").'</p>';
+			$return .= '<div class="sectioncomment"><a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_DOCUMENT . '&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.get_lang("NewDocument").'</a></div>';
 		
-			$return .= '<div style="margin-left:7px;"><a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_DOCUMENT . '&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.get_lang("NewDocument").'</a></div>';
+			$return .= '<div class="sectiontitle">'.get_lang('UseAnExistingResource').'</div>';
 			
-			$return .= '<p class="lp_title" style="margin-top:10px;">'.get_lang("UseAnExistingResource").'</p>';
+			$return .= '<div class="sectioncomment">';
 			
 			/* get all the docs */
 			$return .= $this->get_documents();
@@ -4820,7 +4856,7 @@ class learnpath {
 			/* get al the forums */
 			$return .= $this->get_forums();
 		
-		$return .= '</div>' . "\n";
+			$return .= '</div>';
 		
 		return $return;
 	}
@@ -4864,7 +4900,7 @@ class learnpath {
 		
 		//TODO: add a path filter
 		if($iframe){
-			$return .= '<iframe frameborder="0" src="' . api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document' . str_replace('%2F','/',urlencode($row_doc['path'])) . '?'.api_get_cidreq().'" style="background:#FFFFFF; border:1px solid #CCCCCC; height:490px; width:100%; margin-top: 20px;"></iframe>';
+			$return .= '<iframe id="learnpath_preview_frame" frameborder="0" src="' . api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document' . str_replace('%2F','/',urlencode($row_doc['path'])) . '?'.api_get_cidreq().'"></iframe>';
 		}
 		else{
 			$return .= file_get_contents(api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $row_doc['path']);
@@ -4916,7 +4952,7 @@ class learnpath {
 		
 		$item_title = mb_convert_encoding($item_title,$charset,$this->encoding);
 		
-		$return = '<div style="margin:3px 12px;">';
+		$return = '<div class="sectiontitle">';
 			
 			if($id != 0 && is_array($extra_info))
 				$parent = $extra_info['parent_item_id'];
@@ -4958,32 +4994,44 @@ class learnpath {
 			unset($this->arrMenu);
 			
 			if($action == 'add')
-				$return .= '<p class="lp_title">'.get_lang("CreateTheExercise").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("CreateTheExercise").'&nbsp;:' . "\n";
 			elseif($action == 'move')
-				$return .= '<p class="lp_title">'.get_lang("MoveTheCurrentExercise").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("MoveTheCurrentExercise").'&nbsp;:' . "\n";
 			else
-				$return .= '<p class="lp_title">'.get_lang("EditCurrentExecice").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("EditCurrentExecice").'&nbsp;:' . "\n";
 			
 			if(isset($_GET['edit']) && $_GET['edit'] == 'true')
 			{
-				$return .= '<div class="lp_message" style="margin-bottom:15px;">';
+				$return .= '<div class="warning-message">';
 				
 					$return .= '<p class="lp_title">'.get_lang("Warning").' !</p>';
 					$return .= get_lang("WarningEditingDocument");
 				
 				$return .= '</div>';
 			}
+			$return .= '</div>';
+			$return .= '<div class="sectioncomment">';
 			
 			$return .= '<form method="POST">' . "\n";
 			
-				$return .= "\t" . '<table cellpadding="0" cellspacing="0" class="lp_form">' . "\n";
+				$return .= "\t" . '<table>' . "\n";
+				
+					if($action != 'move')
+					{
+						$return .= "\t\t" . '<tr>' . "\n";
+							
+							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").'&nbsp;:</label></td>' . "\n";
+							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" class="learnpath_item_form" value="' . $item_title . '" /></td>' . "\n";
+						
+						$return .= "\t\t" . '</tr>' . "\n";
+					}				
 				
 					$return .= "\t\t" . '<tr>' . "\n";
 					
 						$return .= "\t\t\t" . '<td class="label"><label for="idParent">'.get_lang("Parent").'&nbsp;:</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" class="learnpath_item_form" size="1">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">' . $this->name . '</option>';
 								
@@ -5024,7 +5072,7 @@ class learnpath {
 						$return .= "\t\t\t" . '<td class="label"><label for="idPosition">'.get_lang("Position").'&nbsp;:</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1">';
+							$return .= "\t\t\t\t" . '<select class="learnpath_item_form" id="idPosition" name="previous" size="1">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
 								
@@ -5051,12 +5099,6 @@ class learnpath {
 					
 					if($action != 'move')
 					{
-						$return .= "\t\t" . '<tr>' . "\n";
-							
-							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").'&nbsp;:</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>' . "\n";
-						
-						$return .= "\t\t" . '</tr>' . "\n";
 						
 						
 						$id_prerequisite=0;
@@ -5086,7 +5128,7 @@ class learnpath {
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 						$return .= "\t\t\t" . '<td class="label"><label for="idPrerequisites">'.get_lang("Prerequisites").'&nbsp;:</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"><option value="0">'.get_lang("NoPrerequisites").'</option>';
+							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" class="learnpath_item_form"><option value="0">'.get_lang("NoPrerequisites").'</option>';
 							
 							foreach($arrHide as $key => $value){
 								if($key==$s_selected_position && $action == 'add'){
@@ -5115,7 +5157,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 						
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td>&nbsp;</td><td><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
@@ -5238,7 +5280,7 @@ class learnpath {
 
 			if(isset($_GET['edit']) && $_GET['edit'] == 'true')
 			{
-				$return .= '<div class="lp_message" style="margin-bottom:15px;">';
+				$return .= '<div class="warning-message">';
 
 					$return .= '<p class="lp_title">'.get_lang("Warning").' !</p>';
 					$return .= get_lang("WarningEditingDocument");
@@ -5354,7 +5396,7 @@ class learnpath {
 						$return .= "\t\t" . '<tr>' . "\n";
 
 							$return .= "\t\t\t" . '<td class="label"><label for="idPrerequisites">'.get_lang("Prerequisites").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"><option value="0">'.get_lang("NoPrerequisites").'</option>';
+							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites"><option value="0">'.get_lang("NoPrerequisites").'</option>';
 
 							foreach($arrHide as $key => $value){
 								if($key==$s_selected_position && $action == 'add'){
@@ -5459,7 +5501,7 @@ class learnpath {
 		$item_title=mb_convert_encoding($item_title,$charset,$this->encoding);
 		$item_description=mb_convert_encoding($item_description,$charset,$this->encoding);
 				
-		$return = '<div style="margin:3px 12px;">';
+		$return = '<div class="sectiontitle">';
 			
 			if($id != 0 && is_array($extra_info))
 				$parent = $extra_info['parent_item_id'];
@@ -5499,22 +5541,35 @@ class learnpath {
 			unset($this->arrMenu);
 			
 			if($action == 'add')
-				$return .= '<p class="lp_title">'.get_lang("CreateTheForum").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("CreateTheForum").'&nbsp;:' . "\n";
 			elseif($action == 'move')
-				$return .= '<p class="lp_title">'.get_lang("MoveTheCurrentForum").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("MoveTheCurrentForum").'&nbsp;:' . "\n";
 			else
-				$return .= '<p class="lp_title">'.get_lang("EditCurrentForum").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("EditCurrentForum").'&nbsp;:' . "\n";
+				
+			$return .= '</div>';
+			$return .= '<div class="sectioncomment">';
 			
 			$return .= '<form method="POST">' . "\n";
 			
-				$return .= "\t" . '<table cellpadding="0" cellspacing="0" class="lp_form">' . "\n";
+				$return .= "\t" . '<table>' . "\n";
+				
+					if($action != 'move')
+					{
+						$return .= "\t\t" . '<tr>' . "\n";
+							
+							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").'&nbsp;:</label></td>' . "\n";
+							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" class="learnpath_item_form" /></td>' . "\n";
+						
+						$return .= "\t\t" . '</tr>' . "\n";
+					}				
 				
 					$return .= "\t\t" . '<tr>' . "\n";
 					
 						$return .= "\t\t\t" . '<td class="label"><label for="idParent">'.get_lang("Parent").'&nbsp;:</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" class="learnpath_item_form" size="1">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">' . $this->name . '</option>';
 								
@@ -5553,7 +5608,7 @@ class learnpath {
 						$return .= "\t\t\t" . '<td class="label"><label for="idPosition">'.get_lang("Position").'&nbsp;:</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1" class="learnpath_item_form">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
 								
@@ -5580,13 +5635,6 @@ class learnpath {
 					
 					if($action != 'move')
 					{
-						$return .= "\t\t" . '<tr>' . "\n";
-							
-							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").'&nbsp;:</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>' . "\n";
-						
-						$return .= "\t\t" . '</tr>' . "\n";
-						
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							//Remove temporaly the test description
@@ -5620,7 +5668,7 @@ class learnpath {
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							$return .= "\t\t\t" . '<td class="label"><label for="idPrerequisites">'.get_lang('Prerequisites').'&nbsp;:</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"><option value="0">'.get_lang("NoPrerequisites").'</option>';
+							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" class="learnpath_item_form"><option value="0">'.get_lang("NoPrerequisites").'</option>';
 							
 							foreach($arrHide as $key => $value){
 								if($key==$s_selected_position && $action == 'add'){
@@ -5886,7 +5934,7 @@ class learnpath {
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							$return .= "\t\t\t" . '<td class="label"><label for="idPrerequisites">'.get_lang("Prerequisites").'&nbsp;:</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"><option value="0">'.get_lang("NoPrerequisites").'</option>';
+							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites"><option value="0">'.get_lang("NoPrerequisites").'</option>';
 							
 							foreach($arrHide as $key => $value){
 								if($key==$s_selected_position && $action == 'add'){
@@ -5967,7 +6015,7 @@ class learnpath {
 			$item_description	= '';
 		}
 		
-		$return = '<div style="margin:10px 12px;">';
+		$return = '<div class="sectiontitle">';
 			
 		if($id != 0 && is_array($extra_info))
 			$parent = $extra_info['parent_item_id'];
@@ -6007,7 +6055,10 @@ class learnpath {
 		$arrLP = $this->arrMenu;		
 		unset($this->arrMenu);
 			
-		$return .= '<p class="lp_title">' . $title . '</p>' . "\n";
+		$return .= $title . "\n";
+		$return .= '</div>';
+		$return .= '<div class="sectioncomment">';
+		
 		require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');		
 		$form = new FormValidator('form','POST',api_get_self()."?".$_SERVER["QUERY_STRING"]);
 		
@@ -6051,7 +6102,17 @@ class learnpath {
 				}
 			}
 			
-			$parent_select = &$form->addElement('select', 'parent', get_lang("Parent")."&nbsp;:", '', 'style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;" onchange="load_cbo(this.value);"');
+			if($action != 'move')
+			{
+				$form->addElement('text','title', get_lang('Title').'&nbsp;:','id="idTitle" class="learnpath_chapter_form"');
+				//$form->addElement('textarea','description',get_lang("Description").' :', 'id="idDescription"');
+			}
+			else
+			{
+				$form->addElement('hidden','title');
+			}			
+			
+			$parent_select = &$form->addElement('select', 'parent', get_lang("Parent")."&nbsp;:", '', 'class="learnpath_chapter_form" id="Parent" onchange="load_cbo(this.value);"');
 
 			foreach($arrHide as $key => $value)
 			{
@@ -6078,7 +6139,7 @@ class learnpath {
 			}
 		}
 		
-		$position = &$form->addElement('select', 'previous', get_lang("Position")."&nbsp;:", '', 'id="idPosition" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"');
+		$position = &$form->addElement('select', 'previous', get_lang("Position")."&nbsp;:", '', 'id="idPosition" class="learnpath_chapter_form"');
 		
 		$position->addOption(get_lang('FirstPosition'),0,'style="padding-left:'.$value['padding'].'px;"');
 		
@@ -6091,17 +6152,7 @@ class learnpath {
 		
 		if(is_array($arrLP)) { reset($arrLP); }
 		
-		if($action != 'move')
-		{
-			$form->addElement('text','title', get_lang('Title').'&nbsp;:','id="idTitle" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; padding:1px 2px; width:300px;"');
-			//$form->addElement('textarea','description',get_lang("Description").' :', 'id="idDescription"  style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; padding:1px 2px; width:300px;"');
-		}
-		else
-		{
-			$form->addElement('hidden','title');
-		}
-		
-		$form->addElement('submit', 'submit_button', get_lang('Ok'), 'style="padding:1px 2px; width:75px;"');
+		$form->addElement('submit', 'submit_button', get_lang('Ok'));
 		
 		if($item_type == 'module' || $item_type == 'dokeos_module')
 		{
@@ -6141,12 +6192,6 @@ class learnpath {
 	function display_document_form($action = 'add', $id = 0, $extra_info = 'new')
 	{
 		global $charset;
-		echo '
-		<style>
-	        div.row div.formw { 	              
-    		width: 80%; 	                        
- 	              }
- 	                 </style>';
 			
 		$tbl_lp_item = Database::get_course_table('lp_item');
 		$tbl_doc = Database::get_course_table(TABLE_DOCUMENT);
@@ -6186,7 +6231,6 @@ class learnpath {
 		if($id != 0 && is_array($extra_info))
 		{
 			$item_title			= stripslashes($extra_info['title']);
-			
 			$item_description	= stripslashes($extra_info['description']);	
             $item_terms         = stripslashes($extra_info['terms']);        
 			if(empty($item_title))
@@ -6230,7 +6274,7 @@ class learnpath {
 			$item_description	= '';
 		}
 		
-		$return = '<div style="margin:3px 12px;">';
+		$return = '<div class="sectiontitle">';
 			
 			if($id != 0 && is_array($extra_info))
 				$parent = $extra_info['parent_item_id'];
@@ -6273,29 +6317,29 @@ class learnpath {
 			
 			if($action == 'add')
 			{
-				$return .= '<p class="lp_title">'.get_lang("CreateTheDocument").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("CreateTheDocument") . "\n";
 			}
 			elseif($action == 'move')
 			{
-				$return .= '<p class="lp_title">'.get_lang("MoveTheCurrentDocument").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("MoveTheCurrentDocument") . "\n";
 			}
 			else
 			{
-				$return .= '<p class="lp_title">'.get_lang("EditTheCurrentDocument").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("EditTheCurrentDocument") . "\n";
 			}
 
 			$return .= '</div>';
 
 			if(isset($_GET['edit']) && $_GET['edit'] == 'true')
 			{
-				$return .= '<div class="lp_message" style="margin-bottom:15px;">';				
-				$return .= '<p class="lp_title">'.get_lang("Warning").' !</p>';
+				$return .= '<div class="warning-message">';				
+				$return .= '<strong>'.get_lang("Warning").' !</strong><br />';
 				$return .= get_lang("WarningEditingDocument");				
 				$return .= '</div>';
 			}
 			/*
 			if($no_display_add==true){
-				$return .= '<div class="lp_message" style="margin-bottom:15px;">';
+				$return .= '<div class="warning-message">';
 				$return .= get_lang("CantEditDocument");
 				$return .= '</div>';
 				return $return;
@@ -6315,6 +6359,11 @@ class learnpath {
 		
 			$form->addElement('html',$return);
 						
+			if($action != 'move')
+			{
+				$form->addElement('text','title', get_lang('Title').'&nbsp;:','id="idTitle" class="learnpath_item_form"');
+			}			
+						
 			//$arrHide = array($id);
 			
 			$arrHide[0]['value']=$this->name;
@@ -6341,7 +6390,7 @@ class learnpath {
 					}
 				}
 			}
-			$parent_select = &$form->addElement('select', 'parent', get_lang("Parent")."&nbsp;:", '', 'style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;" onchange="load_cbo(this.value);"');
+			$parent_select = &$form->addElement('select', 'parent', get_lang("Parent")."&nbsp;:", '', 'class="learnpath_item_form" onchange="load_cbo(this.value);"');
 
 			foreach($arrHide as $key => $value)
 			{
@@ -6370,8 +6419,8 @@ class learnpath {
 				}
 			}
 			
-			$position = &$form->addElement('select', 'previous', get_lang("Position")."&nbsp;:", '', 'id="idPosition" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; padding:1px 2px; width:300px;"');
-			$position->addOption(get_lang("FirstPosition"),0,'style="padding-left:3px;"');
+			$position = &$form->addElement('select', 'previous', get_lang("Position")."&nbsp;:", '', 'id="idPosition" class="learnpath_item_form"');
+			$position->addOption(get_lang("FirstPosition"),0);
 			
 			foreach($arrHide as $key => $value)
 			{
@@ -6385,8 +6434,6 @@ class learnpath {
 			
 			if($action != 'move')
 			{
-				$form->addElement('text','title', get_lang('Title').'&nbsp;:','id="idTitle" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:295px;"');
-
 				
 				$id_prerequisite=0;
 				if(is_array($arrLP))
@@ -6399,8 +6446,8 @@ class learnpath {
 					}
 				}
 
-				$select_prerequisites=$form->addElement('select', 'prerequisites', get_lang('Prerequisites').'&nbsp;:', '', 'id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"');
-				$select_prerequisites->addOption(get_lang("NoPrerequisites"),0,'style="padding-left:3px;"');
+				$select_prerequisites=$form->addElement('select', 'prerequisites', get_lang('Prerequisites').'&nbsp;:', '', 'id="prerequisites" class="learnpath_item_form"');
+				$select_prerequisites->addOption(get_lang("NoPrerequisites"),0);
 
 				// form element for uploading an mp3 file
 				$form->addElement('file','mp3',get_lang('UploadMp3audio'),'id="mp3" size="33"');
@@ -6409,7 +6456,7 @@ class learnpath {
                 if ( api_get_setting('search_enabled') === 'true' )
                 {
                     //add terms field
-                    $terms = $form->addElement('text','terms', get_lang('SearchFeatureTerms').'&nbsp;:','id="idTerms" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:295px;"');
+                    $terms = $form->addElement('text','terms', get_lang('SearchFeatureTerms').'&nbsp;:','id="idTerms" class="learnpath_item_form"');
                     $terms->setValue($item_terms); 
                 }
 
@@ -6457,7 +6504,7 @@ class learnpath {
 						else
 							$content = '';
 						
-						$form->addElement('submit', 'submit_button', get_lang('Ok'), 'style="padding:1px 2px; width:75px;"');
+						$form->addElement('submit', 'submit_button', get_lang('Ok'));
 						
 						if(!$no_display_edit_textarea)
 						{
@@ -6475,7 +6522,7 @@ class learnpath {
 					elseif(is_numeric($extra_info))
 					{
 			
-						$form->addElement('submit', 'submit_button', get_lang('Ok'), 'style="padding:1px 2px; width:75px;"');
+						$form->addElement('submit', 'submit_button', get_lang('Ok'));
 			
 						$return = $this->display_document($extra_info, true, true, true);
 						$form->addElement('html',$return);
@@ -6490,12 +6537,12 @@ class learnpath {
 			}
 			if(is_numeric($extra_info))
 			{
-				$form->addElement('submit', 'submit_button', get_lang('Ok'), 'style="padding:1px 2px; width:75px;"');
+				$form->addElement('submit', 'submit_button', get_lang('Ok'));
 				$form->addElement('hidden', 'path', $extra_info);
 			}
 			elseif(is_array($extra_info))
 			{
-				$form->addElement('submit', 'submit_button', get_lang('Ok'), 'style="padding:1px 2px; width:75px;"');
+				$form->addElement('submit', 'submit_button', get_lang('Ok'));
 				$form->addElement('hidden', 'path', $extra_info['path']);
 			}
 			
@@ -6555,7 +6602,7 @@ class learnpath {
 		$item_title=mb_convert_encoding($item_title,$charset,$this->encoding);
 		$item_description=mb_convert_encoding($item_description,$charset,$this->encoding);
 				
-		$return = '<div style="margin:3px 12px;">';
+		$return = '<div class="sectiontitle">';
 			
 			if($id != 0 && is_array($extra_info))
 				$parent = $extra_info['parent_item_id'];
@@ -6595,22 +6642,34 @@ class learnpath {
 			unset($this->arrMenu);
 			
 			if($action == 'add')
-				$return .= '<p class="lp_title">'.get_lang("CreateTheLink").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("CreateTheLink").'&nbsp;:' . "\n";
 			elseif($action == 'move')
-				$return .= '<p class="lp_title">'.get_lang("MoveCurrentLink").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("MoveCurrentLink").'&nbsp;:' . "\n";
 			else
-				$return .= '<p class="lp_title">'.get_lang("EditCurrentLink").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("EditCurrentLink").'&nbsp;:' . "\n";
 			
+			$return .= '</div>';
+			$return .= '<div class="sectioncomment">';
 			$return .= '<form method="POST">' . "\n";
 			
-				$return .= "\t" . '<table cellpadding="0" cellspacing="0" class="lp_form">' . "\n";
+				$return .= "\t" . '<table>' . "\n";
+				
+					if($action != 'move')
+					{
+						$return .= "\t\t" . '<tr>' . "\n";
+							
+							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").' :</label></td>' . "\n";
+							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" class="learnpath_item_form"/></td>' . "\n";
+						
+						$return .= "\t\t" . '</tr>' . "\n";
+					}				
 				
 					$return .= "\t\t" . '<tr>' . "\n";
 					
 						$return .= "\t\t\t" . '<td class="label"><label for="idParent">'.get_lang("Parent").' :</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" class="learnpath_item_form" size="1">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">' . $this->name . '</option>';
 								
@@ -6649,7 +6708,7 @@ class learnpath {
 						$return .= "\t\t\t" . '<td class="label"><label for="idPosition">'.get_lang("Position").' :</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1" class="learnpath_item_form">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">'.get_lang("FirstPosition").'</option>';
 								
@@ -6676,24 +6735,18 @@ class learnpath {
 					
 					if($action != 'move')
 					{
-						$return .= "\t\t" . '<tr>' . "\n";
-							
-							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>' . "\n";
-						
-						$return .= "\t\t" . '</tr>' . "\n";
 						
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							$return .= "\t\t\t" . '<td class="label"><label for="idDescription">'.get_lang("Description").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><textarea id="idDescription" name="description" rows="4">' . $item_description . '</textarea></td>' . "\n";
+							$return .= "\t\t\t" . '<td class="input"><textarea id="idDescription" name="description" class="learnpath_item_form" rows="4">' . $item_description . '</textarea></td>' . "\n";
 						
 						$return .= "\t\t" . '</tr>' . "\n";
 						
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							$return .= "\t\t\t" . '<td class="label"><label for="idURL">'.get_lang("Url").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><input' . (is_numeric($extra_info) ? ' disabled="disabled"' : '') . ' id="idURL" name="url" type="text" value="' . $item_url . '" /></td>' . "\n";
+							$return .= "\t\t\t" . '<td class="input"><input' . (is_numeric($extra_info) ? ' disabled="disabled"' : '') . ' id="idURL" name="url" type="text" value="' . $item_url . '" class="learnpath_item_form" /></td>' . "\n";
 						
 						$return .= "\t\t" . '</tr>' . "\n";
 						
@@ -6722,7 +6775,7 @@ class learnpath {
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							$return .= "\t\t\t" . '<td class="label"><label for="idPrerequisites">'.get_lang("Prerequisites").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"><option value="0">'.get_lang("NoPrerequisites").'</option>';
+							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" class="learnpath_item_form"><option value="0">'.get_lang("NoPrerequisites").'</option>';
 							
 							foreach($arrHide as $key => $value)
 							{
@@ -6746,7 +6799,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 						
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td>&nbsp;</td><td><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
@@ -6817,7 +6870,7 @@ class learnpath {
 		}
 		
 		$item_title=mb_convert_encoding($item_title,$charset,$this->encoding);			
-		$return = '<div style="margin:3px 12px;">';
+		$return = '<div class="sectiontitle">';
 			
 			if($id != 0 && is_array($extra_info))
 				$parent = $extra_info['parent_item_id'];
@@ -6857,22 +6910,35 @@ class learnpath {
 			unset($this->arrMenu);
 			
 			if($action == 'add')
-				$return .= '<p class="lp_title">'.get_lang("Student_publication").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("Student_publication").'&nbsp;:' . "\n";
 			elseif($action == 'move')
-				$return .= '<p class="lp_title">'.get_lang("MoveCurrentStudentPublication").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("MoveCurrentStudentPublication").'&nbsp;:' . "\n";
 			else
-				$return .= '<p class="lp_title">'.get_lang("EditCurrentStudentPublication").'&nbsp;:</p>' . "\n";
+				$return .= get_lang("EditCurrentStudentPublication").'&nbsp;:' . "\n";
+			
+			$return .= '</div>';
+			$return .= '<div class="sectioncomment">';
 			
 			$return .= '<form method="POST">' . "\n";
 			
-				$return .= "\t" . '<table cellpadding="0" cellspacing="0" class="lp_form">' . "\n";
+				$return .= "\t" . '<table>' . "\n";
+				
+					if($action != 'move')
+					{
+						$return .= "\t\t" . '<tr>' . "\n";
+							
+							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").' :</label></td>' . "\n";
+							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" class="learnpath_item_form" /></td>' . "\n";
+						
+						$return .= "\t\t" . '</tr>' . "\n";			
+					}	
 				
 					$return .= "\t\t" . '<tr>' . "\n";
 					
 						$return .= "\t\t\t" . '<td class="label"><label for="idParent">'.get_lang("Parent").' :</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idParent" name="parent" onchange="load_cbo(this.value);" class="learnpath_item_form" size="1">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">' . $this->name . '</option>';
 								
@@ -6913,7 +6979,7 @@ class learnpath {
 						$return .= "\t\t\t" . '<td class="label"><label for="idPosition">'.get_lang("Position").' :</label></td>' . "\n";
 						$return .= "\t\t\t" . '<td class="input">' . "\n";
 						
-							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1">';
+							$return .= "\t\t\t\t" . '<select id="idPosition" name="previous" size="1" class="learnpath_item_form">';
 							
 								$return .= "\t\t\t\t\t" . '<option class="top" value="0">'.get_lang("FirstPosition").'</option>';
 								
@@ -6940,12 +7006,6 @@ class learnpath {
 					
 					if($action != 'move')
 					{
-						$return .= "\t\t" . '<tr>' . "\n";
-							
-							$return .= "\t\t\t" . '<td class="label"><label for="idTitle">'.get_lang("Title").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>' . "\n";
-						
-						$return .= "\t\t" . '</tr>' . "\n";
 						
 						$id_prerequisite=0;
 						if(is_array($arrLP))
@@ -6974,7 +7034,7 @@ class learnpath {
 						$return .= "\t\t" . '<tr>' . "\n";
 							
 							$return .= "\t\t\t" . '<td class="label"><label for="idPrerequisites">'.get_lang("Prerequisites").' :</label></td>' . "\n";
-							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;"><option value="0">'.get_lang("NoPrerequisites").'</option>';
+							$return .= "\t\t\t" . '<td class="input"><select name="prerequisites" id="prerequisites" class="learnpath_item_form"><option value="0">'.get_lang("NoPrerequisites").'</option>';
 							
 							foreach($arrHide as $key => $value){
 								if($key==$s_selected_position && $action == 'add'){
@@ -6996,7 +7056,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 						
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td>&nbsp</td><td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
@@ -7035,7 +7095,7 @@ class learnpath {
 	function display_manipulate($item_id, $item_type = TOOL_DOCUMENT)
 	{
 		global $charset, $_course; 
-		$return = '<div class="lp_manipulate"><table border="0" width="100%"><tr><td valign="top" width="550">';
+		$return = '<div class="actions">';
 		
 		switch($item_type)
 		{
@@ -7093,12 +7153,11 @@ class learnpath {
 		$s_title = $row['title'];
 		$s_title=mb_convert_encoding($s_title,$charset,$this->encoding);
 		
-		$return .= '<p class="lp_title">' . $lang . '</p>';
 		
 				// we display an audio player if needed
 		if (!empty($row['audio']))
 		{
-			$return .= '<div style="float: right;" id="container"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.</div>';
+			$return .= '<div class="lp_mediaplayer" id="container"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.</div>';
 			$return .= '<script type="text/javascript" src="../inc/lib/mediaplayer/swfobject.js"></script>';
 			$return .= '<script type="text/javascript">
 							var s1 = new SWFObject("../inc/lib/mediaplayer/player.swf","ply","250","20","9","#FFFFFF");
@@ -7108,6 +7167,8 @@ class learnpath {
 						</script>';
 		}
 		
+		$return .= $lang.': '; 
+		
 		$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=edit_item&amp;view=build&amp;id=' . $item_id . '&amp;lp_id=' . $this->lp_id . '" title="Edit the current item"><img align="absbottom" alt="Edit the current item" src="../img/edit.gif" title="Edit the current item" /> '.get_lang("Edit").'</a>';
 		$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=move_item&amp;view=build&amp;id=' . $item_id . '&amp;lp_id=' . $this->lp_id . '" title="Move the current item"><img align="absbottom" alt="Move the current item" src="../img/deplacer_fichier.gif" title="Move the current item" /> '.get_lang("Move").'</a>';
 		// commented for now as prerequisites cannot be added to chapters
@@ -7119,7 +7180,7 @@ class learnpath {
 		
 		//$return .= '<br><br><p class="lp_text">' . ((trim($s_description) == '') ? ''.get_lang("NoDescription").'' : stripslashes(nl2br($s_description))) . '</p>';
 		
-		$return.="</td><td valign='top'>";
+		//$return.="</td><td valign='top'>";
 		
 		// get the audiorecorder. Use of ob_* functions since there are echos in the file
 		ob_start();
@@ -7132,7 +7193,6 @@ class learnpath {
 		ob_end_clean();
 		// end of audiorecorder include
 		
-		$return.="</td></tr></table>";
 		
 		$return .= '</div>';
 		
@@ -7385,20 +7445,22 @@ class learnpath {
 		//$preq_max = $row['max_score'];
 		
 		$return = $this->display_manipulate($item_id, TOOL_DOCUMENT);
-		$return .= '<div style="margin:3px 12px;">';
-		$return .= '<p class="lp_title">'.get_lang("AddEditPrerequisites").'</p>';
+		$return .= '<div class="sectiontitle">';
+		$return .= get_lang('AddEditPrerequisites');
+		$return .= '</div>';
+		$return .= '<div class="sectioncomment">';
 		$return .= '<form method="POST">';
-		$return .= '<table class="lp_form">';
+		$return .= '<table class="lp_prerequisites">';
 		$return .= '<tr>';
 		$return .= '<th></th>';
-		$return .= '<th class="exercise">'.get_lang("Minimum").'</th>';
-		$return .= '<th class="exercise">'.get_lang("Maximum").'</th>';
+		$return .= '<th >'.get_lang('Minimum').'</th>';
+		$return .= '<th>'.get_lang('Maximum').'</th>';
 		$return .= '</tr>';
 		$return .= '<tr>';
-		$return .= '<td class="radio" colspan="3">';
+		$return .= '<td class="radio">';
 		$return .= '<input checked="checked" id="idNone" name="prerequisites" style="margin-left:0; margin-right:10px;" type="radio" />';
-		$return .= '<label for="idNone">'.get_lang("None").'</label>';
-		$return .= '</td>';
+		$return .= '<label for="idNone">'.get_lang('None').'</label>';
+		$return .= '</td><td colspan="2" />';
 		$return .= '</tr>';
 					
 		$sql = "
@@ -7499,7 +7561,7 @@ class learnpath {
 			ORDER BY path ASC";
 		$res_doc = api_sql_query($sql_doc, __FILE__, __LINE__);
 		
-		$return = '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resDoc').style.display == 'block') {document.getElementById('resDoc').style.display = 'none';} else {document.getElementById('resDoc').style.display = 'block';}\"" . ' style="cursor:pointer;"><img align="left" alt="" src="../img/lp_' . TOOL_DOCUMENT . '.gif" style="margin-right:5px;" title="" />'.get_lang("Document").'</div>';
+		$return = '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resDoc').style.display == 'block') {document.getElementById('resDoc').style.display = 'none';} else {document.getElementById('resDoc').style.display = 'block';}\"" . '><img alt="" src="../img/lp_' . TOOL_DOCUMENT . '.gif" style="margin-right:5px;" title="" />'.get_lang("Document").'</div>';
 		$return .= '<div class="lp_resource_elements" id="resDoc">';
 		
 		
@@ -7576,7 +7638,7 @@ class learnpath {
 					$icon = choose_image($resource);
 					$position = strrpos($icon,'.');
 					$icon=substr($icon,0,$position).'_small.gif';
-					$return .= '<div><div style="margin-left:' . (($num+1) * 15) . 'px;margin-right:5px;"><a href="' . api_get_self() . '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_DOCUMENT . '&amp;file=' . $key . '&amp;lp_id=' . $this->lp_id . '"><img align="left" alt="" src="../img/'.$icon.'" title="" />&nbsp;'.$resource."</a></div></div>\r\n";
+					$return .= '<div><div style="margin-left:' . (($num+1) * 15) . 'px;margin-right:5px;"><a href="' . api_get_self() . '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_DOCUMENT . '&amp;file=' . $key . '&amp;lp_id=' . $this->lp_id . '"><img alt="" src="../img/'.$icon.'" title="" />&nbsp;'.$resource."</a></div></div>\r\n";
 				}
 				
 			}
@@ -7609,8 +7671,8 @@ class learnpath {
 		$res_quiz = api_sql_query($sql_quiz, __FILE__, __LINE__);
 	  	$res_hot = api_sql_query($sql_hot, __FILE__, __LINE__);
 
-		$return .= '<div class="lp_resource_header_end"' . " onclick=\"if(document.getElementById('resExercise').style.display == 'block') {document.getElementById('resExercise').style.display = 'none';} else {document.getElementById('resExercise').style.display = 'block';}\"" . ' style="cursor:pointer;"><img align="left" alt="" src="../img/lp_' . TOOL_QUIZ . '.gif" style="margin-right:5px;" title="" />'.get_lang('Quiz').'</div>';
-		$return .= '<div class="lp_resource_elements_end" id="resExercise">';
+		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resExercise').style.display == 'block') {document.getElementById('resExercise').style.display = 'none';} else {document.getElementById('resExercise').style.display = 'block';}\"" . ' ><img align="left" alt="" src="../img/lp_' . TOOL_QUIZ . '.gif" style="margin-right:5px;" title="" />'.get_lang('Quiz').'</div>';
+		$return .= '<div class="lp_resource_elements" id="resExercise">';
 
 		while ($row_hot = Database::fetch_array($res_hot))
  		{
@@ -7664,20 +7726,20 @@ class learnpath {
 			ORDER BY title ASC";
 		$res_link = api_sql_query($sql_link, __FILE__, __LINE__);
 		
-		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resLink').style.display == 'block') {document.getElementById('resLink').style.display = 'none';} else {document.getElementById('resLink').style.display = 'block';}\"" . ' style="cursor:pointer;"><img align="left" alt="" src="../img/lp_' . TOOL_LINK . '.gif" style="margin-right:5px;" title="" />'.get_lang("Links").'</div>';
+		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resLink').style.display == 'block') {document.getElementById('resLink').style.display = 'none';} else {document.getElementById('resLink').style.display = 'block';}\"" . '><img alt="" src="../img/lp_' . TOOL_LINK . '.gif" style="margin-right:5px;" title="" />'.get_lang("Links").'</div>';
 		$return .= '<div class="lp_resource_elements" id="resLink">';
 		
 			while($row_link = Database::fetch_array($res_link))
 			{
 				$return .= '<div class="lp_resource_element">';
 				
-					$return .= '<img align="left" alt="" src="../img/file_html_small.gif" style="margin-right:5px;" title="" />';
+					$return .= '<img alt="" src="../img/file_html_small.gif" style="margin-right:5px;" title="" />';
 					$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_LINK . '&amp;file=' . $row_link['id'] . '&amp;lp_id=' . $this->lp_id . '">' . $row_link['title'] . '</a>';
 				
 				$return .= '</div>';
 			}
 		$return .= '<div class="lp_resource_element">';
-			$return .= '<img align="left" alt="" src="../img/file_html_new_small.gif" style="margin-right:5px;" title="" />';
+			$return .= '<img alt="" src="../img/file_html_new_small.gif" style="margin-right:5px;" title="" />';
 			$return .= '<a href="'.api_get_path(REL_CODE_PATH).'link/link.php?'.api_get_cidreq().'&action=addlink" title="' . get_lang('LinkAdd') . '">' . get_lang('LinkAdd') . '</a>';
 		$return .= '</div>';
 			
@@ -7704,8 +7766,8 @@ class learnpath {
 			ORDER BY title ASC";
 		$res_student = api_sql_query($sql_student, __FILE__, __LINE__);
 		
-		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resStudent').style.display == 'block') {document.getElementById('resStudent').style.display = 'none';} else {document.getElementById('resStudent').style.display = 'block';}\"" . ' style="border-bottom:1px solid #999999; cursor:pointer;"><img align="left" alt="" src="../img/lp_' . TOOL_STUDENTPUBLICATION . '.gif" style="margin-right:5px;" title="" />'.get_lang('Student_publication').'</div>';
-		$return .= '<div class="lp_resource_elements" id="resStudent" style="border-bottom:1px solid #999999; border-top:0;">';
+		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resStudent').style.display == 'block') {document.getElementById('resStudent').style.display = 'none';} else {document.getElementById('resStudent').style.display = 'block';}\"" . '><img alt="" src="../img/lp_' . TOOL_STUDENTPUBLICATION . '.gif" style="margin-right:5px;" title="" />'.get_lang('Student_publication').'</div>';
+		$return .= '<div class="lp_resource_elements" id="resStudent">';
 		$return .= '<div class="lp_resource_element">';
 		$return .= '<img align="left" alt="" src="../img/works_small.gif" style="margin-right:5px;" title="" />';
 		$return .= '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_STUDENTPUBLICATION . '&amp;lp_id=' . $this->lp_id . '">' . get_lang('AddAssignmentPage') . '</a>';
@@ -7732,8 +7794,8 @@ class learnpath {
 		$table_users = Database :: get_main_table(TABLE_MAIN_USER);
 		$a_forums = get_forums();
 		
-		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('forums').style.display == 'block') {document.getElementById('forums').style.display = 'none';} else {document.getElementById('forums').style.display = 'block';}\"" . ' style="border-bottom:1px solid #999999; cursor:pointer;"><img align="left" alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />'.get_lang('Forums').'</div>';
-		$return .= '<div class="lp_resource_elements" id="forums" style="border-bottom:1px solid #999999; border-top:0;">';
+		$return .= '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('forums').style.display == 'block') {document.getElementById('forums').style.display = 'none';} else {document.getElementById('forums').style.display = 'block';}\"" . '><img alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />'.get_lang('Forums').'</div>';
+		$return .= '<div class="lp_resource_elements" id="forums">';
 		
 		foreach($a_forums as $forum)
 		{
@@ -7751,7 +7813,7 @@ class learnpath {
 						}
 						</script>
 						';
-			$return .= '<img align="left" alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />';
+			$return .= '<img alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />';
 			$return .= '<a style="cursor:hand" onclick="toggle_forum('.$forum['forum_id'].')" style="vertical-align:middle"><img src="'.api_get_path(WEB_IMG_PATH).'add.gif" id="forum_'.$forum['forum_id'].'_opener" align="absbottom" /></a>
 						<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=' . TOOL_FORUM . '&amp;forum_id=' . $forum['forum_id'] . '&amp;lp_id=' . $this->lp_id . '" style="vertical-align:middle">' . $forum['forum_title'] . '</a><ul style="display:none" id="forum_'.$forum['forum_id'].'_content">';
 			$a_threads = get_threads($forum['forum_id']);
@@ -7765,7 +7827,7 @@ class learnpath {
 		}
 		
 		$return .= '<div class="lp_resource_element">';
-		$return .= '<img align="left" alt="" src="../img/forum_new_small.gif" style="margin-right:5px;" title="" />';
+		$return .= '<img alt="" src="../img/forum_new_small.gif" style="margin-right:5px;" title="" />';
 		$return .= '<a href="'.api_get_path(REL_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&action=add&amp;content=forum" title="'.get_lang('CreateANewForum').'">'.get_lang('CreateANewForum').'</a>';
 		$return .= '</div>';
 		

+ 13 - 16
main/newscorm/learnpath_functions.inc.php

@@ -1,28 +1,25 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
-============================================================================== 
+==============================================================================
 	Dokeos - elearning and course management software
-	
-	Copyright (c) 2004-2005 Dokeos S.A.
+
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Denes Nagy
-	Copyright (c) Yannick Warnier
-	
+
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
-	
+
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
-	
+
 	See the GNU General Public License for more details.
-	
-	Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 ==============================================================================
 * This is a function library for the learning path.
@@ -551,7 +548,7 @@ function display_learnpath_chapters($parent_item_id = 0, $tree = array (), $leve
 
 				if ($row_items["description"])
 				{
-					echo "<div align='justify'><font color='#999999'>&nbsp;&nbsp;&nbsp;{$row_items['description']}</font>";
+					echo "<div align='justify'>&nbsp;&nbsp;&nbsp;{$row_items['description']}";
 				}
 
 				echo "</td>";
@@ -580,7 +577,7 @@ function display_learnpath_chapters($parent_item_id = 0, $tree = array (), $leve
 							$number_items2 = Database::num_rows($result_items2);
 							if ($number_items2 == 0)
 							{
-								echo "<font color='red'>$lang_prereq_deleted_error</font>";
+								echo $lang_prereq_deleted_error;
 							}
 							$row_items2 = mysql_fetch_array($result_items2);
 							display_addedresource_link_in_learnpath($row_items2["item_type"], $row_items2["ref"], '', $row_items2["id"], 'builder', '', 0);
@@ -1718,7 +1715,7 @@ function exportitem($id, $item_id, $item_type, $add_scorm_communications = false
 			$result = api_sql_query($sql, __FILE__, __LINE__);
 
 			//2 Prepare table output
-			$expcontent .= "<table id=\"agenda_list\" >";
+			$expcontent .= "<table class=\"data_table\" >";
 			$barreMois = "";
 
 			//3 For each event corresponding to this agenda, do the following:

+ 25 - 52
main/newscorm/lp_add.php

@@ -1,28 +1,25 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
-============================================================================== 
+==============================================================================
 	Dokeos - elearning and course management software
-	
-	Copyright (c) 2004 Dokeos S.A.
+
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Patrick Cool
-	Copyright (c) Denes Nagy
-	Copyright (c) Yannick Warnier
-	
+
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
-	
+
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
-	
+
 	See the GNU General Public License for more details.
-	
-	Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-============================================================================== 
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
+==============================================================================
 */
+
 /**
 ============================================================================== 
 * This is a learning path creation and player tool in Dokeos - previously learnpath_handler.php
@@ -65,8 +62,8 @@ $language_file = 'learnpath';
 -----------------------------------------------------------
 */ 
 $currentstyle = api_get_setting('stylesheets');
-$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'css/'.$currentstyle.'/learnpath.css"/>';
-$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="learnpath.css" />'; //will be a merged with original learnpath.css
+//$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'css/'.$currentstyle.'/learnpath.css"/>';
+//$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="learnpath.css" />'; //will be a merged with original learnpath.css
 $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="dtree.css" />'; //will be moved
 /*
 -----------------------------------------------------------
@@ -115,43 +112,19 @@ $interbreadcrumb[]= array ("url"=>"#", "name"=> get_lang("_add_learnpath"));
 
 Display::display_header(null,'Path');
 
-/*
------------------------------------------------------------
-	DISPLAY SECTION
------------------------------------------------------------
-*/
-echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
-	echo '<tr>';
-		echo '<td class="tree">';
-			echo '<p style="border-bottom:1px solid #999999; margin:0; padding:2px;"><strong style="color:#999999">'.get_lang("BasicOverview").'</strong>&nbsp;<strong style="color:#999999">'.get_lang("Display").'</strong></p>';
-			//links for adding a module, chapter or step
-			echo '<div class="lp_actions">';
-				echo '<p class="lp_action">';
-					echo '<img align="left" alt="'.get_lang("NewChapter").'" src="../img/lp_dokeos_chapter_add.png" title="'.get_lang("NewChapter").'" /><strong style="color:#999999">'.get_lang("NewChapter").'</strong>';
-				echo '</p>';
-				echo '<p class="lp_action">';
-					echo '<img align="left" alt="'.get_lang("NewStep").'" src="../img/lp_dokeos_step_add.png" title="'.get_lang("NewStep").'" /><strong style="color:#999999">'.get_lang("NewStep").'</strong>';
-				echo '</p>';
-			echo '</div>';
-		echo '</td>';
-		echo '<td class="workspace">';
-			Display::display_normal_message(get_lang('AddLpIntro'),false);
-			echo '<div style="background:#F8F8F8; border:1px solid #999999; margin:10px; padding:10px; width:490px;">';
-				echo '<p style="font-weight:bold">'.get_lang('AddLpToStart').' :</p>';
-				echo '<form method="post">';
-					echo '<label for="idTitle" style="margin-right:10px;">'.get_lang('Title').' :</label><input id="idTitle" name="learnpath_name" type="text" class="input_titles" />';
-					echo '<p><input style="background:#FFFFFF; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; padding:1px 2px; width:75px;" type="submit" value="'.get_lang('Ok').'" /></p>';
+echo '<div class="actions">';
+echo Display::return_icon('scorm.gif').' <a href="lp_controller.php?cidReq='.$_course['sysCode'].'">'.get_lang('ReturnToLearningPaths').'</a>';
+echo '</div>';
+
+Display::display_normal_message(get_lang('AddLpIntro'),false);
+
+echo '<p>'.get_lang('AddLpToStart').' :</p>';
+echo '<form method="post">';
+	echo '<label for="idTitle">'.get_lang('Title').' : </label><input id="idTitle" name="learnpath_name" type="text" /> ';
+	echo '<input type="submit" value="'.get_lang('Ok').'" />';
 					echo '<input name="post_time" type="hidden" value="' . time() . '" />';
-				echo '</form>';
-			echo '</div>';
-		echo '</td>';
-	echo '</tr>';		
-echo '</table>';
+echo '</form>';
 
-/*
-==============================================================================
-		FOOTER 
-==============================================================================
-*/ 
+// footer
 Display::display_footer();
 ?>

+ 28 - 39
main/newscorm/lp_add_item.php

@@ -1,29 +1,26 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
-============================================================================== 
+==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Patrick Cool
-	Copyright (c) Denes Nagy
-	Copyright (c) Yannick Warnier
-	
+
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
-	
+
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
-	
+
 	See the GNU General Public License for more details.
-	
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-============================================================================== 
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
+==============================================================================
 */
+
+
 /**
 ============================================================================== 
 * This is a learning path creation and player tool in Dokeos - previously 
@@ -206,28 +203,21 @@ function confirmation(name)
 	DISPLAY SECTION
 -----------------------------------------------------------
 */
+echo '<div class="actions">';
+echo '<span>'.Display::return_icon('learnpath_build.gif').' '.get_lang('Build').'</span>';
+echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.Display::return_icon('learnpath_build.gif').' '.get_lang("BasicOverview").'</a>';
+echo '<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'">'.Display::return_icon('learnpath_organize.gif').' '.get_lang('Display').'</a>';
+echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&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.png" title="'.get_lang("NewChapter").'" />'.get_lang("NewChapter").'</a>';
+echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&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/lp_dokeos_step_add.png" title="'.get_lang("NewStep").'" />'.get_lang("NewStep").'</a>';
+echo '</div>';
+
 echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 
 	echo '<tr>';
 			
 		echo '<td class="tree">';
 		
-			echo '<p style="border-bottom:1px solid #999999; margin:0; padding:2px;">'.get_lang("Build").'&nbsp;&#124;&nbsp;<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.get_lang("BasicOverview").'</a>&nbsp;&#124;&nbsp;<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'">'.get_lang("Display").'</a></p>';
-			
-			//links for adding a module, chapter or step
-			echo '<div class="lp_actions">';				
-				echo '<p class="lp_action">';				
-					echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=chapter&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("NewChapter").'"><img align="left" alt="'.get_lang("NewChapter").'" src="../img/lp_dokeos_chapter_add.png" title="'.get_lang("NewChapter").'" />'.get_lang("NewChapter").'</a>';						
-				echo '</p>';
-				echo '<p class="lp_action">';
-				
-					echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=step&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("NewStep").'"><img align="left" alt="'.get_lang("NewStep").'" src="../img/lp_dokeos_step_add.png" title="'.get_lang("NewStep").'" />'.get_lang("NewStep").'</a>';
-				
-				echo '</p>';
-				
-			echo '</div>';
-			
-			echo '<div class="lp_tree" style="height:250px">';					
+			echo '<div class="lp_tree">';					
 				//build the tree with the menu items in it
 				echo $_SESSION['oLP']->build_tree();			
 			echo '</div>';
@@ -235,8 +225,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 			// show the template list 
 			if ($_GET['type']=='document')
 			{
-				echo '<p style="border-bottom:1px solid #999999; margin:0; padding:2px;"></p>'; //line					
-				echo '<br>';			
+				echo '<br />';			
 				echo '<div id="frmModel" style="display:block; height:890px;width:100px; position:relative;"></div>';
 			}
 							
@@ -253,7 +242,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewChapterCreated");
 						
@@ -265,7 +254,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewLinksCreated");
 						
@@ -277,7 +266,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewStudentPublicationCreated");
 						
@@ -289,7 +278,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 						
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewModuleCreated");
 						
@@ -301,7 +290,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 					
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewExerciseCreated");
 						
@@ -312,7 +301,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 					
 					case TOOL_DOCUMENT:
 						
-						$msg = '<div class="lp_message" style="margin-bottom:10px;">';
+						$msg = '<div class="confirmation-message">';
 						
 							$msg .= get_lang("NewDocumentCreated");
 						
@@ -326,7 +315,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 					case TOOL_FORUM:
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewForumCreated");
 						
@@ -338,7 +327,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 					case 'thread':
 						echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']);
 						
-						echo '<div class="lp_message" style="margin:3px 10px;">';
+						echo '<div class="confirmation-message">';
 						
 							echo get_lang("NewThreadCreated");
 						

+ 14 - 16
main/newscorm/lp_admin_view.php

@@ -1,28 +1,26 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
-============================================================================== 
+==============================================================================
 	Dokeos - elearning and course management software
-	
-	Copyright (c) 2004 Dokeos S.A.
+
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Patrick Cool
-	Copyright (c) Denes Nagy
-	Copyright (c) Yannick Warnier
-	
+
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
-	
+
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
-	
+
 	See the GNU General Public License for more details.
-	
-	Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-============================================================================== 
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
+==============================================================================
 */
+
+
 /**
 ============================================================================== 
 * This is a learning path creation and player tool in Dokeos - previously learnpath_handler.php
@@ -172,7 +170,7 @@ switch($_GET['action'])
 		
 		if(isset($is_success) && $is_success === true)
 		{
-			echo '<div class="lp_message">';
+			echo '<div class="confirmation-message">';
 			
 				echo get_lang("_learnpath_item_edited");
 			
@@ -189,7 +187,7 @@ switch($_GET['action'])
 		
 		if(isset($is_success) && $is_success === true)
 		{
-			echo '<div class="lp_message">';
+			echo '<div class="confirmation-message">';
 			
 				echo get_lang("_learnpath_item_deleted");
 			

+ 26 - 22
main/newscorm/lp_build.php

@@ -1,28 +1,26 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
-============================================================================== 
+==============================================================================
 	Dokeos - elearning and course management software
-	
-	Copyright (c) 2004 Dokeos S.A.
+
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Patrick Cool
-	Copyright (c) Denes Nagy
-	Copyright (c) Yannick Warnier
-	
+
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
-	
+
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
-	
+
 	See the GNU General Public License for more details.
-	
-	Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-============================================================================== 
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
+==============================================================================
 */
+
+
 /**
 ============================================================================== 
 * This is a learning path creation and player tool in Dokeos - previously learnpath_handler.php
@@ -191,25 +189,31 @@ function confirmation(name)
 	DISPLAY SECTION
 -----------------------------------------------------------
 */
+echo '<div class="actions">';
+echo '<span>'.Display::return_icon('learnpath_build.gif').' '.get_lang('Build').'</span>';
+echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.Display::return_icon('learnpath_organize.gif').' '.get_lang("BasicOverview").'</a>';
+echo '<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'">'.Display::return_icon('learnpath_view.gif').' '.get_lang("Display").'</a>';
+echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&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.png" title="'.get_lang("NewChapter").'" />'.get_lang("NewChapter").'</a>';
+echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&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/lp_dokeos_step_add.png" title="'.get_lang("NewStep").'" />'.get_lang("NewStep").'</a>';
+echo '</div>';
+
 echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 
 	echo '<tr>';
 			
 		echo '<td class="tree">';
 		
-			echo '<p style="border-bottom:1px solid #999999; margin:0; padding:2px;">'.get_lang("Build").'&nbsp;&#124;&nbsp;<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=admin_view&amp;lp_id=' . $_SESSION['oLP']->lp_id . '">'.get_lang("BasicOverview").'</a>&nbsp;&#124;&nbsp;<a href="lp_controller.php?cidReq='.$_GET['cidReq'].'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'">'.get_lang("Display").'</a></p>';
-			
 			//links for adding a module, chapter or step
 			echo '<div class="lp_actions">';
 				
 				echo '<p class="lp_action">';
 				
-					echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=chapter&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("NewChapter").'"><img align="left" alt="'.get_lang("NewChapter").'" src="../img/lp_dokeos_chapter_add.png" title="'.get_lang("NewChapter").'" />'.get_lang("NewChapter").'</a>';
+					
 						
 				echo '</p>';
 				echo '<p class="lp_action">';
 				
-					echo '<a href="' .api_get_self(). '?cidReq=' . $_GET['cidReq'] . '&amp;action=add_item&amp;type=step&amp;lp_id=' . $_SESSION['oLP']->lp_id . '" title="'.get_lang("NewStep").'"><img align="left" alt="'.get_lang("NewStep").'" src="../img/lp_dokeos_step_add.png" title="'.get_lang("NewStep").'" />'.get_lang("NewStep").'</a>';
+					
 				
 				echo '</p>';
 				
@@ -227,7 +231,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 		
 			if(isset($is_success) && $is_success === true)
 			{
-				echo '<div class="lp_message" style="margin:3px 10px;">';
+				echo '<div class="confirmation-message">';
 			
 					echo get_lang("ItemRemoved");
 			
@@ -237,7 +241,7 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 			{
 				if($is_new)
 				{
-					echo '<div class="lp_message" style="margin:3px 10px;">';
+					echo '<div class="confirmation-message">';
 				
 						echo get_lang("LearnPathAdded");
 				
@@ -245,10 +249,10 @@ echo '<table cellpadding="0" cellspacing="0" class="lp_build">';
 				}
 				
 				if($is_new){
-					echo '<p style="font-weight:bold; text-align:center;">'.get_lang("LPCreatedToContinue").'</p>';
+					Display::display_normal_message(get_lang("LPCreatedToContinue"));
 				}
 				else{
-					echo '<p style="font-weight:bold; text-align:center;">'.get_lang("LPCreatedAddChapterStep").'</p>';
+					Display::display_normal_message(get_lang('LPCreatedAddChapterStep'));
 				}
 								
 			}

+ 11 - 9
main/survey/reporting.php

@@ -1,9 +1,10 @@
-<?php
+<?php // $Id: reporting.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2008 Dokeos SPRL
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -15,16 +16,17 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
 
+
+
 /**
 *	@package dokeos.survey
 * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
-* 	@version $Id: reporting.php 16697 2008-11-07 21:47:40Z yannoo $
+* 	@version $Id: reporting.php 16739 2008-11-13 15:36:40Z pcool $
 *
 * 	@todo The question has to be more clearly indicated (same style as when filling the survey)
 */
@@ -150,10 +152,10 @@ SurveyUtil::handle_reporting_actions();
 if (!$_GET['action'] OR $_GET['action'] == 'overview')
 {
 	$myweb_survey_id = Security::remove_XSS($_GET['survey_id']);
-	echo '<b><a href="reporting.php?action=questionreport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('DetailedReportByQuestion').'</a></b> <br />'.get_lang('DetailedReportByQuestionDetail').' <br /><br />';
-	echo '<b><a href="reporting.php?action=userreport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('DetailedReportByUser').'</a></b><br />'.get_lang('DetailedReportByUserDetail').'.<br /><br />';
-	echo '<b><a href="reporting.php?action=comparativereport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('ComparativeReport').'</a></b><br />'.get_lang('ComparativeReportDetail').'.<br /><br />';
-	echo '<b><a href="reporting.php?action=completereport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('CompleteReport').'</a></b><br />'.get_lang('CompleteReportDetail').'<br /><br />';
+	echo '<div class="sectiontitle"><a href="reporting.php?action=questionreport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>';
+	echo '<div class="sectiontitle"><a href="reporting.php?action=userreport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>';
+	echo '<div class="sectiontitle"><a href="reporting.php?action=comparativereport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>';
+	echo '<div class="sectiontitle"><a href="reporting.php?action=completereport&amp;survey_id='.$myweb_survey_id.'">'.get_lang('CompleteReport').'</a></div><div class="sectioncomment">'.get_lang('CompleteReportDetail').'</div>';
 }
 
 

+ 30 - 31
main/survey/survey.php

@@ -1,9 +1,10 @@
-<?php
+<?php // $Id: survey.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -15,16 +16,17 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
 
+
+
 /**
 *	@package dokeos.survey
 * 	@author unknown
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
-* 	@version $Id: survey.php 16485 2008-10-10 12:49:22Z elixir_inter $
+* 	@version $Id: survey.php 16739 2008-11-13 15:36:40Z pcool $
 *
 * 	@todo use quickforms for the forms
 */
@@ -129,11 +131,11 @@ if (isset($_GET['message']))
 	if (in_array($_GET['message'], array('QuestionAdded','QuestionUpdated')))
 	{
 		Display::display_confirmation_message(get_lang($_GET['message']), false);
-	}
-	
-	if (in_array($_GET['message'], array('YouNeedToCreateGroups')))
-	{
-		Display::display_warning_message(get_lang($_GET['message']), false);
+	}
+	
+	if (in_array($_GET['message'], array('YouNeedToCreateGroups')))
+	{
+		Display::display_warning_message(get_lang($_GET['message']), false);
 	}
 }
 if(!empty($survey_data['survey_version'])) echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
@@ -142,39 +144,36 @@ SurveyUtil::check_first_last_question($_GET['survey_id']);
 
 // Action links
 $survey_actions = get_lang('Survey').': ';
-$survey_actions .= '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
-$survey_actions .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$_GET['survey_id'].'" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("DeleteSurvey").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+$survey_actions .= '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).' '.get_lang('EditSurvey').'</a>';
+$survey_actions .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$_GET['survey_id'].'" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("DeleteSurvey").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).' '.get_lang('DeleteSurvey').'</a>';
 //$survey_actions .= '<a href="create_survey_in_another_language.php?id_survey='.$_GET['survey_id'].'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
-$survey_actions .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('preview.gif', get_lang('Preview')).'</a>';
-$survey_actions .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('survey_publish.gif', get_lang('Publish')).'</a>';
-$survey_actions .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>';
-echo '<div style="float:right;">'.$survey_actions.'</div>';
+$survey_actions .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('preview.gif', get_lang('Preview')).' '.get_lang('Preview').'</a>';
+$survey_actions .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('survey_publish.gif', get_lang('Publish')).' '.get_lang('Publish').'</a>';
+$survey_actions .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).' '.get_lang('Reporting').'</a>';
+echo '<div class="actions">'.$survey_actions.'</div>';
 
 //print_r($survey_data);
 
 if ($survey_data['survey_type']==0)
 {	
-	echo '<div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/yesno.gif" /><br />'.get_lang('YesNo').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/mcua.gif" /><br />'.get_lang('MultipleChoice').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/mcma.gif" /><br />'.get_lang('MultipleResponse').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/open_answer.gif" /><br />'.get_lang('Open').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/dropdown.gif" /><br />'.get_lang('Dropdown').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/percentagequestion.gif" /><br />'.get_lang('Percentage').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/scorequestion.gif" /><br />'.get_lang('Score').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/commentquestion.gif" /><br />'.get_lang('Comment').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/page_end.gif" /><br />'.get_lang('Pagebreak').'</a></div>';
+	echo '<div class="actionsbig">';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/yesno.gif" />'.get_lang('YesNo').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/mcua.gif" />'.get_lang('MultipleChoice').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/mcma.gif" />'.get_lang('MultipleResponse').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/open_answer.gif" />'.get_lang('Open').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/dropdown.gif" />'.get_lang('Dropdown').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/percentagequestion.gif" />'.get_lang('Percentage').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/scorequestion.gif" />'.get_lang('Score').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/commentquestion.gif" />'.get_lang('Comment').'</a>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/page_end.gif" />'.get_lang('Pagebreak').'</a>';
 	echo '</div>';
-	echo '<div style="clear:both;"></div>';
-
 }
 else
 {	
 	echo '<div>';
-	//echo '<div style="float:left; text-align:center; margin:5px;"><a href="group.php?'.api_get_cidreq().'&amp;action=add&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/yesno.gif" /><br />'.get_lang('Add groups').'</a></div>';
-	echo '<div style="float:left; text-align:center; margin:5px;"><a href="question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/yesno.gif" /><br />'.get_lang('PersonalityQuestion').'</a></div>';
+	//echo '<a href="group.php?'.api_get_cidreq().'&amp;action=add&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/yesno.gif" /><br />'.get_lang('Add groups').'</a></div>';
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$_GET['survey_id'].'"><img src="../img/yesno.gif" />'.get_lang('PersonalityQuestion').'</a></div>';
 	echo '</div>';	 
-	echo '<div style="clear:both;"></div>';	
 }
 
 
@@ -250,7 +249,7 @@ while ($row = Database::fetch_array($result,'ASSOC'))
     {
     	echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
         echo '<td>'.(($row['survey_group_pri']==0)?$groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']]:$groups[$row['survey_group_pri']]).'</td>';
-    }
+    }
 	echo '</tr>'; 
 }
 echo '</table>';

+ 14 - 8
main/survey/survey_list.php

@@ -1,10 +1,10 @@
-<?php
+<?php // $Id: survey_list.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2006-2008	Patrick Cool
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,17 +16,18 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
 
+
+
 /**
 *	@package dokeos.survey
 * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
 *	@author Julio Montoya Armas <gugli100@gmail.com>, Dokeos: Personality Test modification and rewriting large parts of the code
-* 	@version $Id: survey_list.php 16486 2008-10-10 13:32:05Z elixir_inter $
+* 	@version $Id: survey_list.php 16739 2008-11-13 15:36:40Z pcool $
 *
 * 	@todo use quickforms for the forms
 */
@@ -75,6 +76,9 @@ else
 Display :: display_header($tool_name,'Survey');
 //api_display_tool_title($tool_name);
 
+// introduction section
+Display::display_introduction_section('survey', 'left');
+
 // Action handling: searching
 if (isset ($_GET['search']) AND $_GET['search'] == 'advanced')
 {
@@ -149,13 +153,15 @@ if ($_POST['action'])
 	}
 }
 echo $extended_rights_for_coachs;
+echo '<div class="actions">';
 if (!api_is_course_coach() || $extend_rights_for_coachs=='true')
 {
 	// Action links
-	echo '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.get_lang('CreateNewSurvey').'</a> | ';
+	echo Display::return_icon('surveyadd.gif') . '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.get_lang('CreateNewSurvey').'</a> ';
 }
-//echo '<a href="survey_all_courses.php">'.get_lang('CreateExistingSurvey').'</a> | ';
-echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.get_lang('Search').'</a>';
+//echo '<a href="survey_all_courses.php">'.get_lang('CreateExistingSurvey').'</a> ';
+echo Display::return_icon('search.gif') . '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.get_lang('Search').'</a>';
+echo '</div>';
 
 //Load main content
 if (api_is_course_coach() && $extend_rights_for_coachs=='false')

+ 17 - 21
main/tracking/courseLog.php

@@ -1,11 +1,10 @@
-<?php
+<?php // $Id: courseLog.php 16739 2008-11-13 15:36:40Z pcool $
 /*
- * ==============================================================================
+==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2004 Dokeos SPRL
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -17,10 +16,10 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 ==============================================================================
 *	@author Thomas Depraetere
@@ -166,30 +165,27 @@ function sort_users($a,$b){
 ==============================================================================
 */
 
-
+echo '<div class="actions">';
 if($_GET['studentlist'] == 'false')
 {
-	echo '<div style="float:left; clear:left">
-			<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
-			'.get_lang('CourseTracking').'
-		  </div>';
+	echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|&nbsp;'.get_lang('CourseTracking');
 }
 else
 {
-	echo '<div style="float:left; clear:left">
-			'.get_lang('StudentsTracking').' |
-			<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;
-		  </div>';
+	echo get_lang('StudentsTracking').' | <a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>';
 }
-echo '<div style="float:right; clear:right">';
 echo '&nbsp;<a href="#" onclick="window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>';
-if($_GET['studentlist'] == 'false'){	
-	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&studentlist=false"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a></div>';
+if($_GET['studentlist'] == 'false')
+{	
+	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&studentlist=false"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
 }
-else{
-	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a></div>';
+else
+{
+	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
 }
-echo '<div class="clear"></div>';
+echo '</div>';
+
+
 if($_GET['studentlist'] == 'false')
 {
 	echo'<br /><br />';

+ 15 - 19
main/user/subscribe_user.php

@@ -1,30 +1,25 @@
-<?php
+<?php // $Id: subscribe_user.php 16739 2008-11-13 15:36:40Z pcool $
 /*
-============================================================================== 
+==============================================================================
 	Dokeos - elearning and course management software
-	
-	Copyright (c) 2004-2005 Dokeos SPRL
+
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Elie harfouche (elie at harfdesign dot com)
-	Copyright (c) Roan Embrechts, Vrije Universiteit Brussel	
-	Copyright (c) Wolfgang Schneider
-	Copyright (c) Bart Mollet, Hogeschool Gent
-	
+
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
-	
+
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
-	
+
 	See the GNU General Public License for more details.
-	
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-============================================================================== 
+
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
+==============================================================================
 */
+
 /**
 ============================================================================== 
 *	This script allows teachers to subscribe existing users
@@ -352,11 +347,14 @@ function active_filter($active, $url_params, $row)
 
 
 // Build search-form
+echo '<div class="actions">';
 $form = new FormValidator('search_user', 'POST',api_get_self().'?type='.$_REQUEST['type'],'',null,false);
 $renderer = & $form->defaultRenderer();
 $renderer->setElementTemplate('<span>{element}</span> ');
 $form->add_textfield('keyword', '', false);
 $form->addElement('submit', 'submit', get_lang('SearchButton'));
+$form->display();
+echo '</div>';
 
 // Build table
 $table = new SortableTable('users', 'get_number_of_users', 'get_user_data', 2);
@@ -376,9 +374,7 @@ $table->set_header($col ++, get_lang('reg'), false);
 $table->set_column_filter($col -1, 'reg_filter');
 $table->set_form_actions(array ('subscribe' => get_lang('reg')), 'user');
 
-// Display form & table
-$form->display();
-echo '<br />';
+// Display table
 $table->display();
 
 if ( !empty($_POST['keyword']))

+ 24 - 29
main/user/user.php

@@ -1,12 +1,10 @@
-<?php
+<?php // $Id: user.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -18,10 +16,10 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 ==============================================================================
 *	This script displays a list of the users of the current course.
@@ -371,29 +369,35 @@ event_access_tool(TOOL_USER);
 --------------------------------------
 */
 $is_allowed_to_track = ($is_courseAdmin || $is_courseTutor) && $_configuration['tracking_enabled'];
-/*
 
 
-/*
------------------------------------------------------------
-	Introduction section
-	(editable by course admins)
------------------------------------------------------------
-*/
-Display::display_introduction_section(TOOL_USER, $is_allowed);
+
+// introduction section
+Display::display_introduction_section(TOOL_USER, 'left');
 
 if( api_is_allowed_to_edit())
 {
-	echo "<div align=\"right\">";
-	echo '<a href="user.php?'.api_get_cidreq().'&action=export&amp;type=csv">'.Display::return_icon('excel.gif', get_lang('ExportAsCSV')).'&nbsp;'.get_lang('ExportAsCSV').'</a> | ';
-	echo '<a href="subscribe_user.php?'.api_get_cidreq().'">'.Display::return_icon('add_user_big.gif',get_lang("SubscribeUserToCourse")).'&nbsp;'.get_lang("SubscribeUserToCourse").'</a> | ';
-	echo "<a href=\"subscribe_user.php?".api_get_cidreq()."&type=teacher\">".Display::return_icon('add_user_big.gif', get_lang("SubscribeUserToCourseAsTeacher"))."&nbsp;".get_lang("SubscribeUserToCourseAsTeacher")."</a> | ";
-	echo "<a href=\"../group/group.php?".api_get_cidreq()."\">".Display::return_icon('edit_group.gif', get_lang("GroupUserManagement"))."&nbsp;".get_lang("GroupUserManagement")."</a>";
+	echo "<div class=\"actions\">";
+	
+	// the action links
+	$actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&amp;type=csv">'.Display::return_icon('csv.gif', get_lang('ExportAsCSV')).'&nbsp;'.get_lang('ExportAsCSV').'</a> ';
+	$actions .= '<a href="subscribe_user.php?'.api_get_cidreq().'">'.Display::return_icon('add_user_big.gif',get_lang("SubscribeUserToCourse")).'&nbsp;'.get_lang("SubscribeUserToCourse").'</a> ';
+	$actions .= "<a href=\"subscribe_user.php?".api_get_cidreq()."&type=teacher\">".Display::return_icon('add_user_big.gif', get_lang("SubscribeUserToCourseAsTeacher"))."&nbsp;".get_lang("SubscribeUserToCourseAsTeacher")."</a> ";
+	$actions .= "<a href=\"../group/group.php?".api_get_cidreq()."\">".Display::return_icon('edit_group.gif', get_lang("GroupUserManagement"))."&nbsp;".get_lang("GroupUserManagement")."</a>";
 	if(api_get_setting('use_session_mode')=='false')
 	{
-		echo ' | <a href="class.php?'.api_get_cidreq().'">'.get_lang('Classes').'</a>';
+		$actions .= ' <a href="class.php?'.api_get_cidreq().'">'.get_lang('Classes').'</a>';
 	}
-	echo "</div>";
+		
+	// Build search-form
+	$form = new FormValidator('search_user', 'get','','',null,false);
+	$renderer = & $form->defaultRenderer();
+	$renderer->setElementTemplate('<span>{element}</span> ');
+	$form->add_textfield('keyword', '', false);
+	$form->addElement('submit', 'submit', get_lang('SearchButton'));
+	$form->addElement('static','additionalactions',null,$actions);
+	$form->display();
+	echo '</div>';
 }
 /*
 if (1) // platform setting api_get_setting('subscribe_user_by_coach')
@@ -668,15 +672,6 @@ $table->set_column_filter($header_nr-1,'modify_filter');
 	$table->set_form_actions(array ('unsubscribe' => get_lang('Unreg')), 'user');
 }
 
-// Build search-form
-
-$form = new FormValidator('search_user', 'get','','',null,false);
-$renderer = & $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
-$form->add_textfield('keyword', '', false);
-$form->addElement('submit', 'submit', get_lang('SearchButton'));
-$form->display();
-echo '<br />';
 $table->display();
 
 if ( !empty($_GET['keyword']) && !empty($_GET['submit']) )

+ 6 - 7
main/user/userInfo.php

@@ -1,12 +1,10 @@
-<?php // $Id: userInfo.php 16701 2008-11-09 17:04:19Z spyroux $
+<?php // $Id: userInfo.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003 hent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) various contributors
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -18,9 +16,10 @@
 
 	See the GNU General Public License for more details.
 
-	Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 ==============================================================================
 *	This script displays info about one specific user, specified through
@@ -248,7 +247,7 @@ if ($allowedToEditContent)
 ==============================================================================
 */
 // Back button for each display mode (Top)
-echo "<div align=\"right\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
+echo "<div class=\"actions\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
 if ($displayMode == "viewDefEdit")
 {
 	/*>>>>>>>>>>>> CATEGORIES DEFINITIONS : EDIT <<<<<<<<<<<<*/
@@ -535,7 +534,7 @@ elseif ($displayMode == "viewContentList") // default display
 }
 
 // Back button for each display mode (bottom)
-echo "<div align=\"right\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
+//echo "<div class=\"actions\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
 /*
 ==============================================================================
 		FOOTER

+ 7 - 5
main/work/work.lib.php

@@ -1,9 +1,10 @@
-<?php
+<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -15,10 +16,10 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
+
 /**
 *	@package dokeos.studentpublications
 * 	@author Thomas, Hugues, Christophe - original version
@@ -41,7 +42,7 @@ require_once('../inc/lib/fileDisplay.lib.php');
 
 function display_action_links($cur_dir_path, $always_show_tool_options, $always_show_upload_form)
 {
-	$display_output = "";
+	$display_output = '<div class="actions">';
 	if(strlen($cur_dir_path) > 0 && $cur_dir_path != '/')
 	{
 		$parent_dir = dirname($cur_dir_path);
@@ -70,6 +71,7 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_
 	{
 		echo $display_output;
 	}
+	echo '</div>';
 }
 
 /**
@@ -1195,4 +1197,4 @@ function count_dir($path_dir, $recurse)
 	$return_array[]=$count_dir;	
     return $return_array;
 }
-?>
+?>

+ 7 - 12
main/work/work.php

@@ -1,10 +1,10 @@
-<?php
-
+<?php // $Id: work.php 16739 2008-11-13 15:36:40Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2004-2008 Dokeos S.P.R.L
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,8 +16,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
+	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
 ==============================================================================
 */
 
@@ -27,7 +26,7 @@
 * 	@author Patrick Cool <patrick.cool@UGent.be>, 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 16694 2008-11-07 16:53:10Z dperales $
+*  	@version $Id: work.php 16739 2008-11-13 15:36:40Z pcool $
 *
 * 	@todo refactor more code into functions, use quickforms, coding standards, ...
 */
@@ -472,12 +471,8 @@ else
 	$uploadvisibledisabled = $row["show_score"];
 }
 
-/*
------------------------------------------------------------
-	Introduction section
------------------------------------------------------------
-*/
-Display :: display_introduction_section(TOOL_STUDENTPUBLICATION);
+// introduction section
+Display :: display_introduction_section(TOOL_STUDENTPUBLICATION,'left');
 
 /*
 -----------------------------------------------------------