[xiph-commits] r9725 - in icecast/branches/kh/icecast: . admin web
web/images
karl at svn.xiph.org
karl at svn.xiph.org
Wed Aug 10 13:48:25 PDT 2005
Author: karl
Date: 2005-08-10 13:48:10 -0700 (Wed, 10 Aug 2005)
New Revision: 9725
Added:
icecast/branches/kh/icecast/web/images/
icecast/branches/kh/icecast/web/images/corner_bottomleft.jpg
icecast/branches/kh/icecast/web/images/corner_bottomright.jpg
icecast/branches/kh/icecast/web/images/corner_topleft.jpg
icecast/branches/kh/icecast/web/images/corner_topright.jpg
icecast/branches/kh/icecast/web/images/icecast.png
icecast/branches/kh/icecast/web/images/key.png
icecast/branches/kh/icecast/web/images/tunein.png
icecast/branches/kh/icecast/web/server_uptime.xsl
icecast/branches/kh/icecast/web/server_version.xsl
icecast/branches/kh/icecast/web/uptime_xml.xsl
Removed:
icecast/branches/kh/icecast/web/corner_bottomleft.jpg
icecast/branches/kh/icecast/web/corner_bottomright.jpg
icecast/branches/kh/icecast/web/corner_topleft.jpg
icecast/branches/kh/icecast/web/corner_topright.jpg
icecast/branches/kh/icecast/web/icecast.png
icecast/branches/kh/icecast/web/key.gif
Modified:
icecast/branches/kh/icecast/admin/listclients.xsl
icecast/branches/kh/icecast/admin/listmounts.xsl
icecast/branches/kh/icecast/admin/manageauth.xsl
icecast/branches/kh/icecast/admin/managerelays.xsl
icecast/branches/kh/icecast/admin/moveclients.xsl
icecast/branches/kh/icecast/admin/response.xsl
icecast/branches/kh/icecast/admin/stats.xsl
icecast/branches/kh/icecast/admin/updatemetadata.xsl
icecast/branches/kh/icecast/configure.in
icecast/branches/kh/icecast/web/auth.xsl
icecast/branches/kh/icecast/web/status.xsl
icecast/branches/kh/icecast/web/style.css
Log:
xsl page changes by Dave St John
Modified: icecast/branches/kh/icecast/admin/listclients.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/listclients.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/listclients.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,53 +6,79 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
+ <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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
-<h2>List Connected Listeners</h2>
+<div class="roundbottom">
+<img src="/images/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" />
+<img src="/images/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="/images/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/images/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" />)</h3>
+(<xsl:value-of select="@mount" />)
+<xsl:if test="authenticator"><a href="manageauth.xsl?mount={@mount}"><img border="0" src="/images/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}">Show Listeners</a> |
+ <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="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" >
+<br />
+<table cellspacing="1" border="1" bordercolor="#C0C0C0" >
<tr>
- <td ><b>IP</b></td>
- <td ><b>Connected For</b></td>
- <td ><b>User Agent</b></td>
- <td ></td>
+ <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><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>
+ <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>
@@ -62,11 +88,10 @@
<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="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/listmounts.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/listmounts.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/listmounts.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,37 +6,60 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
+ <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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
-<h2>List Mountpoints</h2>
+<div class="roundbottom">
+<img src="/images/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" />
+<img src="/images/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="/images/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/images/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.gif"/></a> </xsl:if>
+<xsl:if test="authenticator"> <a href="manageauth.xsl?mount={@mount}"><img border="0" src="/images/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}">Show Listeners</a> |
+ <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="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>
@@ -48,11 +71,10 @@
<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="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/manageauth.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/manageauth.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/manageauth.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,23 +6,35 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
+ <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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
+<div class="roundbottom">
+<img src="/images/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" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<xsl:for-each select="iceresponse">
@@ -35,9 +47,9 @@
<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="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="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
</td></tr>
</table>
@@ -74,11 +86,10 @@
<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="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/managerelays.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/managerelays.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/managerelays.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,24 +6,37 @@
<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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
- </td></tr>
- </table>
-</center>
-<h2>Manage relays</h2>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/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="/images/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="managerelays.xsl">Manage Relays</a> |
+ <a class="nav" href="/status.xsl">Index</a>
+ </td></tr>
+ </table>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+
+<h1>Relay Management</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<div class="newscontent">
<xsl:for-each select="relay">
<h3>
@@ -49,11 +62,10 @@
<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="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/moveclients.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/moveclients.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/moveclients.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,23 +6,36 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
+ <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="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="managerelays.xsl">Manage Relays</a> |
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
-<h2>Move Clients from (<xsl:value-of select="current_source" />)</h2>
+<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="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<h3>Move to which mountpoint ?</h3>
@@ -40,11 +53,10 @@
<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="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
Modified: icecast/branches/kh/icecast/admin/response.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/response.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/response.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,23 +6,35 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
+ <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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="managerelays.xsl">Manage Relays</a> |
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
-<h2>Icecast Server Response</h2>
+<div class="roundbottom">
+<img src="/images/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" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<h3>Response</h3>
@@ -34,11 +46,10 @@
<br />
</div>
<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+<img src="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
Modified: icecast/branches/kh/icecast/admin/stats.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/stats.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/stats.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,23 +6,36 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+<!--header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
+ <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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
-<h2>Icecast Status Page</h2>
+<div class="roundbottom">
+<img src="/images/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" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<h3>Global Server Stats</h3>
@@ -40,29 +53,39 @@
</table>
</div>
<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+<img src="/images/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" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
-<xsl:for-each select="source">
-<xsl:if test = "listeners!=''">
<h3>
-<a href="{@mount}.m3u">
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)</a>
-<xsl:if test="authenticator"> <a href="manageauth.xsl?mount={@mount}"><img border="0" src="/key.gif"/></a> </xsl:if>
+<xsl:choose>
+<xsl:when test="authenticator">
+<a href="auth.xsl"><img border="0" src="/images/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/images/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="/images/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="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>
@@ -72,29 +95,26 @@
<br />
<table cellpadding="5" cellspacing="0" border="0">
<xsl:for-each select="*">
- <xsl:choose>
- <xsl:when test="name()='listener'"></xsl:when>
- <xsl:otherwise>
- <tr>
- <td width="130"><xsl:value-of select="name()" /></td>
- <td class="streamdata"><xsl:value-of select="." /></td>
- </tr>
- </xsl:otherwise>
- </xsl:choose>
+ <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="/images/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;
-</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>
+
+
+<!--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>
Modified: icecast/branches/kh/icecast/admin/updatemetadata.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/updatemetadata.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/admin/updatemetadata.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,23 +6,35 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body>
- <center>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
<td align="center">
- <a class="nav" href="listmounts.xsl">List MountPoints</a> |
+ <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="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="stats.xsl">Stats</a> |
- <a class="nav" href="/status.xsl">Status Page</a>
+ <a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
- </center>
-<h2>Update Metadata</h2>
+<div class="roundbottom">
+<img src="/images/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" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<xsl:for-each select="source">
@@ -45,11 +57,10 @@
<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="/images/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>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/configure.in
===================================================================
--- icecast/branches/kh/icecast/configure.in 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/configure.in 2005-08-10 20:48:10 UTC (rev 9725)
@@ -168,5 +168,5 @@
AC_OUTPUT([Makefile conf/Makefile debian/Makefile src/Makefile src/avl/Makefile
src/httpp/Makefile src/thread/Makefile src/log/Makefile
-src/net/Makefile src/timing/Makefile doc/Makefile web/Makefile
+src/net/Makefile src/timing/Makefile doc/Makefile web/Makefile web/images/Makefile
admin/Makefile win32/Makefile win32/res/Makefile])
Modified: icecast/branches/kh/icecast/web/auth.xsl
===================================================================
--- icecast/branches/kh/icecast/web/auth.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/web/auth.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,15 +6,15 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body bgcolor="black">
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<table border="0" width="100%%">
<tr>
<td width="50"></td>
<td>
-<h2>Authorization Page</h2>
+<img align="left" src="/images/icecast.png" /><h2><center>Authorization Page</center></h2>
<div class="roundcont">
<div class="roundtop">
-<img src="corner_topleft.jpg" class="corner" style="display: none" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<xsl:for-each select="source">
@@ -43,14 +43,14 @@
<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="/images/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>
+<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>
Deleted: icecast/branches/kh/icecast/web/corner_bottomleft.jpg
===================================================================
(Binary files differ)
Deleted: icecast/branches/kh/icecast/web/corner_bottomright.jpg
===================================================================
(Binary files differ)
Deleted: icecast/branches/kh/icecast/web/corner_topleft.jpg
===================================================================
(Binary files differ)
Deleted: icecast/branches/kh/icecast/web/corner_topright.jpg
===================================================================
(Binary files differ)
Deleted: icecast/branches/kh/icecast/web/icecast.png
===================================================================
(Binary files differ)
Added: icecast/branches/kh/icecast/web/images/corner_bottomleft.jpg
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/corner_bottomleft.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/branches/kh/icecast/web/images/corner_bottomright.jpg
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/corner_bottomright.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/branches/kh/icecast/web/images/corner_topleft.jpg
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/corner_topleft.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/branches/kh/icecast/web/images/corner_topright.jpg
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/corner_topright.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/branches/kh/icecast/web/images/icecast.png
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/icecast.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/branches/kh/icecast/web/images/key.png
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/key.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: icecast/branches/kh/icecast/web/images/tunein.png
===================================================================
(Binary files differ)
Property changes on: icecast/branches/kh/icecast/web/images/tunein.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: icecast/branches/kh/icecast/web/key.gif
===================================================================
(Binary files differ)
Added: icecast/branches/kh/icecast/web/server_uptime.xsl
===================================================================
--- icecast/branches/kh/icecast/web/server_uptime.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/web/server_uptime.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -0,0 +1,64 @@
+<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="/images/icecast.png" /><h2><center>Icecast2 Status (Server Uptime)</center></h2>
+<br />
+<!--index header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/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_uptime.xsl">Server Uptime</a> |
+ <a class="nav" href="server_version.xsl">Version Info</a> |</td>
+ </tr>
+</table>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end index header menu -->
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Server Stats</h3>
+<table border="0" cellpadding="4">
+<xsl:for-each select="/icestats">
+<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>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/images/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>
Added: icecast/branches/kh/icecast/web/server_version.xsl
===================================================================
--- icecast/branches/kh/icecast/web/server_version.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/web/server_version.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -0,0 +1,84 @@
+<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="/images/icecast.png" /><h2><center>Icecast2 Status (Version Info)</center></h2>
+<br />
+<!--index header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/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_uptime.xsl">Server Uptime</a> |
+ <a class="nav" href="server_version.xsl">Version Info</a> |</td>
+ </tr>
+</table>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end index header menu -->
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/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>
+<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="/images/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>
Modified: icecast/branches/kh/icecast/web/status.xsl
===================================================================
--- icecast/branches/kh/icecast/web/status.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/web/status.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -6,21 +6,53 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body>
-<h2>Icecast Status Page</h2>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/images/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" />
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
-<div class="newscontent">
+<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
+ <tr>
+ <td bgcolor="#656565">
+ <a class="nav" href="admin/stats.xsl">Administration</a> |
+ <a class="nav" href="status.xsl">Server Status</a> |
+ <a class="nav" href="server_uptime.xsl">Server Uptime</a> |
+ <a class="nav" href="server_version.xsl">Version Info</a> |</td>
+ </tr>
+</table>
+<div class="roundbottom">
+<img src="/images/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="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+<xsl:choose>
+<xsl:when test="authenticator">
+<a href="auth.xsl"><img border="0" src="/images/key.png"/></a> Authentication Required
+</xsl:when>
+<xsl:otherwise>
+<a href="{@mount}.m3u"><img border="0" src="/images/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.gif"/></a> </xsl:if>
+<xsl:if test="authenticator"> <a href="/auth.xsl"><img border="0" src="/images/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>
@@ -28,9 +60,8 @@
<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>
+<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>
@@ -46,48 +77,39 @@
<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>
+<tr><td>Current Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
</xsl:if>
<xsl:if test="listener_peak">
-<tr><td>Listener Peak:</td><td class="streamdata"> <xsl:value-of select="listener_peak" /></td></tr>
+<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 href="{server_url}"><xsl:value-of select="server_url" /></a></td></tr>
+<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>
-<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>
+</div>
+<div class="roundbottom">
+<img src="/images/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>
-<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>
+
+<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>
Modified: icecast/branches/kh/icecast/web/style.css
===================================================================
--- icecast/branches/kh/icecast/web/style.css 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/web/style.css 2005-08-10 20:48:10 UTC (rev 9725)
@@ -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(images/corner_topright.jpg) no-repeat top right;
}
.roundbottom {
- background: url(corner_bottomright.jpg) no-repeat top right;
+ background: url(images/corner_bottomright.jpg) no-repeat top right;
}
img.corner {
Added: icecast/branches/kh/icecast/web/uptime_xml.xsl
===================================================================
--- icecast/branches/kh/icecast/web/uptime_xml.xsl 2005-08-10 20:11:51 UTC (rev 9724)
+++ icecast/branches/kh/icecast/web/uptime_xml.xsl 2005-08-10 20:48:10 UTC (rev 9725)
@@ -0,0 +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" >
+<xsl:for-each select="/icestats">
+<xsl:for-each select="server_start">
+<xsl:if test = "name()!='source'">
+<UPTIME><xsl:value-of select="." /></UPTIME>
+</xsl:if>
+</xsl:for-each>
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>
More information about the commits
mailing list