Merge pull request #124 from cloudscribe/feature/110

JimKerslake · web-flow · commit dfb92dc01956 · 2023-02-16T17:13:45.000Z
#110 accessibility changes (wave)
diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/ChildTree.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/ChildTree.cshtml
@@ -12,11 +12,11 @@
             if (! await Model.ShouldAllowView(node)) { continue; }
             if (! await Model.HasVisibleChildren(node))
             {
-                <li class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>
+                <li role="menuitem" class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>
             }
             else
             {
-                <li class='@Model.GetClass(node.Value)'>
+                <li role="menuitem" class='@Model.GetClass(node.Value)'>
                     <a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a>
                     @Model.UpdateTempNode(node) <partial name="NavigationNodeChildTreePartial" model="@Model" />
                 </li>
diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/SideNav.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/SideNav.cshtml
@@ -14,11 +14,11 @@
                     if (! await Model.ShouldAllowView(node)) { continue; }
                     if (! await Model.HasVisibleChildren(node))
                     {
-                        <li class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>
+                        <li role="menuitem" class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>
                     }
                     else
                     {
-                        <li class='@Model.GetClass(node.Value)'>
+                        <li role="menuitem" class='@Model.GetClass(node.Value)'>
                             <a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a>
                             @Model.UpdateTempNode(node) <partial name="NavigationNodeSideNavPartial" model="@Model" />
                         </li>
diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/SiteMap.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/SiteMap.cshtml
@@ -13,11 +13,11 @@
             if (! await Model.ShouldAllowView(node)) { continue; }
             if (! await Model.HasVisibleChildren(node))
             {
-                <li class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>
+                <li role="menuitem" class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>
             }
             else
             {
-                <li class='@Model.GetClass(node.Value)'>
+                <li role="menuitem" class='@Model.GetClass(node.Value)'>
                     <a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a>
                     @Model.UpdateTempNode(node) <partial name="NavigationNodeChildTreePartial" model="@Model" />
                 </li>
diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/NavigationNodeChildDropdownPartial.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/NavigationNodeChildDropdownPartial.cshtml
@@ -18,7 +18,7 @@
             }
             if (! await Model.HasVisibleChildren(childNode))
             {
-                <li class='@Model.GetClass(childNode.Value)' cwn-data-attributes="@childNode.Value.DataAttributes"><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>
+                <li role="menuitem" class='@Model.GetClass(childNode.Value)' cwn-data-attributes="@childNode.Value.DataAttributes"><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>
             }
             else
             {
diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/NavigationNodeChildTreePartial.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/NavigationNodeChildTreePartial.cshtml
@@ -12,11 +12,11 @@
 
             if (! await Model.HasVisibleChildren(childNode))
             {
-                <li class='@Model.GetClass(childNode.Value)'><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>
+                <li role="menuitem" class='@Model.GetClass(childNode.Value)'><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>
             }
             else
             {
-                <li class='@Model.GetClass(childNode.Value)'>
+                <li role="menuitem" class='@Model.GetClass(childNode.Value)'>
                     <a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a>
                     @Model.UpdateTempNode(childNode) <partial name="NavigationNodeChildTreePartial" model="@Model" />  @* recursion *@
                 </li>
diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/NavigationNodeSideNavPartial.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/NavigationNodeSideNavPartial.cshtml
@@ -11,11 +11,11 @@
             if (! await Model.ShouldAllowView(childNode)) { continue; }
             if (! await Model.HasVisibleChildren(childNode))
             {
-                <li class='@Model.GetClass(childNode.Value)'><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>
+                <li role="menuitem" class='@Model.GetClass(childNode.Value)'><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>
             }
             else
             {
-                <li class='@Model.GetClass(childNode.Value)'>
+                <li role="menuitem" class='@Model.GetClass(childNode.Value)'>
                     <a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a>
                     @Model.UpdateTempNode(childNode) <partial name="NavigationNodeSideNavPartial" model="@Model" />  @* recursion *@
                 </li>
diff --git a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>an ASP.NET Core viewcomponent for menus and breadcrumbs</Description>
-    <Version>6.0.1</Version>
+    <Version>6.0.2</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>cloudscribe.Web.SiteMap.FromNavigation a library that implements ISiteMapNodeService using existing tree of nodes from cloudscribe.Web.Navigation.NavigationTreeBuilderService</Description>
-    <Version>6.0.1</Version>
+    <Version>6.0.2</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;mvc;sitemap</PackageTags>

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`if (! await Model.ShouldAllowView(node)) { continue; }`
`13`	`13`	`if (! await Model.HasVisibleChildren(node))`
`14`	`14`	`{`
`15`		`- <li class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>`
	`15`	`+ <li role="menuitem" class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>`
`16`	`16`	`}`
`17`	`17`	`else`
`18`	`18`	`{`
`19`		`- <li class='@Model.GetClass(node.Value)'>`
	`19`	`+ <li role="menuitem" class='@Model.GetClass(node.Value)'>`
`20`	`20`	`<a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a>`
`21`	`21`	`@Model.UpdateTempNode(node) <partial name="NavigationNodeChildTreePartial" model="@Model" />`
`22`	`22`	`</li>`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`	`if (! await Model.ShouldAllowView(node)) { continue; }`
`15`	`15`	`if (! await Model.HasVisibleChildren(node))`
`16`	`16`	`{`
`17`		`- <li class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>`
	`17`	`+ <li role="menuitem" class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>`
`18`	`18`	`}`
`19`	`19`	`else`
`20`	`20`	`{`
`21`		`- <li class='@Model.GetClass(node.Value)'>`
	`21`	`+ <li role="menuitem" class='@Model.GetClass(node.Value)'>`
`22`	`22`	`<a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a>`
`23`	`23`	`@Model.UpdateTempNode(node) <partial name="NavigationNodeSideNavPartial" model="@Model" />`
`24`	`24`	`</li>`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`if (! await Model.ShouldAllowView(node)) { continue; }`
`14`	`14`	`if (! await Model.HasVisibleChildren(node))`
`15`	`15`	`{`
`16`		`- <li class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>`
	`16`	`+ <li role="menuitem" class='@Model.GetClass(node.Value)'><a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a></li>`
`17`	`17`	`}`
`18`	`18`	`else`
`19`	`19`	`{`
`20`		`- <li class='@Model.GetClass(node.Value)'>`
	`20`	`+ <li role="menuitem" class='@Model.GetClass(node.Value)'>`
`21`	`21`	`<a href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@sr[Model.AdjustText(node)]</a>`
`22`	`22`	`@Model.UpdateTempNode(node) <partial name="NavigationNodeChildTreePartial" model="@Model" />`
`23`	`23`	`</li>`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`}`
`19`	`19`	`if (! await Model.HasVisibleChildren(childNode))`
`20`	`20`	`{`
`21`		`- <li class='@Model.GetClass(childNode.Value)' cwn-data-attributes="@childNode.Value.DataAttributes"><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>`
	`21`	`+ <li role="menuitem" class='@Model.GetClass(childNode.Value)' cwn-data-attributes="@childNode.Value.DataAttributes"><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>`
`22`	`22`	`}`
`23`	`23`	`else`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@`
`11`	`11`	`if (! await Model.ShouldAllowView(childNode)) { continue; }`
`12`	`12`	`if (! await Model.HasVisibleChildren(childNode))`
`13`	`13`	`{`
`14`		`- <li class='@Model.GetClass(childNode.Value)'><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>`
	`14`	`+ <li role="menuitem" class='@Model.GetClass(childNode.Value)'><a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a></li>`
`15`	`15`	`}`
`16`	`16`	`else`
`17`	`17`	`{`
`18`		`- <li class='@Model.GetClass(childNode.Value)'>`
	`18`	`+ <li role="menuitem" class='@Model.GetClass(childNode.Value)'>`
`19`	`19`	`<a href="@Url.Content(Model.AdjustUrl(childNode))">@Html.Raw(Model.GetIcon(childNode.Value))@sr[Model.AdjustText(childNode)]</a>`
`20`	`20`	`@Model.UpdateTempNode(childNode) <partial name="NavigationNodeSideNavPartial" model="@Model" /> @* recursion *@`
`21`	`21`	`</li>`