More cleanups for teacher view in particular

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index 940e262dabca233ed3d18700cdc2d3e60302c794..d126a26f6d9dcb8b114b39a61a0245ac5959d729 100644 (file)
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -39,11 +39,21 @@ function journal_user_complete($course, $user, $mod, $journal) {
 }
 
 function journal_user_complete_index($course, $user, $journal, $journalopen, $heading) {
+/// Prints a journal, entry and feedback ... used on the journal index page.
+
+    if (isteacher($course->id)) {
+        $entrycount = count_records("journal_entries", "journal", $journal->id);
+        $entryinfo  = "&nbsp;(<a href=\"report.php?id=$journal->coursemodule\">".get_string("viewallentries","journal", $entrycount)."</a>)";
+    } else {
+        $entryinfo = "";
+    }
+
+    $journal->name = "<a href=\"view.php?id=$journal->coursemodule\">$journal->name</a>";
 
     if ($heading) {
-        echo "<h3>$heading - $journal->name</h3>";
+        echo "<h3>$heading - $journal->name$entryinfo</h3>";
     } else {
-        echo "<h3>$journal->name</h3>";
+        echo "<h3>$journal->name$entryinfo</h3>";
     }
 
     print_simple_box_start("left", "90%");

diff --git a/mod/journal/view.php b/mod/journal/view.php
index a2e7325a2cd7e24a32fdd1a8af765455a13e0fdf..b7628b916676d5cde93b3277507fea01a202dec9 100644 (file)
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -37,21 +37,17 @@
                   update_module_button($cm->id, $course->id, $strjournal), navmenu($course, $cm));
 
     if (isteacher($course->id)) {
-        if ($allentries = get_records("journal_entries", "journal", $journal->id)) {
-            $entrycount = count($allentries);
-        } else {
-            $entrycount = 0;
-        }
-        echo "<P align=right><A HREF=\"report.php?id=$cm->id\">".get_string("viewallentries","journal", $entrycount)."</A></P>";
+        $entrycount = count_records("journal_entries", "journal", $journal->id);
+        echo "<p align=right><a href=\"report.php?id=$cm->id\">".get_string("viewallentries","journal", $entrycount)."</a></p>";
     } else if (!$cm->visible) {
         notice(get_string("activityiscurrentlyhidden"));
     }
 
-    echo "<CENTER>\n";
+    echo "<center>\n";
     
     print_simple_box( text_to_html($journal->intro) , "center");
 
-    echo "<BR>";
+    echo "<br \>";
 
     $timenow = time();