mirror of
https://github.com/moodle/moodle.git
synced 2025-04-19 07:25:30 +02:00
MDL-19817 Upgraded calls to helpbutton, print_simple_box* and notify
This commit is contained in:
parent
8b1b03820f
commit
56da74f311
@ -338,12 +338,12 @@
|
||||
}
|
||||
|
||||
// The wiki Contents
|
||||
print_simple_box_start( 'center', '100%', '', '20');
|
||||
echo $OUTPUT->box_start();
|
||||
// Do the Action
|
||||
# "setpageflags", "removepages", "strippages", "checklinks", "revertpages"
|
||||
print_heading_with_help(get_string($action,"wiki"), $action, "wiki");
|
||||
include $action.".html";
|
||||
print_simple_box_end();
|
||||
echo $OUTPUT->box_end();
|
||||
|
||||
/// Finish the page
|
||||
echo $OUTPUT->footer();
|
||||
|
@ -149,7 +149,7 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
|
||||
}
|
||||
|
||||
function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvirtualpages=0, $exportdestinations=0) {
|
||||
global $ewiki_config, $wiki, $ewiki_plugins, $wiki_entry, $course, $CFG, $ewiki_t, $userid, $groupid;
|
||||
global $ewiki_config, $wiki, $ewiki_plugins, $wiki_entry, $course, $CFG, $ewiki_t, $userid, $groupid, $OUTPUT;
|
||||
|
||||
$filestozip=array();
|
||||
#-- disable protected email
|
||||
@ -317,7 +317,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
|
||||
$destfn=clean_filename(substr($id,strlen(EWIKI_IDF_INTERNAL)));
|
||||
$dest="$exportdir/".$destfn;
|
||||
if(!copy($fn,$dest)) {
|
||||
notify("Cannot copy $fn to $dest.");
|
||||
echo $OUTPUT->notification("Cannot copy $fn to $dest.");
|
||||
}
|
||||
|
||||
#$fn = urlencode(preg_replace(EWIKI_DUMP_FILENAME_REGEX, "", $id));
|
||||
|
@ -170,7 +170,7 @@ function wiki_rmdir($basedir) {
|
||||
* @return bool
|
||||
*/
|
||||
function wiki_delete_instance($id) {
|
||||
global $CFG, $DB;
|
||||
global $CFG, $DB, $OUTPUT;
|
||||
|
||||
if (! $wiki = $DB->get_record("wiki", array("id"=>$id))) {
|
||||
return false;
|
||||
@ -186,7 +186,7 @@ function wiki_delete_instance($id) {
|
||||
foreach ($files as $file) {
|
||||
#if ($file != $exception) {
|
||||
unlink("$basedir/$file");
|
||||
notify("Existing file '$file' has been deleted!");
|
||||
echo $OUTPUT->notification("Existing file '$file' has been deleted!");
|
||||
#}
|
||||
}
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ if($err->remark) {
|
||||
<td>
|
||||
<input type="text" name="authorfieldpattern" size="30" value="<?php p($form->authorfieldpattern) ?>" />
|
||||
<?php
|
||||
helpbutton('revertauthorfieldpattern', get_string('authorfieldpattern', 'wiki'), 'wiki');
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make('revertauthorfieldpattern', get_string('authorfieldpattern', 'wiki'), 'wiki'));
|
||||
if (!empty($err->authorfieldpattern)) { formerr($err->authorfieldpattern); }
|
||||
?>
|
||||
</td>
|
||||
|
@ -339,7 +339,7 @@
|
||||
|
||||
/// Formatting Rules
|
||||
echo '<td class="howtowiki">';
|
||||
helpbutton('howtowiki', get_string('howtowiki', 'wiki'), 'wiki');
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make('howtowiki', get_string('howtowiki', 'wiki'), 'wiki'));
|
||||
echo '</td>';
|
||||
|
||||
echo '</tr></table>';
|
||||
@ -396,7 +396,7 @@
|
||||
$linktext = get_string('reloadlinktext', 'wiki');
|
||||
echo "<div class='wikilinkright'><a href='$me' title='$linkdesc'><input type='button' value='$linktext' /></a></div>";
|
||||
|
||||
print_simple_box_start('center', '100%', '', '20');
|
||||
echo $OUTPUT->box_start();
|
||||
|
||||
/// Don't filter any pages containing wiki actions (except view). A wiki page containing
|
||||
/// actions will have the form [action]/[pagename]. If the action is 'view' or the '/'
|
||||
@ -476,7 +476,7 @@ $strnojslockwarning
|
||||
print $content;
|
||||
}
|
||||
print $content2;
|
||||
print_simple_box_end();
|
||||
echo $OUTPUT->box_end();
|
||||
echo "<br />";
|
||||
|
||||
/// Finish the page
|
||||
|
Loading…
x
Reference in New Issue
Block a user