Permalink
Browse files

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.
  • Loading branch information...
rwijaya Sam Hemelryk
rwijaya authored and Sam Hemelryk committed Oct 1, 2013
1 parent 268f4cb commit faf6010b107a1742b427a35ddf6a10118b5b443b
Showing with 208 additions and 144 deletions.
  1. +1 −1 course/format/renderer.php
  2. +4 −4 course/renderer.php
  3. +8 −8 course/tests/behat/paged_course_navigation.feature
  4. +3 −3 course/yui/build/moodle-course-categoryexpander/moodle-course-categoryexpander-debug.js
  5. +1 −1 course/yui/build/moodle-course-categoryexpander/moodle-course-categoryexpander-min.js
  6. +3 −3 course/yui/build/moodle-course-categoryexpander/moodle-course-categoryexpander.js
  7. +3 −3 course/yui/src/categoryexpander/js/categoryexpander.js
  8. +6 −6 index.php
  9. +1 −1 tag/index.php
  10. +4 −5 theme/afterburner/style/afterburner_styles.css
  11. +0 −9 theme/anomaly/style/base.css
  12. +8 −4 theme/anomaly/style/general.css
  13. +4 −2 theme/arialist/style/core.css
  14. +4 −1 theme/base/style/core.css
  15. +23 −17 theme/base/style/course.css
  16. +1 −2 theme/bootstrapbase/less/moodle/core.less
  17. +36 −17 theme/bootstrapbase/less/moodle/course.less
  18. +1 −1 theme/bootstrapbase/style/moodle.css
  19. +7 −8 theme/boxxie/style/core.css
  20. +2 −1 theme/brick/style/colors.css
  21. +2 −2 theme/brick/style/core.css
  22. +5 −3 theme/canvas/style/core.css
  23. +0 −6 theme/canvas/style/text.css
  24. +4 −1 theme/formal_white/style/core.css
  25. +1 −1 theme/formal_white/style/course.css
  26. +4 −1 theme/fusion/style/core.css
  27. +7 −2 theme/leatherbound/style/core.css
  28. +2 −1 theme/magazine/style/colors.css
  29. +11 −11 theme/magazine/style/core.css
  30. +1 −6 theme/mymobile/style/core.css
  31. +4 −1 theme/nimble/style/core.css
  32. +8 −2 theme/serenity/style/core.css
  33. +4 −1 theme/sky_high/style/core.css
  34. +6 −3 theme/splash/style/core.css
  35. +4 −1 theme/splash/style/pagelayout.css
  36. +10 −3 theme/standard/style/core.css
  37. +4 −2 theme/standard/style/css3.css
  38. +11 −0 theme/upgrade.txt
@@ -651,7 +651,7 @@ public function print_single_section_page($course, $sections, $mods, $modnames,
// 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
@@ -1147,9 +1147,8 @@ protected function coursecat_coursebox(coursecat_helper $chelper, $course, $addi
// 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 @@ protected function coursecat_category(coursecat_helper $chelper, $coursecat, $de
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
@@ -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"
@@ -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'
},

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -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'
},
@@ -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'
},
Oops, something went wrong.

0 comments on commit faf6010

Please sign in to comment.