diff --git a/ChangeLog b/ChangeLog index 39deecd62c9e5aed77c20b6ef8a46df0f3c66291..bff5348d54940c7d6935f25880f105f7bca74a42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-01-23 06:23:42 dm8tbr + + * Updated web interface to be more XHTML compliant. + * Added warning about HTML scraping to main page. + 2014-01-12 21:09:04 ph3-der-loewe * Fixed a memory leak. Lost headers of stream because of wrong ref diff --git a/admin/listclients.xsl b/admin/listclients.xsl index 17000e6085ff1e4f1af756d2036f0e0b0889f688..8a1a2697bbf948e0decea11040aef80a3609b6f0 100644 --- a/admin/listclients.xsl +++ b/admin/listclients.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +

Icecast2 Admin

-
+


- +
@@ -24,20 +24,18 @@
- +
-
-
- +


Listener Stats

- +
-
+
@@ -60,7 +58,7 @@
- +
List Clients @@ -70,7 +68,7 @@

- +
@@ -93,7 +91,7 @@  
- +
Support icecast development at www.icecast.org
diff --git a/admin/listmounts.xsl b/admin/listmounts.xsl index 9b8f479c87247ff32bb90489852d449463775ddc..0a89dcab594de198cb7e78ced5747a75c93f5ad3 100644 --- a/admin/listmounts.xsl +++ b/admin/listmounts.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +

Icecast2 Admin


- +
IP
Seconds Connected
@@ -24,7 +24,7 @@
- +

@@ -34,9 +34,9 @@

Active Mountpoints

- +
-
+
@@ -59,7 +59,7 @@
- +
List Clients @@ -76,7 +76,7 @@  
- +
Support icecast development at www.icecast.org
diff --git a/admin/manageauth.xsl b/admin/manageauth.xsl index 4c1ab9d4cd44269cf7346f359ee857579ad23f12..49d7ee181d86442d431272837aa45cb68c764d32 100644 --- a/admin/manageauth.xsl +++ b/admin/manageauth.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +Icecast2 Admin
- +
@@ -24,7 +24,7 @@
- +

@@ -32,9 +32,9 @@
- +
-
+
@@ -42,7 +42,7 @@

()

- +
List Clients @@ -88,7 +88,7 @@  
- +
Support icecast development at www.icecast.org
diff --git a/admin/moveclients.xsl b/admin/moveclients.xsl index 99a8a9edc95f6c239de2a09d948ca64e189acb30..8ee029a9ddaeee6003b0065bd6ca782376e4314d 100644 --- a/admin/moveclients.xsl +++ b/admin/moveclients.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +

Icecast2 Admin


- +
@@ -24,7 +24,7 @@
- +

@@ -34,9 +34,9 @@

Moving Listeners From ()

- +
-
+

Move to which mountpoint ?

@@ -52,7 +52,7 @@  
- +
Support icecast development at www.icecast.org
diff --git a/admin/response.xsl b/admin/response.xsl index 6c584b47a89910f815061e22d43b10b7572faad7..a5167e0152f31a3ac278818df2877e5dc58c4f8a 100644 --- a/admin/response.xsl +++ b/admin/response.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +

Icecast2 Admin


- +
@@ -24,7 +24,7 @@
- +

@@ -33,9 +33,9 @@

Icecast Server Response

- +
-
+

Response

Message :

@@ -45,7 +45,7 @@ Return Code:


- +
Support icecast development at www.icecast.org
diff --git a/admin/stats.xsl b/admin/stats.xsl index ec6a33ff81677da37adbb9ebf869187680048ae3..116e418af58e82aa2244e86d4309a3912221862c 100644 --- a/admin/stats.xsl +++ b/admin/stats.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +

Icecast2 Admin


- +
@@ -24,7 +24,7 @@
- +

@@ -34,9 +34,9 @@
- +
-
+

Global Server Stats

@@ -52,7 +52,7 @@
- +

@@ -64,9 +64,9 @@
- +
-
+
@@ -87,7 +87,7 @@
- +
List Clients @@ -108,14 +108,13 @@
- +
-
-
+


-  +

 

diff --git a/admin/updatemetadata.xsl b/admin/updatemetadata.xsl index 0d86aa51f74fa98317ecb5d6051c4a7d060d3b94..ee67fa8f0a715638fd4d4a6686eedd82fdf2da27 100644 --- a/admin/updatemetadata.xsl +++ b/admin/updatemetadata.xsl @@ -1,18 +1,18 @@ - + Icecast Streaming Media Server - +

Icecast2 Admin


- +
@@ -24,7 +24,7 @@
- +

@@ -33,9 +33,9 @@

Update Metadata

- +
-
+

@@ -57,7 +57,7 @@  

- +
Support icecast development at www.icecast.org
diff --git a/web/auth.xsl b/web/auth.xsl index 0d8c97e248c47167469c1cabfdca3039d57ae878..a57d91029b0291e99ac25b4f80cfb499b6f02dc8 100644 --- a/web/auth.xsl +++ b/web/auth.xsl @@ -1,12 +1,12 @@ - + Icecast Streaming Media Server - + @@ -14,9 +14,9 @@

Authorization Page

- +
-
+
@@ -37,20 +37,20 @@

- Not Connected

-

-

+
+
 
- +
-



+

-
Support icecast development at www.icecast.org
+
Support icecast development at www.icecast.org
diff --git a/web/server_version.xsl b/web/server_version.xsl index bcf610b2e67795ea328972dac7199701548b257f..f2803b1468df69ded3bc52c1af595c1b6a38c303 100644 --- a/web/server_version.xsl +++ b/web/server_version.xsl @@ -1,90 +1,88 @@ - + Icecast Streaming Media Server - +

Server Information

-
+


-
-
+


- +
-
+

Server Information

- + - + - + - + - - + + - - + + - - + + - - + + - - + +
LocationLocation
AdminAdmin
HostHost
VersionVersion
Downloadicecast.orgDownloadicecast.org
Subversionclick hereSubversionclick here
Documentationclick hereDocumentationclick here
Stream Directory dir.xiph.orgStream Directory dir.xiph.org
Communityforum.icecast.orgCommunityclick here
- +
-
-
+


-
Support icecast development at www.icecast.org
+
Support icecast development at www.icecast.org
diff --git a/web/status.xsl b/web/status.xsl index b21bae70dd59a354d7a75124e4430ed0417a0cf6..a43bd444453b793cdbb2bb3f6ba8d7224c6b717b 100644 --- a/web/status.xsl +++ b/web/status.xsl @@ -1,33 +1,31 @@ - + Icecast Streaming Media Server - +

Icecast2 Status

-
-
-
+


@@ -35,10 +33,19 @@
- +
-
-
+ +<!-- 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 +--> +
+
+
@@ -61,54 +68,53 @@
- + - + - + - + - + - + - + - + - + - + - + - + - + -
Stream Title:
Stream Name:
Stream Description:
Stream Description:
Content Type:
Content Type:
Mount started:
Mount started:
Bitrate:
Bitrate:
Quality:
Quality:
Video Quality:
Video Quality:
Framesize:
Framesize:
Framerate:
Framerate:
Current Listeners:
Listeners (current):
Peak Listeners:
Listeners (peak):
Stream Genre:
Genre:
Stream URL:
Stream URL:
Current Song: +
Currently playing: -
- +
-
-
+


- Not Connected

@@ -116,10 +122,10 @@ -&nbsp; +

&nbsp;

-
Support icecast development at www.icecast.org
+
Support icecast development at www.icecast.org
diff --git a/web/style.css b/web/style.css index 129d49d471464726065db3a5c3495b5466f0c227..87dfabd63142b7cca62a8d3e72f02ccd4aab8590 100644 --- a/web/style.css +++ b/web/style.css @@ -118,7 +118,7 @@ td { .roundcont a { margin: 0px 10px; } -.newscontent { +.content { margin: 0 20px; } h3 { @@ -130,11 +130,11 @@ h3 { font-size: 110%; color: #f8ef64; } -.newscontent h3 { +.content h3 { margin-bottom: 10px; border-bottom: 1px groove #ACACAC; } -.newscontent h4 { +.content h4 { margin: 10px 0px; font-family: Verdana, sans-serif; text-decoration: none; @@ -142,21 +142,21 @@ h3 { font-size: 110%; color: #f8ef64; } -.newscontent p { +.content p { margin: 0 0; font-family: Verdana, sans-serif; text-decoration: none; font-weight: none; font-size: 90%; } -.newscontent td { +.content td { margin: 0 0; font-family: Verdana, sans-serif; text-decoration: none; font-weight: none; font-size: 90%; } -.newscontent td.streamdata { +.content td.streamstats { margin: 0 0; font-family: Verdana, sans-serif; text-decoration: none; @@ -164,46 +164,46 @@ h3 { font-size: 90%; color: #f8ef64; } -.streamheader table { +.streamheading table { width: 100%; margin-bottom: 5px; border-bottom: 1px groove #ACACAC; } -.streamheader td { +.streamheading td { margin: 0px; padding-top: 10px; padding-bottom: 10px; padding: 10 5 10 5; border: 0px solid white; } -.streamheader h3 { +.streamheading h3 { border: 0px; } -.streamheader a { +.streamheading a { padding: 8px 5px 3px 30px; text-decoration: none; background: transparent url("/tunein.png") no-repeat left center; } -.streamheader a.auth { +.streamheading a.auth { padding-top: 10px; padding-bottom: 10px; padding-left: 32px; background: transparent url("/key.png") no-repeat left center; } -.newscontent a { +.content a { font-family: Verdana, sans-serif; text-decoration: none; font-weight: bold; margin: 0px; color: #f8ef64; } -.newscontent a:hover { +.content a:hover { font-family: Verdana, sans-serif; text-decoration: none; font-weight: bold; color: #fff; } -.newscontent a.nav2 { +.content a.nav2 { font-family: Verdana, sans-serif; text-decoration: none; font-weight: bold; @@ -211,7 +211,7 @@ h3 { background: #444; color: #f8ef64; } -.newscontent a.nav2:hover { +.content a.nav2:hover { font-family: Verdana, sans-serif; text-decoration: none; background: #777;