@foreach (var mediaId in mediaIds.Split(','))
{
- var media = Current.PublishedContentQuery.Media(mediaId);
+ var media = PublishedContentQuery.Media(mediaId);
@* a single image *@
if (media.IsDocumentType("Image"))
{
- @Render(media)
+
}
-
-@helper Render(IPublishedContent item)
-{
-
+
+ )
+
+
}
@* a folder with images under it *@
- foreach (var image in media.Children(Current.VariationContextAccessor))
+ foreach (var image in media.Children(VariationContextAccessor))
{
- @Render(image)
+
+
+ )
+
+
}
}
-
- , width:200, height:200)))
-
-
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
similarity index 77%
rename from src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
rename to src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
index 070f67ff23..2b2e04064b 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
@@ -1,7 +1,7 @@
@using Umbraco.Core
-@using Umbraco.Web
-@inherits Umbraco.Web.Macros.PartialViewMacroPage
-
+@using Umbraco.Web.Routing
+@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inject IPublishedUrlProvider PublishedUrlProvider
@*
This snippet makes a list of links to the of parents of the current page using an unordered HTML list.
@@ -18,7 +18,7 @@
@* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@
@foreach (var item in selection.OrderBy(x => x.Level))
{
- -
@foreach (var item in selection)
{
-
- @item.Name +
- @item.Name }
-
@foreach (var item in selection)
{
-
- @item.Name +
- @item.Name }
-
@foreach (var item in selection)
{
-
- @item.Name +
- @item.Name }
-
@foreach (var item in selection)
{
-
- @item.Name +
- @item.Name }
-
+ @foreach (var item in selection)
+ {
+
- @item.Name + } +
-
+ @* Loop through the selection *@
+ @foreach (var item in selection)
+ {
+
- + @item.Name + + @* if this child page has any children, where the property umbracoNaviHide is not True *@ + @{ + var children = item.Children.Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); + if (children.Length > 0) + { + @* Call a local method to display the children *@ + ChildPages(children); + } + } + + } +
-
+ @foreach (var item in selection)
+ {
+
- + @item.Name + + @* if the page has any children, where the property umbracoNaviHide is not True *@ + @{ + var children = item.Children.Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); + if (children.Length > 0) + { + @* Recurse and call the ChildPages method to display the children *@ + ChildPages(children); + } + } + + } +
+ @* Render the sitemap by passing the root node to the traverse method, below *@
+ @{ Traverse(selection); }
+
+
+@* Helper method to traverse through all descendants *@
+@{
+ void Traverse(IPublishedContent node)
+ {
+ //Update the level to reflect how deep you want the sitemap to go
+ const int maxLevelForSitemap = 4;
+
+ @* Select visible children *@
+ var selection = node.Children.Where(x => x.IsVisible(PublishedValueFallback) && x.Level <= maxLevelForSitemap).ToArray();
+
+ @* If any items are returned, render a list *@
+ if (selection.Length > 0)
+ {
+ -
+ @foreach (var item in selection)
+ {
+
- + @item.Name + + @* Run the traverse method again for any child pages *@ + @{ Traverse(item); } + + } +
-
- @foreach (var item in selection)
- {
-
- @item.Name - } -
-
- @* Loop through the selection *@
- @foreach (var item in selection)
- {
-
- - @item.Name - - @* if this child page has any children, where the property umbracoNaviHide is not True *@ - @{ - var children = item.Children.Where(x => x.IsVisible()).ToArray(); - if (children.Length > 0) - { - @* Call our helper to display the children *@ - @ChildPages(children) - } - } - - } -
-
- @foreach (var item in selection)
- {
-
- - @item.Name - - @* if the page has any children, where the property umbracoNaviHide is not True *@ - @{ - var children = item.Children.Where(x => x.IsVisible()).ToArray(); - if (children.Length > 0) - { - @* Recurse and call our helper to display the children *@ - @ChildPages(children) - } - } - - } -
- @* Render the sitemap by passing the root node to the traverse helper, below *@
- @Traverse(selection)
-
-
-@* Helper method to traverse through all descendants *@
-@helper Traverse(IPublishedContent node)
-{
- @* Update the level to reflect how deep you want the sitemap to go *@
- const int maxLevelForSitemap = 4;
-
- @* Select visible children *@
- var selection = node.Children.Where(x => x.IsVisible() && x.Level <= maxLevelForSitemap).ToArray();
-
- @* If any items are returned, render a list *@
- if (selection.Length > 0)
- {
- -
- @foreach (var item in selection)
- {
-
- - @item.Name - - @* Run the traverse helper again for any child pages *@ - @Traverse(item) - - } -