From 50a8374ef84f66548881e20538be732c447ce86a Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Thu, 10 May 2012 15:09:05 +0800
Subject: [PATCH] MDL-30649 Glossary : Fixed floating element breaking HTML

---
 mod/glossary/lib.php    | 20 +++++++++++++-------
 mod/glossary/styles.css |  3 +++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 61eb61c2c58..993c8ea1701 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -366,7 +366,7 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
 
     $ufields = user_picture::fields('u', array('lastaccess', 'firstname', 'lastname', 'email', 'picture', 'imagealt'));
     $entries = $DB->get_records_sql("
-              SELECT ge.*, $ufields
+              SELECT ge.id AS entryid, ge.*, $ufields
                 FROM {glossary_entries} ge
                 JOIN {user} u ON u.id = ge.userid
                      $groupjoin
@@ -401,10 +401,11 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
         $tmpactivity                       = new stdClass();
         $tmpactivity->type                 = 'glossary';
         $tmpactivity->cmid                 = $cm->id;
+        $tmpactivity->glossaryid           = $entry->glossaryid;
         $tmpactivity->name                 = format_string($cm->name, true);
         $tmpactivity->sectionnum           = $cm->sectionnum;
         $tmpactivity->timestamp            = $entry->timemodified;
-        $tmpactivity->content->entryid     = $entry->id;
+        $tmpactivity->content->entryid     = $entry->entryid;
         $tmpactivity->content->concept     = $entry->concept;
         $tmpactivity->content->definition  = $entry->definition;
         $tmpactivity->user->id             = $entry->userid;
@@ -434,15 +435,18 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
 function glossary_print_recent_mod_activity($activity, $courseid, $detail, $modnames, $viewfullnames) {
     global $OUTPUT;
 
-    echo html_writer::start_tag('div', array('class'=>'glossary-activity', 'style' => 'padding: 7px 0px; clear: both;'));
+    echo html_writer::start_tag('div', array('class'=>'glossary-activity clearfix'));
     if (!empty($activity->user)) {
         echo html_writer::tag('div', $OUTPUT->user_picture($activity->user, array('courseid'=>$courseid)),
-        array('style' => 'float: left; padding: 7px;'));
+            array('class' => 'glossary-activity-picture'));
     }
 
-    echo html_writer::start_tag('div', array('class'=>'glossary-entry'));
-    echo get_string('entry', 'glossary') .': '. strip_tags($activity->content->concept);
-    echo strip_tags($activity->content->definition);
+    echo html_writer::start_tag('div', array('class'=>'glossary-activity-content'));
+    echo html_writer::start_tag('div', array('class'=>'glossary-activity-entry'));
+
+    $urlparams = array('g' => $activity->glossaryid, 'mode' => 'entry', 'hook' => $activity->content->entryid);
+    echo html_writer::tag('a', strip_tags($activity->content->concept),
+        array('href' => new moodle_url('/mod/glossary/view.php', $urlparams)));
     echo html_writer::end_tag('div');
 
     $url = new moodle_url('/user/view.php', array('course'=>$courseid, 'id'=>$activity->user->id));
@@ -453,6 +457,8 @@ function glossary_print_recent_mod_activity($activity, $courseid, $detail, $modn
     echo $link .' - '. userdate($activity->timestamp);
     echo html_writer::end_tag('div');
 
+    echo html_writer::end_tag('div');
+
     echo html_writer::end_tag('div');
     return;
 }
diff --git a/mod/glossary/styles.css b/mod/glossary/styles.css
index a4a52c692d7..43839f40e4f 100644
--- a/mod/glossary/styles.css
+++ b/mod/glossary/styles.css
@@ -18,6 +18,9 @@
 .path-mod-glossary table.glossaryapproval,
 .path-mod-glossary .glossarypost .entrylowersection table{width: 100%;margin-bottom:0em;}
 
+.glossary-activity-picture { float: left; }
+.glossary-activity-content { margin-left: 40px; }
+
 /** Page specific styles **/
 #page-mod-glossary-view .glossarycontrol {float: right;text-align:right;white-space: nowrap;margin: 5px 0;}
 #page-mod-glossary-view table.glossarycategoryheader,
-- 
2.43.0