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

MDL-41288 Wiki: add additional fix for heading level

Browse Source
This commit is contained in:
Rossiani Wijaya 2013-09-13 01:06:38 +08:00 committed by Dan Poltawski
parent 6e3cdbdc33
commit 14cdc25731
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mod/wiki/pagelib.php
View File

@ -1080,7 +1080,7 @@ class page_wiki_diff extends page_wiki {
$vstring = new stdClass();
$vstring->old = $this->compare;
$vstring->new = $this->comparewith;
echo $OUTPUT->heading(get_string('comparewith', 'wiki', $vstring));
echo html_writer::tag('div', get_string('comparewith', 'wiki', $vstring), array('class' => 'wiki_headingtitle'));
}
/**
@ -1187,7 +1187,7 @@ class page_wiki_history extends page_wiki {
global $OUTPUT;
$html = '';
$html .= $OUTPUT->container_start();
$html .= $OUTPUT->container_start('wiki_headingtitle');
$html .= $OUTPUT->heading_with_help(format_string($this->title), 'history', 'wiki', '', '', 3);
$html .= $OUTPUT->container_end();
echo $html;
@ -1253,7 +1253,7 @@ class page_wiki_history extends page_wiki {
$a = new StdClass;
$a->date = userdate($this->page->timecreated, get_string('strftimedaydatetime', 'langconfig'));
$a->username = fullname($creator);
echo $OUTPUT->heading(get_string('createddate', 'wiki', $a), 4);
echo html_writer::tag ('div', get_string('createddate', 'wiki', $a), array('class' => 'wiki_headingtime'));
if ($vcount > 0) {
/// If there is only one version, we don't need radios nor forms
@ -1884,7 +1884,8 @@ class page_wiki_restoreversion extends page_wiki {
$restoreurl = new moodle_url('/mod/wiki/restoreversion.php', $optionsyes);
$return = new moodle_url('/mod/wiki/viewversion.php', array('pageid'=>$this->page->id, 'versionid'=>$version->id));
echo $OUTPUT->heading(get_string('restoreconfirm', 'wiki', $version->version), 3);
echo $OUTPUT->container_start('wiki-form-center');
echo html_writer::tag('div', get_string('restoreconfirm', 'wiki', $version->version));
echo $OUTPUT->container_start(false, 'wiki_restoreform');
echo '<form class="wiki_restore_yes" action="' . $restoreurl . '" method="post" id="restoreversion">';
echo '<div><input type="submit" name="confirm" value="' . get_string('yes') . '" /></div>';
@ -1893,6 +1894,7 @@ class page_wiki_restoreversion extends page_wiki {
echo '<div><input type="submit" name="norestore" value="' . get_string('no') . '" /></div>';
echo '</form>';
echo $OUTPUT->container_end();
echo $OUTPUT->container_end();
}
}
/**
@ -2117,15 +2119,15 @@ class page_wiki_viewversion extends page_wiki {
if ($pageversion) {
$restorelink = new moodle_url('/mod/wiki/restoreversion.php', array('pageid' => $this->page->id, 'versionid' => $this->version->id));
echo $OUTPUT->heading(get_string('viewversion', 'wiki', $pageversion->version) . '<br />' .
echo html_writer::tag('div', get_string('viewversion', 'wiki', $pageversion->version) . '<br />' .
html_writer::link($restorelink->out(false), '(' . get_string('restorethis', 'wiki') .
')', array('class' => 'wiki_restore')) . '&nbsp;', 4);
')', array('class' => 'wiki_restore')) . '&nbsp;', array('class' => 'wiki_headingtitle'));
$userinfo = wiki_get_user_info($pageversion->userid);
$heading = '<p><strong>' . get_string('modified', 'wiki') . ':</strong>&nbsp;' . userdate($pageversion->timecreated, get_string('strftimedatetime', 'langconfig'));
$viewlink = new moodle_url('/user/view.php', array('id' => $userinfo->id));
$heading .= '&nbsp;&nbsp;&nbsp;<strong>' . get_string('user') . ':</strong>&nbsp;' . html_writer::link($viewlink->out(false), fullname($userinfo));
$heading .= '&nbsp;&nbsp;&rarr;&nbsp;' . $OUTPUT->user_picture(wiki_get_user_info($pageversion->userid), array('popup' => true)) . '</p>';
echo $OUTPUT->container($heading, false, 'mdl-align wiki_modifieduser wiki_headingtime');
echo $OUTPUT->container($heading, 'wiki_headingtime', 'mdl-align wiki_modifieduser');
$options = array('swid' => $this->subwiki->id, 'pretty_print' => true, 'pageid' => $this->page->id);
$pageversion->content = file_rewrite_pluginfile_urls($pageversion->content, 'pluginfile.php', $this->modcontext->id, 'mod_wiki', 'attachments', $this->subwiki->id);

6
mod/wiki/styles.css
View File

@ -146,9 +146,13 @@
}
.wiki_restore_yes, .wiki_deletecomment_yes,
.wiki_restore_no, .wiki_deletecomment_no {
.dir-rtl .wiki_restore_no, .wiki_deletecomment_no {
float: left;
}
.wiki_restore_no, .wiki_deletecomment_no,
.dir-rtl .wiki_restore_yes, .wiki_deletecomment_yes {
float: right;
}
.wiki_restoreform, .wiki_deletecommentform {
width: 10%;

10
theme/bootstrapbase/less/moodle/modules.less
View File

@ -138,6 +138,12 @@ div#dock {
text-align: center;
}
.path-mod-wiki .wiki_headingtitle {
.text-left;
.path-mod-wiki .wiki_headingtitle,
.path-mod-wiki .midpad,
.path-mod-wiki .wiki_headingtime {
text-align: inherit;
}
.path-mod-wiki .wiki_contentbox {
width: 100%;
}

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long