Merge pull request #201 from sei-vsarvepalli/main

Updates to Dryad SSVC Calcultor to use radio buttons in Analyst mode
CERTCC · Sep 23, 2022 · b57654b · b57654b
2 parents 64725c1 + d265dcb
commit b57654b
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 2,291 deletions.
diff --git a/ssvc-calc/css.css b/ssvc-calc/css.css
@@ -1,4 +1,49 @@
-/* css version 2.2.6 */
+/* css version 2.2.7 */
+.ssvcvector {
+    color: #7d1d1d;
+}
+.blackbody .ssvcvector {
+    color: #ffc107;
+}
+.export-header {
+    width: 100%;
+}
+.export-header h3 {
+    display: inline;
+    text-decoration: underline;
+}
+.export-header span {
+    padding: 8px;
+}
+.exportdiv {
+    top: 0px;
+    left: 30%;
+    border-radius: 6px;
+    border: 1px solid #333;    
+}
+.blackbody .exportdiv {
+    border: 1px solid white;
+}    
+.blackbody .radiogaga {
+    color: white;
+}
+.radiogaga > div.selected {
+    border: 1px solid #333;
+    border-radius: 4px;
+    padding-left: 4px;
+}
+.blackbody .radiogaga > div.selected {
+    border: 1px solid #eee;
+}
+.exportdiv {
+    background: rgba(255,255,255,0.95);
+}
+.blackbody .exportdiv {
+    background: rgba(32,32,32,0.9);
+}
+.margtop {
+    margin-top: 0.7em;
+}
 #zoomcontrol {
     position: absolute;
     left: 30px;

diff --git a/ssvc-calc/index.html b/ssvc-calc/index.html
@@ -30,8 +30,8 @@
     <link href="magicsuggest-min.css" rel="stylesheet">
     <script src="magicsuggest-min.js" async defer></script>
     <link rel="stylesheet" href="main.css">
-    <link rel="stylesheet" href="css.css?v=1654014549">
-    <script src="ungraph.js?v=1654014549"></script>
+    <link rel="stylesheet" href="css.css?v=1663537129">
+    <script src="ungraph.js?v=1663537129"></script>
   </head>
   <body class="text-center blackbody">
     <img src="../moon_icon.png" class="cert-tweet" alt="CERT Logo"
@@ -87,6 +87,12 @@ <h4 class="cover-heading">
 	  <div class="cover_heading_append d-none">
 	    (CISA Coordinator v2)
 	  </div>
+	  <button type="button" class="btn btn-secondary" id="exportopen"
+		  data-toggle="tooltip" data-placement="bottom"
+		  title="Show Export" style="display:none"
+		  onclick="export_show(false)">
+	    Export</button>
+
 	</h4>
 	<div class="alert" id="topalert" role="alert">
 	  This is an alert!
@@ -106,7 +112,8 @@ <h4 class="cover-heading">
 		  data-toggle="tooltip" data-placement="bottom"
 		  title="Explore the full decision tree of this SSVC Instance"
 		  onclick="show_full_tree()">
-	    Show Full Tree</button>
+	    Show Full Tree
+	  </button>
 	  <a href="javascript:void(0)" title="View previous score"
 	     alt="View previous score" id="table_toggle" style="display:none"
 	     onclick="cve_table_toggle()">
@@ -147,7 +154,7 @@ <h4 class="cover-heading">
 	      <select id="graph-ungraph" class="form-control mauto"
 		      onchange="swapg(this)">
 		<option value="Graphic">Mode: Graphic</option>
-		<option value="Simple">Mode: Simple</option>		
+		<option value="Analyst">Mode: Analyst</option>		
 	      </select>	      
 	      <button class="btn btn-dark btn-bordered d-none"
 		      onclick="$('#cvetsvload').click()">
@@ -399,8 +406,13 @@ <h4>Decision Tree Usage:</h4>
     <div id="biscuit" class="top_fixed tescape tloader">
     </div>
     <div id="exporter" class="d-none">
-      <div class="row justify-content-center position-absolute exportdiv"
-	   style="top:180px;left:30%">
+      <div class="row justify-content-center position-absolute exportdiv">
+	<div class="export-header">
+	  <h3> Export Calculated Score</h3>
+	  <button type="button" aria-label="Close" class="close h3" onclick="$(this).parent().parent().remove()">
+	    <span aria-hidden="true">×</span>
+	  </button>
+	</div>
 	  <div class="col-auto">
 	    <table class="table table-borderless w-auto">
 	      <tbody>
@@ -424,7 +436,7 @@ <h4>Decision Tree Usage:</h4>
 		<tr>
 		  <td>
 		    <div>
-		      <span class="text text-warning ssvcvector d-inline">
+		      <span class="text ssvcvector d-inline">
 		      </span>
 		      <span onclick="copym('#graph .ssvcvector')">
 			<img src="icons8-copy-60.png"
@@ -478,7 +490,7 @@ <h4>Decision Tree Usage:</h4>
       </form>
       <canvas id="canvas" style="display:none">
     </div>      
-    <script src="ssvc.js?v=1654014549"></script>
+    <script src="ssvc.js?v=1663537129"></script>
   </body>
 </html>