Merge pull request #25 from AaronSadlerUK/feature/15-allow-labels-to-…

…show-child-nodes-of-a 15 Allow labels to show child nodes of a page
AaronSadlerUK · Sep 7, 2021 · 53940a1 · 53940a1
2 parents cbf9fe0 + e5774e6
commit 53940a1
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 55 deletions.
diff --git a/TestSite.V9/App_Plugins/UmbNav/js/umbnav.controller.js b/TestSite.V9/App_Plugins/UmbNav/js/umbnav.controller.js
@@ -117,6 +117,7 @@
  allowImageIcon: dialogOptions.config.allowImageIcon,
  hideIncludeChildren: dialogOptions.config.hideIncludeChildren,
  allowLabels: dialogOptions.config.allowLabels,
+ allowDisplayAsLabel: dialogOptions.config.allowDisplayAsLabel,
  currentTarget: item,
  submit: function (model) {
 
@@ -127,8 +128,9 @@
  model.target.target = null;
  model.target.noopener = false;
  model.target.noreferrer = false;
- model.target.includeChildren = false;
+ model.target.includeChildNodes = false;
  model.target.udi = null;
+ model.target.id = null;
  } else {
  model.target.description = model.target.url + model.target.anchor;
  if (model.target.anchor && model.target.anchor[0] !== '?' && model.target.anchor[0] !== '#') {
@@ -200,7 +202,8 @@
  naviHide: data.naviHide,
  culture: data.culture,
  includeChildNodes: data.includeChildNodes,
- itemType: data.itemType
+ itemType: data.itemType,
+ displayAsLabel: data.displayAsLabel
  }
  }
 }

diff --git a/TestSite.V9/App_Plugins/UmbNav/js/umbnav.settings.controller.js b/TestSite.V9/App_Plugins/UmbNav/js/umbnav.settings.controller.js
@@ -9,6 +9,7 @@
  vm.toggleDisplayLoggedIn = toggleDisplayLoggedIn;
  vm.toggleDisplayLoggedOut = toggleDisplayLoggedOut;
  vm.toggleChildren = toggleChildren;
+ vm.toggleDisplayAsLabel = toggleDisplayAsLabel;
  vm.openMediaPicker = openMediaPicker;
  vm.showAdvanced = false;
  vm.labels = {};
@@ -52,6 +53,9 @@
  localizationService.localizeMany(['umbnav_linkTypeDescription']).then(function (data) {
  vm.labels.linkTypeDescription = data[0];
  });
+ localizationService.localizeMany(['umbnav_displayAsLabel']).then(function (data) {
+ vm.labels.displayAsLabel = data[0];
+ });
  if (!$scope.model.title) {
  localizationService.localize('defaultdialogs_selectLink').then(function (value) {
  $scope.model.title = value;
@@ -70,6 +74,7 @@
  };
  $scope.showTarget = $scope.model.hideTarget !== true;
  $scope.showDisplay = $scope.model.allowDisplay === true;
+ $scope.showDisplayAsLabel = $scope.model.allowDisplayAsLabel === true;
  $scope.showNoopener = $scope.model.hideNoopener !== true;
  $scope.showNoreferrer = $scope.model.hideNoreferrer !== true;
  $scope.showAnchor = $scope.model.hideAnchor !== true;
@@ -147,6 +152,7 @@
  vm.hideLoggedIn = $scope.model.target.hideLoggedIn;
  vm.hideLoggedOut = $scope.model.target.hideLoggedOut;
  vm.includeChildren = $scope.model.target.includeChildNodes;
+ vm.displayAsLabel = $scope.model.target.displayAsLabel;
  vm.showNoopener = $scope.model.target.noopener === 'noopener' && $scope.model.target.id === null || $scope.model.target.udi === null;
  vm.showNoreferrer = $scope.model.target.noreferrer === 'noreferrer' && $scope.model.target.id === null || $scope.model.target.udi === null;
  } else if (dialogOptions.anchors) {
@@ -278,6 +284,9 @@
  function toggleChildren(model, value) {
  $scope.model.target.includeChildren = model ? true : false;
  }
+ function toggleDisplayAsLabel(model, value) {
+ $scope.model.target.displayAsLabel = model ? true : false;
+ }
  function close() {
  if ($scope.model && $scope.model.close) {
  $scope.model.close();

diff --git a/TestSite.V9/App_Plugins/UmbNav/lang/en-us.xml b/TestSite.V9/App_Plugins/UmbNav/lang/en-us.xml
@@ -27,5 +27,6 @@
  <key alias="title">Title</key>
  <key alias="itemType">Menu Item Type</key>
  <key alias="linkTypeDescription">Select menu item type</key>
+ <key alias="displayAsLabel">Display as label</key>
  </area>
 </language>
diff --git a/TestSite.V9/App_Plugins/UmbNav/views/settings.html b/TestSite.V9/App_Plugins/UmbNav/views/settings.html
@@ -149,6 +149,13 @@ <h5>
  </umb-checkbox>
  </umb-control-group>
 
+ <umb-control-group ng-if="showDisplayAsLabel" label="@umbnav_displayAsLabel">
+ <umb-checkbox model="vm.displayAsLabel"
+ on-change="vm.toggleDisplayAsLabel(model, value)"
+ text="{{vm.labels.displayAsLabel}}">
+ </umb-checkbox>
+ </umb-control-group>
+
  <umb-control-group ng-if="showIncludeChildren && model.target.itemType == 'link'" label="@umbnav_includeChildren">
  <umb-checkbox model="vm.includeChildren"
  on-change="vm.toggleChildren(model, value)"

diff --git a/TestSite/App_Plugins/UmbNav/js/umbnav.controller.js b/TestSite/App_Plugins/UmbNav/js/umbnav.controller.js
@@ -117,6 +117,7 @@
  allowImageIcon: dialogOptions.config.allowImageIcon,
  hideIncludeChildren: dialogOptions.config.hideIncludeChildren,
  allowLabels: dialogOptions.config.allowLabels,
+ allowDisplayAsLabel: dialogOptions.config.allowDisplayAsLabel,
  currentTarget: item,
  submit: function (model) {
 
@@ -127,8 +128,9 @@
  model.target.target = null;
  model.target.noopener = false;
  model.target.noreferrer = false;
- model.target.includeChildren = false;
+ model.target.includeChildNodes = false;
  model.target.udi = null;
+ model.target.id = null;
  } else {
  model.target.description = model.target.url + model.target.anchor;
  if (model.target.anchor && model.target.anchor[0] !== '?' && model.target.anchor[0] !== '#') {
@@ -200,7 +202,8 @@
  naviHide: data.naviHide,
  culture: data.culture,
  includeChildNodes: data.includeChildNodes,
- itemType: data.itemType
+ itemType: data.itemType,
+ displayAsLabel: data.displayAsLabel
  }
  }
 }

diff --git a/TestSite/App_Plugins/UmbNav/js/umbnav.settings.controller.js b/TestSite/App_Plugins/UmbNav/js/umbnav.settings.controller.js
@@ -9,6 +9,7 @@
  vm.toggleDisplayLoggedIn = toggleDisplayLoggedIn;
  vm.toggleDisplayLoggedOut = toggleDisplayLoggedOut;
  vm.toggleChildren = toggleChildren;
+ vm.toggleDisplayAsLabel = toggleDisplayAsLabel;
  vm.openMediaPicker = openMediaPicker;
  vm.showAdvanced = false;
  vm.labels = {};
@@ -52,6 +53,9 @@
  localizationService.localizeMany(['umbnav_linkTypeDescription']).then(function (data) {
  vm.labels.linkTypeDescription = data[0];
  });
+ localizationService.localizeMany(['umbnav_displayAsLabel']).then(function (data) {
+ vm.labels.displayAsLabel = data[0];
+ });
  if (!$scope.model.title) {
  localizationService.localize('defaultdialogs_selectLink').then(function (value) {
  $scope.model.title = value;
@@ -70,6 +74,7 @@
  };
  $scope.showTarget = $scope.model.hideTarget !== true;
  $scope.showDisplay = $scope.model.allowDisplay === true;
+ $scope.showDisplayAsLabel = $scope.model.allowDisplayAsLabel === true;
  $scope.showNoopener = $scope.model.hideNoopener !== true;
  $scope.showNoreferrer = $scope.model.hideNoreferrer !== true;
  $scope.showAnchor = $scope.model.hideAnchor !== true;
@@ -147,6 +152,7 @@
  vm.hideLoggedIn = $scope.model.target.hideLoggedIn;
  vm.hideLoggedOut = $scope.model.target.hideLoggedOut;
  vm.includeChildren = $scope.model.target.includeChildNodes;
+ vm.displayAsLabel = $scope.model.target.displayAsLabel;
  vm.showNoopener = $scope.model.target.noopener === 'noopener' && $scope.model.target.id === null || $scope.model.target.udi === null;
  vm.showNoreferrer = $scope.model.target.noreferrer === 'noreferrer' && $scope.model.target.id === null || $scope.model.target.udi === null;
  } else if (dialogOptions.anchors) {
@@ -278,6 +284,9 @@
  function toggleChildren(model, value) {
  $scope.model.target.includeChildren = model ? true : false;
  }
+ function toggleDisplayAsLabel(model, value) {
+ $scope.model.target.displayAsLabel = model ? true : false;
+ }
  function close() {
  if ($scope.model && $scope.model.close) {
  $scope.model.close();

diff --git a/TestSite/App_Plugins/UmbNav/lang/en-us.xml b/TestSite/App_Plugins/UmbNav/lang/en-us.xml
@@ -27,5 +27,6 @@
  <key alias="title">Title</key>
  <key alias="itemType">Menu Item Type</key>
  <key alias="linkTypeDescription">Select menu item type</key>
+ <key alias="displayAsLabel">Display as label</key>
  </area>
 </language>
diff --git a/TestSite/App_Plugins/UmbNav/views/settings.html b/TestSite/App_Plugins/UmbNav/views/settings.html
@@ -149,6 +149,13 @@ <h5>
  </umb-checkbox>
  </umb-control-group>
 
+ <umb-control-group ng-if="showDisplayAsLabel" label="@umbnav_displayAsLabel">
+ <umb-checkbox model="vm.displayAsLabel"
+ on-change="vm.toggleDisplayAsLabel(model, value)"
+ text="{{vm.labels.displayAsLabel}}">
+ </umb-checkbox>
+ </umb-control-group>
+
  <umb-control-group ng-if="showIncludeChildren && model.target.itemType == 'link'" label="@umbnav_includeChildren">
  <umb-checkbox model="vm.includeChildren"
  on-change="vm.toggleChildren(model, value)"

diff --git a/TestSite/Views/Partials/Navigation/TopNavigation.cshtml b/TestSite/Views/Partials/Navigation/TopNavigation.cshtml
@@ -13,17 +13,18 @@
  if (item.Children != null && item.Children.Any())
  {
  <li>
- <a class="@item.CustomClasses" href="@item.Url()" target="@item.Target" rel="@item.Noopener @item.Noreferrer">
- @if (item.Image != null)
- {
- <img src="@item.Image.Url()" alt="@item.Title" width="30" height="30" />
- }
- @item.Title 
- @if (item.IsActive)
- {
- <text>Active</text>
- }
- </a>
+ @item.GetItemHtml()
+ @*<a class="@item.CustomClasses" href="@item.Url()" target="@item.Target" rel="@item.Noopener @item.Noreferrer">
+ @if (item.Image != null)
+ {
+ <img src="@item.Image.Url()" alt="@item.Title" width="30" height="30" />
+ }
+ @item.Title
+ @if (item.IsActive)
+ {
+ <text>Active</text>
+ }
+ </a>*@
  <ul>
  @foreach (var child in item.Children)
  {
@@ -48,16 +49,16 @@
  {
  <li>
  @*<a class="@item.CustomClasses" href="@item.Url()" target="@item.Target" rel="@item.Noopener @item.Noreferrer">
- @if (item.Image != null)
- {
- <img src="@item.Image.Url()" alt="@item.Title" width="30" height="30" />
- }
- @item.Title
- @if (item.IsActive)
- {
- <text>Active</text>
- }
- </a>*@
+  @if (item.Image != null)
+  {
+  <img src="@item.Image.Url()" alt="@item.Title" width="30" height="30" />
+  }
+  @item.Title
+  @if (item.IsActive)
+  {
+  <text>Active</text>
+  }
+  </a>*@
  @item.GetItemHtml()
  </li>
  }

diff --git a/src/UmbNav.Core/Models/UmbNavItem.cs b/src/UmbNav.Core/Models/UmbNavItem.cs
@@ -85,5 +85,8 @@ public class UmbNavItem
 
  [JsonIgnore]
  public bool IsActive { get; set; }
+
+ [JsonProperty("displayAsLabel")]
+ public bool DisplayAsLabel { get; set; }
  }
 }
diff --git a/src/UmbNav.Core/PropertyEditors/UmbNavV8Configuration.cs b/src/UmbNav.Core/PropertyEditors/UmbNavV8Configuration.cs
@@ -30,6 +30,9 @@ public class UmbNavV8Configuration
  [ConfigurationField("allowDisplay", "Allow Member Visibility", "boolean", Description = "Allow the ability to hide menu items based on member authentication status")]
  public bool AllowDisplay { get; set; } = false;
 
+ [ConfigurationField("allowDisplayAsLabel", "Allow a Link To Display as a Label", "boolean", Description = "Allow the ability to display a link item as a label")]
+ public bool AllowDisplayAsLabel { get; set; } = false;
+
  [ConfigurationField("allowCustomClasses", "Allow Custom Classes", "boolean", Description = "Allow the ability to set custom classes on an item")]
  public bool AllowCustomClasses { get; set; } = false;
 

diff --git a/src/UmbNav.Core/Services/UmbNavMenuBuilderService.cs b/src/UmbNav.Core/Services/UmbNavMenuBuilderService.cs
@@ -62,7 +62,7 @@ public IEnumerable<UmbNavItem> BuildMenu(IEnumerable<UmbNavItem> items, int leve
  continue;
  }
 
- if (item.MenuItemType is "nolink")
+ if (item.MenuItemType is "nolink" || item.DisplayAsLabel)
  {
  item.ItemType = UmbNavItemType.Label;
  item.Anchor = null;
@@ -72,7 +72,11 @@ public IEnumerable<UmbNavItem> BuildMenu(IEnumerable<UmbNavItem> items, int leve
  item.Noreferrer = null;
  item.IncludeChildNodes = false;
  item.Udi = null;
- continue;
+
+ //if (!item.DisplayAsLabel)
+ //{ 
+ // continue;
+ //}
  }
 
  var children = new List<UmbNavItem>();
@@ -85,46 +89,52 @@ public IEnumerable<UmbNavItem> BuildMenu(IEnumerable<UmbNavItem> items, int leve
  {
  IPublishedContent umbracoContent = null;
  string currentCulture = null;
-#if NETCOREAPP
- if (_publishedSnapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+ if (item.MenuItemType != "nolink")
  {
+#if NETCOREAPP
+ if (_publishedSnapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+ {
+ if (item.Udi != null)
+ {
+ currentCulture = publishedSnapshot.Content.GetById(item.Udi)?.GetCultureFromDomains();
+ umbracoContent = publishedSnapshot.Content.GetById(item.Udi);
+ }
+ else if (item.Key != Guid.Empty)
+ {
+ currentCulture = publishedSnapshot.Content.GetById(item.Key)?.GetCultureFromDomains();
+ umbracoContent = publishedSnapshot.Content.GetById(item.Key);
+ }
+ else
+ {
+ currentCulture = publishedSnapshot.Content.GetById(item.Id)?.GetCultureFromDomains();
+ umbracoContent = publishedSnapshot.Content.GetById(item.Id);
+ }
+ }
+#else
  if (item.Udi != null)
  {
- currentCulture = publishedSnapshot.Content.GetById(item.Udi)?.GetCultureFromDomains();
- umbracoContent = publishedSnapshot.Content.GetById(item.Udi);
+ currentCulture = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Udi)?.GetCultureFromDomains();
+ umbracoContent = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Udi);
  }
  else if (item.Key != Guid.Empty)
  {
- currentCulture = publishedSnapshot.Content.GetById(item.Key)?.GetCultureFromDomains();
- umbracoContent = publishedSnapshot.Content.GetById(item.Key);
+ currentCulture = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Key)?.GetCultureFromDomains();
+ umbracoContent = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Key);
  }
  else
  {
- currentCulture = publishedSnapshot.Content.GetById(item.Id)?.GetCultureFromDomains();
- umbracoContent = publishedSnapshot.Content.GetById(item.Id);
+ currentCulture = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Id)?.GetCultureFromDomains();
+ umbracoContent = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Id);
  }
- }
-#else
- if (item.Udi != null)
- {
- currentCulture = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Udi)?.GetCultureFromDomains();
- umbracoContent = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Udi);
- }
- else if (item.Key != Guid.Empty)
- {
- currentCulture = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Key)?.GetCultureFromDomains();
- umbracoContent = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Key);
- }
- else
- {
- currentCulture = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Id)?.GetCultureFromDomains();
- umbracoContent = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(item.Id);
- }
 #endif
+ }
 
  if (umbracoContent != null)
  {
- item.ItemType = UmbNavItemType.Content;
+ if (!item.DisplayAsLabel)
+ {
+ item.ItemType = UmbNavItemType.Content;
+ }
  item.Content = umbracoContent;
 
  if (umbracoContent.Key == currentPublishedContentKey)
@@ -205,6 +215,11 @@ public IEnumerable<UmbNavItem> BuildMenu(IEnumerable<UmbNavItem> items, int leve
  }
 
  item.Level = level;
+
+ if (item.DisplayAsLabel && item.Content == null || item.MenuItemType is "link" && item.Content == null)
+ {
+ item.ItemType = UmbNavItemType.Link;
+ }
  }
  //items = items.Where(x => x.ItemType == UmbNavItemType.Link);
  foreach (var removeItem in removeItems)