mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

MDL-30649 Glossary : Fixed floating element breaking HTML

Browse Source
This commit is contained in:
Frederic Massart 2012-05-10 15:09:05 +08:00 committed by Aparup Banerjee
parent 6265a43af7
commit 50a8374ef8
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod/glossary/lib.php
View File

@ -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;
}

3
mod/glossary/styles.css
View File

@ -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,