From 56f59dc9e965ea88a0d5e8d21d135f7955c31f46 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Fri, 12 Feb 2010 23:48:20 -0800
Subject: [PATCH] Getting rid of the themed Menu templates so the fall back to
 the default Menu template (which now covers first, last and current item
 class names - the various current reasons for overriding)

--HG--
branch : dev
---
 src/Orchard.Web/Core/Themes/Views/Menu.ascx    | 15 +++++++++++----
 src/Orchard.Web/Orchard.Web.csproj             |  3 ---
 src/Orchard.Web/Themes/Classic/Views/Menu.ascx |  8 --------
 src/Orchard.Web/Themes/Green/Styles/site.css   |  4 ++--
 src/Orchard.Web/Themes/Green/Views/Menu.ascx   |  7 -------
 src/Orchard.Web/Themes/Orchard/Views/Menu.ascx |  9 ---------
 6 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 src/Orchard.Web/Themes/Classic/Views/Menu.ascx
 delete mode 100644 src/Orchard.Web/Themes/Green/Views/Menu.ascx
 delete mode 100644 src/Orchard.Web/Themes/Orchard/Views/Menu.ascx

diff --git a/src/Orchard.Web/Core/Themes/Views/Menu.ascx b/src/Orchard.Web/Core/Themes/Views/Menu.ascx
index 3148753ae..d5e6cc7e4 100644
--- a/src/Orchard.Web/Core/Themes/Views/Menu.ascx
+++ b/src/Orchard.Web/Core/Themes/Views/Menu.ascx
@@ -12,10 +12,17 @@
             if (counter == 0)
                 sbClass.Append("first ");
             if (counter == count)
-                sbClass.Append("last ");%>
-        <li class="<%=sbClass.ToString().TrimEnd() %>"><%=!string.IsNullOrEmpty(menuItem.Url)
-                ? Html.Link(menuItem.Text, ResolveUrl(menuItem.Url))
-                : Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues).ToHtmlString() %></li><%
+                sbClass.Append("last ");
+
+            var url = !string.IsNullOrEmpty(menuItem.Url)
+                          ? menuItem.Url
+                          : Url.RouteUrl(menuItem.RouteValues);
+
+            if (string.Equals(url, Request.Url.AbsolutePath, StringComparison.InvariantCultureIgnoreCase))
+                sbClass.Append("current ");
+            
+            %>
+        <li class="<%=sbClass.ToString().TrimEnd() %>"><%=Html.Link(menuItem.Text, url) %></li><%
             ++counter;
         } %>
     </ul>
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index c46f8ce2b..6fd6b2056 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -182,7 +182,6 @@
     <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
     <Content Include="Themes\Classic\Views\Footer.ascx" />
     <Content Include="Themes\Classic\Views\Layout.ascx" />
-    <Content Include="Themes\Classic\Views\Menu.ascx" />
     <Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
     <Content Include="Themes\Green\Content\Images\bodyBackground.png" />
     <Content Include="Themes\Green\Content\Images\commentpointer.gif" />
@@ -205,7 +204,6 @@
     <Content Include="Themes\Green\Views\Footer.ascx" />
     <Content Include="Themes\Green\Views\Layout.ascx" />
     <Content Include="Themes\Green\Views\ListOfComments.ascx" />
-    <Content Include="Themes\Green\Views\Menu.ascx" />
     <Content Include="Themes\Green\Views\User.ascx" />
     <Content Include="Themes\Orange\Theme.png" />
     <Content Include="Themes\Orange\Views\Orchard.Blogs\BlogPost\Item.ascx" />
@@ -220,7 +218,6 @@
     <Content Include="Themes\Orchard\Theme.txt" />
     <Content Include="Themes\Orchard\Views\Footer.ascx" />
     <Content Include="Themes\Orchard\Views\Layout.ascx" />
-    <Content Include="Themes\Orchard\Views\Menu.ascx" />
     <Content Include="Themes\SafeMode\Content\Images\background_content.jpg" />
     <Content Include="Themes\SafeMode\Content\Images\background_footer.jpg" />
     <Content Include="Themes\SafeMode\Content\Images\background_module.gif" />
diff --git a/src/Orchard.Web/Themes/Classic/Views/Menu.ascx b/src/Orchard.Web/Themes/Classic/Views/Menu.ascx
deleted file mode 100644
index f476ee1cf..000000000
--- a/src/Orchard.Web/Themes/Classic/Views/Menu.ascx
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<div id="menucontainer">
-    <ul id="menu">
-        <li><%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%></li>
-        <li><%= Html.ActionLink("Blogs", "List", "Blog", new {Area = "Orchard.Blogs"}, new {})%></li>
-        <li class="last"><%= Html.ActionLink("Admin", "List", new {Area = "Orchard.Blogs", Controller = "BlogAdmin"})%></li>
-    </ul>
- </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css
index 83d91cb19..dce904dec 100644
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -275,11 +275,11 @@ colgroup
 	color:#35550b;
 }
 
-#menucontainer ul li.tabon {
+#menucontainer ul li.current {
 	background:url(../Content/Images/tabRightOn.gif) no-repeat top right;
 }
 
-#menucontainer ul li.tabon a {
+#menucontainer ul li.current a {
 	background:url(../Content/Images/tabLeftOn.gif) no-repeat top left;
 	font-weight:600;
 }
diff --git a/src/Orchard.Web/Themes/Green/Views/Menu.ascx b/src/Orchard.Web/Themes/Green/Views/Menu.ascx
deleted file mode 100644
index e4103b341..000000000
--- a/src/Orchard.Web/Themes/Green/Views/Menu.ascx
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<div id="menucontainer" role="navigation" class="yui-g">
-    <ul id="menu">
-        <li class="tabon"><%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%></li>
-        <li><%= Html.ActionLink("Blogs", "List", "Blog", new {Area = "Orchard.Blogs"}, new {})%></li>
-    </ul>
- </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Orchard/Views/Menu.ascx b/src/Orchard.Web/Themes/Orchard/Views/Menu.ascx
deleted file mode 100644
index dcadd4626..000000000
--- a/src/Orchard.Web/Themes/Orchard/Views/Menu.ascx
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<div id="menucontainer">
-    <ul id="menu">
-        <li><%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%></li>
-        <li><%= Html.ActionLink("About", "About", "Home", new {Area = ""}, new {})%></li>
-        <li><%= Html.ActionLink("Blogs", "List", "Blog", new {Area = "Orchard.Blogs"}, new {})%></li>
-        <li><%= Html.ActionLink("Admin", "List", new {Area = "Orchard.Blogs", Controller = "BlogAdmin"})%></li>
-    </ul>
- </div>
\ No newline at end of file