Minor tweaking and cleaning up

This commit is contained in:
martin 2002-08-12 13:45:41 +00:00
parent 3db1919baf
commit 909f539dad
8 changed files with 32 additions and 8 deletions

View File

@ -180,9 +180,11 @@ $string[missingstudent] = "Must choose something";
$string[missingsummary] = "Missing summary";
$string[missingteacher] = "Must choose something";
$string[missingusername] = "Missing username";
$string[mostrecently] = "most recently";
$string[movedown] = "Move down";
$string[moveup] = "Move up";
$string[mustconfirm] = "You need to confirm your login";
$string[name] = "Name";
$string[namesocial] = "section";
$string[nametopics] = "topic";
$string[nameweeks] = "week";
@ -228,6 +230,7 @@ $string[numdays] = "\$a days";
$string[numweeks] = "\$a weeks";
$string[numyears] = "\$a years";
$string[numwords] = "\$a words";
$string[numviews] = "\$a views";
$string[ok] = "OK";
$string[opentoguests] = "Open to guests?";
$string[optional] = "optional";

View File

@ -6,5 +6,22 @@ $string[modulenameplural] = "Readings";
#------------------------------------------------------------
$string[addreading] = "Add reading";
$string[editingareading] = "Editing a reading";
$string[example] = "Example";
$string[examplejournal] = "Tobin, K. & Tippins, D (1993) Constructivism as a Referent for Teaching and Learning. In: K. Tobin (Ed) The Practice of Constructivism in Science Education, pp 3-21, Lawrence-Erlbaum, Hillsdale, NJ.";
$string[exampleurl] = "http://www.example.com/somedirectory/somefile.html";
$string[filename] = "File name";
$string[fulltext] = "Full text";
$string[neverread] = "Never read";
$string[note] = "Note";
$string[notefile] = "To upload more files into the course (so they appear in this list) use the
<A HREF=\$a >File Manager</A>.";
$string[notypechosen] = "You need to choose a type. Use your back button to go back and retry.";
$string[readingtype] = "Type of resource";
$string[readingtype1] = "Journal Article";
$string[readingtype2] = "Web Page";
$string[readingtype3] = "Uploaded File";
$string[readingtype4] = "Plain text";
$string[readingtype5] = "Web Link";
?>

View File

@ -176,8 +176,8 @@ function print_table($table) {
if ($table->head) {
echo "<TR>";
foreach ($table->head as $heading) {
echo "<TH>$heading</TH>";
foreach ($table->head as $key => $heading) {
echo "<TH ".$align[$key].">$heading</TH>";
}
echo "</TR>\n";
}

View File

@ -260,7 +260,7 @@ function cleantext($text) {
}
function text_to_html($text, $smiley=true) {
function text_to_html($text, $smiley=true, $para=true) {
// Given plain text, makes it into HTML as nicely as possible.
global $CFG;
@ -291,7 +291,11 @@ function text_to_html($text, $smiley=true) {
$text = ereg_replace("B-)", "<IMG ALT=\"{cool}\" SRC=\"$CFG->wwwroot/pix/s/cool.gif\">", $text);
}
return "<P>".$text."</P>";
if ($para) {
return "<P>".$text."</P>";
} else {
return $text;
}
}
function highlight($needle, $haystack) {

View File

@ -27,7 +27,7 @@
<FONT FACE="Trebuchet MS, Verdana, Arial, Helvetica, sans-serif" SIZE=2><B>
<? print_navigation("$navigation"); ?>
</B></FONT></TD></TR></TABLE>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>
<? } else if ($heading) { ?>
<HR SIZE=1 NOSHADE>
<? } ?>

View File

@ -27,7 +27,7 @@
<FONT FACE="Trebuchet MS, Verdana, Arial, Helvetica, sans-serif" SIZE=2><B>
<? print_navigation("$navigation"); ?>
</B></FONT></TD></TR></TABLE>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>
<? } else if ($heading) { ?>
<HR SIZE=1 NOSHADE>
<? } ?>

View File

@ -27,7 +27,7 @@
<FONT FACE="Trebuchet MS, Verdana, Arial, Helvetica, sans-serif" SIZE=2><B>
<? print_navigation("$navigation"); ?>
</B></FONT></TD></TR></TABLE>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>
<? } else if ($heading) { ?>
<HR SIZE=1 NOSHADE>
<? } ?>

View File

@ -27,7 +27,7 @@
<FONT FACE="Trebuchet MS, Verdana, Arial, Helvetica, sans-serif" SIZE=2><B>
<? print_navigation("$navigation"); ?>
</B></FONT></TD></TR></TABLE>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1>
<IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>
<? } else if ($heading) { ?>
<HR SIZE=1 NOSHADE>
<? } ?>