'; $html .= ''; diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index 058ed790083f0..413e2ca12fd0e 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -587,7 +587,7 @@ public function render_restore_category_search(restore_category_search $componen $row->cells = array( html_writer::empty_tag('input', array('type'=>'radio', 'name'=>'targetid', 'value'=>$category->id)), $category->name, - format_text($category->description, $category->descriptionformat) + format_text($category->description, $category->descriptionformat, array('overflowdiv'=>true)) ); $table->data[] = $row; } diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php index 52424c61c2c3d..7905822233cdc 100644 --- a/blocks/course_summary/block_course_summary.php +++ b/blocks/course_summary/block_course_summary.php @@ -25,6 +25,7 @@ function get_content() { $this->content = new stdClass(); $options = new stdClass(); $options->noclean = true; // Don't clean Javascripts etc + $options->overflowdiv = true; $context = get_context_instance(CONTEXT_COURSE, $this->page->course->id); $this->page->course->summary = file_rewrite_pluginfile_urls($this->page->course->summary, 'pluginfile.php', $context->id, 'course', 'summary', NULL); $this->content->text = format_text($this->page->course->summary, $this->page->course->summaryformat, $options); diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php index 2bfcce07c5794..9e1eaa87aae04 100644 --- a/blocks/glossary_random/block_glossary_random.php +++ b/blocks/glossary_random/block_glossary_random.php @@ -84,6 +84,7 @@ function specialization() { $options = new stdClass(); $options->trusted = $entry->definitiontrust; + $options->overflowdiv = true; $text .= format_text($entry->definition, $entry->definitionformat, $options); $this->config->nexttime = usergetmidnight(time()) + DAYSECS * $this->config->refresh; diff --git a/blocks/html/block_html.php b/blocks/html/block_html.php index 1248a2f449c32..de484a507ee16 100755 --- a/blocks/html/block_html.php +++ b/blocks/html/block_html.php @@ -46,12 +46,11 @@ function get_content() { return $this->content; } + $filteropt = new stdClass; + $filteropt->overflowdiv = true; if ($this->content_is_trusted()) { // fancy html allowed only on course, category and system blocks. - $filteropt = new stdClass; $filteropt->noclean = true; - } else { - $filteropt = null; } $this->content = new stdClass; diff --git a/blocks/html/styles.css b/blocks/html/styles.css new file mode 100644 index 0000000000000..de90b14227afb --- /dev/null +++ b/blocks/html/styles.css @@ -0,0 +1,2 @@ +.block.block_html .content {padding:0;} +.block.block_html .content .no-overflow {padding:4px;} \ No newline at end of file diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php index d7324090e8bd6..01b06de41d944 100644 --- a/blocks/rss_client/block_rss_client.php +++ b/blocks/rss_client/block_rss_client.php @@ -185,7 +185,7 @@ function get_feed_html($feedrecord, $maxentries, $showtitle){ } - $r.='
- '."\n";
+ $r.='
- '."\n";
$feeditems = $feed->get_items(0, $maxentries);
foreach($feeditems as $item){
diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index 3e6b993b034d2..3e139aca9fbed 100644
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -34,13 +34,14 @@ function get_content() {
/// extra fast view mode
if (!$isediting) {
if (!empty($modinfo->sections[0])) {
+ $options = array('overflowdiv'=>true);
foreach($modinfo->sections[0] as $cmid) {
$cm = $modinfo->cms[$cmid];
if (!$cm->uservisible) {
continue;
}
if ($cm->modname == 'label') {
- $this->content->items[] = format_text($cm->extra, FORMAT_HTML);
+ $this->content->items[] = format_text($cm->extra, FORMAT_HTML, $options);
$this->content->icons[] = '';
} else {
$linkcss = $cm->visible ? '' : ' class="dimmed" ';
@@ -85,6 +86,7 @@ function get_content() {
if (!empty($section->sequence)) {
$sectionmods = explode(',', $section->sequence);
+ $options = array('overflowdiv'=>true);
foreach ($sectionmods as $modnumber) {
if (empty($mods[$modnumber])) {
continue;
@@ -127,7 +129,7 @@ function get_content() {
}
if ($mod->modname == 'label') {
- $this->content->items[] = format_text($extra, FORMAT_HTML).$editbuttons;
+ $this->content->items[] = format_text($extra, FORMAT_HTML,$options).$editbuttons;
$this->content->icons[] = '';
} else {
//Accessibility: incidental image - should be empty Alt text
diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 3c3dc924e90ea..bcf7d7bf315b1 100644
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -36,13 +36,14 @@ function get_content() {
/// extra fast view mode
if (!$isediting) {
if (!empty($modinfo->sections[0])) {
+ $options = array('overflowdiv'=>true);
foreach($modinfo->sections[0] as $cmid) {
$cm = $modinfo->cms[$cmid];
if (!$cm->uservisible) {
continue;
}
if ($cm->modname == 'label') {
- $this->content->items[] = format_text($cm->extra, FORMAT_HTML);
+ $this->content->items[] = format_text($cm->extra, FORMAT_HTML, $options);
$this->content->icons[] = '';
} else {
$linkcss = $cm->visible ? '' : ' class="dimmed" ';
@@ -94,6 +95,7 @@ function get_content() {
if (!empty($section) && !empty($section->sequence)) {
$sectionmods = explode(',', $section->sequence);
+ $options = array('overflowdiv'=>true);
foreach ($sectionmods as $modnumber) {
if (empty($mods[$modnumber])) {
continue;
@@ -136,7 +138,7 @@ function get_content() {
}
if ($mod->modname == 'label') {
- $this->content->items[] = format_text($extra, FORMAT_HTML).$editbuttons;
+ $this->content->items[] = format_text($extra, FORMAT_HTML, $options).$editbuttons;
$this->content->icons[] = '';
} else {
//Accessibility: incidental image - should be empty Alt text
diff --git a/blog/locallib.php b/blog/locallib.php
index a7fcf4b4863de..e28cee9116845 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -114,7 +114,8 @@ public function print_html($return=false) {
}
$this->summary = file_rewrite_pluginfile_urls($this->summary, 'pluginfile.php', SYSCONTEXTID, 'blog', 'post', $this->id);
- $template['body'] = format_text($this->summary, $this->summaryformat).$cmttext;
+ $options = array('overflowdiv'=>true);
+ $template['body'] = format_text($this->summary, $this->summaryformat, $options).$cmttext;
$template['title'] = format_string($this->subject);
$template['userid'] = $user->id;
$template['author'] = fullname($user);
diff --git a/cohort/index.php b/cohort/index.php
index 4f1bd2e6275e3..ba656e0ce72b1 100644
--- a/cohort/index.php
+++ b/cohort/index.php
@@ -54,7 +54,7 @@
$strcohorts = get_string('cohorts', 'cohort');
if ($category) {
- $PAGE->set_pagelayout('admin');
+ $PAGE->set_pagelayout('report');
$PAGE->set_context($context);
$PAGE->set_url('/cohort/index.php', array('contextid'=>$context->id));
$PAGE->set_title($strcohorts);
@@ -62,7 +62,7 @@
$PAGE->navbar->add($category->name, new moodle_url('/course/index.php', array('categoryedit'=>'1')));
$PAGE->navbar->add($strcohorts);
} else {
- admin_externalpage_setup('cohorts');
+ admin_externalpage_setup('cohorts', '', null, '', array('pagelayout'=>'report'));
}
echo $OUTPUT->header();
diff --git a/comment/index.php b/comment/index.php
index db6a55aa2aec8..38acc30e2cdc6 100644
--- a/comment/index.php
+++ b/comment/index.php
@@ -23,7 +23,7 @@
require_once('locallib.php');
require_login();
-admin_externalpage_setup('comments');
+admin_externalpage_setup('comments', '', null, '', array('pagelayout'=>'report'));
$context = get_context_instance(CONTEXT_SYSTEM);
require_capability('moodle/comment:delete', $context);
diff --git a/comment/lib.php b/comment/lib.php
index 576314540e777..d8bbc49cfe254 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -413,6 +413,7 @@ public function get_comments($page = '') {
$comments = array();
$candelete = has_capability('moodle/comment:delete', $this->context);
+ $formatoptions = array('overflowdiv' => true);
$rs = $DB->get_recordset_sql($sql, $params, $start, $CFG->commentsperpage);
foreach ($rs as $u) {
$c = new stdClass();
@@ -424,7 +425,7 @@ public function get_comments($page = '') {
$c->profileurl = $url->out();
$c->fullname = fullname($u);
$c->time = userdate($c->timecreated, get_string('strftimerecent', 'langconfig'));
- $c->content = format_text($c->content, $c->format);
+ $c->content = format_text($c->content, $c->format, $formatoptions);
$c->avatar = $OUTPUT->user_picture($u, array('size'=>18));
if (($USER->id == $u->id) || !empty($candelete)) {
@@ -513,7 +514,7 @@ public function add($content, $format = FORMAT_MOODLE) {
$newcmt->fullname = fullname($USER);
$url = new moodle_url('/user/view.php', array('id'=>$USER->id, 'course'=>$this->courseid));
$newcmt->profileurl = $url->out();
- $newcmt->content = format_text($newcmt->content, $format);
+ $newcmt->content = format_text($newcmt->content, $format, array('overflowdiv'=>true));
$newcmt->avatar = $OUTPUT->user_picture($USER, array('size'=>16));
return $newcmt;
} else {
diff --git a/comment/locallib.php b/comment/locallib.php
index 8a035c2a2de58..41ab72872a729 100644
--- a/comment/locallib.php
+++ b/comment/locallib.php
@@ -47,11 +47,12 @@ function get_comments($page) {
WHERE u.id=c.userid ORDER BY c.timecreated ASC";
$comments = array();
+ $formatoptions = array('overflowdiv' => true);
if ($records = $DB->get_records_sql($sql, array(), $start, $this->perpage)) {
foreach ($records as $item) {
$item->fullname = fullname($item);
$item->time = userdate($item->timecreated);
- $item->content = format_text($item->content);
+ $item->content = format_text($item->content, FORMAT_MOODLE, $formatoptions);
$comments[] = $item;
unset($item->firstname);
unset($item->lastname);
diff --git a/course/category.php b/course/category.php
index b03500d875a09..288a3b640ffcc 100644
--- a/course/category.php
+++ b/course/category.php
@@ -196,6 +196,7 @@
$options = new stdClass;
$options->noclean = true;
$options->para = false;
+ $options->overflowdiv = true;
if (!isset($category->descriptionformat)) {
$category->descriptionformat = FORMAT_MOODLE;
}
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 564e3e9a49810..f324a99c4ffa1 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -107,6 +107,7 @@
$summarytext = file_rewrite_pluginfile_urls($thissection->summary, 'pluginfile.php', $coursecontext->id, 'course', 'section', $thissection->id);
$summaryformatoptions = new stdClass();
$summaryformatoptions->noclean = true;
+ $summaryformatoptions->overflowdiv = true;
echo format_text($summarytext, $thissection->summaryformat, $summaryformatoptions);
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', $coursecontext)) {
@@ -229,6 +230,7 @@
$summarytext = file_rewrite_pluginfile_urls($thissection->summary, 'pluginfile.php', $coursecontext->id, 'course', 'section', $thissection->id);
$summaryformatoptions = new stdClass();
$summaryformatoptions->noclean = true;
+ $summaryformatoptions->overflowdiv = true;
echo format_text($summarytext, $thissection->summaryformat, $summaryformatoptions);
} else {
echo ' ';
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 5aa0c2f4234d2..090549a09779d 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -99,8 +99,9 @@
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
$summarytext = file_rewrite_pluginfile_urls($thissection->summary, 'pluginfile.php', $coursecontext->id, 'course', 'section', $thissection->id);
- $summaryformatoptions = new stdClass();
+ $summaryformatoptions = new stdClass;
$summaryformatoptions->noclean = true;
+ $summaryformatoptions->overflowdiv = true;
echo format_text($summarytext, $thissection->summaryformat, $summaryformatoptions);
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
@@ -230,8 +231,9 @@
echo '
';
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
$summarytext = file_rewrite_pluginfile_urls($thissection->summary, 'pluginfile.php', $coursecontext->id, 'course', 'section', $thissection->id);
- $summaryformatoptions = new stdClass();
+ $summaryformatoptions = new stdClass;
$summaryformatoptions->noclean = true;
+ $summaryformatoptions->overflowdiv = true;
echo format_text($summarytext, $thissection->summaryformat, $summaryformatoptions);
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
diff --git a/course/info.php b/course/info.php
index 3156134d40b1c..b25e801669ffd 100644
--- a/course/info.php
+++ b/course/info.php
@@ -54,7 +54,7 @@
echo $OUTPUT->box_start('generalbox info');
$course->summary = file_rewrite_pluginfile_urls($course->summary, 'pluginfile.php', $context->id, 'course', 'summary', NULL);
- echo format_text($course->summary, $course->summaryformat, NULL, $course->id);
+ echo format_text($course->summary, $course->summaryformat, array('overflowdiv'=>true), $course->id);
if (!empty($CFG->coursecontact)) {
$coursecontactroles = explode(',', $CFG->coursecontact);
diff --git a/course/lib.php b/course/lib.php
index 97526f057dc9c..428492f5bc8a0 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1272,6 +1272,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
$labelformatoptions = new stdClass();
$labelformatoptions->noclean = true;
+ $labelformatoptions->overflowdiv = true;
/// Casting $course->modinfo to string prevents one notice when the field is null
$modinfo = get_fast_modinfo($course);
@@ -2322,6 +2323,7 @@ function print_course($course, $highlightterms = '') {
$options = NULL;
$options->noclean = true;
$options->para = false;
+ $options->overflowdiv = true;
if (!isset($course->summaryformat)) {
$course->summaryformat = FORMAT_MOODLE;
}
@@ -2468,6 +2470,7 @@ function print_remote_course($course, $width="100%") {
$options = NULL;
$options->noclean = true;
$options->para = false;
+ $options->overflowdiv = true;
echo format_text($course->summary, $course->summaryformat, $options);
echo '
';
echo '';
diff --git a/course/report/outline/index.php b/course/report/outline/index.php
index 4db31c37a03a5..6b1073e4eef37 100644
--- a/course/report/outline/index.php
+++ b/course/report/outline/index.php
@@ -12,7 +12,7 @@
}
$PAGE->set_url('/course/report/outline/index.php', array('id'=>$id));
- $PAGE->set_pagelayout('admin');
+ $PAGE->set_pagelayout('report');
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
@@ -47,6 +47,7 @@
$outlinetable = new html_table();
$outlinetable->attributes['class'] = 'generaltable boxaligncenter';
+ $outlinetable->attributes['style'] = 'width:2000px;';
$outlinetable->cellpadding = 5;
$outlinetable->id = 'outlinetable';
$outlinetable->head = array($stractivity, $strviews);
diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 39bd8bdad8660..9216deef95911 100644
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -41,6 +41,7 @@
print_error('nocourseid');
}
+$PAGE->set_pagelayout('incourse');
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
if (!has_capability('moodle/grade:manage', $context)) {
diff --git a/grade/lib.php b/grade/lib.php
index 7c19bcb643edb..bc2a810ec3118 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -628,7 +628,11 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null,
$title = $PAGE->course->fullname.': ' . $stractive_plugin;
}
- $PAGE->set_pagelayout('admin');
+ if ($active_type == 'report') {
+ $PAGE->set_pagelayout('report');
+ } else {
+ $PAGE->set_pagelayout('admin');
+ }
$PAGE->set_title(get_string('grades') . ': ' . $stractive_type);
$PAGE->set_heading($title);
if ($buttons instanceof single_button) {
diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index 9837deace7358..3a35fd86575f5 100644
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -106,13 +106,15 @@
$reportname = get_string('pluginname', 'gradereport_grader');
+/// Print header
+print_grade_page_head($COURSE->id, 'report', 'grader', $reportname, false, $buttons);
+
//Initialise the grader report object that produces the table
//the class grade_report_grader_ajax was removed as part of MDL-21562
$report = new grade_report_grader($courseid, $gpr, $context, $page, $sortitemid);
// make sure separate group does not prevent view
if ($report->currentgroup == -2) {
- print_grade_page_head($COURSE->id, 'report', 'grader', $reportname, false, $buttons);
echo $OUTPUT->heading(get_string("notingroup"));
echo $OUTPUT->footer();
exit;
@@ -136,9 +138,6 @@
$numusers = $report->get_numusers();
$report->load_final_grades();
-/// Print header
-print_grade_page_head($COURSE->id, 'report', 'grader', $reportname, false, $buttons);
-
echo $report->group_selector;
echo '';
// echo $report->get_toggles_html();
diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index 3452a6ac40933..b2030eb12916f 100644
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -30,6 +30,7 @@
print_error('nocourseid');
}
require_login($course);
+$PAGE->set_pagelayout('report');
$context = get_context_instance(CONTEXT_COURSE, $course->id);
require_capability('gradereport/user:view', $context);
@@ -148,6 +149,4 @@
}
}
-echo $OUTPUT->footer();
-
-
+echo $OUTPUT->footer();
\ No newline at end of file
diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index b8e0da3cd53c3..71aac4904ace8 100644
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -324,7 +324,7 @@ private function fill_table_recursive(&$element) {
} else {
$data['feedback']['class'] = $class.' feedbacktext';
- $data['feedback']['content'] = format_text($grade_grade->feedback, $grade_grade->feedbackformat);
+ $data['feedback']['content'] = format_text($grade_grade->feedback, $grade_grade->feedbackformat, array('overflowdiv'=>true));
}
/// Range
diff --git a/grade/report/user/styles.css b/grade/report/user/styles.css
index 3a44289ff67d1..d11d9d9f224b1 100644
--- a/grade/report/user/styles.css
+++ b/grade/report/user/styles.css
@@ -1,36 +1,37 @@
-.path-grade-report-user table.user-grade .datesubmitted {font-size: 0.7em;}
-.path-grade-report-user table.user-grade .courseitem,
-.path-grade-report-user table.user-grade .categoryitem {font-weight: bold;}
-.path-grade-report-user table.user-grade td.cell {padding-left: 5px;padding-right: 5px;}
+.path-grade-report-user .user-grade .datesubmitted {font-size: 0.7em;}
+.path-grade-report-user .user-grade .courseitem,
+.path-grade-report-user .user-grade .categoryitem {font-weight: bold;}
+.path-grade-report-user .user-grade td.cell {padding-left: 5px;padding-right: 5px;}
#graded_users_selector {float: right;text-align: right;}
/* this must be last if we want to override other category and course item colors */
-.path-grade-report-user table.user-grade .hidden,
-.path-grade-report-user table.user-grade .hidden a {color:#aaaaaa;}
-table.user-grade {border: 1px solid black;margin: auto;padding: 0.25em;font-size: 0.8em;}
-table.user-grade td {margin: 1px;padding: 0.25em;}
-table.user-grade thead {border-bottom: 3px double black;}
-table.user-grade thead th {padding: 0.25em 0.75em;}
-table.user-grade td.oddd1 {background-color: #f3dfd0;}
-table.user-grade td.oddd2 {background-color: #d0dbf3;}
-table.user-grade td.oddd3 {background-color: #d0f3d6;}
-table.user-grade td.oddd4 {background-color: #f0f0aa;}
-table.user-grade td.evend2 {background-color: #b0bbd3;}
-table.user-grade td.evend3 {background-color: #b0dfb6;}
-table.user-grade td.evend4 {background-color: #cac8be;}
-table.user-grade td.b1t,
-table.user-grade td.b2t {border-top: 2px solid black;}
-table.user-grade td.b1r,
-table.user-grade td.b2r {border-right: 2px solid black;}
-table.user-grade td.b1b,
-table.user-grade td.b2b {border-bottom: 2px solid black;}
-table.user-grade td.b1l,
-table.user-grade td.b2l {border-left: 2px solid black;}
-table.user-grade td.baggt,
-table.user-grade td.baggb {font-style: italic;font-weight: bold;}
-table.user-grade td.baggt {border-top: 3px double black;}
-table.user-grade td.baggb {border-bottom: 3px double black;}
-table.user-grade td.item {border-left: 1px solid gray;border-right: 1px solid gray;}
-table.user-grade td.excluded {background-color: #666;}
-table.user-grade td.hidden {color: #aaa;}
-table.user-grade td {min-width: 0.5em;vertical-align: top;}
\ No newline at end of file
+.path-grade-report-user .user-grade .hidden,
+.path-grade-report-user .user-grade .hidden a {color:#aaaaaa;}
+.user-grade {border: 1px solid black;margin: auto;padding: 0.25em;font-size: 0.8em;}
+.user-grade td {margin: 1px;padding: 0.25em;min-width: 2em;vertical-align: top;}
+.user-grade thead {border-bottom: 3px double black;}
+.user-grade thead th {padding: 0.25em 0.75em;}
+.user-grade td.oddd1 {background-color: #f3dfd0;}
+.user-grade td.oddd2 {background-color: #d0dbf3;}
+.user-grade td.oddd3 {background-color: #d0f3d6;}
+.user-grade td.oddd4 {background-color: #f0f0aa;}
+.user-grade td.evend2 {background-color: #b0bbd3;}
+.user-grade td.evend3 {background-color: #b0dfb6;}
+.user-grade td.evend4 {background-color: #cac8be;}
+.user-grade td.b1t,
+.user-grade td.b2t {border-top: 2px solid black;}
+.user-grade td.b1r,
+.user-grade td.b2r {border-right: 2px solid black;}
+.user-grade td.b1b,
+.user-grade td.b2b {border-bottom: 2px solid black;}
+.user-grade td.b1l,
+.user-grade td.b2l {border-left: 2px solid black;}
+.user-grade td.baggt,
+.user-grade td.baggb {font-style: italic;font-weight: bold;}
+.user-grade td.baggt {border-top: 3px double black;}
+.user-grade td.baggb {border-bottom: 3px double black;}
+.user-grade td.item {border-left: 1px solid gray;border-right: 1px solid gray;}
+.user-grade td.excluded {background-color: #666;}
+.user-grade td.hidden {color: #aaa;}
+.user-grade td.feedbacktext {max-width:600px;padding:0;}
+.pagelayout-report .user-grade .feedbacktext .no-overflow {overflow:auto;padding:0.25em;}
\ No newline at end of file
diff --git a/group/members.php b/group/members.php
index 0a59e08eaf9c9..c871c7908df19 100644
--- a/group/members.php
+++ b/group/members.php
@@ -97,7 +97,9 @@
if (!isset($group->descriptionformat)) {
$group->descriptionformat = FORMAT_MOODLE;
}
-$contentcell->text = format_text($group->description, $group->descriptionformat);
+$options = new stdClass;
+$options->overflowdiv = true;
+$contentcell->text = format_text($group->description, $group->descriptionformat, $options);
$groupinfotable->data[] = new html_table_row(array($picturecell, $contentcell));
echo html_writer::table($groupinfotable);
diff --git a/group/overview.php b/group/overview.php
index 58a0ca7db21bb..449ef14d49138 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -162,6 +162,7 @@
$description = file_rewrite_pluginfile_urls($groups[$gpid]->description, 'pluginfile.php', $context->id, 'group', 'description', $gpid);
$options = new stdClass;
$options->noclean = true;
+ $options->overflowdiv = true;
$jsdescription = trim(format_text($description, $groups[$gpid]->descriptionformat, $options));
if (empty($jsdescription)) {
$line[] = $name;
@@ -187,6 +188,7 @@
$description = file_rewrite_pluginfile_urls($groupings[$gpgid]->description, 'pluginfile.php', $context->id, 'grouping', 'description', $gpgid);
$options = new stdClass;
$options->noclean = true;
+ $options->overflowdiv = true;
echo $OUTPUT->box(format_text($description, $groupings[$gpgid]->descriptionformat, $options), 'generalbox boxwidthnarrow boxaligncenter');
}
echo html_writer::table($table);
diff --git a/help.php b/help.php
index 17141ba14987e..2659812376c64 100644
--- a/help.php
+++ b/help.php
@@ -65,6 +65,7 @@
$options->filter = false;
$options->para = true;
$options->newlines = false;
+ $options->overflowdiv = !$ajax;
echo $OUTPUT->heading(format_string(get_string($identifier, $component)), 1, 'helpheading');
// Should be simple wiki only MDL-21695
diff --git a/index.php b/index.php
index dafc1ae62949f..f871c9f0d33f7 100644
--- a/index.php
+++ b/index.php
@@ -117,6 +117,7 @@
$summarytext = file_rewrite_pluginfile_urls($section->summary, 'pluginfile.php', $context->id, 'course', 'section', $section->id);
$summaryformatoptions = new stdClass();
$summaryformatoptions->noclean = true;
+ $summaryformatoptions->overflowdiv = true;
echo format_text($summarytext, $section->summaryformat, $summaryformatoptions);
diff --git a/lib/adminlib.php b/lib/adminlib.php
index b8f2c4fcec050..e762c5e33f106 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -5526,8 +5526,10 @@ public function output_html($data, $query='') {
* added to the turn blocks editing on/off form, so this page reloads correctly.
* @param string $actualurl if the actual page being viewed is not the normal one for this
* page (e.g. admin/roles/allowassin.php, instead of admin/roles/manage.php, you can pass the alternate URL here.
+ * @param array $options Additional options that can be specified for page setup.
+ * pagelayout - This option can be used to set a specific pagelyaout, admin is default.
*/
-function admin_externalpage_setup($section, $extrabutton = '', array $extraurlparams = null, $actualurl = '') {
+function admin_externalpage_setup($section, $extrabutton = '', array $extraurlparams = null, $actualurl = '', array $options = array()) {
global $CFG, $PAGE, $USER, $SITE, $OUTPUT;
$PAGE->set_context(null); // hack - set context to something, by default to system context
@@ -5549,7 +5551,10 @@ function admin_externalpage_setup($section, $extrabutton = '', array $extraurlpa
die;
}
- if ($section === 'upgradesettings') {
+ if (!empty($options['pagelayout'])) {
+ // A specific page layout has been requested.
+ $PAGE->set_pagelayout($options['pagelayout']);
+ } else if ($section === 'upgradesettings') {
$PAGE->set_pagelayout('maintenance');
} else {
$PAGE->set_pagelayout('admin');
diff --git a/lib/pagelib.php b/lib/pagelib.php
index bd1ff1f63ed26..519be0a19544e 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -838,6 +838,9 @@ public function set_pagetype($pagetype) {
* in the standard theme.
*/
public function set_pagelayout($pagelayout) {
+ if (!empty($this->_wherethemewasinitialised) && $pagelayout != $this->_pagelayout) {
+ debugging('Page layout has already been set and cannot be changed.', DEBUG_DEVELOPER);
+ }
$this->_pagelayout = $pagelayout;
}
@@ -1203,11 +1206,6 @@ protected function starting_output() {
public function initialise_theme_and_output() {
global $OUTPUT, $PAGE, $SITE;
- // If you have lost all blocks on a page and cannot work out why
- // try uncommenting this this debugging line and seeing what you get.
- // Chances are the theme and output are being initialised prematurely.
- // debugging('Initialising theme and output with layout '.$this->_pagelayout, DEBUG_DEVELOPER);
-
if (!empty($this->_wherethemewasinitialised)) {
return;
}
diff --git a/lib/tablelib.php b/lib/tablelib.php
index 9195efb8831a0..975b41823a037 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -1187,7 +1187,7 @@ function start_html(){
$this->wrap_html_start();
// Start of main data table
- echo html_writer::start_tag('div', array('class'=>'flexible-wrap'));
+ echo html_writer::start_tag('div', array('class'=>'no-overflow'));
echo '+ * Options: + * trusted : If true the string won't be cleaned. Default false required noclean=true. + * noclean : If true the string won't be cleaned. Default false required trusted=true. + * nocache : If true the strign will not be cached and will be formatted every call. Default false. + * filter : If true the string will be run through applicable filters as well. Default true. + * para : If true then the returned string will be wrapped in div tags. Default true. + * newlines : If true then lines newline breaks will be converted to HTML newline breaks. Default true. + * context : The context that will be used for filtering. + * overflowdiv : If set to true the formatted text will be encased in a div + * with the class no-overflow before being returned. Default false. + *+ * * @todo Finish documenting this function * * @staticvar array $croncache @@ -983,6 +996,9 @@ function format_text($text, $format = FORMAT_MOODLE, $options = NULL, $courseid_ if (!isset($options['newlines'])) { $options['newlines'] = true; } + if (!isset($options['overflowdiv'])) { + $options['overflowdiv'] = false; + } // Calculate best context if (empty($CFG->version) or $CFG->version < 2010072800 or during_initial_install()) { @@ -1092,6 +1108,10 @@ function format_text($text, $format = FORMAT_MOODLE, $options = NULL, $courseid_ 'relies on it. Please seek out and destroy that filter code.', DEBUG_DEVELOPER); } + if (!empty($options['overflowdiv'])) { + $text = html_writer::tag('div', $text, array('class'=>'no-overflow')); + } + if (empty($options['nocache']) and !empty($CFG->cachetext)) { if (CLI_SCRIPT) { // special static cron cache - no need to store it in db if its not already there @@ -1367,7 +1387,7 @@ function format_module_intro($module, $activity, $cmid, $filter=true) { global $CFG; require_once("$CFG->libdir/filelib.php"); $context = get_context_instance(CONTEXT_MODULE, $cmid); - $options = (object)array('noclean'=>true, 'para'=>false, 'filter'=>$filter, 'context'=>$context); + $options = array('noclean'=>true, 'para'=>false, 'filter'=>$filter, 'context'=>$context, 'overflowdiv'=>true); $intro = file_rewrite_pluginfile_urls($activity->intro, 'pluginfile.php', $context->id, 'mod_'.$module, 'intro', null); return trim(format_text($intro, $activity->introformat, $options, null)); } diff --git a/mnet/service/enrol/course.php b/mnet/service/enrol/course.php index 0de84638fcaaa..6ba05c7ff059f 100644 --- a/mnet/service/enrol/course.php +++ b/mnet/service/enrol/course.php @@ -67,6 +67,7 @@ $options->para = false; $options->filter = false; $options->noclean = false; + $options->overflowdiv = true; print_collapsible_region_start('remotecourse summary', 'remotecourse-summary', get_string('coursesummary'), false, true); echo format_text($course->summary, $course->summaryformat, $options, $course->id); print_collapsible_region_end(); diff --git a/mod/assignment/styles.css b/mod/assignment/styles.css index 2e36c925f28f1..3d948982062c6 100644 --- a/mod/assignment/styles.css +++ b/mod/assignment/styles.css @@ -10,8 +10,6 @@ .path-mod-assignment .feedback .from {float: left;} .path-mod-assignment .files img {margin-right: 4px;} .path-mod-assignment .files a {white-space:nowrap;} -.path-mod-assignment .flexible-wrap {width:100%;overflow:auto;} -.path-mod-assignment .flexible-wrap > .flexible {margin:0;} .path-mod-assignment .late {color: red;} /** Styles for submissions.php **/ diff --git a/mod/assignment/type/online/all.php b/mod/assignment/type/online/all.php index d2861bee2f304..b746dac2c4b7c 100644 --- a/mod/assignment/type/online/all.php +++ b/mod/assignment/type/online/all.php @@ -133,7 +133,7 @@ //submission part echo $OUTPUT->container_start('generalbox submission'); echo '
'.$view->submissiondate.'
';
- echo "$view->submissiontext
\n"; + echo "$view->submissiontext
\n"; echo "$view->editlink
\n"; echo $OUTPUT->container_end(); diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 8a225494de3c9..e66ac4ddb6341 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -100,7 +100,7 @@ function view() { echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter', 'online'); if ($submission && has_capability('mod/assignment:exportownsubmission', $this->context)) { $text = file_rewrite_pluginfile_urls($submission->data1, 'pluginfile.php', $this->context->id, 'mod_assignment', $this->filearea, $submission->id); - echo format_text($text, $submission->data2); + echo format_text($text, $submission->data2, array('overflowdiv'=>true)); if ($CFG->enableportfolios) { require_once($CFG->libdir . '/portfoliolib.php'); $button = new portfolio_add_button(); @@ -233,7 +233,7 @@ function print_user_files($userid, $return=false) { $wordcount .= ''; $text = file_rewrite_pluginfile_urls($submission->data1, 'pluginfile.php', $this->context->id, 'mod_assignment', $this->filearea, $submission->id); - return $wordcount . format_text($text, $submission->data2); + return $wordcount . format_text($text, $submission->data2, array('overflowdiv'=>true)); } diff --git a/mod/assignment/type/online/file.php b/mod/assignment/type/online/file.php index 368f20ceebeed..c7164f298b1d2 100644 --- a/mod/assignment/type/online/file.php +++ b/mod/assignment/type/online/file.php @@ -60,7 +60,7 @@ echo $OUTPUT->box_end(); $text = file_rewrite_pluginfile_urls($submission->data1, 'pluginfile.php', $context->id, 'mod_assignment', $assignmentinstance->filearea, $submission->id); - echo $OUTPUT->box(format_text($text, $submission->data2), 'generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box(format_text($text, $submission->data2, array('overflowdiv'=>true)), 'generalbox boxaligncenter boxwidthwide'); echo $OUTPUT->close_window_button(); echo $OUTPUT->footer(); } else { diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 367af5e02325d..448fea3f406a2 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -211,7 +211,7 @@ function view_notes() { if ($submission = $this->get_submission($USER->id) and !empty($submission->data1)) { - echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML), 'generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML, array('overflowdiv'=>true)), 'generalbox boxaligncenter boxwidthwide'); } else { echo $OUTPUT->box(get_string('notesempty', 'assignment'), 'generalbox boxaligncenter'); } diff --git a/mod/assignment/type/upload/notes.php b/mod/assignment/type/upload/notes.php index 2695982f112d7..17b5760937b4f 100644 --- a/mod/assignment/type/upload/notes.php +++ b/mod/assignment/type/upload/notes.php @@ -53,7 +53,7 @@ $PAGE->set_title(fullname($user,true).': '.$assignment->name); echo $OUTPUT->header(); echo $OUTPUT->heading(get_string('notes', 'assignment').' - '.fullname($user,true)); - echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML), 'generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML, array('overflowdiv'=>true)), 'generalbox boxaligncenter boxwidthwide'); if ($mode != 'single') { echo $OUTPUT->close_window_button(); } else { diff --git a/mod/data/index.php b/mod/data/index.php index 2109246b5f0ca..ba0c1791f0ff8 100755 --- a/mod/data/index.php +++ b/mod/data/index.php @@ -141,6 +141,6 @@ } echo ""; -echo html_writer::table($table); +echo html_writer::tag('div', html_writer::table($table), array('class'=>'no-overflow')); echo $OUTPUT->footer(); diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php index 0de24fba21cbe..a325e9e0c6d68 100644 --- a/mod/feedback/complete.php +++ b/mod/feedback/complete.php @@ -315,7 +315,7 @@ if(isset($savereturn) && $savereturn == 'saved') { if($feedback->page_after_submit) { echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo format_text($feedback->page_after_submit); + echo format_text($feedback->page_after_submit, $feedback->page_after_submitformat, array('overflowdiv'=>true)); echo $OUTPUT->box_end(); } else { echo '
'.get_string('entries_saved','feedback').'
'; diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php index 6000f1eea850e..a25946d29206b 100644 --- a/mod/feedback/complete_guest.php +++ b/mod/feedback/complete_guest.php @@ -282,7 +282,7 @@ if(isset($savereturn) && $savereturn == 'saved') { if($feedback->page_after_submit) { echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo format_text($feedback->page_after_submit); + echo format_text($feedback->page_after_submit, $feedback->page_after_submitformat, array('overflowdiv'=>true)); echo $OUTPUT->box_end(); } else { echo ''.get_string('entries_saved','feedback').'
'; diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php index fb88cf2d5388d..5f446b9408c56 100644 --- a/mod/feedback/item/label/lib.php +++ b/mod/feedback/item/label/lib.php @@ -129,7 +129,7 @@ function print_item($item){ $item->presentationtrust = 1; $output = file_rewrite_pluginfile_urls($item->presentation, 'pluginfile.php', $context->id, 'mod_feedback', $filearea, $item->id); - echo format_text($output, FORMAT_HTML); + echo format_text($output, FORMAT_HTML, array('overflowdiv'=>true)); } /** diff --git a/mod/feedback/view.php b/mod/feedback/view.php index 0b73791ba7c21..ac4fc9d4fad81 100644 --- a/mod/feedback/view.php +++ b/mod/feedback/view.php @@ -168,7 +168,7 @@ if(has_capability('mod/feedback:edititems', $context)) { echo $OUTPUT->heading(get_string("page_after_submit", "feedback"), 4); echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo format_text($feedback->page_after_submit); + echo format_text($feedback->page_after_submit, $feedback->page_after_submitformat, array('overflowdiv'=>true)); echo $OUTPUT->box_end(); } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 2425b45dd6d5c..583172054425b 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -3121,13 +3121,11 @@ function forum_make_mail_post($course, $cm, $forum, $discussion, $post, $userfro * @return void */ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=false, $reply=false, $link=false, - $footer="", $highlight="", $post_read=null, $dummyifcantsee=true, $istracked=null) { - + $footer="", $highlight="", $postisread=null, $dummyifcantsee=true, $istracked=null, $return=false) { global $USER, $CFG, $OUTPUT; - static $stredit, $strdelete, $strreply, $strparent, $strprune; - static $strpruneheading, $displaymode; - static $strmarkread, $strmarkunread; + // String cache + static $str; $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -3137,7 +3135,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa // caching if (!isset($cm->cache)) { - $cm->cache = new stdClass(); + $cm->cache = new stdClass; } if (!isset($cm->cache->caps)) { @@ -3157,103 +3155,72 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa $cm->uservisible = coursemodule_visible_for_user($cm); } + if ($istracked && is_null($postisread)) { + $postisread = forum_tp_is_post_read($USER->id, $post); + } + if (!forum_user_can_see_post($forum, $discussion, $post, NULL, $cm)) { + $output = ''; if (!$dummyifcantsee) { + if ($return) { + return $output; + } + echo $output; return; } - echo ''; - echo '| '; - // print_user_picture($post->userid, $courseid, $post->picture); - echo ' | '; + $output .= html_writer::tag('a', '', array('id'=>'p'.$post->id)); + $output .= html_writer::start_tag('div', array('class'=>'forumpost clearfix '.$forumpostclass)); + $output .= html_writer::start_tag('div', array('class'=>'row header')); + $output .= html_writer::tag('div', '', array('class'=>'left picture')); // Picture if ($post->parent) { - echo ''; + $output .= html_writer::start_tag('div', array('class'=>'topic')); } else { - echo ' | ';
+ $output .= html_writer::start_tag('div', array('class'=>'topic starter'));
}
- echo ' '.get_string('forumsubjecthidden','forum').' ';
- echo ' |
| '; - echo ' '; - - // Actual content - - echo ' | '."\n"; - echo get_string('forumbodyhidden','forum'); - echo ' |
| '; - echo $OUTPUT->user_picture($postuser, array('courseid'=>$course->id)); - echo ' | '; - - if ($post->parent) { - echo ''; - } else { - echo ' | ';
- }
-
- if (!empty($post->subjectnoformat)) {
- echo ' '.$post->subject.' ';
- } else {
- echo ''.format_string($post->subject).' ';
- }
-
- echo ' |
| '; + // Prepare the groups the posting user belongs to if (isset($cm->cache->usersgroups)) { $groups = array(); if (isset($cm->cache->usersgroups[$post->userid])) { @@ -3265,117 +3232,67 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa $groups = groups_get_all_groups($course->id, $post->userid, $cm->groupingid); } - if ($groups) { - print_group_picture($groups, $course->id, false, false, true); - } else { - echo ' '; - } - -// Actual content - - echo ' | '."\n";
-
+ // Prepare the attachements for the post, files then images
list($attachments, $attachedimages) = forum_print_attachments($post, $cm, 'separateimages');
+
+ // Determine if we need to shorten this post
+ $shortenpost = ($link && (strlen(strip_tags($post->message)) > $CFG->forum_longpost));
- if ($attachments !== '') {
- echo '';
- }
-
- $options = new stdClass();
- $options->para = false;
- $options->trusted = $post->messagetrust;
- $options->context = $modcontext;
- if ($link and (strlen(strip_tags($post->message)) > $CFG->forum_longpost)) {
- // Print shortened version
- echo format_text(forum_shorten_post($post->message), $post->messageformat, $options, $course->id);
- $numwords = count_words(strip_tags($post->message));
- echo ' ';
- echo get_string('readtherest', 'forum');
- echo ' ('.get_string('numwords', '', $numwords).')... ';
- } else {
- // Print whole message
- echo '';
- if ($highlight) {
- echo highlight($highlight, format_text($post->message, $post->messageformat, $options, $course->id));
- } else {
- echo format_text($post->message, $post->messageformat, $options, $course->id);
- }
- echo ' ';
- echo $attachedimages;
- }
-
-
-// Commands
+ // Prepare an array of commands
$commands = array();
- if ($istracked) {
- // SPECIAL CASE: The front page can display a news item post to non-logged in users.
- // Don't display the mark read / unread controls in this case.
- if ($CFG->forum_usermarksread and isloggedin()) {
- if ($post_read) {
- $mcmd = '&mark=unread&postid='.$post->id;
- $mtxt = $strmarkunread;
- } else {
- $mcmd = '&mark=read&postid='.$post->id;
- $mtxt = $strmarkread;
- }
- if ($displaymode == FORUM_MODE_THREADED) {
- $commands[] = ''.$mtxt.'';
- } else {
- $commands[] = ''.$mtxt.'';
- }
+ // SPECIAL CASE: The front page can display a news item post to non-logged in users.
+ // Don't display the mark read / unread controls in this case.
+ if ($istracked && $CFG->forum_usermarksread && isloggedin()) {
+ $url = new moodle_url($discussionlink, array('postid'=>$post->id, 'mark'=>'unread'));
+ $text = $str->markunread;
+ if (!$postisread) {
+ $url->param('mark', 'read');
+ $text = $str->markread;
+ }
+ if ($str->displaymode == FORUM_MODE_THREADED) {
+ $url->param('parent', $post->parent);
+ } else {
+ $url->set_anchor('p'.$post->id);
}
+ $commands[] = array('url'=>$url, 'text'=>$text);
}
- if ($post->parent) { // Zoom in to the parent specifically
- if ($displaymode == FORUM_MODE_THREADED) {
- $commands[] = ''.$strparent.'';
+ // Zoom in to the parent specifically
+ if ($post->parent) {
+ $url = new moodle_url($discussionlink);
+ if ($str->displaymode == FORUM_MODE_THREADED) {
+ $url->param('parent', $post->parent);
} else {
- $commands[] = ''.$strparent.'';
+ $url->set_anchor('p'.$post->id);
}
+ $commands[] = array('url'=>$url, 'text'=>$str->parent);
}
- $age = time() - $post->created;
// Hack for allow to edit news posts those are not displayed yet until they are displayed
- if (!$post->parent and $forum->type == 'news' and $discussion->timestart > time()) {
+ $age = time() - $post->created;
+ if (!$post->parent && $forum->type == 'news' && $discussion->timestart > time()) {
$age = 0;
}
- $editanypost = $cm->cache->caps['mod/forum:editanypost'];
-
- if ($ownpost or $editanypost) {
- if (($age < $CFG->maxeditingtime) or $editanypost) {
- $commands[] = ''.$stredit.'';
- }
+ if (($ownpost && $age < $CFG->maxeditingtime) || $cm->cache->caps['mod/forum:editanypost']) {
+ $commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('edit'=>$post->id)), 'text'=>$str->edit);
}
- if ($cm->cache->caps['mod/forum:splitdiscussions']
- && $post->parent && $forum->type != 'single') {
-
- $commands[] = ''.$strprune.'';
+ if ($cm->cache->caps['mod/forum:splitdiscussions'] && $post->parent && $forum->type != 'single') {
+ $commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('prune'=>$post->id)), 'text'=>$str->prune, 'title'=>$str->pruneheading);
}
- if (($ownpost and $age < $CFG->maxeditingtime
- and $cm->cache->caps['mod/forum:deleteownpost'])
- or $cm->cache->caps['mod/forum:deleteanypost']) {
- $commands[] = ''.$strdelete.'';
+ if (($ownpost && $age < $CFG->maxeditingtime && $cm->cache->caps['mod/forum:deleteownpost']) || $cm->cache->caps['mod/forum:deleteanypost']) {
+ $commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('delete'=>$post->id)), 'text'=>$str->delete);
}
if ($reply) {
- $commands[] = ''.$strreply.'';
+ $commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('reply'=>$post->id)), 'text'=>$str->reply);
}
if ($cm->cache->caps['mod/forum:exportpost'] || ($ownpost && $cm->cache->caps['mod/forum:exportownpost'])) {
- $p = array(
- 'postid' => $post->id,
- );
+ $p = array('postid' => $post->id);
require_once($CFG->libdir.'/portfoliolib.php');
$button = new portfolio_add_button();
$button->set_callback_options('forum_portfolio_caller', array('postid' => $post->id), '/mod/forum/locallib.php');
@@ -3390,39 +3307,151 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
$commands[] = $porfoliohtml;
}
}
+ // Finished building commands
- echo '';
- echo implode(' | ', $commands);
- echo ' ';
+ // Begin output
+
+ if ($istracked) {
+ if ($postisread) {
+ $forumpostclass = 'read';
+ } else {
+ $forumpostclass = ' unread';
+ $output .= html_writer::tag('a', '', array('name'=>'unread'));
+ }
+ } else {
+ // ignore trackign status if not tracked or tracked param missing
+ $forumpostclass = '';
+ }
+
+ $topicclass = '';
+ if (empty($post->parent)) {
+ $topicclass = ' firstpost starter';
+ }
+
+ $output = '';
+ $output .= html_writer::tag('a', '', array('id'=>'p'.$post->id));
+ $output .= html_writer::start_tag('div', array('class'=>'forumpost clearfix '.$forumpostclass.$topicclass));
+ $output .= html_writer::start_tag('div', array('class'=>'row header clearfix'));
+ $output .= html_writer::start_tag('div', array('class'=>'left picture'));
+ $output .= $OUTPUT->user_picture($postuser, array('courseid'=>$course->id));
+ $output .= html_writer::end_tag('div');
+
+
+ $output .= html_writer::start_tag('div', array('class'=>'topic'.$topicclass));
+
+ $postsubject = $post->subject;
+ if (empty($post->subjectnoformat)) {
+ $postsubject = format_string($postsubject);
+ }
+ $output .= html_writer::tag('div', $postsubject, array('class'=>'subject'));
+
+ $by = new stdClass();
+ $by->name = html_writer::link($postuser->profilelink, $postuser->fullname);
+ $by->date = userdate($post->modified);
+ $output .= html_writer::tag('div', get_string('bynameondate', 'forum', $by), array('class'=>'author'));
+
+ $output .= html_writer::end_tag('div'); //topic
+ $output .= html_writer::end_tag('div'); //row
-// Ratings
+ $output .= html_writer::start_tag('div', array('class'=>'row maincontent clearfix'));
+ $output .= html_writer::start_tag('div', array('class'=>'left'));
+
+ $groupoutput = '';
+ if ($groups) {
+ $groupoutput = print_group_picture($groups, $course->id, false, true, true);
+ }
+ if (empty($groupoutput)) {
+ $groupoutput = ' ';
+ }
+ $output .= html_writer::tag('div', $groupoutput, array('class'=>'grouppictures'));
+
+ $output .= html_writer::end_tag('div'); //left side
+ $output .= html_writer::start_tag('div', array('class'=>'no-overflow'));
+ $output .= html_writer::start_tag('div', array('class'=>'content'));
+ if (!empty($attachments)) {
+ $output .= html_writer::tag('div', $attachments, array('class'=>'attachments'));
+ }
+
+ $options = new stdClass;
+ $options->para = false;
+ $options->trusted = $post->messagetrust;
+ $options->context = $modcontext;
+ if ($shortenpost) {
+ // Prepare shortened version
+ $postclass = 'shortenedpost';
+ $postcontent = format_text(forum_shorten_post($post->message), $post->messageformat, $options, $course->id);
+ $postcontent .= html_writer::link($discussionlink, get_string('readtherest', 'forum'));
+ $postcontent .= html_writer::tag('span', '('.get_string('numwords', 'moodle', count_words(strip_tags($post->message))).')...', array('class'=>'post-word-count'));
+ } else {
+ // Prepare whole post
+ $postclass = 'fullpost';
+ $postcontent = format_text($post->message, $post->messageformat, $options, $course->id);
+ if (!empty($highlight)) {
+ $postcontent = highlight($highlight, $postcontent);
+ }
+ $postcontent .= html_writer::tag('div', $attachedimages, array('class'=>'attachedimages'));
+ }
+ // Output the post content
+ $output .= html_writer::tag('div', $postcontent, array('class'=>'posting '.$postclass));
+ $output .= html_writer::end_tag('div'); // Content
+ $output .= html_writer::end_tag('div'); // Content mask
+ $output .= html_writer::end_tag('div'); // Row
+
+ $output .= html_writer::start_tag('div', array('class'=>'row side'));
+ $output .= html_writer::tag('div',' ', array('class'=>'left'));
+ $output .= html_writer::start_tag('div', array('class'=>'options clearfix'));
+
+ // Output ratings
if (!empty($post->rating)) {
- echo html_writer::tag('div', $OUTPUT->render($post->rating), array('class'=>'forum-post-rating'));
+ $output .= html_writer::tag('div', $OUTPUT->render($post->rating), array('class'=>'forum-post-rating'));
}
-// Link to post if required
+ // Output the commands
+ $commandhtml = array();
+ foreach ($commands as $command) {
+ if (is_array($command)) {
+ $commandhtml[] = html_writer::link($command['url'], $command['text']);
+ } else {
+ $commandhtml[] = $command;
+ }
+ }
+ $output .= html_writer::tag('div', implode(' | ', $commandhtml), array('class'=>'commands'));
+ // Output link to post if required
if ($link) {
- echo '';
if ($post->replies == 1) {
$replystring = get_string('repliesone', 'forum', $post->replies);
} else {
$replystring = get_string('repliesmany', 'forum', $post->replies);
}
- echo ''.
- get_string('discussthistopic', 'forum').' ('.$replystring.')';
- echo ' ';
+
+ $output .= html_writer::start_tag('div', array('class'=>'link'));
+ $output .= html_writer::link($discussionlink, get_string('discussthistopic', 'forum'));
+ $output .= ' ('.$replystring.')';
+ $output .= html_writer::end_tag('div'); // link
}
+ // Output footer if required
if ($footer) {
- echo '';
+ $output .= html_writer::tag('div', $footer, array('class'=>'footer'));
}
- echo ' |
'; @@ -873,22 +874,19 @@ function glossary_print_entry_concept($entry, $return=false) { /** * - * @global object - * @global array + * @global moodle_database DB * @param object $entry * @param object $glossary * @param object $cm */ function glossary_print_entry_definition($entry, $glossary, $cm) { - global $DB; + global $DB, $GLOSSARY_EXCLUDECONCEPTS; $definition = $entry->definition; - global $GLOSSARY_EXCLUDECONCEPTS; - //Calculate all the strings to be no-linked //First, the concept - $GLOSSARY_EXCLUDECONCEPTS=array($entry->concept); + $GLOSSARY_EXCLUDECONCEPTS = array($entry->concept); //Now the aliases if ( $aliases = $DB->get_records('glossary_alias', array('entryid'=>$entry->id))) { foreach ($aliases as $alias) { @@ -902,7 +900,8 @@ function glossary_print_entry_definition($entry, $glossary, $cm) { $options = new stdClass(); $options->para = false; $options->trusted = $entry->definitiontrust; - $options->context = $context; + $options->context = $context; + $options->overflowdiv = true; $text = format_text($definition, $entry->definitionformat, $options); // Stop excluding concepts from autolinking diff --git a/mod/glossary/locallib.php b/mod/glossary/locallib.php index bdd76c354a80c..739108102ebc9 100644 --- a/mod/glossary/locallib.php +++ b/mod/glossary/locallib.php @@ -391,6 +391,7 @@ public static function entry_content($course, $cm, $glossary, $entry, $aliases, $entry->definition = portfolio_rewrite_pluginfile_urls($entry->definition, $context->id, 'mod_glossary', 'entry', $entry->id, $format); + $options->overflowdiv = true; $output .= format_text($entry->definition, $entry->definitionformat, $options); if (isset($entry->footer)) { $output .= $entry->footer; diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 57ba30977b07f..35b898248c9b5 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -2020,6 +2020,7 @@ final public function record_attempt($context) { $options = new stdClass; $options->noclean = true; $options->para = true; + $options->overflowdiv = true; $result->feedback = $OUTPUT->box(format_text($this->get_contents(), $this->properties->contentsformat, $options), 'generalbox boxaligncenter'); $result->feedback .= '
'.get_string("youranswer", "lesson").' : '.$result->studentanswer; // already in clean html
$result->feedback .= $OUTPUT->box($result->response, $class); // already conerted to HTML
diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index c411247e46a13..9829ad0428b8b 100644
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -361,6 +361,7 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
$answers = $this->get_used_answers();
$formattextdefoptions = new stdClass;
$formattextdefoptions->para = false; //I'll use it widely in this page
+
foreach ($answers as $answer) {
if ($this->properties->qoption) {
if ($useranswer == NULL) {
diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index 34eeb3ae1a688..23d73229d90af 100644
--- a/mod/lesson/report.php
+++ b/mod/lesson/report.php
@@ -384,6 +384,7 @@
$formattextdefoptions = new stdClass;
$formattextdefoptions->para = false; //I'll use it widely in this page
+ $formattextdefoptions->overflowdiv = true;
$userid = optional_param('userid', NULL, PARAM_INT); // if empty, then will display the general detailed view
$try = optional_param('try', NULL, PARAM_INT);
@@ -442,6 +443,7 @@
$options = new stdClass;
$options->noclean = true;
+ $options->overflowdiv = true;
$answerpage->contents = format_text($page->contents, $page->contentsformat, $options);
$answerpage->qtype = $qtypes[$page->qtype].$page->option_description_string();
diff --git a/mod/page/view.php b/mod/page/view.php
index 8b888dd4bf773..6cc4e2c10c811 100644
--- a/mod/page/view.php
+++ b/mod/page/view.php
@@ -91,7 +91,7 @@
}
$content = file_rewrite_pluginfile_urls($page->content, 'pluginfile.php', $context->id, 'mod_page', 'content', $page->revision);
-$formatoptions = (object)array('noclean'=>true);
+$formatoptions = array('noclean'=>true, 'overflowdiv'=>true);
$content = format_text($content, $page->contentformat, $formatoptions, $course->id);
echo $OUTPUT->box($content, "generalbox center clearfix");
diff --git a/mod/quiz/report.php b/mod/quiz/report.php
index 33ff1c585b45c..710a462e1f753 100644
--- a/mod/quiz/report.php
+++ b/mod/quiz/report.php
@@ -44,6 +44,7 @@
require_login($course, false, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $PAGE->set_pagelayout('report');
$reportlist = quiz_report_list($context);
if (count($reportlist)==0){
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index f3a4064704611..5d858ad9203f3 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -402,14 +402,14 @@ function display($quiz, $cm, $course) {
$imageurl = "{$CFG->wwwroot}/mod/quiz/report/overview/overviewgraph.php?id={$quiz->id}&groupid=$currentgroup";
$graphname = get_string('overviewreportgraphgroup', 'quiz_overview', groups_get_group_name($currentgroup));
echo $OUTPUT->heading($graphname);
- echo '
';
+ echo '';
}
}
if ($DB->record_exists('quiz_grades', array('quiz'=> $quiz->id))) {
$graphname = get_string('overviewreportgraph', 'quiz_overview');
$imageurl = $CFG->wwwroot.'/mod/quiz/report/overview/overviewgraph.php?id='.$quiz->id;
echo $OUTPUT->heading($graphname);
- echo '';
+ echo '';
}
}
return true;
diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index b9fdf11fd7203..2ff7d64e3d97e 100644
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -230,7 +230,7 @@ function output_individual_question_data($quiz, $question, $reporturl, $quizstat
echo $OUTPUT->heading(get_string('questioninformation', 'quiz_statistics'));
echo html_writer::table($questioninfotable);
- echo $OUTPUT->box(format_text($question->questiontext, $question->questiontextformat).$actions, 'boxaligncenter generalbox boxwidthnormal mdl-align');
+ echo $OUTPUT->box(format_text($question->questiontext, $question->questiontextformat, array('overflowdiv'=>true)).$actions, 'boxaligncenter generalbox boxwidthnormal mdl-align');
echo $OUTPUT->heading(get_string('questionstatistics', 'quiz_statistics'));
echo html_writer::table($questionstatstable);
@@ -356,7 +356,7 @@ function output_quiz_info_table($course, $cm, $quiz, $quizstats, $usingattemptss
$quizinformationtable = new html_table();
$quizinformationtable->align = array('center', 'center');
$quizinformationtable->width = '60%';
- $quizinformationtable->class = 'generaltable titlesleft';
+ $quizinformationtable->attributes['class'] = 'generaltable titlesleft boxaligncenter';
$quizinformationtable->data = array();
$quizinformationtable->data[] = array(get_string('quizname', 'quiz_statistics'), $quiz->name);
$quizinformationtable->data[] = array(get_string('coursename', 'quiz_statistics'), $course->fullname);
diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index 5f0cba7bc2ab1..47933ff5ae756 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -1,4 +1,3 @@
-.path-mod-quiz #tablecontainer .flexible-wrap {overflow:auto;}
.path-mod-quiz .graph.flexible-wrap {text-align:center;overflow:auto;}
#page-mod-quiz-comment #manualgradingform,
diff --git a/mod/wiki/edit.php b/mod/wiki/edit.php
index 2fd6d8a33566c..67c9f2423cd5e 100644
--- a/mod/wiki/edit.php
+++ b/mod/wiki/edit.php
@@ -45,6 +45,10 @@
$attachments = optional_param('attachments', 0, PARAM_INT);
$deleteuploads = optional_param('deleteuploads', 0, PARAM_RAW);
+if (is_array($newcontent)) {
+ $newcontent = $newcontent['text'];
+}
+
if (!$page = wiki_get_page($pageid)) {
print_error('incorrectpageid', 'wiki');
}
diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index 399dc1ab45bbc..cbb844231df1d 100644
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -1190,7 +1190,7 @@ function wiki_print_page_content($page, $context, $subwikiid) {
}
}
$html = file_rewrite_pluginfile_urls($page->cachedcontent, 'pluginfile.php', $context->id, 'mod_wiki', 'attachments', $subwikiid);
- $html = format_text($html);
+ $html = format_text($html, FORMAT_MOODLE, array('overflowdiv'=>true));
echo $OUTPUT->box($html);
if (!empty($CFG->usetags)) {
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index fe0a4b6901fe9..720d11abae222 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -589,7 +589,7 @@ protected function process_uploads($context) {
file_save_draft_area_files($this->attachments, $context->id, 'mod_wiki', 'attachments', $this->subwiki->id);
return null;
//return wiki_process_attachments($this->attachments, $this->deleteuploads, $context->id, 'mod_wiki', 'attachments', $this->subwiki->id);
- }
+ }
}
}
@@ -694,7 +694,7 @@ function print_content() {
$t->data[] = $row3;
}
- echo html_writer::table($t);
+ echo html_writer::tag('div', html_writer::table($t), array('class'=>'no-overflow'));
}
}
@@ -1035,7 +1035,7 @@ protected function print_preview() {
$parseroutput = wiki_parse_content($data->contentformat, $data->newcontent_editor['text'], $options);
$this->set_newcontent($data->newcontent_editor['text']);
echo $OUTPUT->notification(get_string('previewwarning', 'wiki'), 'notifyproblem wiki_info');
- $content = format_text($parseroutput['parsed_text'], FORMAT_HTML);
+ $content = format_text($parseroutput['parsed_text'], FORMAT_HTML, array('overflowdiv'=>true));
echo $OUTPUT->box($content, 'generalbox wiki_previewbox');
$content = $this->newcontent;
}
@@ -2080,7 +2080,7 @@ private function print_version_view() {
print_container($heading, false, 'mdl-align wiki_modifieduser wiki_headingtime');
$options = array('swid' => $this->subwiki->id, 'pretty_print' => true, 'pageid' => $this->page->id);
$parseroutput = wiki_parse_content($pageversion->contentformat, $pageversion->content, $options);
- $content = print_container(format_text($parseroutput['parsed_text'], FORMAT_HTML), false, '', '', true);
+ $content = print_container(format_text($parseroutput['parsed_text'], FORMAT_HTML, array('overflowdiv'=>true)), false, '', '', true);
echo $OUTPUT->box($content, 'generalbox wiki_contentbox');
} else {
diff --git a/mod/wiki/renderer.php b/mod/wiki/renderer.php
index 5f7fac97420bd..1460ea53fd123 100644
--- a/mod/wiki/renderer.php
+++ b/mod/wiki/renderer.php
@@ -67,6 +67,7 @@ public function search_result($records) {
$table->colclasses = array('wikisearchresults');
$html .= html_writer::table($table);
}
+ $html = html_writer::tag('div', $html, array('class'=>'no-overflow'));
return $this->output->container($html);
}
diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php
index ea2a2707415c9..e747b2c9f63d0 100644
--- a/mod/workshop/assessment.php
+++ b/mod/workshop/assessment.php
@@ -178,7 +178,7 @@
$instructions = file_rewrite_pluginfile_urls($workshop->instructreviewers, 'pluginfile.php', $PAGE->context->id,
'mod_workshop', 'instructreviewers', 0, workshop::instruction_editors_options($PAGE->context));
print_collapsible_region_start('', 'workshop-viewlet-instructreviewers', get_string('instructreviewers', 'workshop'));
- echo $output->box(format_text($instructions, $workshop->instructreviewersformat), array('generalbox', 'instructions'));
+ echo $output->box(format_text($instructions, $workshop->instructreviewersformat, array('overflowdiv'=>true)), array('generalbox', 'instructions'));
print_collapsible_region_end();
}
diff --git a/mod/workshop/exassessment.php b/mod/workshop/exassessment.php
index 63abd3ff00559..aee2e4179d290 100644
--- a/mod/workshop/exassessment.php
+++ b/mod/workshop/exassessment.php
@@ -115,7 +115,7 @@
$instructions = file_rewrite_pluginfile_urls($workshop->instructreviewers, 'pluginfile.php', $PAGE->context->id,
'mod_workshop', 'instructreviewers', 0, workshop::instruction_editors_options($PAGE->context));
print_collapsible_region_start('', 'workshop-viewlet-instructreviewers', get_string('instructreviewers', 'workshop'));
- echo $output->box(format_text($instructions, $workshop->instructreviewersformat), array('generalbox', 'instructions'));
+ echo $output->box(format_text($instructions, $workshop->instructreviewersformat, array('overflowdiv'=>true)), array('generalbox', 'instructions'));
print_collapsible_region_end();
}
diff --git a/mod/workshop/exsubmission.php b/mod/workshop/exsubmission.php
index 8ad3cc1ea4c17..70870e8df5d7d 100644
--- a/mod/workshop/exsubmission.php
+++ b/mod/workshop/exsubmission.php
@@ -179,7 +179,7 @@
$instructions = file_rewrite_pluginfile_urls($workshop->instructauthors, 'pluginfile.php', $PAGE->context->id,
'mod_workshop', 'instructauthors', 0, workshop::instruction_editors_options($PAGE->context));
print_collapsible_region_start('', 'workshop-viewlet-instructauthors', get_string('instructauthors', 'workshop'));
- echo $output->box(format_text($instructions, $workshop->instructauthorsformat), array('generalbox', 'instructions'));
+ echo $output->box(format_text($instructions, $workshop->instructauthorsformat, array('overflowdiv'=>true)), array('generalbox', 'instructions'));
print_collapsible_region_end();
}
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index 9a282e82b649e..1b1333e5e7f90 100644
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -124,7 +124,7 @@ protected function render_workshop_submission(workshop_submission $submission) {
$o .= $this->output->container_end(); // end of header
- $content = format_text($submission->content, $submission->contentformat);
+ $content = format_text($submission->content, $submission->contentformat, array('overflowdiv'=>true));
$content = file_rewrite_pluginfile_urls($content, 'pluginfile.php', $this->page->context->id,
'mod_workshop', 'submission_content', $submission->id);
$o .= $this->output->container($content, 'content');
@@ -215,7 +215,7 @@ protected function render_workshop_example_submission(workshop_example_submissio
$o .= $this->output->heading(format_string($example->title), 3, 'title');
$o .= $this->output->container_end(); // end of header
- $content = format_text($example->content, $example->contentformat);
+ $content = format_text($example->content, $example->contentformat, array('overflowdiv'=>true));
$content = file_rewrite_pluginfile_urls($content, 'pluginfile.php', $this->page->context->id,
'mod_workshop', 'submission_content', $example->id);
$o .= $this->output->container($content, 'content');
diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php
index 51f731489653f..a0766e6d112d4 100644
--- a/mod/workshop/submission.php
+++ b/mod/workshop/submission.php
@@ -223,7 +223,7 @@
$instructions = file_rewrite_pluginfile_urls($workshop->instructauthors, 'pluginfile.php', $PAGE->context->id,
'mod_workshop', 'instructauthors', 0, workshop::instruction_editors_options($PAGE->context));
print_collapsible_region_start('', 'workshop-viewlet-instructauthors', get_string('instructauthors', 'workshop'));
- echo $output->box(format_text($instructions, $workshop->instructauthorsformat), array('generalbox', 'instructions'));
+ echo $output->box(format_text($instructions, $workshop->instructauthorsformat, array('overflowdiv'=>true)), array('generalbox', 'instructions'));
print_collapsible_region_end();
}
diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 97aee6c8cc204..1eefa0be85f5c 100644
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -100,7 +100,7 @@
$instructions = file_rewrite_pluginfile_urls($workshop->instructauthors, 'pluginfile.php', $PAGE->context->id,
'mod_workshop', 'instructauthors', 0, workshop::instruction_editors_options($PAGE->context));
print_collapsible_region_start('', 'workshop-viewlet-instructauthors', get_string('instructauthors', 'workshop'));
- echo $output->box(format_text($instructions, $workshop->instructauthorsformat), array('generalbox', 'instructions'));
+ echo $output->box(format_text($instructions, $workshop->instructauthorsformat, array('overflowdiv'=>true)), array('generalbox', 'instructions'));
print_collapsible_region_end();
}
@@ -241,7 +241,7 @@
$instructions = file_rewrite_pluginfile_urls($workshop->instructreviewers, 'pluginfile.php', $PAGE->context->id,
'mod_workshop', 'instructreviewers', 0, workshop::instruction_editors_options($PAGE->context));
print_collapsible_region_start('', 'workshop-viewlet-instructreviewers', get_string('instructreviewers', 'workshop'));
- echo $output->box(format_text($instructions, $workshop->instructreviewersformat), array('generalbox', 'instructions'));
+ echo $output->box(format_text($instructions, $workshop->instructreviewersformat, array('overflowdiv'=>true)), array('generalbox', 'instructions'));
print_collapsible_region_end();
}
diff --git a/notes/lib.php b/notes/lib.php
index 18fd0778be353..51df2397a7a13 100644
--- a/notes/lib.php
+++ b/notes/lib.php
@@ -196,7 +196,7 @@ function note_print($note, $detail = NOTES_SHOW_FULL) {
// print note content
if ($detail & NOTES_SHOW_BODY) {
echo '<?php echo $PAGE->title ?>
+
+ standard_head_html() ?>
+
+
+standard_top_of_body_html() ?>
+
+<?php echo $PAGE->title ?>
+
+ standard_head_html() ?>
+
+
+
+standard_top_of_body_html() ?>
+
+
+
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/arialist/style/core.css b/theme/arialist/style/core.css
index a084b9fbf97d1..003c958639f8e 100644
--- a/theme/arialist/style/core.css
+++ b/theme/arialist/style/core.css
@@ -168,7 +168,7 @@ h2.headingblock {
.forumpost .topic {
background: #eee;
border-width: 0;
- padding: 0 10px 0;
+ padding: 4px 10px 4px;
}
.forumpost .subject {
@@ -180,10 +180,14 @@ h2.headingblock {
font-style: italic;
}
-.forumpost .content {
+.forumpost .no-overflow {
border-width: 0 1px 10px;
border-style: solid;
border-color: #aaa #eee #eee;
+ margin: 0 1px 1px 1px;
+}
+
+.forumpost .content .posting {
padding: 5px 10px 10px;
}
diff --git a/theme/arialist/style/pagelayout.css b/theme/arialist/style/pagelayout.css
index f0090fe48ee3e..5c8249c4bb97c 100644
--- a/theme/arialist/style/pagelayout.css
+++ b/theme/arialist/style/pagelayout.css
@@ -1,103 +1,129 @@
/*********************************************************************************************
- left column: 250px
- right column: 250px
- padding left/right column: 10px
- padding center column: 30px
+ left column: 250px
+ right column: 250px
+ padding left/right column: 10px
+ padding center column: 30px
**********************************************************************************************/
body {
- margin: auto 0px;
- width: auto;
+ margin: auto 0px;
+ width: auto;
}
#page {
- width: 100%;
- overflow: hidden;
+ width: 100%;
+ overflow: hidden;
}
#page-header {
- float: left;
- width: 100%;
+ float: left;
+ width: 100%;
}
#page-content {
- clear: both;
- float: left;
- overflow: hidden;
- position: relative;
- width: 100%;
+ clear: both;
+ float: left;
+ overflow: hidden;
+ position: relative;
+ width: 100%;
}
#page-content #region-main-box {
- float: left;
- margin-left: 0;
- position: relative;
- width: 200%;
- right: 100%;
+ float: left;
+ margin-left: 0;
+ position: relative;
+ width: 200%;
+ right: 100%;
}
-#page-content #region-main-box #region-post-box {
- float: left;
- width: 100%;
+#page-content #region-post-box {
+ float: left;
+ width: 100%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap {
- float: left;
- width: 50%;
+#page-content #region-main-wrap {
+ float: left;
+ width: 50%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- overflow: hidden;
- position: relative;
- left: 100%;
+#page-content #region-main {
+ overflow: hidden;
+ position: relative;
+ left: 100%;
}
-#page-content #region-main-box #region-post-box #region-post {
- float: right;
- position: relative;
+#page-content #region-post {
+ float: right;
+ position: relative;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
- overflow: hidden;
- padding: 20px 30px 20px 0;
+#page-content #region-main .region-content {
+ overflow: hidden;
+ padding: 20px 30px 20px 0;
}
-#page-content #region-main-box #region-post-box #region-post .region-content {
- overflow: hidden;
- padding: 20px 0 20px 10px;
+#page-content #region-post .region-content {
+ overflow: hidden;
+ padding: 20px 0 20px 10px;
}
#page-footer {
- clear: both;
- float: left;
- width: 100%;
+ clear: both;
+ float: left;
+ width: 100%;
}
-.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 200px;
+.has_dock.side-post-only .page-middle #region-main {
+ margin-left: 200px;
}
/** No blocks whatsoever **/
-
.content-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
+}
+
+.content-only #page-content #region-post-box {
+ margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box {
- margin-left: 0px;
+.content-only #page-content #region-main {
+ margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 0px;
+.content-only #page-content #region-pre {
+ width: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-pre {
- width: 0px;
+.content-only #page-content #region-post {
+ width: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-post {
- width: 0px;
-}
\ No newline at end of file
+/** Report layout **/
+.pagelayout-report #page {width:auto;position:relative;overflow:visible;}
+.pagelayout-report #page-header {float:none;}
+.pagelayout-report #page-content {float:none;overflow:visible;width:auto;}
+.pagelayout-report #report-main-content {float:left;width:100%;}
+.pagelayout-report #report-main-content .region-content {margin-left:210px;margin-top:20px;}
+.pagelayout-report #report-main-content .region-content table {background-color:#FFF;}
+.pagelayout-report #report-region-wrap {width:0;float:right;position:relative;left:-100%;}
+.pagelayout-report #report-region-pre {width:200px;margin-top:20px;}
+.pagelayout-report #page-footer {float:none;}
+.pagelayout-report #page-content .region-content {overflow:visible;}
+.pagelayout-report.content-only #report-main-content .region-content {margin-left:0;}
+
+/** Correct for right to left languages **/
+.dir-rtl.pagelayout-report #report-main-content .region-content {margin-left:0;margin-right:200px;}
+.dir-rtl.pagelayout-report #report-region-wrap {left:0;}
+
+/** Stabalise IE6 behaviour on the report layout **/
+.ie6.pagelayout-report #report-main-content,
+.ie7.pagelayout-report #report-main-content {float:none;width:auto;}
+.ie6.pagelayout-report #report-region-wrap,
+.ie7.pagelayout-report #report-region-wrap {float:none;width:200px;left:auto;position:absolute;top:0;}
+.ie6.pagelayout-report #report-region-pre,
+.ie6.pagelayout-report #report-region-pre .block
+.ie7.pagelayout-report #report-region-pre,
+.ie7.pagelayout-report #report-region-pre .block {width:100%;}
\ No newline at end of file
diff --git a/theme/base/config.php b/theme/base/config.php
index c1d77a69bed84..712561f4d617e 100644
--- a/theme/base/config.php
+++ b/theme/base/config.php
@@ -152,6 +152,12 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
),
+ // The pagelayout used for reports
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ ),
);
// We don't want the base theme to be shown on the theme selection screen, by setting
diff --git a/theme/base/layout/report.php b/theme/base/layout/report.php
new file mode 100644
index 0000000000000..7b2196f99f5b7
--- /dev/null
+++ b/theme/base/layout/report.php
@@ -0,0 +1,89 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
+
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if (!$showsidepre) {
+ $bodyclasses[] = 'content-only';
+}
+if ($hascustommenu) {
+ $bodyclasses[] = 'has_custom_menu';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+ ';
- echo format_text($note->content, $note->format);
+ echo format_text($note->content, $note->format, array('overflowdiv'=>true));
echo '
';
}
diff --git a/question/editlib.php b/question/editlib.php
index b754ee58fefcb..ba51bbb93c939 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1159,6 +1159,7 @@ protected function get_current_category($categoryandcontext) {
protected function print_category_info($category) {
$formatoptions = new stdClass;
$formatoptions->noclean = true;
+ $formatoptions->overflowdiv = true;
echo '';
echo format_text($category->info, FORMAT_MOODLE, $formatoptions, $this->course->id);
echo "
\n";
diff --git a/tag/locallib.php b/tag/locallib.php
index 6df476a1bed0a..74c788e77f053 100644
--- a/tag/locallib.php
+++ b/tag/locallib.php
@@ -116,6 +116,7 @@ function tag_print_description_box($tag_object, $return=false) {
if (!empty($tag_object->description)) {
$options = new stdClass();
$options->para = false;
+ $options->overflowdiv = true;
$tag_object->description = file_rewrite_pluginfile_urls($tag_object->description, 'pluginfile.php', get_context_instance(CONTEXT_SYSTEM)->id, 'tag', 'description', $tag_object->id);
$output .= format_text($tag_object->description, $tag_object->descriptionformat, $options);
}
diff --git a/theme/anomaly/config.php b/theme/anomaly/config.php
index c97be599bfae0..ac2f64c531dfd 100644
--- a/theme/anomaly/config.php
+++ b/theme/anomaly/config.php
@@ -121,6 +121,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre'
+ ),
);
$THEME->rendererfactory = 'theme_overridden_renderer_factory';
diff --git a/theme/anomaly/layout/report.php b/theme/anomaly/layout/report.php
new file mode 100644
index 0000000000000..686a996c244b8
--- /dev/null
+++ b/theme/anomaly/layout/report.php
@@ -0,0 +1,80 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
+$showsidepre = $hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT);
+
+
+$bodyclasses = array();
+if (!$showsidepre) {
+ $bodyclasses[] = 'content-only';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/arialist/config.php b/theme/arialist/config.php
index 9b7e5a0b8fa2b..818985e78d216 100644
--- a/theme/arialist/config.php
+++ b/theme/arialist/config.php
@@ -167,6 +167,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>false, 'nocustommenu'=>true),
),
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-post'),
+ 'defaultregion' => 'side-post',
+ ),
);
///////////////////////////////////////////////////////////////
diff --git a/theme/arialist/layout/report.php b/theme/arialist/layout/report.php
new file mode 100644
index 0000000000000..2ddb330a2c2ac
--- /dev/null
+++ b/theme/arialist/layout/report.php
@@ -0,0 +1,119 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if ($showsidepost) {
+ $bodyclasses[] = 'side-post-only';
+} else if (!$showsidepost) {
+ $bodyclasses[] = 'content-only';
+}
+if ($hascustommenu) {
+ $bodyclasses[] = 'has-custom-menu';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
+
+
+
+
+
+ heading ?>
+ + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ heading ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-post') ?>
+
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index bfbacbae4c8ed..1cbd8546d6271 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -98,6 +98,11 @@ form.popupform,
form.popupform div {display: inline;}
.arrow_button input {overflow:hidden;}
+.no-overflow {overflow:auto;}
+.pagelayout-report .no-overflow {overflow:visible;}
+.no-overflow > .generaltable {margin-bottom:0;}
+.ie6 .no-overflow {width:100%;}
+
/** IE6 float + background bug solution **/
.ie6 li.section {line-height:1.2em;width:100%;}
@@ -649,10 +654,12 @@ body.tag .managelink {padding: 5px;}
.restore-course-search .rcs-results {width:70%;min-width:400px;border:1px solid #ddd;margin:5px 0;}
.restore-course-search .rcs-results table {width:100%;margin:0;border-width:0;}
+.restore-course-search .rcs-results table .no-overflow {max-width:600px;}
.restore-course-search .rcs-results .paging {text-align:left;margin:0;background-color:#eee;padding:3px;}
.restore-course-category .rcs-results {width:70%;min-width:400px;border:1px solid #ddd;margin:5px 0;}
.restore-course-category .rcs-results table {width:100%;margin:0;border-width:0;}
+.restore-course-category .rcs-results table .no-overflow {max-width:600px;}
.restore-course-category .rcs-results .paging {text-align:left;margin:0;background-color:#eee;padding:3px;}
.corelightbox {background-color:#CCC;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;}
diff --git a/theme/base/style/pagelayout.css b/theme/base/style/pagelayout.css
index 69bb168729c65..bedb4c6d1cbfa 100644
--- a/theme/base/style/pagelayout.css
+++ b/theme/base/style/pagelayout.css
@@ -32,37 +32,62 @@ body {margin:auto 0px;width:auto;}
#page-header {float:left;width:100%;}
#page-content {clear:both;float:left;overflow:hidden;position:relative;width:100%;min-width:900px;}
#page-content #region-main-box {float:left;left:200px;position:relative;width:200%;}
-#page-content #region-main-box #region-post-box {float:left;left:50%;margin-left:-400px;position:relative;width:100%;}
-#page-content #region-main-box #region-post-box #region-main-wrap {float:right;position:relative;right:100%;width:50%;}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-right:0px;margin-left:400px;overflow:hidden;}
-#page-content #region-main-box #region-post-box #region-pre {float:left;left:200px;overflow:hidden;position:relative;width:200px;margin-left:-50%;}
-#page-content #region-main-box #region-post-box #region-post {float:left;left:0px;overflow:hidden;position:relative;width:200px;}
-#page-content #region-main-box .region-content {overflow:hidden;padding:10px;}
+#page-content #region-post-box {float:left;left:50%;margin-left:-400px;position:relative;width:100%;}
+#page-content #region-main-wrap {float:right;position:relative;right:100%;width:50%;}
+#page-content #region-main {margin-right:0px;margin-left:400px;overflow:hidden;}
+#page-content #region-pre {float:left;left:200px;overflow:hidden;position:relative;width:200px;margin-left:-50%;}
+#page-content #region-post {float:left;left:0px;overflow:hidden;position:relative;width:200px;}
+#page-content .region-content {overflow:hidden;padding:10px;}
#page-footer {clear:both;float:left;width:100%;}
/** Only side pre **/
-.side-pre-only #page-content #region-main-box #region-post-box {margin-left:-200px;}
-.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:200px;}
-.side-pre-only #page-content #region-main-box #region-post-box #region-pre {left:0px;}
-.side-pre-only #page-content #region-main-box #region-post-box #region-post {width:0px;}
+.side-pre-only #page-content #region-post-box {margin-left:-200px;}
+.side-pre-only #page-content #region-main {margin-left:200px;}
+.side-pre-only #page-content #region-pre {left:0px;}
+.side-pre-only #page-content #region-post {width:0px;}
/** Only side post **/
.side-post-only #page-content #region-main-box {left:0px;}
-.side-post-only #page-content #region-main-box #region-post-box {margin-left:-200px;}
-.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:200px;}
-.side-post-only #page-content #region-main-box #region-post-box #region-pre {width:0px;}
-.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:200px;}
+.side-post-only #page-content #region-post-box {margin-left:-200px;}
+.side-post-only #page-content #region-main {margin-left:200px;}
+.side-post-only #page-content #region-pre {width:0px;}
+.has_dock.side-post-only .page-middle #region-main {margin-left:200px;}
/** No blocks whatsoever **/
.content-only #page-content {min-width:0;}
.content-only #page-content #region-main-box {left:0px;}
-.content-only #page-content #region-main-box #region-post-box {margin-left:0px;}
-.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:0px;}
-.content-only #page-content #region-main-box #region-post-box #region-pre {left:0;width:0px;}
-.content-only #page-content #region-main-box #region-post-box #region-post {width:0;}
+.content-only #page-content #region-post-box {margin-left:0px;}
+.content-only #page-content #region-main {margin-left:0px;}
+.content-only #page-content #region-pre {left:0;width:0px;}
+.content-only #page-content #region-post {width:0;}
/** Stabalise some IE6 behaviour **/
.ie6 #region-pre .region-content,
.ie6 #region-post .region-content {padding:0 !important;width:100%;float:none;}
.ie6 #region-pre .region-content .block,
-.ie6 #region-post .region-content .block {width:auto;padding:0;margin:10px;}
\ No newline at end of file
+.ie6 #region-post .region-content .block {width:auto;padding:0;margin:10px;}
+
+/** Report layout **/
+.pagelayout-report #page {width:auto;position:relative;}
+.pagelayout-report #page-header {float:none;}
+.pagelayout-report #page-content {float:none;overflow:visible;width:auto;}
+.pagelayout-report #report-main-content {float:left;width:100%;}
+.pagelayout-report #report-main-content .region-content {margin-left:200px;}
+.pagelayout-report #report-main-content .region-content table {background-color:#FFF;}
+.pagelayout-report #report-region-wrap {width:0;float:right;position:relative;left:-100%;}
+.pagelayout-report #report-region-pre {width:200px;}
+.pagelayout-report #page-footer {float:none;}
+.pagelayout-report #page-content .region-content {overflow:visible;}
+
+/** Correct for content only **/
+.pagelayout-report.content-only #report-main-content .region-content {margin-left:0;}
+
+/** Correct for right to left languages **/
+.dir-rtl.pagelayout-report #report-main-content .region-content {margin-left:0;margin-right:200px;}
+.dir-rtl.pagelayout-report #report-region-wrap {left:0;}
+
+/** Stabalise IE6 behaviour on the report layout **/
+.ie6.pagelayout-report #report-main-content {float:none;width:auto;}
+.ie6.pagelayout-report #report-region-wrap {float:none;width:200px;left:auto;position:absolute;top:0;}
+.ie6.pagelayout-report #report-region-pre,
+.ie6.pagelayout-report #report-region-pre .block {width:100%;}
diff --git a/theme/binarius/config.php b/theme/binarius/config.php
index 27fc3f673bfac..59808d35ada7c 100644
--- a/theme/binarius/config.php
+++ b/theme/binarius/config.php
@@ -166,6 +166,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>false, 'nocustommenu'=>true),
),
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-post'),
+ 'defaultregion' => 'side-post',
+ ),
);
///////////////////////////////////////////////////////////////
diff --git a/theme/binarius/layout/report.php b/theme/binarius/layout/report.php
new file mode 100644
index 0000000000000..a67f792baf55a
--- /dev/null
+++ b/theme/binarius/layout/report.php
@@ -0,0 +1,118 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if ($showsidepost) {
+ $bodyclasses[] = 'side-post-only';
+} else if (!$showsidepost) {
+ $bodyclasses[] = 'content-only';
+}
+
+if ($hascustommenu) {
+ $bodyclasses[] = 'has-custom-menu';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
+
+
+
+
+
+ heading ?>
+ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/binarius/style/pagelayout.css b/theme/binarius/style/pagelayout.css
index b232bfaad81c1..bde162c687073 100644
--- a/theme/binarius/style/pagelayout.css
+++ b/theme/binarius/style/pagelayout.css
@@ -1,115 +1,144 @@
/*********************************************************************************************
- left column: 250px
- right column: 250px
- padding left/right column: 10px
- padding center column: 30px
+ left column: 250px
+ right column: 250px
+ padding left/right column: 10px
+ padding center column: 30px
**********************************************************************************************/
body {
- margin: auto 0px;
- width: auto;
+ margin: auto 0px;
+ width: auto;
}
#page {
- width: 100%;
- overflow: hidden;
+ width: 100%;
+ overflow: hidden;
}
#page-header {
- float: left;
- width: 100%;
+ float: left;
+ width: 100%;
}
#page-content {
- clear: both;
- float: left;
- overflow: hidden;
- position: relative;
- width: 100%;
+ clear: both;
+ float: left;
+ overflow: hidden;
+ position: relative;
+ width: 100%;
}
#page-content #region-main-box {
- float: left;
- margin-left: 0;
- position: relative;
- width: 200%;
- right: 100%;
+ float: left;
+ margin-left: 0;
+ position: relative;
+ width: 200%;
+ right: 100%;
}
#page-content #region-main-box #region-post-box {
- float: left;
- margin-left: -250px;
- width: 100%;
+ float: left;
+ margin-left: -250px;
+ width: 100%;
}
#page-content #region-main-box #region-post-box #region-main-wrap {
- float: left;
- width: 50%;
+ float: left;
+ width: 50%;
}
#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- overflow: hidden;
- position: relative;
- margin-left: 250px;
- left: 100%;
+ overflow: hidden;
+ position: relative;
+ margin-left: 250px;
+ left: 100%;
}
#page-content #region-main-box #region-post-box #region-pre {
- float: right;
- position: relative;
- left: 250px;
- width: 250px;
+ float: right;
+ position: relative;
+ left: 250px;
+ width: 250px;
}
#page-content #region-main-box #region-post-box #region-post {
- float: right;
- position: relative;
- left: 250px;
- width: 250px;
+ float: right;
+ position: relative;
+ left: 250px;
+ width: 250px;
}
#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
- overflow: hidden;
- padding: 10px 20px 20px 10px;
+ overflow: hidden;
+ padding: 10px 20px 20px 10px;
}
#page-content #region-main-box #region-post-box #region-pre .region-content,
#page-content #region-main-box #region-post-box #region-post .region-content {
- overflow: hidden;
- padding: 10px 0 20px 10px;
+ overflow: hidden;
+ padding: 10px 0 20px 10px;
}
#page-footer {
- clear: both;
- float: left;
- width: 100%;
+ clear: both;
+ float: left;
+ width: 100%;
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 200px;
+ margin-left: 200px;
}
/** No blocks whatsoever **/
.content-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box {
- margin-left: 0px;
+ margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 0px;
+ margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-pre {
- width: 0px;
+ width: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-post {
- width: 0px;
-}
\ No newline at end of file
+ width: 0px;
+}
+
+
+/** Report layout **/
+.pagelayout-report {border-top:1px solid #555555;}
+.pagelayout-report #page {width:auto;position:relative;overflow:visible;}
+.pagelayout-report #page-header {float:none;}
+.pagelayout-report #page-content {float:none;overflow:visible;width:auto;}
+.pagelayout-report #report-main-content {float:left;width:100%;}
+.pagelayout-report #report-main-content .region-content {margin-left:210px;margin-top:20px;}
+.pagelayout-report #report-main-content .region-content table {background-color:#FFF;}
+.pagelayout-report #report-region-wrap {width:0;float:right;position:relative;left:-100%;}
+.pagelayout-report #report-region-pre {width:200px;margin-top:20px;}
+.pagelayout-report #page-footer {float:none;}
+.pagelayout-report #page-content .region-content {overflow:visible;}
+.pagelayout-report.content-only #report-main-content .region-content {margin-left:0;}
+
+/** Correct for right to left languages **/
+.dir-rtl.pagelayout-report #report-main-content .region-content {margin-left:0;margin-right:200px;}
+.dir-rtl.pagelayout-report #report-region-wrap {left:0;}
+
+/** Stabalise IE6 behaviour on the report layout **/
+.ie6.pagelayout-report #report-main-content,
+.ie7.pagelayout-report #report-main-content {float:none;width:auto;}
+.ie6.pagelayout-report #report-region-wrap,
+.ie7.pagelayout-report #report-region-wrap {float:none;width:200px;left:auto;position:absolute;top:0;}
+.ie6.pagelayout-report #report-region-pre,
+.ie6.pagelayout-report #report-region-pre .block
+.ie7.pagelayout-report #report-region-pre,
+.ie7.pagelayout-report #report-region-pre .block {width:100%;}
\ No newline at end of file
diff --git a/theme/boxxie/style/core.css b/theme/boxxie/style/core.css
index 0da356c5b45ed..4a4180d527b8c 100644
--- a/theme/boxxie/style/core.css
+++ b/theme/boxxie/style/core.css
@@ -645,15 +645,14 @@ h2.headingblock {
text-decoration: none;
}
-.forumpost .content {
- border-width: 1px ;
- border-color: #a0c278;
- border-style: solid;
- padding: 5px 10px;
+.forumpost .no-overflow,
+.forumpost .options {
+ border: 1px solid #a0c278;
}
-.forumpost .commands {
- padding: 10px 0;
+.forumpost .options,
+.forumpost .content .posting {
+ padding: 5px 10px;
}
.forumaddnew,
diff --git a/theme/brick/config.php b/theme/brick/config.php
index 946067e5d00cf..2d465cdf1938e 100644
--- a/theme/brick/config.php
+++ b/theme/brick/config.php
@@ -38,8 +38,8 @@
$THEME->parents = array(
- 'canvas',
- 'base',
+ 'canvas',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -54,11 +54,10 @@
$THEME->sheets = array(
-'pagelayout',
- 'core',
- 'colors',
- 'css3',
-
+ 'pagelayout',
+ 'core',
+ 'colors',
+ 'css3',
);
////////////////////////////////////////////////////
@@ -67,12 +66,12 @@
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'pagelayout',
- ),
- 'canvas'=>array(
- 'pagelayout',
- ),
+ 'base'=>array(
+ 'pagelayout',
+ ),
+ 'canvas'=>array(
+ 'pagelayout',
+ ),
);
@@ -158,11 +157,16 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
+ 'report' => array(
+ 'file' => 'general.php',
+ 'regions' => array('side-post'),
+ 'defaultregion' => 'side-post',
+ ),
);
@@ -175,7 +179,7 @@
// specific page.
///////////////////////////////////////////////////////////////
-//$THEME->csspostprocess = 'arialist_process_css';
+//$THEME->csspostprocess = 'arialist_process_css';
////////////////////////////////////////////////////
// Allows the user to provide the name of a function
// that all CSS should be passed to before being
@@ -189,7 +193,7 @@
// media player for the filters
////////////////////////////////////////////////////
-// $THEME->javascripts
+// $THEME->javascripts
////////////////////////////////////////////////////
// An array containing the names of JavaScript files
@@ -203,20 +207,20 @@
// As above but will be included in the page footer.
////////////////////////////////////////////////////
-//$THEME->larrow = '⟨';
+//$THEME->larrow = '⟨';
////////////////////////////////////////////////////
// Overrides the left arrow image used throughout
// Moodle
////////////////////////////////////////////////////
-//$THEME->rarrow = '⟩';
+//$THEME->rarrow = '⟩';
////////////////////////////////////////////////////
// Overrides the right arrow image used throughout Moodle
////////////////////////////////////////////////////
-// $THEME->layouts
+// $THEME->layouts
////////////////////////////////////////////////////
// An array setting the layouts for the theme
@@ -229,7 +233,7 @@
// the themes parents
////////////////////////////////////////////////////
-// $THEME->parents_exclude_sheets
+// $THEME->parents_exclude_sheets
////////////////////////////////////////////////////
// An array of stylesheets not to inherit from the
@@ -253,7 +257,7 @@
// $THEME->resource_mp3player_colors
////////////////////////////////////////////////////
-// Controls the colours for the MP3 player
+// Controls the colours for the MP3 player
////////////////////////////////////////////////////
$THEME->csspostprocess = 'brick_process_css';
//$THEME->rendererfactory = 'theme_overridden_renderer_factory';
diff --git a/theme/brick/style/core.css b/theme/brick/style/core.css
index 75e50b3b0882f..b01544de28a4a 100644
--- a/theme/brick/style/core.css
+++ b/theme/brick/style/core.css
@@ -4,274 +4,274 @@
---------------------------*/
html, body {
- background: #eee;
+ background: #eee;
}
#mypagewrapper {
- width: 100%;
- border-top: 1px solid #fff;
+ width: 100%;
+ border-top: 1px solid #fff;
}
#page {
- margin-top: 15px;
- width: 90%;
- min-width: 960px;
- margin-left: auto;
- margin-right: auto;
- clear: both;
- border: 1px solid #dadada;
- background: #fff;
+ margin-top: 15px;
+ width: 90%;
+ min-width: 960px;
+ margin-left: auto;
+ margin-right: auto;
+ clear: both;
+ border: 1px solid #dadada;
+ background: #fff;
}
#wrapper {
- padding: 20px;
- padding-left: 20px;
- padding-right: 17px;
+ padding: 20px;
+ padding-left: 20px;
+ padding-right: 17px;
}
#wrapper.notathome {
- padding-top: 15px;
+ padding-top: 15px;
}
.content-only #wrapper {
- padding-right: 0px;
+ padding-right: 0px;
}
/* Header
----------------------------*/
#headerwrap {
- width: 100%;
- top: 0px;
- height: 140px;
+ width: 100%;
+ top: 0px;
+ height: 140px;
}
#header {
- width: 90%;
- min-width: 960px;
- margin-left: auto;
- margin-right: auto;
+ width: 90%;
+ min-width: 960px;
+ margin-left: auto;
+ margin-right: auto;
}
#logo {
- background-position: 0% 40%;
- width: 300px;
- height: 70px;
- float: left;
+ background-position: 0% 40%;
+ width: 300px;
+ height: 70px;
+ float: left;
}
#nologo {
- width: 590px;
- height: 70px;
- float: left;
- margin-left: 6px;
- overflow: hidden;
+ width: 590px;
+ height: 70px;
+ float: left;
+ margin-left: 6px;
+ overflow: hidden;
}
#nologo a, #nologo {
- font-family: Georgia, Palatino, serif;
- line-height: 70px;
- font-size: 28px;
- font-weight: 600;
- letter-spacing: -1px;
+ font-family: Georgia, Palatino, serif;
+ line-height: 70px;
+ font-size: 28px;
+ font-weight: 600;
+ letter-spacing: -1px;
}
#loggedinas {
- min-width: 300px;
- height: 65px;
- float: right;
- text-align: right;
- line-height: 65px;
- font-size: 10px;
+ min-width: 300px;
+ height: 65px;
+ float: right;
+ text-align: right;
+ line-height: 65px;
+ font-size: 10px;
}
#loginas a {
- color: #fff;
+ color: #fff;
}
#headerbottom {
- clear: both;
+ clear: both;
}
#headingtitle {
- float: right;
- width: 280px;
- padding-right: 5px;
- text-align: right;
- height: 70px;
- overflow: hidden;
- background: url([[pix:theme|youare]]) no-repeat;
- background-position: 95% 110%;
- position: relative;
- bottom: -2px;
+ float: right;
+ width: 280px;
+ padding-right: 5px;
+ text-align: right;
+ height: 70px;
+ overflow: hidden;
+ background: url([[pix:theme|youare]]) no-repeat;
+ background-position: 95% 110%;
+ position: relative;
+ bottom: -2px;
}
#headingtitle h1 {
- line-height: 67px;
- font-weight: 200;
- font-size: 13px;
- text-transform: uppercase;
- color: #fff;
+ line-height: 67px;
+ font-weight: 200;
+ font-size: 13px;
+ text-transform: uppercase;
+ color: #fff;
}
/* end Header
----------------------------*/
#region-post2 .region-content div.navbutton {
- display: inline-block !important;
- width: 100%;
- float: none;
- margin-bottom: 5px;
- margin-top: 5px;
- clear: both;
+ display: inline-block !important;
+ width: 100%;
+ float: none;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ clear: both;
}
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
- font-family: Georgia, Palatino, serif;
- line-height: 1.5;
- color: #333;
+ font-family: Georgia, Palatino, serif;
+ line-height: 1.5;
+ color: #333;
}
h1, h2, h3, h4 {
- font-family: Georgia, Times, "Times New Roman", serif !important;
+ font-family: Georgia, Times, "Times New Roman", serif !important;
}
h2,h3,h4,h5,h6 {
- color: #999;
- font-weight: normal;
+ color: #999;
+ font-weight: normal;
}
blockquote {
- border-left: 1px solid #eee;
- padding-left: 15px;
- color: #666;
+ border-left: 1px solid #eee;
+ padding-left: 15px;
+ color: #666;
}
.mform fieldset {
- border-color: #eee;
+ border-color: #eee;
}
.mform fieldset legend {
- color: #555;
- font-weight: normal;
- font-size: 1.2em;
- border: 1px solid #eee;
- padding: 2px 5px;
- background: #fff;
+ color: #555;
+ font-weight: normal;
+ font-size: 1.2em;
+ border: 1px solid #eee;
+ padding: 2px 5px;
+ background: #fff;
}
div.navbar {
- border-bottom: 1px solid #eee;
- border-top: 1px solid #eee;
- background: #fafafa url([[pix:theme|block]]) no-repeat;
- background-position: 100% 0%;
- font-size: 0.85em;
- font-style: italic;
- font-weight: 200;
- padding:0 10px;
- margin-bottom: 7px;
+ border-bottom: 1px solid #eee;
+ border-top: 1px solid #eee;
+ background: #fafafa url([[pix:theme|block]]) no-repeat;
+ background-position: 100% 0%;
+ font-size: 0.85em;
+ font-style: italic;
+ font-weight: 200;
+ padding:0 10px;
+ margin-bottom: 7px;
}
div.breadcrumb li {
- line-height: 30px;
- font-family: Georgia, serif;
+ line-height: 30px;
+ font-family: Georgia, serif;
}
.breadcrumb li img {
- vertical-align: middle;
+ vertical-align: middle;
}
/** breadcrumb image replacement **/
div.navbar span.arrow.sep {
- font-size: 1px;
- color: #fafafa;
- background: url([[pix:theme|crumber]]) no-repeat;
- background-position: 50% 25%;
- display: inline-block;
- width: 16px;
- height: 30px;
+ font-size: 1px;
+ color: #fafafa;
+ background: url([[pix:theme|crumber]]) no-repeat;
+ background-position: 50% 25%;
+ display: inline-block;
+ width: 16px;
+ height: 30px;
}
.navbutton {
- float: none;
- width: 100%;
- padding: 5px 0 15px;
- text-align: center;
+ float: none;
+ width: 100%;
+ padding: 5px 0 15px;
+ text-align: center;
}
/* Blocks
----------------------------*/
.block {
- border: none;
+ border: none;
}
div.block {
- padding: 2px;
- border: 1px solid #dadada;
- margin-left: -10px;
+ padding: 2px;
+ border: 1px solid #dadada;
+ margin-left: -10px;
}
#region-main div.block {
- margin-left: 0px;
- background-image: none;
+ margin-left: 0px;
+ background-image: none;
}
.block div.header {
- min-height: 33px;
- padding-top: 3px;
- padding-left: 3px;
+ min-height: 33px;
+ padding-top: 3px;
+ padding-left: 3px;
}
div.block.hidden div.header {
- border-bottom: none;
+ border-bottom: none;
}
.block .header h2 {
- font-size: 13px;
- font-weight: 200;
- text-transform: uppercase;
+ font-size: 13px;
+ font-weight: 200;
+ text-transform: uppercase;
}
.block div.content {
- background: #fff;
- border: 1px solid #dadada;
- border-top: none;
- padding: 4px;
+ background: #fff;
+ border: 1px solid #dadada;
+ border-top: none;
+ padding: 4px;
}
.block div.content h1, .block div.content h2.main, .block div.content h3.main {
- font-size: 13px;
- background-image: none;
+ font-size: 13px;
+ background-image: none;
}
.block_calendar_month table.minicalendar.calendartable td,.block_calendar_month table.minicalendar.calendartable th {
- border: none !important;
+ border: none !important;
}
.block_calendar_month table.minicalendar {
- margin-bottom: 0px !important;
+ margin-bottom: 0px !important;
}
.block_calendar_month table.minicalendar.calendartable th abbr {
- border: none !important;
- text-decoration: none;
+ border: none !important;
+ text-decoration: none;
}
/** main headings **/
.generalbox h2,h3.sectionname, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 {
- font-weight: 600;
- letter-spacing: -1px;
- line-height: 1.3em;
- font-size: 28px;
- border-bottom: 0px solid #eee;
- padding-bottom: 2px;
- background: url([[pix:theme|mainbar]]) repeat-x;
- background-position: 0% 100%;
+ font-weight: 600;
+ letter-spacing: -1px;
+ line-height: 1.3em;
+ font-size: 28px;
+ border-bottom: 0px solid #eee;
+ padding-bottom: 2px;
+ background: url([[pix:theme|mainbar]]) repeat-x;
+ background-position: 0% 100%;
}
.generalbox h2, #page-course-info h2.main, h3.sectionname, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2, div.hd h3.main {
- font-size: 22px;
- background: none;
+ font-size: 22px;
+ background: none;
}
@@ -280,259 +280,264 @@ div.block.hidden div.header {
----------------------------*/
.coursebox {
- border-color: #eee;
+ border-color: #eee;
}
.coursebox .info {
- width: 35%;
+ width: 35%;
}
.coursebox .info .name {
- margin-bottom: 0;
+ margin-bottom: 0;
}
.coursebox .info .teachers {
- font-size: 0.9em;
- color: #888;
+ font-size: 0.9em;
+ color: #888;
}
.coursebox .summary {
- width: 63%;
+ width: 63%;
}
.course-content .section.main {
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #eee;
}
.course-content .section.main .content {
- padding: 5px 5px 10px;
+ padding: 5px 5px 10px;
}
.course-content .weeks .section.main .content {
- margin-left: 0;
+ margin-left: 0;
}
.course-content .weeks .section.main .left {
- display: none;
+ display: none;
}
.course-content .section.main.current {
- background: #fffcdc;
+ background: #fffcdc;
}
.course-content .weeks .section.main h3.weekdates {
- color: #999;
+ color: #999;
}
.course-content .current .left,
.course-content .current h3.weekdates {
- color: #92310c !important;
+ color: #92310c !important;
}
span.completionprogress {
- font-size: 11px;
- color: #666666;
+ font-size: 11px;
+ color: #666666;
}
/* Forum
--------------------------*/
.forumpost .topic {
- background: #eee url([[pix:theme|block]]) no-repeat;
- background-position: 100% 0%;
- border-width: 0;
- border: 1px solid #dadada;
- padding: 0 10px 0;
+ background: #eee url([[pix:theme|block]]) no-repeat;
+ background-position: 100% 0%;
+ border-width: 0;
+ border: 1px solid #dadada;
+ padding: 0 10px 0;
}
.forumpost .subject {
- font-size: 1.45em;
- font-family: Georgia, serif;
+ font-size: 1.45em;
+ font-family: Georgia, serif;
}
.forumpost .author {
- font-size: 0.9em;
- font-style: italic;
+ font-size: 0.9em;
+ font-style: italic;
}
td.picture.left img {
- background: #fafafa;
- padding: 4px;
- padding-bottom: 9px;
- border: 1px solid #dadada;
+ background: #fafafa;
+ padding: 4px;
+ padding-bottom: 9px;
+ border: 1px solid #dadada;
}
-.forumpost .content {
- border-width: 0 1px 1px;
- border-style: solid;
- border-color: #aaa #dadada #dadada;
- padding: 5px 10px 10px;
+.forumpost .options,
+.forumpost .no-overflow {
+ border-width: 0 1px 1px;
+ border-style: solid;
+ border-color: #aaa #dadada #dadada;
+}
+
+.forumpost .options,
+.forumpost .content .posting {
+ padding: 5px 10px 10px;
}
/* Footer
----------------------------*/
#page-footer .helplink {
- margin: 1em 0;
+ margin: 1em 0;
}
/* Dock */
body.has_dock {
- margin: 0px;
+ margin: 0px;
}
.has_dock #page, .has_dock #header {
- margin-left: 5%;
+ margin-left: 5%;
}
#dock {
- left: 5%;
- top: 107px;
- margin-left: -29px;
- border-width: 0;
- background-color: transparent;
- position: absolute;
+ left: 5%;
+ top: 107px;
+ margin-left: -29px;
+ border-width: 0;
+ background-color: transparent;
+ position: absolute;
}
#dock .controls {
- bottom: auto;
- -webkit-border-bottom-left-radius: 3px;
- -moz-border-radius-bottomleft: 3px;
- border-bottom-left-radius: 3px;
+ bottom: auto;
+ -webkit-border-bottom-left-radius: 3px;
+ -moz-border-radius-bottomleft: 3px;
+ border-bottom-left-radius: 3px;
}
#dock .dockeditem_container {
- position: relative;
+ position: relative;
}
#dock .dockeditem.firstdockitem {
- margin-top: 50px;
- border-top: 1px solid #dadada;
- -webkit-border-top-left-radius: 3px;
- -moz-border-radius-topleft: 3px;
- border-top-left-radius: 3px;
+ margin-top: 50px;
+ border-top: 1px solid #dadada;
+ -webkit-border-top-left-radius: 3px;
+ -moz-border-radius-topleft: 3px;
+ border-top-left-radius: 3px;
}
#dock .dockeditem {
- background-color: #fff;
- padding: 2px;
- padding-right: 0px;
- border-left: 1px solid #dadada;
- border-right: 0px solid #fafafa;
- border-top: 1px solid #fafafa;
+ background-color: #fff;
+ padding: 2px;
+ padding-right: 0px;
+ border-left: 1px solid #dadada;
+ border-right: 0px solid #fafafa;
+ border-top: 1px solid #fafafa;
}
#dock .dockedtitle {
- border-width: 0;
+ border-width: 0;
}
#dock .dockedtitle h2 {
- margin: 0;
- padding: 10px 3px;
+ margin: 0;
+ padding: 10px 3px;
}
#dock .dockedtitle.activeitem {
- color: #fff !important;
- width: 35px;
- -webkit-border-top-left-radius: 3px;
- -moz-border-radius-topleft: 3px;
- border-top-left-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- -moz-border-radius-bottomleft: 3px;
- border-bottom-left-radius: 3px;
+ color: #fff !important;
+ width: 35px;
+ -webkit-border-top-left-radius: 3px;
+ -moz-border-radius-topleft: 3px;
+ border-top-left-radius: 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -moz-border-radius-bottomleft: 3px;
+ border-bottom-left-radius: 3px;
}
#dock .dockedtitle.activeitem h2 {
- color: #fff !important;
+ color: #fff !important;
}
#dockeditempanel {
- margin-left: 0px;
+ margin-left: 0px;
}
#dockeditempanel .dockeditempanel_content {
- background-color: #fff;
- margin: 0 3px;
- position: relative;
- min-height: 100px;
- -webkit-border-radius: 3px;
- -webkit-border-top-left-radius: 0;
- -moz-border-radius: 3px;
- -moz-border-radius-topleft: 0;
- border-radius: 3px;
- border-top-left-radius: 0;
+ background-color: #fff;
+ margin: 0 3px;
+ position: relative;
+ min-height: 100px;
+ -webkit-border-radius: 3px;
+ -webkit-border-top-left-radius: 0;
+ -moz-border-radius: 3px;
+ -moz-border-radius-topleft: 0;
+ border-radius: 3px;
+ border-top-left-radius: 0;
}
#dockeditempanel .dockeditempanel_hd {
- border-width: 0;
- padding: 2px;
+ border-width: 0;
+ padding: 2px;
}
#dockeditempanel .dockeditempanel_hd h2 {
- font-size: 0.9em;
- color: #fff;
+ font-size: 0.9em;
+ color: #fff;
}
/** yui menu styles **/
#menustuff {
- width: 600px;
- float: left;
- clear: left;
- height: 65px;
+ width: 600px;
+ float: left;
+ clear: left;
+ height: 65px;
}
#custommenu {
- border: none !important;
+ border: none !important;
}
div.yui3-menu-content {
- border: none !important;
+ border: none !important;
}
.yui3-menu-content li a {
- font-size: 14px;
- font-family: Georgia, serif !important;
- font-weight: 200;
- text-transform: lowercase;
- line-height: 70px;
- cursor: pointer;
- border-right: none !important;
- border-top: none !important;
- border-bottom: none !important;
+ font-size: 14px;
+ font-family: Georgia, serif !important;
+ font-weight: 200;
+ text-transform: lowercase;
+ line-height: 70px;
+ cursor: pointer;
+ border-right: none !important;
+ border-top: none !important;
+ border-bottom: none !important;
}
.yui3-menu-content li a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
div.custom_menu_submenu li a {
- line-height: 30px;
- text-shadow: none !important;
+ line-height: 30px;
+ text-shadow: none !important;
}
div.yui3-menu.custom_menu_submenu {
- background: url([[pix:theme|youare]]) no-repeat;
- background-position: 30px 10px;
- top: 120px !important;
- border: none;
- min-width: 100px;
- z-index: 99998;
+ background: url([[pix:theme|youare]]) no-repeat;
+ background-position: 30px 10px;
+ top: 120px !important;
+ border: none;
+ min-width: 100px;
+ z-index: 99998;
}
div.yui3-menu.custom_menu_submenu div.yui3-menu-content {
- margin-top: 22px;
- border: 1px solid #dadada !important;
- border-top: none !important;
+ margin-top: 22px;
+ border: 1px solid #dadada !important;
+ border-top: none !important;
}
/** below style to move sub subs to the left to keep from going off the page **/
div.yui3-menu.custom_menu_submenu div.yui3-menu-content div.yui3-menu.custom_menu_submenu div.yui3-menu-content {
- background-image: none !important;
- min-width: 200px;
- position: relative;
- margin-top: -50px;
- border-top: 1px solid #dadada !important;
+ background-image: none !important;
+ min-width: 200px;
+ position: relative;
+ margin-top: -50px;
+ border-top: 1px solid #dadada !important;
}
\ No newline at end of file
diff --git a/theme/brick/style/pagelayout.css b/theme/brick/style/pagelayout.css
index 35de309aac9d1..349d86962bf16 100644
--- a/theme/brick/style/pagelayout.css
+++ b/theme/brick/style/pagelayout.css
@@ -38,33 +38,33 @@ body {
right: 100%;
}
-#page-content #region-main-box #region-post-box {
+#page-content #region-post-box {
float: left;
width: 100%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap {
+#page-content #region-main-wrap {
float: left;
width: 50%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+#page-content #region-main {
overflow: hidden;
position: relative;
left: 100%;
}
-#page-content #region-main-box #region-post-box #region-post {
+#page-content #region-post {
float: right;
position: relative;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
+#page-content #region-main .region-content {
overflow: hidden;
padding: 0px 30px 20px 0;
}
-#page-content #region-main-box #region-post-box #region-post .region-content {
+#page-content #region-post .region-content {
overflow: hidden;
padding: 0px 0 20px 10px;
}
@@ -86,31 +86,34 @@ body {
margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box {
+.content-only #page-content #region-post-box {
margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+.content-only #page-content #region-main {
margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-pre {
+.content-only #page-content #region-pre {
width: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-post {
+.content-only #page-content #region-post {
width: 0px;
}
-#page-content #region-main-box #region-post-box {
+#page-content #region-post-box {
margin-left: -250px;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+#page-content #region-main {
margin-left: 250px;
}
-#page-content #region-main-box #region-post-box #region-post {
+#page-content #region-post {
left: 250px;
width: 250px;
}
+
+.pagelayout-report #page-content #region-main {overflow:auto;}
+.pagelayout-report #page-content #region-main .region-content {overflow:visible;}
\ No newline at end of file
diff --git a/theme/canvas/config.php b/theme/canvas/config.php
index e375fd9e8d8f7..19951f17b8480 100644
--- a/theme/canvas/config.php
+++ b/theme/canvas/config.php
@@ -41,7 +41,7 @@
////////////////////////////////////////////////////
$THEME->parents = array(
- 'base',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -55,16 +55,16 @@
////////////////////////////////////////////////////
$THEME->sheets = array(
- 'pagelayout',
- 'text',
- 'core',
- 'course',
- 'mods',
- 'blocks',
- 'tabs',
- 'admin',
- 'tables',
- 'popups',
+ 'pagelayout',
+ 'text',
+ 'core',
+ 'course',
+ 'mods',
+ 'blocks',
+ 'tabs',
+ 'admin',
+ 'tables',
+ 'popups',
);
////////////////////////////////////////////////////
@@ -73,10 +73,10 @@
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'navigation',
- 'browser',
- ),
+ 'base'=>array(
+ 'navigation',
+ 'browser',
+ ),
);
////////////////////////////////////////////////////
@@ -168,6 +168,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ )
);
/////////////////////////////////////////////////////////
diff --git a/theme/canvas/layout/general.php b/theme/canvas/layout/general.php
index c5e77258db492..532cc2e487350 100644
--- a/theme/canvas/layout/general.php
+++ b/theme/canvas/layout/general.php
@@ -26,29 +26,29 @@
standard_top_of_body_html() ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ heading ?>
+ + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-post') ?>
+
+
-
+
-
- <?php echo $PAGE->title ?>
+
+ standard_head_html() ?>
+
+
+standard_top_of_body_html() ?>
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/canvas/style/pagelayout.css b/theme/canvas/style/pagelayout.css
index 46a69ee42680a..b3c811cb16e85 100644
--- a/theme/canvas/style/pagelayout.css
+++ b/theme/canvas/style/pagelayout.css
@@ -1,21 +1,19 @@
#page-content #region-main-box {
- left: 210px;
-/
-
-* Width of left sideblock */
+ left: 210px;
+/* Width of left sideblock */
}
-#page-content #region-main-box #region-post-box {
- margin-left: -420px;
-
+#page-content #region-post-box {
+ margin-left: -420px;
+
/* Twice width of left sideblock */
padding-top: 5px;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 420px;
-
+#page-content #region-main {
+ margin-left: 420px;
+
/* Twice width of left sideblock */
padding: 0 15px;
@@ -24,9 +22,9 @@
/* Padding around middle column */
}
-#page-content #region-main-box #region-post-box #region-pre {
- left: 210px;
-
+#page-content #region-pre {
+ left: 210px;
+
/* Width of left sideblock */
width: 210px;
@@ -35,37 +33,35 @@
/* Width of left sideblock */
}
-#page-content #region-main-box #region-post-box #region-post {
- width: 210px;
-/
-
-* Width of right sideblock */
+#page-content #region-post {
+ width: 210px;
+/* Width of right sideblock */
}
#page-content #region-main-box .region-content {
- padding: 0;
+ padding: 0;
}
/** Only side pre **/
.side-pre-only #page-content #region-main-box #region-post-box {
- margin-left: -210px;
+ margin-left: -210px;
}
.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 210px;
+ margin-left: 210px;
}
/** Only side post **/
.side-post-only #page-content #region-main-box #region-post-box {
- margin-left: -210px;
+ margin-left: -210px;
}
.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 210px;
+ margin-left: 210px;
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 210px;
+ margin-left: 210px;
}
\ No newline at end of file
diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php
index ddc8f0ad4ff35..02d00c265220d 100644
--- a/theme/formal_white/config.php
+++ b/theme/formal_white/config.php
@@ -156,6 +156,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre'
+ ),
);
$THEME->rendererfactory = 'theme_overridden_renderer_factory';
diff --git a/theme/formal_white/layout/report.php b/theme/formal_white/layout/report.php
new file mode 100644
index 0000000000000..ca1a082564f30
--- /dev/null
+++ b/theme/formal_white/layout/report.php
@@ -0,0 +1,127 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
+
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if ($showsidepre && !$showsidepost) {
+ $bodyclasses[] = 'side-pre-only';
+} else if ($showsidepost && !$showsidepre) {
+ $bodyclasses[] = 'side-post-only';
+} else if (!$showsidepost && !$showsidepre) {
+ $bodyclasses[] = 'content-only';
+}
+if ($hascustommenu) {
+ $bodyclasses[] = 'has_custom_menu';
+}
+
+if (!empty($PAGE->theme->settings->logo)) {
+ $logourl = $PAGE->theme->settings->logo;
+} else {
+ $logourl = $OUTPUT->pix_url('logo', 'theme');
+}
+
+if (!empty($PAGE->theme->settings->footnote)) {
+ $footnote = $PAGE->theme->settings->footnote;
+} else {
+ $footnote = '';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
-
-
diff --git a/theme/canvas/layout/report.php b/theme/canvas/layout/report.php
new file mode 100644
index 0000000000000..49d67890619a0
--- /dev/null
+++ b/theme/canvas/layout/report.php
@@ -0,0 +1,109 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
+$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+
+$bodyclasses = array();
+if ($hassidepre && !$hassidepost) {
+ $bodyclasses[] = 'side-pre-only';
+} else if ($hassidepost && !$hassidepre) {
+ $bodyclasses[] = 'side-post-only';
+} else if (!$hassidepost && !$hassidepre) {
+ $bodyclasses[] = 'content-only';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
-
-
+
+
-
-
- heading ?>
- - -
+
+
+
+
+
+
+
+
+
+
+
+
+ heading ?>
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ heading ?>
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+
+
+
+
<?php echo $PAGE->title ?>
+
+ standard_head_html() ?>
+
+
+
+standard_top_of_body_html() ?>
+
+<?php echo $PAGE->title ?>
+
+
+ standard_head_html() ?>
+
+
+standard_top_of_body_html() ?>
+
+
+ home_link();
+ echo $OUTPUT->standard_end_of_body_html() ?>
+
+
+
diff --git a/theme/sky_high/style/core.css b/theme/sky_high/style/core.css
index 12082d9294c2d..cf66752457884 100644
--- a/theme/sky_high/style/core.css
+++ b/theme/sky_high/style/core.css
@@ -8,165 +8,154 @@
.pagelayout-admin,
.pagelayout-mydashboard,
.pagelayout-mypublic,
-.pagelayout-login
-{
- background:url([[pix:theme|body]]) top left repeat-x #dcecf9;
+.pagelayout-login,
+.pagelayout-report {
+ background:url([[pix:theme|body]]) top left repeat-x #dcecf9;
}
-body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea
-{
- font-family:Arial, Helvetica, sans-serif;
- color:#333;
+body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
+ font-family:Arial, Helvetica, sans-serif;
+ color:#333;
}
-#wrapper
-{
- background:#fff;
- margin:20px 5% 0px 5%;
- padding:0px;
- border:1px solid #c1bc9d;
+#wrapper {
+ background:#fff;
+ margin:20px 5% 0px 5%;
+ padding:0px;
+ border:1px solid #c1bc9d;
}
#page-content-wrapper {
- padding: 0px;
- padding-top: 0px;
- background: #ebf6f9;
- border-top: 1px solid #ccc;
+ padding: 0px;
+ padding-top: 0px;
+ background: #ebf6f9;
+ border-top: 1px solid #ccc;
}
.pagelayout-frontpage #page-content #region-main-box #region-post-box {
padding-top: 0;
}
-a:link, a:visited
-{
- color: #003466;
- text-decoration: none;
+a:link, a:visited {
+ color: #003466;
+ text-decoration: none;
}
-a:hover, a:active, a:focus
-{
- color: #4785ac;
- text-decoration: none;
+a:hover, a:active, a:focus {
+ color: #4785ac;
+ text-decoration: none;
}
#region-main-box {
- border: 0px none;
+ border: 0px none;
}
-
#newmessageoverlay {
- background: #f9f9d4;
- margin-left: 55px;
- margin-top: 10px;
- padding: 10px;
- border-right: 2px solid #5ea4dc;
- border-bottom: 2px solid #5ea4dc;
- filter:alpha(opacity=90);
- -moz-opacity:0.9;
- -khtml-opacity: 0.9;
- opacity: 0.9;
+ background: #f9f9d4;
+ margin-left: 55px;
+ margin-top: 10px;
+ padding: 10px;
+ border-right: 2px solid #5ea4dc;
+ border-bottom: 2px solid #5ea4dc;
+ filter:alpha(opacity=90);
+ -moz-opacity:0.9;
+ -khtml-opacity: 0.9;
+ opacity: 0.9;
}
#newmessageoverlay #newmessagelinks {
- border-top: 1px dashed #ccc;
- padding-top: 5px;
- margin-top: 5px;
+ border-top: 1px dashed #ccc;
+ padding-top: 5px;
+ margin-top: 5px;
}
#newmessageoverlay a {
- font-weight: bold;
- font-style: italic;
+ font-weight: bold;
+ font-style: italic;
}
/* @end */
/* @group Header */
-#page-header
-{
- background:#97d3f4 url([[pix:theme|header]]) no-repeat top right;
- margin-bottom: 0px;
- height: 80px;
- border-bottom: 1px solid #fff;
-}
-
-#page-header .sitelogo {
+#page-header {
+ background:#97d3f4 url([[pix:theme|header]]) no-repeat top right;
+ margin-bottom: 0px;
+ height: 80px;
+ border-bottom: 1px solid #fff;
}
.logo {
- height: 50px;
- float: left;
- padding-left: 10px;
- padding-top: 18px;
- padding-right: 0px;
+ height: 50px;
+ float: left;
+ padding-left: 10px;
+ padding-top: 18px;
+ padding-right: 0px;
}
.headermain {
- font-weight:normal;
- margin:.8em 0.5em 0.75em;
+ font-weight:normal;
+ margin:.8em 0.5em 0.75em;
}
-h1.headermain
-{
- color: #006699;
- font-weight: normal;
- font-size: 1.85em !important;
- padding-left: 0px;
- margin-top: 30px;
+h1.headermain {
+ color: #006699;
+ font-weight: normal;
+ font-size: 1.85em !important;
+ padding-left: 0px;
+ margin-top: 30px;
}
h1.headerwlogo {
- color: #006699;
- font-weight: normal;
- font-size: 1.45em !important;
- display: block;
- float: left;
- margin-top: 35px;
+ color: #006699;
+ font-weight: normal;
+ font-size: 1.45em !important;
+ display: block;
+ float: left;
+ margin-top: 35px;
}
-.tagline
-{
- color: #006699 !important;
- padding-top: 7px;
- font-size: .45em;
- text-transform: uppercase;
+.tagline {
+ color: #006699 !important;
+ padding-top: 7px;
+ font-size: .45em;
+ text-transform: uppercase;
}
.headermenu {
- font-size: .9em;
+ font-size: .9em;
}
p.helplink {
- text-align: center;
+ text-align: center;
}
/* @end */
/* @group Navbar */
.navbar {
- background: #fff;
- height: 20px;
- padding-top: 5px;
- padding-bottom: 4px;
- margin-left: 4px;
- margin-right: 4px;
+ background: #fff;
+ height: 20px;
+ padding-top: 5px;
+ padding-bottom: 4px;
+ margin-left: 4px;
+ margin-right: 4px;
}
.breadcrumb {
- text-transform: uppercase;
- font-weight: bold;
- font-size: .9em;
- margin-left: 7px;
+ text-transform: uppercase;
+ font-weight: bold;
+ font-size: .9em;
+ margin-left: 7px;
}
.breadcrumb a {
- color: #336699 !important;
+ color: #336699 !important;
}
.breadcrumb ul {
- color: #666;
+ color: #666;
}
.arrow, .arrow_button input {
- color: #aaa;
+ color: #aaa;
}
/* @end */
@@ -174,79 +163,75 @@ p.helplink {
/* @group Blocks */
.block_action {
- padding:0px;
+ padding:0px;
}
.block .content {
- background:#c7eafd;
- border:1px solid #867f6a;
+ background:#c7eafd;
+ border:1px solid #867f6a;
}
.block .minicalendar td,
.block .minicalendar th {
- border: none;
+ border: none;
}
-.block
-{
- border: 0px none;
+.block {
+ border: 0px none;
}
-.block .header
-{
- border: 1px solid #ccc;
- background: #fff;
- padding-left:5px;
+.block .header {
+ border: 1px solid #ccc;
+ background: #fff;
+ padding-left:5px;
}
-.block .title h2
-{
- text-transform: uppercase;
- padding-bottom: 0px;
- color: #336699;
- font-size: .95em;
+.block .title h2 {
+ text-transform: uppercase;
+ padding-bottom: 0px;
+ color: #336699;
+ font-size: .95em;
}
-.block .content
-{
- background: #fff;
- border: 1px solid #ccc;
- padding: 10px;
- margin-top: -2px;
+.block .content {
+ background: #fff;
+ border: 1px solid #ccc;
+ padding: 10px;
+ margin-top: -2px;
}
.block_calendar_month table.minicalendar.calendartable td,.block_calendar_month table.minicalendar.calendartable th {
- border: none !important;
+ border: none !important;
}
/* @end */
/* @group Course */
.headingblock {
- border: 0px none;
- border-bottom: 1px solid #98bcd6;
- padding-bottom: 0px;
- padding-top: 5px;
- color: #336699;
- font-size: 1.8em;
- font-weight: normal;
+ border: 0px none;
+ border-bottom: 1px solid #98bcd6;
+ padding-bottom: 0px;
+ padding-top: 5px;
+ color: #336699;
+ font-size: 1.8em;
+ font-weight: normal;
}
.completionprogress {
- color: #336699;
- text-transform: uppercase;
- font-size: .85em;
+ color: #336699;
+ text-transform: uppercase;
+ font-size: .85em;
}
.course-content ul.topics li.section,
.course-content ul.weeks li.section {
- border: 1px solid #ccc;
- margin-right: 20px;
+ border: 1px solid #ccc;
+ margin-right: 20px;
}
.path-course-view li.activity {
- border-bottom: 1px dashed #c3daf9;
- padding-top: 10px;
- padding-bottom: 5px;
+ border-bottom: 1px dashed #c3daf9;
+ padding-top: 10px;
+ padding-bottom: 5px;
}
/* @end */
@@ -254,98 +239,107 @@ p.helplink {
/* @group Dock */
body.has_dock {
- margin:0;
+ margin:0;
}
#dock {
- border-right: 0px none;
- background: url([[pix:theme|dock]]) repeat-y top right #fff;
+ border-right: 0px none;
+ background: url([[pix:theme|dock]]) repeat-y top right #fff;
}
#dock .controls {
- bottom:auto;
- background-color:#5ea4dc;
+ bottom:auto;
+ background-color:#5ea4dc;
}
#dock .dockeditem {
- background: url([[pix:theme|dock]]) repeat-y top right #fff;
- padding:2px;
- padding-right:0px;
+ background: url([[pix:theme|dock]]) repeat-y top right #fff;
+ padding:2px;
+ padding-right:0px;
}
#dock .dockedtitle {
- border-width:0;
+ border-width:0;
}
#dock .dockedtitle h2 {
- margin:0;
- padding:10px 3px;
+ margin:0;
+ padding:10px 3px;
}
#dock .dockedtitle.activeitem {
- background-color:#407ea8;
- border-top: 1px solid #6f6856;
+ background-color:#407ea8;
+ border-top: 1px solid #6f6856;
}
#dockeditempanel {
- background-color:#5ea4dc;
- margin-left:0px;
- border-left: none;
+ background-color:#5ea4dc;
+ margin-left:0px;
+ border-left: none;
}
#dockeditempanel .dockeditempanel_content {
- border-color:#6f6856;
- border-left: none;
+ border-color:#6f6856;
+ border-left: none;
}
#dockeditempanel .dockeditempanel_hd {
- background: #407ea8;
- border-width:0;
+ background: #407ea8;
+ border-width:0;
}
#dockeditempanel .dockeditempanel_hd h2 {
- font-size:1em;
- color:#fff;
+ font-size:1em;
+ color:#fff;
}
/* @end */
/* @group Footer */
#page-footer{
- padding: 20px 0 30px;
- clear: both;
- background: url([[pix:theme|footer]]) no-repeat top right #dfdfdf;
- margin-top: 0px;
- border: 1px solid #98bcd6;
- border-top: 5px solid #98bcd6;
- height: 75px;
+ padding: 20px 0 30px;
+ clear: both;
+ background: url([[pix:theme|footer]]) no-repeat top right #dfdfdf;
+ margin-top: 0px;
+ border: 1px solid #98bcd6;
+ border-top: 5px solid #98bcd6;
+ height: 75px;
}
.footnote {
- float: left;
- padding-top: 80px;
- padding-left: 20px;
+ float: left;
+ padding-top: 80px;
+ padding-left: 20px;
}
#page-footer .logininfo {
- padding-top: 80px;
- text-align: right;
+ padding-top: 80px;
+ text-align: right;
}
/* @end */
/* @group Forums */
.forumpost {
- border: 1px solid #ccc;
+ border: 1px solid #ccc;
+ background: #c7eafd;
}
.forumpost .left {
- background: #c7eafd;
+ background: #c7eafd;
}
-
-.forumpost .topic {
- border-bottom: 2px solid #94b9d3;
- background: #d6e2f2;
+.forumpost .header {
+ background: #d6e2f2;
+}
+.forumpost .no-overflow {
+ border-top: 2px solid #94b9d3;background: #FFF;
+}
+.forumpost .content .posting {
+ padding:4px;
+}
+.forumpost .options {
+ background: #FFF;
+ padding:4px;
}
@@ -355,5 +349,4 @@ body.has_dock {
[[setting:customcss]]
-/* @end */
-
+/* @end */
\ No newline at end of file
diff --git a/theme/sky_high/style/pagelayout.css b/theme/sky_high/style/pagelayout.css
index 0e2afae3a8f94..349eb10f70b2e 100644
--- a/theme/sky_high/style/pagelayout.css
+++ b/theme/sky_high/style/pagelayout.css
@@ -2,93 +2,93 @@
/*********************************************************************************************
- left column: 230px
- right column: 330px
- padding left/right column: 10px
- padding center column: 30px
+ left column: 230px
+ right column: 330px
+ padding left/right column: 10px
+ padding center column: 30px
**********************************************************************************************/
body {
- margin:auto 0px;
- width:auto;
+ margin:auto 0px;
+ width:auto;
}
-
+
#page {
- width:100%;
- max-width: 1600px;
- overflow:hidden;
+ width:100%;
+ max-width: 1600px;
+ overflow:hidden;
+ margin:0 auto;
}
#page-content {
- clear: both;
- overflow: hidden;
- position: relative;
- width: 100%;
+ clear: both;
+ overflow: hidden;
+ position: relative;
+ width: 100%;
}
/* @group Pre and Post */
#page-content #region-main-box {
- float: left;
- margin-left: -[[setting:regionwidth]];
- position: relative;
- width: 200%;
- right: 100%;
+ float: left;
+ margin-left: -[[setting:regionwidth]];
+ position: relative;
+ width: 200%;
+ right: 100%;
}
-#page-content #region-main-box #region-post-box {
- float: left;
- margin-left: -[[setting:regionwidth]];
- width: 100%;
- border-right: 2px solid #98bcd6;
- background: url([[pix:theme|top_bg]]) repeat-x top #fff;
+#page-content #region-post-box {
+ float: left;
+ margin-left: -[[setting:regionwidth]];
+ width: 100%;
+ border-right: 2px solid #98bcd6;
+ background: url([[pix:theme|top_bg]]) repeat-x top #fff;
}
-#page-content #region-main-box #region-post-box #region-main-wrap {
- float: left;
- width: 50%;
- margin-left: 20px;
+#page-content #region-main-wrap {
+ float: left;
+ width: 50%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- overflow: hidden;
- position: relative;
- margin-left: [[setting:regionwidthdouble]];
- left: 100%;
+#page-content #region-main {
+ overflow: hidden;
+ position: relative;
+ margin-left: [[setting:regionwidthdouble]];
+ left: 100%;
}
-#page-content #region-main-box #region-post-box #region-pre {
- float: right;
- position: relative;
- left: [[setting:leftregionwidthmargin]];
- width: [[setting:regionwidth]];
- background: transparent;
+#page-content #region-pre {
+ float: right;
+ position: relative;
+ left: [[setting:leftregionwidthmargin]];
+ width: [[setting:regionwidth]];
+ background: transparent;
}
-#page-content #region-main-box #region-post-box #region-post {
- float: right;
- position: relative;
- left: [[setting:rightregionwidthmargin]];
- width: [[setting:regionwidth]];
- background: transparent;
+#page-content #region-post {
+ float: right;
+ position: relative;
+ left: [[setting:rightregionwidthmargin]];
+ width: [[setting:regionwidth]];
+ background: transparent;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
- overflow: hidden;
- padding: 20px 40px 20px 0px;
+#page-content #region-main .region-content {
+ overflow: hidden;
+ margin: 20px;
}
-#page-content #region-main-box #region-post-box #region-pre .region-content,
-#page-content #region-main-box #region-post-box #region-post .region-content {
- overflow: hidden;
- padding: 20px 10px;
+#page-content #region-pre .region-content,
+#page-content #region-post .region-content {
+ overflow: hidden;
+ padding: 20px 10px;
}
#page-footer {
- clear: both;
- float: left;
- width: 100%;
+ clear: both;
+ float: left;
+ width: 100%;
}
@@ -98,24 +98,24 @@ body {
/* @group Pre Side Only */
.side-pre-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
}
-.side-pre-only #page-content #region-main-box #region-post-box {
- margin-left: -[[setting:regionwidth]];
+.side-pre-only #page-content #region-post-box {
+ margin-left: -[[setting:regionwidth]];
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: [[setting:regionwidth]];
+.side-pre-only #page-content #region-main {
+ margin-left: [[setting:regionwidth]];
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-pre {
- left: [[setting:regionwidth]];
- width: [[setting:regionwidth]];
+.side-pre-only #page-content #region-pre {
+ left: [[setting:regionwidth]];
+ width: [[setting:regionwidth]];
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-post {
- width: 0%;
+.side-pre-only #page-content #region-post {
+ width: 0%;
}
@@ -125,24 +125,24 @@ body {
/* @group Post Side Only */
.side-post-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
}
.side-post-only #page-content #region-main-box #region-post-box {
- margin-left: -[[setting:regionwidth]];
+ margin-left: -[[setting:regionwidth]];
}
.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: [[setting:regionwidth]];
+ margin-left: [[setting:regionwidth]];
}
.side-post-only #page-content #region-main-box #region-post-box #region-post {
- left: [[setting:regionwidthdouble]];
- width: [[setting:regionwidth]];
+ left: [[setting:regionwidthdouble]];
+ width: [[setting:regionwidth]];
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 200px;
+ margin-left: 200px;
}
@@ -152,25 +152,31 @@ body {
/* @group No Blocks */
.content-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box {
- margin-left: 0px;
+ margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 0px;
+ margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-pre {
- width: 0px;
+ width: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-post {
- width: 0px;
+ width: 0px;
}
-/* @end */
\ No newline at end of file
+/* @end */
+.pagelayout-report #page-content #region-main {
+ overflow:auto;
+}
+.pagelayout-report #page-content #region-main .region-content {
+ overflow:visible;
+}
\ No newline at end of file
diff --git a/theme/splash/config.php b/theme/splash/config.php
index d42352c4f8f76..6601892a163b4 100644
--- a/theme/splash/config.php
+++ b/theme/splash/config.php
@@ -126,7 +126,7 @@
),
// Embeded pages, like iframe embeded in moodleform
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
@@ -145,6 +145,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre'
+ ),
);
diff --git a/theme/splash/layout/report.php b/theme/splash/layout/report.php
new file mode 100644
index 0000000000000..dad56b6f559b1
--- /dev/null
+++ b/theme/splash/layout/report.php
@@ -0,0 +1,149 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+splash_check_colourswitch();
+splash_initialise_colourswitcher($PAGE);
+
+$bodyclasses = array();
+$bodyclasses[] = 'splash-'.splash_get_colour();
+if (!$hassidepre) {
+ $bodyclasses[] = 'content-only';
+}
+
+$haslogo = (!empty($PAGE->theme->settings->logo));
+$hasfootnote = (!empty($PAGE->theme->settings->footnote));
+$hidetagline = (!empty($PAGE->theme->settings->hide_tagline) && $PAGE->theme->settings->hide_tagline == 1);
+
+if (!empty($PAGE->theme->settings->tagline)) {
+ $tagline = $PAGE->theme->settings->tagline;
+} else {
+ $tagline = get_string('defaulttagline', 'theme_splash');
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+ <?php echo $PAGE->title ?>
+
+
+ standard_head_html() ?>
+
+
+ standard_top_of_body_html() ?>
+ ';
diff --git a/user/profile/field/textarea/field.class.php b/user/profile/field/textarea/field.class.php
index 54d322bf4fc40..eeffebca4d4ce 100644
--- a/user/profile/field/textarea/field.class.php
+++ b/user/profile/field/textarea/field.class.php
@@ -36,7 +36,7 @@ function edit_load_user_data(&$user) {
* Display the data for this field
*/
function display_data() {
- return format_text($this->data, $this->dataformat, new stdClass());
+ return format_text($this->data, $this->dataformat, array('overflowdiv'=>true));
}
}
diff --git a/user/view.php b/user/view.php
index ab82bf22b3347..155cf889fd8f7 100644
--- a/user/view.php
+++ b/user/view.php
@@ -219,7 +219,8 @@
// we have to make a little detour thought the course context to verify the access control for course profile
$user->description = file_rewrite_pluginfile_urls($user->description, 'pluginfile.php', $coursecontext->id, 'user', 'profile', $user->id);
}
- echo format_text($user->description, $user->descriptionformat);
+ $options = array('overflowdiv'=>true);
+ echo format_text($user->description, $user->descriptionformat, $options);
}
}
echo '
';
+
+
+
+
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/formal_white/lib.php b/theme/formal_white/lib.php
index d94f6cd75cd5a..8f5a3279b2f45 100644
--- a/theme/formal_white/lib.php
+++ b/theme/formal_white/lib.php
@@ -64,12 +64,14 @@ function formalwhite_set_backgroundcolor($css, $backgroundcolor) {
function formalwhite_set_regionwidth($css, $regionwidth) {
$tag = '[[setting:regionwidth]]';
$doubletag = '[[setting:regionwidthdouble]]';
+ $tagplus10 = '[[setting:regionwidthplus10]]';
$replacement = $regionwidth;
if (is_null($replacement)) {
$replacement = 200;
}
$css = str_replace($tag, $replacement.'px', $css);
$css = str_replace($doubletag, ($replacement*2).'px', $css);
+ $css = str_replace($tag, ($replacement+10).'px', $css);
return $css;
}
diff --git a/theme/formal_white/style/general.css b/theme/formal_white/style/general.css
index 09ff63082da7d..bcf2602ab6028 100644
--- a/theme/formal_white/style/general.css
+++ b/theme/formal_white/style/general.css
@@ -162,13 +162,16 @@ img.iconhelp {vertical-align:middle;}
/** Forum **/
.forumheaderlist,
-.forumpost {margin-top:15px;border:1px solid #DDD;border-collapse:separate;}
-.forumpost td {border-width:0px;}
-.forumpost .topic {background-color:#C8C9C7;}
+.forumpost {margin-top:15px;border:1px solid #DDD;background-color:#EEE;}
+.forumpost .header {background-color:#C8C9C7;}
+.forumpost .topic {padding:7px;}
.forumpost .topic .subject {font-weight:bold;}
.forumpost .topic .author {font-size:0.8em;}
-.forumpost .left {background-color:#EEE;padding:4px;text-align:center;vertical-align:top;width:35px;}
-.forumpost .content .commands {font-size:0.9em;clear:both;padding-top:0.5em;text-align:right;}
+.forumpost .left {background-color:#EEE;}
+.forumpost .content {background-color:#FFF;border-top:1px solid #333;}
+.forumpost .content .posting {padding:4px;}
+.forumpost .options {background-color:#FFF;}
+.forumpost .options .commands {font-size:0.9em;clear:both;padding:0.5em 5px 5px;text-align:right;}
.forumpost .content .link {font-size:0.9em;}
.forumpost .content .footer {font-size:0.9em;padding-top:0.5em;text-align:right;}
diff --git a/theme/formal_white/style/settings.css b/theme/formal_white/style/settings.css
index 2eab15748d01d..c3ea7d1af0a3d 100644
--- a/theme/formal_white/style/settings.css
+++ b/theme/formal_white/style/settings.css
@@ -1,13 +1,11 @@
.block .content {background-color:[[setting:backgroundcolor]];}
-#page-content #region-main-box {left:[[setting:regionwidth]];}
-#page-content #region-main-box #region-post-box {margin-left:-[[setting:regionwidthdouble]];}
-#page-content #region-main-box #region-post-box #region-pre {width:[[setting:regionwidth]];left:[[setting:regionwidth]];}
-#page-content #region-main-box #region-post-box #region-post {width:[[setting:regionwidth]];}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:[[setting:regionwidthdouble]];}
-.side-pre-only #page-content #region-main-box #region-post-box {margin-left:-[[setting:regionwidth]];}
-.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {margin-left:[[setting:regionwidth]];}
-/* #page {width:[[setting:regionwidth]]%;margin:15px (100-[[setting:regionwidth])/2% 0;} */
-/* #page {min-width: 934px;} */
+#page-content #region-main-box {left:[[setting:regionwidthplus10]];}
+#page-content #region-post-box {margin-left:-[[setting:regionwidthdouble]];}
+#page-content #region-pre {width:[[setting:regionwidth]];left:[[setting:regionwidth]];}
+#page-content #region-post {width:[[setting:regionwidth]];}
+#page-content #region-main {margin-left:[[setting:regionwidthdouble]];}
+.side-pre-only #page-content #region-post-box {margin-left:-[[setting:regionwidth]];}
+.side-pre-only #page-content #region-main {margin-left:[[setting:regionwidth]];}
/** Custom CSS **/
[[setting:customcss]]
\ No newline at end of file
diff --git a/theme/formfactor/style/mods.css b/theme/formfactor/style/mods.css
index c7ecd10bd8269..b59cdbe73dcf8 100644
--- a/theme/formfactor/style/mods.css
+++ b/theme/formfactor/style/mods.css
@@ -7,10 +7,11 @@
.path-mod-forum .forumheaderlist th {background: url([[pix:theme|gradient-sb]]) repeat-x 0 0}
.path-mod-forum .forumheaderlist .r1 td { background:#f5f5f5; }
-.forumpost .topic { background:#eee;border-color:#aaa;border-width:0 0 2px 0;padding-left:7px; }
+.forumpost .topic { background:#eee;border-bottom:2px solid #AAA;padding-left:7px; }
.forumpost .topic .subject { font-size:1.25em; }
.forumpost .topic .author { font-style:italic;color:#444;font-size:0.95em; }
-.forumpost .content { border-bottom:5px solid #aaa;padding:5px 7px 10px 7px; }
+.forumpost .content .posting { padding:5px 7px 10px 7px; }
+.forumpost .options { border-bottom:5px solid #aaa;}
/* Assignments
--------------------------*/
diff --git a/theme/fusion/config.php b/theme/fusion/config.php
index 8271c2d2d2788..4262e773ce92d 100644
--- a/theme/fusion/config.php
+++ b/theme/fusion/config.php
@@ -38,8 +38,8 @@
$THEME->parents = array(
- 'canvas',
- 'base',
+ 'canvas',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -54,10 +54,10 @@
$THEME->sheets = array(
- 'core',
- 'pagelayout',
- 'menus',
- 'settings',
+ 'core',
+ 'pagelayout',
+ 'menus',
+ 'settings',
);
////////////////////////////////////////////////////
@@ -66,12 +66,12 @@
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'pagelayout',
- ),
- 'canvas'=>array(
- 'pagelayout',
- ),
+ 'base'=>array(
+ 'pagelayout',
+ ),
+ 'canvas'=>array(
+ 'pagelayout',
+ ),
);
@@ -156,7 +156,7 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
@@ -167,7 +167,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
-
+ 'report' => array(
+ 'file' => 'general.php',
+ 'regions' => array('side-post'),
+ 'defaultregion' => 'side-post',
+ ),
);
///////////////////////////////////////////////////////////////
@@ -208,14 +212,14 @@
// As above but will be included in the page footer.
////////////////////////////////////////////////////
-$THEME->larrow = '⟨';
+$THEME->larrow = '⟨';
////////////////////////////////////////////////////
// Overrides the left arrow image used throughout
// Moodle
////////////////////////////////////////////////////
-$THEME->rarrow = '⟩';
+$THEME->rarrow = '⟩';
////////////////////////////////////////////////////
// Overrides the right arrow image used throughout Moodle
diff --git a/theme/fusion/style/pagelayout.css b/theme/fusion/style/pagelayout.css
index 4f3f223e647a5..a64e2d3a07d63 100644
--- a/theme/fusion/style/pagelayout.css
+++ b/theme/fusion/style/pagelayout.css
@@ -38,14 +38,14 @@ body {
width: 100%;
}
-#page-content #region-main-box #region-post-box {
+#page-content #region-post-box {
float: left;
right: 72%;
position: relative;
width: 100%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+#page-content #region-main {
float: left;
overflow: hidden;
position: relative;
@@ -54,7 +54,7 @@ body {
width: 72%;
}
-#page-content #region-main-box #region-post-box #region-post {
+#page-content #region-post {
float: left;
overflow: hidden;
position: relative;
@@ -62,12 +62,12 @@ body {
width: 28%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
+#page-content #region-main .region-content {
overflow: hidden;
padding: 50px 15px 20px 0;
}
-#page-content #region-main-box #region-post-box #region-post .region-content {
+#page-content #region-post .region-content {
overflow: hidden;
padding: 0 0 0 10px;
}
@@ -84,19 +84,22 @@ body {
right: 0%;
}
-.content-only #page-content #region-main-box #region-post-box {
+.content-only #page-content #region-post-box {
right: 100%;
}
-.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+.content-only #page-content #region-main {
left: 100%;
width: 100%;
}
-.content-only #page-content #region-main-box #region-post-box #region-pre {
+.content-only #page-content #region-pre {
width: 0%;
}
-.content-only #page-content #region-main-box #region-post-box #region-post {
+.content-only #page-content #region-post {
width: 0%;
-}
\ No newline at end of file
+}
+
+.pagelayout-report #page-content #region-main {overflow:auto;}
+.pagelayout-report #page-content #region-main .region-content {overflow:visible;}
\ No newline at end of file
diff --git a/theme/leatherbound/config.php b/theme/leatherbound/config.php
index 9219516c30f5b..fe39c6c2d0d66 100644
--- a/theme/leatherbound/config.php
+++ b/theme/leatherbound/config.php
@@ -38,8 +38,8 @@
$THEME->parents = array(
- 'canvas',
- 'base',
+ 'canvas',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -54,7 +54,7 @@
$THEME->sheets = array(
- 'core',
+ 'core',
);
////////////////////////////////////////////////////
@@ -144,7 +144,7 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
@@ -155,7 +155,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
-
+ 'report' => array(
+ 'file' => 'report.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ ),
);
///////////////////////////////////////////////////////////////
diff --git a/theme/leatherbound/layout/general.php b/theme/leatherbound/layout/general.php
index b6a9fc1be1b65..bc6c787d59939 100644
--- a/theme/leatherbound/layout/general.php
+++ b/theme/leatherbound/layout/general.php
@@ -29,26 +29,26 @@
+
+
+
+
+
+
+
+
+
+
+ 
';
+ echo ''; // closes: '; // closes:
+ echo '
'; // closes:
+
+ if ($hascustommenu) {
+ echo '';
+ }
+
+ //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
+ if ($hasnavbar) {
+ echo '';
+ }
+
+ } ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+
-
diff --git a/theme/leatherbound/layout/report.php b/theme/leatherbound/layout/report.php
new file mode 100644
index 0000000000000..a1866f38009a2
--- /dev/null
+++ b/theme/leatherbound/layout/report.php
@@ -0,0 +1,91 @@
+heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
+$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+
+$bodyclasses = array();
+if ($hassidepre && !$hassidepost) {
+ $bodyclasses[] = 'side-pre-only';
+} else if ($hassidepost && !$hassidepre) {
+ $bodyclasses[] = 'side-post-only';
+} else if (!$hassidepost && !$hassidepre) {
+ $bodyclasses[] = 'content-only';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
-
-
+ heading ?>
- - -
+
+
heading ?>
+ + +
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/leatherbound/style/core.css b/theme/leatherbound/style/core.css
index c029e1874a176..c7a4b442facc4 100644
--- a/theme/leatherbound/style/core.css
+++ b/theme/leatherbound/style/core.css
@@ -14,273 +14,274 @@
------------------------*/
body {
- background: #fff;
- margin: 0;
- padding: 0;
- color: #281f18;
+ background: #fff;
+ margin: 0;
+ padding: 0;
+ color: #281f18;
}
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.wrapper {
- margin: 0 25px;
+ margin: 0 25px;
}
a:link,a:visited {
- color: #DA5013;
+ color: #DA5013;
}
a:hover,a:active {
- color: #251c17;
+ color: #251c17;
}
a img {
- border: none;
+ border: none;
}
a:active {
- outline: none;
+ outline: none;
}
/* Header
-----------------------*/
#page-header {
- float: none;
- padding: 10px 0 0;
- background: url([[pix:theme|header]]);
- border-bottom: 5px solid #DA5013;
- color: #fff;
+ float: none;
+ padding: 10px 0 0;
+ background: url([[pix:theme|header]]);
+ border-bottom: 5px solid #DA5013;
+ color: #fff;
}
#page-header h1 {
- font-size: 2.25em;
- margin: 30px 0 20px;
+ font-size: 2.25em;
+ margin: 30px 0 20px;
}
#page-header h1.inside {
- font-size: 1.8em;
- margin: 20px 0 10px;
+ font-size: 1.8em;
+ margin: 20px 0 10px;
}
.headermenu {
- margin: 0;
- font-size: 0.9em;
+ margin: 0;
+ font-size: 0.9em;
}
/* Navbar
-----------------------*/
.navbar {
- border-width: 0 0 1px 0;
- border-color: #ddddd7;
- background: #f7f6f1;
- margin: 0;
- padding: 5px 0;
+ border-width: 0 0 1px 0;
+ border-color: #ddddd7;
+ background: #f7f6f1;
+ margin: 0;
+ padding: 5px 0;
}
.navbar .navbutton {
- margin-top: 0;
+ margin-top: 0;
}
.breadcrumb .sep {
- font-size: 0.8em;
- color: #999;
+ font-size: 0.8em;
+ color: #999;
}
/* Content
-----------------------*/
#page-content-wrapper {
- float: none;
- margin-top: 5px;
+ float: none;
+ margin-top: 5px;
}
/* Blocks
-----------------------*/
.block {
- margin-bottom: 20px;
- border: none;
+ margin-bottom: 20px;
+ border: none;
}
.block .header {
- border-top: 2px solid #da5013;
- background: #f7f6f1;
- padding: 4px 5px 5px;
+ border-top: 2px solid #da5013;
+ background: #f7f6f1;
+ padding: 4px 5px 5px;
}
.block .title h2 {
- color: #35251B;
- font-weight: normal;
- font-size: 1.2em;
- margin: 0;
+ color: #35251B;
+ font-weight: normal;
+ font-size: 1.2em;
+ margin: 0;
}
/* Forum
------------------------*/
.forumpost .topic {
- background: #dbd6c7;
- border-bottom-color: #da5013;
+ background: #dbd6c7;
+ border-bottom:1px solid #da5013;
+ padding:5px 4px 4px;
}
.forumpost .topic .subject {
- font-weight: bold;
- font-size: 1.1em;
+ font-weight: bold;
+ font-size: 1.1em;
}
.forumpost .topic .author {
- font-size: 0.9em;
+ font-size: 0.9em;
}
.forumpost .content {
- background: #f7f5f1;
- border-width: 0 1px 1px;
- border-style: solid;
- border-color: #d9d8d4;
+ background: #f7f5f1;
+ border-width: 0 1px 1px;
+ border-style: solid;
+ border-color: #d9d8d4;
}
/* Course
---------------------------*/
h2.headingblock {
- border-width: 0 0 1px 0;
- padding: 5px 5px 2px;
- font-weight: normal;
- font-size: 1.2em;
- background: #f7f5f1;
- color: #251c17;
+ border-width: 0 0 1px 0;
+ padding: 5px 5px 2px;
+ font-weight: normal;
+ font-size: 1.2em;
+ background: #f7f5f1;
+ color: #251c17;
}
.course-content .main {
- background: #f7f5f1;
- border: 1px solid #ddd
+ background: #f7f5f1;
+ border: 1px solid #ddd
}
.course-content .current {
- background: #da5013;
- color: #fff;
+ background: #da5013;
+ color: #fff;
}
.course-content .main .content {
- background: #fff;
+ background: #fff;
}
/* Dock
---------------------------*/
#dock {
- background-color: #f7f5f1;
- border-right-color: #433b30;
+ background-color: #f7f5f1;
+ border-right-color: #433b30;
}
#dock .dockeditem_container {
- margin-top: 10px;
+ margin-top: 10px;
}
#dock .dockeditem {
- background-color: #fff;
+ background-color: #fff;
}
#dock .firstdockitem {
- margin-top: 1em;
+ margin-top: 1em;
}
#dock .dockeditem .dockedtitle {
- border-color: #dddddd;
- border-top-color: #fff;
+ border-color: #dddddd;
+ border-top-color: #fff;
}
#dock .dockeditem .dockedtitle.activeitem {
- background: #f7f5f1;
- border-top-color:#f7f5f1 ;
+ background: #f7f5f1;
+ border-top-color:#f7f5f1 ;
}
#dock .firstdockitem .dockedtitle {
- border-top-color: #ddd;
+ border-top-color: #ddd;
}
-
+
#dock .dockeditem .dockedtitle h2 {
- margin: 12px 0 12px 7px;
+ margin: 12px 0 12px 7px;
}
#dockeditempanel .dockeditempanel_content {
- border-color: #433b30;
+ border-color: #433b30;
}
#dockeditempanel .dockeditempanel_hd {
- border-bottom: none;
- padding: 3px 5px;
- background: #f7f6f1;
- text-align: left;
+ border-bottom: none;
+ padding: 3px 5px;
+ background: #f7f6f1;
+ text-align: left;
}
#dockeditempanel .dockeditempanel_hd h2 {
- color: #333;
- text-align: left;
- font-weight: normal;
- font-size: 1.25em;
- padding: 0 2px;
+ color: #333;
+ text-align: left;
+ font-weight: normal;
+ font-size: 1.25em;
+ padding: 0 2px;
}
#dockeditempanel .dockeditempanel_hd .commands {
- float: right;
+ float: right;
}
/* block expansion code */
.block_js_expansion .block_tree {
- overflow-x: scroll;
+ overflow-x: scroll;
}
.block_js_expansion.mouseover .content {
- width: 200%;
- z-index: 1000;
- position: relative;
+ width: 200%;
+ z-index: 1000;
+ position: relative;
}
.block_js_expansion.mouseover .content .block_tree {
- width: 100%;
- background-color: #FAFAFA;
- padding-bottom: 0px;
+ width: 100%;
+ background-color: #FAFAFA;
+ padding-bottom: 0px;
}
/** IE stylings */
.ie6 .block .block_tree {
- width: 160px;
- overflow-x: scroll;
+ width: 160px;
+ overflow-x: scroll;
}
.ie6 .block_tree .tree_item {
- width: 100%;
+ width: 100%;
}
.ie6 #dock {
- position: absolute;
+ position: absolute;
}
.ie6 #dock hr {
- display: none;
- margin: 0px;
- height: 0px;
- padding: 0px;
+ display: none;
+ margin: 0px;
+ height: 0px;
+ padding: 0px;
}
.ie6 #dock li p {
- background-color: inherit;
+ background-color: inherit;
}
.ie6 #dock .bd.oversized_content .content, .ie7 #dock .bd.oversized_content .content {
- padding-bottom: 0px;
+ padding-bottom: 0px;
}
.ie6 .block_js_expansion.mouseover .content, .ie7 .block_js_expansion.mouseover .content {
- padding-bottom: 2px;
+ padding-bottom: 2px;
}
.ie6 #dock .bd.oversized_content {
- width: 100%;
+ width: 100%;
}
\ No newline at end of file
diff --git a/theme/magazine/config.php b/theme/magazine/config.php
index 3cd91ae0679be..706cf9ffa9079 100644
--- a/theme/magazine/config.php
+++ b/theme/magazine/config.php
@@ -120,7 +120,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
-
+ 'report' => array(
+ 'file' => 'general.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ ),
);
///////////////////////////////////////////////////////////////
diff --git a/theme/magazine/style/colors.css b/theme/magazine/style/colors.css
index 15da183c1c045..7597e11710920 100644
--- a/theme/magazine/style/colors.css
+++ b/theme/magazine/style/colors.css
@@ -1,70 +1,70 @@
/** colors file for magazine theme, contains colors, logo and background image **/
html,body {
- background: #fff url([[setting:background]]);
+ background: #fff url([[setting:background]]);
}
html a,body a, html a:visited,body a:visited {
- color: [[setting:linkcolor]];
+ color: [[setting:linkcolor]];
}
html a:hover,body a:hover {
- color: [[setting:linkhover]];
+ color: [[setting:linkhover]];
}
/** header and dock, default #002f2f and #092323 **/
#header-wrap, #dock {
- background: [[setting:maincolor]];
- border-bottom: 1px solid [[setting:maincoloraccent]];
+ background: [[setting:maincolor]];
+ border-bottom: 1px solid [[setting:maincoloraccent]];
}
/** logo is below **/
div.thetitle {
- background: url([[setting:logo]]) no-repeat 0% 50%;
+ background: url([[setting:logo]]) no-repeat 0% 50%;
}
/** block header font color and others default is #002f2f **/
td.category.number, .yui-module.yui-overlay.yui-panel div.hd, #navigation li a:link,#navigation li a:visited, div.tabtree li a span {
- color: [[setting:maincolor]];
+ color: [[setting:maincolor]];
}
.title h2, div.dockeditempanel_hd h2, div.dockeditempanel_hd {
- color: [[setting:blockcolor]];
+ color: [[setting:blockcolor]];
}
.yui3-menu-content li a {
- color: [[setting:maincolor]] !important;
+ color: [[setting:maincolor]] !important;
}
div.dockedtitle {
- border-bottom: 1px solid [[setting:maincoloraccent]] !important;
- border-top: 1px solid #333333 !important;
+ border-bottom: 1px solid [[setting:maincoloraccent]] !important;
+ border-top: 1px solid #333333 !important;
}
/** main headings and forum post subject default color #4e0000 **/
#nologo, #nologo a, .generalbox h2,h3.sectionname, div.tabtree li.selected a span, .forumpost .subject, .blog_entry div.subject a, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 {
- color: [[setting:headingcolor]];
+ color: [[setting:headingcolor]];
}
/** forum post subject background default is #e6e2af **/
-.forumpost td.topic {
- background: [[setting:forumback]] url([[pix:theme|alert-overlay]]) repeat-x;
+.forumpost .topic {
+ background: [[setting:forumback]] url([[pix:theme|alert-overlay]]) repeat-x;
}
/** table header background color, default is #002f2f **/
td.maincalendar table.calendartable th, table.rolecap .header,.generaltable .header,.forumheaderlist .header,.files .header,.editcourse .header,.logtable .header,#attempts .header,table#categoryquestions th {
- background: [[setting:maincolor]] !important;
+ background: [[setting:maincolor]] !important;
}
/** dock item hover, default is #4e0000 **/
div.dockeditem_container div.dockeditem:hover {
- background: [[setting:headingcolor]] url([[pix:theme|mbar]]) repeat-y;
+ background: [[setting:headingcolor]] url([[pix:theme|mbar]]) repeat-y;
}
\ No newline at end of file
diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css
index 653349ce930f3..d1940a73d7e74 100644
--- a/theme/magazine/style/core.css
+++ b/theme/magazine/style/core.css
@@ -1,29 +1,29 @@
/** body font family and background image **/
html,body {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- margin: 0;
- padding: 0;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ margin: 0;
+ padding: 0;
}
html a:hover,body a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
/** remove text decoration from some links **/
div.yui3-widget-bd a, .tabtree li a, .block div.content a, .unlist a, .categorybox a, .course_category_tree a, .section a {
- text-decoration: none;
+ text-decoration: none;
}
a:active {
- outline: 0;
+ outline: 0;
/* for browsers that understand */
}
a:focus {
- outline: 0;
+ outline: 0;
/* for browsers that understand */
}
@@ -31,1131 +31,1133 @@ a:focus {
/**header divs **/
#header-wrap {
- top: 0;
- left: 0;
- width: 100%;
+ top: 0;
+ left: 0;
+ width: 100%;
}
#header {
- width: 91%;
- min-width: 910px;
- height: 30px;
- margin: 0 auto;
- overflow: hidden;
+ width: 91%;
+ min-width: 910px;
+ height: 30px;
+ margin: 0 auto;
+ overflow: hidden;
}
#headright {
- float: right;
- font-size: 10px;
- font-weight: 200;
- margin-top: 0;
- padding-top: 0;
- min-width: 180px;
- text-align: right;
- color: #eeeeee;
- line-height: 30px;
- min-width: 400px;
+ float: right;
+ font-size: 10px;
+ font-weight: 200;
+ margin-top: 0;
+ padding-top: 0;
+ min-width: 180px;
+ text-align: right;
+ color: #eeeeee;
+ line-height: 30px;
+ min-width: 400px;
}
#headright a {
- color: #fff;
+ color: #fff;
}
#headright div.langmenu {
- float: right !important;
- display: inline !important;
- padding: 0px 0px 0px 0px !important;
- line-height: 28px !important;
- margin: 0px 0px 0px 5px !important;
- font-size: 9px;
+ float: right !important;
+ display: inline !important;
+ padding: 0px 0px 0px 0px !important;
+ line-height: 28px !important;
+ margin: 0px 0px 0px 5px !important;
+ font-size: 9px;
}
#headleft {
- float: left;
- height: 30px;
- line-height: 30px;
- color: #fff;
- font-size: 12px;
+ float: left;
+ height: 30px;
+ line-height: 30px;
+ color: #fff;
+ font-size: 12px;
}
/** Logo and menu bar divs and wrap **/
#textcontainer-wrap {
- top: 0;
- left: 0;
- width: 100%;
- border-top: 1px solid #fff;
+ top: 0;
+ left: 0;
+ width: 100%;
+ border-top: 1px solid #fff;
}
#textcontainer {
- clear: both;
- border: none;
- width: 92%;
- min-width: 910px;
- height: 130px;
- margin: 0 auto;
- overflow: hidden;
+ clear: both;
+ border: none;
+ width: 92%;
+ min-width: 910px;
+ height: 130px;
+ margin: 0 auto;
+ overflow: hidden;
}
div.thetitle {
- width: 340px;
- height: 130px;
- float: left;
+ width: 340px;
+ height: 130px;
+ float: left;
}
#nologo {
- width: 337px;
- float: left;
- overflow: hidden;
- padding-left: 3px;
- margin-top: 40px;
- }
-
+ width: 337px;
+ float: left;
+ overflow: hidden;
+ padding-left: 3px;
+ margin-top: 40px;
+ }
+
#nologo.nomenu {
- width: 100%;
-}
+ width: 100%;
+}
#nologo a, #nologo {
- font-size: 35px;
- font-style: italic;
- font-family: Palatino,"Palatino Linotype",Georgia,"Times New Roman",serif;
- font-weight: 800;
- letter-spacing: -1px;
- line-height: 45px;
-
-
+ font-size: 35px;
+ font-style: italic;
+ font-family: Palatino,"Palatino Linotype",Georgia,"Times New Roman",serif;
+ font-weight: 800;
+ letter-spacing: -1px;
+ line-height: 45px;
+
+
}
#nologo a:hover {
- text-decoration: none;
+ text-decoration: none;
}
div.rightinfo {
- float: right;
- min-width: 470px;
- height: 130px;
- overflow: hidden;
+ float: right;
+ min-width: 470px;
+ height: 130px;
+ overflow: hidden;
}
#menucontainer {
- height: 45px;
- margin-top: 40px;
+ height: 45px;
+ margin-top: 40px;
}
/** main content wraps **/
#outercontainer {
- width: 91%;
- min-width: 910px;
- margin:0 auto;
- background-position: 78% 100%;
- padding: 1%;
- background: url([[pix:theme|contback]]);
- border: 1px solid #dadada;
+ width: 91%;
+ min-width: 910px;
+ margin:0 auto;
+ background-position: 78% 100%;
+ padding: 1%;
+ background: url([[pix:theme|contback]]);
+ border: 1px solid #dadada;
}
#container {
- width: 100%;
- margin:0 auto;
- background: #fff url([[pix:theme|post_grid]]) repeat-y 21% 100%;
- border: 1px solid #dadada;
+ width: 100%;
+ margin:0 auto;
+ background: #fff url([[pix:theme|post_grid]]) repeat-y 21% 100%;
+ border: 1px solid #dadada;
}
#innercontainer {
- background: url([[pix:theme|post_grid]]) repeat-y 79% 100%;
+ background: url([[pix:theme|post_grid]]) repeat-y 79% 100%;
}
/** remove background image line for post or pre or content only **/
.side-pre-only #innercontainer, .content-only #innercontainer, .content-only #container, .side-post-only #container {
- background-image: none !important;
+ background-image: none !important;
}
/** breadcrumb and button holders at top of page content **/
div#jcontrols_button {
- width: 100%;
- min-height: 35px;
- border-top: 1px solid #fff;
- background: #f9f9f9 url([[pix:theme|hr_grid]]) repeat-x 100% 100%;
+ width: 100%;
+ min-height: 35px;
+ border-top: 1px solid #fff;
+ background: #f9f9f9 url([[pix:theme|hr_grid]]) repeat-x 100% 100%;
}
div#jcontrols_bottom {
- width: 100%;
- height: 35px;
- background: url([[pix:theme|hr_grid]]) repeat-x 0% 0%;
- clear: both;
+ width: 100%;
+ height: 35px;
+ background: url([[pix:theme|hr_grid]]) repeat-x 0% 0%;
+ clear: both;
}
div.jcontrolsleft {
- min-height: 35px;
- line-height: 35px;
- margin-left: 15px;
- font-weight: 600;
- font-size: 13px;
- float: left;
- min-width: 100px;
+ min-height: 35px;
+ line-height: 35px;
+ margin-left: 15px;
+ font-weight: 600;
+ font-size: 13px;
+ float: left;
+ min-width: 100px;
}
div.jcontrolsright {
- float: right;
- min-width: 100px;
- min-height: 35px;
- margin-right: 15px;
+ float: right;
+ min-width: 100px;
+ min-height: 35px;
+ margin-right: 15px;
}
div.jcontrolsright div.singlebutton, div.jcontrolsright div.forumsearch {
- margin: 5px 0px 0px;
+ margin: 5px 0px 0px;
}
/** foot wraps and inner divs **/
#footer {
- width: 91%;
- height: 35px;
- position: relative;
- margin: 0 auto;
+ width: 91%;
+ height: 35px;
+ position: relative;
+ margin: 0 auto;
}
#footer-wrap {
- position: relative;
- bottom: 0;
- left: 0;
- width: 100%;
- background: none;
- margin-top: 10px;
- height: 35px;
+ position: relative;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ background: none;
+ margin-top: 10px;
+ height: 35px;
}
.johndocs {
- float: right;
- height: 15px;
- font-size: 8px;
- margin: 10px 3px 0px 0px;
- color: #333333;
+ float: right;
+ height: 15px;
+ font-size: 8px;
+ margin: 10px 3px 0px 0px;
+ color: #333333;
}
.johndocs a, div.johndocsleft a {
- font-weight: 200;
- text-decoration: none;
+ font-weight: 200;
+ text-decoration: none;
}
div.johndocsleft {
- float: left;
- height: 15px;
- margin-top: 10px;
- width: 300px;
- color: #333333;
- font-size: 11px;
+ float: left;
+ height: 15px;
+ margin-top: 10px;
+ width: 300px;
+ color: #333333;
+ font-size: 11px;
}
/** Some breadcrumb style **/
.breadcrumb ul {
- line-height: 35px;
+ line-height: 35px;
}
.breadcrumb li a,.breadcrumb li, .breadcrumb li a:visited {
- font-weight: 200;
- text-decoration: none;
- color: #666666;
- font-size: 12px;
+ font-weight: 200;
+ text-decoration: none;
+ color: #666666;
+ font-size: 12px;
}
.breadcrumb li a:hover {
- text-decoration: underline;
- color: #333333;
+ text-decoration: underline;
+ color: #333333;
}
.breadcrumb li img {
- vertical-align: middle;
+ vertical-align: middle;
}
/** breadcrumb image replacement **/
div#jcontrols_button span.arrow.sep {
- font-size: 1px;
- color: #fafafa;
- background: url([[pix:theme|breadcrumb_separator_arrow_2_dots]]) no-repeat;
- background-position: 50% 9px;
- display: inline-block;
- width: 16px;
- line-height: 40px;
+ font-size: 1px;
+ color: #fafafa;
+ background: url([[pix:theme|breadcrumb_separator_arrow_2_dots]]) no-repeat;
+ background-position: 50% 9px;
+ display: inline-block;
+ width: 16px;
+ line-height: 40px;
}
/** Block styles **/
.block {
- margin: 0 0 5px 0 !important;
- padding: 0 0 0 0 !important;
- border: none !important;
+ margin: 0 0 5px 0 !important;
+ padding: 0 0 0 0 !important;
+ border: none !important;
}
.block div.header {
- margin: 0 0 0 !important;
- padding-top: 0 !important;
- min-height: 33px;
- height: auto !important;
- height: 33px;
- border-right: 1px solid #dadada;
- border-top: 1px solid #dfdfdf;
- border-left: 1px solid #dfdfdf;
- border-bottom: 1px solid #cccccc;
- background: #eeeeee url([[pix:theme|bart5]]) repeat-x;
+ margin: 0 0 0 !important;
+ padding-top: 0 !important;
+ min-height: 33px;
+ height: auto !important;
+ height: 33px;
+ border-right: 1px solid #dadada;
+ border-top: 1px solid #dfdfdf;
+ border-left: 1px solid #dfdfdf;
+ border-bottom: 1px solid #cccccc;
+ background: #eeeeee url([[pix:theme|bart5]]) repeat-x;
}
.block.hidden div.header {
- border: 1px solid #dadada;
+ border: 1px solid #dadada;
}
.block.block_with_controls div.header div.commands {
- text-align: center;
- border-top: 1px solid #ccc;
- padding: 2px;
+ text-align: center;
+ border-top: 1px solid #ccc;
+ padding: 2px;
}
.block.block_with_controls div.header div.commands a img {
- margin-right: 3px;
+ margin-right: 3px;
}
.title h2 {
- padding: 0px 0px 0px 10px;
- font-size: 16px;
- text-transform: none;
- margin: 0 !important;
- line-height: 32px;
- font-weight: 800;
+ padding: 0px 0px 0px 10px;
+ font-size: 16px;
+ text-transform: none;
+ margin: 0 !important;
+ line-height: 32px;
+ font-weight: 800;
}
.block div.block_action input, .block div.block_action img {
- margin-top: 3px;
- margin-right: 3px;
- position: relative;
- top: 6px;
+ margin-top: 3px;
+ margin-right: 3px;
+ position: relative;
+ top: 6px;
}
.block div.content {
- font-size: 12px;
- font-weight: 200;
- padding: 10px 15px 15px;
+ font-size: 12px;
+ font-weight: 200;
+ padding: 10px 15px 15px;
}
/** extra left padding on right side blocks **/
#region-post .block div.content {
- padding-left: 20px;
+ padding-left: 20px;
}
/** some specific block styles for calendar block, login block, my profile block, etc. **/
.block_calendar_month table.minicalendar.calendartable td,.block_calendar_month table.minicalendar.calendartable th {
- border: none !important;
+ border: none !important;
}
.block_calendar_month table.minicalendar {
- margin-bottom: 0px !important;
+ margin-bottom: 0px !important;
}
.block_calendar_month table.minicalendar.calendartable th abbr {
- border: none !important;
- text-decoration: none;
+ border: none !important;
+ text-decoration: none;
}
.block_comments div.content li {
- list-style-type: none;
+ list-style-type: none;
}
.block_messages.block div.content .list a {
- font-size: 10px;
+ font-size: 10px;
}
.block_login.block div.content div {
- margin-bottom: 9px;
- clear: both;
+ margin-bottom: 9px;
+ clear: both;
}
.block_login.block div.content label {
- font-size: 11px;
- display: inline-block;
- min-width: 50px;
- margin-right: 3px;
+ font-size: 11px;
+ display: inline-block;
+ min-width: 50px;
+ margin-right: 3px;
}
.block_myprofile div.content div {
- font-size: 11px;
+ font-size: 11px;
}
.block_myprofile div.content div.myprofileitem.picture {
- width: 105px;
- float: left;
+ width: 105px;
+ float: left;
}
.block_myprofile div.myprofileitem.fullname {
- font-size: 12px;
- font-weight: 800;
+ font-size: 12px;
+ font-weight: 800;
}
.block_myprofile div.myprofileitem.edit {
- clear: both;
- font-weight: 800;
- font-size: 12px;
+ clear: both;
+ font-weight: 800;
+ font-size: 12px;
}
.block_news_items div.content li.post {
- margin-bottom: 4px;
- margin-top: 2px;
+ margin-bottom: 4px;
+ margin-top: 2px;
}
.block_news_items div.content div.head.clearfix {
- font-size: 11px;
+ font-size: 11px;
}
.block_news_items div.content div.info {
- font-weight: 600;
+ font-weight: 600;
}
/** inner block style for decent display of recent news, etc **/
.block_recent_activity.block_docked div.content h2.main, .block_recent_activity.block_docked div.content h3.main, .side-pre .block div.content h2.main,.side-post .block div.content h2.main,.block div.content h3.main,.block div.content h2 {
- font-size: 13px;
- color: #333;
- font-weight: 800;
- background: none;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ color: #333;
+ font-weight: 800;
+ background: none;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
/** a few styles for the tabs **/
div.tabtree li a span {
- font-size: 11px;
+ font-size: 11px;
}
/** yui overlays **/
div.yui3-widget.yui3-overlay.yui3-widget-positioned {
- border: 1px solid #cccccc;
+ border: 1px solid #cccccc;
}
div.yui3-overlay-content.yui3-widget-stdmod {
- border: 1px solid #fff;
- background: #ffff66 url([[pix:theme|alert-overlay]]) repeat-x;
+ border: 1px solid #fff;
+ background: #ffff66 url([[pix:theme|alert-overlay]]) repeat-x;
}
div.yui3-widget-bd {
- border: none;
- background: none;
+ border: none;
+ background: none;
}
div.yui3-widget-bd h1.helpheading {
- font-size: 16px !important;
- font-weight: 800;
- margin: 5px 0px 2px 18px;
- background: url([[pix:theme|information]]) no-repeat 0% 50%;
+ font-size: 16px !important;
+ font-weight: 800;
+ margin: 5px 0px 2px 18px;
+ background: url([[pix:theme|information]]) no-repeat 0% 50%;
}
.yui-module.yui-overlay.yui-panel div.hd {
- background: #eeeeee url([[pix:theme|bart5]]) repeat-x 0% 90%;
- }
+ background: #eeeeee url([[pix:theme|bart5]]) repeat-x 0% 90%;
+ }
/**moodle dropdown css for yui menu **/
#custommenu {
- font-size: 13px;
- font-weight: 600;
- border: none !important;
- height: 45px;
+ font-size: 13px;
+ font-weight: 600;
+ border: none !important;
+ height: 45px;
}
div.yui3-menu.yui3-menu-horizontal {
- background: #fafafa url([[pix:theme|menubarback]]) repeat-x !important;
- border-bottom: 1px solid #cccccc !important;
- border-top: 1px solid #dadada !important;
- border-left: none;
- border-right: 1px solid #cccccc;
- float: right;
+ background: #fafafa url([[pix:theme|menubarback]]) repeat-x !important;
+ border-bottom: 1px solid #cccccc !important;
+ border-top: 1px solid #dadada !important;
+ border-left: none;
+ border-right: 1px solid #cccccc;
+ float: right;
}
div.yui3-menu-content {
- border: none !important;
+ border: none !important;
}
.yui3-menu-content li a {
- font-size: 12px;
- font-weight: 600;
- text-transform: lowercase;
- line-height: 45px;
- cursor: pointer;
- border-right: none !important;
- border-top: none !important;
- border-bottom: none !important;
+ font-size: 12px;
+ font-weight: 600;
+ text-transform: lowercase;
+ line-height: 45px;
+ cursor: pointer;
+ border-right: none !important;
+ border-top: none !important;
+ border-bottom: none !important;
}
.yui3-menu-horizontal .yui3-menu-label {
- padding-left: 16px !important;
- background: url([[pix:theme|yuiarrows]]) no-repeat 7px 17px !important;
- }
+ padding-left: 16px !important;
+ background: url([[pix:theme|yuiarrows]]) no-repeat 7px 17px !important;
+ }
.yui3-menu-horizontal .yui3-menu-label-menuvisible {
- background-position: 5px -23px !important;
+ background-position: 5px -23px !important;
}
.yui3-menu-content li {
- border-left: 1px solid #dadada;
- border-top: none !important;
+ border-left: 1px solid #dadada;
+ border-top: none !important;
}
.yui3-menu-content li:hover {
- background: #eee;
+ background: #eee;
}
div.yui3-menu.custom_menu_submenu {
- background: url([[pix:theme|yuiarrow]]) no-repeat 40px 0;
- border: none;
- min-width: 100px;
- z-index: 99998;
+ background: url([[pix:theme|yuiarrow]]) no-repeat 40px 0;
+ border: none;
+ min-width: 100px;
+ z-index: 99998;
}
div.yui3-menu.custom_menu_submenu div.yui3-menu.custom_menu_submenu {
- background: none !important;
- min-width: 100px;
+ background: none !important;
+ min-width: 100px;
}
div.yui3-menu.custom_menu_submenu div.yui3-menu-content {
- background: #fff;
- z-index: 99999;
- min-width: 200px;
- padding-top: 0 !important;
- padding-bottom: 0 !important;
- margin: 20px 0px 0px -40px;
+ background: #fff;
+ z-index: 99999;
+ min-width: 200px;
+ padding-top: 0 !important;
+ padding-bottom: 0 !important;
+ margin: 20px 0px 0px -40px;
}
/** below style to move sub subs to the left to keep from going off the page **/
div.yui3-menu.custom_menu_submenu div.yui3-menu-content div.yui3-menu.custom_menu_submenu div.yui3-menu-content {
- margin-left: -400px !important;
- /** double the width of the menu item **/
- position: absolute;
- top: -15px;
+ margin-left: -400px !important;
+ /** double the width of the menu item **/
+ position: absolute;
+ top: -15px;
}
div.yui3-menu.custom_menu_submenu .yui3-menu-content li {
- border-left: none;
+ border-left: none;
}
div.yui3-menu.custom_menu_submenu .yui3-menu-content li a {
- font-size: 11px;
- border-bottom: 1px solid #cccccc !important;
- border-top: 0px solid #fff !important;
- text-transform: none;
- background: #eee !important;
- text-decoration: none !important;
- text-transform: lowercase;
+ font-size: 11px;
+ border-bottom: 1px solid #cccccc !important;
+ border-top: 0px solid #fff !important;
+ text-transform: none;
+ background: #eee !important;
+ text-decoration: none !important;
+ text-transform: lowercase;
}
div.yui3-menu.custom_menu_submenu .yui3-menu-content li a:hover {
- background: #cccccc !important;
- cursor: pointer;
- color: black !important;
- text-decoration: none !important;
+ background: #cccccc !important;
+ cursor: pointer;
+ color: black !important;
+ text-decoration: none !important;
}
div.yui3-menu.custom_menu_submenu li a.yui3-menu-label {
- background: #eee url([[pix:theme|yuiarrows]]) no-repeat 7px -72px !important;
+ background: #eee url([[pix:theme|yuiarrows]]) no-repeat 7px -72px !important;
}
div.yui3-menu.custom_menu_submenu li a.yui3-menu-label:hover {
- background: #ccc url([[pix:theme|yuiarrows]]) no-repeat !important 7px -72px;
+ background: #ccc url([[pix:theme|yuiarrows]]) no-repeat !important 7px -72px;
}
/** yui moodle dock bar **/
#dock {
- padding-top: 0px;
- width: 30px;
+ padding-top: 0px;
+ width: 30px;
}
div.dockeditem_container div.dockeditem {
- background: url([[pix:theme|mbar]]) repeat-y;
- border: none;
- color: #fff;
- font: 100% Constantia, Lucidabright, Lucida, Georgia, serif;
+ background: url([[pix:theme|mbar]]) repeat-y;
+ border: none;
+ color: #fff;
+ font: 100% Constantia, Lucidabright, Lucida, Georgia, serif;
}
div.dockeditem_container.firstdockitem {
- border-top: none;
+ border-top: none;
}
div.dockedtitle {
- border: none;
- padding-top: 3px;
- padding-bottom: 3px;
+ border: none;
+ padding-top: 3px;
+ padding-bottom: 3px;
}
.dockedtitle h2 {
- font-weight: 200 !important;
+ font-weight: 200 !important;
}
div.dockeditempanel_content {
- border: 1px solid #dadada !important;
- border-left: none !important;
- font-size: 90%;
+ border: 1px solid #dadada !important;
+ border-left: none !important;
+ font-size: 90%;
}
div.dockeditempanel_content a {
- text-decoration: none;
+ text-decoration: none;
}
div.dockeditempanel_hd {
- text-align: left;
- font-size: 12px;
+ text-align: left;
+ font-size: 12px;
}
div.dockeditempanel_hd {
- padding-top: 3px;
- padding-bottom: 3px;
- background: #eee;
- border-bottom: 1px solid #dadada !important;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ background: #eee;
+ border-bottom: 1px solid #dadada !important;
}
div.dockeditempanel_hd h2 {
- font-weight: 600;
- font-size: 12px;
+ font-weight: 600;
+ font-size: 12px;
}
div.dockeditempanel_bd ul, div.dockeditempanel_bd li {
- list-style-type: none;
- padding: 0;
+ list-style-type: none;
+ padding: 0;
}
div.dockeditempanel_bd {
- font-weight: 200;
+ font-weight: 200;
}
#dockeditempanel {
- margin-left: 1px;
+ margin-left: 1px;
}
html>
/**/body #dockeditempanel {
- margin-top: -20px;
+ margin-top: -20px;
}
#dock div.controls {
- margin-top: 20px;
- padding-top: 0px;
- position: relative;
+ margin-top: 20px;
+ padding-top: 0px;
+ position: relative;
}
/** main headings **/
.generalbox h2,h3.sectionname, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 {
- font-size: 30px;
- padding-bottom: 2px;
- margin: 3px 0 2px;
- border-bottom: none;
- display: block;
- font-family: Georgia, serif;
- font-weight: normal;
- letter-spacing: -1px;
- line-height: 1em;
- background: url([[pix:theme|hr_grid]]) repeat-x 0% 89%
- }
+ font-size: 30px;
+ padding-bottom: 2px;
+ margin: 3px 0 2px;
+ border-bottom: none;
+ display: block;
+ font-family: Georgia, serif;
+ font-weight: normal;
+ letter-spacing: -1px;
+ line-height: 1em;
+ background: url([[pix:theme|hr_grid]]) repeat-x 0% 89%
+ }
.generalbox h2, #page-course-info h2.main, h3.sectionname, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2, div.hd h3.main {
- font-size: 22px;
- background: none;
+ font-size: 22px;
+ background: none;
}
/** forum post style **/
-.forumpost td.content {
- border: 1px solid #dadada;
- border-top: none;
- background: #fff;
- padding: 1em 1em 1em 1em;
+.forumpost .content {
+ border: 1px solid #dadada;
+ border-top: none;
+ background: #fff;
+ padding: 1em 1em 1em 1em;
}
-.forumpost td.content div.posting {
- font-size: 90%;
+.forumpost .content div.posting {
+ font-size: 90%;
}
-.forumpost td.topic {
- border: 1px solid #dadada;
- padding-top: 0px;
- padding-bottom: 0px;
+.forumpost .topic {
+ border: 1px solid #dadada;
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+
+.forumpost .topic div {
+ margin:4px;
}
.forumpost .subject, .blog_entry div.subject a {
- font-size: 19px;
+ font-size: 19px;
}
td.picture {
- border-right: none !important;
+ border-right: none !important;
}
td.author {
- border-left: none !important;
+ border-left: none !important;
}
-table.forumpost {
- border: none;
+.forumpost {
+ border: none;
}
.forumpost .commands a {
- text-decoration: none;
- font-weight: 200;
+ text-decoration: none;
+ font-weight: 200;
}
-.forumpost td.left {
- padding: 4px 5px 4px 0;
+.forumpost .left {
+
}
-.forumpost td.left.picture {
- background: url([[pix:theme|postline]]) no-repeat 120% 104%;
+.forumpost .left.picture {
+ background-image: url([[pix:theme|postline]]);
+ background-repeat: no-repeat;
+ background-position: 180% 106%;
}
-.forumpost td.left.picture img {
- border: 1px solid #eee;
- border-bottom: 1px solid #ccc;
- border-right: 1px solid #dadada;
- background: #fff;
- padding: 4px 4px 9px;
- margin-top: 0px;
+.forumpost .left.picture img {
+ border: 1px solid #eee;
+ border-bottom: 1px solid #ccc;
+ border-right: 1px solid #dadada;
+ background: #fff;
+ margin: 4px 0 9px;
}
.forumpost .starter {
- background-color: #FFF;
+ background-color: #FFF;
}
.forumpost .author {
- font-size: 11px !important;
- color: #666;
- font-style: italic;
- font-weight: 200;
+ font-size: 11px !important;
+ color: #666;
+ font-style: italic;
+ font-weight: 200;
}
.forumpost .author a {
- font-style: normal;
- font-weight: 800;
+ font-style: normal;
+ font-weight: 800;
}
.info .name a {
- font-weight: bold;
+ font-weight: bold;
}
.indent {
- margin-left: 30px;
+ margin-left: 30px;
}
div.subscribelink {
- text-align: right;
+ text-align: right;
}
.subscribelink a {
- text-decoration: none;
- font-size: 11px;
+ text-decoration: none;
+ font-size: 11px;
}
/**tables and fields and foms oh my! **/
.mform fieldset,fieldset.clearfix {
- border: 1px solid #dadada !important;
- background: #f9f9f9;
+ border: 1px solid #dadada !important;
+ background: #f9f9f9;
}
.ftoggler {
- font-size: 18px;
- color: #333333;
+ font-size: 18px;
+ color: #333333;
}
div.notifysuccess {
- width: 80%;
- margin: 0 auto;
- font-size: 15px;
- color: #008500;
- border: 3px solid #dadada;
- text-align: center;
- background: #fff url([[pix:theme|check]]) no-repeat 2% 50%;
- padding: 5px;
+ width: 80%;
+ margin: 0 auto;
+ font-size: 15px;
+ color: #008500;
+ border: 3px solid #dadada;
+ text-align: center;
+ background: #fff url([[pix:theme|check]]) no-repeat 2% 50%;
+ padding: 5px;
}
table a {
- text-decoration: none;
+ text-decoration: none;
}
td.maincalendar table.calendartable th, table.rolecap .header,.generaltable .header,.forumheaderlist .header,.files .header,.editcourse .header,.logtable .header,#attempts .header,table#categoryquestions th {
- font-size: 11px;
- font-weight: 200;
- text-decoration: none;
- color: #fff !important;
- border-top: 1px #ccc solid !important;
- padding: 5px;
+ font-size: 11px;
+ font-weight: 200;
+ text-decoration: none;
+ color: #fff !important;
+ border-top: 1px #ccc solid !important;
+ padding: 5px;
}
table#categoryquestions th a {
- color: #fff;
+ color: #fff;
}
.generaltable .header a,.forumheaderlist .header a, th.header.questionnametext a {
- border: none;
- color: #fff !important;
- font-size: 12px;
- text-decoration: none;
- padding: 5px;
+ border: none;
+ color: #fff !important;
+ font-size: 12px;
+ text-decoration: none;
+ padding: 5px;
}
tr.r1 td {
- background-color: #f9f9f9;
+ background-color: #f9f9f9;
}
table.rolecap td, table.rolecap th {
- border-bottom: 1px solid #dadada;
+ border-bottom: 1px solid #dadada;
}
table.rolecap td.risk {
- border-left: 1px solid #dadada;
+ border-left: 1px solid #dadada;
}
/** Coursebox and category box stuff for front page **/
ul.unlist, ul.unlist li, ul.unlist li div, ul.unlist li div ul, ul.unlist li div ul li {
- list-style-type: none;
- padding: 0;
- margin: 0;
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
}
div.coursebox {
- padding-bottom: 7px !important;
- margin-bottom: 7px !important;
- border-bottom: 1px solid #eee;
+ padding-bottom: 7px !important;
+ margin-bottom: 7px !important;
+ border-bottom: 1px solid #eee;
}
div.coursebox h3.name {
- margin-top: 0px;
- margin-bottom: 0px;
+ margin-top: 0px;
+ margin-bottom: 0px;
}
div.coursebox h3.name a {
- font-size: 16px;
- font-weight: 400;
+ font-size: 16px;
+ font-weight: 400;
}
.unlist div.summary {
- font-size: 14px;
- color: #666666;
- font-style: italic;
+ font-size: 14px;
+ color: #666666;
+ font-style: italic;
}
.unlist ul.teachers {
- display: block;
- padding-left: 5px !important;
+ display: block;
+ padding-left: 5px !important;
}
.unlist ul.teachers li {
- font-size: 10px;
+ font-size: 10px;
}
.unlist ul.teachers li a {
- font-size: 11px;
+ font-size: 11px;
}
div.categorybox {
- border: none !important;
- margin-top: 0;
+ border: none !important;
+ margin-top: 0;
}
td.category.name a {
- padding-left: 20px;
- background-image: url([[pix:theme|jcourse]]) no-repeat 0 50%;
- font-weight: 400;
- font-size: 16px;
+ padding-left: 20px;
+ background-image: url([[pix:theme|jcourse]]) no-repeat 0 50%;
+ font-weight: 400;
+ font-size: 16px;
}
#course-index td.category.name a {
- padding-left: 0px;
- background-image: none;
+ padding-left: 0px;
+ background-image: none;
}
table.categorylist td {
- padding: 0;
+ padding: 0;
}
div.course_category_tree a {
- font-size: 16px;
- font-weight: 400;
- text-decoration: none;
+ font-size: 16px;
+ font-weight: 400;
+ text-decoration: none;
}
div.course_category_tree div.category,div.course_category_tree div.category_label,div.course_category_tree div.courses {
- margin-bottom: 8px;
+ margin-bottom: 8px;
}
div.course_category_tree div.category.with_children div.category_label {
- background-position: 0 55% !important;
+ background-position: 0 55% !important;
}
div.course_category_tree div.course.odd {
- background: #eee;
+ background: #eee;
}
div.course_category_tree div.course a {
- font-size: 14px;
+ font-size: 14px;
}
div.category.subcategory.with_children {
- margin-left: 20px;
+ margin-left: 20px;
}
div.course_category_tree div.controls {
- font-size: 10px;
- color: #666;
- text-transform: uppercase;
+ font-size: 10px;
+ color: #666;
+ text-transform: uppercase;
}
div.course_category_tree div.controls div {
- margin-top: 3px;
- margin-right: 10px;
- border-bottom: 1px solid #dadada;
+ margin-top: 3px;
+ margin-right: 10px;
+ border-bottom: 1px solid #dadada;
}
/** inside of course **/
li.section {
- border-bottom: 1px solid #dadada;
- clear: both;
- min-height: 30px;
+ border-bottom: 1px solid #dadada;
+ clear: both;
+ min-height: 30px;
}
li#section-0 div.content {
- margin-top: 0px;
- padding-top: 0px;
+ margin-top: 0px;
+ padding-top: 0px;
}
li.current {
- background: #ffffe3;
+ background: #ffffe3;
}
li.current div.content {
- background: #fff;
+ background: #fff;
}
h3.weekdates {
- border: 1px solid #ccc;
- background: #eeeeee url([[pix:theme|bart5]]) repeat-x;
- width: 170px;
- font-size: 11px !important;
- font-weight: 200;
- text-transform: uppercase;
- text-align: center;
- margin: 0px 0px 3px;
- color: #333333 !important;
- padding: 3px;
+ border: 1px solid #ccc;
+ background: #eeeeee url([[pix:theme|bart5]]) repeat-x;
+ width: 170px;
+ font-size: 11px !important;
+ font-weight: 200;
+ text-transform: uppercase;
+ text-align: center;
+ margin: 0px 0px 3px;
+ color: #333333 !important;
+ padding: 3px;
}
.current h3.weekdates {
- color: black !important;
- font-weight: 600;
+ color: black !important;
+ font-weight: 600;
}
div.course-content div.left.side {
- font-weight: 200;
- font-size: 20px;
- font-family: Georgia, serif;
- color: #666;
+ font-weight: 200;
+ font-size: 20px;
+ font-family: Georgia, serif;
+ color: #666;
}
span.completionprogress {
- font-size: 11px;
- font-weight: 200;
+ font-size: 11px;
+ font-weight: 200;
}
/**my moodle page style **/
div.assignment.overview {
- margin-bottom: 5px;
- padding-bottom: 3px;
- border-bottom: 1px dashed #dadada;
+ margin-bottom: 5px;
+ padding-bottom: 3px;
+ border-bottom: 1px dashed #dadada;
}
div.assignment.overview div.name {
- font-weight: 600;
+ font-weight: 600;
}
div.assignment.overview div {
- display: block !important;
- float: none !important;
- width: 100% !important;
+ display: block !important;
+ float: none !important;
+ width: 100% !important;
}
#page-my-index div.coursebox {
- border-bottom: none;
+ border-bottom: none;
}
/** glossary activity **/
table.glossarycategoryheader h2.main {
- text-align: center;
- margin-bottom: 0;
- margin-top: 0;
+ text-align: center;
+ margin-bottom: 0;
+ margin-top: 0;
}
table.glossarypost {
- margin-top: 0;
- width: 100%;
- border-bottom: 1px dashed #dadada;
+ margin-top: 0;
+ width: 100%;
+ border-bottom: 1px dashed #dadada;
}
table.glossarypost td.entry h3 {
- font-size: 20px;
+ font-size: 20px;
}
/** a few quick wiki styles **/
#page-mod-wiki-view div.generalbox {
- padding: 10px;
+ padding: 10px;
}
#page-mod-wiki-view h2.wiki_headingtitle {
- font-size: 22px;
- font-family: Georgia, serif;
- color: #333333;
- font-weight: 600;
- text-align: left;
- margin-bottom: 3px;
- margin-top: 2px;
+ font-size: 22px;
+ font-family: Georgia, serif;
+ color: #333333;
+ font-weight: 600;
+ text-align: left;
+ margin-bottom: 3px;
+ margin-top: 2px;
}
/**HR in content blocks **/
.content hr {
- height: 1px;
- color: #dadada;
- background-color: #dadada !important;
- border: none;
- border-style: none;
+ height: 1px;
+ color: #dadada;
+ background-color: #dadada !important;
+ border: none;
+ border-style: none;
}
/** some MISC styles to clean things up and keep the theme consistant **/
div#intro {
- border: none;
- text-align: center;
- font-size: 14px;
- color: #333333;
+ border: none;
+ text-align: center;
+ font-size: 14px;
+ color: #333333;
}
div.que {
- border: 1px solid #dadada;
+ border: 1px solid #dadada;
}
div.questionbankwindow.block div.header {
- background: #eee !important;
+ background: #eee !important;
}
div.questionbankwindow.block div.header a {
- color: #333333 !important;
- font-size: 11px;
+ color: #333333 !important;
+ font-size: 11px;
}
div.generalbox, div.section {
- border: 1px solid #dadada;
+ border: 1px solid #dadada;
}
/** take borders away from some generalboxes here **/
div.generalbox.sitetopic, div.generalbox.authsui,#page-course-info div.generalbox, #page-admin-roles-assign div.generalbox, table.roleassigntable, table.roleassigntable td, #page-blocks-private-edit div.generalbox {
- border: none;
+ border: none;
}
div.generalbox.firstpageoptions h3.main {
- font-size: 16px;
+ font-size: 16px;
}
div.redirectmessage {
- width: 60%;
- margin: 10px auto 0 auto;
- border: none;
- font-size: 13px;
- background: #fff url([[pix:theme|ajax-loader]]) no-repeat 50% 100%;
- padding: 20px;
+ width: 60%;
+ margin: 10px auto 0 auto;
+ border: none;
+ font-size: 13px;
+ background: #fff url([[pix:theme|ajax-loader]]) no-repeat 50% 100%;
+ padding: 20px;
}
div.box.errorbox {
- border: 1px solid #dadada;
- color: #ff0000;
- background: #fff url([[pix:theme|error]]) no-repeat 1% 3%;
- padding: 10px;
+ border: 1px solid #dadada;
+ color: #ff0000;
+ background: #fff url([[pix:theme|error]]) no-repeat 1% 3%;
+ padding: 10px;
}
div#newmessageoverlay {
- padding: 10px;
+ padding: 10px;
}
div#newmessageoverlay a {
- text-decoration: none;
- font-size: 11px;
+ text-decoration: none;
+ font-size: 11px;
}
#page-mod-page-view div.generalbox {
- border-left: none;
- border-right: none;
- border-top: none;
+ border-left: none;
+ border-right: none;
+ border-top: none;
}
-/** fix overflow on quiz results display **/
-
div#tablecontainer {
- overflow: auto;
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
div.course-content div.availabilityinfo {
- font-size: 11px;
- font-style: italic;
- padding: 2px;
- border-bottom: 1px dashed #dadada;
- margin-bottom: 10px;
+ font-size: 11px;
+ font-style: italic;
+ padding: 2px;
+ border-bottom: 1px dashed #dadada;
+ margin-bottom: 10px;
}
/** login form **/
.twocolumns div.loginpanel {
- border-right: 1px dashed #dadada !important;
+ border-right: 1px dashed #dadada !important;
}
div.forgetpass {
- clear: both;
+ clear: both;
}
div.loginform {
- width: 50% !important;
+ width: 50% !important;
}
div.loginform div.form-input input {
- width: 90px !important;
+ width: 90px !important;
}
div.loginform label {
- line-height: 20px;
+ line-height: 20px;
}
div.signuppanel {
- float: right !important;
- width: 40% !important;
- margin-left: 0px;
- padding-left: 0px;
+ float: right !important;
+ width: 40% !important;
+ margin-left: 0px;
+ padding-left: 0px;
}
div.singlebutton.forumaddnew {
- text-align: center;
+ text-align: center;
}
#page-course-info h2.main {
- line-height: 5px;
- margin-bottom: 5px;
+ line-height: 5px;
+ margin-bottom: 5px;
}
#page-course-info div.generalbox ul, #page-course-info div.generalbox li {
- list-style-type: none;
+ list-style-type: none;
}
\ No newline at end of file
diff --git a/theme/magazine/style/layout.css b/theme/magazine/style/layout.css
index f6dc5a1dc4d0e..d938c9b8eb36e 100644
--- a/theme/magazine/style/layout.css
+++ b/theme/magazine/style/layout.css
@@ -62,27 +62,27 @@
right: 0%;
}
-.side-pre-only #page-content #region-main-box #region-post-box {
+.side-pre-only #page-content #region-post-box {
right: 77%;
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+.side-pre-only #page-content #region-main {
left: 100%;
width: 77%;
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
+.side-pre-only #page-content #region-main .region-content {
overflow: hidden;
padding: 20px 10px;
padding-top: 10px;
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-pre {
+.side-pre-only #page-content #region-pre {
left: 1%;
width: 21%;
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-post {
+.side-pre-only #page-content #region-post {
width: 0%;
}
@@ -92,21 +92,21 @@
right: 23%;
}
-.side-post-only #page-content #region-main-box #region-post-box {
+.side-post-only #page-content #region-post-box {
right: 76%;
}
-.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+.side-post-only #page-content #region-main {
left: 100%;
width: 77%;
}
-.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
+.side-post-only #page-content #region-main .region-content {
overflow: hidden;
padding: 20px 10px;
}
-.side-post-only #page-content #region-main-box #region-post-box #region-post {
+.side-post-only #page-content #region-post {
left: 100%;
width: 21%;
}
@@ -121,15 +121,15 @@
right: 0%;
}
-.content-only #page-content #region-main-box #region-post-box {
+.content-only #page-content #region-post-box {
right: 100%;
}
-.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
+.content-only #page-content #region-main {
width: 98%;
}
-.content-only #page-content #region-main-box #region-post-box #region-pre {
+.content-only #page-content #region-pre {
width: 0%;
}
@@ -145,4 +145,7 @@
#region-post {
padding-top: 0px;
-}
\ No newline at end of file
+}
+
+.pagelayout-report #page-content #region-main {overflow:auto;}
+.pagelayout-report #page-content #region-main .region-content {overflow:visible;}
\ No newline at end of file
diff --git a/theme/nonzero/config.php b/theme/nonzero/config.php
index 1249bf0779db4..c46e3033bca20 100644
--- a/theme/nonzero/config.php
+++ b/theme/nonzero/config.php
@@ -38,8 +38,8 @@
$THEME->parents = array(
- 'canvas',
- 'base',
+ 'canvas',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -54,8 +54,8 @@
$THEME->sheets = array(
- 'core',
- 'pagelayout',
+ 'core',
+ 'pagelayout',
);
////////////////////////////////////////////////////
@@ -64,12 +64,12 @@
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'pagelayout',
- ),
- 'canvas'=>array(
- 'pagelayout',
- ),
+ 'base'=>array(
+ 'pagelayout',
+ ),
+ 'canvas'=>array(
+ 'pagelayout',
+ ),
);
@@ -155,7 +155,7 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
@@ -166,7 +166,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
-
+ 'report' => array(
+ 'file' => 'general.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ ),
);
///////////////////////////////////////////////////////////////
diff --git a/theme/nonzero/style/pagelayout.css b/theme/nonzero/style/pagelayout.css
index 60123fabc57a4..b01e5ef9984a3 100644
--- a/theme/nonzero/style/pagelayout.css
+++ b/theme/nonzero/style/pagelayout.css
@@ -1,139 +1,136 @@
/** Path: theme pagelayout **/
-
-
-
body {margin:auto 0px;width:auto;}
#page {width:100%;overflow:hidden;}
#page-content {
- clear: both;
- overflow: hidden;
- position: relative;
- width: 100%;
+ clear: both;
+ overflow: hidden;
+ position: relative;
+ width: 100%;
}
#page-content #region-main-box {
- float: left;
- margin-left: -[[setting:regionpostwidth]];;
- position: relative;
- width: 200%;
- right: 100%;
+ float: left;
+ margin-left: -[[setting:regionpostwidth]];;
+ position: relative;
+ width: 200%;
+ right: 100%;
}
-#page-content #region-main-box #region-post-box {
- float: left;
- margin-left: -[[setting:regionprewidth]];;
- width: 100%;
+#page-content #region-post-box {
+ float: left;
+ margin-left: -[[setting:regionprewidth]];;
+ width: 100%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap {
- float: left;
- width: 50%;
+#page-content #region-main-wrap {
+ float: left;
+ width: 50%;
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- overflow: hidden;
- position: relative;
- margin-left: [[setting:regionsumwidth]];
- left: 100%;
+#page-content #region-main {
+ overflow: hidden;
+ position: relative;
+ margin-left: [[setting:regionsumwidth]];
+ left: 100%;
}
-#page-content #region-main-box #region-post-box #region-pre {
- float: right;
- position: relative;
- width: [[setting:regionprewidth]];
- left: [[setting:regionprewidth]];
+#page-content #region-pre {
+ float: right;
+ position: relative;
+ width: [[setting:regionprewidth]];
+ left: [[setting:regionprewidth]];
}
-#page-content #region-main-box #region-post-box #region-post {
- float: right;
- position: relative;
- left: [[setting:regiondoublepresumwidth]];
- width: [[setting:regionpostwidth]];
+#page-content #region-post {
+ float: right;
+ position: relative;
+ left: [[setting:regiondoublepresumwidth]];
+ width: [[setting:regionpostwidth]];
}
-#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
- overflow: hidden;
- padding: 20px 20px 20px 0;
+#page-content #region-main .region-content {
+ overflow: hidden;
+ padding: 20px 20px 20px 0;
}
-#page-content #region-main-box #region-post-box #region-pre .region-content,
-#page-content #region-main-box #region-post-box #region-post .region-content {
- overflow: hidden;
- padding: 20px 10px;
+#page-content #region-pre .region-content,
+#page-content #region-post .region-content {
+ overflow: hidden;
+ padding: 20px 10px;
}
#page-footer {
- clear: both;
- float: left;
- width: 100%;
+ clear: both;
+ float: left;
+ width: 100%;
}
/** Only side pre **/
-
.side-pre-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
}
-.side-pre-only #page-content #region-main-box #region-post-box {
- margin-left: -[[setting:regionprewidth]];
+.side-pre-only #page-content #region-post-box {
+ margin-left: -[[setting:regionprewidth]];
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: [[setting:regionprewidth]];
+.side-pre-only #page-content #region-main {
+ margin-left: [[setting:regionprewidth]];
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-pre {
- left: [[setting:regionprewidth]];
- width: [[setting:regionprewidth]];
+.side-pre-only #page-content #region-pre {
+ left: [[setting:regionprewidth]];
+ width: [[setting:regionprewidth]];
}
-.side-pre-only #page-content #region-main-box #region-post-box #region-post {
- width: 0%;
+.side-pre-only #page-content #region-post {
+ width: 0%;
}
/** Only side post **/
-
.side-post-only #page-content #region-main-box {
- margin-left: 0px;
-
+ margin-left: 0px;
+
}
-.side-post-only #page-content #region-main-box #region-post-box {
- margin-left: -[[setting:regionpostwidth]];
+.side-post-only #page-content #region-post-box {
+ margin-left: -[[setting:regionpostwidth]];
}
-.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: [[setting:regionpostwidth]];
-
+.side-post-only #page-content #region-main {
+ margin-left: [[setting:regionpostwidth]];
+
}
-.side-post-only #page-content #region-main-box #region-post-box #region-post {
- left: [[setting:regionpostwidth]];
- width: [[setting:regionpostwidth]];
+.side-post-only #page-content #region-post {
+ left: [[setting:regionpostwidth]];
+ width: [[setting:regionpostwidth]];
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: [[setting:regionprewidth]];
+ margin-left: [[setting:regionprewidth]];
}
/** No blocks whatsoever **/
-
.content-only #page-content #region-main-box {
- margin-left: 0px;
+ margin-left: 0px;
+}
+
+.content-only #page-content #region-post-box {
+ margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box {
- margin-left: 0px;
+.content-only #page-content #region-main {
+ margin-left: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
- margin-left: 0px;
+.content-only #page-content #region-pre {
+ width: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-pre {
- width: 0px;
+.content-only #page-content #region-post {
+ width: 0px;
}
-.content-only #page-content #region-main-box #region-post-box #region-post {
- width: 0px;
-}
\ No newline at end of file
+.pagelayout-report #page-content #region-main {overflow:auto;}
+.pagelayout-report #page-content #region-main .region-content {overflow:visible;}
\ No newline at end of file
diff --git a/theme/overlay/config.php b/theme/overlay/config.php
index 3425f8f0b6346..686e96c7284b8 100644
--- a/theme/overlay/config.php
+++ b/theme/overlay/config.php
@@ -38,8 +38,8 @@
$THEME->parents = array(
- 'canvas',
- 'base',
+ 'canvas',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -54,9 +54,9 @@
$THEME->sheets = array(
- 'core',
- 'settings',
- 'pagelayout',
+ 'core',
+ 'settings',
+ 'pagelayout',
);
////////////////////////////////////////////////////
@@ -65,12 +65,12 @@
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'pagelayout',
- ),
- 'canvas'=>array(
- 'pagelayout',
- ),
+ 'base'=>array(
+ 'pagelayout',
+ ),
+ 'canvas'=>array(
+ 'pagelayout',
+ ),
);
@@ -156,12 +156,16 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
-
+ 'report' => array(
+ 'file' => 'general.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ ),
);
///////////////////////////////////////////////////////////////
@@ -174,7 +178,7 @@
///////////////////////////////////////////////////////////////
$THEME->csspostprocess = 'overlay_process_css';
-
+
////////////////////////////////////////////////////
// Allows the user to provide the name of a function
// that all CSS should be passed to before being
@@ -188,7 +192,7 @@
// media player for the filters
////////////////////////////////////////////////////
-// $THEME->javascripts
+// $THEME->javascripts
////////////////////////////////////////////////////
// An array containing the names of JavaScript files
@@ -196,26 +200,26 @@
// (gets included in the head)
////////////////////////////////////////////////////
-// $THEME->javascripts_footer
+// $THEME->javascripts_footer
////////////////////////////////////////////////////
// As above but will be included in the page footer.
////////////////////////////////////////////////////
-// $THEME->larrow
+// $THEME->larrow
////////////////////////////////////////////////////
// Overrides the left arrow image used throughout
// Moodle
////////////////////////////////////////////////////
-// $THEME->rarrow
+// $THEME->rarrow
////////////////////////////////////////////////////
// Overrides the right arrow image used throughout Moodle
////////////////////////////////////////////////////
-// $THEME->layouts
+// $THEME->layouts
////////////////////////////////////////////////////
// An array setting the layouts for the theme
@@ -228,7 +232,7 @@
// the themes parents
////////////////////////////////////////////////////
-// $THEME->parents_exclude_sheets
+// $THEME->parents_exclude_sheets
////////////////////////////////////////////////////
// An array of stylesheets not to inherit from the
@@ -252,5 +256,5 @@
// $THEME->resource_mp3player_colors
////////////////////////////////////////////////////
-// Controls the colours for the MP3 player
+// Controls the colours for the MP3 player
////////////////////////////////////////////////////
diff --git a/theme/serenity/style/core.css b/theme/serenity/style/core.css
index 6d953887276ec..e92ef14baad99 100644
--- a/theme/serenity/style/core.css
+++ b/theme/serenity/style/core.css
@@ -6,207 +6,215 @@
.pagelayout-admin,
.pagelayout-mydashboard,
.pagelayout-mypublic,
-.pagelayout-login {
- background: url([[pix:theme|body]]);
+.pagelayout-login,
+.pagelayout-report {
+ background: url([[pix:theme|body]]);
+ border-top:1px solid #c1bc9d;
}
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
- font-family: Georgia, "Times New Roman", Times, serif;
- color: #2a2513;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ color: #2a2513;
}
#wrapper {
- background: #fff;
- margin: 2% 5%;
- padding: 5px;
- border: 1px solid #c1bc9d;
+ background: #fff;
+ margin: 2% 5%;
+ padding: 5px;
+ border: 1px solid #c1bc9d;
}
a {
- color: #336699;
+ color: #336699;
}
a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
.pagelayout-frontpage #page-content #region-main-box #region-post-box {
- padding-top: 0;
+ padding-top: 0;
}
/* Header
------------------------*/
#page-header {
- background: #ddd6cc url([[pix:theme|header_grass]]) repeat-x 0 100%;
- margin-bottom: 5px;
+ background: #ddd6cc url([[pix:theme|header_grass]]) repeat-x 0 100%;
+ margin-bottom: 5px;
}
.headermain {
- font-weight: normal;
- margin: 1em 0.5em 0.75em;
+ font-weight: normal;
+ margin: 1em 0.5em 0.75em;
}
/* Navbar
-------------------------*/
.navbar {
- background: #aeb9c6 url([[pix:theme|breadcrumb]]) repeat-x 0 100%;
- padding: 5px;
+ background: #aeb9c6 url([[pix:theme|breadcrumb]]) repeat-x 0 100%;
+ padding: 5px;
}
/* Blocks
-------------------------*/
.block {
- border-color: #eee;
+ border-color: #eee;
}
.block .header {
- background: #9eb1bf;
- padding-left: 5px;
+ background: #9eb1bf;
+ padding-left: 5px;
}
.block .title {
- background: #867f6a;
- padding-left: 5px;
+ background: #867f6a;
+ padding-left: 5px;
}
.block .title h2 {
- background: #6e6855;
- margin: 0;
- padding: 5px;
- font-size: 1em;
- color: #fff;
+ background: #6e6855;
+ margin: 0;
+ padding: 5px;
+ font-size: 1em;
+ color: #fff;
}
.block_action {
- padding: 5px 0 0;
+ padding: 5px 0 0;
}
.block .content {
- background: #d8d2c6;
- border: 1px solid #867f6a;
+ background: #d8d2c6;
+ border: 1px solid #867f6a;
}
.block .minicalendar td,
.block .minicalendar th {
- border-color: #d8d2c6;
+ border-color: #d8d2c6;
}
/* Course
----------------------------*/
.headingblock {
- background: url([[pix:theme|headingblock]]) repeat-x 0 0;
- color: #fff;
- font-weight: normal;
- border: none;
- padding: 2px 5px;
+ background: url([[pix:theme|headingblock]]) repeat-x 0 0;
+ color: #fff;
+ font-weight: normal;
+ border: none;
+ padding: 2px 5px;
}
.course-content .main {
- border: 1px solid #eee;
- background: #eee;
+ border: 1px solid #eee;
+ background: #eee;
}
.course-content .current {
- background: #9ca7b4;
- color: #fff;
+ background: #9ca7b4;
+ color: #fff;
}
.course-content .main .content {
- background: #fff;
+ background: #fff;
}
/* Forums
-----------------------------*/
.forumpost .topic {
- background: #cad5e1;
- border-width: 1px;
- border-color: #eee #eee #aaa;
- border-style: solid;
+ background: #cad5e1;
+ border-width: 1px;
+ border-color: #eee #eee #aaa;
+ border-style: solid;
}
+.forumpost .topic div,
+.forumpost .content div {
+ margin:4px;
+}
+
+
.forumpost .starter .subject {
- font-weight: bold;
+ font-weight: bold;
}
.forumpost .content {
- border-color: #eee;
- border-width: 0 1px 1px;
- border-style: solid;
- background: #f6f6f6;
+ border-color: #eee;
+ border-width: 0 1px 1px;
+ border-style: solid;
+ background: #f6f6f6;
}
/* Dock
-----------------------------*/
body.has_dock {
- margin: 0;
+ margin: 0;
}
#dock {
- left: 5%;
- margin-left: -29px;
- border-width: 0;
- background-color: transparent;
+ left: 5%;
+ margin-left: -29px;
+ border-width: 0;
+ background-color: transparent;
}
#dock .controls {
- bottom: auto;
- background-color: #DDD6CC;
+ bottom: auto;
+ background-color: #DDD6CC;
}
#dock .dockeditem_container {
- position: relative;
+ position: relative;
}
#dock .dockeditem.firstdockitem {
- margin-top: 50px;
+ margin-top: 50px;
}
#dock .dockeditem {
- background-color: #fff;
- padding: 2px;
- padding-right: 0px;
+ background-color: #fff;
+ padding: 2px;
+ padding-right: 0px;
}
#dock .dockedtitle {
- border-width: 0;
+ border-width: 0;
}
#dock .dockedtitle h2 {
- margin: 0;
- padding: 10px 3px;
+ margin: 0;
+ padding: 10px 3px;
}
#dock .dockedtitle.activeitem {
- background-color: #817b65;
- width: 35px;
+ background-color: #817b65;
+ width: 35px;
}
#dockeditempanel {
- background-color: #817b65;
- margin-left: 5px;
+ background-color: #817b65;
+ margin-left: 5px;
}
#dockeditempanel .dockeditempanel_content {
- background-color: #eee9e0;
- margin: 0 3px;
- position: relative;
- top: -3px;
- min-height: 100px;
- border-color: #6f6856;
+ background-color: #eee9e0;
+ margin: 0 3px;
+ position: relative;
+ top: -3px;
+ min-height: 100px;
+ border-color: #6f6856;
}
#dockeditempanel .dockeditempanel_hd {
- background-image: url([[pix:theme|headingblock]]);
- border-width: 0;
+ background-image: url([[pix:theme|headingblock]]);
+ border-width: 0;
}
#dockeditempanel .dockeditempanel_hd h2 {
- font-size: 1em;
- color: #fff;
+ font-size: 1em;
+ color: #fff;
}
\ No newline at end of file
diff --git a/theme/sky_high/config.php b/theme/sky_high/config.php
index df25c67762e91..2c190bc5308d1 100644
--- a/theme/sky_high/config.php
+++ b/theme/sky_high/config.php
@@ -36,8 +36,8 @@
$THEME->parents = array(
- 'canvas',
- 'base',
+ 'canvas',
+ 'base',
);
/////////////////////////////////////////////////////
@@ -52,9 +52,9 @@
$THEME->sheets = array(
- 'core',
- 'pagelayout',
- 'menu'
+ 'core',
+ 'pagelayout',
+ 'menu'
);
////////////////////////////////////////////////////
@@ -63,12 +63,12 @@
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'pagelayout',
- ),
- 'canvas'=>array(
- 'pagelayout',
- ),
+ 'base'=>array(
+ 'pagelayout',
+ ),
+ 'canvas'=>array(
+ 'pagelayout',
+ ),
);
@@ -154,7 +154,7 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
- 'theme' => 'canvas',
+ 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
@@ -165,7 +165,11 @@
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
-
+ 'report' => array(
+ 'file' => 'general.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ )
);
///////////////////////////////////////////////////////////////
diff --git a/theme/sky_high/layout/report.php b/theme/sky_high/layout/report.php
new file mode 100644
index 0000000000000..3bd42c8571f42
--- /dev/null
+++ b/theme/sky_high/layout/report.php
@@ -0,0 +1,136 @@
+layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if (!$showsidepre) {
+ $bodyclasses[] = 'content-only';
+}
+if ($hassidepre) {
+ $bodyclasses[] = 'background';
+}
+
+if (!empty($PAGE->theme->settings->logo)) {
+ $logourl = $PAGE->theme->settings->logo;
+} else {
+ $logourl = NULL;
+}
+
+if (!empty($PAGE->theme->settings->footnote)) {
+ $footnote = $PAGE->theme->settings->footnote;
+} else {
+ $footnote = '';
+}
+
+echo $OUTPUT->doctype() ?>
+htmlattributes() ?>>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ heading ?>
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ + heading ?> +
+ +- heading ?>
+ + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+ + +
+
+
+
+
+
+
+standard_end_of_body_html() ?>
+
+
\ No newline at end of file
diff --git a/theme/splash/style/sl.css b/theme/splash/style/sl.css
index b0b71c551f263..69b95f414cf16 100644
--- a/theme/splash/style/sl.css
+++ b/theme/splash/style/sl.css
@@ -20,7 +20,6 @@ body { /* Define margins and background colour/image */
margin: 0 auto;
padding: 0;
width: 100%;
- overflow-x:hidden;
}
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { /* Set fonttype for site */
@@ -428,44 +427,23 @@ div.summary {
padding-top: 10px;
}
-#region-pre {
+.block-region {
background: #fff;
}
-#region-post {
- background: #fff;
-}
-
-#region-pre .block .header { /*-- right block header --*/
+.block-region .block .header { /*-- right block header --*/
background: url([[pix:theme|sbheaderbg2]]) center no-repeat;
height: 25px;
color: #fff;
padding: 12px 5px 5px 5px;
}
-#region-pre .block .header h2{ /*-- right block text --*/
+.block-region .block .header h2{ /*-- right block text --*/
color: #333;
padding: 0 0 0 10px;
}
-#region-pre .block .content { /*-- right block content --*/
- background: #f2f2f2;
- padding: 4px 5px 5px;
-}
-
-#region-post .block .header { /*-- left block header --*/
- background: url([[pix:theme|sbheaderbg2]]) center no-repeat;
- height: 25px;
- color: #fff;
- padding: 12px 5px 5px 5px;
-}
-
-#region-post .block .header h2{ /*-- left block text --*/
- color: #333;
- padding: 0 0 0 10px;
-}
-
-#region-post .block .content { /*-- left block content --*/
+.block-region .block .content { /*-- right block content --*/
background: #f2f2f2;
padding: 4px 5px 5px;
}
@@ -639,6 +617,11 @@ ul.topics li#section-0, ul.weeks li#section-0 {
.pagelayout-redirect {background-position:0 0;border-top:1px solid #853650;}
.pagelayout-redirect #content {margin-top:150px;}
+.pagelayout-report #page #page-header {
+ width:960px;
+ margin:0 auto;
+}
+
/* Splash Theme Specific settings for Administrators to customise css.
---------------------------*/
[[setting:customcss]]
\ No newline at end of file
diff --git a/theme/standard/style/css3.css b/theme/standard/style/css3.css
index e4567f664fd1d..cf17e84aca504 100644
--- a/theme/standard/style/css3.css
+++ b/theme/standard/style/css3.css
@@ -195,6 +195,7 @@ table.minicalendar {
.loginbox .content.right,
.forumpost .content,
.forumpost .message,
+.forumpost .side,
.glossarycomment .entry {
-moz-border-radius-bottomright:10px;
-webkit-border-bottom-right-radius: 10px;
diff --git a/theme/standard/style/modules.css b/theme/standard/style/modules.css
index a0402e5de1e48..b16a98d6385f7 100644
--- a/theme/standard/style/modules.css
+++ b/theme/standard/style/modules.css
@@ -76,20 +76,17 @@ table.mod_index {width:90%;margin:1em auto;}
#page-mod-folder-view .foldertree {width: 90%;margin:0 auto;}
/** Forum **/
-.forumpost {border-color:#DDDDDD;} /** header of reply posts and lower corners of all posts in */
-.forumpost .starter {background-color:#DDDDDD;} /** header of the first post in */
-.forumpost .topic {border-bottom-color: #EEEEEE;} /** line between header and post body in */
-.forumpost .topic .author {font-size: 0.8em;}
-.forumpost .topic .subject {font-weight: bold;}
-.forumpost .ratings {padding-top: 1em;}
-.forumpost .attachments {padding: 7px;}
-.forumpost .content {padding: 4px;background-color: #FFFFFF;}
-.forumpost .commands,
-.forumpost .footer,
-.forumpost .link {padding-top: 0.5em;font-size: 0.9em;}
-.forumpost .left {padding: 4px;text-align: center;background-color:#EEEEEE;}
-.forumpost .edited {font-style: italic;}
+.forumpost {border-color:#DDDDDD;}
+.forumpost .row {background-color:#FFF;}
+.forumpost .row.header {background-color:#EEE;background-image:none;}
+.forumpost.firstpost .row.header {background-color:#DDD;}
+.forumpost .topic .author {font-size: 0.8em;padding:4px;}
+.forumpost .topic .subject {font-weight: bold;padding:4px 4px 0;}
+.forumpost .content div,
+.forumpost .options div {padding:4px;}
.forumpost.unread {background: #9EBEFF;}
+.forumpost.unread .content {border:2px solid #0046C7;} /** inside border of unread posts in nested format in */
+
#page-mod-forum-view .forummode,
.path-mod-forum .forumheaderlist .replies {text-align: center;}
.path-mod-forum .forumheaderlist .discussion .lastpost {font-size: 0.7em;}
@@ -99,7 +96,6 @@ table.mod_index {width:90%;margin:1em auto;}
#page-mod-forum-subscribers .subscriberdiv,
#page-mod-forum-subscribers .subscribertable tr td {padding:0.2em 0.3em;}
#page-mod-forum-discuss .ratingsubmit {text-align:center;padding:10px;}
-#page-mod-forum-discuss .forumpost.unread .content {border:2px solid #0046C7;} /** inside border of unread posts in nested format in */
#page-mod-forum-view .forumheaderlist .discussion .starter, /** Discussion column background in */
#page-mod-forum-view .forumaddnew {margin-bottom: 20px;text-align:center;}
#page-mod-forum-view .forumheaderlist td {border-color: #FFFFFF;} /** wire frame around cells in */
diff --git a/user/index.php b/user/index.php
index 0e12ba2896c2f..ca8529f659cd2 100644
--- a/user/index.php
+++ b/user/index.php
@@ -305,7 +305,8 @@
if (!isset($group->descriptionformat)) {
$group->descriptionformat = FORMAT_MOODLE;
}
- $contentcell->text = $OUTPUT->heading($contentheading, 3) . format_text($group->description, $group->descriptionformat);
+ $options = array('overflowdiv'=>true);
+ $contentcell->text = $OUTPUT->heading($contentheading, 3) . format_text($group->description, $group->descriptionformat, $options);
$groupinfotable->data[] = new html_table_row(array($picturecell, $contentcell));
echo html_writer::table($groupinfotable);
}
diff --git a/user/profile.php b/user/profile.php
index bddcac941e10d..50f73deeef74d 100644
--- a/user/profile.php
+++ b/user/profile.php
@@ -214,7 +214,8 @@
echo get_string('profilenotshown', 'moodle');
} else {
$user->description = file_rewrite_pluginfile_urls($user->description, 'pluginfile.php', $usercontext->id, 'user', 'profile', null);
- echo format_text($user->description, $user->descriptionformat);
+ $options = array('overflowdiv'=>true);
+ echo format_text($user->description, $user->descriptionformat, $options);
}
}
echo '
+
+
+
+
+
+
+
+
+
+ 'userdetails'));
+ echo html_writer::tag('h1', get_string('usergreeting', 'theme_splash', $USER->firstname));
+ echo html_writer::start_tag('p', array('class'=>'prolog'));
+ echo html_writer::link(new moodle_url('/user/profile.php', array('id'=>$USER->id)), get_string('myprofile')).' | ';
+ echo html_writer::link(new moodle_url('/login/logout.php', array('sesskey'=>sesskey())), get_string('logout'));
+ echo html_writer::end_tag('p');
+ echo html_writer::end_tag('div');
+ echo html_writer::tag('div', $OUTPUT->user_picture($USER, array('size'=>55)), array('class'=>'userimg'));
+ } else {
+ echo html_writer::start_tag('div', array('id'=>'userdetails_loggedout'));
+ $loginlink = html_writer::link(new moodle_url('/login/'), get_string('loginhere', 'theme_splash'));
+ echo html_writer::tag('h1', get_string('welcome', 'theme_splash', $loginlink));
+ echo html_writer::end_tag('div');;
+ } ?>
+
+
+
+
+ lang_menu();?>
+ -
+
+ theme->settings->logo."' alt='logo' />");
+ } else {
+ echo html_writer::link(new moodle_url('/'), $PAGE->heading, array('class'=>'nologoimage'));
+ } ?>
+
+
+
+
+
+
+ + +
heading ?>
+ + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks_for_region('side-pre') ?>
+
+