From e7f4ecd0cf8455c6c6ce57dae48da246a02f76d0 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 6 Jan 2016 05:10:33 +0100
Subject: Added interface to run selftest in TPS UI.

The TPS UI has been modified to provide an interface to run the
selftests and display the results.

https://fedorahosted.org/pki/ticket/1502
---
 base/tps/shared/webapps/tps/ui/selftest.html  | 35 ++++++++++++++++++++++++
 base/tps/shared/webapps/tps/ui/selftests.html | 39 +++++++++++++++++++++------
 2 files changed, 66 insertions(+), 8 deletions(-)

(limited to 'base/tps/shared/webapps/tps/ui')

diff --git a/base/tps/shared/webapps/tps/ui/selftest.html b/base/tps/shared/webapps/tps/ui/selftest.html
index 8a680355a..1b43cfe5e 100644
--- a/base/tps/shared/webapps/tps/ui/selftest.html
+++ b/base/tps/shared/webapps/tps/ui/selftest.html
@@ -24,6 +24,14 @@
 
 <span name="title" class="pki-title">Self Test ${id}</span>
 
+<span class="pki-actions">
+
+<ul name="view" class="pki-actions-menu">
+<li name="run"><a href="#">Run</a></li>
+</ul>
+
+</span>
+
 </div>
 
 <div name="user" class="pki-fields">
@@ -40,3 +48,30 @@
     <input name="criticalOnDemand" readonly="readonly"><br>
 </fieldset>
 </div>
+
+<div id="selftest-result-dialog" class="modal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <span class="pficon pficon-close"></span>
+                </button>
+                <h4 class="modal-title">Self Test Result</h4>
+            </div>
+            <div class="modal-body">
+                <fieldset>
+                <label>Self Test ID</label>
+                <input name="id" readonly="readonly"><br>
+                <label>Status</label>
+                <input name="status" readonly="readonly"><br>
+                <label>Output</label>
+                <textarea name="output" rows="20" style="width: 100%; white-space: pre;">
+                </textarea>
+                </fieldset>
+            </div>
+            <div class="modal-footer">
+                <button name="close" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/base/tps/shared/webapps/tps/ui/selftests.html b/base/tps/shared/webapps/tps/ui/selftests.html
index 95bafeaff..92133c3d3 100644
--- a/base/tps/shared/webapps/tps/ui/selftests.html
+++ b/base/tps/shared/webapps/tps/ui/selftests.html
@@ -32,26 +32,22 @@
                  <input name="search" type="text" placeholder="Search...">
              </span>
              <span class="pki-table-buttons">
+                 <button name="run">Run</button>
+                 <button name="clear">Clear</button>
              </span>
          </th>
     </tr>
     <tr>
         <th class="pki-select-column"><input id="selftests-selectall" type="checkbox"><label for="selftests-selectall">&nbsp;</label></th>
         <th>Self Test ID</th>
-        <th>Enabled at Statup</th>
-        <th>Critical at Startup</th>
-        <th>Enabled on Demand</th>
-        <th>Critical on Demand</th>
+        <th>Status</th>
     </tr>
 </thead>
 <tbody>
     <tr>
         <td class="pki-select-column"><input id="selftests-select" type="checkbox"><label for="selftests-select">&nbsp;</label></td>
         <td name="id"><a href="#selftests/${id}">${id}</a></td>
-        <td name="enabledAtStartup">${enabledAtStartup}</td>
-        <td name="criticalAtStartup">${criticalAtStartup}</td>
-        <td name="enabledOnDemand">${enabledOnDemand}</td>
-        <td name="criticalOnDemand">${criticalOnDemand}</td>
+        <td name="status"></td>
     </tr>
 </tbody>
 <tfoot>
@@ -77,3 +73,30 @@
     </tr>
 </tfoot>
 </table>
+
+<div id="selftest-result-dialog" class="modal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <span class="pficon pficon-close"></span>
+                </button>
+                <h4 class="modal-title">Self Test Result</h4>
+            </div>
+            <div class="modal-body">
+                <fieldset>
+                <label>Self Test ID</label>
+                <input name="id" readonly="readonly"><br>
+                <label>Status</label>
+                <input name="status" readonly="readonly"><br>
+                <label>Output</label>
+                <textarea name="output" rows="20" style="width: 100%; white-space: pre;">
+                </textarea>
+                </fieldset>
+            </div>
+            <div class="modal-footer">
+                <button name="close" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
-- 
cgit