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

Merge branch 'MDL-40759-master-fix3' of http://github.com/damyon/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2017-03-23 11:33:11 +08:00
parent b7cc51ca60 fe4f35b29b
commit 85ead19b34
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/user.php
+2 -1
View File
@@ -187,7 +187,8 @@
} else {
$columnicon = ($dir == "ASC") ? "sort_asc" : "sort_desc";
}
$columnicon = $OUTPUT->pix_icon('t/' . $columnicon, get_string($columndir), 'core', ['class' => 'iconsort']);
$columnicon = $OUTPUT->pix_icon('t/' . $columnicon, get_string(strtolower($columndir)), 'core',
['class' => 'iconsort']);
}
$$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir\">".$string[$column]."</a>$columnicon";
course/amd/build/actions.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
course/amd/src/actions.js
+10 -3
View File
@@ -355,15 +355,22 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
*/
var replaceActionItem = function(actionitem, image, stringname,
stringcomponent, titlestr, titlecomponent, newaction) {
actionitem.find('img').attr('src', url.imageUrl(image, 'core'));
str.get_string(stringname, stringcomponent).done(function(newstring) {
actionitem.find('span.menu-action-text').html(newstring);
actionitem.attr('title', newstring);
});
if (titlestr) {
str.get_string(titlestr, titlecomponent).done(function(newtitle) {
str.get_string(titlestr, titlecomponent).then(function(newtitle) {
templates.renderPix(image, 'core', newtitle).then(function(html) {
actionitem.find('.icon').replaceWith(html);
});
actionitem.attr('title', newtitle);
});
} else {
templates.renderPix(image, 'core', '').then(function(html) {
actionitem.find('.icon').replaceWith(html);
});
}
actionitem.attr('data-action', newaction);
};
@@ -591,4 +598,4 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
replaceActionItem(actionitem, image, stringname, stringcomponent, titlestr, titlecomponent, newaction);
}
};
});
});
theme/bootstrapbase/less/moodle/core.less
+3 -2
View File
@@ -1986,7 +1986,8 @@ img#persona_signin {
padding-right: 4px;
.iconsmall,
.smallicon {
.smallicon,
.icon {
margin: 4px 4px 4px 0;
padding: 8px 4px 0 2px;
vertical-align: text-bottom;
@@ -2031,7 +2032,7 @@ img#persona_signin {
a {
display: block;
color: @dropdownLinkColor;
padding: 2px 1em 2px 28px;
padding: 6px 1em 6px 1em;
&:hover {
color: @dropdownLinkColorHover;
background-color: @dropdownLinkBackgroundHover;
theme/bootstrapbase/style/moodle.css
+3 -2
View File
@@ -4436,7 +4436,8 @@ img#persona_signin {
padding-right: 4px;
}
.jsenabled .moodle-actionmenu[data-enhance] .toggle-display.textmenu .iconsmall,
.jsenabled .moodle-actionmenu[data-enhance] .toggle-display.textmenu .smallicon {
.jsenabled .moodle-actionmenu[data-enhance] .toggle-display.textmenu .smallicon,
.jsenabled .moodle-actionmenu[data-enhance] .toggle-display.textmenu .icon {
margin: 4px 4px 4px 0;
padding: 8px 4px 0 2px;
vertical-align: text-bottom;
@@ -4482,7 +4483,7 @@ img#persona_signin {
.moodle-actionmenu[data-enhanced].show .menu a {
display: block;
color: #333;
padding: 2px 1em 2px 28px;
padding: 6px 1em 6px 1em;
}
.moodle-actionmenu[data-enhanced].show .menu a:hover {
color: #fff;