Skip to content

GitLab

Commit a43350d9 authored by Melissa Draper's avatar Melissa Draper Committed by Gerrit Code Review
Browse files

Merge "Change warning/error messages to one div"

parents d471a5da 7e688937
Hide whitespace changes
Inline Side-by-side
htdocs/lib/web.php
View file @ a43350d9
......@@ -415,9 +415,7 @@ EOF;
$smarty->assign('PAGETITLE', $sitename);
}
if (!get_config('productionmode')) {
$sitetop = '<div class="error">' . get_string('notproductionsite', 'error') . '</div>';
}
$smarty->assign('PRODUCTIONMODE', get_config('productionmode'));
if (function_exists('local_header_top_content')) {
$sitetop = (isset($sitetop) ? $sitetop : '') . local_header_top_content();
}
......
htdocs/theme/raw/static/style/style.css
View file @ a43350d9
......@@ -979,6 +979,7 @@ input.cancel,
background-color: #f99;
font-weight: bold;
padding: 5px;
border-bottom: 2px darkred solid;
color: #333333;
}
.sitemessage img {
......
htdocs/theme/raw/templates/header.tpl
View file @ a43350d9
......@@ -2,9 +2,12 @@
<html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if}>
{include file="header/head.tpl"}
<body>
{if $USERMASQUERADING}<div class="sitemessage"><img src="{theme_url filename='images/icon_problem.gif'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>{/if}
{if $SITECLOSED}<div class="sitemessage center">{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}</div>{/if}
{if $SITETOP}<div id="switchwrap">{$SITETOP|safe}</div>{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}<div class="sitemessages">{/if}
{if $USERMASQUERADING}<div class="sitemessage"><img src="{theme_url filename='images/icon_problem.gif'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>{/if}
{if !$PRODUCTIONMODE}<div class="sitemessage center">{str tag=notproductionsite section=error}</div>{/if}
{if $SITECLOSED}<div class="sitemessage center">{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}</div>{/if}
{if $SITETOP}<div id="switchwrap">{$SITETOP|safe}</div>{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}</div>{/if}
<div id="container">
<div id="loading-box"></div>
<div id="top-wrapper"><h1 id="site-logo"><a href="{$WWWROOT}"><img src="{$sitelogo}" alt="{$sitename}"></a></h1>
......
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