Revert "Allow bootstrap in popup templates"

This reverts commit da0cb81801ac897fa41761af0b0b18fda9d16195.
author: Alex Yatskov <alex@foosoft.net> 2016-10-08 19:40:19 -0700
committer: Alex Yatskov <alex@foosoft.net> 2016-10-08 19:40:19 -0700
commit: f34b51252245b1834e0cd049859782145156e09b (patch)
tree: ba1ed80e1fd22c0419a4efab7abe44961553b314
parent: da0cb81801ac897fa41761af0b0b18fda9d16195 (diff)
7 files changed, 21 insertions, 32 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 75bf7be5..1f9e3c30 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -5,22 +5,18 @@ templates['footer.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
 
   return "    <script src=\""
     + container.escapeExpression(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"root","hash":{},"data":data}) : helper)))
-    + "/fg/js/frame.js\"></script>\n    </body>\n</html>\n";
+    + "/js/frame.js\"></script>\n    </body>\n</html>\n";
 },"useData":true});
 templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<!DOCTYPE html>\n<html lang=\"en\">\n    <head>\n        <meta charset=\"UTF-8\">\n        <title></title>\n        <style>\n            @font-face {\n                font-family: kanji-stroke-orders;\n                src:         url('"
     + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
-    + "/fg/ttf/kanji-stroke-orders.ttf');\n            }\n            @font-face {\n                font-family: vl-gothic-regular;\n                src:         url('"
+    + "/ttf/kanji-stroke-orders.ttf');\n            }\n            @font-face {\n                font-family: vl-gothic-regular;\n                src:         url('"
     + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
-    + "/fg/ttf/vl-gothic-regular.ttf');\n            }\n        </style>\n        <link rel=\"stylesheet\" type=\"text/css\" href=\""
+    + "/ttf/vl-gothic-regular.ttf');\n            }\n        </style>\n        <link rel=\"stylesheet\" href=\""
     + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
-    + "/lib/bootstrap-3.3.6-dist/css/bootstrap.min.css\">\n        <link rel=\"stylesheet\" type=\"text/css\" href=\""
-    + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
-    + "/lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css\">\n        <link rel=\"stylesheet\" href=\""
-    + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
-    + "/fg/css/frame.css\">\n    </head>\n    <body>\n";
+    + "/css/frame.css\">\n    </head>\n    <body>\n";
 },"useData":true});
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
@@ -37,7 +33,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + alias1(((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=\""
     + alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0))
-    + "/fg/img/add_kanji.png\"></a>\n";
+    + "/img/add_kanji.png\"></a>\n";
 },"4":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -112,7 +108,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + alias1(((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=\""
     + alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0))
-    + "/fg/img/play_audio.png\"></a>\n";
+    + "/img/play_audio.png\"></a>\n";
 },"4":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression, alias5=container.lambda;
 
@@ -120,11 +116,11 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + 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=\""
     + alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0))
-    + "/fg/img/add_term_kanji.png\"></a>\n        <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note disabled\" data-mode=\"term_kana\" data-index=\""
+    + "/img/add_term_kanji.png\"></a>\n        <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note 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=\""
     + alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0))
-    + "/fg/img/add_term_kana.png\"></a>\n";
+    + "/img/add_term_kana.png\"></a>\n";
 },"6":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = 
   "    <div class=\"term-expression\"><ruby>";
diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js
index 79a3eb9f..1e817c1c 100644
--- a/ext/fg/js/driver.js
+++ b/ext/fg/js/driver.js
@@ -29,7 +29,7 @@ class Driver {
         this.options = null;
         this.definitions = null;
         this.sequence = 0;
-        this.extRoot = chrome.extension.getURL('.');
+        this.fgRoot = chrome.extension.getURL('fg');
 
         chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
         window.addEventListener('message', this.onFrameMessage.bind(this));
@@ -139,7 +139,7 @@ class Driver {
                 });
 
                 const sequence = ++this.sequence;
-                return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'term-list.html').then(content => {
+                return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'term-list.html').then(content => {
                     this.definitions = definitions;
                     this.pendingLookup = false;
                     this.showPopup(textSource, content);
@@ -167,7 +167,7 @@ class Driver {
                 definitions.forEach(definition => definition.url = window.location.href);
 
                 const sequence = ++this.sequence;
-                return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'kanji-list.html').then(content => {
+                return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => {
                     this.definitions = definitions;
                     this.pendingLookup = false;
                     this.showPopup(textSource, content);
@@ -278,7 +278,7 @@ class Driver {
             definitions.forEach(definition => definition.url = window.location.href);
 
             const sequence = ++this.sequence;
-            return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'kanji-list.html').then(content => {
+            return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => {
                 this.definitions = definitions;
                 this.popup.setContent(content, definitions);
                 return canAddDefinitions(definitions, ['kanji']);
diff --git a/ext/manifest.json b/ext/manifest.json
index dc766795..02cfd6d8 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -33,11 +33,6 @@
         "fg/img/play_audio.png",
         "fg/js/frame.js",
         "fg/ttf/kanji-stroke-orders.ttf",
-        "fg/ttf/vl-gothic-regular.ttf",
-        "lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css",
-        "lib/bootstrap-3.3.6-dist/css/bootstrap.min.css",
-        "lib/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf",
-        "lib/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff",
-        "lib/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2"
+        "fg/ttf/vl-gothic-regular.ttf"
     ]
 }
diff --git a/tmpl/footer.html b/tmpl/footer.html
index 2cb496c9..3840600f 100644
--- a/tmpl/footer.html
+++ b/tmpl/footer.html
@@ -1,3 +1,3 @@
-    <script src="{{root}}/fg/js/frame.js"></script>
+    <script src="{{root}}/js/frame.js"></script>
     </body>
 </html>
diff --git a/tmpl/header.html b/tmpl/header.html
index e5ecb06e..b7fad070 100644
--- a/tmpl/header.html
+++ b/tmpl/header.html
@@ -6,15 +6,13 @@
         <style>
             @font-face {
                 font-family: kanji-stroke-orders;
-                src:         url('{{root}}/fg/ttf/kanji-stroke-orders.ttf');
+                src:         url('{{root}}/ttf/kanji-stroke-orders.ttf');
             }
             @font-face {
                 font-family: vl-gothic-regular;
-                src:         url('{{root}}/fg/ttf/vl-gothic-regular.ttf');
+                src:         url('{{root}}/ttf/vl-gothic-regular.ttf');
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="{{root}}/lib/bootstrap-3.3.6-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="{{root}}/lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" href="{{root}}/fg/css/frame.css">
+        <link rel="stylesheet" href="{{root}}/css/frame.css">
     </head>
     <body>
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 80c642bd..0a0cfe11 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -2,7 +2,7 @@
     {{#with options}}
     <div class="action-bar" data-sequence="{{../sequence}}">
         {{#if enableAnkiConnect}}
-        <a href="#" title="Add Kanji" class="action-add-note disabled" data-mode="kanji" data-index="{{@index}}"><img src="{{../root}}/fg/img/add_kanji.png"></a>
+        <a href="#" title="Add Kanji" class="action-add-note disabled" data-mode="kanji" data-index="{{@index}}"><img src="{{../root}}/img/add_kanji.png"></a>
         {{/if}}
     </div>
     {{/with}}
diff --git a/tmpl/term.html b/tmpl/term.html
index 65278145..aff3e2ff 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -2,11 +2,11 @@
     {{#with options}}
     <div class="action-bar" data-sequence="{{../sequence}}">
         {{#if enableAudioPlayback}}
-        <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="{{../root}}/fg/img/play_audio.png"></a>
+        <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="{{../root}}/img/play_audio.png"></a>
         {{/if}}
         {{#if enableAnkiConnect}}
-        <a href="#" title="Add term as expression" class="action-add-note disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="{{../root}}/fg/img/add_term_kanji.png"></a>
-        <a href="#" title="Add term as reading" class="action-add-note disabled" data-mode="term_kana" data-index="{{@index}}"><img src="{{../root}}/fg/img/add_term_kana.png"></a>
+        <a href="#" title="Add term as expression" class="action-add-note disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="{{../root}}/img/add_term_kanji.png"></a>
+        <a href="#" title="Add term as reading" class="action-add-note disabled" data-mode="term_kana" data-index="{{@index}}"><img src="{{../root}}/img/add_term_kana.png"></a>
         {{/if}}
     </div>
     {{/with}}
author	Alex Yatskov <alex@foosoft.net>	2016-10-08 19:40:19 -0700
committer	Alex Yatskov <alex@foosoft.net>	2016-10-08 19:40:19 -0700
commit	f34b51252245b1834e0cd049859782145156e09b (patch)
tree	ba1ed80e1fd22c0419a4efab7abe44961553b314
parent	da0cb81801ac897fa41761af0b0b18fda9d16195 (diff)