summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-11-08 19:41:03 -0800
committerAlex Yatskov <alex@foosoft.net>2016-11-08 19:41:03 -0800
commit885f508edafdcf7f060dde73b6bae65f56bed3d2 (patch)
tree0ef958acb9c6cf5dadf523e53ca465dd38f70517
parentaf45e8fab63487e0e5ffc43b99ff6c075d38e4ab (diff)
WIP
-rw-r--r--ext/bg/js/options-form.js2
-rw-r--r--ext/bg/js/templates.js2
-rw-r--r--ext/bg/options.html4
-rw-r--r--tmpl/dictionary.html4
4 files changed, 7 insertions, 5 deletions
diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index f5ca3ce2..8bb60808 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -172,7 +172,7 @@ function onDictionaryImport() {
const dictError = $('#dict-error');
dictError.hide();
- const progressbar = $('#dict-progress');
+ const progressbar = $('#dict-import-progress');
progressbar.show();
const callback = (total, current) => {
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 206ed605..d198a76f 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
+ alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
+ " <small>v."
+ alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
- + "</small></h4>\n </div>\n <div class=\"col-xs-4 text-right disabled\">\n <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n </div>\n </div>\n\n <div class=\"checkbox "
+ + "</small></h4>\n </div>\n <div class=\"col-xs-4 text-right disabled\">\n <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n </div>\n </div>\n <div class=\"progress\" id=\"dict-delete-progress\">\n <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n </div>\n <div class=\"checkbox "
+ ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\">\n <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
+ ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/options.html b/ext/bg/options.html
index d7aead07..a3c66ce3 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
<style>
- #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-progress, #dict-laggy, #options-advanced {
+ #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-import-progress, #dict-delete-progress, #dict-laggy, #options-advanced {
display: none;
}
@@ -76,7 +76,7 @@
The dictionary database appears to be busy; please wait for currently executing tasks to complete.
</div>
- <div class="progress" id="dict-progress">
+ <div class="progress" id="dict-import-progress">
<div class="progress-bar progress-bar-striped" style="width: 0%"></div>
</div>
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 035c0755..4f2d9790 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -7,7 +7,9 @@
<button type="button" class="dict-delete btn btn-danger">Delete</button>
</div>
</div>
-
+ <div class="progress" id="dict-delete-progress">
+ <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
+ </div>
<div class="checkbox {{#unless hasTerms}}disabled{{/unless}}">
<label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
</div>