From 395af352f0381d43086563aa7d72ac56ac207133 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 4 Mar 2017 11:53:55 -0800
Subject: wip

---
 ext/bg/js/templates.js | 12 ++++++------
 ext/bg/search.html     |  4 ++++
 ext/fg/css/frame.css   |  2 +-
 ext/fg/frame.html      |  2 +-
 ext/fg/js/frame.js     |  4 ++--
 tmpl/kanji.html        |  4 ++--
 tmpl/terms.html        |  8 ++++----
 7 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index ed6d3dd8..f8306b1b 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -302,7 +302,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 
   return "            <a href=\"#\" title=\"Add Kanji\" class=\"action-add-note pending disabled\" data-mode=\"kanji\" data-index=\""
     + container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"img/add_kanji.png\"></a>\n";
+    + "\"><img src=\"/fg/img/add_kanji.png\"></a>\n";
 },"4":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -362,7 +362,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"18":function(container,depth0,helpers,partials,data) {
     return "<hr>";
 },"20":function(container,depth0,helpers,partials,data) {
-    return "    <p>No results found</p>\n";
+    return "    <p>No results found.</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
@@ -459,15 +459,15 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 
   return "            <a href=\"#\" title=\"Add term as expression\" class=\"action-add-note pending disabled\" data-mode=\"term_kanji\" data-index=\""
     + alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"img/add_term_kanji.png\"></a>\n            <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
+    + "\"><img src=\"/fg/img/add_term_kanji.png\"></a>\n            <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
     + alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"img/add_term_kana.png\"></a>\n";
+    + "\"><img src=\"/fg/img/add_term_kana.png\"></a>\n";
 },"15":function(container,depth0,helpers,partials,data) {
     var helper;
 
   return "            <a href=\"#\" title=\"Play audio\" class=\"action-play-audio\" data-index=\""
     + container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"img/play_audio.png\"></a>\n";
+    + "\"><img src=\"/fg/img/play_audio.png\"></a>\n";
 },"17":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = 
   "        <div class=\"expression\"><ruby>";
@@ -542,7 +542,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"36":function(container,depth0,helpers,partials,data) {
     return "<hr>";
 },"38":function(container,depth0,helpers,partials,data) {
-    return "    <p>No results found</p>\n";
+    return "    <p>No results found.</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 68bc6e03..0737f99c 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -18,6 +18,10 @@
                 </form>
             </p>
 
+            <div id="spinner">
+                <img src="img/spinner.gif">
+            </div>
+
             <div id="content"></div>
         </div>
         <script src="../lib/jquery-3.1.1.min.js"></script>
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index 9697ba2e..e2006328 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -41,7 +41,7 @@ hr {
     margin-bottom: 0.8em;
 }
 
-.spinner {
+#spinner {
     bottom: 5px;
     display: none;
     position: fixed;
diff --git a/ext/fg/frame.html b/ext/fg/frame.html
index 14fd63c1..a5baee98 100644
--- a/ext/fg/frame.html
+++ b/ext/fg/frame.html
@@ -9,7 +9,7 @@
     </head>
     <body>
         <div class="container-fluid">
-            <div class="spinner">
+            <div id="spinner">
                 <img src="img/spinner.gif">
             </div>
 
diff --git a/ext/fg/js/frame.js b/ext/fg/js/frame.js
index 32e227d0..c1253e41 100644
--- a/ext/fg/js/frame.js
+++ b/ext/fg/js/frame.js
@@ -75,7 +75,7 @@ class Frame {
         const sequence = ++this.sequence;
         const params = {
             definitions,
-            addable: options.ankiMethod !== 'disabled'
+            addable: options.anki.enabled
         };
 
         definitions.forEach(definition => {
@@ -165,7 +165,7 @@ class Frame {
     }
 
     showSpinner(show) {
-        const spinner = $('.spinner');
+        const spinner = $('#spinner');
         if (show) {
             spinner.show();
         } else {
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 43c57aed..fefef9bb 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -2,7 +2,7 @@
 <p>
     <div class="actions">
         {{#if addable}}
-            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="img/add_kanji.png"></a>
+            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="/fg/img/add_kanji.png"></a>
         {{/if}}
     </div>
 
@@ -55,5 +55,5 @@
         {{> kanji addable=../addable root=../root}}
     {{/each}}
 {{else}}
-    <p>No results found</p>
+    <p>No results found.</p>
 {{/if}}
diff --git a/tmpl/terms.html b/tmpl/terms.html
index 036aa465..cb68c74f 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -21,11 +21,11 @@
 <p>
     <div class="actions">
         {{#if addable}}
-            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a>
-            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a>
+            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="/fg/img/add_term_kanji.png"></a>
+            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="/fg/img/add_term_kana.png"></a>
         {{/if}}
         {{#if playback}}
-            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a>
+            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/fg/img/play_audio.png"></a>
         {{/if}}
     </div>
 
@@ -67,5 +67,5 @@
         {{> term grouped=../grouped addable=../addable playback=../playback}}
     {{/each}}
 {{else}}
-    <p>No results found</p>
+    <p>No results found.</p>
 {{/if}}
-- 
cgit v1.2.3