Skip to content
Snippets Groups Projects
Commit b76a9eb8 authored by Petr.Kalashnikov's avatar Petr.Kalashnikov
Browse files

Merge branch 'UU428' into 'master'

Uu428

See merge request spraksamlingane/beta.ordbok.uib.no!51
parents ee58dcbd c0b5ab71
No related branches found
No related tags found
No related merge requests found
<template> <template>
<v-app id="app"> <v-app id="app">
<header> <header>
<div class="about-link"><router-link to="/om">OM ORDBØKENE</router-link></div> <div class="about-link"><router-link to="/om" tabindex="2">OM ORDBØKENE</router-link></div>
<h1><a :class="$vuetify.breakpoint.name" href="/">Ordbøkene</a></h1> <h1><a :class="$vuetify.breakpoint.name" href="/" tabindex="1">Ordbøkene</a></h1>
<div class="beta" :title="release">{{version_label}}</div> <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> </header>
<router-view></router-view> <router-view></router-view>
<footer> <footer>
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<DefElement v-for="(element, index) in article.body.etymology" :dictionary="dictionary" :key="index" :body='element' @article-click="article_link_click" /> <DefElement v-for="(element, index) in article.body.etymology" :dictionary="dictionary" :key="index" :body='element' @article-click="article_link_click" />
</ul> </ul>
</section> </section>
<section class="definitions" v-if="has_content"> <section class="definitions" v-if="has_content" tabindex="0">
<h3>{{def_label}}</h3> <h3 tabindex="0">{{def_label}}</h3>
<ol> <ol>
<Definition v-for="definition in article.body.definitions" :dictionary="dictionary" :level="1" :key="definition.id" :body='definition' @article-click="article_link_click" /> <Definition v-for="definition in article.body.definitions" :dictionary="dictionary" :level="1" :key="definition.id" :body='definition' @article-click="article_link_click" />
</ol> </ol>
......
<template> <template>
<div class="article_footer"> <div class="article_footer">
<span v-if="hasPointer"> <span v-if="hasPointer">
<button class="share_button"> <button class="share_button" tabindex="0">
<ShareNetwork network="facebook" <ShareNetwork network="facebook"
title="" title=""
:url="share_link"> :url="share_link"
tabindex="-1">
<v-icon dense>$vuetify.icons.facebook</v-icon> <v-icon dense>$vuetify.icons.facebook</v-icon>
</ShareNetwork> </ShareNetwork>
</button> </button>
<button class="share_button"> <button class="share_button" tabindex="0">
<ShareNetwork <ShareNetwork
network="twitter" network="twitter"
:url="share_link" :url="share_link"
:title="dict_label" :title="dict_label"
hashtags="#ordbøkene"> hashtags="#ordbøkene"
tabindex="-1">
<v-icon dense>$vuetify.icons.twitter</v-icon> <v-icon dense>$vuetify.icons.twitter</v-icon>
</ShareNetwork> </ShareNetwork>
</button> </button>
...@@ -22,7 +24,7 @@ ...@@ -22,7 +24,7 @@
<span v-if="!hasPointer" class = "share_text">Del ordet</span> <span v-if="!hasPointer" class = "share_text">Del ordet</span>
<v-icon dense>$vuetify.icons.share</v-icon> <v-icon dense>$vuetify.icons.share</v-icon>
</button> </button>
<div class = "footer_title">Ordbøkene.no <div class = "footer_title" tabindex="0">Ordbøkene.no
</div> </div>
</div> </div>
</template> </template>
......
<template> <template>
<li :class="['definition', 'level'+level]" :ref="'def' + body.id" :id="'def' + body.id"> <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" /> <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> </ul>
<div v-if="examples.length"> <div v-if="examples.length" tabindex="0">
<h4>{{example_header}}</h4> <h4>{{example_header}}</h4>
<ul class="examples"> <ul class="examples">
<Example :body="example" :dictionary="dictionary" v-for="(example, index) in examples" :key="index" @article-click="article_link_click" /> <Example :body="example" :dictionary="dictionary" v-for="(example, index) in examples" :key="index" @article-click="article_link_click" />
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<ul class="compound_lists"> <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" /> <CompoundList :body="compound_list" :dictionary="dictionary" v-for="(compound_list, index) in compund_lists" :key="index" @article-click="article_link_click" />
</ul> </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" /> <Definition :level="level+1" :body="subdef" v-for="(subdef, index) in subdefs" :dictionary="dictionary" :key="index" @article-click="article_link_click" />
</div> </div>
</li> </li>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="search_container"> <div class="search_container">
<div class="lang_select_container"> <div class="lang_select_container">
<v-radio-group row v-model="lang" @change="update_lang_form"> <v-radio-group row v-model="lang" @change="update_lang_form">
<template v-slot:label> <template v-slot:label tabindex="1">
<span>VIS<span style="font-size:0px;margin-top:11px;color:#fdf4f5;display:inline-block;"> resultat i begge ordbøkene eller bruk radioknapp for bokmålsordboka eller nynorskordboka</span></span> <span aria-label="Vis dresultat i begge ordbøkene eller bruk radioknapp for bokmålsordboka eller radioknapp for nynorskordboka">VIS</span>
</template> </template>
<v-radio value="bob,nob" color="primary"> <v-radio value="bob,nob" color="primary">
<template v-slot:label> <template v-slot:label>
......
<!-- eslint-disable --> <!-- eslint-disable -->
<template> <template>
<div> <div>
<h2 class="article_header">{{header_text}}</h2> <span class="dict-label" tabindex="0">{{dict_label}}</span>
<h2 class="secondary_header" v-if="secondary_header_text.length">{{secondary_header_text}}</h2> <h2 class="article_header" tabindex="0">{{header_text}}</h2>
{{group_list}} <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"> <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"> <div class="inflection-canvas">
<inflectionTable :lemmaList="lemmas_with_word_class_and_lang" :mq="$vuetify.breakpoint.name" /> <inflectionTable :lemmaList="lemmas_with_word_class_and_lang" :mq="$vuetify.breakpoint.name" />
</div> </div>
</details> </details>
<span class="dict-label">{{dict_label}}</span>
</div> </div>
</template> </template>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<section id="search_results"> <section id="search_results">
<div class="flex-container" :class="$vuetify.breakpoint.name"> <div class="flex-container" :class="$vuetify.breakpoint.name">
<ul class="hits" v-if="results_bob.length"> <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
:article="result" :article="result"
@article-click="article_link_click" @article-click="article_link_click"
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</li> </li>
</ul> </ul>
<ul class="hits" v-if="results_nob.length"> <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
:article="result" :article="result"
@article-click="article_link_click" @article-click="article_link_click"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment