From 4e24768989eb2ee1246a75c98c32930cc058a5c5 Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 6 Oct 2016 11:46:42 +0200 Subject: [PATCH] fixes #533, add a "messages" box (blue colorscheme) --- admin/themes/default/template/admin.tpl | 16 +++++++++++++++- admin/themes/default/theme.css | 13 ++++++++++--- include/common.inc.php | 1 + include/functions_html.inc.php | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 215801656..b54d38790 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -28,7 +28,7 @@ $('#menubar').lightAccordion({ /* in case we have several infos/errors/warnings display bullets */ jQuery(document).ready(function() { - var eiw = ["infos","erros","warnings"]; + var eiw = ["infos","erros","warnings", "messages"]; for (var i = 0; i < eiw.length; i++) { var boxType = eiw[i]; @@ -143,6 +143,7 @@ jQuery(document).ready(function() { {/if} +
{if isset($errors)}
@@ -176,5 +177,18 @@ jQuery(document).ready(function() {
{/if} + {if isset($messages)} +
+ +
    + {foreach from=$messages item=message} +
  • {$message}
  • + {/foreach} +
+
+ {/if} + +
{* .eiw *} + {$ADMIN_CONTENT} diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index c325fdb7d..1f001d024 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -803,7 +803,7 @@ h2:lang(en) { text-transform:capitalize; } /** * Informations box in administration */ -.infos, .errors, .warnings { +.infos, .errors, .warnings, .messages { text-align: left; margin: 15px 10px 15px 15px; padding: 5px; @@ -811,7 +811,7 @@ h2:lang(en) { text-transform:capitalize; } min-height: 54px; } -.infos ul, .errors ul, .warnings ul { +.infos ul, .errors ul, .warnings ul, .messages ul { margin-top:18px; } @@ -839,7 +839,14 @@ h2:lang(en) { text-transform:capitalize; } border-left:4px solid #ee8800; } -.infos li, .errors li, .warnings li { list-style-type:none; } +.messages { + color: #00529b; + background-color:#bde5f8; + border-left:4px solid #00529b; +} + + +.infos li, .errors li, .warnings li, .messages li { list-style-type:none; } .infos .submit {margin-left:30px;} .checkActions {text-align:left;padding:0;margin:0;} diff --git a/include/common.inc.php b/include/common.inc.php index a01fced8a..81b7352d2 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -65,6 +65,7 @@ $page = array( 'infos' => array(), 'errors' => array(), 'warnings' => array(), + 'messages' => array(), ); $user = array(); $lang = array(); diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 5af5c1862..300a37d31 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -637,7 +637,7 @@ function flush_page_messages() global $template, $page; if ($template->get_template_vars('page_refresh') === null) { - foreach (array('errors','infos','warnings') as $mode) + foreach (array('errors','infos','warnings', 'messages') as $mode) { if (isset($_SESSION['page_'.$mode])) {