From 141bbe516303d1d3e35e8419eb7caf9167da6dac Mon Sep 17 00:00:00 2001
From: Julian Prud'homme <j.prudhomme@elixir-interactive.com>
Date: Thu, 8 Feb 2007 16:56:01 +0100
Subject: [PATCH] [svn r11086] update to integrate new CSS

---
 main/blog/blog_admin.php            |  8 +++----
 main/calendar/agenda.inc.php        | 26 ++++++++++++---------
 main/exercice/hotspot_admin.inc.php | 12 +++++-----
 main/exercice/matching.class.php    | 36 ++++++++++++++---------------
 4 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/main/blog/blog_admin.php b/main/blog/blog_admin.php
index bd1899945d..da6dc5e586 100644
--- a/main/blog/blog_admin.php
+++ b/main/blog/blog_admin.php
@@ -94,10 +94,10 @@ api_display_tool_title($nameTools);
 	echo "<a href='".$_SERVER['PHP_SELF']."?action=add'>",
 	"<img src='../img/blog.gif' border=\"0\" align=\"absmiddle\" alt='scormbuilder'>&nbsp;&nbsp;".get_lang('AddBlog')."</a>";
 	echo "<table width=\"100%\" border=\"0\" cellspacing=\"2\" class='data_table'>";
-	echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-				 "<td width='290'><b>",get_lang('Title'),"</b></td>\n",
-				 "<td><b>",get_lang('Subtitle'),"</b></td>\n",
-				 "<td width='200'><b>",get_lang('Modify'),"</b></td>\n",
+	echo	"<tr>",
+				 "<th>",get_lang('Title'),"</th>\n",
+				 "<th>",get_lang('Subtitle'),"</th>\n",
+				 "<th>",get_lang('Modify'),"</th>\n",
 			"</tr>\n";
 	Blog::display_blog_list();
 	echo "</table>";
diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 079f3e2c03..8265dea6f8 100644
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 11073 2007-02-07 15:48:24Z elixir_julian $
+<?php //$Id: agenda.inc.php 11086 2007-02-08 15:56:01Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -1431,13 +1431,13 @@ function display_agenda_items()
 	/*--------------------------------------------------
 			DISPLAY: THE ITEMS
 	  --------------------------------------------------*/
-	echo "<table id=\"agenda_list\">\n";
 
 	$month_bar="";
 	$event_list="";
+	$counter=0;
 	while ($myrow=mysql_fetch_array($result))
 {
-
+	echo "<table class=\"data_table\">\n";
 /*--------------------------------------------------
 		display: the month bar
   --------------------------------------------------*/
@@ -1482,7 +1482,7 @@ function display_agenda_items()
 
 
 
-	echo "\t\t<td class=\"".$style."\">\n";
+	echo "\t\t<th>\n";
 
 	// adding an internal anchor
 	echo "\t\t\t<a name=\"".(int)date("d",strtotime($myrow["start_date"]))."\"></a>";
@@ -1490,7 +1490,7 @@ function display_agenda_items()
 	// the icons. If the message is sent to one or more specific users/groups
 	// we add the groups icon
 	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-	echo "<img src=\"../img/agenda.gif\" border=\"0\" />";
+	echo "<img src=\"../img/agenda.gif\" align=\"absbottom\" border=\"0\" />";
 	if ($myrow['to_group_id']!=='0')
 		{
 		echo "<img src=\"../img/group.gif\" border=\"0\" />";
@@ -1499,7 +1499,7 @@ function display_agenda_items()
 	echo "\t\t</td>\n";
 
 	// the message has been sent to
-	echo "\t\t<td class=\"".$stylenotbold."\">".get_lang("SentTo").": ";
+	echo "\t\t<th>".get_lang("SentTo").": ";
 	$sent_to=sent_to(TOOL_CALENDAR_EVENT, $myrow["ref"]);
 	$sent_to_form=sent_to_form($sent_to);
 	echo $sent_to_form;
@@ -1508,7 +1508,7 @@ function display_agenda_items()
 /*--------------------------------------------------
  			display: the title
   --------------------------------------------------*/
-	echo "\t<tr class=\"".$stylenotbold."\">\n";
+	echo "<tr class='row_odd'>";
 	echo "\t\t<td>".get_lang("StartTimeWindow").": ";
 	echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["start_date"])))."&nbsp;&nbsp;&nbsp;";
 	echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["start_date"])))."";
@@ -1529,7 +1529,8 @@ function display_agenda_items()
 	$content = $myrow['content'];
 	$content = make_clickable($content);
 	$content = text_filter($content);
-	echo "\t<tr>\n\t\t<td class=\"".$text_style."\" colspan='2'>";
+	echo "<tr class='row_even'>";
+	echo "<td colspan='2'>";
 
 	echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;"><img src="../img/print.png" border="0" title="'.htmlentities(get_lang('Print')).'" /></a>&nbsp;';
 
@@ -1557,7 +1558,7 @@ function display_agenda_items()
   
 	$event_list.=$myrow['id'].',';
   
-	echo "<tr><td>";
+	echo "<tr class='row_odd'><td>";
 			if (is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_agenda'))
 	{
 		// edit
@@ -1576,16 +1577,19 @@ function display_agenda_items()
 			$image_visibility="invisible";
 		}
 		echo 	"<a href=\"".$_SERVER['PHP_SELF']."?origin=".$_GET['origin']."&amp;action=showhide&amp;id=".$myrow['id']."\">",
-				"<img src=\"../img/".$image_visibility.".gif\" border=\"0\" align=\"absmiddle\" alt=\"".get_lang("Visible")."\" /></a><br /><br />";
+				"<img src=\"../img/".$image_visibility.".gif\" border=\"0\" align=\"absmiddle\" alt=\"".get_lang("Visible")."\" /></a>";
 	}
 	echo "</td>";
+	
+	$counter++;
 
 /*--------------------------------------------------
 	display: jump-to-top icon
   --------------------------------------------------*/
 	echo "<td><a href=\"#top\"><img src=\"../img/top.gif\" border=\"0\" alt=\"to top\" align=\"right\" /></a></td></tr>";
+	echo "</table><br><br>";
 } // end while ($myrow=mysql_fetch_array($result))
-echo "</table>";
+
 
 if(!empty($event_list))
 {
diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php
index 3018c2dd5e..06509a0e77 100644
--- a/main/exercice/hotspot_admin.inc.php
+++ b/main/exercice/hotspot_admin.inc.php
@@ -325,17 +325,17 @@ if($modifyAnswers)
 			<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?hotspotadmin=<?php echo $modifyAnswers; ?>" name="frm_exercise">
 				<input type="hidden" name="formSent" value="1" />
 				<input type="hidden" name="nbrAnswers" value="<?php echo $nbrAnswers; ?>" />
-				<table border="0" cellpadding="3" cellspacing="0" style="border: 1px solid #4271b5; border-left:none; width: 100%; ">
+				<table class="data_table">
 					<!--
 					<tr>
 					  <td colspan="5"><?php echo get_lang('AnswerHotspot'); ?> :</td>
 					</tr>
 					-->
-					<tr style="background-color: #E6E6E6; height: 37px">
-					  <td style="width: 20px; border-bottom: 1px solid #4271b5">&nbsp;<?php /* echo get_lang('Hotspot'); */ ?></td>
-					  <td style="width: 100px; border-bottom: 1px solid #4271b5"><?php echo get_lang('Description'); ?>*</td>
-					  <td style="border-bottom: 1px solid #4271b5"><?php echo get_lang('Comment'); ?></td>
-					  <td style="width: 60px; border-bottom: 1px solid #4271b5"><?php echo get_lang('QuestionWeighting'); ?>*</td>
+					<tr>
+					  <th >&nbsp;<?php /* echo get_lang('Hotspot'); */ ?></th>
+					  <th ><?php echo get_lang('Description'); ?>*</th>
+					  <th ><?php echo get_lang('Comment'); ?></th>
+					  <th ><?php echo get_lang('QuestionWeighting'); ?>*</th>
 					</tr>
 
 					<?php
diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php
index 4e7fd915cc..304200d1af 100644
--- a/main/exercice/matching.class.php
+++ b/main/exercice/matching.class.php
@@ -132,21 +132,21 @@ class Matching extends Question {
 			</div>
 			<div class="formw">
 				'.get_lang('MakeCorrespond').'
-				<table cellpadding="0" cellspacing="5">
-					<tr bgcolor="#e6e6e6">
-						<td>
+				<table class="data_table">
+					<tr style="text-align: center">
+						<th>
 							'.get_lang('Number').'
-						</td>
-						<td>
+						</th>
+						<th>
 							'.get_lang('Answer').'
-						</td>
-						<td>
+						</th>
+						<th>
 							'.get_lang('MatchesTo').'
-						</td>
-						<td>
+						</th>
+						<th>
 							'.get_lang('Weighting').'
-						</td>
-						<td width="0"></td>
+						</th>
+						
 					</tr>';
 		$form -> addElement ('html', $html);
 
@@ -185,15 +185,15 @@ class Matching extends Question {
 			<div class="label">
 			</div>
 			<div class="formw"><br /><br />
-				<table cellpadding="0" cellspacing="5">
-					<tr bgcolor="#e6e6e6">
-						<td>
+				<table class="data_table">
+					<tr style="text-align: center;">
+						<th>
 							'.get_lang('Number').'						
-						</td>
-						<td>
+						</th>
+						<th>
 							'.get_lang('Answer').'
-						</td>
-						<td width="0"></td>
+						</th>
+						
 					</tr>';
 		$form -> addElement ('html', $html);