Commit be184111 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1619051 - Fix link colour inside decompress progress bar"

parents 8fa4c8b9 bedcb716
...@@ -37,18 +37,21 @@ function print_export_head($stylesheets) { ...@@ -37,18 +37,21 @@ function print_export_head($stylesheets) {
function print_export_iframe_die($message, $link=null) { function print_export_iframe_die($message, $link=null) {
$message = hsc($message); $message = hsc($message);
if (isset($link)) { if (isset($link)) {
$message .= ' <a target="_top" href="' . hsc($link) . '">' . get_string('continue', 'admin') . '</a>'; $message .= ' <a class="decompress-link" target="_top" href="' . hsc($link) . '">' . get_string('continue', 'admin') . '</a>';
} }
echo '<div class="progress-bar" style="width: 100%;"><p>' . $message . '</p></div></body></html>'; echo '<div class="progress-bar" style="width: 100%;"><p>' . $message . '</p></div></body></html>';
} }
function print_iframe_progress_handler($percent, $status) { function print_iframe_progress_handler($percent, $status) {
// "Erase" the current output with a new background div // The progress bar using linear gradient to show progress
echo '<div style="width: 100%; background-color: #d4d4d4; position: absolute; text-align: center; height: 40px; left: 0; top: 0;" class="progress-bar"></div>'; // so we can have two background colours on same div allowing the text to not be hidden
// The progress bar itself echo '<div style="width: 100%; background-color: #d4d4d4; position: absolute;
echo '<div class="progress-bar-progress" style="width: ' . intval($percent) . '%; background-color: #cff253; position: absolute; text-align: center; height: 40px; left: 0; top: 0;"></div>' . "\n"; text-align: center; height: 40px; left: 0; top: 0;
// The status text background-image: linear-gradient(left, #cff253, #cff253 ' . intval($percent) . '%, transparent ' . intval($percent) . '%, transparent 100%);
echo '<p class="progress-text" style="color: #000000; position: absolute; text-align: center; height: 40px; left: 0; top: 0; width:100%; margin-top:8px;">' . hsc($status) . "</p>\n"; background-image: -webkit-linear-gradient(left, #cff253, #cff253 ' . intval($percent) . '%, transparent ' . intval($percent) . '%, transparent 100%);
background-image: -moz-linear-gradient(left, #cff253, #cff253 ' . intval($percent) . '%, transparent ' . intval($percent) . '%, transparent 100%);
background-image: -o-linear-gradient(left, #cff253, #cff253 ' . intval($percent) . '%, transparent ' . intval($percent) . '%, transparent 100%);
" class="progress-bar"><p class="progress-text" style="color: #000000; text-align: center; height: 40px; left: 0; top: 0; width:100%; margin-top:8px;">' . hsc($status) . "</p></div>\n";
} }
function print_export_footer($strexportgenerated, $continueurl, $continueurljs, $jsmessages=array(), $newlocation) { function print_export_footer($strexportgenerated, $continueurl, $continueurljs, $jsmessages=array(), $newlocation) {
...@@ -100,7 +103,7 @@ function print_extractprogress_head($stylesheets, $artefacts) { ...@@ -100,7 +103,7 @@ function print_extractprogress_head($stylesheets, $artefacts) {
function print_extractprogress_footer($message, $next) { function print_extractprogress_footer($message, $next) {
?> ?>
<div class="progress-bar" style="width: 100%;"> <div class="progress-bar" style="width: 100%;">
<p><?php echo $message; ?> <a href="<?php echo $next; ?>" target="_top"><?php echo get_string('Continue', 'artefact.file'); ?></a></p> <p><?php echo $message; ?> <a class="decompress-link" href="<?php echo $next; ?>" target="_top"><?php echo get_string('Continue', 'artefact.file'); ?></a></p>
</div> </div>
</body> </body>
</html> </html>
......
...@@ -211,6 +211,13 @@ ...@@ -211,6 +211,13 @@
} }
} }
.progress-bar .decompress-link {
color: $progress-bar-color;
text-decoration: underline;
display: inline-block;
margin-top: 8px;
}
// Admin user search page (advanced options) // Admin user search page (advanced options)
// limit the size of dynamic to match select box above // limit the size of dynamic to match select box above
.userserach-filter { .userserach-filter {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment