Changes to use new htmlviewfunctions functions

1 files changed, 5 insertions, 5 deletions

diff --git a/openssl-model.lua b/openssl-model.lua
index 1df9b13..f5ab354 100644
--- a/openssl-model.lua
+++ b/openssl-model.lua
@@ -299,7 +299,7 @@ mymodule.getstatus = function()
 		end
 	end
 	local environment = mymodule.checkenvironment()
-	return cfe({ type="group", value={version=version, conffile=conffile, environment=environment, cacert=cacert, cacertcontents=cacertcontents, cakey=cakey}, label="openssl status" })
+	return cfe({ type="group", value={version=version, conffile=conffile, environment=environment, cacert=cacert, cacertcontents=cacertcontents, cakey=cakey}, label="OpenSSL status" })
 end
 
 mymodule.set_umask = function()
@@ -463,7 +463,7 @@ mymodule.viewrequest = function(request)
 	local reqpath = requestdir .. request
 	local cmdresult = modelfunctions.run_executable({"openssl", "req", "-in", reqpath..".csr", "-text", "-noout"})
 	local a,b,c = string.match(request, "([^%.]*)%.([^%.]*)%.([^%.]*)")
-	local request = cfe({ type="table", value={name=name, user=a, certtype=b, commonName=c, value=cmdresult}, label="Request" })
+	local request = cfe({ type="table", value={name=name, user=a, certtype=b, commonName=c, value=cmdresult}, label="Request Details" })
 	return request
 end
 
@@ -586,7 +586,7 @@ end
 mymodule.viewcert = function(cert)
 	local cmdresult = modelfunctions.run_executable({"openssl", "x509", "-in", certdir..cert..".crt", "-noout", "-text"})
 	local a,b,c,d = string.match(cert, "([^%.]*)%.([^%.]*)%.([^%.]*).([^%.]*)")
-	return cfe({ type="table", value={name=name, user=a, certtype=b, commonName=c, serial=d, value=cmdresult}, label="Certificate" })
+	return cfe({ type="table", value={name=name, user=a, certtype=b, commonName=c, serial=d, value=cmdresult}, label="Certificate Details" })
 end
 
 mymodule.getcert = function(cert)
@@ -728,8 +728,8 @@ mymodule.getca = function(certtype)
 end
 
 mymodule.getnewputca = function()
-	local ca = cfe({ type="raw", value=0, label="CA Certificate", descr='File must be a password protected ".pfx" file' })
-	local password = cfe({ label="Certificate Password" })
+	local ca = cfe({ type="raw", value=0, label="CA Certificate", descr='File must be a password protected ".pfx" file', seq=1 })
+	local password = cfe({ type="password", label="Certificate Password", seq=2 })
 	return cfe({ type="group", value={ca=ca, password=password} })
 end