Merge pull request #888 from philborman/master

Changes to sqlite commands, email notification, libgen options, magazine opf
DobyTang · Jun 30, 2017 · 582f7e3 · 582f7e3
2 parents fb4b821 + a5d54b8
commit 582f7e3
Show file tree

Hide file tree

Showing 36 changed files with 1,355 additions and 1,013 deletions.
diff --git a/data/interfaces/bookstrap/audio.html b/data/interfaces/bookstrap/audio.html
@@ -29,6 +29,9 @@
 </%def>
 <%def name="body()">
   <h1>${title}</h1>
+  %if lazylibrarian.AUDIO_UPDATE == True:
+    <p class="alert alert-info"><i class="fa fa-circle-o-notch fa-spin"></i> Library scan in progress ...</p>
+  %endif
   <form action="markBooks" method="get" class="form-inline">
     <div class="indented">
       <input type="hidden" name="booklang" value=${booklang}>
@@ -71,6 +74,9 @@ <h1>${title}</h1>
   </form>
 </%def>
 <%def name="headIncludes()">
+  %if lazylibrarian.AUDIO_UPDATE == True:
+  <meta http-equiv="refresh" content="10">
+  %endif
 </%def>
 <%def name="javascriptIncludes()">
   <script type="text/javascript">

diff --git a/data/interfaces/bookstrap/books.html b/data/interfaces/bookstrap/books.html
@@ -27,6 +27,9 @@
 </%def>
 <%def name="body()">
   <h1>${title}</h1>
+  %if lazylibrarian.EBOOK_UPDATE == True:
+    <p class="alert alert-info"><i class="fa fa-circle-o-notch fa-spin"></i> Library scan in progress ...</p>
+  %endif
   <form action="markBooks" method="get" class="form-inline">
     <div class="indented">
       <input type="hidden" name="booklang" value=${booklang}>
@@ -69,6 +72,9 @@ <h1>${title}</h1>
   </form>
 </%def>
 <%def name="headIncludes()">
+  %if lazylibrarian.EBOOK_UPDATE == True:
+  <meta http-equiv="refresh" content="10">
+  %endif
 </%def>
 <%def name="javascriptIncludes()">
   <script type="text/javascript">

diff --git a/data/interfaces/bookstrap/config.html b/data/interfaces/bookstrap/config.html
diff --git a/data/interfaces/bookstrap/history.html b/data/interfaces/bookstrap/history.html
@@ -77,6 +77,11 @@ <h1>${title}</h1>
                         primary: {
                             label: "Close",
                             className: 'btn-primary'
+                        },
+                        prompt: {
+                            label: "Clear Counters",
+                            className: 'btn-primary',
+                            callback: function(result){ $.get("cleardownloads", function(e) {}); }
                         }
                     }
                 });

diff --git a/data/interfaces/bookstrap/issues.html b/data/interfaces/bookstrap/issues.html
@@ -9,6 +9,7 @@
             <a href="forceProcess?source=magazines" class="button btn btn-sm btn-primary">Force Post-Processing</a>
             <a href="magazineScan" class="button btn btn-sm btn-primary"><i class="fa fa-flash"></i> Library Scan</a>
             <a href="pastIssues?whichStatus=Skipped" class="button btn btn-sm btn-primary"><i class="fa fa-calendar"></i> Past Issues</a>
+            <a href="magWall?title=${title}" class="button btn btn-sm btn-primary"><i class="fa fa-calendar"></i> Recent Issues</a>
         </div>
     </div>
 </%def>

diff --git a/data/interfaces/bookstrap/magazines.html b/data/interfaces/bookstrap/magazines.html
@@ -30,6 +30,9 @@
 <%def name="body()">
   <form action="markMagazines" method="get" class="form-inline">
     <h1>${title}</h1>
+    %if lazylibrarian.MAG_UPDATE == True:
+        <p class="alert alert-info"><i class="fa fa-circle-o-notch fa-spin"></i> Library scan in progress ...</p>
+    %endif
     <div class="indented">
       <div class="form-group">
         <label for="action" class="">Mark selected as</label>
@@ -108,6 +111,9 @@ <h1>${title}</h1>
   </form>
 </%def>
 <%def name="headIncludes()">
+  %if lazylibrarian.MAG_UPDATE == True:
+  <meta http-equiv="refresh" content="10">
+  %endif
 </%def>
 <%def name="javascriptIncludes()">
   <script>