lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-02-12 23:48:20 -08:00
parent e3ccec7157
commit 56f59dc9e9
6 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Core/Themes/Views/Menu.ascx
View File

@@ -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>

3
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -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" />

8
src/Orchard.Web/Themes/Classic/Views/Menu.ascx
View File

@@ -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>

4
src/Orchard.Web/Themes/Green/Styles/site.css
View File

@@ -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;
}

7
src/Orchard.Web/Themes/Green/Views/Menu.ascx
View File

@@ -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>

9
src/Orchard.Web/Themes/Orchard/Views/Menu.ascx
View File

@@ -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>