diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-02-03 16:44:37 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-02-03 16:44:37 +0000 |
| commit | 929263e84ddc10bd0c801b3be8b4cf5495c0d16d (patch) | |
| tree | 99157fcad105e742ff80d47944a5753ead92c0d3 | |
| parent | 5a01923aff6dcb460b0b04d30be86eb25a7abc90 (diff) | |
| download | acf-core-929263e84ddc10bd0c801b3be8b4cf5495c0d16d.tar.bz2 acf-core-929263e84ddc10bd0c801b3be8b4cf5495c0d16d.tar.xz | |
Changed acf-util/logon controller to use standard view
| -rw-r--r-- | app/Makefile | 2 | ||||
| -rw-r--r-- | app/acf-util/logon-controller.lua | 6 | ||||
| -rw-r--r-- | app/acf-util/logon-html.lsp | 17 | ||||
| -rw-r--r-- | app/acf-util/logon-logout-html.lsp | 7 | ||||
| -rw-r--r-- | app/acf-util/logon-status-html.lsp | 13 |
5 files changed, 3 insertions, 42 deletions
diff --git a/app/Makefile b/app/Makefile index 68c21de..9f47121 100644 --- a/app/Makefile +++ b/app/Makefile @@ -3,9 +3,7 @@ include ../config.mk APP_DIST= \ acf-util/acf-util.roles \ acf-util/logon-controller.lua \ - acf-util/logon-html.lsp \ acf-util/logon-model.lua \ - acf-util/logon-status-html.lsp \ acf-util/roles-controller.lua \ acf-util/roles-model.lua \ acf-util/roles-html.lsp \ diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua index 7bbd522..df2fd70 100644 --- a/app/acf-util/logon-controller.lua +++ b/app/acf-util/logon-controller.lua @@ -22,9 +22,9 @@ end -- Logon a new user based upon id and password in clientdata logon = function(self) - local userid = cfe({ value=clientdata.userid or "", label="User ID" }) - local password = cfe({ label="Password" }) - local redir = cfe({ value=clientdata.redir, label="" }) + local userid = cfe({ value=clientdata.userid or "", label="User ID", seq=1 }) + local password = cfe({ type="password", label="Password", seq=2 }) + local redir = cfe({ type="hidden", value=clientdata.redir, label="" }) local cmdresult = cfe({ type="form", value={userid=userid, password=password, redir=redir}, label="Logon", option="Logon" }) if clientdata.Logon then local logonredirect = self.sessiondata.logonredirect diff --git a/app/acf-util/logon-html.lsp b/app/acf-util/logon-html.lsp deleted file mode 100644 index 29ced43..0000000 --- a/app/acf-util/logon-html.lsp +++ /dev/null @@ -1,17 +0,0 @@ -<% local form, viewlibrary, page_info, session = ... %> -<% require("htmlviewfunctions") %> - -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript"> - $(function(){ - $("input[name='userid']").focus(); - }); -</script> - -<h1><%= html.html_escape(form.label) %></h1> -<% - form.value.password.type = "password" - form.value.redir.type = "hidden" - local order = { "userid", "password" } - htmlviewfunctions.displayform(form, order) -%> diff --git a/app/acf-util/logon-logout-html.lsp b/app/acf-util/logon-logout-html.lsp deleted file mode 100644 index 765eb4f..0000000 --- a/app/acf-util/logon-logout-html.lsp +++ /dev/null @@ -1,7 +0,0 @@ -<% local view= ... %> -<% require("htmlviewfunctions") %> -<h1>Log Out</h1> - -<%= htmlviewfunctions.cfe_unpack(view) %> - -<%= html.html_escape(view.logout.value) %> diff --git a/app/acf-util/logon-status-html.lsp b/app/acf-util/logon-status-html.lsp deleted file mode 100644 index be905f3..0000000 --- a/app/acf-util/logon-status-html.lsp +++ /dev/null @@ -1,13 +0,0 @@ -<% local view = ... %> - -<h1>User Status</h1> - -<DL> - -<DT><%= html.html_escape(view.value.username.label) %></DT> -<DD><%= html.html_escape(view.value.username.value) %></DD> - -<DT><%= html.html_escape(view.value.sessionid.label) %></DT> -<DD><%= html.html_escape(view.value.sessionid.value) %></DD> - -</DL> |