- Adding View comments link to the new display format

diff --git a/mod/glossary/formats/6.php b/mod/glossary/formats/6.php
index 4d4f7245bb569ade268acb858190efc705886bdb..315c4707e1ca254fcd1299307e1b98d1816dc0f8 100644 (file)
--- a/mod/glossary/formats/6.php
+++ b/mod/glossary/formats/6.php
@@ -13,7 +13,12 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry,$mode=""
         echo "<b><a href=\"view.php?id=$cm->id&mode=entry&hook=$entry->id&displayformat=2\">";
 
         glossary_print_entry_concept($entry);
-        echo '</a></b><br />';
+        echo '</a></b> ';
+        if ( $return = glossary_print_entry_commentslink($course, $cm, $glossary, $entry,$mode,$hook, 'html') ) {
+            echo "<font size=-1>($return)</font>";
+        }
+
+        echo '<br />';
     } else {
         echo "<center>";
         print_string("noentry", "glossary");

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 7a7a2b479e8332088e38f8975c11919a588c0d58..a594e6ec9616f2442496aad85f9c11bb0d5e3924 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -406,9 +406,10 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry,$mode="",$ho
     if (!$entry->approved) {
         $return .= get_string("entryishidden","glossary");
     }
-    $return .= "</font> ";
 
-    $return .= glossary_print_entry_commentslink($course, $cm, $glossary, $entry,$mode,$hook);
+    $return .= glossary_print_entry_commentslink($course, $cm, $glossary, $entry,$mode,$hook,'html');
+
+    $return .= "</font> ";
 
     
     if ( $glossary->allowcomments and !isguest()) {

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index dcb2276d11bba3c4ad162e53d54c94ccee2d2bf8..62626c2166b795d6fc49bf317baf2e78f8e89920 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -454,7 +454,7 @@
             }
             $paging  = "<font size=1><center>" . get_string ("jumpto") . " $paging</center></font>";
         }
-        echo "$paging";
+        echo $paging;
 
         if ($glossary->displayformat == GLOSSARY_FORMAT_CONTINUOUS) {
             $printpivot = 0;
@@ -573,7 +573,6 @@
                 $entriesshown++;
             }
         }
-        echo '<p>';
         if ( $tableisopen ) {
             if ($glossary->displayformat == GLOSSARY_FORMAT_CONTINUOUS OR 
                 $glossary->displayformat == GLOSSARY_FORMAT_SIMPLE ) {
@@ -585,7 +584,10 @@
     if ( !$entriesshown ) {
         print_simple_box('<center>' . get_string("noentries","glossary") . '</center>',"center","95%");
     }
-
+    if ( $paging ) {
+        echo "<hr />$paging";
+    }
+    echo '<p>';
     echo '</center>';
     glossary_print_tabbed_table_end();
     if ( $debug ) {