MDL-40829: courses heading: remove headerblock class from header and fix heading levels.

Also, changing h3 classname from name to categoryname.
    Added note to theme/upgrade.txt to describe the heading level changes.
This commit is contained in:
rwijaya 2013-10-01 16:42:04 +08:00 committed by Sam Hemelryk
parent 268f4cb503
commit faf6010b10
38 changed files with 206 additions and 142 deletions

View File

@ -651,7 +651,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
// Title with section navigation links.
$sectionnavlinks = $this->get_nav_links($course, $modinfo->get_section_info_all(), $displaysection);
$sectiontitle = '';
$sectiontitle .= html_writer::start_tag('div', array('class' => 'section-navigation header headingblock'));
$sectiontitle .= html_writer::start_tag('div', array('class' => 'section-navigation navigationtitle'));
$sectiontitle .= html_writer::tag('span', $sectionnavlinks['previous'], array('class' => 'mdl-left'));
$sectiontitle .= html_writer::tag('span', $sectionnavlinks['next'], array('class' => 'mdl-right'));
// Title attributes

View File

@ -1147,9 +1147,8 @@ class core_course_renderer extends plugin_renderer_base {
// course name
$coursename = $chelper->get_course_formatted_name($course);
$coursenamelink = html_writer::link(new moodle_url('/course/view.php', array('id' => $course->id)),
$coursename, array('class' => $course->visible ? '' : 'dimmed'));
$content .= html_writer::tag($nametag, $coursenamelink, array('class' => 'name'));
$coursename, array('class' => $course->visible ? 'courseicon' : 'courseicon dimmed'));
$content .= html_writer::tag($nametag, $coursenamelink, array('class' => 'coursename'));
// If we display course in collapsed form but the course has summary or course contacts, display the link to the info page.
$content .= html_writer::start_tag('div', array('class' => 'moreinfo'));
if ($chelper->get_show_courses() < self::COURSECAT_SHOW_COURSES_EXPANDED) {
@ -1542,7 +1541,8 @@ class core_course_renderer extends plugin_renderer_base {
array('title' => get_string('numberofcourses'), 'class' => 'numberofcourse'));
}
$content .= html_writer::start_tag('div', array('class' => 'info'));
$content .= html_writer::tag(($depth > 1) ? 'h4' : 'h3', $categoryname, array('class' => 'name'));
$content .= html_writer::tag(($depth > 1) ? 'h4' : 'h3', $categoryname, array('class' => 'categoryname'));
$content .= html_writer::end_tag('div'); // .info
// add category content to the output

View File

@ -16,18 +16,18 @@ Feature: Course paged mode
And I click on <section3> "link" in the "#section-3" "css_element"
And I follow "C1"
And I click on <section1> "link" in the "#section-1" "css_element"
And I should see <section1> in the "div.single-section div.header" "css_element"
And I should see <section1> in the "div.single-section" "css_element"
And I should see <section2> in the ".single-section span.mdl-right" "css_element"
And I should not see <prevunexistingsection> in the ".single-section" "css_element"
And I click on <section2> "link" in the ".single-section" "css_element"
And I should see <section2> in the "div.single-section div.header" "css_element"
And I should see <section2> in the "div.single-section" "css_element"
And I should see <section1> in the ".single-section span.mdl-left" "css_element"
And I should see <section3> in the ".single-section span.mdl-right" "css_element"
And I click on <section1> "link" in the ".single-section" "css_element"
And I should see <section1> in the "div.single-section div.header" "css_element"
And I should see <section1> in the "div.single-section" "css_element"
And I click on <section2> "link" in the ".single-section" "css_element"
And I click on <section3> "link" in the ".single-section" "css_element"
And I should see <section3> in the "div.single-section div.header" "css_element"
And I should see <section3> in the "div.single-section" "css_element"
And I should see <section2> in the ".single-section span.mdl-left" "css_element"
And I should not see <section1> in the ".single-section .section-navigation" "css_element"
And I should not see <prevunexistingsection> in the ".single-section" "css_element"
@ -49,18 +49,18 @@ Feature: Course paged mode
And I click on <section3> "link" in the "#section-3" "css_element"
And I follow "C1"
And I click on <section1> "link" in the "#section-1" "css_element"
And I should see <section1> in the "div.single-section div.header" "css_element"
And I should see <section1> in the "div.single-section" "css_element"
And I should see <section2> in the ".single-section span.mdl-right" "css_element"
And I should not see <prevunexistingsection> in the ".single-section" "css_element"
And I click on <section2> "link" in the ".single-section" "css_element"
And I should see <section2> in the "div.single-section div.header" "css_element"
And I should see <section2> in the "div.single-section" "css_element"
And I should see <section1> in the ".single-section span.mdl-left" "css_element"
And I should see <section3> in the ".single-section span.mdl-right" "css_element"
And I click on <section1> "link" in the ".single-section" "css_element"
And I should see <section1> in the "div.single-section div.header" "css_element"
And I should see <section1> in the "div.single-section" "css_element"
And I click on <section2> "link" in the ".single-section" "css_element"
And I click on <section3> "link" in the ".single-section" "css_element"
And I should see <section3> in the "div.single-section div.header" "css_element"
And I should see <section3> in the "div.single-section" "css_element"
And I should see <section2> in the ".single-section span.mdl-left" "css_element"
And I should not see <section1> in the ".single-section .section-navigation" "css_element"
And I should not see <prevunexistingsection> in the ".single-section" "css_element"

View File

@ -27,14 +27,14 @@ var CSS = {
SELECTORS = {
LOADEDTREES: '.with_children.loaded',
CONTENTNODE: '.content',
CATEGORYLISTENLINK: '.category .info .name',
CATEGORYSPINNERLOCATION: '.name',
CATEGORYLISTENLINK: '.category .info .categoryname',
CATEGORYSPINNERLOCATION: '.categoryname',
CATEGORYWITHCOLLAPSEDLOADEDCHILDREN: '.category.with_children.loaded.collapsed',
CATEGORYWITHMAXIMISEDLOADEDCHILDREN: '.category.with_children.loaded:not(.collapsed)',
COLLAPSEEXPAND: '.collapseexpand',
COURSEBOX: '.coursebox',
COURSEBOXLISTENLINK: '.coursebox .moreinfo',
COURSEBOXSPINNERLOCATION: '.name a',
COURSEBOXSPINNERLOCATION: '.categoryname a',
COURSECATEGORYTREE: '.course_category_tree',
PARENTWITHCHILDREN: '.category'
},

File diff suppressed because one or more lines are too long

View File

@ -27,14 +27,14 @@ var CSS = {
SELECTORS = {
LOADEDTREES: '.with_children.loaded',
CONTENTNODE: '.content',
CATEGORYLISTENLINK: '.category .info .name',
CATEGORYSPINNERLOCATION: '.name',
CATEGORYLISTENLINK: '.category .info .categoryname',
CATEGORYSPINNERLOCATION: '.categoryname',
CATEGORYWITHCOLLAPSEDLOADEDCHILDREN: '.category.with_children.loaded.collapsed',
CATEGORYWITHMAXIMISEDLOADEDCHILDREN: '.category.with_children.loaded:not(.collapsed)',
COLLAPSEEXPAND: '.collapseexpand',
COURSEBOX: '.coursebox',
COURSEBOXLISTENLINK: '.coursebox .moreinfo',
COURSEBOXSPINNERLOCATION: '.name a',
COURSEBOXSPINNERLOCATION: '.categoryname a',
COURSECATEGORYTREE: '.course_category_tree',
PARENTWITHCHILDREN: '.category'
},

View File

@ -25,14 +25,14 @@ var CSS = {
SELECTORS = {
LOADEDTREES: '.with_children.loaded',
CONTENTNODE: '.content',
CATEGORYLISTENLINK: '.category .info .name',
CATEGORYSPINNERLOCATION: '.name',
CATEGORYLISTENLINK: '.category .info .categoryname',
CATEGORYSPINNERLOCATION: '.categoryname',
CATEGORYWITHCOLLAPSEDLOADEDCHILDREN: '.category.with_children.loaded.collapsed',
CATEGORYWITHMAXIMISEDLOADEDCHILDREN: '.category.with_children.loaded:not(.collapsed)',
COLLAPSEEXPAND: '.collapseexpand',
COURSEBOX: '.coursebox',
COURSEBOXLISTENLINK: '.coursebox .moreinfo',
COURSEBOXSPINNERLOCATION: '.name a',
COURSEBOXSPINNERLOCATION: '.categoryname a',
COURSECATEGORYTREE: '.course_category_tree',
PARENTWITHCHILDREN: '.category'
},

View File

@ -191,11 +191,11 @@
} else {
$subtext = get_string('subscribe', 'forum');
}
echo $OUTPUT->heading($forumname, 2, 'headingblock header');
echo $OUTPUT->heading($forumname);
$suburl = new moodle_url('/mod/forum/subscribe.php', array('id' => $newsforum->id, 'sesskey' => sesskey()));
echo html_writer::tag('div', html_writer::link($suburl, $subtext), array('class' => 'subscribelink'));
} else {
echo $OUTPUT->heading($forumname, 2, 'headingblock header');
echo $OUTPUT->heading($forumname);
}
forum_print_latest_discussions($SITE, $newsforum, $SITE->newsitems, 'plain', 'p.modified DESC');
@ -215,7 +215,7 @@
//wrap frontpage course list in div container
echo html_writer::start_tag('div', array('id'=>'frontpage-course-list'));
echo $OUTPUT->heading(get_string('mycourses'), 2, 'headingblock header');
echo $OUTPUT->heading(get_string('mycourses'));
echo $mycourseshtml;
//end frontpage course list div container
@ -234,7 +234,7 @@
//wrap frontpage course list in div container
echo html_writer::start_tag('div', array('id'=>'frontpage-course-list'));
echo $OUTPUT->heading(get_string('availablecourses'), 2, 'headingblock header');
echo $OUTPUT->heading(get_string('availablecourses'));
echo $availablecourseshtml;
//end frontpage course list div container
@ -250,7 +250,7 @@
//wrap frontpage category names in div container
echo html_writer::start_tag('div', array('id'=>'frontpage-category-names'));
echo $OUTPUT->heading(get_string('categories'), 2, 'headingblock header');
echo $OUTPUT->heading(get_string('categories'));
echo $courserenderer->frontpage_categories_list();
//end frontpage category names div container
@ -265,7 +265,7 @@
//wrap frontpage category combo in div container
echo html_writer::start_tag('div', array('id'=>'frontpage-category-combo'));
echo $OUTPUT->heading(get_string('courses'), 2, 'headingblock header');
echo $OUTPUT->heading(get_string('courses'));
echo $courserenderer->frontpage_combo_list();
//end frontpage category combo div container

View File

@ -90,7 +90,7 @@ if ($tag->flag > 0 && has_capability('moodle/tag:manage', $systemcontext)) {
$tagname = '<span class="flagged-tag">' . $tagname . '</span>';
}
echo $OUTPUT->heading($tagname, 2, 'headingblock header tag-heading');
echo $OUTPUT->heading($tagname, 2);
tag_print_management_box($tag);
tag_print_description_box($tag);
// Check what type of results are avaialable

View File

@ -22,7 +22,10 @@ hr {
border-bottom: 1px dotted #808080;
border-top: 0px;
}
h2.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
border-bottom: 1px solid #ddd;
font-size: 1.4em;
font-weight: bold;
@ -254,10 +257,6 @@ Course Section Topic & Weekly
.course-content ul.topics li.section {
padding-top: 1em;
}
.path-course-view .headingblock {
display: none; /* hides topic items title or weekly itens title */
margin-bottom: 9px;
}
/*Login (Login page)*/
.loginbox .loginform .form-label {
width:46%;

View File

@ -13,15 +13,6 @@ h1, h1.headermain, h2, h2.tagline, h3, h4, h5 {
padding: 0;
}
h1,
h2,
h3,
h4,
h5,
h6 {
text-align: center;
}
.generalbox {
padding: 10px;
margin-bottom: 15px;

View File

@ -106,7 +106,11 @@ h2.tagline {
.sitetopic {
border-width: 0;
}
.headingblock {
.navigationtitle,
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
margin-bottom: 10px;
border-bottom: 1px solid #697F55;
background-color: #E3E3E3;
@ -144,9 +148,6 @@ h2.tagline {
border:none;
}
.course-content .headingblock.outline {
margin-top: 0;
}
.course-content .section.main {
border:1px solid #E3E3E3;
margin-bottom: 10px;
@ -166,6 +167,9 @@ h2.tagline {
.course-content .section.main .content .section_add_menus {
text-align: right;
}
#region-main .course-content .single-section .section-navigation h3 {
font-size: 1.3em;
}
#page-report-outline-user .section {
border: 1px solid #DDD;
margin: 0 5% 1.5em 5%;

View File

@ -109,8 +109,10 @@ fieldset#general legend {
/* Courses
----------------------------*/
h2.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
font-weight: normal;
color:#999;
font-size: 1.5em;

View File

@ -91,7 +91,10 @@ a.autolink.glossary:hover {cursor: help;}
.errorbox .title,
.pagingbar .title,
.pagingbar .thispage,
.headingblock {font-weight: bold;}
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {font-weight: bold;}
img.resize {height: 1em;width: 1em;}
.block img.resize,
.breadcrumb img.resize {height: 0.9em;width: 0.8em;}

View File

@ -63,11 +63,13 @@
.course-content .single-section .section-navigation .mdl-bottom { margin-top: 0; }
#page-site-index .subscribelink {text-align:right;}
#page-site-index .headingblock {margin-bottom: 9px;}
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {margin-bottom: 9px;}
#page-site-index .clearfloat {float: none;clear: both; height:0px;}
.path-course-view a.reduce-sections {padding-left: 0.2em;}
.path-course-view .headingblock {margin-bottom: 9px;}
.path-course-view .subscribelink {text-align:right;}
.path-course-view .unread {margin-left: 3em;}
.path-course-view .block.drag .header {cursor: move;}
@ -116,9 +118,9 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.coursebox {width: 100%;margin-bottom:15px;}
.coursebox.collapsed {margin-bottom:0}
.coursebox.collapsed > .content {display:none;}
.coursebox > .info > .name a {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;background-position: left top;}
.coursebox.remotehost .name a {background-image:url([[pix:moodle|i/mnethost]]);}
.coursebox > .info > .name,
.coursebox > .info a.courseicon {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;background-position: left top;}
.coursebox.remotehost .coursename a {background-image:url([[pix:moodle|i/mnethost]]);}
.coursebox > .info > .coursename,
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile {float:left;width:40%;clear:left;}
@ -134,7 +136,7 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.coursebox.remotecoursebox .remotecourseinfo {float:left;width: 40%;}
.coursebox .content .courseimage img {max-width:100px;max-height:100px;}
.coursebox >.info >.name {margin: 5px;padding:0;}
.coursebox >.info >.categoryname {margin: 5px;padding:0;}
.coursebox .content .teachers,
.coursebox .content .coursecat,
.coursebox .content .summary,
@ -142,8 +144,8 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.coursebox .content .coursefile,
.coursebox.remotecoursebox .remotecourseinfo {margin:3px 5px;padding:0;}
.dir-rtl .coursebox > .info > .name a {padding-left:0;padding-right:21px;background-position: top right;}
.dir-rtl .coursebox > .info > .name,
.dir-rtl .coursebox > .info > .coursename a {padding-left:0;padding-right:21px;background-position: top right;}
.dir-rtl .coursebox > .info > .coursename,
.dir-rtl .coursebox .teachers,
.dir-rtl .coursebox .content .courseimage,
.dir-rtl .coursebox .content .coursefile {float:right;clear:right;}
@ -154,15 +156,19 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.dir-rtl .coursebox .coursecat {text-align:left;clear:left;}
.course_category_tree .category .numberofcourse {font-size: 0.85em;}
.dir-rtl .course_category_tree .category .numberofcourse {padding-right: 20px;}
.course_category_tree .category>.info .name {background-image:url([[pix:moodle|t/collapsed_empty]]);background-repeat: no-repeat;background-position:center left;}
.dir-rtl .course_category_tree .category>.info .name {background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);background-position:center right;}
.course_category_tree .category.with_children>.info .name {background-image:url([[pix:moodle|t/expanded]]);cursor: pointer;}
.course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed]]);}
.dir-rtl .course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed_rtl]]);}
.course_category_tree .category.collapsed>.content {display:none;}
.course_category_tree .controls {visibility: hidden;}
.course_category_tree .controls div {display:inline;cursor:pointer;}
.jsenabled .course_category_tree .controls {visibility: visible;}
.course_category_tree .category > .info .name {padding:2px 18px;margin:3px;}
.course_category_tree .category >.info > .categoryname {background-image:url([[pix:moodle|t/collapsed_empty]]);background-repeat: no-repeat;background-position:center left;margin:0.5em 5px;}
.dir-rtl .course_category_tree .category >.info > .categoryname {background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);background-position:center right;margin:0.5em 5px;}
.course_category_tree .category.with_children >.info > .categoryname {background-image:url([[pix:moodle|t/expanded]]);}
.course_category_tree .category.with_children.collapsed >.info > .categoryname {background-image:url([[pix:moodle|t/collapsed]]);}
.dir-rtl .course_category_tree .category.with_children.collapsed >.info .categoryname {background-image:url([[pix:moodle|t/collapsed_rtl]]);}
.course_category_tree .category.collapsed >.content {display:none;}
.course_category_tree .category > .info > .categoryname {padding:2px 18px;margin:3px;}
.course_category_tree .category > .content {padding-left:16px;overflow: hidden;}
.dir-rtl .course_category_tree .category > .content {padding-left:0;padding-right:16px;}

View File

@ -188,8 +188,7 @@ a.autolink.glossary:hover {
.warning,
.errorbox .title,
.pagingbar .title,
.pagingbar .thispage,
.headingblock {
.pagingbar .thispage {
font-weight: bold;
}
img.resize {

View File

@ -205,16 +205,15 @@
#page-site-index .subscribelink {
text-align: right;
}
#page-site-index .headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
margin-bottom: 9px;
}
.path-course-view a.reduce-sections {
padding-left: 0.2em;
}
.path-course-view .headingblock {
margin-bottom: 9px;
}
.path-course-view .subscribelink {
text-align: right;
}
@ -387,17 +386,17 @@ span.editinstructions {
padding: 5px;
}
.coursebox > .info > .name a {
.coursebox > .info > .categoryname a {
display:block;
background-image:url([[pix:moodle|i/course]]);
background-repeat: no-repeat;
padding-left:21px;
background-position: center left;
}
.coursebox.remotehost > .info > .name a {
.coursebox.remotehost > .info > .categoryname a {
background-image:url([[pix:moodle|i/mnethost]]);
}
.coursebox > .info > .name,
.coursebox > .info h3,
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile {
@ -405,10 +404,10 @@ span.editinstructions {
width:40%;
clear:left;
}
.coursebox > .info > h3.name {
.coursebox > .info > h3.categoryname {
margin: 5px;
}
.coursebox > .info > .name {
.coursebox > .info > .categoryname {
margin: 5px;
padding: 0;
}
@ -459,12 +458,12 @@ span.editinstructions {
padding:0;
}
.dir-rtl .coursebox > .info > .name a {
.dir-rtl .coursebox > .info > .categoryname a {
padding-left:0;
padding-right:21px;
background-position: center right;
}
.dir-rtl .coursebox > .info > .name,
.dir-rtl .coursebox > .info > .categoryname,
.dir-rtl .coursebox .teachers,
.dir-rtl .coursebox .content .courseimage,
.dir-rtl .coursebox .content .coursefile {
@ -507,25 +506,45 @@ span.editinstructions {
font-size: @fontSizeSmall;
}
.course_category_tree .category>.info .name {
.course_category_tree .controls {
visibility: hidden;
}
.course_category_tree .controls div {
display:inline;
cursor:pointer;
}
.jsenabled .course_category_tree .controls {
visibility: visible;
}
.course_category_tree .controls {
margin-bottom:5px;
text-align:right;
float:right;
}
.course_category_tree .controls div {
padding-right:2em;
font-size:75%;
}
.course_category_tree .category > .info > .categoryname{
background-image:url([[pix:moodle|t/collapsed_empty]]);
background-repeat: no-repeat;
padding:2px 18px;
margin:3px;
background-position:center left;
}
.dir-rtl .course_category_tree .category>.info .name {
.dir-rtl .course_category_tree .category > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);
background-position:center right;
}
.course_category_tree .category.with_children>.info .name {
.course_category_tree .category.with_children > .info > .categoryname {
background-image:url([[pix:moodle|t/expanded]]);
cursor: pointer;
}
.course_category_tree .category.with_children.collapsed>.info .name {
.course_category_tree .category.with_children.collapsed >.info > .categoryname {
background-image:url([[pix:moodle|t/collapsed]]);
}
.dir-rtl .course_category_tree .category.with_children.collapsed>.info .name {
.dir-rtl .course_category_tree .category.with_children.collapsed > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed_rtl]]);
}
.course_category_tree .category.collapsed>.content {

File diff suppressed because one or more lines are too long

View File

@ -263,9 +263,13 @@ td.eventskey {
}
/* Course */
h2.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
font-weight: normal;
border-bottom: 1px solid #eee;
font-size: 1.5em;
}
.coursebox {
@ -284,7 +288,7 @@ h2.headingblock {
width: 61%;
}
.coursebox > .info > h3.name {
.coursebox > .info > h3.coursename {
font-size: 1.2em;
line-height: 1.4;
}
@ -293,11 +297,6 @@ h2.headingblock {
font-size: 0.95em;
}
h2.headingblock {
border-bottom: 1px solid #eee;
font-size: 1.5em;
}
#page-course-index-category .categorypicker {
text-align: center;
margin: 10px 0 20px;

View File

@ -27,7 +27,8 @@ div.block {
border-bottom: 1px solid [[setting:maincolor]];
}
.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, .forumpost .subject {
.generalbox h2, h3.sectionname, div.loginpanel h2, div.signuppanel h2, .forumpost .subject,
#site-news-forum h2, #frontpage-course-list h2, #frontpage-category-names h2, #frontpage-category-combo h2 {
color: [[setting:headingcolor]];
}

View File

@ -272,8 +272,8 @@ div.block.hidden div.header {
/** main headings **/
.generalbox h2,h3.sectionname, h2.headingblock, div.loginpanel h2, div.signuppanel h2, div.userprofile h2 {
font-weight: 600;
.generalbox h2, h3.sectionname, div.loginpanel h2, div.signuppanel h2, div.userprofile h2,
#site-news-forum h2, #frontpage-course-list h2, #frontpage-category-names h2, #frontpage-category-combo h2 {
letter-spacing: -1px;
line-height: 1.3em;
font-size: 28px;

View File

@ -16,8 +16,10 @@ body {
.sitetopic {
border: none;
}
.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
border-bottom: 1px solid #ddd;
font-size: 1.3em;
color: #333;
@ -438,7 +440,7 @@ body {
text-align: right;
}
#page-tag-index .headingblock {
#page-tag-index h2 {
text-align: center;
margin-bottom: 0;
}

View File

@ -10,12 +10,6 @@ h1,h2,h3,h4,h5,h6 {
margin: 0;
}
h2,h3,h4 {
text-align: center;
padding: 0.5em 0 1em;
margin: 0;
}
h1 {
font-size: 2.25em;
line-height: 1;

View File

@ -1,4 +1,7 @@
.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
font-size:130%;
}

View File

@ -1,6 +1,6 @@
/** Course formats **/
.course-content .section li.activity {margin:7px 0;}
.course-content .header {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;border-top:1px solid #C6BDA8;}
.course-content .navigationtitle {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;border-top:1px solid #C6BDA8;}
.course-content h2.header {padding-left:1em;}
.course-content ul.weeks li.section {border:1px solid #DDD;}
.course-content ul.weeks li.section .content {background-color:#FAFAFA;padding:5px 10px;}

View File

@ -258,7 +258,10 @@ margin: 0;
/* Courses
----------------------------*/
h2.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
font-weight: normal;
color:#999;
font-size: 1.5em;

View File

@ -150,8 +150,10 @@ a:active {
/* Course
---------------------------*/
h2.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
border-width: 0 0 1px 0;
padding: 5px 5px 2px;
font-weight: normal;
@ -160,6 +162,9 @@ h2.headingblock {
color: #251c17;
}
.course_category_tree .coursebox > .info > .categoryname {
margin: 10px;
}
.course-content .main {
background: #f7f5f1;
border: 1px solid #ddd

View File

@ -46,7 +46,8 @@ div.dockedtitle {
/** 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,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
#nologo, #nologo a, .generalbox h2,h3.sectionname, div.tabtree li.selected a span, .forumpost .subject, .blog_entry div.subject a, div.loginpanel h2, div.signuppanel h2,
#site-news-forum h2, #frontpage-course-list h2, #frontpage-category-names h2, #frontpage-category-combo h2 {
color: [[setting:headingcolor]];
}

View File

@ -696,8 +696,8 @@ html>
}
/** main headings **/
.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
.generalbox h2,h3.sectionname, div.loginpanel h2, div.signuppanel h2,
#site-news-forum h2, #frontpage-course-list h2, #frontpage-category-names h2, #frontpage-category-combo h2 {
font-size: 30px;
padding-bottom: 2px;
margin: 3px 0 2px;
@ -708,9 +708,13 @@ html>
letter-spacing: -1px;
line-height: 1em;
background: url([[pix:theme|hr_grid]]) repeat-x 0% 89%
}
}
.generalbox h2, h3.sectionname, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, div.hd h3 {
.course_category_tree .info > .categoryname {
display: inline;
}
.generalbox h2, h3.sectionname, div.loginpanel h2, div.signuppanel h2, div.hd h3 {
font-size: 22px;
background: none;
}
@ -793,10 +797,6 @@ td.author {
font-weight: 800;
}
.info .name a {
font-weight: bold;
}
.indent {
margin-left: 30px;
}
@ -901,11 +901,11 @@ div.coursebox.collapsed {
margin-bottom: 0;
}
div.coursebox > .info > .name a {
div.coursebox > .info > .coursename {
font-weight: inherit;
}
div.coursebox > .info > h3.name a {
div.coursebox > .info > h3.coursename a {
font-size: 16px;
font-weight: 400;
}
@ -937,7 +937,7 @@ div.course_category_tree div.coursebox.odd {
background: #eee;
}
div.course_category_tree div.coursebox > .info > .name > a {
div.course_category_tree div.coursebox > .info > .categoryname > a {
font-size: 14px;
}

View File

@ -28,11 +28,6 @@ ul {
margin: 0.5em 0;
padding: 0;
}
.headingblock {
border-bottom:0px solid #DDDDDD;
color:inherit;
font-size:inherit;
}
h1.helpheading,
h2.helpheading {
font-size: 1.6em;
@ -165,7 +160,7 @@ ul.section li.activity .mod-indent {
.category a .ui-li-count {
right: 1em;
}
.coursebox > .info > .name {
.coursebox > .info > .coursename {
font-size: 1.2em;
}
.coursebox div.summary {

View File

@ -79,7 +79,10 @@ h1.headermain {
/* Content */
h2.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
text-shadow: 1px 1px 3px #aaa;
color: #445566;
}

View File

@ -116,14 +116,20 @@ a:hover {
/* Course
----------------------------*/
.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2,
.course-content .single-section .section-navigation.navigationtitle {
background: url([[pix:theme|headingblock]]) repeat-x 0 0;
color: #fff;
font-weight: normal;
border: none;
padding: 2px 5px;
}
.course-content .single-section .navigationtitle h3 {
color: #FFF;
}
.course-content .main {
border: 1px solid #eee;

View File

@ -184,7 +184,10 @@ p.helplink a {
/* @group Course */
.headingblock {
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
border: 0px none;
border-bottom: 1px solid #98bcd6;
padding-bottom: 0px;

View File

@ -340,14 +340,17 @@ img.icon {
li.activity {
padding-bottom:5px;
}
.coursebox > .info > .name, #region-main .coursebox > .info > h3.name {
.coursebox > .info > .coursename, #region-main .coursebox > .info > .coursename {
margin: 5px;
padding: 0;
}
#region-main .course_category_tree .category > .info h3.name,
#region-main .course_category_tree .category > .info h4.name {
#region-main .course_category_tree .category > .info > .categoryname {
padding: 2px 18px;
}
#region-main .course-content .single-section .section-navigation h3 {
font-size: 1.7em;
font-weight: bold;
}
.que .info{
width: 10em;
}

View File

@ -276,7 +276,10 @@ h2,h3,h4,h5,h6{
margin:0 0 10px;
padding:3px;
}
#region-main h2.headingblock{
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {
font-size:1.6em;
font-weight:400;
line-height:1.6em;

View File

@ -37,9 +37,16 @@ div.header,
.informationbox,
.noticebox,
.tabledivider {border-color:#DDD;}
.headingblock {border:1px solid #DDD;padding:5px;margin-top:0;}
h2.headingblock {font-size:1.1em;}
.headingblock .outline {border-color:#DDDDDD;}
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2 {border:1px solid #DDD;padding:0 5px;margin-top:0;}
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2,
.navigationtitle,
.header,
.navbar {background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;background-color:#e1e1df;}

View File

@ -32,8 +32,10 @@
-webkit-border-radius: 0;
border-radius: 0;
}
.headingblock,
#site-news-forum h2,
#frontpage-course-list h2,
#frontpage-category-names h2,
#frontpage-category-combo h2,
table.minicalendar td,
.path-calendar .maincalendar .filters table,
.path-calendar .sidecalendar .filters table,

View File

@ -4,6 +4,9 @@ information provided here is intended especially for theme designer.
=== 2.6 ===
Notes:
* There have been several changes made to the classes used on headings throughout Moodle.
This was done as per the Moodle HTML guidelines. h1 and h2 elements should have no classes, h3 and lower headings
may have descriptive classes only (any classes must properly describe the relation between the header and its content).
* The parameters value for the following functions have been modified: core_renderer::heading() and core_renderer::heading_with_help().
This means that headings using the default options will no longer have the class "main" which was the previous default.
* The file picker and activity chooser have been converted to use M.core.dialogue. This means the styles
@ -20,6 +23,14 @@ Renderer changes:
* core_renderer::block_header has been altered to give core_renderer::block_controls the new second argument, the block id.
* core_renderer::action_link has a new argument, and optional icon that can be rendererd into the link.
Selector changes:
* Changes to the classes given to the header produced when rendering a single section within a course.
.section-navigation.header.headingblock => .section-navigation.navigationtitle
* Changes to the classes used when producing the course information box that lists courses.
The name (h3|div} of both courses and categories used to have .name, for courses in the list this was changed to .coursename and for categories in the list this was changed to .categoryname.
* Classes ".header and .headingblock" were removed from all front page content headings.
* Classes ".headingblock .header .tag-header" were removed from the tag index page
=== 2.5.1 ===
Notes: