From e85acca1e604576fca083df149fd9a342f963b69 Mon Sep 17 00:00:00 2001 From: Leonard Smith Date: Fri, 18 Dec 2020 08:51:46 -0600 Subject: [PATCH 1/3] Change order of ULB and Greek text --- app/components/words/word-row.hbs | 2 +- app/components/words/word-table.hbs | 2 +- app/templates/verse.hbs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/words/word-row.hbs b/app/components/words/word-row.hbs index a0e5ac5..1e865ca 100644 --- a/app/components/words/word-row.hbs +++ b/app/components/words/word-row.hbs @@ -1,5 +1,5 @@ - {{@model.greek}} {{@model.ulb}} + {{@model.greek}} {{@model.morph}} \ No newline at end of file diff --git a/app/components/words/word-table.hbs b/app/components/words/word-table.hbs index c8552ed..8cc2810 100644 --- a/app/components/words/word-table.hbs +++ b/app/components/words/word-table.hbs @@ -1,8 +1,8 @@

Word Details

- + {{#each @model as |word|}} diff --git a/app/templates/verse.hbs b/app/templates/verse.hbs index 4517568..8087f4b 100644 --- a/app/templates/verse.hbs +++ b/app/templates/verse.hbs @@ -15,10 +15,10 @@
-

Greek

-

ULB

{{model.ulbText}}

+

Greek

+

From 8403f9d318033414ef492e15ac81785fd6744157 Mon Sep 17 00:00:00 2001 From: Leonard Smith Date: Fri, 18 Dec 2020 08:52:56 -0600 Subject: [PATCH 2/3] Temporarily remove content tabs until we get the commentary content loading --- app/templates/verse.hbs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/app/templates/verse.hbs b/app/templates/verse.hbs index 8087f4b..c1a09d5 100644 --- a/app/templates/verse.hbs +++ b/app/templates/verse.hbs @@ -1,18 +1,5 @@

{{model.reference}}

- - - Verse Details - - - Commentary - -

ULB

From 02c7efecd597f41198e60f898c5fd4c99b6bf63a Mon Sep 17 00:00:00 2001 From: Leonard Smith Date: Fri, 18 Dec 2020 09:29:55 -0600 Subject: [PATCH 3/3] Add missing transition to clicks on the word table --- app/components/lexicon/entry.js | 1 - app/components/words/word-row.js | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/components/lexicon/entry.js b/app/components/lexicon/entry.js index bb29814..41b43de 100644 --- a/app/components/lexicon/entry.js +++ b/app/components/lexicon/entry.js @@ -1,7 +1,6 @@ import Component from '@glimmer/component'; import { inject as service } from '@ember/service'; import { tracked } from "@glimmer/tracking"; -import showdown from 'showdown'; export default class LexiconEntryComponent extends Component { @service('word-select') selectedWord; diff --git a/app/components/words/word-row.js b/app/components/words/word-row.js index b50219a..6816e2a 100644 --- a/app/components/words/word-row.js +++ b/app/components/words/word-row.js @@ -5,10 +5,12 @@ import { action } from '@ember/object'; export default class WordsWordRowComponent extends Component { @service('word-select') selectWord; + @service router; @action select(word) { this.selectWord.select(word); + this.router.transitionTo('verse.word', word.strongsNumber); } get
Greek ULBGreek Morphology