Template tweaks

Author: osanderson

templates/apduLog.html

@@ -0,0 +1,24 @@
+{{define "apduLog"}}
+
+<h1>APDU LOG</h1>
+
+<h2>Count: {{len .}}</h2>
+<h2>Duration(ms): {{. | ApduTotalDurMs}}</h2>
+
+{{ range . }}
+<div><pre>
+Desc: <b>{{ .Desc }}</b>
+Dur(ms): <b>{{ .DurMs }}</b>
+</pre></div>
+<div><pre>
+-> {{ .Tx | BytesToHex }}
+    {{if .Child}}
+--> {{ .Child.Tx | BytesToHex }}
+<-- {{ .Child.Rx | BytesToHex }}
+    {{end}}
+<- {{ .Rx | BytesToHex }}
+</pre></div>
+<hr>
+{{ end }}
+
+{{end}}

templates/cardAccess.html

@@ -0,0 +1,10 @@
+{{define "cardAccess"}}
+
+<h2>CardAccess</h2>
+{{if .}}
+{{template "fileHexAndTlv" .RawData}}
+{{else}}
+<i>No data</i>
+{{end}}
+
+{{end}}

templates/cardSecurity.html

@@ -0,0 +1,10 @@
+{{define "cardSecurity"}}
+
+<h2>CardSecurity</h2>
+{{if .}}
+{{template "fileHexAndTlv" .RawData}}
+{{else}}
+<i>No data</i>
+{{end}}
+
+{{end}}

templates/com.html

@@ -0,0 +1,10 @@
+{{define "com"}}
+
+<h2>COM</h2>
+{{if .}}
+{{template "fileHexAndTlv" .RawData}}
+{{else}}
+<i>No data</i>
+{{end}}
+
+{{end}}

templates/dir.html

@@ -0,0 +1,10 @@
+{{define "dir"}}
+
+<h2>DIR</h2>
+{{if .}}
+{{template "fileHexAndTlv" .RawData}}
+{{else}}
+<i>No data</i>
+{{end}}
+
+{{end}}

templates/output.html

@@ -64,40 +64,11 @@ <h2>Passive Authentication <sub>CardSecurity</sub></h2>
 <i>No data</i>
 {{end}}
 
-<h2>CardAccess</h2>
-{{if .Mf.CardAccess}}
-{{template "fileHexAndTlv" .Mf.CardAccess.RawData}}
-{{else}}
-<i>No data</i>
-{{end}}
-
-<h2>CardSecurity</h2>
-{{if .Mf.CardSecurity}}
-{{template "fileHexAndTlv" .Mf.CardSecurity.RawData}}
-{{else}}
-<i>No data</i>
-{{end}}
-
-<h2>DIR</h2>
-{{if .Mf.Dir}}
-{{template "fileHexAndTlv" .Mf.Dir.RawData}}
-{{else}}
-<i>No data</i>
-{{end}}
-
-<h2>COM</h2>
-{{if .Mf.Lds1.Com}}
-{{template "fileHexAndTlv" .Mf.Lds1.Com.RawData}}
-{{else}}
-<i>No data</i>
-{{end}}
-
-<h2>SOD <sub>Document Security Object</sub></h2>
-{{if .Mf.Lds1.Sod}}
-{{template "fileHexAndTlv" .Mf.Lds1.Sod.RawData}}
-{{else}}
-<i>No data</i>
-{{end}}
+{{template "cardAccess" .Mf.CardAccess}}
+{{template "cardSecurity" .Mf.CardSecurity}}
+{{template "dir" .Mf.Dir}}
+{{template "com" .Mf.Lds1.Com}}
+{{template "sod" .Mf.Lds1.Sod}}
 
 {{template "dg1" .Mf.Lds1.Dg1}}
 {{template "dg2" .Mf.Lds1.Dg2}}
@@ -109,26 +80,7 @@ <h2>SOD <sub>Document Security Object</sub></h2>
 {{template "dg15" .Mf.Lds1.Dg15}}
 {{template "dg16" .Mf.Lds1.Dg16}}
 
-<h1>APDU LOG</h1>
-
-<h2>Count: {{len .Apdus}}</h2>
-<h2>Duration(ms): {{.Apdus | ApduTotalDurMs}}</h2>
-
-{{ range .Apdus }}
-<div><pre>
-Desc: <b>{{ .Desc }}</b>
-Dur(ms): <b>{{ .DurMs }}</b>
-</pre></div>
-<div><pre>
--> {{ .Tx | BytesToHex }}
-    {{if .Child}}
---> {{ .Child.Tx | BytesToHex }}
-<-- {{ .Child.Rx | BytesToHex }}
-    {{end}}
-<- {{ .Rx | BytesToHex }}
-</pre></div>
-<hr>
-{{ end }}
+{{template "apduLog" .Apdus}}
 
 <div id="json">
 <h1>Document JSON</h1>

templates/sod.html

@@ -0,0 +1,10 @@
+{{define "sod"}}
+
+<h2>SOD <sub>Document Security Object</sub></h2>
+{{if .}}
+{{template "fileHexAndTlv" .RawData}}
+{{else}}
+<i>No data</i>
+{{end}}
+
+{{end}}