From 125d7a985e77d216812a019ad3c07cd80c0a08d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Nov 2008 17:51:40 +0000 Subject: [PATCH] * Use jquery for the logfile manipulation. --- src/HydraFrontend/root/layout.tt | 42 +++++++++++++++- src/HydraFrontend/root/log.tt | 1 - src/HydraFrontend/root/static/css/logfile.css | 7 +-- src/HydraFrontend/root/static/js/treebits.js | 50 ------------------- src/HydraFrontend/xsl/log2html.xsl | 8 ++- 5 files changed, 49 insertions(+), 59 deletions(-) delete mode 100644 src/HydraFrontend/root/static/js/treebits.js diff --git a/src/HydraFrontend/root/layout.tt b/src/HydraFrontend/root/layout.tt index ff2bac99..0105a0f6 100644 --- a/src/HydraFrontend/root/layout.tt +++ b/src/HydraFrontend/root/layout.tt @@ -18,12 +18,50 @@ - + + diff --git a/src/HydraFrontend/root/log.tt b/src/HydraFrontend/root/log.tt index 0874742f..a226b6f7 100644 --- a/src/HydraFrontend/root/log.tt +++ b/src/HydraFrontend/root/log.tt @@ -2,7 +2,6 @@

Build log [% IF step %] of step [% step.stepnr %] [% ELSE %][% log.logphase %][% END %] of build ID [% id %]

-
[% logtext -%]
diff --git a/src/HydraFrontend/root/static/css/logfile.css b/src/HydraFrontend/root/static/css/logfile.css index b4709048..091662dd 100644 --- a/src/HydraFrontend/root/static/css/logfile.css +++ b/src/HydraFrontend/root/static/css/logfile.css @@ -69,11 +69,8 @@ em.storeref:hover span.popup { } -.toggle { +.logTreeToggle { text-decoration: none; -} - -.showTree, .hideTree { font-family: monospace; font-size: larger; } @@ -81,4 +78,4 @@ em.storeref:hover span.popup { .error { color: #ff0000; font-weight: bold; -} \ No newline at end of file +} diff --git a/src/HydraFrontend/root/static/js/treebits.js b/src/HydraFrontend/root/static/js/treebits.js deleted file mode 100644 index 3011b391..00000000 --- a/src/HydraFrontend/root/static/js/treebits.js +++ /dev/null @@ -1,50 +0,0 @@ -/* Acknowledgement: this is based on the Wikipedia table-of-contents - * toggle. */ - - -var idCounter = 0; - - -function showTreeToggle(isHidden) { - if (document.getElementById) { - var id = "toggle_" + idCounter; - document.writeln( - '' + - '+' + - '-' + - ''); - idCounter = idCounter + 1; - } -} - - -function toggleTree(id) { - - var href = document.getElementById(id); - - var node = href; - var tree = null; - while (node != null) { - if (node.className == "nesting") tree = node; - node = node.nextSibling; - } - - node = href.firstChild; - var hideTree = null; - var showTree = null; - while (node != null) { - if (node.className == "showTree") showTree = node; - else if (node.className == "hideTree") hideTree = node; - node = node.nextSibling; - } - - if (tree.style.display == 'none') { - tree.style.display = ''; - hideTree.style.display = ''; - showTree.style.display = 'none'; - } else { - tree.style.display = 'none'; - hideTree.style.display = 'none'; - showTree.style.display = ''; - } -} diff --git a/src/HydraFrontend/xsl/log2html.xsl b/src/HydraFrontend/xsl/log2html.xsl index 78532882..beb3eaf3 100644 --- a/src/HydraFrontend/xsl/log2html.xsl +++ b/src/HydraFrontend/xsl/log2html.xsl @@ -7,6 +7,8 @@ doctype-system="http://www.w3.org/TR/html4/strict.dtd" /> + [Expand all] + [Collapse all]