L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-42246 course: improved highlighting of bulk actions

Browse Source
This commit is contained in:
Sam Hemelryk
2013-10-17 08:40:44 +13:00
parent 059d7bd275
commit 3b681e6cf8
4 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/classes/management_renderer.php
+2 -2
View File
@@ -204,7 +204,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$html = html_writer::start_tag('li', $attributes);
$html .= html_writer::start_div('clearfix');
$html .= html_writer::start_div('float-left');
$html .= html_writer::start_div('float-left ba-checkbox');
$html .= html_writer::empty_tag('input', $bcatinput).' ';
$html .= html_writer::end_div();
$html .= $icon;
@@ -561,7 +561,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$html .= html_writer::div($this->output->pix_icon('i/dragdrop', get_string('dndcourse')), 'float-left drag-handle');
}
$html .= html_writer::start_div('float-left');
$html .= html_writer::start_div('ba-checkbox float-left');
$html .= html_writer::empty_tag('input', $bulkcourseinput).' ';
$html .= html_writer::end_div();
$html .= html_writer::link($viewcourseurl, $text, array('class' => 'float-left coursename'));
theme/base/style/course.css
+12 -2
View File
@@ -246,13 +246,15 @@ input.titleeditor { width: 330px; vertical-align: text-bottom; }
#course-category-listings li {line-height:2.2em;}
#course-category-listings li > div {border-bottom:1px solid #fff;border-top:1px solid #fff;}
#course-category-listings li > div:hover {background-color:#fafafa;}
#course-category-listings li.highlight {background-color:transparent;}
#course-category-listings li.highlight > div,
#category-listing li.highlight.listitem > div > .ba-checkbox,
#course-category-listings li.highlight > div:hover,
#course-category-listings li[data-selected='1'].highlight > div {background-color:#ddffaa;}
#course-category-listings li+li > div,
#course-category-listings li:first-child > div {border-top-color:#f7f7f9;}
#course-category-listings li .tree-icon {vertical-align:text-top;margin-right:0.5em;width:12px;height:12px;}
#course-category-listings li[data-selected='1'] > div {background-color:#f7f7f9;border-top-color: #e1e1e8;border-bottom-color:#f7f7f9;}
#course-category-listings li[data-selected='1'] > div {background-color:#FFFFD8;border-top-color: #e1e1e8;border-bottom-color:#f7f7f9;}
#course-category-listings li[data-selected='1'] li:first-of-type > div,
#course-category-listings li[data-selected='1'][data-expandable='0']+li > div {border-top-color:#e1e1e8;}
#course-category-listings li[data-selected='1']:last-of-type > div {border-bottom-color:#e1e1e8;}
@@ -288,6 +290,14 @@ input.titleeditor { width: 330px; vertical-align: text-bottom; }
#category-listing .listitem.collapsed > ul.ml {display: none;}
#category-listing .course-count .smallicon {width:0.8em;height:0.8em;vertical-align:middle;margin:0 0.3em;}
#category-listing .category-listing > ul > .listitem:first-child {position:relative;}
#category-listing .category-listing > ul > .listitem:first-child .ba-checkbox:before {content: '.';background-color: #FaFaFb; color: #FaFaFb; position:absolute;top:-0.2em;line-height:0.2em;border: 1px solid #EFEFF4;border-width:1px 1px 0;margin:-1px;width:2.2em;display:block;border-radius: 2px 2px 0 0;}
#category-listing .listitem > div {margin-left:0.5em;}
#category-listing .listitem > div > .ba-checkbox {background-color: #FaFaFb;border-right: 1px solid #EFEFF4;border-left: 1px solid #EFEFF4;vertical-align:middle;width:2.2em;text-align:center;margin:-1px 0;padding-top:2px;margin-right:0.5em;}
#category-listing .listitem[data-selected='1'] > div > .ba-checkbox {margin:0 0.5em 0 0;padding:0;background-color: inherit;}
.category-bulk-actions {margin: 0 0.5em 0.5em; background-color: #FaFaFb; border: 1px solid #EFEFF4;position:relative;}
.category-bulk-actions:before {content: '.';background-color: #FaFaFb; color: #FaFaFb; position:relative;top:-1em;line-height:110%;border: 1px solid #EFEFF4;border-width:0 1px;margin:-1px;width:2.2em;display:block;}
#course-category-listings .listitem > div > .float-left {float:left;}
#course-category-listings .listitem > div > .float-right {float:right;text-align:right;}
#course-category-listings .listitem[data-visible="0"],
@@ -334,7 +344,7 @@ input.titleeditor { width: 330px; vertical-align: text-bottom; }
.listing-pagination .yui3-button.active-page {background-color:#E5EFFD;}
.listing-pagination-totals.dimmed {color:#999;margin:0.4em 1em 0.45em;}
#category-listing .bulk-action-checkbox {margin-left:0.3em;margin-right:0.3em;vertical-align:middle;margin-bottom:0.5em;}
#category-listing .bulk-action-checkbox {vertical-align:middle;margin:0 0 0.5em 3px;}
#course-listing .bulk-action-checkbox {margin-right:0.6em;vertical-align:middle;margin-bottom:0.5em;}
/**
theme/bootstrapbase/less/moodle/course.less
+71 -13
View File
@@ -694,30 +694,20 @@ span.editinstructions {
> div {
border-bottom:1px solid #fff;
border-top:1px solid #fff;
padding-left:1rem;
&:hover {
background-color:#fafafa;
}
}
&.highlight > div {
background-color:#ddffaa;
&:hover {
background-color:#ddffaa;
}
}
.tree-icon {
vertical-align:text-top;
margin: 2px 6px 0 0;
}
&[data-selected='1'] {
> div {
background-color:#f7f7f9;
background-color:#FFFFD8;
border-top-color: #e1e1e8;
border-bottom-color:#f7f7f9;
}
&.highlight > div {
background-color:#ddffaa;
}
li:first-of-type > div,
&[data-expandable='0']+li > div {
border-top-color:#e1e1e8;
@@ -800,6 +790,14 @@ span.editinstructions {
}
}
}
&.highlight {
background-color:transparent;
> div,
> div:hover,
&[data-selected='1'] > div {
background-color:#ddffaa;
}
}
}
#course-listing {
@@ -820,6 +818,9 @@ span.editinstructions {
display:inline-block;
margin: 0 6px 0 0;
}
> div {
padding-left:1rem;
}
}
> .firstpage .listitem:first-child > div .item-actions .action-moveup,
> .lastpage .listitem:last-child > div .item-actions .action-movedown {display: none;}
@@ -833,6 +834,27 @@ span.editinstructions {
display: none;
}
.listitem {
> div {
margin-left:0.5em;
> .ba-checkbox {
background-color: #FaFaFb;
border-right: 1px solid #EFEFF4;
border-left: 1px solid #EFEFF4;
vertical-align:middle;
width:2.2em;
text-align:center;
margin:-1px 0.5em 0 0;
padding-top:2px;
}
}
&.highlight > div > .ba-checkbox {
background-color:#ddffaa;
}
&[data-selected='1'] > div > .ba-checkbox {
margin:0 0.5em 0 0;
padding:0;
background-color: inherit;
}
&:first-child > div .item-actions .action-moveup,
&:last-child > div .item-actions .action-movedown {display: none;}
}
@@ -850,8 +872,44 @@ span.editinstructions {
}
.bulk-action-checkbox {
vertical-align:middle;
margin:-6px 6px 0 0;
cursor: pointer;
margin-right: -3px;
}
.category-listing > ul > .listitem:first-child {
position:relative;
.ba-checkbox:before {
content: '.';
background-color: #FaFaFb;
color: #FaFaFb;
position:absolute;
top:-0.2em;
line-height:0.2em;
border: 1px solid #EFEFF4;
border-width:1px 1px 0;
margin:-1px;
width:2.2em;
display:block;
border-radius: 2px 2px 0 0;
}
}
.category-bulk-actions {
margin: 0 0.5em 0.5em;
background-color: #FaFaFb;
border: 1px solid #EFEFF4;
position:relative;
&:before {
content: '.';
background-color: #FaFaFb;
color: #FaFaFb;
position:relative;
top:-1em;
line-height:110%;
border: 1px solid #EFEFF4;
border-width:0 1px;
margin:-1px;
width:2.2em;
display:block;
}
}
}
theme/bootstrapbase/style/moodle.css
+1 -1
View File
File diff suppressed because one or more lines are too long