[xiph-commits] r19106 - in icecast/trunk/icecast: admin web
dm8tbr at svn.xiph.org
dm8tbr at svn.xiph.org
Sun Mar 2 05:35:09 PST 2014
Author: dm8tbr
Date: 2014-03-02 05:35:09 -0800 (Sun, 02 Mar 2014)
New Revision: 19106
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/auth.xsl
icecast/trunk/icecast/web/server_version.xsl
icecast/trunk/icecast/web/status.xsl
icecast/trunk/icecast/web/status2.xsl
Log:
dos2unix conversion of new web interface files.
Modified: icecast/trunk/icecast/admin/listclients.xsl
===================================================================
--- icecast/trunk/icecast/admin/listclients.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/listclients.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,95 +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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <h2>Listener Stats</h2>
- <xsl:for-each select="source">
- <div class="roundbox">
- <div class="mounthead">
- <h3>Mountpoint <xsl:value-of select="@mount" /></h3>
- <div class="right">
- <xsl:choose>
- <xsl:when test="authenticator">
- <a class="auth" href="/auth.xsl">Login</a>
- </xsl:when>
- <xsl:otherwise>
- <ul class="mountlist">
- <li><a class="play" href="{@mount}.m3u">M3U</a></li>
- <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
- <li><a class="play" href="{@mount}.vclt">VCLT</a></li>
- </ul>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
- <div class="mountcont">
- <ul class="nav">
- <li class="active"><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
- <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
- <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
- <xsl:if test="authenticator">
- <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
- </xsl:if>
- <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
- </ul>
- <xsl:choose>
- <xsl:when test="listener">
- <div class="scrolltable">
- <table border="1">
- <thead>
- <tr>
- <td>IP</td>
- <td>Sec. connected</td>
- <td>User Agent</td>
- <td>Action</td>
- </tr>
- </thead>
- <tbody>
- <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" /></td>
- <td><xsl:value-of select="UserAgent" /></td>
- <td><a href="killclient.xsl?mount={$themount}&id={ID}">Kick</a></td>
- </tr>
- </xsl:for-each>
- </tbody>
- </table>
- </div>
- </xsl:when>
- <xsl:otherwise>
- <p>No listeners connected</p>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
- </div>
-</body>
-</html>
-</xsl:template>
+<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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <h2>Listener Stats</h2>
+ <xsl:for-each select="source">
+ <div class="roundbox">
+ <div class="mounthead">
+ <h3>Mountpoint <xsl:value-of select="@mount" /></h3>
+ <div class="right">
+ <xsl:choose>
+ <xsl:when test="authenticator">
+ <a class="auth" href="/auth.xsl">Login</a>
+ </xsl:when>
+ <xsl:otherwise>
+ <ul class="mountlist">
+ <li><a class="play" href="{@mount}.m3u">M3U</a></li>
+ <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
+ <li><a class="play" href="{@mount}.vclt">VCLT</a></li>
+ </ul>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ <div class="mountcont">
+ <ul class="nav">
+ <li class="active"><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
+ <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
+ <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
+ <xsl:if test="authenticator">
+ <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
+ </xsl:if>
+ <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
+ </ul>
+ <xsl:choose>
+ <xsl:when test="listener">
+ <div class="scrolltable">
+ <table border="1">
+ <thead>
+ <tr>
+ <td>IP</td>
+ <td>Sec. connected</td>
+ <td>User Agent</td>
+ <td>Action</td>
+ </tr>
+ </thead>
+ <tbody>
+ <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" /></td>
+ <td><xsl:value-of select="UserAgent" /></td>
+ <td><a href="killclient.xsl?mount={$themount}&id={ID}">Kick</a></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <p>No listeners connected</p>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a 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/admin/listmounts.xsl
===================================================================
--- icecast/trunk/icecast/admin/listmounts.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/listmounts.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,61 +1,61 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <h2>Active Mountpoints</h2>
- <xsl:for-each select="source">
- <div class="roundbox">
- <div class="mounthead">
- <h3 class="mount">Mountpoint <xsl:value-of select="@mount" /></h3>
- <div class="right">
- <xsl:choose>
- <xsl:when test="authenticator">
- <a class="auth" href="/auth.xsl">Login</a>
- </xsl:when>
- <xsl:otherwise>
- <ul class="mountlist">
- <li><a class="play" href="{@mount}.m3u">M3U</a></li>
- <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
- <li><a class="play" href="{@mount}.vclt">VCLT</a></li>
- </ul>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
- <div class="mountcont">
- <ul class="nav">
- <li><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
- <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
- <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
- <xsl:if test="authenticator">
- <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
- </xsl:if>
- <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
- </ul>
- <p><xsl:value-of select="listeners" /> Listener(s)</p>
- </div>
- </div>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
- </div>
-</body>
-</html>
-</xsl:template>
+<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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <h2>Active Mountpoints</h2>
+ <xsl:for-each select="source">
+ <div class="roundbox">
+ <div class="mounthead">
+ <h3 class="mount">Mountpoint <xsl:value-of select="@mount" /></h3>
+ <div class="right">
+ <xsl:choose>
+ <xsl:when test="authenticator">
+ <a class="auth" href="/auth.xsl">Login</a>
+ </xsl:when>
+ <xsl:otherwise>
+ <ul class="mountlist">
+ <li><a class="play" href="{@mount}.m3u">M3U</a></li>
+ <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
+ <li><a class="play" href="{@mount}.vclt">VCLT</a></li>
+ </ul>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ <div class="mountcont">
+ <ul class="nav">
+ <li><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
+ <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
+ <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
+ <xsl:if test="authenticator">
+ <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
+ </xsl:if>
+ <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
+ </ul>
+ <p><xsl:value-of select="listeners" /> Listener(s)</p>
+ </div>
+ </div>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a 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/admin/manageauth.xsl
===================================================================
--- icecast/trunk/icecast/admin/manageauth.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/manageauth.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,91 +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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <h2>Manage Authentication</h2>
- <xsl:if test="iceresponse">
- <div class="roundbox">
- <h3>Message</h3>
- <xsl:for-each select="iceresponse">
- <xsl:value-of select="message" /><br />
- </xsl:for-each>
- </div>
- </xsl:if>
- <xsl:for-each select="source">
- <div class="roundbox">
- <h3>Mountpoint <xsl:value-of select="@mount" />
- <xsl:if test="server_name">
- <small><xsl:value-of select="server_name" /></small>
- </xsl:if>
- </h3>
- <ul class="nav">
- <li><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
- <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
- <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
- <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
- <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
- </ul>
- <xsl:if test="User">
- <table border="1">
- <thead>
- <tr>
- <td>User</td>
- <td>Action</td>
- </tr>
- </thead>
- <tbody>
- <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>
- <a href="manageauth.xsl?mount={$themount}&username={username}&action=delete">Delete</a>
- </td>
- </tr>
- </xsl:for-each>
- </tbody>
- </table>
- </xsl:if>
- <form class="alignedform" method="get" action="/admin/manageauth.xsl">
- <fieldset>
- <legend>Add new user</legend>
- <p>
- <label for="username">Username:</label>
- <input type="text" id="username" name="username"/>
- </p>
- <p>
- <label for="password">Password:</label>
- <input type="password" id="password" name="password"/>
- </p>
- <input type="hidden" name="mount" value="{@mount}"/>
- <input type="hidden" name="action" value="add"/>
- <input type="Submit" value="Add"/>
- </fieldset>
- </form>
- </div>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
- </div>
-</body>
-</html>
-</xsl:template>
+<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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <h2>Manage Authentication</h2>
+ <xsl:if test="iceresponse">
+ <div class="roundbox">
+ <h3>Message</h3>
+ <xsl:for-each select="iceresponse">
+ <xsl:value-of select="message" /><br />
+ </xsl:for-each>
+ </div>
+ </xsl:if>
+ <xsl:for-each select="source">
+ <div class="roundbox">
+ <h3>Mountpoint <xsl:value-of select="@mount" />
+ <xsl:if test="server_name">
+ <small><xsl:value-of select="server_name" /></small>
+ </xsl:if>
+ </h3>
+ <ul class="nav">
+ <li><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
+ <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
+ <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
+ <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
+ <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
+ </ul>
+ <xsl:if test="User">
+ <table border="1">
+ <thead>
+ <tr>
+ <td>User</td>
+ <td>Action</td>
+ </tr>
+ </thead>
+ <tbody>
+ <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>
+ <a href="manageauth.xsl?mount={$themount}&username={username}&action=delete">Delete</a>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </xsl:if>
+ <form class="alignedform" method="get" action="/admin/manageauth.xsl">
+ <fieldset>
+ <legend>Add new user</legend>
+ <p>
+ <label for="username">Username:</label>
+ <input type="text" id="username" name="username"/>
+ </p>
+ <p>
+ <label for="password">Password:</label>
+ <input type="password" id="password" name="password"/>
+ </p>
+ <input type="hidden" name="mount" value="{@mount}"/>
+ <input type="hidden" name="action" value="add"/>
+ <input type="Submit" value="Add"/>
+ </fieldset>
+ </form>
+ </div>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a 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/admin/moveclients.xsl
===================================================================
--- icecast/trunk/icecast/admin/moveclients.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/moveclients.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,39 +1,39 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
- <h2>Moving listeners from <xsl:value-of select="current_source" /></h2>
- <div class="roundbox">
- <h3>Move to which mountpoint?</h3>
- <xsl:for-each select="source">
- <p>
- Move from <code><xsl:copy-of select="$currentmount" /></code> to <code><xsl:value-of select="@mount" /></code><br />
- <xsl:value-of select="listeners" /> listeners<br />
- <a href="moveclients.xsl?mount={$currentmount}&destination={@mount}">Move clients</a>
- </p>
- </xsl:for-each>
- </div>
- <div id="footer">
- Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
- </div>
-</body>
-</html>
-</xsl:template>
+<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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
+ <h2>Moving listeners from <xsl:value-of select="current_source" /></h2>
+ <div class="roundbox">
+ <h3>Move to which mountpoint?</h3>
+ <xsl:for-each select="source">
+ <p>
+ Move from <code><xsl:copy-of select="$currentmount" /></code> to <code><xsl:value-of select="@mount" /></code><br />
+ <xsl:value-of select="listeners" /> listeners<br />
+ <a href="moveclients.xsl?mount={$currentmount}&destination={@mount}">Move clients</a>
+ </p>
+ </xsl:for-each>
+ </div>
+ <div id="footer">
+ Support icecast development at <a 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/admin/response.xsl
===================================================================
--- icecast/trunk/icecast/admin/response.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/response.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,35 +1,35 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <h2>Icecast Server Response</h2>
- <xsl:for-each select="/iceresponse">
- <div class="roundbox">
- <h3>Response</h3>
- <p>Message: <xsl:value-of select="message" /></p>
- <p>Return Code: <xsl:value-of select="return" /></p>
- </div>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a 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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <h2>Icecast Server Response</h2>
+ <xsl:for-each select="/iceresponse">
+ <div class="roundbox">
+ <h3>Response</h3>
+ <p>Message: <xsl:value-of select="message" /></p>
+ <p>Return Code: <xsl:value-of select="return" /></p>
+ </div>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a 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 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/stats.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,93 +1,93 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <!--global server stats-->
- <div class="roundbox">
- <h3>Global Server Stats</h3>
- <table class="yellowkeys">
- <tbody>
- <xsl:for-each select="/icestats">
- <xsl:for-each select="*">
- <xsl:if test = "name()!='source'">
- <tr>
- <td><xsl:value-of select="name()" /></td>
- <td><xsl:value-of select="." /></td>
- </tr>
- </xsl:if>
- </xsl:for-each>
- </xsl:for-each>
- </tbody>
- </table>
- </div>
- <!--end global server stats-->
-
- <!--mount point stats-->
- <xsl:for-each select="source">
- <xsl:if test = "listeners!=''">
- <div class="roundbox">
- <div class="mounthead">
- <h3 class="mount">Mountpoint <xsl:value-of select="@mount" /></h3>
- <div class="right">
- <xsl:choose>
- <xsl:when test="authenticator">
- <a class="auth" href="/auth.xsl">Login</a>
- </xsl:when>
- <xsl:otherwise>
- <ul class="mountlist">
- <li><a class="play" href="{@mount}.m3u">M3U</a></li>
- <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
- <li><a class="play" href="{@mount}.vclt">VCLT</a></li>
- </ul>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
- <div class="mountcont">
- <ul class="nav">
- <li><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
- <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
- <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
- <xsl:if test="authenticator">
- <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
- </xsl:if>
- <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
- </ul>
- <table class="yellowkeys">
- <tbody>
- <xsl:for-each select="*">
- <tr>
- <td><xsl:value-of select="name()" /></td>
- <td><xsl:value-of select="." /></td>
- </tr>
- </xsl:for-each>
- </tbody>
- </table>
- </div>
- </div>
- </xsl:if>
- </xsl:for-each>
- <!--end mount point stats-->
- <div id="footer">
- Support icecast development at <a 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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <!--global server stats-->
+ <div class="roundbox">
+ <h3>Global Server Stats</h3>
+ <table class="yellowkeys">
+ <tbody>
+ <xsl:for-each select="/icestats">
+ <xsl:for-each select="*">
+ <xsl:if test = "name()!='source'">
+ <tr>
+ <td><xsl:value-of select="name()" /></td>
+ <td><xsl:value-of select="." /></td>
+ </tr>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ <!--end global server stats-->
+
+ <!--mount point stats-->
+ <xsl:for-each select="source">
+ <xsl:if test = "listeners!=''">
+ <div class="roundbox">
+ <div class="mounthead">
+ <h3 class="mount">Mountpoint <xsl:value-of select="@mount" /></h3>
+ <div class="right">
+ <xsl:choose>
+ <xsl:when test="authenticator">
+ <a class="auth" href="/auth.xsl">Login</a>
+ </xsl:when>
+ <xsl:otherwise>
+ <ul class="mountlist">
+ <li><a class="play" href="{@mount}.m3u">M3U</a></li>
+ <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
+ <li><a class="play" href="{@mount}.vclt">VCLT</a></li>
+ </ul>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ <div class="mountcont">
+ <ul class="nav">
+ <li><a href="listclients.xsl?mount={@mount}">List Clients</a></li>
+ <li><a href="moveclients.xsl?mount={@mount}">Move Listeners</a></li>
+ <li><a href="updatemetadata.xsl?mount={@mount}">Update Metadata</a></li>
+ <xsl:if test="authenticator">
+ <li><a href="manageauth.xsl?mount={@mount}">Manage Authentication</a></li>
+ </xsl:if>
+ <li><a href="killsource.xsl?mount={@mount}">Kill Source</a></li>
+ </ul>
+ <table class="yellowkeys">
+ <tbody>
+ <xsl:for-each select="*">
+ <tr>
+ <td><xsl:value-of select="name()" /></td>
+ <td><xsl:value-of select="." /></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </xsl:if>
+ </xsl:for-each>
+ <!--end mount point stats-->
+ <div id="footer">
+ Support icecast development at <a 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 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/admin/updatemetadata.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,49 +1,49 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1>Icecast2 Admin</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="stats.xsl">Admin Home</a></li>
- <li><a href="listmounts.xsl">Mountpoint List</a></li>
- <li><a href="/status.xsl">Public Home</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <h2>Update Metadata</h2>
- <xsl:for-each select="source">
- <div class="roundbox">
- <h3>Mountpoint <xsl:value-of select="@mount" />
- <xsl:if test="server_name">
- <small><xsl:value-of select="server_name" /></small>
- </xsl:if>
- </h3>
- <form class="alignedform" method="get" action="/admin/metadata.xsl">
- <p>
- <label for="song">Metadata:</label>
- <input type="text" id="song" name="song"/>
- </p>
- <p>
- <input type="submit" value="Update"/>
- <input type="hidden" name="mount" value="{@mount}"/>
- <input type="hidden" name="mode" value="updinfo"/>
- <input type="hidden" name="charset" value="UTF-8"/>
- </p>
- </form>
- </div>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
- </div>
-</body>
-</html>
-</xsl:template>
+<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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1>Icecast2 Admin</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="stats.xsl">Admin Home</a></li>
+ <li><a href="listmounts.xsl">Mountpoint List</a></li>
+ <li><a href="/status.xsl">Public Home</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <h2>Update Metadata</h2>
+ <xsl:for-each select="source">
+ <div class="roundbox">
+ <h3>Mountpoint <xsl:value-of select="@mount" />
+ <xsl:if test="server_name">
+ <small><xsl:value-of select="server_name" /></small>
+ </xsl:if>
+ </h3>
+ <form class="alignedform" method="get" action="/admin/metadata.xsl">
+ <p>
+ <label for="song">Metadata:</label>
+ <input type="text" id="song" name="song"/>
+ </p>
+ <p>
+ <input type="submit" value="Update"/>
+ <input type="hidden" name="mount" value="{@mount}"/>
+ <input type="hidden" name="mode" value="updinfo"/>
+ <input type="hidden" name="charset" value="UTF-8"/>
+ </p>
+ </form>
+ </div>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a 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/auth.xsl
===================================================================
--- icecast/trunk/icecast/web/auth.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/web/auth.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,59 +1,59 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1 id="header">Icecast2 Status</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="admin/">Administration</a></li>
- <li><a href="status.xsl">Server Status</a></li>
- <li><a href="server_version.xsl">Version</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <h2>Authorization Page</h2>
- <xsl:for-each select="source">
- <xsl:choose>
- <xsl:when test="listeners">
- <xsl:if test="authenticator">
- <div class="roundbox">
- <h3 class="mount">
- Mount Point <xsl:value-of select="@mount" />
- <xsl:if test="server_name">
- <small><xsl:value-of select="server_name" /></small>
- </xsl:if>
- </h3>
- <form class="alignedform" method="get" action="/admin/buildm3u">
- <p>
- <label for="name">Username: </label>
- <input id="name" name="username" type="text" />
- </p>
- <p>
- <label for="password">Password: </label>
- <input id="password" name="password" type="password" />
- </p>
- <input type="hidden" name="mount" value="{@mount}" />
- <input type="submit" value="Login" />
- </form>
- </div>
- </xsl:if>
- </xsl:when>
- <xsl:otherwise>
- <h3><xsl:value-of select="@mount" /> - Not Connected</h3>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a 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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1 id="header">Icecast2 Status</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="admin/">Administration</a></li>
+ <li><a href="status.xsl">Server Status</a></li>
+ <li><a href="server_version.xsl">Version</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <h2>Authorization Page</h2>
+ <xsl:for-each select="source">
+ <xsl:choose>
+ <xsl:when test="listeners">
+ <xsl:if test="authenticator">
+ <div class="roundbox">
+ <h3 class="mount">
+ Mount Point <xsl:value-of select="@mount" />
+ <xsl:if test="server_name">
+ <small><xsl:value-of select="server_name" /></small>
+ </xsl:if>
+ </h3>
+ <form class="alignedform" method="get" action="/admin/buildm3u">
+ <p>
+ <label for="name">Username: </label>
+ <input id="name" name="username" type="text" />
+ </p>
+ <p>
+ <label for="password">Password: </label>
+ <input id="password" name="password" type="password" />
+ </p>
+ <input type="hidden" name="mount" value="{@mount}" />
+ <input type="submit" value="Login" />
+ </form>
+ </div>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <h3><xsl:value-of select="@mount" /> - Not Connected</h3>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
+ </div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/web/server_version.xsl
===================================================================
--- icecast/trunk/icecast/web/server_version.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/web/server_version.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,73 +1,73 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1 id="header">Server Information</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="admin/">Administration</a></li>
- <li><a href="status.xsl">Server Status</a></li>
- <li><a href="server_version.xsl">Version</a></li>
- </ul>
- </div>
- <!--end index header menu -->
-
- <div class="roundbox">
- <h3>Server Information</h3>
- <table class="yellowkeys">
- <tbody>
- <xsl:for-each select="/icestats">
- <tr>
- <td>Location</td>
- <td><xsl:value-of select="location" /></td>
- </tr>
- <tr>
- <td>Admin</td>
- <td><xsl:value-of select="admin" /></td>
- </tr>
- <tr>
- <td>Host</td>
- <td><xsl:value-of select="host" /></td>
- </tr>
- <tr>
- <td>Version</td>
- <td><xsl:value-of select="server_id" /></td>
- </tr>
- </xsl:for-each>
- <tr>
- <td>Download</td>
- <td><a href="http://icecast.org/download.php">icecast.org</a></td>
- </tr>
- <tr>
- <td>Subversion</td>
- <td><a href="http://icecast.org/svn.php">icecast.org/svn.php</a></td>
- </tr>
- <tr>
- <td>Documentation</td>
- <td><a href="http://icecast.org/docs.php">icecast.org/docs.php</a></td>
- </tr>
- <tr>
- <td>Stream Directory</td>
- <td><a href="http://dir.xiph.org/index.php">dir.xiph.org</a></td>
- </tr>
- <tr>
- <td>Community</td>
- <td><a href="http://icecast.org/community.php">icecast.org/community.php</a></td>
- </tr>
- </tbody>
- </table>
- </div>
- <div id="footer">
- Support icecast development at <a 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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1 id="header">Server Information</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="admin/">Administration</a></li>
+ <li><a href="status.xsl">Server Status</a></li>
+ <li><a href="server_version.xsl">Version</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+
+ <div class="roundbox">
+ <h3>Server Information</h3>
+ <table class="yellowkeys">
+ <tbody>
+ <xsl:for-each select="/icestats">
+ <tr>
+ <td>Location</td>
+ <td><xsl:value-of select="location" /></td>
+ </tr>
+ <tr>
+ <td>Admin</td>
+ <td><xsl:value-of select="admin" /></td>
+ </tr>
+ <tr>
+ <td>Host</td>
+ <td><xsl:value-of select="host" /></td>
+ </tr>
+ <tr>
+ <td>Version</td>
+ <td><xsl:value-of select="server_id" /></td>
+ </tr>
+ </xsl:for-each>
+ <tr>
+ <td>Download</td>
+ <td><a href="http://icecast.org/download.php">icecast.org</a></td>
+ </tr>
+ <tr>
+ <td>Subversion</td>
+ <td><a href="http://icecast.org/svn.php">icecast.org/svn.php</a></td>
+ </tr>
+ <tr>
+ <td>Documentation</td>
+ <td><a href="http://icecast.org/docs.php">icecast.org/docs.php</a></td>
+ </tr>
+ <tr>
+ <td>Stream Directory</td>
+ <td><a href="http://dir.xiph.org/index.php">dir.xiph.org</a></td>
+ </tr>
+ <tr>
+ <td>Community</td>
+ <td><a href="http://icecast.org/community.php">icecast.org/community.php</a></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="footer">
+ Support icecast development at <a href="http://www.icecast.org">www.icecast.org</a>
+ </div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/trunk/icecast/web/status.xsl
===================================================================
--- icecast/trunk/icecast/web/status.xsl 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/web/status.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -1,160 +1,160 @@
-<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 xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Icecast Streaming Media Server</title>
- <link rel="stylesheet" type="text/css" href="style.css" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-</head>
-<body>
- <h1 id="header">Icecast2 Status</h1>
- <!--index header menu -->
- <div id="menu">
- <ul>
- <li><a href="admin/">Administration</a></li>
- <li><a href="status.xsl">Server Status</a></li>
- <li><a href="server_version.xsl">Version</a></li>
- </ul>
- </div>
- <!--end index header menu -->
- <xsl:text disable-output-escaping="yes">
- <!-- WARNING:
- DO NOT ATTEMPT TO PARSE ICECAST HTML OUTPUT!
- The web interface may change completely between releases.
- If you have a need for automatic processing of server data,
- please read the appropriate documentation. Latest docs:
- http://icecast.org/docs/icecast-latest/icecast2_stats.html
- -->
- </xsl:text>
- <!--mount point stats-->
- <xsl:for-each select="source">
- <xsl:choose>
- <xsl:when test="listeners">
- <div class="roundbox">
- <div class="mounthead">
- <h3 class="mount">Mount Point <xsl:value-of select="@mount" /></h3>
- <div class="right">
- <xsl:choose>
- <xsl:when test="authenticator">
- <a class="auth" href="/auth.xsl">Login</a>
- </xsl:when>
- <xsl:otherwise>
- <ul class="mountlist">
- <li><a class="play" href="{@mount}.m3u">M3U</a></li>
- <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
- <!-- <li><a class="play" href="{@mount}.vclt">VCLT</a></li> -->
- </ul>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
- <div class="mountcont">
- <table class="yellowkeys">
- <tbody>
- <xsl:if test="server_name">
- <tr>
- <td>Stream Name:</td>
- <td><xsl:value-of select="server_name" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="server_description">
- <tr>
- <td>Stream Description:</td>
- <td><xsl:value-of select="server_description" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="server_type">
- <tr>
- <td>Content Type:</td>
- <td><xsl:value-of select="server_type" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="stream_start">
- <tr>
- <td>Stream started:</td>
- <td class="streamstats"><xsl:value-of select="stream_start" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="bitrate">
- <tr>
- <td>Bitrate:</td>
- <td class="streamstats"><xsl:value-of select="bitrate" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="quality">
- <tr>
- <td>Quality:</td>
- <td class="streamstats"><xsl:value-of select="quality" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="video_quality">
- <tr>
- <td>Video Quality:</td>
- <td class="streamstats"><xsl:value-of select="video_quality" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="frame_size">
- <tr>
- <td>Framesize:</td>
- <td class="streamstats"><xsl:value-of select="frame_size" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="frame_rate">
- <tr>
- <td>Framerate:</td>
- <td class="streamstats"><xsl:value-of select="frame_rate" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="listeners">
- <tr>
- <td>Listeners (current):</td>
- <td class="streamstats"><xsl:value-of select="listeners" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="listener_peak">
- <tr>
- <td>Listeners (peak):</td>
- <td class="streamstats"><xsl:value-of select="listener_peak" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="genre">
- <tr>
- <td>Genre:</td>
- <td class="streamstats"><xsl:value-of select="genre" /></td>
- </tr>
- </xsl:if>
- <xsl:if test="server_url">
- <tr>
- <td>Stream URL:</td>
- <td class="streamstats">
- <a href="{server_url}"><xsl:value-of select="server_url" /></a>
- </td>
- </tr>
- </xsl:if>
- <tr>
- <td>Currently playing:</td>
- <td class="streamstats">
- <xsl:if test="artist">
- <xsl:value-of select="artist" /> -
- </xsl:if>
- <xsl:value-of select="title" />
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </xsl:when>
- <xsl:otherwise>
- <h3><xsl:value-of select="@mount" /> - Not Connected</h3>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <div id="footer">
- Support icecast development at <a 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 xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Icecast Streaming Media Server</title>
+ <link rel="stylesheet" type="text/css" href="style.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+</head>
+<body>
+ <h1 id="header">Icecast2 Status</h1>
+ <!--index header menu -->
+ <div id="menu">
+ <ul>
+ <li><a href="admin/">Administration</a></li>
+ <li><a href="status.xsl">Server Status</a></li>
+ <li><a href="server_version.xsl">Version</a></li>
+ </ul>
+ </div>
+ <!--end index header menu -->
+ <xsl:text disable-output-escaping="yes">
+ <!-- WARNING:
+ DO NOT ATTEMPT TO PARSE ICECAST HTML OUTPUT!
+ The web interface may change completely between releases.
+ If you have a need for automatic processing of server data,
+ please read the appropriate documentation. Latest docs:
+ http://icecast.org/docs/icecast-latest/icecast2_stats.html
+ -->
+ </xsl:text>
+ <!--mount point stats-->
+ <xsl:for-each select="source">
+ <xsl:choose>
+ <xsl:when test="listeners">
+ <div class="roundbox">
+ <div class="mounthead">
+ <h3 class="mount">Mount Point <xsl:value-of select="@mount" /></h3>
+ <div class="right">
+ <xsl:choose>
+ <xsl:when test="authenticator">
+ <a class="auth" href="/auth.xsl">Login</a>
+ </xsl:when>
+ <xsl:otherwise>
+ <ul class="mountlist">
+ <li><a class="play" href="{@mount}.m3u">M3U</a></li>
+ <li><a class="play" href="{@mount}.xspf">XSPF</a></li>
+ <!-- <li><a class="play" href="{@mount}.vclt">VCLT</a></li> -->
+ </ul>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ <div class="mountcont">
+ <table class="yellowkeys">
+ <tbody>
+ <xsl:if test="server_name">
+ <tr>
+ <td>Stream Name:</td>
+ <td><xsl:value-of select="server_name" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="server_description">
+ <tr>
+ <td>Stream Description:</td>
+ <td><xsl:value-of select="server_description" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="server_type">
+ <tr>
+ <td>Content Type:</td>
+ <td><xsl:value-of select="server_type" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="stream_start">
+ <tr>
+ <td>Stream started:</td>
+ <td class="streamstats"><xsl:value-of select="stream_start" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="bitrate">
+ <tr>
+ <td>Bitrate:</td>
+ <td class="streamstats"><xsl:value-of select="bitrate" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="quality">
+ <tr>
+ <td>Quality:</td>
+ <td class="streamstats"><xsl:value-of select="quality" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="video_quality">
+ <tr>
+ <td>Video Quality:</td>
+ <td class="streamstats"><xsl:value-of select="video_quality" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="frame_size">
+ <tr>
+ <td>Framesize:</td>
+ <td class="streamstats"><xsl:value-of select="frame_size" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="frame_rate">
+ <tr>
+ <td>Framerate:</td>
+ <td class="streamstats"><xsl:value-of select="frame_rate" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="listeners">
+ <tr>
+ <td>Listeners (current):</td>
+ <td class="streamstats"><xsl:value-of select="listeners" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="listener_peak">
+ <tr>
+ <td>Listeners (peak):</td>
+ <td class="streamstats"><xsl:value-of select="listener_peak" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="genre">
+ <tr>
+ <td>Genre:</td>
+ <td class="streamstats"><xsl:value-of select="genre" /></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="server_url">
+ <tr>
+ <td>Stream URL:</td>
+ <td class="streamstats">
+ <a href="{server_url}"><xsl:value-of select="server_url" /></a>
+ </td>
+ </tr>
+ </xsl:if>
+ <tr>
+ <td>Currently playing:</td>
+ <td class="streamstats">
+ <xsl:if test="artist">
+ <xsl:value-of select="artist" /> -
+ </xsl:if>
+ <xsl:value-of select="title" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <h3><xsl:value-of select="@mount" /> - Not Connected</h3>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ <div id="footer">
+ Support icecast development at <a 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 2014-03-02 12:46:24 UTC (rev 19105)
+++ icecast/trunk/icecast/web/status2.xsl 2014-03-02 13:35:09 UTC (rev 19106)
@@ -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>
More information about the commits
mailing list