diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-13 12:06:25 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-13 12:06:25 -0500 |
| commit | 60ca7cf2001baa4fc37d54a867751e72571e4079 (patch) | |
| tree | b956c628c54b670bba632c6a82e5ff7af1cd2c6e /pts-core/results-viewer | |
| parent | 1f67addf9f2fbf555ba071f2e357e8c7a12e6fb6 (diff) | |
| download | phoronix-test-suite-upstream-60ca7cf2001baa4fc37d54a867751e72571e4079.tar.gz phoronix-test-suite-upstream-60ca7cf2001baa4fc37d54a867751e72571e4079.tar.xz phoronix-test-suite-upstream-60ca7cf2001baa4fc37d54a867751e72571e4079.zip | |
pts-core: Unify the XSL for the PTS Results Viewer and use a PHP
function to insert the respective PNG/SVG markup when saving the results
Diffstat (limited to 'pts-core/results-viewer')
| -rw-r--r-- | pts-core/results-viewer/pts-results-viewer.xsl | 2 | ||||
| -rw-r--r-- | pts-core/results-viewer/pts-svg-results-viewer.xsl | 84 |
2 files changed, 1 insertions, 85 deletions
diff --git a/pts-core/results-viewer/pts-results-viewer.xsl b/pts-core/results-viewer/pts-results-viewer.xsl index d50869e..228343c 100644 --- a/pts-core/results-viewer/pts-results-viewer.xsl +++ b/pts-core/results-viewer/pts-results-viewer.xsl @@ -67,7 +67,7 @@ </xsl:for-each> </xsl:if> </div> - <div class="pts_benchmark_img_area"><img><xsl:attribute name="src">result-graphs/<xsl:number value="position()" />.png</xsl:attribute></img></div> + <div class="pts_benchmark_img_area"><!-- GRAPH TAGS --></div> </xsl:for-each> </div> diff --git a/pts-core/results-viewer/pts-svg-results-viewer.xsl b/pts-core/results-viewer/pts-svg-results-viewer.xsl deleted file mode 100644 index 225d3e7..0000000 --- a/pts-core/results-viewer/pts-svg-results-viewer.xsl +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -<xsl:template match="/"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>Phoronix Test Suite - <xsl:value-of select="PhoronixTestSuite/Suite/Title" /> - Results Viewer</title> - <link href="../pts-results-viewer/pts-viewer.css" rel="stylesheet" type="text/css" /> - <script src="../pts-results-viewer/pts.js" type="text/javascript"></script> - </head> - <body> - <div id="pts_header_top"> - <div id="pts_header_top_center"> - <div id="pts_header_top_title">Phoronix Test Suite</div> - <div id="pts_header_top_link_group"><a href="http://www.phoronix-test-suite.com/">Phoronix Test Suite</a><a href="http://global.phoronix.com/">Phoronix Global</a></div> - </div> - </div> - <div id="pts_container"> - <div class="pts_box"> - - <div style="float: left; width: 60%;"> - <h1><xsl:value-of select="PhoronixTestSuite/Suite/Title" /></h1> - <div class="pts_chart_box"> - <p><strong><xsl:value-of select="PhoronixTestSuite/Suite/Name" /> v<xsl:value-of select="PhoronixTestSuite/Suite/Version" /> (<xsl:value-of select="PhoronixTestSuite/Suite/Type" />)</strong></p> - </div> - </div> - <div style="float: right; width: 40%;"> - <p align="right"><img src="../pts-results-viewer/pts-logo.png" /></p> - </div> - <div class="pts_chart_box"> - <p><xsl:value-of select="PhoronixTestSuite/Suite/Description"/></p> - </div> - - <xsl:variable name="idcount"><xsl:value-of select="count(PhoronixTestSuite/System)" /></xsl:variable> - <xsl:variable name="idwidth"><xsl:value-of select="floor(815 div $idcount) - 3" /></xsl:variable> - - <h1>System Hardware</h1> - <div class="pts_chart_box"> - <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each> - <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_body"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="Hardware" /></div></xsl:for-each> - </div> - <h1>System Software</h1> - <div class="pts_chart_box"> - <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each> - <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_body"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="Software" /></div></xsl:for-each> - </div> - <h1>Additional Details</h1> - <div class="pts_chart_box"> - <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each> - <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_body"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><strong>Test Administrator:</strong> <xsl:value-of select="Author" /><br /><strong>Test Date/Time:</strong> <xsl:value-of select="TestDate" /> (UTC)<br /><strong>PTS Version:</strong> <xsl:value-of select="Version" /><br /><strong>Test Notes:</strong><br /><xsl:value-of select="TestNotes" /></div></xsl:for-each> - </div> - </div> - - <div class="pts_box"> - <h1>Test Results</h1> - - <div id="pts_benchmark_area"> - <xsl:for-each select="PhoronixTestSuite/Benchmark"> - <div class="pts_benchmark_bar"><span class="pts_benchmark_bar_header"><xsl:value-of select="Name"/></span> <span class="pts_benchmark_bar_version">v<xsl:value-of select="Version"/></span><br /><strong><xsl:value-of select="Attributes"/></strong></div> - <div class="pts_benchmark_text"> - <xsl:if test="not(contains(ResultFormat,'MULTI_'))"> - <xsl:for-each select="Results/Group"> - <div style="padding: 5px 0;"> - <xsl:for-each select="Entry"> - <strong><xsl:value-of select="Identifier"/>:</strong><span style="padding-left: 5px;"><xsl:value-of select="Value"/></span><br /> - </xsl:for-each> - </div> - </xsl:for-each> - </xsl:if> - </div> - <div class="pts_benchmark_img_area"><object type="image/svg+xml"><xsl:attribute name="data">result-graphs/<xsl:number value="position()" />.svg</xsl:attribute></object></div> - </xsl:for-each> - </div> - - - </div> - </div> - <div id="pts_header_bottom"> - <div id="pts_header_bottom_center">The <a href="http://www.phoronix-test-suite.com/">Phoronix Test Suite</a> is developed by <a href="http://www.phoronix.com/">Phoronix</a>, an Internet resource devoted to Linux hardware reviews, video driver articles, and much more.<br />Copyright © 2008 by Phoronix Media.</div> - </div> - - </body> -</html> -</xsl:template> -</xsl:stylesheet> |