[svn]

1 files changed, 21 insertions, 6 deletions

diff --git a/templates/controlPanel.html b/templates/controlPanel.html
index bce56f8..487b7d1 100644
--- a/templates/controlPanel.html
+++ b/templates/controlPanel.html
@@ -1,15 +1,30 @@
 {% extends "base.html" %}

 {% block content %}

-<form name="import" method="post" action="">

 

-<h3>Dump:</h3>

+

+{% if jobs_completed %}

+    <div style="border:thin black solid; width: 40%; color:#F00; margin-left:auto; margin-right:auto">

+            Just finished running:

+                <ul>

+                {% for job in jobs_completed %}

+                    <li>{{ job }}</li>

+                {% endfor %}

+                </ul>

+            {% if settings.LOGFILE %}See the logfile at {{settings.LOGFILE.path}} for more information.{% endif %}

+            <a href="#" class="closeDiv">dismiss this message</a>

+    </div>

+{% endif %}

+

+

+<form name="reset" method="post" action="">

+<h3>Wipe:</h3>

 

 <table>

-<tr><td>Dump entire database and recreate tables: </td><td><input type="checkbox" name="dump_db" /></td></tr>

+<tr><td>Wipe entire database and recreate tables: </td><td><input type="checkbox" name="reset" /></td><td>      <input type="submit" id="Import" value="I really want to delete all information in troggle, and accept all responsibility."></td></tr>

 </table>

-

+</form>

 <h3>Import (non-destructive):</h3>

-

+<form name="import" method="post" action="">

 <table>

 <tr><td>caves from cavetab2.csv using parsers\cavetab.py</td><td> <input type="checkbox" class="parser" name="import_cavetab"/></td></tr>

 <tr><td>logbook entries using parsers\logbooks.py</td><td><input type="checkbox" name="import_logbooks"/></td></tr>

@@ -24,7 +39,7 @@
     <p>

       <input type="submit" id="Import" value="Import">

       

-      <input type="submit" name="check_all_import" id="check_all_import" value="Check all">

+      <input type="submit" name="check_all_import" id="check_all_import" value="Check all" disabled >

     </p>

 </form>