lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Corrected notifications display

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-09-20 17:00:37 -07:00
parent 90d214db1a
commit 55adba610c
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Themes/Classic/Styles/site.css
View File

@@ -298,7 +298,7 @@ span.message {
background:#e68585; /* red */ background:#e68585; /* red */
color:#fff; color:#fff;
} }
.info.message { .inf.message {
background:#e6f1c9; /* green*/ background:#e6f1c9; /* green*/
border:1px solid #d4deb9; border:1px solid #d4deb9;
color:#062232; color:#062232;

10
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -356,21 +356,21 @@ form.link button:hover {
margin:10px 0 4px 0; margin:10px 0 4px 0;
padding:4px; padding:4px;
} }
div.message { messages div.message {
clear:both; clear:both;
} }
span.message { span.message {
display:block; display:block;
margin:4px 0 4px 4px; margin:4px 0 4px 4px;
} }
.message a { .messages a {
font-weight:bold; font-weight:bold;
} }
.confirmation.message { .message-Confirmation {
background:#D1F2A5; /* green */ background:#D1F2A5; /* green */
border:1px solid #BCD994; border:1px solid #BCD994;
} }
.warning.message { .message-Warning {
background:#fdf5bc; /* yellow */ background:#fdf5bc; /* yellow */
border:1px solid #ffea9b; border:1px solid #ffea9b;
} }
@@ -383,7 +383,7 @@ span.message {
background:#e68585; /* red */ background:#e68585; /* red */
color:#fff; color:#fff;
} }
.info.message { .message-Information {
background:#e6f1c9; /* green */ background:#e6f1c9; /* green */
border:1px solid #cfe493; border:1px solid #cfe493;
color:#062232; color:#062232;

6
src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
View File

@@ -28,10 +28,10 @@
<div id="navshortcut"> <div id="navshortcut">
<a href="#Menu-admin"> <a href="#Menu-admin">
@T("Skip to navigation")</a></div> @T("Skip to navigation")</a></div>
<div id="messages">
@Display(Model.Messages)
</div>
<div id="main" role="main"> <div id="main" role="main">
<div id="messages">
@Display(Model.Messages)
</div>
@Display(Model.Content)</div> @Display(Model.Content)</div>
<div id="menu"> <div id="menu">
@Display(Model.Navigation)</div> @Display(Model.Navigation)</div>

2
src/Orchard/UI/Admin/Notification/NotificationFilter.cs
View File

@@ -20,7 +20,7 @@ namespace Orchard.UI.Admin.Notification {
return; return;
// if it's not a view result, a redirect for example // if it's not a view result, a redirect for example
if (filterContext.Result is ViewResultBase) if (!(filterContext.Result is ViewResultBase))
return; return;
var messageEntries = _notificationManager.GetNotifications().ToList(); var messageEntries = _notificationManager.GetNotifications().ToList();

2
src/Orchard/UI/Notify/NotifyFilter.cs
View File

@@ -85,7 +85,7 @@ namespace Orchard.UI.Notify {
var shape = _shapeHelperFactory.CreateHelper(); var shape = _shapeHelperFactory.CreateHelper();
var messagesZone = _workContextAccessor.GetContext(filterContext).Page.Zones["Messages"]; var messagesZone = _workContextAccessor.GetContext(filterContext).Page.Zones["Messages"];
foreach(var messageEntry in messageEntries) 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 //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(); //baseViewModel.Messages = baseViewModel.Messages == null ? messageEntries .Messages.Union(messageEntries).ToList();