diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2010-03-10 11:15:25 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2010-03-10 11:15:25 +0000 |
| commit | 05fe5a366d064728db49b93d2ed1a416e099d49a (patch) | |
| tree | 7e485f2d3aaad04e30c69a83e21256df92fa715c | |
| parent | 5c99c770bf9fabd45f6d7e778a2aff54b2a45f6a (diff) | |
| download | acf-did-05fe5a366d064728db49b93d2ed1a416e099d49a.tar.bz2 acf-did-05fe5a366d064728db49b93d2ed1a416e099d49a.tar.xz | |
A bunch of graphical changes.
Removed dashes from assign autocomplete and display current extension.
Pagination changed to 15 DIDs from 100.
No longer a popup with different template for editdefinition.
| -rw-r--r-- | did-assigndefinition-html.lsp | 6 | ||||
| -rw-r--r-- | did-html.lsp | 4 | ||||
| -rw-r--r-- | template-did-editdefinition-html.lsp | 33 |
3 files changed, 6 insertions, 37 deletions
diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp index e228ce4..472cf84 100644 --- a/did-assigndefinition-html.lsp +++ b/did-assigndefinition-html.lsp @@ -15,7 +15,9 @@ if (data.value.did.errtxt) $("#diderrtxt").html(data.value.did.errtxt); else if (data.value.rules.value.search("\n") != -1) - $("#diderrtxt").html("Warning - this did contains time constraints"); + $("#diderrtxt").html("Warning - this DID contains time constraints"); + else + $("#diderrtxt").html("Current extension is " + data.value.rules.value.match(/[^,]*/)); } ); }; @@ -24,7 +26,7 @@ var data = "<% local result = viewlibrary.dispatch_component("listdefinitions", nil, true) local tab = {} for i,res in ipairs(result.value.definitions.value) do - tab[#tab+1] = res.did + tab[#tab+1] = string.gsub(res.did, "-", "") end io.write(table.concat(tab, " ")) %>".split(" "); $("#did").focus(); diff --git a/did-html.lsp b/did-html.lsp index 8b645ad..b86fc14 100644 --- a/did-html.lsp +++ b/did-html.lsp @@ -2,7 +2,7 @@ require("viewfunctions") %> -<% local subdata, pagedata = paginate(data.value.definitions.value, page_info.clientdata, 100) %> +<% local subdata, pagedata = paginate(data.value.definitions.value, page_info.clientdata, 15) %> <script type="text/javascript"> function newPopup(url) { @@ -41,7 +41,7 @@ function newPopup(url) { <% for i,def in ipairs(subdata) do %> <TR> <TD> - <%= html.link{value = "JavaScript:newPopup('editdefinition?did=" .. def.did.."');", label="Edit "} %> + <%= html.link{value = "editdefinition?did=" .. def.did, label="Edit "} %> <% if viewlibrary.check_permission("publish") then %> <%= html.link{value = "publish?did=" .. def.did, label="Publish "} %> <% end %> diff --git a/template-did-editdefinition-html.lsp b/template-did-editdefinition-html.lsp deleted file mode 100644 index 7787c5a..0000000 --- a/template-did-editdefinition-html.lsp +++ /dev/null @@ -1,33 +0,0 @@ -<% local viewtable, viewlibrary, pageinfo, session = ... - html=require("html") %> -Status: 200 OK -Content-Type: text/html -<% if (session.id) then - io.write( html.cookie.set("sessionid", session.id) ) - else - io.write (html.cookie.unset("sessionid")) - end -%> - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<% -local hostname = "" -if viewlibrary and viewlibrary.dispatch_component then - local result = viewlibrary.dispatch_component("alpine-baselayout/hostname/read", nil, true) - if result and result.value then - hostname = result.value - end -end -%> -<title><%= html.html_escape(hostname .. " - " .. pageinfo.controller .. "->" .. pageinfo.action) %></title> -</head> -<body> - - <% local func = haserl.loadfile(pageinfo.viewfile) %> - <% func (viewtable, viewlibrary, pageinfo, session) %> - -</body> -</html> |