summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2011-09-09 20:38:45 +0000
committerTed Trask <ttrask01@yahoo.com>2011-09-09 20:38:45 +0000
commit5b3647c7f98f04f33ae21e28e75dca9b8d9e9ff5 (patch)
tree49eeedfa841aad49e9de8725c1ba9268aa51da90
parentf15d7db1ed2d4e6a8e4734789646d67d65cc91b9 (diff)
downloadacf-weblog-5b3647c7f98f04f33ae21e28e75dca9b8d9e9ff5.tar.bz2
acf-weblog-5b3647c7f98f04f33ae21e28e75dca9b8d9e9ff5.tar.xz
Reimplement shorturi and shortreason
-rw-r--r--weblog-viewweblog-html.lsp12
1 files changed, 9 insertions, 3 deletions
diff --git a/weblog-viewweblog-html.lsp b/weblog-viewweblog-html.lsp
index 0bda5cb..fe1f74d 100644
--- a/weblog-viewweblog-html.lsp
+++ b/weblog-viewweblog-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions")%>
+<% require("viewfunctions") %>
<%
-- Insert a string into another string
@@ -236,8 +236,14 @@ end %>
<TD WIDTH="2%"><% if watch.deniedyesno ~= "0" then %> <IMG SRC='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/denied.png' width='13' height='13'><% end %></TD>
<TD WIDTH="2%"><% if watch.bypassyesno ~= "0" then %> <IMG SRC='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/bypass.png' width='13' height='13'><% end %></TD>
<TD><%= html.html_escape(watch.score) %></TD>
- <TD><%= html.html_escape(watch.reason) %></TD>
- <TD style="word-wrap: break-word" width="500"><% highlight_uri=html.html_escape(watch.uri)
+ <TD<% if (watch.shortreason and watch.shortreason ~= "" and watch.reason and watch.reason ~= "") then %> title="<%= html.html_escape(watch.reason) %>"<% end %>>
+ <% if (watch.shortreason and watch.shortreason ~= "") then %>
+ <%= html.html_escape(watch.shortreason) %>
+ <% elseif (watch.reason and watch.reason ~= "") then %>
+ <%= html.html_escape(watch.reason) %>
+ <% end %>
+ </TD>
+ <TD style="word-wrap: break-word" width="500" title="<%= html.html_escape(watch.uri) %>"><% highlight_uri=html.html_escape(watch.shorturi or watch.uri)
if watch.wordloc ~= nil then
if string.find(watch.wordloc, "|") then
badwords = format.string_to_table(watch.wordloc, "|")