diff --git a/src/App.vue b/src/App.vue index 978aa553a5f20f8a58501f599b294c5c7819aee0..4b7d9f6376678bdf32d2334a1a53e8c21e3e3c68 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,10 +1,10 @@ <template> <v-app id="app"> <header> - <div class="about-link"><router-link to="/om">OM ORDBØKENE</router-link></div> - <h1><a :class="$vuetify.breakpoint.name" href="/">Ordbøkene</a></h1> + <div class="about-link"><router-link to="/om" tabindex="2">OM ORDBØKENE</router-link></div> + <h1><a :class="$vuetify.breakpoint.name" href="/" tabindex="1">Ordbøkene</a></h1> <div class="beta" :title="release">{{version_label}}</div> - <p class="sub-title"><router-link to="/">Bokmålsordboka og Nynorskordboka</router-link></p> + <p class="sub-title"><router-link to="/" tabindex="3">Bokmålsordboka og Nynorskordboka</router-link></p> </header> <router-view></router-view> <footer> diff --git a/src/components/Article.vue b/src/components/Article.vue index e9198d90c7599edc2e57c7ab2b5eb84b2b67b830..1952759d9c4391647c3bf73f3c92a8deef146d04 100644 --- a/src/components/Article.vue +++ b/src/components/Article.vue @@ -14,8 +14,8 @@ <DefElement v-for="(element, index) in article.body.etymology" :dictionary="dictionary" :key="index" :body='element' @article-click="article_link_click" /> </ul> </section> - <section class="definitions" v-if="has_content"> - <h3>{{def_label}}</h3> + <section class="definitions" v-if="has_content" tabindex="0"> + <h3 tabindex="0">{{def_label}}</h3> <ol> <Definition v-for="definition in article.body.definitions" :dictionary="dictionary" :level="1" :key="definition.id" :body='definition' @article-click="article_link_click" /> </ol> diff --git a/src/components/ArticleFooter.vue b/src/components/ArticleFooter.vue index dfa9ffc075a46e87051c8b7fdd17e612442a202d..e8611fba156d3510bf0445b1f8763765f3115c9c 100644 --- a/src/components/ArticleFooter.vue +++ b/src/components/ArticleFooter.vue @@ -1,19 +1,21 @@ <template> <div class="article_footer"> <span v-if="hasPointer"> - <button class="share_button"> + <button class="share_button" tabindex="0"> <ShareNetwork network="facebook" title="" - :url="share_link"> + :url="share_link" + tabindex="-1"> <v-icon dense>$vuetify.icons.facebook</v-icon> </ShareNetwork> </button> - <button class="share_button"> + <button class="share_button" tabindex="0"> <ShareNetwork network="twitter" :url="share_link" :title="dict_label" - hashtags="#ordbøkene"> + hashtags="#ordbøkene" + tabindex="-1"> <v-icon dense>$vuetify.icons.twitter</v-icon> </ShareNetwork> </button> @@ -22,7 +24,7 @@ <span v-if="!hasPointer" class = "share_text">Del ordet</span> <v-icon dense>$vuetify.icons.share</v-icon> </button> - <div class = "footer_title">Ordbøkene.no + <div class = "footer_title" tabindex="0">Ordbøkene.no </div> </div> </template> diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue index 46fa3e1239f0c4b4aab18df5cc574f815ae7d723..a042536d768a7601817e977f719d57d3cd45ae04 100644 --- a/src/components/Autocomplete.vue +++ b/src/components/Autocomplete.vue @@ -103,7 +103,7 @@ let hit = {q: q, match: match, label: match} hit.article_promise = self.api.get('articles?', {params: {lord: match, dict: self.$parent.lang}}) - + hit.lang = item[1] hits.push(hit) @@ -117,7 +117,7 @@ }, submit(item) { - + this.$emit('submit', item) let self = this diff --git a/src/components/Definition.vue b/src/components/Definition.vue index 0560336b11d8797ddf2eef87a3aa9e548fe5d0be..5f47c647884d2ff4df2838e1ca89b40d37ab2e81 100644 --- a/src/components/Definition.vue +++ b/src/components/Definition.vue @@ -1,9 +1,9 @@ <template> <li :class="['definition', 'level'+level]" :ref="'def' + body.id" :id="'def' + body.id"> - <ul class="explanations"> + <ul class="explanations" tabindex="0"> <DefElement :body="explanation" :dictionary="dictionary" :has_article_ref=has_article_ref(explanation) v-for="(explanation, index) in explanations" :key="index" @article-click="article_link_click" /> </ul> - <div v-if="examples.length"> + <div v-if="examples.length" tabindex="0"> <h4>{{example_header}}</h4> <ul class="examples"> <Example :body="example" :dictionary="dictionary" v-for="(example, index) in examples" :key="index" @article-click="article_link_click" /> @@ -12,7 +12,7 @@ <ul class="compound_lists"> <CompoundList :body="compound_list" :dictionary="dictionary" v-for="(compound_list, index) in compund_lists" :key="index" @article-click="article_link_click" /> </ul> - <div :is="level < 3 ? 'ol' : 'ul'" class="sub_definitions" v-if="subdefs.length"> + <div :is="level < 3 ? 'ol' : 'ul'" class="sub_definitions" v-if="subdefs.length" tabindex="0"> <Definition :level="level+1" :body="subdef" v-for="(subdef, index) in subdefs" :dictionary="dictionary" :key="index" @article-click="article_link_click" /> </div> </li> diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index b5e18086c1e3926e4aecec8109f9b854fa8a4830..359d51324be844108b124855af6d6714cc3b1896 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -3,8 +3,8 @@ <div class="search_container"> <div class="lang_select_container"> <v-radio-group row v-model="lang" @change="update_lang_form"> - <template v-slot:label> - <span>VIS</span> + <template v-slot:label tabindex="1"> + <span aria-label="Vis dresultat i begge ordbøkene eller bruk radioknapp for bokmålsordboka eller radioknapp for nynorskordboka">VIS</span> </template> <v-radio value="bob,nob" color="primary"> <template v-slot:label> diff --git a/src/components/Header.vue b/src/components/Header.vue index 8193e4224ad22e6487c4428411513a1505814414..9f8f52e5c7bcee3a2f7830ddddcfaaee91acf86a 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -1,16 +1,16 @@ <!-- eslint-disable --> <template> <div> - <h2 class="article_header">{{header_text}}</h2> - <h2 class="secondary_header" v-if="secondary_header_text.length">{{secondary_header_text}}</h2> - {{group_list}} + <span class="dict-label" tabindex="0">{{dict_label}}</span> + <h2 class="article_header" tabindex="0">{{header_text}}</h2> + <h2 class="secondary_header" v-if="secondary_header_text.length" tabindex="0">{{secondary_header_text}}</h2> + <span class="header_group_list" v-if="group_list.length" tabindex="0">{{group_list}}</span> <details :title="inflect_tooltip" @toggle="toggle()" v-if="inflected" :class="$vuetify.breakpoint.name"> - <summary :class="dictionary" onclick="this.blur()">bøying</summary> + <summary :class="dictionary" onclick="this.blur()" tabindex="0">bøying</summary> <div class="inflection-canvas"> <inflectionTable :lemmaList="lemmas_with_word_class_and_lang" :mq="$vuetify.breakpoint.name" /> </div> - </details> - <span class="dict-label">{{dict_label}}</span> + </details> </div> </template> diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue index 1c5f15c2d756651530bafbf2daf85f3f459c2f4e..7bc3d9b079d32a349e8b429b79c5865faeacd2df 100644 --- a/src/components/SearchResults.vue +++ b/src/components/SearchResults.vue @@ -2,7 +2,7 @@ <section id="search_results"> <div class="flex-container" :class="$vuetify.breakpoint.name"> <ul class="hits" v-if="results_bob.length"> - <li class="article_container" v-for="(result, index) in results_bob" :key="index + results_hash"> + <li class="article_container" v-for="(result, index) in results_bob" :key="index + results_hash" tabindex="-1"> <Article :article="result" @article-click="article_link_click" @@ -11,7 +11,7 @@ </li> </ul> <ul class="hits" v-if="results_nob.length"> - <li class="article_container" v-for="(result, index) in results_nob" :key="index + results_hash"> + <li class="article_container" v-for="(result, index) in results_nob" :key="index + results_hash" tabindex="-1"> <Article :article="result" @article-click="article_link_click"