mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

Revert "MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels"

Browse Source 
This reverts commit 278d64572d272c776c564dcd743959c21ee20c8b.

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-09-12 19:21:43 +08:00
parent d7587b3136
commit 1d49a5cdc6
28 changed files with 132 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/format/renderer.php
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'));
$sectiontitle .= html_writer::start_tag('div', array('class' => 'section-navigation header headingblock'));
$sectiontitle .= html_writer::tag('span', $sectionnavlinks['previous'], array('class' => 'mdl-left'));
$sectiontitle .= html_writer::tag('span', $sectionnavlinks['next'], array('class' => 'mdl-right'));
// Title attributes

6
course/renderer.php
View File

@ -1129,11 +1129,9 @@ class core_course_renderer extends plugin_renderer_base {
$classes = trim('coursebox clearfix '. $additionalclasses);
if ($chelper->get_show_courses() >= self::COURSECAT_SHOW_COURSES_EXPANDED) {
$nametag = 'h3';
$nameattributes = array();
} else {
$classes .= ' collapsed';
$nametag = 'div';
$nameattributes = array('class' => 'name');
}
$content .= html_writer::start_tag('div', array('class' => $classes)); // .coursebox
@ -1143,7 +1141,7 @@ class core_course_renderer extends plugin_renderer_base {
$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, $nameattributes);
$content .= html_writer::tag($nametag, $coursenamelink, array('class' => 'name'));
// 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'));
@ -1515,7 +1513,7 @@ 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);
$content .= html_writer::tag(($depth > 1) ? 'h4' : 'h3', $categoryname, array('class' => 'name'));
$content .= html_writer::end_tag('div'); // .info
// add category content to the output

12
index.php
View File

@ -191,11 +191,11 @@
} else {
$subtext = get_string('subscribe', 'forum');
}
echo $OUTPUT->heading($forumname);
echo $OUTPUT->heading($forumname, 2, 'headingblock header');
$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);
echo $OUTPUT->heading($forumname, 2, 'headingblock header');
}
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'));
echo $OUTPUT->heading(get_string('mycourses'), 2, 'headingblock header');
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'));
echo $OUTPUT->heading(get_string('availablecourses'), 2, 'headingblock header');
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'));
echo $OUTPUT->heading(get_string('categories'), 2, 'headingblock header');
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'));
echo $OUTPUT->heading(get_string('courses'), 2, 'headingblock header');
echo $courserenderer->frontpage_combo_list();
//end frontpage category combo div container

2
tag/index.php
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);
echo $OUTPUT->heading($tagname, 2, 'headingblock header tag-heading');
tag_print_management_box($tag);
tag_print_description_box($tag);
// Check what type of results are avaialable

10
theme/afterburner/style/afterburner_styles.css
View File

@ -22,6 +22,11 @@ hr {
border-bottom: 1px dotted #808080;
border-top: 0px;
}
h2.headingblock {
border-bottom: 1px solid #ddd;
font-size: 1.4em;
font-weight: bold;
}
/*
Page
-----------------------*/
@ -249,7 +254,10 @@ 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%;

10
theme/anomaly/style/general.css
View File

@ -106,7 +106,12 @@ h2.tagline {
.sitetopic {
border-width: 0;
}
.headingblock {
margin-bottom: 10px;
border-bottom: 1px solid #697F55;
background-color: #E3E3E3;
padding: 4px 5px;
}
.coursebox {
width: 100%;
margin: 10px 0;
@ -139,6 +144,9 @@ h2.tagline {
border:none;
}
.course-content .headingblock.outline {
margin-top: 0;
}
.course-content .section.main {
border:1px solid #E3E3E3;
margin-bottom: 10px;

8
theme/arialist/style/core.css
View File

@ -110,6 +110,14 @@ fieldset#general legend {
/* Courses
----------------------------*/
h2.headingblock {
font-weight: normal;
color:#999;
font-size: 1.5em;
border-bottom:1px solid #eee;
padding-bottom:2px;
}
.coursebox {
border-color: #eee;
}

3
theme/base/style/core.css
View File

@ -90,7 +90,8 @@ a.autolink.glossary:hover {cursor: help;}
.warning,
.errorbox .title,
.pagingbar .title,
.pagingbar .thispage {font-weight: bold;}
.pagingbar .thispage,
.headingblock {font-weight: bold;}
img.resize {height: 1em;width: 1em;}
.block img.resize,
.breadcrumb img.resize {height: 0.9em;width: 0.8em;}

2
theme/base/style/course.css
View File

@ -63,9 +63,11 @@
.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;}
#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;}

3
theme/bootstrapbase/less/moodle/core.less
View File

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

6
theme/bootstrapbase/less/moodle/course.less
View File

@ -201,10 +201,16 @@
#page-site-index .subscribelink {
text-align: right;
}
#page-site-index .headingblock {
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;
}

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

File diff suppressed because one or more lines are too long

9
theme/boxxie/style/core.css
View File

@ -264,6 +264,10 @@ td.eventskey {
/* Course */
h2.headingblock {
font-weight: normal;
}
.coursebox {
border-bottom: 1px solid #eee;
}
@ -289,6 +293,11 @@ td.eventskey {
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;

2
theme/brick/style/colors.css
View File

@ -27,7 +27,7 @@ div.block {
border-bottom: 1px solid [[setting:maincolor]];
}
.generalbox h2,h3.sectionname,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, .forumpost .subject {
.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, .forumpost .subject {
color: [[setting:headingcolor]];
}

2
theme/brick/style/core.css
View File

@ -272,7 +272,7 @@ div.block.hidden div.header {
/** main headings **/
.generalbox h2,h3.sectionname,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
font-weight: 600;
letter-spacing: -1px;
line-height: 1.3em;

11
theme/canvas/style/core.css
View File

@ -17,6 +17,12 @@ body {
border: none;
}
.headingblock {
border-bottom: 1px solid #ddd;
font-size: 1.3em;
color: #333;
}
#notice {
text-align: center;
}
@ -432,6 +438,11 @@ body {
text-align: right;
}
#page-tag-index .headingblock {
text-align: center;
margin-bottom: 0;
}
#page-tag-index #tag-management-box {
border-bottom: 1px solid #ddd;
padding: 4px 0;

4
theme/formal_white/style/core.css
View File

@ -1,3 +1,7 @@
.headingblock {
font-size:130%;
}
#notice {
padding:1em;
}

7
theme/fusion/style/core.css
View File

@ -258,6 +258,13 @@ margin: 0;
/* Courses
----------------------------*/
h2.headingblock {
font-weight: normal;
color:#999;
font-size: 1.5em;
border-bottom:1px dotted #eee;
}
.coursebox {
border-color: #eee;
}

9
theme/leatherbound/style/core.css
View File

@ -151,6 +151,15 @@ a:active {
/* Course
---------------------------*/
h2.headingblock {
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

2
theme/magazine/style/colors.css
View File

@ -46,7 +46,7 @@ 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,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, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
color: [[setting:headingcolor]];
}

2
theme/magazine/style/core.css
View File

@ -697,7 +697,7 @@ html>
/** main headings **/
.generalbox h2,h3.sectionname,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
font-size: 30px;
padding-bottom: 2px;
margin: 3px 0 2px;

5
theme/mymobile/style/core.css
View File

@ -28,6 +28,11 @@ 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;

5
theme/nimble/style/core.css
View File

@ -79,6 +79,11 @@ h1.headermain {
/* Content */
h2.headingblock {
text-shadow: 1px 1px 3px #aaa;
color: #445566;
}
/* Region Post */
#region-post-wrap-1 {

9
theme/serenity/style/core.css
View File

@ -116,6 +116,15 @@ a:hover {
/* Course
----------------------------*/
.headingblock {
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;

9
theme/sky_high/style/core.css
View File

@ -184,6 +184,15 @@ p.helplink a {
/* @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;
}
.completionprogress {
color: #336699;
text-transform: uppercase;

8
theme/splash/style/pagelayout.css
View File

@ -276,7 +276,13 @@ h2,h3,h4,h5,h6{
margin:0 0 10px;
padding:3px;
}
#region-main h2.headingblock{
font-size:1.6em;
font-weight:400;
line-height:1.6em;
margin:0 0 10px;
padding:3px;
}
#region-main .coursebox h3{
font-size:1em;
}

3
theme/standard/style/core.css
View File

@ -37,6 +37,9 @@ 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;}
.header,
.navbar {background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;background-color:#e1e1df;}

1
theme/standard/style/css3.css
View File

@ -33,6 +33,7 @@
border-radius: 0;
}
.headingblock,
table.minicalendar td,
.path-calendar .maincalendar .filters table,
.path-calendar .sidecalendar .filters table,