From 878989065d9e92ab74ad310eca886323178d44f0 Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Wed, 7 Oct 2009 16:42:53 +0200 Subject: Graphical fix. Modifying
to fix skin issues.\n Removing hardcoded backgroundcolor from table and using class=header instead to have the skins do the choosing of colors. --- weblog-adhocquery-html.lsp | 26 +++++++++++++++----------- weblog-listsources-html.lsp | 6 ++---- weblog-status-html.lsp | 19 +++++++++++++------ weblog-viewactivitylog-html.lsp | 4 +++- weblog-viewauditstats-html.lsp | 4 ++-- weblog-viewblocklog-html.lsp | 2 +- weblog-viewusagestats-html.lsp | 2 ++ weblog-viewwatchlist-html.lsp | 4 ++++ 8 files changed, 42 insertions(+), 25 deletions(-) diff --git a/weblog-adhocquery-html.lsp b/weblog-adhocquery-html.lsp index b55fc4d..e1c79f2 100644 --- a/weblog-adhocquery-html.lsp +++ b/weblog-adhocquery-html.lsp @@ -4,30 +4,29 @@ require("viewfunctions") <% if form.value.result then %>

<%= html.html_escape(form.value.result.label) %>

+
<% require("html") %> <%= html.cfe_unpack(form.value.result.value) %>
-
Download query result
-
+
<% end %>

<%= html.html_escape(form.label) %>

<% displayformstart(form, page_info) %> -
<% displayformitem(form.value.query, "query") %> -
-<% displayformend(form) %> - This form accepts a Postgresql SELECT statement and displays the results. Examples: The available database tables and descriptions are as follows:
+<% displayformend(form) %> +

PubWeblog and PubBlocklog

+
These tables contain the combined squid access log and dansguardian log for every access and blocked access respectively. The definition of the table is as follows: 
 (
@@ -41,16 +40,19 @@ These tables contain the combined squid access log and dansguardian log for ever
     score integer,
     shortreason text
 )
-
+

dbHistLog

+
This table contains the database history, including such information as which log files were loaded and how many entries they contained. The definition of the table is as follows: 
 (
     logdatetime timestamp(3) without time zone NOT NULL,
     msgtext text
 )
-
+
+

Source

+
This table contains the list of log file sources. The definition of the table is as follows: 
 (
@@ -62,8 +64,9 @@ This table contains the list of log file sources. The definition of the table is
     tzislocal boolean,
     enabled boolean
 )
-
+

Usagestat

+
This table contains a historical record of pages requested and blocked by hour. The definition of the table is as follows: 
 (
@@ -72,12 +75,13 @@ This table contains a historical record of pages requested and blocked by hour.
     numrequest integer,
     numblock integer
 )
-
+

Watchlist

+
This table contains the user watch list. The definition of the table is as follows: 
 (
     clientuserid character varying(64) NOT NULL,
     expiredatetime timestamp(0) without time zone NOT NULL
 )
-
+
diff --git a/weblog-listsources-html.lsp b/weblog-listsources-html.lsp index 53a571f..270e24c 100644 --- a/weblog-listsources-html.lsp +++ b/weblog-listsources-html.lsp @@ -5,7 +5,7 @@ require("viewfunctions") <% displaycommandresults({"deletesource", "editsource", "testsource", "createsource", "importlogs"}, session) %>

<%= html.html_escape(data.label) %>

- +
@@ -38,15 +38,13 @@ require("viewfunctions")

No sources found

<% end %> -
+
">
Create New Source
-
-
">
Import Logs
diff --git a/weblog-status-html.lsp b/weblog-status-html.lsp index d0784ba..fae98c0 100644 --- a/weblog-status-html.lsp +++ b/weblog-status-html.lsp @@ -5,23 +5,30 @@ require("viewfunctions") <% displaycommandresults({"createdatabase"}, session, true) %>

Weblog Database Status

+
<% local status if viewlibrary and viewlibrary.dispatch_component then if session.permissions.postgresql and session.permissions.postgresql.status then status = viewlibrary.dispatch_component("postgresql/postgresql/status", nil, true) end -end -if status then %> -

Database is <%= status.value.status.value %> +end %> + +

Database status
+<% if status then %> +<%= status.value.status.value %> <% else %> -

Database status unknown +unknown <% end %> +

+
Weblog Database
<% if data.value then %> -

Weblog Database present +present <% else %> -

Weblog Database missing +missing <% if viewlibrary and viewlibrary.dispatch_component then viewlibrary.dispatch_component("createdatabase") end %> <% end %> +

+
diff --git a/weblog-viewactivitylog-html.lsp b/weblog-viewactivitylog-html.lsp index 516b79e..a272544 100644 --- a/weblog-viewactivitylog-html.lsp +++ b/weblog-viewactivitylog-html.lsp @@ -4,9 +4,10 @@ <% local subdata, pagedata = paginate(data.value, page_info.clientdata, 100) %>

<%= html.html_escape(data.label) %>

+
<% displaypagination(pagedata, page_info) %>
Action
- + @@ -25,3 +26,4 @@ <% if #data.value == 0 then %>

No history found

<% end %> + diff --git a/weblog-viewauditstats-html.lsp b/weblog-viewauditstats-html.lsp index 97d1f38..f33576c 100644 --- a/weblog-viewauditstats-html.lsp +++ b/weblog-viewauditstats-html.lsp @@ -19,8 +19,9 @@

<%= html.html_escape(data.label) %>

+
Date Message
- + @@ -40,7 +41,6 @@

No blocks, try adjusting the audit dates

<% end %> -
">
Complete Audit
diff --git a/weblog-viewblocklog-html.lsp b/weblog-viewblocklog-html.lsp index 6f62c06..6b60acd 100644 --- a/weblog-viewblocklog-html.lsp +++ b/weblog-viewblocklog-html.lsp @@ -62,7 +62,7 @@ end

<%= html.html_escape(data.label) %>

<% if data.value.groupby.value == "clientip" then %>Client IP<% else %>User ID<% end %> Blocks Maximum Score
- + diff --git a/weblog-viewusagestats-html.lsp b/weblog-viewusagestats-html.lsp index 708b374..0d534e1 100644 --- a/weblog-viewusagestats-html.lsp +++ b/weblog-viewusagestats-html.lsp @@ -4,6 +4,7 @@ <% local subdata, pagedata = paginate(data.value, page_info.clientdata, 100) %>

<%= html.html_escape(data.label) %>

+
<% displaypagination(pagedata, page_info) %>
Timestamp Client IP User ID
@@ -29,3 +30,4 @@ <% if #data.value == 0 then %>

No usage stats found

<% end %> + diff --git a/weblog-viewwatchlist-html.lsp b/weblog-viewwatchlist-html.lsp index d17a42f..ba7b88a 100644 --- a/weblog-viewwatchlist-html.lsp +++ b/weblog-viewwatchlist-html.lsp @@ -14,6 +14,7 @@ <% displaycommandresults({"createwatchlistentry"}, session, true) %>

<%= html.html_escape(data.label) %>

+
@@ -36,7 +37,10 @@ <% if #data.value == 0 then %>

No watchlist entries found

<% end %> + <% if viewlibrary and viewlibrary.dispatch_component and session.permissions[page_info.controller].createwatchlistentry then viewlibrary.dispatch_component("createwatchlistentry") end %> + + -- cgit v1.2.3
Delete