2 new revisions: Revision: 28b6c5de4f5c Author: Pekka Klärck Date: Fri Jun 17 01:57:44 2011 Log: Always visible link to log/report from report/log. http://code.google.com/p/robotframework/source/detail?r=28b6c5de4f5c
Revision: 2ca82d9232e4 Author: Pekka Klärck Date: Fri Jun 17 01:57:49 2011 Log: Automated merge with https://robotframework.googlecode.com/hg/ http://code.google.com/p/robotframework/source/detail?r=2ca82d9232e4 ============================================================================== Revision: 28b6c5de4f5c Author: Pekka Klärck Date: Fri Jun 17 01:57:44 2011 Log: Always visible link to log/report from report/log. http://code.google.com/p/robotframework/source/detail?r=28b6c5de4f5c Modified: /src/robot/webcontent/common.css /src/robot/webcontent/log.html /src/robot/webcontent/report.html ======================================= --- /src/robot/webcontent/common.css Thu Jun 16 14:29:37 2011 +++ /src/robot/webcontent/common.css Fri Jun 17 01:57:44 2011 @@ -26,21 +26,22 @@ /* Report/Log links */ -#report_link { +#report_or_log_link { position: fixed; top: 0px; right: 0px; background: black; border-radius: 0 0 0 4px; -} -#report_link a { - margin: 0 1em; + width: 8em; + text-align: center; +} +#report_or_log_link a { color: white; text-decoration: none; font-weight: bold; letter-spacing: 0.1em; } -#report_link a:hover { +#report_or_log_link a:hover { color: yellow; } ======================================= --- /src/robot/webcontent/log.html Thu Jun 16 14:29:37 2011 +++ /src/robot/webcontent/log.html Fri Jun 17 01:57:44 2011 @@ -32,9 +32,7 @@ </div> <div id="javascript_enabled" style="visibility: hidden;"> <div class="header" id="header_div"></div> - <!-- TODO: Generate link to report. - Also add link from report to log and tune CSS --> - <div id="report_link"><a href="report.html">REPORT</a></div> + <div id="report_or_log_link"><a href="#">REPORT</a></div> <h2>Test Statistics</h2> <table class="statistics" id="total_stats"> <tr> @@ -71,6 +69,7 @@ window.templates = initTemplates(); setDocumentTitle(topsuite.name, window.settings.title); addHeader(); + addReportOrLogLink(window.settings.reportURL); addStatistics(); addErrors(); addTestExecutionLog(topsuite); @@ -90,12 +89,20 @@ // TODO: This is duplicated in report.html function addHeader() { var generatedAgoMillis = window.testdata.generated().getTime(); - var header = $.tmpl(window.templates.header, { + $.tmpl(window.templates.header, { title: document.title, generated: window.output.generatedTimestamp, generatedAgo: util.createGeneratedAgoString(generatedAgoMillis) - }); - header.appendTo($('#header_div')); + }).appendTo($('#header_div')); +} + +// TODO: This is duplicated in report.html +function addReportOrLogLink(url) { + if (url) { + $('#report_or_log_link a').attr('href', url); + } else { + $('#report_or_log_link').remove(); + } } function addErrors() { ======================================= --- /src/robot/webcontent/report.html Thu Jun 16 12:50:27 2011 +++ /src/robot/webcontent/report.html Fri Jun 17 01:57:44 2011 @@ -29,8 +29,8 @@ </ul> </div> <div id="javascript_enabled" style="visibility: hidden;"> - <div class="header" id="header_div"> - </div> + <div class="header" id="header_div"></div> + <div id="report_or_log_link"><a href="#">LOG</a></div> <h2>Test Statistics</h2> <table class="statistics" id="total_stats"> <tr> @@ -70,6 +70,7 @@ setDocumentTitle(topsuite.name, window.settings.title); window.templates = initTemplates(); addHeader(); + addReportOrLogLink(window.settings.logURL); addSummary(topsuite); addStatistics(); if (window.location.hash) { @@ -271,12 +272,20 @@ // TODO: This is duplicated in log.html function addHeader() { var generatedAgoMillis = window.testdata.generated().getTime(); - var header = $.tmpl(window.templates.header, { + $.tmpl(window.templates.header, { title: document.title, generated: window.output.generatedTimestamp, generatedAgo: util.createGeneratedAgoString(generatedAgoMillis) - }); - header.appendTo($('#header_div')); + }).appendTo($('#header_div')); +} + +// TODO: This is duplicated in log.html +function addReportOrLogLink(url) { + if (url) { + $('#report_or_log_link a').attr('href', url); + } else { + $('#report_or_log_link').remove(); + } } function setBackground(topsuite) { ============================================================================== Revision: 2ca82d9232e4 Author: Pekka Klärck Date: Fri Jun 17 01:57:49 2011 Log: Automated merge with https://robotframework.googlecode.com/hg/ http://code.google.com/p/robotframework/source/detail?r=2ca82d9232e4
