Permalink
Browse files

MDL-39824 output: tidied up output before bootstrap cleaning

Conflicts:
	lib/pagelib.php
  • Loading branch information...
1 parent 2d28b03 commit 00f906b1143bd5918bbebe70e46b0f58d3fffeea Sam Hemelryk committed Jun 6, 2013
Showing with 31 additions and 10 deletions.
  1. +1 −1 lib/blocklib.php
  2. +7 −4 lib/outputrenderers.php
  3. +2 −1 lib/pagelib.php
  4. +21 −4 lib/weblib.php
View
@@ -341,7 +341,7 @@ protected function get_move_target_url($region, $weight) {
* output the blocks anyway, so we are not doing wasted effort.)
*
* @param string $region a block region that exists on this page.
- * @param object $output a core_renderer. normally the global $OUTPUT.
+ * @param core_renderer $output a core_renderer. normally the global $OUTPUT.
* @return boolean Whether there is anything in this region.
*/
public function region_has_content($region, $output) {
@@ -921,7 +921,7 @@ public function course_content_header($onlyifnotcalledbefore = false) {
$functioncalled = true;
$courseformat = course_get_format($this->page->course);
if (($obj = $courseformat->course_content_header()) !== null) {
- return $courseformat->get_renderer($this->page)->render($obj);
+ return html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-header');
}
return '';
}
@@ -948,7 +948,7 @@ public function course_content_footer($onlyifnotcalledbefore = false) {
require_once($CFG->dirroot.'/course/lib.php');
$courseformat = course_get_format($this->page->course);
if (($obj = $courseformat->course_content_footer()) !== null) {
- return $courseformat->get_renderer($this->page)->render($obj);
+ return html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-footer');
}
return '';
}
@@ -2675,10 +2675,13 @@ public function tree_block_contents($items, $attrs = array()) {
*/
public function navbar() {
$items = $this->page->navbar->get_items();
+ $itemcount = count($items);
+ if ($itemcount === 0) {
+ return '';
+ }
$htmlblocks = array();
// Iterate the navarray and display each node
- $itemcount = count($items);
$separator = get_separator();
for ($i=0;$i < $itemcount;$i++) {
$item = $items[$i];
@@ -2827,7 +2830,7 @@ protected function render_custom_menu(custom_menu $menu) {
$jscode = "(function(){{$jscode}})";
$this->page->requires->yui_module('node-menunav', $jscode);
// Build the root nodes as required by YUI
- $content = html_writer::start_tag('div', array('id'=>'custom_menu_'.$menucount, 'class'=>'yui3-menu yui3-menu-horizontal javascript-disabled'));
+ $content = html_writer::start_tag('div', array('id'=>'custom_menu_'.$menucount, 'class'=>'yui3-menu yui3-menu-horizontal javascript-disabled custom-menu'));
$content .= html_writer::start_tag('div', array('class'=>'yui3-menu-content'));
$content .= html_writer::start_tag('ul');
// Render each child
View
@@ -51,7 +51,8 @@
* the forum or quiz table) that this page belongs to. Will be null
* if this page is not within a module.
* @property-read array $alternativeversions Mime type => object with ->url and ->title.
- * @property-read blocks_manager $blocks The blocks manager object for this page.
+ * @property-read block_manager $blocks The blocks manager object for this page.
+ * @property-read array $blockmanipulations
* @property-read string $bodyclasses A string to use within the class attribute on the body tag.
* @property-read string $bodyid A string to use as the id of the body tag.
* @property-read string $button The HTML to go where the Turn editing on button normally goes.
View
@@ -909,20 +909,37 @@ function close_window($delay = 0, $reloadopener = false) {
* @return string The link to user documentation for this current page
*/
function page_doc_link($text='') {
- global $CFG, $PAGE, $OUTPUT;
+ global $OUTPUT, $PAGE;
+ $path = page_get_doc_link_path($PAGE);
+ if (!$path) {
+ return '';
+ }
+ return $OUTPUT->doc_link($path, $text);
+}
+
+/**
+ * Returns the path to use when constructing a link to the docs.
+ *
+ * @since 2.5.1 2.6
+ * @global stdClass $CFG
+ * @param moodle_page $page
+ * @return string
+ */
+function page_get_doc_link_path(moodle_page $page) {
+ global $CFG;
if (empty($CFG->docroot) || during_initial_install()) {
return '';
}
- if (!has_capability('moodle/site:doclinks', $PAGE->context)) {
+ if (!has_capability('moodle/site:doclinks', $page->context)) {
return '';
}
- $path = $PAGE->docspath;
+ $path = $page->docspath;
if (!$path) {
return '';
}
- return $OUTPUT->doc_link($path, $text);
+ return $path;
}

0 comments on commit 00f906b

Please sign in to comment.