moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle

Browse source
This commit is contained in:
Marina Glancy 2013-10-03 18:10:31 +10:00
commit 1b87f31348
10 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
course/renderer.php
View file

@ -1147,7 +1147,7 @@ class core_course_renderer extends plugin_renderer_base {
// course name // course name
$coursename = $chelper->get_course_formatted_name($course); $coursename = $chelper->get_course_formatted_name($course);
$coursenamelink = html_writer::link(new moodle_url('/course/view.php', array('id' => $course->id)), $coursenamelink = html_writer::link(new moodle_url('/course/view.php', array('id' => $course->id)),
$coursename, array('class' => $course->visible ? 'courseicon' : 'courseicon dimmed')); $coursename, array('class' => $course->visible ? '' : 'dimmed'));
$content .= html_writer::tag($nametag, $coursenamelink, array('class' => 'coursename')); $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. // 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')); $content .= html_writer::start_tag('div', array('class' => 'moreinfo'));

2
course/yui/build/moodle-course-categoryexpander/moodle-course-categoryexpander-debug.js vendored
View file

@ -34,7 +34,7 @@ var CSS = {
COLLAPSEEXPAND: '.collapseexpand', COLLAPSEEXPAND: '.collapseexpand',
COURSEBOX: '.coursebox', COURSEBOX: '.coursebox',
COURSEBOXLISTENLINK: '.coursebox .moreinfo', COURSEBOXLISTENLINK: '.coursebox .moreinfo',
COURSEBOXSPINNERLOCATION: '.categoryname a', COURSEBOXSPINNERLOCATION: '.coursename a',
COURSECATEGORYTREE: '.course_category_tree', COURSECATEGORYTREE: '.course_category_tree',
PARENTWITHCHILDREN: '.category' PARENTWITHCHILDREN: '.category'
}, },

2
course/yui/build/moodle-course-categoryexpander/moodle-course-categoryexpander-min.js vendored
View file

File diff suppressed because one or more lines are too long

2
course/yui/build/moodle-course-categoryexpander/moodle-course-categoryexpander.js vendored
View file

@ -34,7 +34,7 @@ var CSS = {
COLLAPSEEXPAND: '.collapseexpand', COLLAPSEEXPAND: '.collapseexpand',
COURSEBOX: '.coursebox', COURSEBOX: '.coursebox',
COURSEBOXLISTENLINK: '.coursebox .moreinfo', COURSEBOXLISTENLINK: '.coursebox .moreinfo',
COURSEBOXSPINNERLOCATION: '.categoryname a', COURSEBOXSPINNERLOCATION: '.coursename a',
COURSECATEGORYTREE: '.course_category_tree', COURSECATEGORYTREE: '.course_category_tree',
PARENTWITHCHILDREN: '.category' PARENTWITHCHILDREN: '.category'
}, },

2
course/yui/src/categoryexpander/js/categoryexpander.js vendored
View file

@ -32,7 +32,7 @@ var CSS = {
COLLAPSEEXPAND: '.collapseexpand', COLLAPSEEXPAND: '.collapseexpand',
COURSEBOX: '.coursebox', COURSEBOX: '.coursebox',
COURSEBOXLISTENLINK: '.coursebox .moreinfo', COURSEBOXLISTENLINK: '.coursebox .moreinfo',
COURSEBOXSPINNERLOCATION: '.categoryname a', COURSEBOXSPINNERLOCATION: '.coursename a',
COURSECATEGORYTREE: '.course_category_tree', COURSECATEGORYTREE: '.course_category_tree',
PARENTWITHCHILDREN: '.category' PARENTWITHCHILDREN: '.category'
}, },

4
theme/base/style/course.css
View file

@ -118,7 +118,7 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.coursebox {width: 100%;margin-bottom:15px;} .coursebox {width: 100%;margin-bottom:15px;}
.coursebox.collapsed {margin-bottom:0} .coursebox.collapsed {margin-bottom:0}
.coursebox.collapsed > .content {display:none;} .coursebox.collapsed > .content {display:none;}
.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 > .info > .coursename a {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.remotehost .coursename a {background-image:url([[pix:moodle|i/mnethost]]);}
.coursebox > .info > .coursename, .coursebox > .info > .coursename,
.coursebox .content .teachers, .coursebox .content .teachers,
@ -136,7 +136,7 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.coursebox.remotecoursebox .remotecourseinfo {float:left;width: 40%;} .coursebox.remotecoursebox .remotecourseinfo {float:left;width: 40%;}
.coursebox .content .courseimage img {max-width:100px;max-height:100px;} .coursebox .content .courseimage img {max-width:100px;max-height:100px;}
.coursebox >.info >.categoryname {margin: 5px;padding:0;} .coursebox >.info >.coursename {margin: 5px;padding:0;}
.coursebox .content .teachers, .coursebox .content .teachers,
.coursebox .content .coursecat, .coursebox .content .coursecat,
.coursebox .content .summary, .coursebox .content .summary,

10
theme/bootstrapbase/less/moodle/course.less
View file

@ -383,7 +383,7 @@ span.editinstructions {
padding: 5px; padding: 5px;
} }
.coursebox > .info > .categoryname a { .coursebox > .info > .coursename a {
display:block; display:block;
background-image:url([[pix:moodle|i/course]]); background-image:url([[pix:moodle|i/course]]);
background-repeat: no-repeat; background-repeat: no-repeat;
@ -393,7 +393,7 @@ span.editinstructions {
.coursebox.remotehost > .info > .categoryname a { .coursebox.remotehost > .info > .categoryname a {
background-image:url([[pix:moodle|i/mnethost]]); background-image:url([[pix:moodle|i/mnethost]]);
} }
.coursebox > .info h3, .coursebox > .info > .coursename,
.coursebox .content .teachers, .coursebox .content .teachers,
.coursebox .content .courseimage, .coursebox .content .courseimage,
.coursebox .content .coursefile { .coursebox .content .coursefile {
@ -401,10 +401,10 @@ span.editinstructions {
width:40%; width:40%;
clear:left; clear:left;
} }
.coursebox > .info > h3.categoryname { .coursebox > .info > h3.coursename {
margin: 5px; margin: 5px;
} }
.coursebox > .info > .categoryname { .coursebox > .info > .coursename {
margin: 5px; margin: 5px;
padding: 0; padding: 0;
} }
@ -488,7 +488,7 @@ span.editinstructions {
} }
.courses .coursebox.collapsed { .courses .coursebox.collapsed {
border:1px solid #eeeeee; border:1px solid #eeeeee;
padding:3px 0; padding:5px;
} }
.courses .coursebox.even { .courses .coursebox.even {

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

File diff suppressed because one or more lines are too long

2
theme/standard/style/core.css
View file

@ -40,7 +40,7 @@ div.header,
#site-news-forum h2, #site-news-forum h2,
#frontpage-course-list h2, #frontpage-course-list h2,
#frontpage-category-names h2, #frontpage-category-names h2,
#frontpage-category-combo h2 {border:1px solid #DDD;padding:0 5px;margin-top:0;} #frontpage-category-combo h2 {border:1px solid #DDD;padding:5px;margin-top:0;}
#site-news-forum h2, #site-news-forum h2,
#frontpage-course-list h2, #frontpage-course-list h2,

2
theme/standard/style/course.css
View file

@ -75,7 +75,7 @@
/* Courses and categories lists */ /* Courses and categories lists */
.coursebox {border:1px solid #DDD;border-color:#DDDDDD;} .coursebox {border:1px solid #DDD;border-color:#DDDDDD;padding:3px 0;}
#page-enrol-index .generalbox.info, #page-enrol-index .generalbox.info,
#page-course-info .generalbox.info {border:none;} #page-course-info .generalbox.info {border:none;}
.coursebox .content .teachers, .coursebox .content .teachers,