Skip to content
Snippets Groups Projects
Commit ad2c95fa authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.1.x' into prod/1.1.x

parents c0baf462 46493481
No related branches found
No related tags found
No related merge requests found
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x=".5" y=".5" width="29" height="29"/><path d="M29,1v28H1V1h28M30,0H0v30h30V0h0Z"/><path d="M15,16.41c3.11,0,5.62-2.52,5.62-5.62V3.75l-2.81,1.41-2.81-1.41-2.81,1.41-2.81-1.41v7.03c0,3.11,2.52,5.62,5.62,5.62ZM11.48,9.38h7.03v1.41c0,1.94-1.58,3.52-3.52,3.52s-3.52-1.58-3.52-3.52v-1.41ZM18.94,17.11c-.48,0-.96.11-1.42.27-.79.28-1.64.43-2.52.43s-1.73-.15-2.52-.43c-.46-.16-.93-.27-1.42-.27-3.26,0-5.91,2.65-5.91,5.91v1.13c0,1.16.94,2.11,2.11,2.11h15.47c1.16,0,2.11-.94,2.11-2.11v-1.13c0-3.26-2.65-5.91-5.91-5.91ZM22.73,24.14H7.27v-1.13c0-2.09,1.71-3.8,3.8-3.8.18,0,.42.05.72.16,1.04.36,2.12.54,3.22.54s2.18-.18,3.22-.55c.3-.11.54-.16.72-.16,2.09,0,3.8,1.71,3.8,3.8v1.13Z"/></svg>
......@@ -105,6 +105,9 @@ function uw_fdsu_theme_resp_preprocess_html(&$variables) {
else {
$variables['attributes']['class'][] = 'layout-page';
}
// Add UW to page title, if not already there.
_uw_add_page_title($variables);
}
/**
......@@ -204,8 +207,17 @@ function uw_fdsu_theme_resp_preprocess_region(&$variables) {
$variables['faculty'] = theme_get_setting('wcms_colour_scheme', 'uw_fdsu_theme_resp') ? theme_get_setting('wcms_colour_scheme', 'uw_fdsu_theme_resp') : 'org-default';
// Create the stream context to use with file_get_contents
// so it times out after a certain period instead of
// waiting indefinitely. Timeout is in seconds.
$context = stream_context_create([
'http' => [
'timeout' => 3,
],
]);
// Global message content.
$global_message = file_get_contents('https://uwaterloo.ca/global-message.html');
$global_message = file_get_contents('https://uwaterloo.ca/global-message.html', 0, $context);
// If there is something to display, make sure to include css file, and
// pass message as render array, then use render twig filter to avoid using
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment