fix style import conflict

app/components/scripture-nav-bar.hbs

@@ -1,19 +1,29 @@
 <nav class="scripture-menu navbar navbar-dark sticky-top">
-  <div class="container">
-    <Scrollmenu @visible="true">
-      {{#each this.books as |book|}}
-        <Book @book={{book}} @showChapters={{this.showChapters}} />
-      {{/each}}
-    </Scrollmenu>
+  <a href="#" title="Go to the previous verse">
+  <svg xmlns="http://www.w3.org/2000/svg" fill="#dadada" class="bi bi-arrow-left-square ml-auto" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M15 2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2zM0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm11.5 5.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5z"/>
+  </svg>
+  </a> 
+    <div class="container w-75">
+      <Scrollmenu @visible="true">
+        {{#each this.books as |book|}}
+          <Book @book={{book}} @showChapters={{this.showChapters}} />
+        {{/each}}
+      </Scrollmenu>
 
-    <ChapterNav @book={{this.currentBook}}
-                @showVerses={{this.showVerses}}
-                @visible={{this.chaptersVisible}} />
+      <ChapterNav @book={{this.currentBook}}
+                  @showVerses={{this.showVerses}}
+                  @visible={{this.chaptersVisible}} />
 
-    <VerseNav @book={{this.currentBook}}
-              @chapter={{this.currentChapter}}
-              @verses={{this.currentChapter.verses}}
-              @verseSelected={{this.verseSelected}}
-              @visible={{this.versesVisible}} />
-  </div>
+      <VerseNav @book={{this.currentBook}}
+                @chapter={{this.currentChapter}}
+                @verses={{this.currentChapter.verses}}
+                @verseSelected={{this.verseSelected}}
+                @visible={{this.versesVisible}} />
+    </div>
+  <a href="#" title="Go to the next verse">
+  <svg xmlns="http://www.w3.org/2000/svg" fill="#dadada" class="bi bi-arrow-right-square mr-auto" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M15 2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2zM0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm4.5 5.5a.5.5 0 0 0 0 1h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H4.5z"/>
+  </svg>
+  </a>
 </nav>

app/router.js

@@ -17,5 +17,4 @@ Router.map(function() {
   this.route('contact-us');
   this.route('morph-legend');
   this.route('commentary-intro', { path: '/commentary/:book_id' });
-  this.route('commentary-article', { path: '/commentary/articles/:article_id' });
 });

app/routes/commentary-article.js

@@ -1,14 +0,0 @@
-import Route from '@ember/routing/route';
-import fetch from 'fetch';
-import { htmlSafe } from '@ember/template';
-import ENV from 'gwt-frontend/config/environment';
-
-export default class CommentaryArticleRoute extends Route {
-  async model(params) {
-    const response = await fetch(ENV.APP.hostUrl + '/api/v1/commentary/articles/' + params.article_id);
-    const body = await response.text().then(function(text){
-      return new htmlSafe(text);
-    });
-    return { body };
-  }
-}

app/routes/commentary-intro.js

@@ -1,12 +1,10 @@
 import Route from '@ember/routing/route';
 import fetch from 'fetch';
 import { htmlSafe } from '@ember/template';
-import ENV from 'gwt-frontend/config/environment';
 
 export default class CommentaryIntroRoute extends Route {
   async model(params) {
-    console.log(ENV);
-    const response = await fetch(ENV.APP.hostUrl + '/api/v1/commentary/' + params.book_id + '/chapter/intro');
+    const response = await fetch('http://gwt.api/api/v1/commentary/' + params.book_id + '/chapter/intro');
     const body = await response.text().then(function(text){
       return new htmlSafe(text);
     });

app/styles/app.scss

@@ -11,4 +11,6 @@
 
 @import "components/footer";
 
-@import "components/user-guide"
+@import "components/user-guide";
+
+@import "components/verse";

app/styles/components/help.scss

@@ -26,6 +26,15 @@ a #help-button-mobile {
 	visibility: hidden;
 }
 
+.desktop-img {
+    background-image: url(/public/assets/images/desk.jpg);
+	width:100%;
+	height:851px;
+	max-height:100%;
+    background-repeat: no-repeat;
+    background-size: contain;
+}
+
 }
 
 @media only screen and (max-width: 991.98px) {
@@ -48,4 +57,11 @@ a #help-button-desktop {
 	visibility: hidden;	
 }
 
+.mobile-img {
+    background-image: url(/public/assets/images/mobile.jpg);
+	width:100%;
+	height:1348px;
+    background-repeat: no-repeat;
+    background-size: contain;
+}
 }

app/styles/components/user-guide.scss

@@ -1,10 +1,9 @@
 .help-video
 {
-  max-width: 100%;
+  max-width: 90%;
   height: auto;
   max-height: 75%;
-  text-align: center;
-  cursor: pointer;
+  text-align:center;
 }
 
 .help-img {

app/styles/components/verse.scss

@@ -0,0 +1,17 @@
+.bi-arrow-left-square {
+	width:2rem;
+	height: 2rem;
+}
+
+.bi-arrow-right-square {
+	width:2rem;
+	height: 2rem;
+}
+
+a .bi-arrow-left-square, a .bi-arrow-right-square {
+	color:#212529;
+}
+
+.bi-arrow-left-square:hover,.bi-arrow-right-square:hover {
+	fill:darkgrey;
+}

app/templates/commentary-article.hbs

@@ -1,7 +0,0 @@
-{{page-title "Commentary Article"}}
-
-<div class="container pt-4">
-  {{{@model.body}}}
-</div>
-
-{{outlet}}

app/templates/site-purpose.hbs

@@ -1,35 +1,4 @@
 <div class="container mt-5">
   <h2 class="mt-5">Website Purpose</h2>
-  <hr>
-  <p>This website is designed to help Bible translators gain valuable insight into the meaning of the biblical text in its original languages. We recognize that formal training in of the biblical languages is very limited and few people in the world have the ability to pursue this training. We also recognize that knowledge of the biblical languages helps people to produce more accurate Bible translations. In light of these truths, this website has been developed to give Bible translators access to information about the meaning of the Bible in its original languages. Because most Bible translators are non-native speakers of English, the content on this website is designed to be used by non-native speakers of English. All content has been produced using “writing for international translators”, which is a way of writing for non-native speakers of English that does not use overly technical or complex language.</p>
-
-  <h2 class="mt-5">English and Greek Texts Used</h2>
-  <hr>
-  <h5 class="mt-3">English</h5>
-  <p>The English Bible used for this site is the Unlocked Literal Bible (ULB).<br>
-    The Unlocked Literal Bible is an open-licensed version of the Bible derived from 1901 The American Standard Version, and updated using the most reliable Hebrew, Aramaic, and Greek copies of the Biblical texts available. It is intended to accurately reflect the meanings of those texts and to be used as a source text for Bible translators to translate the Bible into their own language.</p>
-
-  <h5>Greek</h5>
-  <p>The Greek text used for this site is the Open Greek New Testament (OGNT).  This text is the result of the Open Greek New Testament Project. The goals of the Open Greek New Testament Project are to:</p>
-    <ul>
-      <li>offer <b>a FREE NA-equivalent text</b> of Greek New Testament, compiled from open-resources;</li>
-      <li>align <b>a FREE NA-equivalent Greek New Testament</b> with a group of high-quality and open-source materials;</li>
-      <li>develop an online reader for <b>FREE ACCESS</b> of major resources integrated in this project. [<a href="https://opengnt.com/" target="_blank">OpenGNT.com</a>]</li>
-    </ul>
-  <p>The text of OGNT was built upon and compiled from a group of high-quality scholarly materials. It serves as the base text for the rest of the project. This provides all bible readers, students or scholars a FREE text of Greek New Testament, which is the closest equivalent to the text of NA28 / NA27, for studies or research purposes.</p>
-
-  <p>As the text of OGNT is close to the text of NA28 / NA27, OGNT is a very good candidate for bridging a free Greek New Testament text with resources, which were originally keyed to the text of NA28 / NA27. So far, Open Greek New Testament Project has successfully aligned the text of OGNT with various scholarly resources, e.g. Tyndale Amalgamated NT Tagged texts, OpenText Linguisitic Annotations, Levinsohn Greek New Testament Features, Mounce Greek-English Dictionary, Berean interlinear translations, etc.</p>
-
-  <h5>The Latest Version (version 3) of the OGNT</h5>
-  <p>The latest base text of Open Greek New Testament Project was compiled from Berean Greek Bible and its associated database, which is primarily based on the Greek New Testament, Η ΚΑΙΝΗ ΔΙΑΘΗΚΗ, edited by Eberhard Nestle, published in 1904 by the British and Foreign Bible Society.</p>
-
-  <p>The Greek New Testament (Nestle, 1904) is now a public domain document worldwide, without any limitations for use or copyright issues. The Berean Bible Translation Committee adopted it years ago as the base text for developing the Berean Greek Bible and associated resources on New Testament.</p>
-
-  <p>The final text of the Berean Greek Bible is primary based on Nestle Greek New Testament (1904), with modernization of spellings and textual decisions reflecting the best and earliest manuscripts. In addition, Berean translation table marks some significant textual variants of popular critical Greek New Testament editions, with a set of symbols.</p>
-
-  <h2 class="mt-5">Purpose of the Lexicon Entries</h2>
-  <hr>
-  <p>The lexicon entries which display after selecting (clicking or tapping) a Greek word are intended to serve the needs of Mother-tongue translators and translation checkers and reviewers. It does this by providing the lexical meaning and other information about each word in the original language of the New Testament.  This lexicon is written in WIT (Writing for International Translators) style so that non-professional translators can more easily translate it into any of the world’s languages.  The Greek words are connected to their associated lexicon entries by Strong’s numbers. Because there are different numbering systems (even within Strong’s system), the Bible Translation Resources website follows the Strong’s numbering system that the Open Greek New Testament uses.</p>
-
-  <p>“Although the Greek words in Strong's Concordance are numbered 1–5624, the numbers 2717 and 3203–3302 are unassigned due to 'changes in the enumeration while in progress'. Not every distinct word is assigned a number, but rather only the root words. For example, αγαπησεις is assigned the same number as αγαπατε – both are listed as Greek word #25 in Strong's Concordance (αγαπαω).” [Source: Wikipedia]</p>
+  <p class="mt-4">This website is designed to help Bible translators gain valuable insight into the meaning of the biblical text in its original languages. We recognize that formal training in the biblical languages is very limited and few people in the world have the ability to pursue this training. We also recognize that knowledge of the biblical languages helps people to produce more accurate Bible translations. In light of these truths, this website has been developed to give Bible translators access to information about the meaning of the Bible in its original languages. Because most Bible translators are non-native speakers of English, the content on this website is designed to be used by non-native speakers of English. All content has been produced using “writing for international translators”, which is a way of writing for non-native speakers of English that does not use overly technical or complex language.</p>
 </div>

app/templates/user-guide.hbs

@@ -4,18 +4,14 @@
     </div>
   <h2 class="mt-4">How to Use This Site</h2>
   <p class="mt-4">Here are a few visual aids to help you learn the basics of using this site.</p>
+  <h3>Screenshots</h3>
+  <p>(Click the image to open large in a new tab.)</p>
+  <a href="/assets/images/desk.jpg" target="_blank"><img src="/assets/images/desk.jpg" class="help-img img-fluid"></a>
 
-  <h3 class="mt-4 mb-3">Video tutorial</h3>
-    <video controls="controls" src="//btr.mrgreekgeek.com/btr_getting_started-new.mp4" class="help-video" poster="/assets/images/vid-thumb.jpg">
+  <h3 class="mt-4">Video tutorial</h3>
+    <video controls="controls" src="//btr.mrgreekgeek.com/btr_getting_started.mp4" class="help-video" poster="/assets/images/vid-thumb.jpg">
     Your browser does not support the HTML5 Video element.
     </video>
 
-  <h3 class="mt-4 mb-3">Screenshots</h3>
-    <p>(Click the image to open large in a new tab.)</p>
-      <picture>
-        <source media="(min-width: 991.97px)" srcset="/assets/images/btr-help-image.jpg">
-        <source media="(max-width: 991.98px)" srcset="/assets/images/BTR-mobile-help.jpg">
-        <img src="/assets/images/btr-help-image.jpg" class="help-img img-fluid">
-      </picture>
 
 </div>

app/templates/verse.hbs

@@ -1,5 +1,7 @@
-<div class="container pt-4">
-  <h1>{{model.reference}}</h1>
+<div class="container pt-4 text-center">
+  <h1 id="verse-ref">{{model.reference}}</h1>
+</div>
+<div class="container">
   <div class="row">
     <div class="col-12 pt-4 pb-3">
       <h4>ULB</h4>

config/environment.js

@@ -38,7 +38,7 @@ module.exports = function (environment) {
     ENV.APP.LOG_TRANSITIONS = true;
     ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    ENV.APP.hostUrl = 'http://gwt.api';
+    ENV.APP.hostUrl = 'http://backend.bibletranslationresources.org';
   }
 
   if (environment === 'test') {
@@ -55,13 +55,13 @@ module.exports = function (environment) {
 
   if (environment === 'production') {
     // here you can enable a production-specific feature
-    ENV.APP.hostUrl = 'https://backend.bibletranslationresources.org';
+    ENV.APP.hostUrl = 'http://backend.bibletranslationresources.org';
   }
 
   if (environment === 'staging') {
-    ENV.APP.hostUrl = 'https://backend.bibletranslationresources.org';
-    ENV.APP.rootURL = 'https://bibletranslationresources.org/test/current/';
-    ENV.APP.baseUrl = 'https://bibletranslationresources.org/test/current/';
+    ENV.APP.hostUrl = 'http://backend.bibletranslationresources.org';
+    ENV.APP.rootURL = 'http://bibletranslationresources.org/test/current/';
+    ENV.APP.baseUrl = 'http://bibletranslationresources.org/test/current/';
     ENV.APP.locationType = 'hash';
   }
 

tests/unit/routes/commentary-article-test.js

@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Route | commentary-article', function(hooks) {
-  setupTest(hooks);
-
-  test('it exists', function(assert) {
-    let route = this.owner.lookup('route:commentary-article');
-    assert.ok(route);
-  });
-});