mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 03:25:23 +08:00
Corrected notifications display
--HG-- branch : dev
This commit is contained in:
@@ -298,7 +298,7 @@ span.message {
|
||||
background:#e68585; /* red */
|
||||
color:#fff;
|
||||
}
|
||||
.info.message {
|
||||
.inf.message {
|
||||
background:#e6f1c9; /* green*/
|
||||
border:1px solid #d4deb9;
|
||||
color:#062232;
|
||||
|
@@ -356,21 +356,21 @@ form.link button:hover {
|
||||
margin:10px 0 4px 0;
|
||||
padding:4px;
|
||||
}
|
||||
div.message {
|
||||
messages div.message {
|
||||
clear:both;
|
||||
}
|
||||
span.message {
|
||||
display:block;
|
||||
margin:4px 0 4px 4px;
|
||||
}
|
||||
.message a {
|
||||
.messages a {
|
||||
font-weight:bold;
|
||||
}
|
||||
.confirmation.message {
|
||||
.message-Confirmation {
|
||||
background:#D1F2A5; /* green */
|
||||
border:1px solid #BCD994;
|
||||
}
|
||||
.warning.message {
|
||||
.message-Warning {
|
||||
background:#fdf5bc; /* yellow */
|
||||
border:1px solid #ffea9b;
|
||||
}
|
||||
@@ -383,7 +383,7 @@ span.message {
|
||||
background:#e68585; /* red */
|
||||
color:#fff;
|
||||
}
|
||||
.info.message {
|
||||
.message-Information {
|
||||
background:#e6f1c9; /* green */
|
||||
border:1px solid #cfe493;
|
||||
color:#062232;
|
||||
|
@@ -28,10 +28,10 @@
|
||||
<div id="navshortcut">
|
||||
<a href="#Menu-admin">
|
||||
@T("Skip to navigation")</a></div>
|
||||
<div id="messages">
|
||||
@Display(Model.Messages)
|
||||
</div>
|
||||
<div id="main" role="main">
|
||||
<div id="messages">
|
||||
@Display(Model.Messages)
|
||||
</div>
|
||||
@Display(Model.Content)</div>
|
||||
<div id="menu">
|
||||
@Display(Model.Navigation)</div>
|
||||
|
@@ -20,7 +20,7 @@ namespace Orchard.UI.Admin.Notification {
|
||||
return;
|
||||
|
||||
// if it's not a view result, a redirect for example
|
||||
if (filterContext.Result is ViewResultBase)
|
||||
if (!(filterContext.Result is ViewResultBase))
|
||||
return;
|
||||
|
||||
var messageEntries = _notificationManager.GetNotifications().ToList();
|
||||
|
@@ -85,7 +85,7 @@ namespace Orchard.UI.Notify {
|
||||
var shape = _shapeHelperFactory.CreateHelper();
|
||||
var messagesZone = _workContextAccessor.GetContext(filterContext).Page.Zones["Messages"];
|
||||
foreach(var messageEntry in messageEntries)
|
||||
messagesZone.Add(shape.Message(messageEntry));
|
||||
messagesZone = messagesZone.Add(shape.Message(messageEntry));
|
||||
|
||||
//todo: (heskew) probably need to keep duplicate messages from being pushed into the zone like the previous behavior
|
||||
//baseViewModel.Messages = baseViewModel.Messages == null ? messageEntries .Messages.Union(messageEntries).ToList();
|
||||
|
Reference in New Issue
Block a user