diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index e41fc4eb..ff70d39f 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -4365,6 +4365,7 @@ + web.config diff --git a/OurUmbraco.Site/Views/ContentLanding.cshtml b/OurUmbraco.Site/Views/ContentLanding.cshtml index 7bfffa9f..4d565639 100644 --- a/OurUmbraco.Site/Views/ContentLanding.cshtml +++ b/OurUmbraco.Site/Views/ContentLanding.cshtml @@ -6,7 +6,7 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "0" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })

Contribute to the Umbraco Project

diff --git a/OurUmbraco.Site/Views/DisplayTopic.cshtml b/OurUmbraco.Site/Views/DisplayTopic.cshtml index 41c697bd..2fa94169 100644 --- a/OurUmbraco.Site/Views/DisplayTopic.cshtml +++ b/OurUmbraco.Site/Views/DisplayTopic.cshtml @@ -8,7 +8,7 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) @Umbraco.RenderMacro("ForumTopicActions") diff --git a/OurUmbraco.Site/Views/EditProject.cshtml b/OurUmbraco.Site/Views/EditProject.cshtml index 5068c863..91730b5b 100644 --- a/OurUmbraco.Site/Views/EditProject.cshtml +++ b/OurUmbraco.Site/Views/EditProject.cshtml @@ -13,7 +13,8 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) + @if (Request.QueryString["editorStep"] == "files") { @Html.Action("RenderFiles", "Project") diff --git a/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml index ca947ed0..3b73f808 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml @@ -63,11 +63,8 @@ }
- - @Umbraco.RenderMacro("Breadcrumb", new { linktocurrent = "1" }) - + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) @Html.Partial("~/Views/Partials/Forum/ForumActions.cshtml") -
diff --git a/OurUmbraco.Site/Views/Partials/Global/Breadcrumb.cshtml b/OurUmbraco.Site/Views/Partials/Global/Breadcrumb.cshtml new file mode 100644 index 00000000..1127cd14 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Global/Breadcrumb.cshtml @@ -0,0 +1,10 @@ +@model List + \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Profilepage.cshtml b/OurUmbraco.Site/Views/Profilepage.cshtml index 09dd69d8..124369bf 100644 --- a/OurUmbraco.Site/Views/Profilepage.cshtml +++ b/OurUmbraco.Site/Views/Profilepage.cshtml @@ -19,11 +19,8 @@
- - @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) - + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) @Html.Raw(Model.Content.GetPropertyValue("bodyText")) -
diff --git a/OurUmbraco.Site/Views/Project.cshtml b/OurUmbraco.Site/Views/Project.cshtml index 970e8c97..5b4dc7bf 100644 --- a/OurUmbraco.Site/Views/Project.cshtml +++ b/OurUmbraco.Site/Views/Project.cshtml @@ -6,7 +6,7 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "0" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })
@Umbraco.RenderMacro("ProjectsProjectDetail") diff --git a/OurUmbraco.Site/Views/ProjectPage.cshtml b/OurUmbraco.Site/Views/ProjectPage.cshtml index 1fdfed61..f598d1a1 100644 --- a/OurUmbraco.Site/Views/ProjectPage.cshtml +++ b/OurUmbraco.Site/Views/ProjectPage.cshtml @@ -13,7 +13,7 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) @Html.Raw(Model.Content.GetPropertyValue("bodyText"))
diff --git a/OurUmbraco.Site/Views/Projects.cshtml b/OurUmbraco.Site/Views/Projects.cshtml index 68e32fda..d7546fe7 100644 --- a/OurUmbraco.Site/Views/Projects.cshtml +++ b/OurUmbraco.Site/Views/Projects.cshtml @@ -39,7 +39,7 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true })
@Umbraco.RenderMacro("ProjectsListProjects") diff --git a/OurUmbraco.Site/Views/PublicMemberProfile.cshtml b/OurUmbraco.Site/Views/PublicMemberProfile.cshtml index 60f1400e..9cc88b85 100644 --- a/OurUmbraco.Site/Views/PublicMemberProfile.cshtml +++ b/OurUmbraco.Site/Views/PublicMemberProfile.cshtml @@ -21,7 +21,7 @@
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) @Umbraco.RenderMacro("MembersPublicProfile")
diff --git a/OurUmbraco.Site/Views/Release.cshtml b/OurUmbraco.Site/Views/Release.cshtml index 81017f36..c67fa4d2 100644 --- a/OurUmbraco.Site/Views/Release.cshtml +++ b/OurUmbraco.Site/Views/Release.cshtml @@ -90,9 +90,9 @@
-
- @Umbraco.RenderMacro("Breadcrumb", new { linkToCurrent = "1" }) -
+
+ @Html.Action("Render", "Breadcrumb", new { linkToCurrent = true }) +
- @Umbraco.RenderMacro("Breadcrumb") + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })

@title

diff --git a/OurUmbraco.Site/Views/Textpage.cshtml b/OurUmbraco.Site/Views/Textpage.cshtml index 1d0e3592..c88dcc35 100644 --- a/OurUmbraco.Site/Views/Textpage.cshtml +++ b/OurUmbraco.Site/Views/Textpage.cshtml @@ -5,7 +5,7 @@
- @Umbraco.RenderMacro("Breadcrumb") + @Html.Action("Render", "Breadcrumb", new { linkToCurrent = false })

@Model.Content.Name

@Html.Raw(Model.Content.GetPropertyValue("bodyText")) diff --git a/OurUmbraco/Our/Controllers/BreadcrumbController.cs b/OurUmbraco/Our/Controllers/BreadcrumbController.cs new file mode 100644 index 00000000..ff9cbe7e --- /dev/null +++ b/OurUmbraco/Our/Controllers/BreadcrumbController.cs @@ -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("umbracoNaviHide") == false) + .OrderByDescending(a => a.Level) + .ToList(); + + if(linkToCurrent) + model.Add(CurrentPage); + + return PartialView("~/Views/Partials/Global/Breadcrumb.cshtml", model); + } + } +} \ No newline at end of file diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj index 292750da..4f6ab5a6 100644 --- a/OurUmbraco/OurUmbraco.csproj +++ b/OurUmbraco/OurUmbraco.csproj @@ -510,6 +510,7 @@ +