[xiph-commits] r9742 - in icecast/trunk/icecast: admin web
oddsock at svn.xiph.org
oddsock at svn.xiph.org
Fri Aug 12 13:44:42 PDT 2005
Author: oddsock
Date: 2005-08-12 13:44:38 -0700 (Fri, 12 Aug 2005)
New Revision: 9742
Added:
icecast/trunk/icecast/web/key.png
icecast/trunk/icecast/web/server_version.xsl
icecast/trunk/icecast/web/tunein.png
Modified:
icecast/trunk/icecast/admin/listclients.xsl
icecast/trunk/icecast/admin/listmounts.xsl
icecast/trunk/icecast/admin/manageauth.xsl
icecast/trunk/icecast/admin/moveclients.xsl
icecast/trunk/icecast/admin/response.xsl
icecast/trunk/icecast/admin/stats.xsl
icecast/trunk/icecast/admin/updatemetadata.xsl
icecast/trunk/icecast/web/Makefile.am
icecast/trunk/icecast/web/auth.xsl
icecast/trunk/icecast/web/status.xsl
icecast/trunk/icecast/web/status2.xsl
icecast/trunk/icecast/web/style.css
Log:
encorporated xslt changes from dave st. john....
Modified: icecast/trunk/icecast/admin/listclients.xsl
===================================================================
--- icecast/trunk/icecast/admin/listclients.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/listclients.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,72 +1,97 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<h2>List Connected Listeners</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<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">
- <tr>
- <td align="center">
- <a class="nav2" href="listclients.xsl?mount={@mount}">Show Listeners</a> |
- <a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
- <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
- <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
- </td></tr>
- </table>
-<br></br>
-<table cellpadding="2" cellspacing="4" border="0" >
- <tr>
- <td ><b>IP</b></td>
- <td ><b>Connected For</b></td>
- <td ><b>User Agent</b></td>
- <td ></td>
- </tr>
-<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
-<xsl:for-each select="listener">
- <tr>
- <td><xsl:value-of select="IP" /><xsl:if test="username"> (<xsl:value-of select="username" />)</xsl:if></td>
- <td><xsl:value-of select="Connected" /> seconds</td>
- <td><xsl:value-of select="UserAgent" /></td>
- <td><a class="nav2" href="killclient.xsl?mount={$themount}&id={ID}">kill</a></td>
- </tr>
-</xsl:for-each>
-</table>
-<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" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<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" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+
+
+<h1>Listener Stats</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<h3>
+
+<xsl:choose>
+<xsl:when test="authenticator">
+<a href="auth.xsl"><img border="0" src="/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a> Mount Point
+</xsl:otherwise>
+</xsl:choose>
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+(<xsl:value-of select="@mount" />)
+<xsl:if test="authenticator"><a href="manageauth.xsl?mount={@mount}"><img border="0" src="/key.png"/></a> </xsl:if>
+
+</h3>
+ <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+ <tr>
+ <td align="center">
+ <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
+ <a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
+ <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
+ <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+ </td></tr>
+ </table>
+<br />
+<table cellspacing="1" border="1" bordercolor="#C0C0C0" >
+ <tr>
+ <td ><center><b>IP</b></center></td>
+ <td ><center><b>Connected For</b></center></td>
+ <td ><center><b>User Agent</b></center></td>
+ <td ><center><b>Action</b></center></td>
+ </tr>
+<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
+<xsl:for-each select="listener">
+ <tr>
+ <td align="center"><xsl:value-of select="IP" /><xsl:if test="username"> (<xsl:value-of select="username" />)</xsl:if></td>
+ <td align="center"><xsl:value-of select="Connected" /> seconds</td>
+ <td align="center"><xsl:value-of select="UserAgent" /></td>
+ <td align="center"><a href="killclient.xsl?mount={$themount}&id={ID}">Kick</a></td>
+ </tr>
+</xsl:for-each>
+</table>
+<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" />
+</div>
+</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>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/admin/listmounts.xsl
===================================================================
--- icecast/trunk/icecast/admin/listmounts.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/listmounts.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,58 +1,80 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<h2>List Mountpoints</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)
-<xsl:if test="authenticator"> <a href="manageauth.xsl?mount={@mount}"><img border="0" src="/key.gif"/></a> </xsl:if>
-</h3>
- <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
- <tr>
- <td align="center">
- <a class="nav2" href="listclients.xsl?mount={@mount}">Show Listeners</a> |
- <a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
- <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
- <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
- <xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
- </td></tr>
- </table>
-<br />
-<p><xsl:value-of select="listeners" /> Listener(s)</p>
-<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" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<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" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+
+<h1>Active Mountpoints</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<h3>
+<xsl:choose>
+<xsl:when test="authenticator">
+<a href="auth.xsl"><img border="0" src="/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a> Mount Point
+</xsl:otherwise>
+</xsl:choose>
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+(<xsl:value-of select="@mount" />)
+<xsl:if test="authenticator"> <a href="manageauth.xsl?mount={@mount}"><img border="0" src="/key.png"/></a> </xsl:if>
+
+
+</h3>
+ <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+ <tr>
+ <td align="center">
+ <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
+ <a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
+ <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
+ <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+ <xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
+ </td></tr>
+ </table>
+<br />
+<p><xsl:value-of select="listeners" /> Listener(s)</p>
+<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" />
+</div>
+</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>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/admin/manageauth.xsl
===================================================================
--- icecast/trunk/icecast/admin/manageauth.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/manageauth.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,84 +1,95 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<h2>Show defined users</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="iceresponse">
-<xsl:value-of select="message" />
-</xsl:for-each>
-<xsl:for-each select="source">
-<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">
- <tr>
- <td align="center">
- <a class="nav2" href="listclients.xsl?mount={@mount}">Show Listeners</a> |
- <a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
- <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
- <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
- </td></tr>
- </table>
-<br></br>
-<form method="GET" action="manageauth.xsl">
-<table cellpadding="2" cellspacing="4" border="0" >
- <tr>
- <td ><b>User Id</b></td>
- <td ><b>Password</b></td>
- <td ></td>
- </tr>
-<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
-<xsl:for-each select="User">
- <tr>
- <td><xsl:value-of select="username" /></td>
- <td><xsl:value-of select="password" /></td>
- <td><a class="nav2" href="manageauth.xsl?mount={$themount}&username={username}&action=delete">delete</a></td>
- </tr>
-</xsl:for-each>
- <tr>
- <td ><input type="text" name="username" /></td>
- <td ><input type="text" name="password" /></td>
- </tr>
- <tr>
- <td colspan="2"><input type="Submit" name="Submit" value="Add New User" /></td>
- </tr>
-</table>
-<input type="hidden" name="mount" value="{@mount}"/>
-<input type="hidden" name="action" value="add"/>
-</form>
-<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" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<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" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<h2>Show defined users</h2>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="iceresponse">
+<xsl:value-of select="message" />
+</xsl:for-each>
+<xsl:for-each select="source">
+<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">
+ <tr>
+ <td align="center">
+ <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
+ <a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
+ <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
+ <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+ </td></tr>
+ </table>
+<br></br>
+<form method="GET" action="manageauth.xsl">
+<table cellpadding="2" cellspacing="4" border="0" >
+ <tr>
+ <td ><b>User Id</b></td>
+ <td ><b>Password</b></td>
+ <td ></td>
+ </tr>
+<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
+<xsl:for-each select="User">
+ <tr>
+ <td><xsl:value-of select="username" /></td>
+ <td><xsl:value-of select="password" /></td>
+ <td><a class="nav2" href="manageauth.xsl?mount={$themount}&username={username}&action=delete">delete</a></td>
+ </tr>
+</xsl:for-each>
+ <tr>
+ <td ><input type="text" name="username" /></td>
+ <td ><input type="text" name="password" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="Submit" name="Submit" value="Add New User" /></td>
+ </tr>
+</table>
+<input type="hidden" name="mount" value="{@mount}"/>
+<input type="hidden" name="action" value="add"/>
+</form>
+<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" />
+</div>
+</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>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/admin/moveclients.xsl
===================================================================
--- icecast/trunk/icecast/admin/moveclients.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/moveclients.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,52 +1,63 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
-<h2>Move Clients from (<xsl:value-of select="current_source" />)</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Move to which mountpoint ?</h3>
-<xsl:for-each select="source">
- <table border="0" cellpadding="1" cellspacing="5" >
- <tr>
- <td>Move from (<xsl:copy-of select="$currentmount" />) to (<xsl:value-of select="@mount" />)</td>
- <td><xsl:value-of select="listeners" /> Listeners</td>
- <td><a class="nav2" href="moveclients.xsl?mount={$currentmount}&destination={@mount}">Move Clients</a></td>
- </tr>
- </table>
-<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" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<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" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
+<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" />
+</div>
+<div class="newscontent">
+<h3>Move to which mountpoint ?</h3>
+<xsl:for-each select="source">
+ <table border="0" cellpadding="1" cellspacing="5" >
+ <tr>
+ <td>Move from (<xsl:copy-of select="$currentmount" />) to (<xsl:value-of select="@mount" />)</td>
+ <td><xsl:value-of select="listeners" /> Listeners</td>
+ <td><a class="nav2" href="moveclients.xsl?mount={$currentmount}&destination={@mount}">Move Clients</a></td>
+ </tr>
+ </table>
+<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" />
+</div>
+</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>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/admin/response.xsl
===================================================================
--- icecast/trunk/icecast/admin/response.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/response.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,45 +1,56 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<h2>Icecast Server Response</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Response</h3>
-<xsl:for-each select="/iceresponse">
-Message : <xsl:value-of select="message" /><br></br>
-Return Code: <xsl:value-of select="return" /><br></br>
-</xsl:for-each>
-<br />
-<br />
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<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" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<h1>Icecast Server Response</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Response</h3>
+<xsl:for-each select="/iceresponse">
+Message : <xsl:value-of select="message" /><br></br>
+Return Code: <xsl:value-of select="return" /><br></br>
+</xsl:for-each>
+<br />
+<br />
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</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>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/admin/stats.xsl
===================================================================
--- icecast/trunk/icecast/admin/stats.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/stats.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,94 +1,120 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<h2>Icecast Status Page</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Global Server Stats</h3>
-<table border="0" cellpadding="4">
-<xsl:for-each select="/icestats">
-<xsl:for-each select="*">
-<xsl:if test = "name()!='source'">
-<tr>
- <td width="130"><xsl:value-of select="name()" /></td>
- <td class="streamdata"><xsl:value-of select="." /></td>
-</tr>
-</xsl:if>
-</xsl:for-each>
-</xsl:for-each>
-</table>
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<xsl:if test = "listeners!=''">
-<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)
-<xsl:if test="authenticator"> <a href="manageauth.xsl?mount={@mount}"><img border="0" src="/key.gif"/></a> </xsl:if>
-</h3>
- <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
- <tr>
- <td align="center">
- <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
- <a class="nav2" href="moveclients.xsl?mount={@mount}">Move MountPoints</a> |
- <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
- <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
- <xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
- </td></tr>
- </table>
-<br />
-<table cellpadding="5" cellspacing="0" border="0">
- <xsl:for-each select="*">
- <tr>
- <td width="130"><xsl:value-of select="name()" /></td>
- <td class="streamdata"><xsl:value-of select="." /></td>
- </tr>
- </xsl:for-each>
-</table>
-<br />
-<br />
-</xsl:if>
-</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" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+<!--header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end header menu -->
+
+<!--global server stats-->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Global Server Stats</h3>
+<table border="0" cellpadding="4">
+<xsl:for-each select="/icestats">
+<xsl:for-each select="*">
+<xsl:if test = "name()!='source'">
+<tr>
+ <td width="130"><xsl:value-of select="name()" /></td>
+ <td class="streamdata"><xsl:value-of select="." /></td>
+</tr>
+</xsl:if>
+</xsl:for-each>
+</xsl:for-each>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end global server stats-->
+
+<!--mount point stats-->
+<xsl:for-each select="source">
+<xsl:if test = "listeners!=''">
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>
+<xsl:choose>
+<xsl:when test="authenticator">
+<a href="auth.xsl"><img border="0" src="/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a> Mount Point
+</xsl:otherwise>
+</xsl:choose>
+
+(<xsl:value-of select="@mount" />)
+<xsl:if test="authenticator"><a href="manageauth.xsl?mount={@mount}"><img border="0" src="/key.gif"/></a> </xsl:if>
+
+</h3>
+ <table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+ <tr>
+ <td align="center">
+ <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
+ <a class="nav2" href="moveclients.xsl?mount={@mount}">Move MountPoints</a> |
+ <a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
+ <a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+ <xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
+ </td></tr>
+ </table>
+<br />
+<table cellpadding="5" cellspacing="0" border="0">
+ <xsl:for-each select="*">
+ <tr>
+ <td width="130"><xsl:value-of select="name()" /></td>
+ <td class="streamdata"><xsl:value-of select="." /></td>
+ </tr>
+ </xsl:for-each>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+</xsl:if>
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&</xsl:text>nbsp;
+
+
+<!--end mount point stats-->
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/admin/updatemetadata.xsl
===================================================================
--- icecast/trunk/icecast/admin/updatemetadata.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/admin/updatemetadata.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,55 +1,66 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body>
- <center>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
- </center>
-<h2>Update Metadata</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)</h3>
-
-<form method="GET" action="/admin/metadata.xsl">
-<table border="0" cellpadding="4">
-<tr><td>Metadata : <input type="text" name="song"/></td></tr>
-<tr><td><input type="Submit" value="Update"/></td></tr>
-</table>
-<input type="hidden" name="mount" value="{@mount}"/>
-<input type="hidden" name="mode" value="updinfo"/>
-</form>
-
-<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" />
-</div>
-</div>
-<div class="poster">
-<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<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" />
+</div>
+ <table border="0" cellpadding="1" cellspacing="3">
+ <tr>
+ <td align="center">
+ <a class="nav" href="stats.xsl">Admin Home</a> |
+ <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <a class="nav" href="moveclients.xsl">Move Listeners</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<h1>Update Metadata</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<h3>
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+(<xsl:value-of select="@mount" />)</h3>
+
+<form method="GET" action="/admin/metadata.xsl">
+<table border="0" cellpadding="4">
+<tr><td>Metadata : <input type="text" name="song"/></td></tr>
+<tr><td><input type="Submit" value="Update"/></td></tr>
+</table>
+<input type="hidden" name="mount" value="{@mount}"/>
+<input type="hidden" name="mode" value="updinfo"/>
+</form>
+
+<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" />
+</div>
+</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>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/web/Makefile.am
===================================================================
--- icecast/trunk/icecast/web/Makefile.am 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/web/Makefile.am 2005-08-12 20:44:38 UTC (rev 9742)
@@ -12,4 +12,7 @@
icecast.png \
key.gif \
style.css \
- auth.xsl
+ auth.xsl \
+ server_version.xsl \
+ tunein.png \
+ key.png
Modified: icecast/trunk/icecast/web/auth.xsl
===================================================================
--- icecast/trunk/icecast/web/auth.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/web/auth.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,57 +1,57 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-<body bgcolor="black">
-<table border="0" width="100%%">
-<tr>
-<td width="50"></td>
-<td>
-<h2>Authorization Page</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<xsl:choose>
-<xsl:when test="listeners">
-<xsl:if test="authenticator">
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-<h3>(<xsl:value-of select="@mount" />)</h3>
-<form method="GET" action="/admin/buildm3u">
-<table border="0" cellpadding="4">
-<tr><td>Username : <input type="text" name="username"/></td></tr>
-<tr><td>Password : <input type="password" name="password"/></td></tr>
-<tr><td><input type="Submit" value="Login"/></td></tr>
-</table>
-<input type="hidden" name="mount" value="{@mount}"/>
-</form>
-</xsl:if>
-</xsl:when>
-<xsl:otherwise>
-<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
-</xsl:otherwise>
-</xsl:choose>
-<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" />
-</div>
-</div>
-<br></br><br></br>
-</td>
-<td width="25"></td></tr>
-</table>
-<div class="poster"><img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<table border="0" width="100%%">
+<tr>
+<td width="50"></td>
+<td>
+<img align="left" src="/icecast.png" /><h2><center>Authorization Page</center></h2>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<xsl:choose>
+<xsl:when test="listeners">
+<xsl:if test="authenticator">
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+<h3>(<xsl:value-of select="@mount" />)</h3>
+<form method="GET" action="/admin/buildm3u">
+<table border="0" cellpadding="4">
+<tr><td>Username : <input type="text" name="username"/></td></tr>
+<tr><td>Password : <input type="password" name="password"/></td></tr>
+<tr><td><input type="Submit" value="Login"/></td></tr>
+</table>
+<input type="hidden" name="mount" value="{@mount}"/>
+</form>
+</xsl:if>
+</xsl:when>
+<xsl:otherwise>
+<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
+</xsl:otherwise>
+</xsl:choose>
+<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" />
+</div>
+</div>
+<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>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
Added: icecast/trunk/icecast/web/key.png
===================================================================
(Binary files differ)
Property changes on: icecast/trunk/icecast/web/key.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/trunk/icecast/web/server_version.xsl
===================================================================
--- icecast/trunk/icecast/web/server_version.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/web/server_version.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -0,0 +1,91 @@
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<img align="left" src="/icecast.png" /><h2><center>Icecast2 Status (Version Info)</center></h2>
+<br />
+<!--index header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
+ <tr>
+ <td bgcolor="#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" />
+</div>
+</div>
+<br />
+<br />
+<!--end index header menu -->
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Version Information</h3>
+<table border="0" cellpadding="4">
+<xsl:for-each select="/icestats">
+<xsl:for-each select="server">
+<xsl:if test = "name()!='source'">
+<tr>
+ <td width="130">Build</td>
+ <td class="streamdata"><xsl:value-of select="." /></td>
+</tr>
+</xsl:if>
+</xsl:for-each>
+<xsl:for-each select="server_start">
+<xsl:if test = "name()!='source'">
+<tr>
+ <td width="130">Server Uptime</td>
+ <td class="streamdata"><xsl:value-of select="." /></td>
+</tr>
+</xsl:if>
+</xsl:for-each>
+</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>
+</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>
+</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>
+</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>
+</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>
+</tr>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Modified: icecast/trunk/icecast/web/status.xsl
===================================================================
--- icecast/trunk/icecast/web/status.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/web/status.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -1,91 +1,115 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" 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>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-<body>
-<h2>Icecast Status Page</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<xsl:choose>
-<xsl:when test="listeners">
-<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)
-<xsl:if test="authenticator"> <a href="/auth.xsl"><img border="0" src="/key.gif"/></a> </xsl:if>
-</h3>
-<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>
-</xsl:if>
-<xsl:if test="server_description">
-<tr><td>Stream Description:</td><td class="streamdata"> <xsl:value-of select="server_description" /></td></tr>
-</xsl:if>
-<xsl:if test="type">
-<tr><td width="130"> Stream Type:</td><td class="streamdata"><xsl:value-of select="type" /></td></tr>
-</xsl:if>
-<xsl:if test="bitrate">
-<tr><td>Bitrate:</td><td class="streamdata"> <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>
-</xsl:if>
-<xsl:if test="video_quality">
-<tr><td>Video Quality:</td><td class="streamdata"> <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>
-</xsl:if>
-<xsl:if test="frame_rate">
-<tr><td>Framerate:</td><td class="streamdata"> <xsl:value-of select="frame_rate" /></td></tr>
-</xsl:if>
-
-<xsl:if test="listeners">
-<tr><td>Stream Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
-</xsl:if>
-<xsl:if test="genre">
-<tr><td>Stream Genre:</td><td class="streamdata"> <xsl:value-of select="genre" /></td></tr>
-</xsl:if>
-<xsl:if test="server_url">
-<tr><td>Stream URL:</td><td class="streamdata"> <a href="{server_url}"><xsl:value-of select="server_url" /></a></td></tr>
-</xsl:if>
-<tr><td>Current Song:</td><td class="streamdata">
-<xsl:if test="artist"><xsl:value-of select="artist" /> - </xsl:if><xsl:value-of select="title" /></td></tr>
-<tr><td>Listen:</td><td class="streamdata">
-<xsl:choose>
-<xsl:when test="authenticator">
-<a href="auth.xsl">Click to Listen</a>
-</xsl:when>
-<xsl:otherwise>
-<a href="{@mount}.m3u">Click to Listen</a>
-</xsl:otherwise>
-</xsl:choose>
-</td></tr>
-</table>
-</xsl:when>
-<xsl:otherwise>
-<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
-</xsl:otherwise>
-</xsl:choose>
-<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" />
-</div>
-</div>
-
-<div class="poster"><img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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>
+<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">
+<img align="left" src="/icecast.png" /><h2><center>Icecast2 Status</center></h2>
+<br />
+<!--index header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
+ <tr>
+ <td bgcolor="#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" />
+</div>
+</div>
+<br />
+<br />
+<!--end index header menu -->
+<!--mount point stats-->
+<xsl:for-each select="source">
+<xsl:choose>
+<xsl:when test="listeners">
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>
+<xsl:choose>
+<xsl:when test="authenticator">
+<a href="auth.xsl"><img border="0" src="/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a> Mount Point
+</xsl:otherwise>
+</xsl:choose>
+(<xsl:value-of select="@mount" />)
+<xsl:if test="authenticator"> <a href="/auth.xsl"><img border="0" src="/key.png"/></a> </xsl:if>
+
+</h3>
+
+<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>
+</xsl:if>
+<xsl:if test="server_description">
+<tr><td>Stream Description:</td><td class="streamdata"> <xsl:value-of select="server_description" /></td></tr>
+</xsl:if>
+<tr><td>Content Type:</td><td class="streamdata"><xsl:value-of select="server_type" /></td></tr>
+<tr><td>Mount Uptime:</td><td class="streamdata"><xsl:value-of select="stream_start" /></td></tr>
+<xsl:if test="bitrate">
+<tr><td>Bitrate:</td><td class="streamdata"> <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>
+</xsl:if>
+<xsl:if test="video_quality">
+<tr><td>Video Quality:</td><td class="streamdata"> <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>
+</xsl:if>
+<xsl:if test="frame_rate">
+<tr><td>Framerate:</td><td class="streamdata"> <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>
+</xsl:if>
+<xsl:if test="listener_peak">
+<tr><td>Peak Listeners:</td><td class="streamdata"> <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>
+</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>
+</xsl:if>
+<tr><td>Current Song:</td><td class="streamdata">
+<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" />
+</div>
+</div>
+<br />
+<br />
+</xsl:when>
+<xsl:otherwise>
+<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
+</xsl:otherwise>
+</xsl:choose>
+
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&</xsl:text>nbsp;
+
+
+<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/web/status2.xsl
===================================================================
--- icecast/trunk/icecast/web/status2.xsl 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/web/status2.xsl 2005-08-12 20:44:38 UTC (rev 9742)
@@ -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="xml" 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" >
-<pre>
-MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL
-Global,Client:<xsl:value-of select="connections" /> Source: <xsl:value-of select="source_connections" />,,<xsl:value-of select="listeners" />,,
-<xsl:for-each select="source">
-<xsl:value-of select="@mount" />,,<xsl:value-of select="name" />,<xsl:value-of select="listeners" />,<xsl:value-of select="description" />,<xsl:value-of select="artist" /> - <xsl:value-of select="title" />,<xsl:value-of select="url" />
-</xsl:for-each>
-</pre>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" 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" >
+<pre>
+MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL
+Global,Client:<xsl:value-of select="connections" /> Source: <xsl:value-of select="source_connections" />,,<xsl:value-of select="listeners" />,,
+<xsl:for-each select="source">
+<xsl:value-of select="@mount" />,,<xsl:value-of select="name" />,<xsl:value-of select="listeners" />,<xsl:value-of select="description" />,<xsl:value-of select="artist" /> - <xsl:value-of select="title" />,<xsl:value-of select="url" />
+</xsl:for-each>
+</pre>
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/web/style.css
===================================================================
--- icecast/trunk/icecast/web/style.css 2005-08-12 20:02:16 UTC (rev 9741)
+++ icecast/trunk/icecast/web/style.css 2005-08-12 20:44:38 UTC (rev 9742)
@@ -38,6 +38,14 @@
color: #fff;
margin-top:3px;
}
+h1 {
+ font-family: Verdana, sans-serif;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 100%;
+ color: #fff;
+ margin-top:3px;
+}
.nav {
font-family: Verdana, sans-serif;
text-decoration: none;
@@ -116,7 +124,7 @@
font-weight: bold;
font-size: 110%;
color: #f8ef64;
- border-bottom: 3px dashed #000000;
+ border-bottom: 1px groove #ACACAC;
}
.newscontent h4 {
margin: 10px 0px;
@@ -189,11 +197,11 @@
}
.roundtop {
- background: url(corner_topright.jpg) no-repeat top right;
+ background: url(/corner_topright.jpg) no-repeat top right;
}
.roundbottom {
- background: url(corner_bottomright.jpg) no-repeat top right;
+ background: url(/corner_bottomright.jpg) no-repeat top right;
}
img.corner {
Added: icecast/trunk/icecast/web/tunein.png
===================================================================
(Binary files differ)
Property changes on: icecast/trunk/icecast/web/tunein.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the commits
mailing list