Merge branch 'feature/tweak-layout' into master
This commit is contained in:
commit
8326a5cb1a
|
@ -1,7 +1,6 @@
|
||||||
import Component from '@glimmer/component';
|
import Component from '@glimmer/component';
|
||||||
import { inject as service } from '@ember/service';
|
import { inject as service } from '@ember/service';
|
||||||
import { tracked } from "@glimmer/tracking";
|
import { tracked } from "@glimmer/tracking";
|
||||||
import showdown from 'showdown';
|
|
||||||
|
|
||||||
export default class LexiconEntryComponent extends Component {
|
export default class LexiconEntryComponent extends Component {
|
||||||
@service('word-select') selectedWord;
|
@service('word-select') selectedWord;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<tr {{on "click" (fn this.select @model)}} class="{{this.selected}}" ...attributes>
|
<tr {{on "click" (fn this.select @model)}} class="{{this.selected}}" ...attributes>
|
||||||
<td>{{@model.greek}}</td>
|
|
||||||
<td>{{@model.ulb}}</td>
|
<td>{{@model.ulb}}</td>
|
||||||
|
<td>{{@model.greek}}</td>
|
||||||
<td>{{@model.morph}}</td>
|
<td>{{@model.morph}}</td>
|
||||||
</tr>
|
</tr>
|
|
@ -5,10 +5,12 @@ import { action } from '@ember/object';
|
||||||
|
|
||||||
export default class WordsWordRowComponent extends Component {
|
export default class WordsWordRowComponent extends Component {
|
||||||
@service('word-select') selectWord;
|
@service('word-select') selectWord;
|
||||||
|
@service router;
|
||||||
|
|
||||||
@action
|
@action
|
||||||
select(word) {
|
select(word) {
|
||||||
this.selectWord.select(word);
|
this.selectWord.select(word);
|
||||||
|
this.router.transitionTo('verse.word', word.strongsNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
get
|
get
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<h4>Word Details</h4>
|
<h4>Word Details</h4>
|
||||||
<table class="word-details" ...attributes>
|
<table class="word-details" ...attributes>
|
||||||
<thead>
|
<thead>
|
||||||
<th>Greek</th>
|
|
||||||
<th>ULB</th>
|
<th>ULB</th>
|
||||||
|
<th>Greek</th>
|
||||||
<th>Morphology</th>
|
<th>Morphology</th>
|
||||||
</thead>
|
</thead>
|
||||||
{{#each @model as |word|}}
|
{{#each @model as |word|}}
|
||||||
|
|
|
@ -1,24 +1,11 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h1>{{model.reference}}</h1>
|
<h1>{{model.reference}}</h1>
|
||||||
<BsNav
|
|
||||||
@type="tabs"
|
|
||||||
@justified={{true}}
|
|
||||||
@stacked={{false}}
|
|
||||||
@fill={{true}} as |nav|
|
|
||||||
>
|
|
||||||
<nav.item>
|
|
||||||
<nav.link-to @route="index">Verse Details</nav.link-to>
|
|
||||||
</nav.item>
|
|
||||||
<nav.item>
|
|
||||||
<nav.link-to @route="verse">Commentary</nav.link-to>
|
|
||||||
</nav.item>
|
|
||||||
</BsNav>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<h4>Greek</h4>
|
|
||||||
<p><Words::GreekText @model={{model.words}} /></p>
|
|
||||||
<h4>ULB</h4>
|
<h4>ULB</h4>
|
||||||
<p>{{model.ulbText}}</p>
|
<p>{{model.ulbText}}</p>
|
||||||
|
<h4>Greek</h4>
|
||||||
|
<p><Words::GreekText @model={{model.words}} /></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
Loading…
Reference in New Issue