Migrating Notifications

--HG--
branch : dev

src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml

@@ -8,4 +8,4 @@
         <label for="MenuText">@T("Menu text")</label>
         @Html.TextBoxFor(m => m.MenuText, new { @class = "large text" })
     </div>
-</fieldset>
+</fieldset>

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -336,6 +336,7 @@
     <Content Include="Shapes\Views\DisplayTemplates\Items\ContentItem.ascx" />
     <Content Include="Shapes\Views\EditorTemplates\Items\ContentItem.ascx" />
     <Content Include="Shapes\Views\HeadPreload.ascx" />
+    <None Include="Shapes\Views\Message.cshtml" />
     <None Include="Shapes\Views\NotFound.cshtml" />
     <Content Include="Shapes\Views\UI\Switchable.ascx" />
     <Content Include="Web.config" />
@@ -406,7 +407,6 @@
     <None Include="Shapes\Views\Layout.cshtml" />
     <None Include="Shapes\Views\Menu.cshtml" />
     <None Include="Shapes\Views\MenuItem.cshtml" />
-    <None Include="Shapes\Views\Messages.ascx_" />
     <Content Include="Shapes\Views\Web.config" />
     <None Include="Shapes\Views\Zone.cshtml" />
   </ItemGroup>

src/Orchard.Web/Core/Shapes/Views/Layout.cshtml

@@ -10,6 +10,9 @@
 @Display(Model.Header)
     </header>
     <div id="main">
+        <div id="messages">
+            @Display(Model.Messages)
+        </div>
         <div id="content-wrapper">
             <div id="content">
 @Display(Model.Content)

src/Orchard.Web/Core/Shapes/Views/Message.cshtml

@@ -0,0 +1 @@
+<div class="message message-@Model.Type">@Model.Message</div>

src/Orchard.Web/Core/Shapes/Views/Messages.ascx_

@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<NotifyEntry>>" %>
-<%@ Import Namespace="Orchard.UI.Notify"%>
-<% foreach (var item in Model) {
-     var className = item.Type == NotifyType.Error
-                         ? "critical"
-                         : item.Type == NotifyType.Warning
-                               ? "warning"
-                               : "info"; %>
-<div class="<%=className %> message"><%: item.Message %></div>
-<% } %>

src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx

@@ -29,6 +29,9 @@
     <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">
         <%: Display(Model.Content) %></div>
     <div id="menu">