| ';
- echo '';
- echo $OUTPUT->user_picture($userinfo['user'], array('courseid'=>$userinfo['courseid']));
- echo " | ";
+
+ //echo '';
+ $link = '/user/view.php?id='.$userinfo['user']->id.'&course='.$userinfo['courseid'];
+ $anchortagcontents = $OUTPUT->user_picture($userinfo['user'], array('courseid'=>$userinfo['courseid']));
+
+ $action = new popup_action('click', $link, 'user'.$userinfo['chatuser']->id);
+ $anchortag = $OUTPUT->action_link($link, $anchortagcontents, $action);
+
+ echo $anchortag;
+ echo " | ";
echo " ";
echo fullname($userinfo['user'])."
";
echo "$str->idle: ".format_time($lastping, $str)." ";
Index: moodle/mod/data/preset.php
--- moodle/mod/data/preset.php Base (1.52)
+++ moodle/mod/data/preset.php Locally Modified (Based On 1.52)
@@ -360,11 +360,16 @@
echo '';
echo '';
echo '';
-echo 'id}&choose=uploadpreset.file', 'coursefiles', 'menubar=0,location=0,scrollbars,resizable,width=750,height=500', 0".');" type="button" />';
+echo '';
echo '';
echo '';
echo ' |
';
+//attach the onclick event to fromfile button
+$link = '/files/index.php?id={$course->id}&choose=uploadpreset.file';
+$action = new popup_action('click', $link, 'coursefiles', array('height'=>750,'width'=>500));
+$OUTPUT->add_action_handler($action, 'fromfile');
+
echo '| ';
echo $OUTPUT->help_icon('usestandard', 'data');
echo ' | ';
Index: moodle/mod/glossary/filter.php
--- moodle/mod/glossary/filter.php Base (1.39)
+++ moodle/mod/glossary/filter.php Locally Modified (Based On 1.39)
@@ -128,12 +128,15 @@
$encodedconcept = urlencode($concept->concept);
$title = str_replace('"', "'", strip_tags($glossaryname.': '.$concept->concept));
}
- $href_tag_begin = '';
+ '&concept='.$encodedconcept.'" >';
+
+ //attach the onclick event
+ $link = '/mod/glossary/showentry.php?courseid='.$courseid.'\&concept='.$encodedconcept;
+ $action = new popup_action('click', $link, 'entry', array('height'=>600,'width'=>450));
+ $OUTPUT->add_action_handler($action, $randid);
}
Index: moodle/mod/glossary/formats/entrylist/entrylist_format.php
--- moodle/mod/glossary/formats/entrylist/entrylist_format.php Base (1.20)
+++ moodle/mod/glossary/formats/entrylist/entrylist_format.php Locally Modified (Based On 1.20)
@@ -1,7 +1,7 @@
';
if ($entry) {
glossary_print_entry_approval($cm, $entry, $mode);
- echo " ';
+
+ //id&eid=$entry->id&displayformat=dictionary\" target=\"_blank\" onclick=\"return openpopup('/mod/glossary/showentry.php?courseid=$course->id&eid=$entry->id&displayformat=dictionary', 'entry', 'menubar=0,location=0,scrollbars,resizable,width=600,height=450', 0);\">
+ $link = "/mod/glossary/showentry.php?courseid={$course->id}&eid={$entry->id}&displayformat=dictionary";
+ $anchortagcontents = glossary_print_entry_concept($entry);
+
+ $action = new popup_action('click', $link, 'entry',array('title'=>'entry','width'=>600,'height'=>450));
+ $anchor = $OUTPUT->action_link($link, $anchortagcontents, $action);
+
+ echo " $anchor ";
echo ' | ';
if ($printicons) {
glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode, $hook,'print');
Index: moodle/mod/glossary/lib.php
--- moodle/mod/glossary/lib.php Base (1.296)
+++ moodle/mod/glossary/lib.php Locally Modified (Based On 1.296)
@@ -1655,7 +1655,7 @@
* @param string $sortorder
*/
function glossary_print_sorting_links($cm, $mode, $sortkey = '',$sortorder = '') {
- global $CFG;
+ global $CFG, $OUTPUT;
$asc = get_string("ascending","glossary");
$desc = get_string("descending","glossary");
Index: moodle/mod/glossary/sql.php
--- moodle/mod/glossary/sql.php Base (1.48)
+++ moodle/mod/glossary/sql.php Locally Modified (Based On 1.48)
@@ -149,10 +149,10 @@
$searchcond = array();
$alcond = array();
- $params = array();
+ //$params = array();
$i = 0;
- $concat = $DB->sql_concat('ge.concept', "' '", 'ge.definition',"' '", "COALESCE(al.alial, '')");
+ $concat = $DB->sql_concat('ge.concept', "' '", 'ge.definition',"' '", "COALESCE(al.alias, '')");
$searchterms = explode(" ",$hook);
Index: moodle/mod/hotpot/mod_form.php
--- moodle/mod/hotpot/mod_form.php Base (1.13)
+++ moodle/mod/hotpot/mod_form.php Locally Modified (Based On 1.13)
@@ -102,12 +102,14 @@
if ($choosefile_button) {
$wdir = "'+getDir(this.form.reference.value)+'";
$url="/files/index.php?id=$id&wdir=$wdir&choose=id_reference";
- $options = 'menubar=0,location=0,scrollbars,resizable,width=750,height=500';
$attributes = array(
- 'title'=>get_string('chooseafile', 'resource'),
- 'onclick'=>"return openpopup('$url', '".$choosefile_button->getName()."', '$options', 0);"
+ 'title'=>get_string('chooseafile', 'resource')
);
$choosefile_button->updateAttributes($attributes);
+
+ //attach the onclick event
+ $action = new popup_action('click', $url, $choosefile_button->getName(), array('title'=>$choosefile_button->getName(),'width'=>750,'height'=>500));
+ $OUTPUT->add_action_handler($action, $choosefile_button->id);
}
$mform->setType('reference', PARAM_TEXT);
Index: moodle/search/documents/glossary_document.php
--- moodle/search/documents/glossary_document.php Base (1.16)
+++ moodle/search/documents/glossary_document.php Locally Modified (Based On 1.16)
@@ -112,7 +112,9 @@
// Suggestion : bounce on popup within the glossarie's showentry page
// preserve glossary pop-up, be careful where you place your ' and "s
//this function is meant to return a url that is placed between href='[url here]'
- return "$CFG->wwwroot/mod/glossary/showentry.php?eid=$entry_id' onclick='return openpopup(\"/mod/glossary/showentry.php?eid={$entry_id}\", \"entry\", DEFAULT_POPUP_SETTINGS, 0);";
\ No newline at end of file
+ $jsondata = array('url'=>'/mod/glossary/showentry.php?eid='.$entry_id,'name'=>'entry','options'=>DEFAULT_POPUP_SETTINGS);
+ $jsondata = json_encode($jsondata);
+ return "$CFG->wwwroot/mod/glossary/showentry.php?eid=$entry_id' onclick='return openpopup(null, $jsondata);";
\ No newline at end of file
}
/**
Index: moodle/user/view.php
--- moodle/user/view.php Base (1.235)
+++ moodle/user/view.php Locally Modified (Based On 1.235)
@@ -525,18 +525,31 @@
} else {
$messagebuttonname = get_string("messages", "message");
}
+ $messagebuttonid = html_writer::random_id($messagebuttonname);
echo "";
+
+ //attach the onclick event
+ $link = '/message/index.php';
+ $action = new popup_action('click', $link, 'message');
+ $OUTPUT->add_action_handler($action, $messagebuttonid);
} else {
+ $sendmessage = get_string("sendmessage", "message");
+ $messagebuttonid = html_writer::random_id($sendmessage);
echo "";
+
+ //attach the onclick event
+ $link = "/message/discussion.php?id={$user->id}";
+ $action = new popup_action('click', $link, 'message_'.$user->id);
+ $OUTPUT->add_action_handler($action, $messagebuttonid);
}
}
|