[svn r11855] improve xhtml compliance

skala
Patrick Cool 19 years ago
parent b0bdd21ecc
commit 3a7660062e
  1. 14
      main/calendar/agenda.inc.php
  2. 22
      main/course_home/3column.php
  3. 10
      main/course_home/course_home.php
  4. 4
      main/exercice/exercise.class.php
  5. 4
      main/inc/lib/add_course.lib.inc.php
  6. 2
      main/inc/lib/display.lib.php

@ -1,4 +1,4 @@
<?php //$Id: agenda.inc.php 11607 2007-03-16 13:18:47Z elixir_julian $
<?php //$Id: agenda.inc.php 11855 2007-04-03 15:00:22Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
@ -1032,7 +1032,7 @@ function change_visibility($tool,$id)
*/
function display_courseadmin_links()
{
echo "<li><a href='".$_SERVER['PHP_SELF']."?action=add&amp;origin=".$_GET['origin']."'><img src=\"../img/view_more_stats.gif\" align=\"absmiddle\" border=\"0\" /> ".get_lang("AgendaAdd")."</a><br /></li>";
echo "<li><a href='".$_SERVER['PHP_SELF']."?action=add&amp;origin=".$_GET['origin']."'><img src=\"../img/view_more_stats.gif\" alt=\"".get_lang('MoreStats')."\" border=\"0\" /> ".get_lang("AgendaAdd")."</a><br /></li>";
if (empty ($_SESSION['toolgroup']))
{
echo "<li>".get_lang(UserGroupFilter)."<br/>";
@ -1054,11 +1054,11 @@ function display_student_links()
global $show;
if ($_SESSION['sort'] == 'DESC')
{
echo "<li><a href='".$_SERVER['PHP_SELF']."?sort=asc&amp;origin=".$_GET['origin']."'><img src=\"../img/calendar_up.gif\" border=\"0\" /> ".get_lang("AgendaSortChronologicallyUp")."</a></li>";
echo "<li><a href='".$_SERVER['PHP_SELF']."?sort=asc&amp;origin=".$_GET['origin']."'><img src=\"../img/calendar_up.gif\" border=\"0\" alt=\"".get_lang('AgendaSortChronologicallyUp')."\" /> ".get_lang("AgendaSortChronologicallyUp")."</a></li>";
}
else
{
echo "<li><a href='".$_SERVER['PHP_SELF']."?sort=desc&amp;origin=".$_GET['origin']."'><img src=\"../img/calendar_down.gif\" border=\"0\" /> ".get_lang("AgendaSortChronologicallyDown")."</a></li>";
echo "<li><a href='".$_SERVER['PHP_SELF']."?sort=desc&amp;origin=".$_GET['origin']."'><img src=\"../img/calendar_down.gif\" border=\"0\" alt=\"".get_lang('AgendaSortChronologicallyDown')."\" /> ".get_lang("AgendaSortChronologicallyDown")."</a></li>";
}
// showing the link to show all items or only those of the current month
@ -1495,20 +1495,20 @@ 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\" align=\"absbottom\" border=\"0\" />";
echo "<img src=\"../img/agenda.gif\" border=\"0\" />";
if ($myrow['to_group_id']!=='0')
{
echo "<img src=\"../img/group.gif\" border=\"0\" />";
}
echo " ".$myrow['title']."\n";
echo "\t\t</td>\n";
echo "\t\t</th>\n";
// the message has been sent to
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;
echo "</td>\n\t</tr>\n";
echo "</th>\n\t</tr>\n";
/*--------------------------------------------------
display: the title

@ -92,11 +92,13 @@ if (is_allowed_to_edit())
$toolsRow = mysql_fetch_array($result);
$tool_name = htmlspecialchars($toolsRow['name'] != "" ? $toolsRow['name'] : $toolsRow['link']);
if($toolsRow['img'] != "external.gif")
{
$toolsRow['link']=$clarolineRepositoryWeb.$toolsRow['link'];
}
$toolsRow['image']=$clarolineRepositoryWeb."img/".$toolsRow['image'];
echo "<br><br><br>\n";
echo "<table class=message width=\"70%\" align=\"center\">\n",
echo "<table class=\"message\" width=\"70%\" align=\"center\">\n",
"<tr><td width=\"7%\" align=\"center\">\n",
"<a href=\"".$toolsRow['link']."\"><img src=\"",$toolsRow['image'],"\" alt=\"\" align=\"absmiddle\" border=\"0\">","</a></td>\n",
"<td width=\"28%\" height=\"45\"><small>\n",
@ -108,7 +110,7 @@ if (is_allowed_to_edit())
"<br>&nbsp;&nbsp;&nbsp;\n",
"<a href=\"".$_SERVER['PHP_SELF']."\">",get_lang('No'),"</a>\n",
"&nbsp;|&nbsp;\n",
"<a href=\"".$_SERVER['PHP_SELF']."?destroy=yes&id=$id\">",get_lang('Yes'),"</a>\n",
"<a href=\"".$_SERVER['PHP_SELF']."?destroy=yes&amp;id=$id\">",get_lang('Yes'),"</a>\n",
"</font></td></tr>\n",
"</table>\n";
echo "<br><br><br>\n";
@ -239,7 +241,7 @@ if ($is_platformAdmin and is_allowed_to_edit())
"<br>&nbsp;&nbsp;&nbsp;\n",
"<a href=\"".$_SERVER['PHP_SELF']."\">",get_lang('No'),"</a>\n",
"&nbsp;|&nbsp;\n",
"<a href=\"".$_SERVER['PHP_SELF']."?delete=yes&id=$id\">",get_lang('Yes'),"</a>\n",
"<a href=\"".$_SERVER['PHP_SELF']."?delete=yes&amp;id=$id\">",get_lang('Yes'),"</a>\n",
"</font>\n",
"<br><br><br>\n",
"</td>\n",
@ -260,15 +262,17 @@ if ($is_platformAdmin and is_allowed_to_edit())
}
echo "<table class=item valign=\"middle\" align=\"center\" border=\"0\" width=\"95%\">\n";
echo "<table class=\"item\" align=\"center\" border=\"0\" width=\"95%\">\n";
/*==========================
TOOLS FOR EVERYBODY
==========================*/
echo "<tr>\n<td colspan=\"6\">&nbsp;</td>\n</tr>\n";
echo "<tr>\n<td colspan=\"6\">";
showtools2('Basic');
showtools2('External');
echo "</td>\n</tr>\n";
/*==========================
@ -277,12 +281,13 @@ showtools2('External');
if (is_allowed_to_edit())
{
echo "<tr><td colspan=\"6\"><hr noshade size=\"1\"></td></tr>\n",
echo "<tr><td colspan=\"6\"><hr noshade size=\"1\" /></td></tr>\n",
"<tr>\n","<td colspan=\"6\">\n",
"<font color=\"#F66105\">\n",get_lang('CourseAdminOnly'),"</font>\n",
"</td>\n","</tr>\n";
echo "<tr>\n<td colspan=\"6\">";
showtools2('courseAdmin');
echo "</td>\n</tr>\n";
}
@ -293,13 +298,14 @@ if (is_allowed_to_edit())
if ($is_platformAdmin and is_allowed_to_edit())
{
echo "<tr>","<td colspan=\"6\">",
"<hr noshade size=\"1\">",
"<hr noshade size=\"1\" />",
"</td>","</tr>\n",
"<tr>\n","<td colspan=\"6\">\n",
"<font color=\"#F66105\" >",get_lang('PlatformAdminOnly'),"</font>\n",
"</td>\n","</tr>\n";
echo "<tr>\n<td colspan=\"6\">";
showtools2('claroAdmin');
echo "</td>\n</tr>\n";
}
echo "</table>\n";

@ -1,4 +1,4 @@
<?php // $Id: course_home.php 11849 2007-04-03 12:52:25Z elixir_inter $
<?php // $Id: course_home.php 11855 2007-04-03 15:00:22Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
@ -58,7 +58,7 @@
*/
$htmlHeadXtra[] = "
<style>
<style type=\"text/css\" media=\"screen, projection\">
.row{
width:100%;
}
@ -209,11 +209,17 @@ Display::display_introduction_section(TOOL_COURSE_HOMEPAGE);
-----------------------------------------------------------
*/
if(get_setting('homepage_view') == "activity")
{
include('activity.php');
}
elseif(get_setting('homepage_view') == "2column")
{
include('2column.php');
}
elseif(get_setting('homepage_view') == "3column")
{
include('3column.php');
}
/*
==============================================================================

@ -22,7 +22,7 @@
* Exercise class: This class allows to instantiate an object of type Exercise
* @package dokeos.exercise
* @author Olivier Brouckaert
* @version $Id: exercise.class.php 11674 2007-03-23 14:26:21Z elixir_julian $
* @version $Id: exercise.class.php 11855 2007-04-03 15:00:22Z pcool $
*/
@ -630,7 +630,7 @@ class Exercise
$defaults['exerciseDescription'] = $this -> selectDescription();
}
else{
$defaults['exerciseDescription'] = '<table width="100%" border="0" callpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_CODE_PATH).'/default_course_document/images/mr_dokeos/thinking.jpg"></td><td valign="top" align="left"></td></tr></table>';
$defaults['exerciseDescription'] = '<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_CODE_PATH).'/default_course_document/images/mr_dokeos/thinking.jpg"></td><td valign="top" align="left"></td></tr></table>';
}
$defaults['exerciseType'] = '1';

@ -1763,7 +1763,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
Introduction text
-----------------------------------------------------------
*/
$intro_text='<table width="100%" border="0" callpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_IMG_PATH).'mr_dokeos.png" alt="mr. Dokeos" title="mr. Dokeos" /></td><td valign="top" align="left">'.lang2db(get_lang('IntroductionText')).'</td></tr></table>';
$intro_text='<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_IMG_PATH).'mr_dokeos.png" alt="mr. Dokeos" title="mr. Dokeos" /></td><td valign="top" align="left">'.lang2db(get_lang('IntroductionText')).'</td></tr></table>';
api_sql_query("INSERT INTO `".$TABLEINTROS . "` VALUES ('" . TOOL_COURSE_HOMEPAGE . "','".$intro_text. "')");
api_sql_query("INSERT INTO `".$TABLEINTROS . "` VALUES ('" . TOOL_STUDENTPUBLICATION . "','".lang2db(get_lang('IntroductionTwo')) . "')");
@ -1776,7 +1776,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
api_sql_query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '2', '1', '".lang2db(get_lang('AdmitError')) . "', '0', '".lang2db(get_lang('NoSeduction')) . "', '-5', '2','','')");
api_sql_query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '3', '1', '".lang2db(get_lang('Force')) . "', '1', '".lang2db(get_lang('Indeed')) . "', '5', '3','','')");
api_sql_query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '4', '1', '".lang2db(get_lang('Contradiction')) . "', '1', '".lang2db(get_lang('NotFalse')) . "', '5', '4','','')");
$html=addslashes('<table width="100%" border="0" callpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_CODE_PATH).'/default_course_document/images/mr_dokeos/thinking.jpg"></td><td valign="top" align="left">'.lang2db(get_lang('Antique')).'</td></tr></table>');
$html=addslashes('<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_CODE_PATH).'/default_course_document/images/mr_dokeos/thinking.jpg"></td><td valign="top" align="left">'.lang2db(get_lang('Antique')).'</td></tr></table>');
api_sql_query('INSERT INTO `'.$TABLEQUIZ . '` VALUES ( "1", "'.lang2db(get_lang('ExerciceEx')) . '", "'.$html.'", "", "1", "0", "1")');
api_sql_query("INSERT INTO `".$TABLEQUIZQUESTIONLIST . "` VALUES ( '1', '".lang2db(get_lang('SocraticIrony')) . "', '".lang2db(get_lang('ManyAnswers')) . "', '10', '1', '2','')");
api_sql_query("INSERT INTO `".$TABLEQUIZQUESTION . "` VALUES ( '1', '1')");

@ -440,7 +440,7 @@ class Display {
}
//return encrypted mailto hyperlink
return '<a href="'.$hmail.'"'.$style_class.' name="clickable_email_link">'.$hclickable_text.'</a>';
return '<a href="'.$hmail.'"'.$style_class.'>'.$hclickable_text.'</a>';
}
/**

Loading…
Cancel
Save