diff --git a/ChangeLog b/ChangeLog index 39deecd62c9e5aed77c20b6ef8a46df0f3c66291..bff5348d54940c7d6935f25880f105f7bca74a42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-01-23 06:23:42 dm8tbr + + * Updated web interface to be more XHTML compliant. + * Added warning about HTML scraping to main page. + 2014-01-12 21:09:04 ph3-der-loewe * Fixed a memory leak. Lost headers of stream because of wrong ref diff --git a/admin/listclients.xsl b/admin/listclients.xsl index 17000e6085ff1e4f1af756d2036f0e0b0889f688..8a1a2697bbf948e0decea11040aef80a3609b6f0 100644 --- a/admin/listclients.xsl +++ b/admin/listclients.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Icecast2 Admin</h2> -<br /> +<p><br /></p> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,20 +24,18 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br /> -<br /> - +<p><br /><p> <h1>Listener Stats</h1> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <xsl:for-each select="source"> <div class="streamheader"> <table cellspacing="0" cellpadding="0" > @@ -60,7 +58,7 @@ </tr></table> </div> -<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444"> +<table border="0" cellpadding="1" cellspacing="5" style="background-color: 444444"> <tr> <td align="center"> <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> @@ -70,7 +68,7 @@ </td></tr> </table> <br /> -<table cellspacing="0" cellpadding="5" border="1" bordercolor="#C0C0C0" > +<table cellspacing="0" cellpadding="5" border="1" style="bordercolor: #C0C0C0" > <tr> <td ><center><b>IP</b></center></td> <td ><center><b>Seconds Connected</b></center></td> @@ -93,7 +91,7 @@ <xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> diff --git a/admin/listmounts.xsl b/admin/listmounts.xsl index 9b8f479c87247ff32bb90489852d449463775ddc..0a89dcab594de198cb7e78ced5747a75c93f5ad3 100644 --- a/admin/listmounts.xsl +++ b/admin/listmounts.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Icecast2 Admin</h2> <br /> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,7 +24,7 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -34,9 +34,9 @@ <h1>Active Mountpoints</h1> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <xsl:for-each select="source"> <div class="streamheader"> <table cellspacing="0" cellpadding="0" > @@ -59,7 +59,7 @@ </tr></table> </div> -<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444"> +<table border="0" cellpadding="1" cellspacing="5" style="background-color: 444444"> <tr> <td align="center"> <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> @@ -76,7 +76,7 @@ <xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> diff --git a/admin/manageauth.xsl b/admin/manageauth.xsl index 4c1ab9d4cd44269cf7346f359ee857579ad23f12..49d7ee181d86442d431272837aa45cb68c764d32 100644 --- a/admin/manageauth.xsl +++ b/admin/manageauth.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body <h2>Icecast2 Admin</h2> <br /> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,7 +24,7 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -32,9 +32,9 @@ <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <xsl:for-each select="iceresponse"> <xsl:value-of select="message" /> </xsl:for-each> @@ -42,7 +42,7 @@ <h3> <xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if> (<xsl:value-of select="@mount" />)</h3> - <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444"> + <table border="0" cellpadding="1" cellspacing="5" style="background-color: 444444"> <tr> <td align="center"> <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> @@ -88,7 +88,7 @@ <xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> diff --git a/admin/moveclients.xsl b/admin/moveclients.xsl index 99a8a9edc95f6c239de2a09d948ca64e189acb30..8ee029a9ddaeee6003b0065bd6ca782376e4314d 100644 --- a/admin/moveclients.xsl +++ b/admin/moveclients.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Icecast2 Admin</h2> <br /> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,7 +24,7 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -34,9 +34,9 @@ <h1>Moving Listeners From (<xsl:value-of select="current_source" />)</h1> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <h3>Move to which mountpoint ?</h3> <xsl:for-each select="source"> <table border="0" cellpadding="1" cellspacing="5" > @@ -52,7 +52,7 @@ <xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> diff --git a/admin/response.xsl b/admin/response.xsl index 6c584b47a89910f815061e22d43b10b7572faad7..a5167e0152f31a3ac278818df2877e5dc58c4f8a 100644 --- a/admin/response.xsl +++ b/admin/response.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/iceresponse" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2> <br /> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,7 +24,7 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -33,9 +33,9 @@ <h1>Icecast Server Response</h1> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <h3>Response</h3> <xsl:for-each select="/iceresponse"> Message : <xsl:value-of select="message" /><br></br> @@ -45,7 +45,7 @@ Return Code: <xsl:value-of select="return" /><br></br> <br /> </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> diff --git a/admin/stats.xsl b/admin/stats.xsl index ec6a33ff81677da37adbb9ebf869187680048ae3..116e418af58e82aa2244e86d4309a3912221862c 100644 --- a/admin/stats.xsl +++ b/admin/stats.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Icecast2 Admin</h2> <br /> <!--header menu --> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,7 +24,7 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -34,9 +34,9 @@ <!--global server stats--> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <h3>Global Server Stats</h3> <table border="0" cellpadding="4"> <xsl:for-each select="/icestats"> @@ -52,7 +52,7 @@ </table> </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -64,9 +64,9 @@ <xsl:if test = "listeners!=''"> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <div class="streamheader"> <table cellspacing="0" cellpadding="0" > <colgroup align="left" /> @@ -87,7 +87,7 @@ </xsl:choose> </tr></table> </div> - <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444"> + <table border="0" cellpadding="1" cellspacing="5" style="background-color: 444444"> <tr> <td align="center"> <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> @@ -108,14 +108,13 @@ </table> </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br /> -<br /> +<p><br /></p> </xsl:if> </xsl:for-each> -<xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; +<p><xsl:text disable-output-escaping="yes">&</xsl:text>nbsp;</p> <!--end mount point stats--> diff --git a/admin/updatemetadata.xsl b/admin/updatemetadata.xsl index 0d86aa51f74fa98317ecb5d6051c4a7d060d3b94..ee67fa8f0a715638fd4d4a6686eedd82fdf2da27 100644 --- a/admin/updatemetadata.xsl +++ b/admin/updatemetadata.xsl @@ -1,18 +1,18 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Icecast2 Admin</h2> <br /> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" cellpadding="1" cellspacing="3"> <tr> @@ -24,7 +24,7 @@ </td></tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <br /> @@ -33,9 +33,9 @@ <h1>Update Metadata</h1> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <xsl:for-each select="source"> <h3> <xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if> @@ -57,7 +57,7 @@ <xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> <div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> diff --git a/web/auth.xsl b/web/auth.xsl index 0d8c97e248c47167469c1cabfdca3039d57ae878..a57d91029b0291e99ac25b4f80cfb499b6f02dc8 100644 --- a/web/auth.xsl +++ b/web/auth.xsl @@ -1,12 +1,12 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <table border="0" width="100%%"> <tr> <td width="50"></td> @@ -14,9 +14,9 @@ <h2>Authorization Page</h2> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <xsl:for-each select="source"> <xsl:choose> <xsl:when test="listeners"> @@ -37,20 +37,20 @@ <h3><xsl:value-of select="@mount" /> - Not Connected</h3> </xsl:otherwise> </xsl:choose> -<br></br> -<br></br> +<br /> +<br /> </xsl:for-each> <xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br></br><br></br> +<br /><br /> </td> <td width="25"></td></tr> </table> -<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div> +<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> </body> </html> </xsl:template> diff --git a/web/server_version.xsl b/web/server_version.xsl index bcf610b2e67795ea328972dac7199701548b257f..f2803b1468df69ded3bc52c1af595c1b6a38c303 100644 --- a/web/server_version.xsl +++ b/web/server_version.xsl @@ -1,90 +1,88 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Server Information</h2> -<br /> +<p><br /></p> <!--index header menu --> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4"> +<table border="0" style="width: 100%" id="table1" cellspacing="0" cellpadding="4"> <tr> - <td bgcolor="#656565"> + <td style="background-color: #656565"> <a class="nav" href="admin/">Administration</a> <a class="nav" href="status.xsl">Server Status</a> <a class="nav" href="server_version.xsl">Version</a></td> </tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br /> -<br /> +<p><br /></p> <!--end index header menu --> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> +<div class="content"> <h3>Server Information</h3> <table border="0" cellpadding="4"> <xsl:for-each select="/icestats"> <tr> - <td width="130">Location</td> + <td style="width: 130px">Location</td> <td class="streamdata"><xsl:value-of select="location" /></td> </tr> <tr> - <td width="130">Admin</td> + <td style="width: 130px">Admin</td> <td class="streamdata"><xsl:value-of select="admin" /></td> </tr> <tr> - <td width="130">Host</td> + <td style="width: 130px">Host</td> <td class="streamdata"><xsl:value-of select="host" /></td> </tr> <tr> - <td width="130">Version</td> + <td style="width: 130px">Version</td> <td class="streamdata"><xsl:value-of select="server_id" /></td> </tr> </xsl:for-each> <tr> - <td width="130">Download</td> - <td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/download.php">icecast.org</a></td> + <td style="width: 130px">Download</td> + <td class="streamdata"><a class="nav" href="http://icecast.org/download.php">icecast.org</a></td> </tr> <tr> - <td width="130">Subversion</td> - <td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/svn.php">click here</a></td> + <td style="width: 130px">Subversion</td> + <td class="streamdata"><a class="nav" href="http://icecast.org/svn.php">click here</a></td> </tr> <tr> - <td width="130">Documentation</td> - <td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/docs.php">click here</a></td> + <td style="width: 130px">Documentation</td> + <td class="streamdata"><a class="nav" href="http://icecast.org/docs.php">click here</a></td> </tr> <tr> - <td width="130">Stream Directory </td> - <td class="streamdata"><a class="nav" target="_blank" href="http://dir.xiph.org/index.php">dir.xiph.org</a></td> + <td style="width: 130px">Stream Directory </td> + <td class="streamdata"><a class="nav" href="http://dir.xiph.org/index.php">dir.xiph.org</a></td> </tr> <tr> - <td width="130">Community</td> - <td class="streamdata"><a class="nav" target="_blank" href="http://forum.icecast.org/">forum.icecast.org</a></td> + <td style="width: 130px">Community</td> + <td class="streamdata"><a class="nav" href="http://icecast.org/community.php">click here</a></td> </tr> </table> </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br /> -<br /> +<p><br /></p> -<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div> +<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> </body> </html> </xsl:template> diff --git a/web/status.xsl b/web/status.xsl index b21bae70dd59a354d7a75124e4430ed0417a0cf6..a43bd444453b793cdbb2bb3f6ba8d7224c6b717b 100644 --- a/web/status.xsl +++ b/web/status.xsl @@ -1,33 +1,31 @@ <xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" > <xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:template match = "/icestats" > -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Icecast Streaming Media Server</title> <link rel="stylesheet" type="text/css" href="style.css" /> </head> -<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"> +<body> <h2>Icecast2 Status</h2> -<br /> <!--index header menu --> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> <table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4"> <tr> - <td bgcolor="#656565"> + <td style="background-color: #656565"> <a class="nav" href="admin/">Administration</a> <a class="nav" href="status.xsl">Server Status</a> <a class="nav" href="server_version.xsl">Version</a></td> </tr> </table> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br /> -<br /> +<p><br /></p> <!--end index header menu --> <!--mount point stats--> <xsl:for-each select="source"> @@ -35,10 +33,19 @@ <xsl:when test="listeners"> <div class="roundcont"> <div class="roundtop"> -<img src="/corner_topleft.jpg" class="corner" style="display: none" /> +<img src="/corner_topleft.jpg" class="corner" style="display: none" alt="" /> </div> -<div class="newscontent"> - <div class="streamheader"> +<xsl:text disable-output-escaping="yes"> +<!-- WARNING: + DO NOT ATTEMPT TO PARSE ICECAST HTML OUTPUT! + The web interface may change completely between releases. + If you have a need for automatic processing of server data, + please read the appropriate documentation. Latest docs: + http://icecast.org/docs/icecast-latest/icecast2_stats.html +--></xsl:text> +<div class="content"> + <div class="dummy"></div> + <div class="streamheading"> <table cellspacing="0" cellpadding="0"> <colgroup align="left" /> <colgroup align="right" width="300" /> @@ -61,54 +68,53 @@ <table border="0" cellpadding="4"> <xsl:if test="server_name"> -<tr><td>Stream Title:</td><td class="streamdata"> <xsl:value-of select="server_name" /></td></tr> +<tr><td>Stream Name:</td><td class="streamstats"> <xsl:value-of select="server_name" /></td></tr> </xsl:if> <xsl:if test="server_description"> -<tr><td>Stream Description:</td><td class="streamdata"> <xsl:value-of select="server_description" /></td></tr> +<tr><td>Stream Description:</td><td class="streamstats"> <xsl:value-of select="server_description" /></td></tr> </xsl:if> <xsl:if test="server_type"> -<tr><td>Content Type:</td><td class="streamdata"><xsl:value-of select="server_type" /></td></tr> +<tr><td>Content Type:</td><td class="streamstats"><xsl:value-of select="server_type" /></td></tr> </xsl:if> <xsl:if test="stream_start"> -<tr><td>Mount started:</td><td class="streamdata"><xsl:value-of select="stream_start" /></td></tr> +<tr><td>Mount started:</td><td class="streamstats"><xsl:value-of select="stream_start" /></td></tr> </xsl:if> <xsl:if test="bitrate"> -<tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr> +<tr><td>Bitrate:</td><td class="streamstats"> <xsl:value-of select="bitrate" /></td></tr> </xsl:if> <xsl:if test="quality"> -<tr><td>Quality:</td><td class="streamdata"> <xsl:value-of select="quality" /></td></tr> +<tr><td>Quality:</td><td class="streamstats"> <xsl:value-of select="quality" /></td></tr> </xsl:if> <xsl:if test="video_quality"> -<tr><td>Video Quality:</td><td class="streamdata"> <xsl:value-of select="video_quality" /></td></tr> +<tr><td>Video Quality:</td><td class="streamstats"> <xsl:value-of select="video_quality" /></td></tr> </xsl:if> <xsl:if test="frame_size"> -<tr><td>Framesize:</td><td class="streamdata"> <xsl:value-of select="frame_size" /></td></tr> +<tr><td>Framesize:</td><td class="streamstats"> <xsl:value-of select="frame_size" /></td></tr> </xsl:if> <xsl:if test="frame_rate"> -<tr><td>Framerate:</td><td class="streamdata"> <xsl:value-of select="frame_rate" /></td></tr> +<tr><td>Framerate:</td><td class="streamstats"> <xsl:value-of select="frame_rate" /></td></tr> </xsl:if> <xsl:if test="listeners"> -<tr><td>Current Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr> +<tr><td>Listeners (current):</td><td class="streamstats"> <xsl:value-of select="listeners" /></td></tr> </xsl:if> <xsl:if test="listener_peak"> -<tr><td>Peak Listeners:</td><td class="streamdata"> <xsl:value-of select="listener_peak" /></td></tr> +<tr><td>Listeners (peak):</td><td class="streamstats"> <xsl:value-of select="listener_peak" /></td></tr> </xsl:if> <xsl:if test="genre"> -<tr><td>Stream Genre:</td><td class="streamdata"> <xsl:value-of select="genre" /></td></tr> +<tr><td>Genre:</td><td class="streamstats"> <xsl:value-of select="genre" /></td></tr> </xsl:if> <xsl:if test="server_url"> -<tr><td>Stream URL:</td><td class="streamdata"> <a target="_blank" href="{server_url}"><xsl:value-of select="server_url" /></a></td></tr> +<tr><td>Stream URL:</td><td class="streamstats"> <a href="{server_url}"><xsl:value-of select="server_url" /></a></td></tr> </xsl:if> -<tr><td>Current Song:</td><td class="streamdata"> +<tr><td>Currently playing:</td><td class="streamstats"> <xsl:if test="artist"><xsl:value-of select="artist" /> - </xsl:if><xsl:value-of select="title" /></td></tr> </table> </div> <div class="roundbottom"> -<img src="/corner_bottomleft.jpg" class="corner" style="display: none" /> +<img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" /> </div> </div> -<br /> -<br /> +<p><br /></p> </xsl:when> <xsl:otherwise> <h3><xsl:value-of select="@mount" /> - Not Connected</h3> @@ -116,10 +122,10 @@ </xsl:choose> </xsl:for-each> -<xsl:text disable-output-escaping="yes">&</xsl:text>nbsp; +<p><xsl:text disable-output-escaping="yes">&</xsl:text>nbsp;</p> -<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div> +<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div> </body> </html> </xsl:template> diff --git a/web/style.css b/web/style.css index 129d49d471464726065db3a5c3495b5466f0c227..87dfabd63142b7cca62a8d3e72f02ccd4aab8590 100644 --- a/web/style.css +++ b/web/style.css @@ -118,7 +118,7 @@ td { .roundcont a { margin: 0px 10px; } -.newscontent { +.content { margin: 0 20px; } h3 { @@ -130,11 +130,11 @@ h3 { font-size: 110%; color: #f8ef64; } -.newscontent h3 { +.content h3 { margin-bottom: 10px; border-bottom: 1px groove #ACACAC; } -.newscontent h4 { +.content h4 { margin: 10px 0px; font-family: Verdana, sans-serif; text-decoration: none; @@ -142,21 +142,21 @@ h3 { font-size: 110%; color: #f8ef64; } -.newscontent p { +.content p { margin: 0 0; font-family: Verdana, sans-serif; text-decoration: none; font-weight: none; font-size: 90%; } -.newscontent td { +.content td { margin: 0 0; font-family: Verdana, sans-serif; text-decoration: none; font-weight: none; font-size: 90%; } -.newscontent td.streamdata { +.content td.streamstats { margin: 0 0; font-family: Verdana, sans-serif; text-decoration: none; @@ -164,46 +164,46 @@ h3 { font-size: 90%; color: #f8ef64; } -.streamheader table { +.streamheading table { width: 100%; margin-bottom: 5px; border-bottom: 1px groove #ACACAC; } -.streamheader td { +.streamheading td { margin: 0px; padding-top: 10px; padding-bottom: 10px; padding: 10 5 10 5; border: 0px solid white; } -.streamheader h3 { +.streamheading h3 { border: 0px; } -.streamheader a { +.streamheading a { padding: 8px 5px 3px 30px; text-decoration: none; background: transparent url("/tunein.png") no-repeat left center; } -.streamheader a.auth { +.streamheading a.auth { padding-top: 10px; padding-bottom: 10px; padding-left: 32px; background: transparent url("/key.png") no-repeat left center; } -.newscontent a { +.content a { font-family: Verdana, sans-serif; text-decoration: none; font-weight: bold; margin: 0px; color: #f8ef64; } -.newscontent a:hover { +.content a:hover { font-family: Verdana, sans-serif; text-decoration: none; font-weight: bold; color: #fff; } -.newscontent a.nav2 { +.content a.nav2 { font-family: Verdana, sans-serif; text-decoration: none; font-weight: bold; @@ -211,7 +211,7 @@ h3 { background: #444; color: #f8ef64; } -.newscontent a.nav2:hover { +.content a.nav2:hover { font-family: Verdana, sans-serif; text-decoration: none; background: #777;