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

#19850: Only link to the first child if it also has the same "effective" url as its parent.

Browse Source 
Work Item: 19850
This commit is contained in:
Sipke Schoorstra
2013-08-07 01:29:22 -07:00
parent 9338c96e3b
commit 4d5e51ccf5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml
View File

@@ -20,6 +20,7 @@
string sectionHeaderText = firstLevelMenuItem.Text.Text; string sectionHeaderText = firstLevelMenuItem.Text.Text;
string sectionHeaderTextHint = firstLevelMenuItem.Text.TextHint; string sectionHeaderTextHint = firstLevelMenuItem.Text.TextHint;
var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault(); var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault();
var firstLevelMenuItemUrl = firstLevelMenuItem.Href;
var itemClassName = HasText(sectionHeaderTextHint) var itemClassName = HasText(sectionHeaderTextHint)
? "navicon-" + sectionHeaderTextHint.HtmlClassify() ? "navicon-" + sectionHeaderTextHint.HtmlClassify()
@@ -34,6 +35,7 @@
&& ( && (
firstOfTheSecond.RouteValues != null firstOfTheSecond.RouteValues != null
|| HasText(firstOfTheSecond.Url))) { || HasText(firstOfTheSecond.Url))) {
firstLevelMenuItemUrl = firstOfTheSecond.Href;
sectionHeaderMarkup = HasText(itemId) sectionHeaderMarkup = HasText(itemId)
? Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href, new { @class = itemClassName, id = itemId }) ? Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href, new { @class = itemClassName, id = itemId })
: Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href, new { @class = itemClassName }); : Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href, new { @class = itemClassName });
@@ -75,7 +77,7 @@
<ul class="menuItems"> <ul class="menuItems">
@{ var first = true;} @{ var first = true;}
@foreach (var secondLevelMenuItem in secondLevelMenuItems.Where(menuItem => !menuItem.LocalNav)) { @foreach (var secondLevelMenuItem in secondLevelMenuItems.Where(menuItem => !menuItem.LocalNav)) {
if (first && firstLevelMenuItem.LinkToFirstChild) { if (first && firstLevelMenuItem.LinkToFirstChild && String.Equals(firstLevelMenuItemUrl, secondLevelMenuItem.Href)) {
first = false; first = false;
continue; continue;
} }