Commit f63e0d14 authored by Karl Heyes's avatar Karl Heyes

xsl update. added xspf links. minor changes to page display

svn path=/icecast/trunk/icecast/; revision=14850
parent c59afc60
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
<h2>Icecast2 Admin</h2>
<br />
<div class="roundcont">
......@@ -17,9 +17,9 @@
<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="stats.xsl">Admin Home</a>
<a class="nav" href="listmounts.xsl">List Mountpoints</a>
<a class="nav" href="moveclients.xsl">Move Listeners</a>
<a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
......@@ -39,33 +39,39 @@
</div>
<div class="newscontent">
<xsl:for-each select="source">
<h3>
<div class="streamheader">
<table cellspacing="0" cellpadding="0" >
<colgroup align="left" />
<colgroup align="right" width="300" />
<tr>
<td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
<xsl:choose>
<xsl:when test="authenticator">
<td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
</xsl:when>
<xsl:otherwise>
<td align="right">
<a href="{@mount}.m3u">M3U</a>
<a href="{@mount}.xspf">XSPF</a></td>
</xsl:otherwise>
</xsl:choose>
</tr></table>
</div>
<xsl:choose>
<xsl:when test="authenticator">
<a href="/auth.xsl"><img border="0" src="/key.png"/></a>
</xsl:when>
<xsl:otherwise>
<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
Mount Point : (<xsl:value-of select="@mount" />)
</h3>
<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
<tr>
<td align="center">
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
</td></tr>
</table>
<br />
<table cellspacing="1" border="1" bordercolor="#C0C0C0" >
<table cellspacing="0" cellpadding="5" border="1" bordercolor="#C0C0C0" >
<tr>
<td ><center><b>IP</b></center></td>
<td ><center><b>Connected For</b></center></td>
<td ><center><b>Seconds Connected</b></center></td>
<td ><center><b>User Agent</b></center></td>
<td ><center><b>Action</b></center></td>
</tr>
......@@ -73,7 +79,7 @@ Mount Point : (<xsl:value-of select="@mount" />)
<xsl:for-each select="listener">
<tr>
<td align="center"><xsl:value-of select="IP" /><xsl:if test="username"> (<xsl:value-of select="username" />)</xsl:if></td>
<td align="center"><xsl:value-of select="Connected" /> seconds</td>
<td align="center"><xsl:value-of select="Connected" /></td>
<td align="center"><xsl:value-of select="UserAgent" /></td>
<td align="center"><a href="killclient.xsl?mount={$themount}&amp;id={ID}">Kick</a></td>
</tr>
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
<h2>Icecast2 Admin</h2>
<br />
<div class="roundcont">
......@@ -17,9 +17,9 @@
<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="stats.xsl">Admin Home</a>
<a class="nav" href="listmounts.xsl">List Mountpoints</a>
<a class="nav" href="moveclients.xsl">Move Listeners</a>
<a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
......@@ -38,26 +38,33 @@
</div>
<div class="newscontent">
<xsl:for-each select="source">
<h3>
<xsl:choose>
<xsl:when test="authenticator">
<a href="/auth.xsl"><img border="0" src="/key.png"/></a>
</xsl:when>
<xsl:otherwise>
<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
Mount Point : (<xsl:value-of select="@mount" />)
</h3>
<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
<div class="streamheader">
<table cellspacing="0" cellpadding="0" >
<colgroup align="left" />
<colgroup align="right" width="300" />
<tr>
<td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
<xsl:choose>
<xsl:when test="authenticator">
<td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
</xsl:when>
<xsl:otherwise>
<td align="right">
<a href="{@mount}.m3u">M3U</a>
<a href="{@mount}.xspf">XSPF</a></td>
</xsl:otherwise>
</xsl:choose>
</tr></table>
</div>
<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
<tr>
<td align="center">
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
<xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
<xsl:if test="authenticator"><a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
</td></tr>
</table>
<br />
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
<h2>Icecast2 Admin</h2>
<br />
<div class="roundcont">
......@@ -17,9 +17,9 @@
<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="stats.xsl">Admin Home</a>
<a class="nav" href="listmounts.xsl">List Mountpoints</a>
<a class="nav" href="moveclients.xsl">Move Listeners</a>
<a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
......@@ -30,7 +30,6 @@
<br />
<br />
<h2>Show defined users</h2>
<div class="roundcont">
<div class="roundtop">
<img src="/corner_topleft.jpg" class="corner" style="display: none" />
......@@ -46,9 +45,9 @@
<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
<tr>
<td align="center">
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a> |
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
</td></tr>
</table>
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
<h2>Icecast2 Admin</h2>
<br />
<div class="roundcont">
......@@ -17,9 +17,9 @@
<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="stats.xsl">Admin Home</a>
<a class="nav" href="listmounts.xsl">List Mountpoints</a>
<a class="nav" href="moveclients.xsl">Move Listeners</a>
<a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
<h2>Icecast2 Admin</h2>
<br />
<!--header menu -->
<div class="roundcont">
......@@ -17,9 +17,9 @@
<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="stats.xsl">Admin Home</a>
<a class="nav" href="listmounts.xsl">List Mountpoints</a>
<a class="nav" href="moveclients.xsl">Move Listeners</a>
<a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
......@@ -67,25 +67,32 @@
<img src="/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<h3>
<xsl:choose>
<xsl:when test="authenticator">
<a href="/auth.xsl"><img border="0" src="/key.png"/></a>
</xsl:when>
<xsl:otherwise>
<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a>
</xsl:otherwise>
</xsl:choose>
Mount Point : (<xsl:value-of select="@mount" />)
</h3>
<div class="streamheader">
<table cellspacing="0" cellpadding="0" >
<colgroup align="left" />
<colgroup align="right" width="300" />
<tr>
<td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
<xsl:choose>
<xsl:when test="authenticator">
<td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
</xsl:when>
<xsl:otherwise>
<td align="right">
<a href="{@mount}.m3u">M3U</a>
<a href="{@mount}.xspf">XSPF</a></td>
</xsl:otherwise>
</xsl:choose>
</tr></table>
</div>
<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
<tr>
<td align="center">
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a> |
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move MountPoints</a> |
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a> |
<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
<a class="nav2" href="moveclients.xsl?mount={@mount}">Move MountPoints</a>
<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
<xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
<xsl:if test="authenticator"><a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
</td></tr>
</table>
<br />
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
<h2>Icecast2 Admin</h2>
<br />
<div class="roundcont">
......@@ -17,9 +17,9 @@
<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="stats.xsl">Admin Home</a>
<a class="nav" href="listmounts.xsl">List Mountpoints</a>
<a class="nav" href="moveclients.xsl">Move Listeners</a>
<a class="nav" href="/status.xsl">Index</a>
</td></tr>
</table>
......
<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:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
......@@ -11,7 +11,7 @@
<tr>
<td width="50"></td>
<td>
<img align="left" src="/icecast.png" /><h2><center>Authorization Page</center></h2>
<h2>Authorization Page</h2>
<div class="roundcont">
<div class="roundtop">
<img src="/corner_topleft.jpg" class="corner" style="display: none" />
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Status (Version Info)</center></h2>
<h2>Server Information</h2>
<br />
<!--index header menu -->
<div class="roundcont">
......@@ -17,8 +17,8 @@
<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="admin/">Administration</a>
<a class="nav" href="status.xsl">Server Status</a>
<a class="nav" href="server_version.xsl">Version</a></td>
</tr>
</table>
......@@ -35,7 +35,7 @@
<img src="/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<h3>Version Information</h3>
<h3>Server Information</h3>
<table border="0" cellpadding="4">
<xsl:for-each select="/icestats">
<tr>
......
......@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
<img align="left" src="/icecast.png" /><h2><center>Icecast2 Status</center></h2>
<h2>Icecast2 Status</h2>
<br />
<!--index header menu -->
<div class="roundcont">
......@@ -17,9 +17,9 @@
<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
<tr>
<td bgcolor="#656565">
<a class="nav" href="admin/">Administration</a> |
<a class="nav" href="status.xsl">Server Status</a> |
<a class="nav" href="server_version.xsl">Version</a> |</td>
<a class="nav" href="admin/">Administration</a>
<a class="nav" href="status.xsl">Server Status</a>
<a class="nav" href="server_version.xsl">Version</a></td>
</tr>
</table>
<div class="roundbottom">
......@@ -38,25 +38,22 @@
<img src="/corner_topleft.jpg" class="corner" style="display: none" />
</div>
<div class="newscontent">
<h3>
<xsl:choose>
<xsl:when test="authenticator">
<a href="/auth.xsl"><img border="0" src="/key.png"/></a>
</xsl:when>
<xsl:otherwise>
<a href="{@mount}.m3u"><img border="0" src="/tunein.png"/></a>
</xsl:otherwise>
</xsl:choose>
Mount Point : (<xsl:value-of select="@mount" />) :
<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>
</h3>
<div class="streamheader">
<table cellspacing="0" cellpadding="0">
<colgroup align="left" />
<colgroup align="right" width="300" />
<tr>
<td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
<xsl:choose>
<xsl:when test="authenticator">
<td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
</xsl:when>
<xsl:otherwise>
<td align="right"> <a href="{@mount}.m3u">M3U</a> <a href="{@mount}.xspf">XSPF</a></td>
</xsl:otherwise>
</xsl:choose>
</tr></table>
</div>
<table border="0" cellpadding="4">
<xsl:if test="server_name">
......@@ -65,8 +62,12 @@ Mount Point : (<xsl:value-of select="@mount" />) :
<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="server_type">
<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>
<xsl:if test="stream_start">
<tr><td>Mount started:</td><td class="streamdata"><xsl:value-of select="stream_start" /></td></tr>
</xsl:if>
<xsl:if test="bitrate">
<tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr>
</xsl:if>
......
......@@ -34,9 +34,11 @@ h2 {
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: bold;
font-size: 250%;
font-size: 3em;
color: #fff;
padding: 10px 0px 10px 80px;
margin-top:3px;
background: transparent url(/icecast.png) no-repeat scroll left center
}
h1 {
font-family: Verdana, sans-serif;
......@@ -113,18 +115,24 @@ td {
background-color: #656565;
color: #fff;
}
.roundcont a {
margin: 0px 10px;
}
.newscontent {
margin: 0 20px;
}
.newscontent h3 {
margin: 10px 0px;
h3 {
margin: 0px;
padding: 0px;
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: bold;
font-size: 110%;
color: #f8ef64;
border-bottom: 1px groove #ACACAC;
}
.newscontent h3 {
margin-bottom: 10px;
border-bottom: 1px groove #ACACAC;
}
.newscontent h4 {
margin: 10px 0px;
......@@ -156,15 +164,42 @@ td {
font-size: 90%;
color: #f8ef64;
}
.streamheader table {
width: 100%;
margin-bottom: 5px;
border-bottom: 1px groove #ACACAC;
}
.streamheader td {
margin: 0px;
padding-top: 10px;
padding-bottom: 10px;
padding: 10 5 10 5;
border: 0px solid white;
}
.streamheader h3 {
border: 0px;
}
.streamheader a {
padding: 8px 5px 3px 30px;
text-decoration: none;
background: transparent url("/tunein.png") no-repeat left center;
}
.streamheader a.auth {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 32px;
background: transparent url("/key.png") no-repeat left center;
}
.newscontent a {
font-family: Verdana, sans-serif;
text-decoration: underline;
text-decoration: none;
font-weight: bold;
margin: 0px;
color: #f8ef64;
}
.newscontent a:hover {
font-family: Verdana, sans-serif;
text-decoration: underline;
text-decoration: none;
font-weight: bold;
color: #fff;
}
......@@ -172,6 +207,7 @@ td {
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: bold;
padding: 2px 9px;
background: #444;
color: #f8ef64;
}
......@@ -184,13 +220,13 @@ td {
}
.poster {
font-family: Verdana, sans-serif;
margin: 0px;
margin-top: 50px;
margin: 50px 120px 20px 0px;
display: block;
text-decoration: none;
font-size: 100%;
color: #f8ef64;
border-top: 3px dashed #000;
padding: 5px;
border-top: 1px groove #ACACAC;
}
.roundcont p {
margin: 10px 50px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment