Skip to content

Commit

Permalink
Fix multiple accessibility errors (#362)
Browse files Browse the repository at this point in the history
* Fix multiple accessibility errors

* Fix spacing in closing tags
  • Loading branch information
odero authored Sep 26, 2023
1 parent 967789c commit bf1c9f4
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,25 +112,25 @@ <h2>Approach</h2>
<h2>Capturing control information as patterns</h2>
<p>I mentioned patterns several times already. Let me make this more concrete. As we discussed before in the OData mailing list, we’re adding support for annotations to metadata using vocabularies. In order to support this JSON-based “light” format we introduce a vocabulary that captures how to derive all bits of control information from the regular object data. We’ll have the details of every pattern documented in the official spec, but here are a few to show what they look like.</p>
<p>This one shows the base URL for the service, and is used for all relative URLs in other patterns:</p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation</span><span style="color: #ff0000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.urls.baseurlexpression</span>"<span style="color: #ff0000">Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation </span><span style="color: #e50000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.urls.baseurlexpression</span>"<span style="color: #e50000"> Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>      &lt;</span></span><span><span style="color: #a31515">String</span><span style="color: #0000ff">&gt;https://services.odata.org/OData/OData.svc/&lt;/<span><span style="color: #a31515">String</span></span></span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;/</span></span><span><span style="color: #a31515">ValueAnnotation</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p>These two show two URL construction rules, one to obtain the URL of a collection (a set) and one to obtain the URL of an individual element within that collection:</p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation</span><span style="color: #ff0000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.urls.setexpression</span>"<span style="color: #ff0000">Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService.Products</span></span><span>"</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>                     </span></span><span><span style="color: #ff0000">String</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">Products/</span>"</span><span style="color: #0000ff">/&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation </span><span style="color: #e50000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.urls.setexpression</span>"<span style="color: #e50000"> Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService.Products</span></span><span>"</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>                     </span></span><span><span style="color: #e50000">String</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">Products/</span>"</span><span style="color: #0000ff">/&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span> </span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation</span><span style="color: #ff0000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.urls.keylookupexpression</span>"<span style="color: #ff0000">Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService.Products</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>      &lt;</span></span><span><span style="color: #a31515">Apply</span><span style="color: #ff0000">Function</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">KeyConcat</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation </span><span style="color: #e50000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.urls.keylookupexpression</span>"<span style="color: #e50000"> Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService.Products</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>      &lt;</span></span><span><span style="color: #a31515">Apply </span><span style="color: #e50000">Function</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">KeyConcat</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">String</span><span style="color: #0000ff">&gt;</span>(<span style="color: #0000ff">&lt;/</span><span style="color: #a31515">String</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">Path</span><span style="color: #0000ff">&gt;</span>ID<span style="color: #0000ff">&lt;/</span><span style="color: #a31515">Path</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">String</span><span style="color: #0000ff">&gt;</span>)/<span style="color: #0000ff">&lt;/</span><span style="color: #a31515">String</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>      &lt;/</span></span><span><span style="color: #a31515">Apply</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;/</span></span><span><span style="color: #a31515">ValueAnnotation</span></span><span style="color: #0000ff">&gt;</span></span><span style="font-family: Lucida Console"><span> </span></span></p>
<p>Finally, here’s one that’s not a URL but a plain value, in this case the ETag for each element (doesn’t apply to the “Product” type, but included here as an example):</p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation</span><span style="color: #ff0000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.json.etagexpression</span>"<span style="color: #ff0000">Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService.Products</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>      &lt;</span></span><span><span style="color: #a31515">Apply</span><span style="color: #ff0000">Function</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">Concat</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>    &lt;</span></span><span><span style="color: #a31515">ValueAnnotation </span><span style="color: #e50000">Term</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">odata.json.etagexpression</span>"<span style="color: #e50000"> Target</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">ODataDemo.DemoService.Products</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>      &lt;</span></span><span><span style="color: #a31515">Apply </span><span style="color: #e50000">Function</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">Concat</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">String</span><span style="color: #0000ff">&gt;</span>W/"<span style="color: #0000ff">&lt;/</span><span style="color: #a31515">String</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">Apply</span><span style="color: #ff0000">Function</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">RawValue</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">Apply </span><span style="color: #e50000">Function</span><span style="color: #0000ff">=</span>"<span style="color: #0000ff">RawValue</span>"</span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>          &lt;</span></span><span><span style="color: #a31515">Path</span><span style="color: #0000ff">&gt;</span>Version<span style="color: #0000ff">&lt;/</span><span style="color: #a31515">Path</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;/</span></span><span><span style="color: #a31515">Apply</span></span><span style="color: #0000ff">&gt;</span></span></p>
<p><span style="font-family: Lucida Console"><span style="color: #0000ff"><span>        &lt;</span></span><span><span style="color: #a31515">String</span><span style="color: #0000ff">&gt;</span>"<span style="color: #0000ff">&lt;/</span><span style="color: #a31515">String</span></span><span style="color: #0000ff">&gt;</span></span></p>
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</ol>

<!-- Wrapper for slides -->
<div class="carousel-inner zero-side-margin" aria-label="OData Description" role="listbox">
<div class="item active" role="option">
<div class="carousel-inner zero-side-margin" aria-label="OData Description">
<div class="item active">
<img src="{{ '/assets/homepage_1.jpg' | prepend: site.baseurl | prepend: site.url }}" alt="Home">
<div class="carousel-caption jumbotron transparent-background">
<h1 class="text-center">OData - the best way to REST</h1>
Expand Down
12 changes: 6 additions & 6 deletions pages/getting-started/understand-odata-in-6-steps.html
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ <h3 class="top-margin bottom-margin">Step 1: Requesting resources
<li role="presentation" class="dropdown">
<a class="tab-link dropdown-toggle" href="#csharp1" role="tab" id="csharpDrop1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="csharpDrop1-contents">C# &nbsp;<span
class="caret"></span></a></p>
<ul class="dropdown-menu tab-link"aria-labelledby="csharpDrop1" id="csharpDrop1-contents">
<ul role="presentation" class="dropdown-menu tab-link" id="csharpDrop1-contents">
<li><a class="tab-link" href="#csharpCodeGen1" role="tab" id="csharpCodeGen1-tab" data-toggle="tab" aria-controls="csharpCodeGen1">OData v4 Client Code Generator</a></li>
<li><a class="tab-link" href="#csharpSimpleOData1" role="tab" id="csharpSimpleOData1-tab" data-toggle="tab" aria-controls="csharpSimpleOData1">Simple.OData.Client</a></li>
</ul>
Expand Down Expand Up @@ -583,7 +583,7 @@ <h3 class="top-margin bottom-margin">Step 2: Requesting an individual resource
<li role="presentation" class="dropdown">
<a class="tab-link dropdown-toggle" href="#csharp2" role="tab" id="csharpDrop2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="csharpDrop2-contents">C# &nbsp;<span
class="caret"></span></a></p>
<ul class="dropdown-menu tab-link" aria-labelledby="csharpDrop1" id="csharpDrop2-contents">
<ul role="presentation" class="dropdown-menu tab-link" id="csharpDrop2-contents">
<li><a class="tab-link" href="#csharpCodeGen2" role="tab" id="csharpCodeGen2-tab" data-toggle="tab" aria-controls="csharpCodeGen2">OData v4 Client Code Generator</a></li>
<li><a class="tab-link" href="#csharpSimpleOData2" role="tab" id="csharpSimpleOData2-tab" data-toggle="tab" aria-controls="csharpSimpleOData2">Simple.OData.Client</a></li>
</ul>
Expand Down Expand Up @@ -692,7 +692,7 @@ <h3 class="top-margin bottom-margin">Step 3: Queries
<li role="presentation" class="dropdown">
<a class="tab-link dropdown-toggle" href="#csharp3" role="tab" id="csharpDrop3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="csharpDrop3-contents">C#
&nbsp;<span class="caret"></span></a></p>
<ul class="dropdown-menu tab-link" aria-labelledby="csharpDrop3" id="csharpDrop3-contents">
<ul role="presentation" class="dropdown-menu tab-link" id="csharpDrop3-contents">
<li><a class="tab-link" href="#csharpCodeGen3" role="tab" id="csharpCodeGen3-tab" data-toggle="tab" aria-controls="csharpCodeGen3">OData v4 Client Code Generator</a></li>
<li><a class="tab-link" href="#csharpSimpleOData3" role="tab" id="csharpSimpleOData3-tab" data-toggle="tab" aria-controls="csharpSimpleOData3">Simple.OData.Client</a></li>
</ul>
Expand Down Expand Up @@ -810,7 +810,7 @@ <h3 class="top-margin bottom-margin">Step 4: Creating a new resource
<li role="presentation" class="dropdown">
<a class="tab-link dropdown-toggle" href="#csharp4" role="tab" id="csharpDrop4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="csharpDrop4-contents">C# &nbsp;<span
class="caret"></span></a></p>
<ul class="dropdown-menu tab-link" aria-labelledby="csharpDrop4" id="csharpDrop4-contents">
<ul role="presentation" class="dropdown-menu tab-link" id="csharpDrop4-contents">
<li><a class="tab-link" href="#csharpCodeGen4" role="tab" id="csharpCodeGen4-tab" data-toggle="tab" aria-controls="csharpCodeGen4">OData v4 Client Code Generator</a></li>
<li><a class="tab-link" href="#csharpSimpleOData4" role="tab" id="csharpSimpleOData4-tab" data-toggle="tab" aria-controls="csharpSimpleOData4">Simple.OData.Client</a></li>
</ul>
Expand Down Expand Up @@ -1074,7 +1074,7 @@ <h3 class="top-margin bottom-margin">Step 5: Relating resources
<li role="presentation" class="dropdown">
<a class="tab-link dropdown-toggle" href="#csharp5" role="tab" id="csharpDrop5" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="csharpDrop5-contents">C# &nbsp;<span
class="caret"></span></a></p>
<ul class="dropdown-menu tab-link" aria-labelledby="csharpDrop5" id="csharpDrop5-contents">
<ul role="presentation" class="dropdown-menu tab-link" id="csharpDrop5-contents">
<li><a class="tab-link" href="#csharpCodeGen5" role="tab" id="csharpCodeGen5-tab" data-toggle="tab" aria-controls="csharpCodeGen5">OData v4 Client Code Generator</a></li>
<li><a class="tab-link" href="#csharpSimpleOData5" role="tab" id="csharpSimpleOData5-tab" data-toggle="tab" aria-controls="csharpSimpleOData5">Simple.OData.Client</a></li>
</ul>
Expand Down Expand Up @@ -1243,7 +1243,7 @@ <h3 class="top-margin bottom-margin">Step 6: Invoking a function
<li role="presentation" class="dropdown">
<a class="tab-link dropdown-toggle" href="#csharp6" role="tab" id="csharpDrop6" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="csharpDrop1-contents">C# &nbsp;<span
class="caret"></span></a></p>
<ul class="dropdown-menu tab-link" aria-labelledby="csharpDrop6" id="csharpDrop6-contents">
<ul role="presentation" class="dropdown-menu tab-link" id="csharpDrop6-contents">
<li><a class="tab-link" href="#csharpCodeGen6" role="tab" id="csharpCodeGen6-tab" data-toggle="tab" aria-controls="csharpCodeGen6">OData v4 Client Code Generator</a></li>
<li><a class="tab-link" href="#csharpSimpleOData6" role="tab" id="csharpSimpleOData6-tab" data-toggle="tab" aria-controls="csharpSimpleOData6">Simple.OData.Client</a></li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions pages/reference-service.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
---
<div id="services-tab">
<ul class="nav nav-tabs" role="tablist" aria-label="Versions">
<li class="active">
<li class="active" role="presentation">
<a class="tab-link" href="#odata-v4" role="tab" aria-controls="odata-v4" data-toggle="tab">OData v4</a>
</li>
<li>
<li role="presentation">
<a class="tab-link" href="#v3" role="tab" data-toggle="tab" aria-controls="v3" tabindex="-1">OData v3</a>
</li>
<li>
<li role="presentation">
<a class="tab-link" href="#v2" role="tab" data-toggle="tab" aria-controls="v2" tabindex="-1">OData v2</a>
</li>
</ul>
Expand Down

0 comments on commit bf1c9f4

Please sign in to comment.