More glossary formats checked and slighty modified...

This commit is contained in:
stronk7 2004-08-01 00:16:17 +00:00
parent bcf1fc0759
commit 2ff5bb1cc6
3 changed files with 48 additions and 40 deletions

View File

@ -4,31 +4,24 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode="
global $THEME, $USER;
$return = false;
if ($entry) {
glossary_print_entry_approval($cm, $entry, $mode);
glossary_print_entry_attachment($entry,"html","right");
glossary_print_entry_concept($entry);
echo ": ";
$colour = $THEME->cellheading2;
glossary_print_entry_definition($entry);
echo "\n<table border=0 width=95% cellspacing=0 valign=top cellpadding=0 align=center>\n";
echo "<tr>\n";
echo "<td width=\"100%\" valign=\"top\"\n";
glossary_print_entry_approval($cm, $entry, $mode);
glossary_print_entry_attachment($entry,"html","right");
echo "<b>";
glossary_print_entry_concept($entry);
echo ":</b> ";
glossary_print_entry_definition($entry);
$entry->alias = "";
$return = glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons,$ratings,false);
echo "</td>\n";
echo "</tr>\n";
echo "</table>\n";
$icons = '';
if ( $printicons ) {
$icons = glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode, $hook,"html");
}
echo '(';
if ( $icons ) {
echo $icons;
}
$return = glossary_print_entry_ratings($course, $entry, $ratings);
echo ')<br>';
}
return $return;
}
?>

View File

@ -19,9 +19,6 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
echo "</td>";
echo "<td valign=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
glossary_print_entry_approval($cm, $entry, $mode);
glossary_print_entry_attachment($entry,"html","right");
echo "<b>";
glossary_print_entry_concept($entry);
echo "</b><br />";
@ -29,17 +26,22 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
echo "<font size=\"2\">$strby " . fullname($user, isteacher($course->id)) . "</font>";
echo "&nbsp;&nbsp;<font size=1>(".get_string("lastedited").": ".
userdate($entry->timemodified).")</font>";
echo "</td>";
echo "\n<td bgcolor=\"$THEME->cellheading\" width=35 valign=top class=\"forumpostheader\">";
glossary_print_entry_approval($cm, $entry, $mode);
glossary_print_entry_attachment($entry,"html","right");
echo "</td>";
echo "</tr>";
echo "\n<tr>";
echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostside\">&nbsp;</td>";
echo "\n<td width=100% bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
echo "\n<td width=100% colspan=\"2\" bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
glossary_print_entry_definition($entry);
glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons);
glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons,$ratings);
echo ' ';
$return = glossary_print_entry_ratings($course, $entry, $ratings);
} else {
echo "<center>";
print_string("noentry", "glossary");

View File

@ -1,29 +1,42 @@
<?PHP // $Id$
function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry, $mode="",$hook="",$printicons=1,$ratings=NULL) {
global $THEME, $USER;
global $THEME, $CFG, $USER;
$colour = $THEME->cellheading2;
$return = false;
$user = get_record("user", "id", $entry->userid);
$strby = get_string("writtenby", "glossary");
echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
echo "\n<tr>";
echo "<td width=100% bgcolor=\"$THEME->cellheading\">";
glossary_print_entry_approval($cm, $entry, $mode);
$return = false;
if ($entry) {
glossary_print_entry_attachment($entry,"html","right");
echo "<td valign=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
echo "<b>";
glossary_print_entry_concept($entry);
echo "</b><br />";
echo "<font size=1>".get_string("lastedited").": ".userdate($entry->timemodified)."</font>";
echo "</b><br />";
echo "<font size=1>(".get_string("lastedited").": ".
userdate($entry->timemodified).")</font>";
echo "</td>";
echo "\n<td bgcolor=\"$THEME->cellheading\" width=35 valign=top class=\"forumpostheader\">";
glossary_print_entry_approval($cm, $entry, $mode);
glossary_print_entry_attachment($entry,"html","right");
echo "</td>";
echo "</tr>";
echo "\n<tr><td width=100% bgcolor=\"$THEME->cellcontent\">";
echo "\n<tr>";
echo "\n<td width=100% colspan=\"2\" bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
glossary_print_entry_definition($entry);
glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook,$printicons);
glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons,$ratings);
echo ' ';
$return = glossary_print_entry_ratings($course, $entry, $ratings);
} else {
echo "<center>";
print_string("noentry", "glossary");