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

Merge branch 'MDL-42858_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

Browse source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-11-25 10:49:02 +08:00
commit 9e2bc0490f
4 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
course/classes/management/helper.php
View file

@ -622,10 +622,6 @@ class helper {
if (!$category->can_change_visibility()) { if (!$category->can_change_visibility()) {
throw new \moodle_exception('permissiondenied', 'error', '', null, 'coursecat::can_change_visbility'); throw new \moodle_exception('permissiondenied', 'error', '', null, 'coursecat::can_change_visbility');
} }
if ((int)$category->get_parent_coursecat()->visible === 0) {
// You cannot mark a category visible if its parent is hidden.
return false;
}
$category->show(); $category->show();
return true; return true;
} }

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

@ -461,14 +461,11 @@ input.titleeditor { vertical-align: text-bottom; }
.dir-rtl #course-category-listings .listitem > div > .float-right {float:left;text-align:left;} .dir-rtl #course-category-listings .listitem > div > .float-right {float:left;text-align:left;}
#course-category-listings .listitem[data-visible="0"], #course-category-listings .listitem[data-visible="0"],
#course-category-listings .listitem[data-visible="0"] a.categoryname,
#course-category-listings .listitem[data-visible="0"] > div > a {color:#AAA;} #course-category-listings .listitem[data-visible="0"] > div > a {color:#AAA;}
#course-category-listings .listitem > div .item-actions .action-hide, #course-category-listings .listitem > div .item-actions .action-hide,
#course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show {display:inline;} #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show {display:inline;}
#course-category-listings .listitem > div .item-actions .action-show, #course-category-listings .listitem > div .item-actions .action-show,
#course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide, #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide,
#course-category-listings .listitem[data-visible="0"] > ul .item-actions.category-item-actions .action-hide,
#course-category-listings .listitem[data-visible="0"] > ul .item-actions.category-item-actions .action-show,
#category-listing .listitem:first-child > div .item-actions .action-moveup, #category-listing .listitem:first-child > div .item-actions .action-moveup,
#category-listing .listitem:last-child > div .item-actions .action-movedown, #category-listing .listitem:last-child > div .item-actions .action-movedown,

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

@ -978,9 +978,6 @@ span.editinstructions {
// The category or course is hidden. // The category or course is hidden.
&[data-visible="0"] { &[data-visible="0"] {
.muted; .muted;
a.categoryname {
.muted;
}
> div { > div {
> a { > a {
.muted; .muted;
@ -994,13 +991,6 @@ span.editinstructions {
} }
} }
} }
> ul .item-actions.category-item-actions {
// If the category is hidden hide both show and hide icons for sub categories.
.action-hide,
.action-show {
display: none;
}
}
} }
&.highlight { &.highlight {
background-color:transparent; background-color:transparent;

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

File diff suppressed because one or more lines are too long