Permalink
Browse files

- Adding View comments link to the new display format

  • Loading branch information...
1 parent a0d1e2b commit 66d7ae88a10ec93d6eaf8b15d0375d2c865e26fd willcast committed Nov 18, 2003
Showing with 14 additions and 6 deletions.
  1. +6 −1 mod/glossary/formats/6.php
  2. +3 −2 mod/glossary/lib.php
  3. +5 −3 mod/glossary/view.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");
View
@@ -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()) {
View
@@ -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 ) {

0 comments on commit 66d7ae8

Please sign in to comment.