Fixed routing error and added css for conversion status page

crocodilestick · Dec 12, 2024 · f80b072 · f80b072
1 parent 93edaa0
commit f80b072
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/root/app/calibre-web/cps/templates/admin.html b/root/app/calibre-web/cps/templates/admin.html
@@ -206,7 +206,7 @@ <h2>{{_('CWA Admin Functions⚡')}}</h2>
     <a class="btn btn-default" id="check_mon_srvs" href="{{url_for('cwa_check_status.cwa_flash_status')}}">{{_('Check CWA Status')}}</a>
   </div>
   <div class="row form-group">
-    <a class="btn btn-default" id="library_convert" href="{{url_for('convert_library.cwa_library_convert')}}">{{_('Convert Library to Target Format')}}</a>
+    <a class="btn btn-default" id="library_convert" href="{{url_for('convert_library.start_conversion')}}">{{_('Convert Library to Target Format')}}</a>
     <a class="btn btn-default" id="cwa_history" href="{{url_for('cwa_history.cwa_history_show')}}">{{_('Show CWA History')}}</a>
   </div>
   <div class="row-form-group">

diff --git a/root/app/calibre-web/cps/templates/cwa_convert_library.html b/root/app/calibre-web/cps/templates/cwa_convert_library.html
@@ -2,12 +2,16 @@
 
 {% block body %}
 <div class="discover">
-  <h2>{{title}}</h2>
+  <h2 style="color: whitesmoke;">{{title}}</h2>
     <div>
       <h3>CWA Library Convertor</h3><br>
       <div class="row">
-        <div class="logging_window">
-          <h2 id="innerStatus">Loading...</h2>
+        <div class="logging_window" style="padding-left: 15px;
+                                          padding-right: 15px;
+                                          background: #0000003d;
+                                          padding-top: 11px;
+                                          padding-bottom: 1px;">
+          <p id="innerStatus" style="color: whitesmoke;">Loading...</h2>
         </div>
       </div>
     </div>
@@ -31,7 +35,7 @@ <h2 id="innerStatus">Loading...</h2>
 
     document.getElementById("innerStatus").innerHTML = get.status.replace(/\n/g, "<br>"); // * 10 + "&percnt;"
 
-    if (get.status == "Done!"){
+    if (get.status.includes("FIN")){
       document.getElementById("innerStatus").innerHTML;
       clearTimeout(timeout);
       return false;
@@ -42,4 +46,4 @@ <h2 id="innerStatus">Loading...</h2>
 
   getStatus();
   </script>
-{% endblock %}
+{% endblock %}