[xiph-commits] r7929 - in icecast/trunk/icecast: admin web
j at motherfish-iii.xiph.org
j at motherfish-iii.xiph.org
Thu Oct 7 15:19:43 PDT 2004
Author: j
Date: 2004-10-07 15:19:43 -0700 (Thu, 07 Oct 2004)
New Revision: 7929
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/web/auth.xsl
icecast/trunk/icecast/web/corner_bottomleft.jpg
icecast/trunk/icecast/web/corner_bottomright.jpg
icecast/trunk/icecast/web/corner_topleft.jpg
icecast/trunk/icecast/web/corner_topright.jpg
icecast/trunk/icecast/web/icecast.png
icecast/trunk/icecast/web/key.gif
icecast/trunk/icecast/web/status.xsl
icecast/trunk/icecast/web/status2.xsl
icecast/trunk/icecast/web/style.css
Log:
update admin interface to use xhtml
Modified: icecast/trunk/icecast/admin/listclients.xsl
===================================================================
--- icecast/trunk/icecast/admin/listclients.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/admin/listclients.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>List Connected Listeners</h2>
<div class="roundcont">
<div class="roundtop">
@@ -58,19 +54,14 @@
</tr>
</xsl:for-each>
</table>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:for-each>
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/trunk/icecast/admin/listmounts.xsl
===================================================================
--- icecast/trunk/icecast/admin/listmounts.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/admin/listmounts.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>List Mountpoints</h2>
<div class="roundcont">
<div class="roundtop">
@@ -43,7 +39,7 @@
<xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
</td></tr>
</table>
-<br></br>
+<br />
<p><xsl:value-of select="listeners" /> Listener(s)</p>
<br></br>
</xsl:for-each>
@@ -52,11 +48,6 @@
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/trunk/icecast/admin/manageauth.xsl
===================================================================
--- icecast/trunk/icecast/admin/manageauth.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/admin/manageauth.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>Show defined users</h2>
<div class="roundcont">
<div class="roundtop">
@@ -70,19 +66,14 @@
<input type="hidden" name="mount" value="{@mount}"/>
<input type="hidden" name="action" value="add"/>
</form>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:for-each>
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/trunk/icecast/admin/moveclients.xsl
===================================================================
--- icecast/trunk/icecast/admin/moveclients.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/admin/moveclients.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,13 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
-
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -19,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
<h2>Move Clients from (<xsl:value-of select="current_source" />)</h2>
<div class="roundcont">
@@ -39,19 +34,14 @@
<td><a class="nav2" href="moveclients.xsl?mount={$currentmount}&destination={@mount}">Move Clients</a></td>
</tr>
</table>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:for-each>
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/trunk/icecast/admin/response.xsl
===================================================================
--- icecast/trunk/icecast/admin/response.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/admin/response.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/iceresponse" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>Icecast Server Response</h2>
<div class="roundcont">
<div class="roundtop">
@@ -33,18 +29,13 @@
Message : <xsl:value-of select="message" /><br></br>
Return Code: <xsl:value-of select="return" /><br></br>
</xsl:for-each>
-<br></br>
-<br></br>
+<br />
+<br />
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/trunk/icecast/admin/stats.xsl
===================================================================
--- icecast/trunk/icecast/admin/stats.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/admin/stats.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>Icecast Status Page</h2>
<div class="roundcont">
<div class="roundtop">
@@ -46,8 +42,8 @@
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br>
-<br></br>
+<br />
+<br />
<div class="roundcont">
<div class="roundtop">
@@ -70,7 +66,7 @@
<xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
</td></tr>
</table>
-<br></br>
+<br />
<table cellpadding="5" cellspacing="0" border="0">
<xsl:for-each select="*">
<tr>
@@ -79,8 +75,8 @@
</tr>
</xsl:for-each>
</table>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:if>
</xsl:for-each>
</div>
@@ -88,11 +84,6 @@
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/trunk/icecast/web/auth.xsl
===================================================================
--- icecast/trunk/icecast/web/auth.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/web/auth.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,5 +1,5 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<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>
Property changes on: icecast/trunk/icecast/web/corner_bottomleft.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Property changes on: icecast/trunk/icecast/web/corner_bottomright.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Property changes on: icecast/trunk/icecast/web/corner_topleft.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Property changes on: icecast/trunk/icecast/web/corner_topright.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Modified: icecast/trunk/icecast/web/icecast.png
===================================================================
(Binary files differ)
Property changes on: icecast/trunk/icecast/web/icecast.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Property changes on: icecast/trunk/icecast/web/key.gif
___________________________________________________________________
Name: svn:mime-type
- application/octet-stream
+ image/gif
Modified: icecast/trunk/icecast/web/status.xsl
===================================================================
--- icecast/trunk/icecast/web/status.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/web/status.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,16 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body bgcolor="black">
-<table border="0" width="100%%">
-<tr>
-<td width="50"></td>
-<td>
+<body>
<h2>Icecast Status Page</h2>
<div class="roundcont">
<div class="roundtop">
@@ -73,10 +69,7 @@
<img src="corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="25"></td></tr>
-</table>
+
<div class="poster"><img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
</html>
Modified: icecast/trunk/icecast/web/status2.xsl
===================================================================
--- icecast/trunk/icecast/web/status2.xsl 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/web/status2.xsl 2004-10-07 22:19:43 UTC (rev 7929)
@@ -1,5 +1,5 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<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
Modified: icecast/trunk/icecast/web/style.css
===================================================================
--- icecast/trunk/icecast/web/style.css 2004-10-07 19:18:07 UTC (rev 7928)
+++ icecast/trunk/icecast/web/style.css 2004-10-07 22:19:43 UTC (rev 7929)
@@ -15,34 +15,41 @@
padding: 0;
}
+body {
+ margin-left: 50px;
+ margin-right: 25px;
+ background-color: #000;
+}
+
.xiphnav {
- font-family: Verdana, sans-serif;
+ font-family: Verdana, sans-serif;
font-weight: normal;
- padding: .25em;
- margin-bottom: .5em;
- border-bottom: 1px solid #000;
- color: #000;
- background: #aaa;
+ padding: .25em;
+ margin-bottom: .5em;
+ border-bottom: 1px solid #000;
+ color: #000;
+ background: #aaa;
}
h2 {
- font-family: Verdana, sans-serif;
- text-decoration: none;
- font-weight: bold;
- font-size: 250%;
- color: #FFFFFF;
+ font-family: Verdana, sans-serif;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 250%;
+ color: #fff;
+ margin-top:3px;
}
.nav {
- font-family: Verdana, sans-serif;
- text-decoration: none;
- font-weight: bold;
- font-size: 110%;
- color: #FFFFFF;
+ font-family: Verdana, sans-serif;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 110%;
+ color: #fff;
}
.nav:hover {
- font-family: Verdana, sans-serif;
- text-decoration: none;
- font-weight: bold;
- color: #F8EF64;
+ font-family: Verdana, sans-serif;
+ text-decoration: none;
+ font-weight: bold;
+ color: #f8ef64;
}
.xiphnav_a {
text-decoration: none;
@@ -53,22 +60,22 @@
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: normal;
- color: #FFFFFF;
+ color: #fff;
}
.newsheader {
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: normal;
font-size: 110%;
- color: #F8EF64;
- background: #444444;
+ color: #f8ef64;
+ background: #444;
}
.streamtd {
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: normal;
font-size: 85%;
- color: #FFFFFF;
+ color: #fff;
padding:15px;
}
.streamtd_alt {
@@ -76,7 +83,7 @@
text-decoration: none;
font-weight: normal;
font-size: 85%;
- color: #FFFFFF;
+ color: #fff;
}
.streamtd_alt_2 {
@@ -84,14 +91,14 @@
text-decoration: underline;
font-weight: normal;
font-size: 85%;
- color: #FFFFFF;
+ color: #fff;
}
td {
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: normal;
- color: #FFFFFF;
+ color: #fff;
}
.roundcont {
width: 90%;
@@ -108,7 +115,7 @@
text-decoration: none;
font-weight: bold;
font-size: 110%;
- color: #F8EF64;
+ color: #f8ef64;
border-bottom: 3px dashed #000000;
}
.newscontent h4 {
@@ -117,7 +124,7 @@
text-decoration: none;
font-weight: bold;
font-size: 110%;
- color: #F8EF64;
+ color: #f8ef64;
}
.newscontent p {
margin: 0 0;
@@ -139,42 +146,43 @@
text-decoration: none;
font-weight: none;
font-size: 90%;
- color: #F8EF64;
+ color: #f8ef64;
}
.newscontent a {
font-family: Verdana, sans-serif;
text-decoration: underline;
font-weight: bold;
- color: #F8EF64;
+ color: #f8ef64;
}
.newscontent a:hover {
font-family: Verdana, sans-serif;
text-decoration: underline;
font-weight: bold;
- color: #FFFFFF;
+ color: #fff;
}
.newscontent a.nav2 {
font-family: Verdana, sans-serif;
text-decoration: none;
font-weight: bold;
- background: #444444;
- color: #F8EF64;
+ background: #444;
+ color: #f8ef64;
}
.newscontent a.nav2:hover {
font-family: Verdana, sans-serif;
text-decoration: none;
- background: #777777;
+ background: #777;
font-weight: bold;
- color: #FFFFFF;
+ color: #fff;
}
.poster {
- font-family: Verdana, sans-serif;
- margin: 0px 0px;
+ font-family: Verdana, sans-serif;
+ margin: 0px;
+ margin-top: 50px;
display: block;
text-decoration: none;
font-size: 100%;
- color: #F8EF64;
- border-top: 3px dashed #000000;
+ color: #f8ef64;
+ border-top: 3px dashed #000;
}
.roundcont p {
margin: 10px 50px;
More information about the commits
mailing list