Merge branch 'dev'

1 files changed, 77 insertions, 7 deletions

diff --git a/ext/bg/options.html b/ext/bg/options.html
index 42029727..7ad5ea5c 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -6,7 +6,9 @@
         <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, #options-advanced {
+            #anki-spinner, #anki-general, #anki-error,
+            #dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress, .dict-delete-progress,
+            #options-advanced {
                 display: none;
             }
 
@@ -64,10 +66,69 @@
 
             <div>
                 <div>
+                    <img src="img/spinner.gif" class="pull-right" id="dict-spinner" alt>
+                    <h3>Dictionaries</h3>
+                </div>
+
+                <p class="help-block">
+                    Yomichan can utilize both bundled and custom (see the <a href="https://foosoft.net/projects/yomichan-import">Yomichan Import</a>
+                    page for details) dictionaries. You can disable dictionaries that you no longer wish to use, or you can simply
+                    <a href="#" id="dict-purge">purge the database</a> to delete everything. Please make sure to wait for import
+                    and delete operations to complete before closing this page.
+                </p>
+
+                <div id="dict-purge-progress" class="text-danger">Dictionary data is being purged, please be patient...</div>
+
+                <div class="alert alert-warning" id="dict-warning">
+                    <strong>Warning:</strong>
+                    <span>No dictionaries found, use the importer below to install packaged and external dictionaries</span>
+                </div>
+
+                <div class="alert alert-danger" id="dict-error">
+                    <strong>Error:</strong>
+                    <span></span>
+                </div>
+
+                <div id="dict-groups"></div>
+
+                <div id="dict-import-progress">
+                    Dictionary data is being imported, please be patient...
+                    <div class="progress">
+                        <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
+                    </div>
+                </div>
+
+                <div class="input-group" id="dict-importer">
+                    <div class="input-group-btn">
+                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" data-url="edict">JMdict</a></li>
+                            <li><a href="#" data-url="enamdict">JMnedict</a></li>
+                            <li><a href="#" data-url="kanjidic">KANJIDIC2</a></li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="#" data-url="http://localhost:9876/index.json">Local dictionary</a></li>
+                        </ul>
+                    </div>
+                    <input type="text" id="dict-url" class="form-control" placeholder="Dictionary import URL">
+                    <div class="input-group-btn">
+                        <button type="button" id="dict-import" class="btn btn-primary" disabled>Import</button>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <div>
                     <img src="img/spinner.gif" class="pull-right" id="anki-spinner" alt>
                     <h3>Anki Options</h3>
                 </div>
 
+                <p class="help-block">
+                    Yomichan features automatic flashcard creation for <a href="http://ankisrs.net/">Anki</a>, a free application
+                    designed to help you retain knowledge. While the <a href="https://foosoft.net/projects/anki-connect/">AnkiConnect</a> plugin
+                    offers the best experience, it is also possible to create flashcards through <a href="https://ankiweb.net/">AnkiWeb</a>,
+                    provided you already have an account.
+                </p>
+
                 <div class="alert alert-danger" id="anki-error">
                     <strong>Error:</strong>
                     <span></span>
@@ -80,12 +141,6 @@
                         <option value="ankiconnect">AnkiConnect (requires the AnkiConnect plugin)</option>
                         <option value="ankiweb">AnkiWeb (requires an account on AnkiWeb)</option>
                     </select>
-                    <p class="help-block">
-                        Yomichan features automatic flashcard creation for <a href="http://ankisrs.net/">Anki</a>, a free application
-                        designed to help you retain knowledge. While the <a href="https://foosoft.net/projects/anki-connect/">AnkiConnect</a> plugin
-                        offers the best experience, it is also possible to create flashcards through <a href="https://ankiweb.net/">AnkiWeb</a>,
-                        provided you already have an account.
-                    </p>
                 </div>
 
                 <div id="anki-general">
@@ -158,6 +213,19 @@
                         </div>
                     </div>
                 </div>
+
+                <div>
+                    <h3>Support Development</h3>
+
+                    <p class="help-block">
+                        If you find Yomichan useful, please consider making a small donation as a way to show your appreciation for the countless hours
+                        that I have devoted to this extension. Seeing that people care about my work is great motivation for continuing to
+                        improve Yomichan!
+                    </p>
+                    <p>
+                        <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN"><img src="img/paypal.gif" alt></a>
+                    </p>
+                </div>
             </div>
 
             <div class="pull-right">
@@ -167,6 +235,8 @@
 
         <script src="../lib/jquery-2.2.2.min.js"></script>
         <script src="../lib/bootstrap-3.3.6-dist/js/bootstrap.min.js"></script>
+        <script src="../lib/handlebars.min.js"></script>
+        <script src="js/templates.js"></script>
         <script src="js/options.js"></script>
         <script src="js/options-form.js"></script>
     </body>