mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-10 13:11:48 +02:00
Code Issues Releases Wiki Activity

Message handler updated to bootstrap css standard

Browse Source
This commit is contained in:
Cameron 2013-02-05 12:32:51 -08:00
parent 4d60153fe2
commit 7de272bcfe
4 changed files with 38 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
e107_handlers/message_handler.php
View File

@ -468,16 +468,23 @@ class eMessage
*/ */
public static function formatMessage($mstack, $type, $message) public static function formatMessage($mstack, $type, $message)
{ {
if (empty($message)) return ''; $bstrap = array('info'=>'alert-info','error'=>'alert-error','success'=>'alert-success');
$bclass = vartrue($bstrap[$type]) ? " ".$bstrap[$type] : "";
if (empty($message))
{
return '';
}
elseif (is_array($message)) elseif (is_array($message))
{ {
$message = array_unique($message); // quick fix for duplicates. $message = array_unique($message); // quick fix for duplicates.
$message = "<div class='s-message-item'>".implode("</div>\n<div class='s-message-item'>", $message)."</div>"; $message = "<div class='s-message-item'>".implode("</div>\n<div class='s-message-item'>", $message)."</div>";
} }
return " return "
<div class='s-message {$type}'> <div class='s-message alert alert-block {$type} {$bclass}'>
<i class='s-message-icon s-message-".$type."'></i> <i class='s-message-icon s-message-".$type."'></i>
<div class='s-message-title'>".self::getTitle($type, $mstack)."</div> <h4 class='s-message-title'>".self::getTitle($type, $mstack)."</h4>
<div class='s-message-body'> <div class='s-message-body'>
{$message} {$message}
</div> </div>
@ -910,19 +917,19 @@ function show_emessage($mode, $message, $line = 0, $file = "") {
require_once(e_THEME.'index.html'); require_once(e_THEME.'index.html');
exit; exit;
} }
echo "<div style='text-align:center; font: 11px verdana, tahoma, arial, helvetica, sans-serif;'><b>CRITICAL_ERROR: </b><br />Line $line $file<br /><br />Error reported as: ".$message."</div>"; echo "<div class='alert alert-block alert-error' style='text-align:center; font: 11px verdana, tahoma, arial, helvetica, sans-serif;'><b>CRITICAL_ERROR: </b><br />Line $line $file<br /><br />Error reported as: ".$message."</div>";
break; break;
case "MESSAGE": case "MESSAGE":
if(strstr(e_SELF, "forum_post.php")) if(strstr(e_SELF, "forum_post.php")) //FIXME Shouldn't be here.
{ {
return; return;
} }
$ns->tablerender("", "<div style='text-align:center'><b>{$message}</b></div>"); $ns->tablerender("", "<div class='alert alert-block' style='text-align:center'><b>{$message}</b></div>");
break; break;
case "ADMIN_MESSAGE": case "ADMIN_MESSAGE":
$ns->tablerender("Admin Message", "<div style='text-align:center'><b>{$message}</b></div>"); $ns->tablerender("Admin Message", "<div class='alert'><b>{$message}</b></div>");
break; break;
case "ALERT": case "ALERT":

43
e107_themes/bootstrap/admin_style.css
View File

@ -179,40 +179,10 @@ img.S32:hover {}
/******** SyS Messages / Message text formatting */ /******** SyS Messages / Message text formatting */
/* message boxes */
.s-message { }
.s-message div.info, .s-message .s-message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; line-height: 32px; }
.s-message div.error,
.s-message div.success,
.s-message div.debug,
.s-message div.warning { padding: 8px 35px 8px 14px;
margin-bottom: 20px;
color: #c09853;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px; }
.s-message div.info { color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1; }
.s-message div.error { color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7; }
.s-message div.success { color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6; }
.s-message div.warning { background-color:#FFFFD5; border: 1px solid #FFCC00; }
.s-message div.debug { background-color:#FFFFFF; border: 1px solid #EAEAEA; }
.s-message .s-message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; font-size: 14px; font-weight: bold; line-height: 32px; }
i.s-message-icon { i.s-message-icon {
background: url(images/adminicons_32.png) no-repeat top left; background: url(images/adminicons_32.png) no-repeat top left;
display: inline-block; display: inline-block;
@ -227,17 +197,6 @@ i.s-message-warning { background-position: -777px -37px; width: 32px; height: 32
i.s-message-info { background-position: -1480px 0; width: 32px; height: 32px; } i.s-message-info { background-position: -1480px 0; width: 32px; height: 32px; }
i.s-message-debug { background-position: -1480px 0; width: 32px; height: 32px; } i.s-message-debug { background-position: -1480px 0; width: 32px; height: 32px; }
/*
.s-message div.info .s-message-title { background-image: url(images/messagebox_info.png); }
.s-message div.error .s-message-title { background-image: url(images/messagebox_critical.png); }
.s-message div.success .s-message-title { background-image: url(images/ok.png); }
.s-message div.warning .s-message-title { background-image: url(images/messagebox_warning.png); }
.s-message div.debug .s-message-title { background-image: url(images/messagebox_info.png); }
*/
.s-message-body { padding-left: 42px; } .s-message-body { padding-left: 42px; }
.s-message-item {} .s-message-item {}

46
e107_themes/bootstrap/style.css
View File

@ -14,34 +14,30 @@ body { padding-top: 75px; padding-bottom: 40px; }
/******** SyS Messages / Message text formatting */ /******** SyS Messages / Message text formatting */
/* message boxes */ /* message boxes */
.s-message { }
.s-message div.info,
.s-message div.error,
.s-message div.success,
.s-message div.debug,
.s-message div.warning { padding: 5px; margin-bottom: 10px; }
.s-message div.info { background-color:#C1E0FF; border: 1px solid #3399FF; }
.s-message div.error { background-color:#FFCECE; border: 1px solid #CC0000; }
.s-message div.success { background-color:#DFFFDF; border: 1px solid #009900; }
.s-message div.warning { background-color:#FFFFD5; border: 1px solid #FFCC00; }
.s-message div.debug { background-color:#FFFFFF; border: 1px solid #EAEAEA; }
.s-message .s-message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; font-size: 14px; font-weight: bold; line-height: 32px; }
.s-message div.info .s-message-title { background-image: url(images/messagebox_info.png); }
.s-message div.error .s-message-title { background-image: url(images/messagebox_critical.png); }
.s-message div.success .s-message-title { background-image: url(images/ok.png); }
.s-message div.warning .s-message-title { background-image: url(images/messagebox_warning.png); }
.s-message div.debug .s-message-title { background-image: url(images/messagebox_info.png); }
/* message text (overall) */ /* message text (overall) */
.warning { color: #FF6600 } /******** SyS Messages / Message text formatting */
.success { color: green; }
.error { color: #FF0000 } .s-message .s-message-title { height: 32px; background: 0 50% no-repeat; padding-left: 42px; line-height: 32px; }
.info {}
i.s-message-icon {
background: url(images/adminicons_32.png) no-repeat top left;
display: inline-block;
width:32px;
height:32px;
float:left;
}
i.s-message-success { background-position: -592px -37px; width: 32px; height: 32px; }
i.s-message-error { background-position: -925px 0; width: 32px; height: 32px; }
i.s-message-warning { background-position: -777px -37px; width: 32px; height: 32px; }
i.s-message-info { background-position: -1480px 0; width: 32px; height: 32px; }
i.s-message-debug { background-position: -1480px 0; width: 32px; height: 32px; }
.s-message-body { padding-left: 42px; }
.required { color:red } .required { color:red }
/* THEME SPECIFIC CSS *********************************************************************************************/ /* THEME SPECIFIC CSS *********************************************************************************************/

2
e107_web/css/e107.css
View File

@ -70,7 +70,7 @@ a.cpage-np.current { text-decoration: none; }
/******** SyS Messages / Message text formatting */ /******** SyS Messages / Message text formatting */
/* message boxes */ /* message boxes */
.s-message { } .s-message { }
/*
.s-message div.info, .s-message div.info,
.s-message div.error, .s-message div.error,
.s-message div.success, .s-message div.success,