Replace Breadcrumb XSLT macro

This commit is contained in:
Sebastiaan Janssen
2017-01-22 16:27:24 +01:00
parent 8eda3b367f
commit 0598124f67
18 changed files with 53 additions and 22 deletions
+1
View File
@@ -4365,6 +4365,7 @@
<Content Include="Views\Partials\Members\QuickMenu.cshtml" />
<Content Include="Views\Partials\Navigation\TopNavigation.cshtml" />
<Content Include="Views\Partials\Global\Alertbar.cshtml" />
<Content Include="Views\Partials\Global\Breadcrumb.cshtml" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
+1 -1
View File
@@ -6,7 +6,7 @@
<div id="contribute" class="subpage">
<div id="body" class="markdown-syntax">
<div>
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "0" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })
</div>
<h1>Contribute to the Umbraco Project</h1>
<div>
+1 -1
View File
@@ -8,7 +8,7 @@
<!-- FORUM HEADER START -->
<div class="utilities">
<!-- FORUM BREADCRUMB START -->
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
<!-- FORUM BREADCRUMB END -->
<!-- THREAD ACTIONS START -->
@Umbraco.RenderMacro("ForumTopicActions")
+2 -1
View File
@@ -13,7 +13,8 @@
<div class="main-area">
<div class="main-content">
<div class="content-wrapper">
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
@if (Request.QueryString["editorStep"] == "files")
{
@Html.Action("RenderFiles", "Project")
@@ -63,11 +63,8 @@
}
<!-- FORUM HEADER START -->
<div class="utilities">
@Umbraco.RenderMacro("Breadcrumb", new { linktocurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
@Html.Partial("~/Views/Partials/Forum/ForumActions.cshtml")
</div>
<div class="forum-settings">
@@ -0,0 +1,10 @@
@model List<IPublishedContent>
<ul id="breadcrumb">
<li>
<a href="/">Our</a>
</li>
@foreach (var page in Model)
{
<li><a href="@page.Url">@page.Name</a></li>
}
</ul>
+1 -4
View File
@@ -19,11 +19,8 @@
<div class="main-area">
<div class="main-content">
<div class="content-wrapper">
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
</div><!-- .content-wrapper -->
</div><!-- .main-content -->
</div><!-- .main-area -->
+1 -1
View File
@@ -6,7 +6,7 @@
<div>
<!-- FORUM HEADER START -->
<div class="utilities">
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "0" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })
<div class="clear"></div>
</div>
@Umbraco.RenderMacro("ProjectsProjectDetail")
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="main-area">
<div class="main-content">
<div class="content-wrapper">
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
</div><!-- .content-wrapper -->
</div><!-- .main-content -->
+1 -1
View File
@@ -39,7 +39,7 @@
<div class="main-content">
<div class="content-wrapper">
<div>
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
</div>
<div class="packages-content">
@Umbraco.RenderMacro("ProjectsListProjects")
@@ -21,7 +21,7 @@
<div class="main-area">
<div class="main-content">
<div class="content-wrapper">
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
@Umbraco.RenderMacro("MembersPublicProfile")
</div><!-- .content-wrapper -->
</div><!-- .main-content -->
+3 -3
View File
@@ -90,9 +90,9 @@
<div class="main-area">
<div class="main-content">
<div class="content-wrapper">
<div>
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
</div>
<div>
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
</div>
<style>
.release-page .explain h2 {
margin-top: 12px;
+1 -1
View File
@@ -35,7 +35,7 @@
<div class="main-content">
<div class="content-wrapper">
<div>
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
</div>
<style>
+1 -1
View File
@@ -41,7 +41,7 @@
<div class="main-content">
<div class="content-wrapper">
<div>
@Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" })
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
</div>
<!-- <div class="markdown-syntax"><div data-bind="template: { name: 'releases-template', foreach: currentReleases }"></div></div>-->
<div class="markdown-syntax">
+1 -1
View File
@@ -27,7 +27,7 @@
</style>
<div class="subpage wrapper">
<div>
@Umbraco.RenderMacro("Breadcrumb")
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })
</div>
<div class="markdown-syntax">
<h1>@title</h1>
+1 -1
View File
@@ -5,7 +5,7 @@
<div id="body" class="page markdown-syntax">
<div>
@Umbraco.RenderMacro("Breadcrumb")
@Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })
</div>
<h1>@Model.Content.Name</h1>
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
@@ -0,0 +1,24 @@
using System.Linq;
using System.Web.Mvc;
using Umbraco.Web;
using Umbraco.Web.Mvc;
namespace OurUmbraco.Our.Controllers
{
public class BreadcrumbController : SurfaceController
{
[ChildActionOnly]
public ActionResult Render(bool linkToCurrent)
{
var model = CurrentPage.Ancestors()
.Where(a => a.Level > 1 && a.GetPropertyValue<bool>("umbracoNaviHide") == false)
.OrderByDescending(a => a.Level)
.ToList();
if(linkToCurrent)
model.Add(CurrentPage);
return PartialView("~/Views/Partials/Global/Breadcrumb.cshtml", model);
}
}
}
+1
View File
@@ -510,6 +510,7 @@
<Compile Include="Our\Api\YouTrackApiController.cs" />
<Compile Include="Our\Businesslogic\ProjectContributor.cs" />
<Compile Include="Our\Controllers\AvatarController.cs" />
<Compile Include="Our\Controllers\BreadcrumbController.cs" />
<Compile Include="Our\Controllers\OurUmbracoController.cs" />
<Compile Include="Our\Models\EditScreenshotModel.cs" />
<Compile Include="Our\Models\EditFileModel.cs" />