From: martin <martin>
Date: Mon, 12 Aug 2002 13:45:41 +0000 (+0000)
Subject: Minor tweaking and cleaning up
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=909f539dadbabc11cdb6c2cfa019448683a9c5e0;p=moodle.git

Minor tweaking and cleaning up
---

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 1e39cada22..2ec38da736 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -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";
diff --git a/lang/en/reading.php b/lang/en/reading.php
index 36a7eb770b..32ddc500c1 100644
--- a/lang/en/reading.php
+++ b/lang/en/reading.php
@@ -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";
 
 ?>
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d43e610c21..893619f30c 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -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";
     }
diff --git a/lib/weblib.php b/lib/weblib.php
index b8674f7a1b..8db61ed314 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -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) {
diff --git a/theme/standard/header.html b/theme/standard/header.html
index b2f8df6b76..6c76df3091 100644
--- a/theme/standard/header.html
+++ b/theme/standard/header.html
@@ -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>
 <?  } ?>
diff --git a/theme/standardblue/header.html b/theme/standardblue/header.html
index 8a685c4120..58a7c57858 100644
--- a/theme/standardblue/header.html
+++ b/theme/standardblue/header.html
@@ -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>
 <?  } ?>
diff --git a/theme/standardgreen/header.html b/theme/standardgreen/header.html
index 8a685c4120..58a7c57858 100644
--- a/theme/standardgreen/header.html
+++ b/theme/standardgreen/header.html
@@ -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>
 <?  } ?>
diff --git a/theme/standardred/header.html b/theme/standardred/header.html
index 8a685c4120..58a7c57858 100644
--- a/theme/standardred/header.html
+++ b/theme/standardred/header.html
@@ -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>
 <?  } ?>