mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-57527-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-02-22 00:52:03 +01:00
commit 492099d929
8 changed files with 74 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
portfolio/download/file.php
View File

@ -25,8 +25,6 @@ $exporter->print_header(get_string('downloading', 'portfolio_download'), false);
$returnurl = $exporter->get('caller')->get_return_url();
echo $OUTPUT->notification('<a href="' . $returnurl . '">' . get_string('returntowhereyouwere', 'portfolio') . '</a><br />');
$PAGE->requires->js('/portfolio/download/helper.js');
$PAGE->requires->js_function_call('submit_download_form', null, true);
// if they don't have javascript, they can submit the form here to get the file.
// if they do, it does it nicely for them.
@ -35,6 +33,13 @@ echo '<div id="redirect">
<input type="submit" value="' . get_string('downloadfile', 'portfolio_download') . '" />
</form>
';
$PAGE->requires->js_amd_inline("
require(['jquery'], function($) {
$('#redirectform').submit(function() {
$('#redirect').addClass('hide');
}).submit();
});");
echo $OUTPUT->footer();

7
portfolio/download/helper.js
View File

@ -1,7 +0,0 @@
function submit_download_form() {
YUI().use('yui2-dom', function(Y) {
f = Y.YUI2.util.Dom.get("redirectform");
Y.YUI2.util.Dom.addClass(f.parentNode, "hide");
f.submit();
});
}

7
report/completion/index.php
View File

@ -156,9 +156,6 @@ if ($csv) {
echo $OUTPUT->header();
$PAGE->requires->js('/report/completion/textrotate.js');
$PAGE->requires->js_function_call('textrotate_init', null, true);
// Handle groups (if enabled)
groups_print_course_menu($course, $CFG->wwwroot.'/report/completion/?course='.$course->id);
}
@ -417,13 +414,13 @@ if (!$csv) {
// Get criteria details
$details = $criterion->get_title_detailed();
print '<th scope="col" class="colheader criterianame">';
print '<span class="completion-criterianame">'.$details.'</span>';
print '<div class="rotated-text-container"><span class="rotated-text">'.$details.'</span></div>';
print '</th>';
}
// Overall course completion status
print '<th scope="col" class="colheader criterianame">';
print '<span class="completion-criterianame">'.get_string('coursecomplete', 'completion').'</span>';
print '<div class="rotated-text-container"><span class="rotated-text">'.get_string('coursecomplete', 'completion').'</span></div>';
print '</th></tr>';
}

31
report/completion/styles.css
View File

@ -7,7 +7,32 @@
text-align: center;
list-style: none;
}
/*rtl:ignore*/
#page-report-completion-index #completion-progress th svg {
direction: ltr;
#page-report-completion-index .criterianame,
#page-report-completion-index .criteriaicon,
#page-report-completion-index .completion-progresscell {
text-align: center;
}
/* Custom CSS for rotated header.. */
#page-report-completion-index .rotated-text-container {
display: inline-block;
width: 16px;
}
/*rtl:begin:ignore*/
#page-report-completion-index .rotated-text {
display: inline-block;
white-space: nowrap;
transform: translate(0, 100%) rotate(-90deg);
transform-origin: 0 0;
vertical-align: middle;
}
#page-report-completion-index .rotated-text:after {
content: "";
float: left;
margin-top: 100%;
}
/*rtl:end:ignore*/

72
report/completion/textrotate.js
View File

@ -1,72 +0,0 @@
var SVGNS='http://www.w3.org/2000/svg',XLINKNS='http://www.w3.org/1999/xlink';
function textrotate_make_svg(el)
{
var string=el.firstChild.nodeValue;
// Add absolute-positioned string (to measure length)
var abs=document.createElement('div');
abs.appendChild(document.createTextNode(string));
abs.style.position='absolute';
document.body.appendChild(abs);
var textWidth=abs.offsetWidth * 1.2,textHeight=abs.offsetHeight;
document.body.removeChild(abs);
// Create SVG
var svg=document.createElementNS(SVGNS,'svg');
svg.setAttribute('version','1.1');
svg.setAttribute('width',20);
svg.setAttribute('height',textWidth);
// Add text
var text=document.createElementNS(SVGNS,'text');
svg.appendChild(text);
text.setAttribute('x',textWidth);
text.setAttribute('y',-textHeight/4);
text.setAttribute('text-anchor','end');
text.setAttribute('transform','rotate(90)');
text.appendChild(document.createTextNode(string));
// Is there an icon near the text?
var icon=el.parentNode.firstChild;
if(icon.nodeName.toLowerCase()=='img') {
el.parentNode.removeChild(icon);
var image=document.createElementNS(SVGNS,'image');
var iconx=el.offsetHeight/4;
if(iconx>width-16) iconx=width-16;
image.setAttribute('x',iconx);
image.setAttribute('y',textWidth+4);
image.setAttribute('width',16);
image.setAttribute('height',16);
image.setAttributeNS(XLINKNS,'href',icon.src);
svg.appendChild(image);
}
// Replace original content with this new SVG
el.parentNode.insertBefore(svg,el);
el.parentNode.removeChild(el);
}
function browser_supports_svg() {
return document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1");
}
function textrotate_init() {
if (!browser_supports_svg()) {
// Feature detect, else bail.
return;
}
YUI().use('yui2-dom', function(Y) {
var elements= Y.YUI2.util.Dom.getElementsByClassName('completion-criterianame', 'span');
for(var i=0;i<elements.length;i++)
{
var el=elements[i];
el.parentNode.style.verticalAlign='bottom';
el.parentNode.style.width='20px';
textrotate_make_svg(el);
}
});
}

11
report/progress/index.php
View File

@ -154,8 +154,6 @@ if ($csv && $grandtotal && count($activities)>0) { // Only show CSV if there are
$PAGE->set_title($strcompletion);
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
$PAGE->requires->js('/report/progress/textrotate.js');
$PAGE->requires->js_function_call('textrotate_init', null, true);
// Handle groups (if enabled)
groups_print_course_menu($course,$CFG->wwwroot.'/report/progress/?course='.$course->id);
@ -323,13 +321,14 @@ foreach($activities as $activity) {
print $sep.csv_quote($displayname).$sep.csv_quote($datetext);
} else {
$shortenedname = shorten_text($displayname);
print '<th scope="col" class="'.$datepassedclass.'">'.
print '<th scope="col" class="completion-header '.$datepassedclass.'">'.
'<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname.
'/view.php?id='.$activity->id.'" title="' . s($displayname) . '">'.
'<img src="'.$OUTPUT->pix_url('icon', $activity->modname).'" alt="'.
'<div class="rotated-text-container"><span class="rotated-text">'.$shortenedname.'</span></div>'.
'<div class="modicon"><img src="'.$OUTPUT->pix_url('icon', $activity->modname).'" alt="'.
s(get_string('modulename', $activity->modname)).
'" /> <span class="completion-activityname">'.
$shortenedname.'</span></a>';
'" /></div></a>';
if ($activity->completionexpected) {
print '<div class="completion-expected"><span>'.$datetext.'</span></div>';
}

36
report/progress/styles.css
View File

@ -1,6 +1,6 @@
#page-report-progress-index #completion-progress th,
#page-report-progress-index #completion-progress td {
padding: 2px 4px;
padding: 2px 2px;
font-weight: normal;
border-right: 1px solid #eee;
}
@ -28,7 +28,35 @@
display: inline;
margin-left: 2em;
}
/*rtl:ignore*/
#page-report-progress-index #completion-progress th svg {
direction: ltr;
#page-report-progress-index .completion-header,
#page-report-progress-index .completion-progresscell {
text-align: center;
}
/* Custom CSS for rotated header.. */
#page-report-progress-index .rotated-text-container {
display: inline-block;
width: 16px;
}
/*rtl:begin:ignore*/
#page-report-progress-index .rotated-text {
display: inline-block;
white-space: nowrap;
transform: translate(0, 100%) rotate(-90deg);
transform-origin: 0 0;
vertical-align: middle;
}
#page-report-progress-index .rotated-text:after {
content: "";
float: left;
margin-top: 100%;
}
#page-report-progress-index .modicon {
padding-top: 5px;
}
/*rtl:end:ignore*/

94
report/progress/textrotate.js
View File

@ -1,94 +0,0 @@
var SVGNS='http://www.w3.org/2000/svg',XLINKNS='http://www.w3.org/1999/xlink';
function textrotate_make_svg(el)
{
var string=el.firstChild.nodeValue;
// Add absolute-positioned string (to measure length)
var abs=document.createElement('div');
abs.appendChild(document.createTextNode(string));
abs.style.position='absolute';
document.body.appendChild(abs);
var textWidth=abs.offsetWidth * 1.2,textHeight=abs.offsetHeight;
document.body.removeChild(abs);
// Create SVG
var svg=document.createElementNS(SVGNS,'svg');
svg.setAttribute('version','1.1');
var width=(textHeight*9)/8;
svg.setAttribute('width',width);
svg.setAttribute('height',textWidth+20);
// Add text
var text=document.createElementNS(SVGNS,'text');
svg.appendChild(text);
text.setAttribute('x',textWidth);
text.setAttribute('y',-textHeight/4);
text.setAttribute('text-anchor','end');
text.setAttribute('transform','rotate(90)');
text.appendChild(document.createTextNode(string));
// Is there an icon near the text?
var icon=el.parentNode.firstChild;
if(icon.nodeName.toLowerCase()=='img') {
el.parentNode.removeChild(icon);
var image=document.createElementNS(SVGNS,'image');
var iconx=el.offsetHeight/4;
if(iconx>width-16) iconx=width-16;
image.setAttribute('x',iconx);
image.setAttribute('y',textWidth+4);
image.setAttribute('width',16);
image.setAttribute('height',16);
image.setAttributeNS(XLINKNS,'href',icon.src);
svg.appendChild(image);
}
// Replace original content with this new SVG
el.parentNode.insertBefore(svg,el);
el.parentNode.removeChild(el);
}
function browser_supports_svg() {
return document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1");
}
function textrotate_init() {
if (!browser_supports_svg()) {
// Feature detect, else bail.
return;
}
YUI().use('yui2-dom', function(Y) {
var elements= Y.YUI2.util.Dom.getElementsByClassName('completion-activityname', 'span');
for(var i=0;i<elements.length;i++)
{
var el=elements[i];
el.parentNode.parentNode.parentNode.style.verticalAlign='bottom';
textrotate_make_svg(el);
}
elements= Y.YUI2.util.Dom.getElementsByClassName('completion-expected', 'div');
for(var i=0;i<elements.length;i++)
{
var el=elements[i];
el.style.display='inline';
var parent=el.parentNode;
parent.removeChild(el);
parent.insertBefore(el,parent.firstChild);
textrotate_make_svg(el.firstChild);
}
elements= Y.YUI2.util.Dom.getElementsByClassName('rotateheaders', 'table');
for(var i=0;i<elements.length;i++)
{
var table=elements[i];
var headercells = Y.YUI2.util.Dom.getElementsByClassName('header', 'th', table);
for(var j=0;j<headercells.length;j++)
{
var el=headercells[j];
textrotate_make_svg(el.firstChild);
}
}
});
}