diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2014-04-25 10:54:55 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2014-04-25 10:54:55 +0000 |
| commit | 93117edd17f8b1be4a943484a9a6568afd57da3e (patch) | |
| tree | a138ec3713101a753735b030217d2063b2e8603f | |
| parent | 5832775f8f2fa176a1ccb4be5eb0e8ede11b185e (diff) | |
| download | acf-apk-tools-93117edd17f8b1be4a943484a9a6568afd57da3e.tar.bz2 acf-apk-tools-93117edd17f8b1be4a943484a9a6568afd57da3e.tar.xz | |
Change loaded and available html views to use View button rather than link on the package name
| -rw-r--r-- | apk-available-html.lsp | 7 | ||||
| -rw-r--r-- | apk-loaded-html.lsp | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/apk-available-html.lsp b/apk-available-html.lsp index 3d7c8bc..3872667 100644 --- a/apk-available-html.lsp +++ b/apk-available-html.lsp @@ -35,7 +35,7 @@ <% local packagecfe = cfe({ type="hidden", value="" }) %> <% for i,packagetable in pairs(form.value) do %> <tr> - <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %> + <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") or viewlibrary.check_permission("details") then %> <% packagecfe.value = packagetable.name %> <td> <% if viewlibrary.check_permission("install") and not packagetable.upgrade then %> @@ -44,9 +44,12 @@ <% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %> <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %> <% end %> + <% if viewlibrary.check_permission("details") then %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="View", action="details" }), page_info, -1) %> + <% end %> </td> <% end %> - <td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td> + <td><%= html.html_escape(packagetable.name) %></td> <td><%= html.html_escape(packagetable.version) %></td> </tr> <% end %> diff --git a/apk-loaded-html.lsp b/apk-loaded-html.lsp index 4113e80..5fc82df 100644 --- a/apk-loaded-html.lsp +++ b/apk-loaded-html.lsp @@ -38,7 +38,7 @@ <% local packagecfe = cfe({ type="hidden", value="" }) %> <% for i,packagetable in pairs(form.value.toplevel.value) do %> <tr> - <% if viewlibrary.check_permission("delete") or viewlibrary.check_permission("upgrade") then %> + <% if viewlibrary.check_permission("delete") or viewlibrary.check_permission("upgrade") or viewlibrary.check_permission("details") then %> <% packagecfe.value = packagetable.name %> <td> <% if viewlibrary.check_permission("delete") then %> @@ -47,9 +47,12 @@ <% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %> <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %> <% end %> + <% if viewlibrary.check_permission("details") then %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="View", action="details" }), page_info, -1) %> + <% end %> </td> <% end %> - <td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td> + <td><%= html.html_escape(packagetable.name) %></td> <td><%= html.html_escape(packagetable.version) %></td> <td><%= html.html_escape(packagetable.description) %></td> </tr> @@ -70,7 +73,7 @@ </thead><tbody> <% for i,packagetable in pairs(form.value.dependent.value) do %> <tr> - <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %> + <% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") or viewlibrary.check_permission("details") then %> <% packagecfe.value = packagetable.name %> <td> <% if viewlibrary.check_permission("install") then %> @@ -79,9 +82,12 @@ <% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %> <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %> <% end %> + <% if viewlibrary.check_permission("details") then %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="View", action="details" }), page_info, -1) %> + <% end %> </td> <% end %> - <td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td> + <td><%= html.html_escape(packagetable.name) %></td> <td><%= html.html_escape(packagetable.version) %></td> <td><%= html.html_escape(packagetable.description) %></td> </tr> |