#76 [nouns][pl] change order

This commit is contained in:
Andrea Vos 2020-10-16 19:32:03 +02:00
parent 430e29c110
commit 8bd37271fe
3 changed files with 259 additions and 254 deletions

View File

@ -1,3 +1,6 @@
<template> <template>
<div>
<Separator icon="book-open"/> <Separator icon="book-open"/>
<slot></slot>
</div>
</template> </template>

View File

@ -1,83 +1,65 @@
<template> <template>
<div> <div>
<div class="btn-group btn-block"> <div class="btn-group btn-block">
<a :href="'#' + $t('nouns.personNouns.id')" class="btn btn-outline-primary"> <a :href="'#' + $t('nouns.neuterNouns.id')" class="btn btn-outline-primary">
<Icon v="atom-alt"/> <Icon v="atom-alt"/>
<T>nouns.personNouns.header</T> <T>nouns.neuterNouns.header</T>
</a> </a>
<a :href="'#' + $t('nouns.dukajNouns.id')" class="btn btn-outline-primary"> <a :href="'#' + $t('nouns.dukajNouns.id')" class="btn btn-outline-primary">
<Icon v="atom-alt"/> <Icon v="atom-alt"/>
<T>nouns.dukajNouns.header</T> <T>nouns.dukajNouns.header</T>
</a> </a>
<a :href="'#' + $t('nouns.neuterNouns.id')" class="btn btn-outline-primary"> <a :href="'#' + $t('nouns.personNouns.id')" class="btn btn-outline-primary">
<Icon v="atom-alt"/> <Icon v="atom-alt"/>
<T>nouns.neuterNouns.header</T> <T>nouns.personNouns.header</T>
</a> </a>
</div> </div>
<Separator icon="atom-alt"/> <Separator icon="atom-alt"/>
<h3 :id="$t('nouns.personNouns.id')"> <h3 :id="$t('nouns.neuterNouns.id')">
<T>nouns.personNouns.header</T> <T>nouns.neuterNouns.header</T>
<small><NormativeBadge/></small>
</h3> </h3>
<T>nouns.personNouns.info</T> <T>nouns.neuterNouns.info</T>
<details class="border mb-3"> <details class="border mb-3">
<summary class="bg-light p-3"> <summary class="bg-light p-3">
<h4 class="h5 d-inline"><T>nouns.examples</T></h4> <h4 class="h5 d-inline"><T>nouns.neuterNouns.alt.header</T></h4>
</summary> </summary>
<div class="border-top table-responsive"> <div class="border-top">
<div class="p-4 pb-0">
<T>nouns.neuterNouns.alt.info</T>
</div>
<div class="table-responsive">
<table class="table table-striped table-hover table-fixed-3"> <table class="table table-striped table-hover table-fixed-3">
<thead> <thead>
<tr> <tr>
<th class="text-nowrap"> <th v-for="templates in neuterAltDeclensionTemplates" class="text-nowrap">
<Icon v="mars"/> <ul class="list-inline mb-0">
<T>nouns.masculine</T> <li v-for="template in templates" class="list-inline-item">
</th> <nuxt-link :to="'/' + template">
<th class="text-nowrap"> {{ template }}
<Icon v="venus"/> </nuxt-link>
<T>nouns.feminine</T> </li>
</th> </ul>
<th class="text-nowrap">
<Icon v="neuter"/>
<T>nouns.personNouns.label</T>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="noun in personNouns" :key="noun.id"> <tr v-for="(declensions, word) in neuterAltDeclension" :key="word">
<td> <td v-for="declension in declensions">
<ul class="list-singular"> <Declension :word="word" :template="declension" open condense/>
<li v-for="w in noun.masc">{{ w }}</li>
</ul>
<ul class="list-plural">
<li v-for="w in noun.mascPl">{{ w }}</li>
</ul>
</td>
<td>
<ul class="list-singular">
<li v-for="w in noun.fem">{{ w }}</li>
</ul>
<ul class="list-plural">
<li v-for="w in noun.femPl">{{ w }}</li>
</ul>
</td>
<td>
<ul class="list-singular">
<li v-for="w in noun.neutr">{{ w }}</li>
</ul>
<ul class="list-plural">
<li v-for="w in noun.neutrPl">{{ w }}</li>
</ul>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</details> </details>
<slot></slot>
<Separator icon="atom-alt"/> <Separator icon="atom-alt"/>
<h3 :id="$t('nouns.dukajNouns.id')"> <h3 :id="$t('nouns.dukajNouns.id')">
@ -149,45 +131,65 @@
<Separator icon="atom-alt"/> <Separator icon="atom-alt"/>
<h3 :id="$t('nouns.neuterNouns.id')"> <h3 :id="$t('nouns.personNouns.id')">
<T>nouns.neuterNouns.header</T> <T>nouns.personNouns.header</T>
<small><NormativeBadge/></small>
</h3> </h3>
<T>nouns.neuterNouns.info</T> <T>nouns.personNouns.info</T>
<details class="border mb-3"> <details class="border mb-3">
<summary class="bg-light p-3"> <summary class="bg-light p-3">
<h4 class="h5 d-inline"><T>nouns.neuterNouns.alt.header</T></h4> <h4 class="h5 d-inline"><T>nouns.examples</T></h4>
</summary> </summary>
<div class="border-top"> <div class="border-top table-responsive">
<div class="p-4 pb-0">
<T>nouns.neuterNouns.alt.info</T>
</div>
<div class="table-responsive">
<table class="table table-striped table-hover table-fixed-3"> <table class="table table-striped table-hover table-fixed-3">
<thead> <thead>
<tr> <tr>
<th v-for="templates in neuterAltDeclensionTemplates" class="text-nowrap"> <th class="text-nowrap">
<ul class="list-inline mb-0"> <Icon v="mars"/>
<li v-for="template in templates" class="list-inline-item"> <T>nouns.masculine</T>
<nuxt-link :to="'/' + template"> </th>
{{ template }} <th class="text-nowrap">
</nuxt-link> <Icon v="venus"/>
</li> <T>nouns.feminine</T>
</ul> </th>
<th class="text-nowrap">
<Icon v="neuter"/>
<T>nouns.personNouns.label</T>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(declensions, word) in neuterAltDeclension" :key="word"> <tr v-for="noun in personNouns" :key="noun.id">
<td v-for="declension in declensions"> <td>
<Declension :word="word" :template="declension" open condense/> <ul class="list-singular">
<li v-for="w in noun.masc">{{ w }}</li>
</ul>
<ul class="list-plural">
<li v-for="w in noun.mascPl">{{ w }}</li>
</ul>
</td>
<td>
<ul class="list-singular">
<li v-for="w in noun.fem">{{ w }}</li>
</ul>
<ul class="list-plural">
<li v-for="w in noun.femPl">{{ w }}</li>
</ul>
</td>
<td>
<ul class="list-singular">
<li v-for="w in noun.neutr">{{ w }}</li>
</ul>
<ul class="list-plural">
<li v-for="w in noun.neutrPl">{{ w }}</li>
</ul>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</details> </details>
</div> </div>
</template> </template>

View File

@ -11,8 +11,7 @@
<Share :title="$t('nouns.headerLong')"/> <Share :title="$t('nouns.headerLong')"/>
</section> </section>
<NounsExtra/> <NounsExtra>
<details class="border mb-3" ref="dictionary"> <details class="border mb-3" ref="dictionary">
<summary class="bg-light p-3" @click="loadNouns"> <summary class="bg-light p-3" @click="loadNouns">
<h4 class="h5 d-inline"> <h4 class="h5 d-inline">
@ -186,6 +185,7 @@
</Loading> </Loading>
</div> </div>
</details> </details>
</NounsExtra>
</div> </div>
</template> </template>