From 4c771579b87392a1e07ecf1c6093ca9da557f25f Mon Sep 17 00:00:00 2001 From: oddsock Date: Fri, 12 Aug 2005 20:44:38 +0000 Subject: [PATCH] encorporated xslt changes from dave st. john.... svn path=/icecast/trunk/icecast/; revision=9742 --- admin/listclients.xsl | 169 ++++++++++++++++++------------- admin/listmounts.xsl | 138 ++++++++++++++----------- admin/manageauth.xsl | 179 +++++++++++++++++--------------- admin/moveclients.xsl | 115 +++++++++++---------- admin/response.xsl | 101 ++++++++++-------- admin/stats.xsl | 214 ++++++++++++++++++++++----------------- admin/updatemetadata.xsl | 121 ++++++++++++---------- web/Makefile.am | 5 +- web/auth.xsl | 114 ++++++++++----------- web/key.png | Bin 0 -> 2228 bytes web/server_version.xsl | 91 +++++++++++++++++ web/status.xsl | 206 ++++++++++++++++++++----------------- web/status2.xsl | 24 ++--- web/style.css | 14 ++- web/tunein.png | Bin 0 -> 2042 bytes 15 files changed, 867 insertions(+), 624 deletions(-) create mode 100644 web/key.png create mode 100644 web/server_version.xsl create mode 100644 web/tunein.png diff --git a/admin/listclients.xsl b/admin/listclients.xsl index cfe01ef5..69a096c3 100644 --- a/admin/listclients.xsl +++ b/admin/listclients.xsl @@ -1,72 +1,97 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List MountPoints | - Move Listeners | - Stats | - Status Page -
-
-

List Connected Listeners

-
-
- -
-
- -

- -()

- - - -
- Show Listeners | - Move Listeners | - Update Metadata | - Kill Source -
-

- - - - - - - - - - - - - - - - -
IPConnected ForUser Agent
() secondskill
-
-
- -  -
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ + + +

Listener Stats

+
+
+ +
+
+ +

+ + + + Authentication Required + + + Mount Point + + + +() + + +

+ + + +
+ List Clients | + Move Listeners | + Update Metadata | + Kill Source +
+
+ + + + + + + + + + + + + + + + +
IP
Connected For
User Agent
Action
() secondsKick
+
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/admin/listmounts.xsl b/admin/listmounts.xsl index a2679a29..150e4ac1 100644 --- a/admin/listmounts.xsl +++ b/admin/listmounts.xsl @@ -1,58 +1,80 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List MountPoints | - Move Listeners | - Stats | - Status Page -
-
-

List Mountpoints

-
-
- -
-
- -

- -() - -

- - - -
- Show Listeners | - Move Listeners | - Update Metadata | - Kill Source - | Manage Authentication -
-
-

Listener(s)

-

- -  -
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ + +

Active Mountpoints

+
+
+ +
+
+ +

+ + + Authentication Required + + + Mount Point + + + +() + + + +

+ + + +
+ List Clients | + Move Listeners | + Update Metadata | + Kill Source + | Manage Authentication +
+
+

Listener(s)

+

+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/admin/manageauth.xsl b/admin/manageauth.xsl index 5e76609c..12b14058 100644 --- a/admin/manageauth.xsl +++ b/admin/manageauth.xsl @@ -1,84 +1,95 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List MountPoints | - Move Listeners | - Stats | - Status Page -
-
-

Show defined users

-
-
- -
-
- - - - -

- -()

- - - -
- Show Listeners | - Move Listeners | - Update Metadata | - Kill Source -
-

-
- - - - - - - - - - - - - - - - - - - - - -
User IdPassword
delete
- - -
-
-
- -  -
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ +

Show defined users

+
+
+ +
+
+ + + + +

+ +()

+ + + +
+ List Clients | + Move Listeners | + Update Metadata | + Kill Source +
+

+
+ + + + + + + + + + + + + + + + + + + + + +
User IdPassword
delete
+ + +
+
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/admin/moveclients.xsl b/admin/moveclients.xsl index 4418f289..5ef4ff2e 100644 --- a/admin/moveclients.xsl +++ b/admin/moveclients.xsl @@ -1,52 +1,63 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List MountPoints | - Move Listeners | - Stats | - Status Page -
-
- -

Move Clients from ()

-
-
- -
-
-

Move to which mountpoint ?

- - - - - - - -
Move from () to () ListenersMove Clients
-
-
- -  -
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ + +

Moving Listeners From ()

+
+
+ +
+
+

Move to which mountpoint ?

+ + + + + + + +
Move from () to () ListenersMove Clients
+
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + + diff --git a/admin/response.xsl b/admin/response.xsl index 665f6075..f8c083db 100644 --- a/admin/response.xsl +++ b/admin/response.xsl @@ -1,45 +1,56 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List MountPoints | - Move Listeners | - Stats | - Status Page -
-
-

Icecast Server Response

-
-
- -
-
-

Response

- -Message :

-Return Code:

- -
-
-
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ +

Icecast Server Response

+
+
+ +
+
+

Response

+ +Message :

+Return Code:

+ +
+
+
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + + diff --git a/admin/stats.xsl b/admin/stats.xsl index fecd461a..d8364251 100644 --- a/admin/stats.xsl +++ b/admin/stats.xsl @@ -1,94 +1,120 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List Mountpoints | - Move Listeners | - Stats | - Status Page -
-
-

Icecast Status Page

-
-
- -
-
-

Global Server Stats

- - - - - - - - - - - -
-
-
- -
-
-
-
- -
-
- -
-
- - -

- -() - -

- - - -
- List Clients | - Move MountPoints | - Update Metadata | - Kill Source - | Manage Authentication -
-
- - - - - - - -
-
-
- - -  -
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ + + +
+
+ +
+
+

Global Server Stats

+ + + + + + + + + + + +
+
+
+ +
+
+
+
+ + + + + +
+
+ +
+
+

+ + + Authentication Required + + + Mount Point + + + +() + + +

+ + + +
+ List Clients | + Move MountPoints | + Update Metadata | + Kill Source + | Manage Authentication +
+
+ + + + + + + +
+
+
+ +
+
+
+
+ + +  + + + +
Support icecast development at www.icecast.org
+ + + + diff --git a/admin/updatemetadata.xsl b/admin/updatemetadata.xsl index b37f3f1d..8e972826 100644 --- a/admin/updatemetadata.xsl +++ b/admin/updatemetadata.xsl @@ -1,55 +1,66 @@ - - - - - -Icecast Streaming Media Server - - - -
- - - -
- List MountPoints | - Move Listeners | - Stats | - Status Page -
-
-

Update Metadata

-
-
- -
-
- -

- -()

- -
- - - -
Metadata :
- - -
- -
-
- -  -
-
- -
-
-
-Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ +

Update Metadata

+
+
+ +
+
+ +

+ +()

+ +
+ + + +
Metadata :
+ + +
+ +
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/web/Makefile.am b/web/Makefile.am index 81247489..aa6ac817 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -12,4 +12,7 @@ dist_web_DATA = status.xsl \ icecast.png \ key.gif \ style.css \ - auth.xsl + auth.xsl \ + server_version.xsl \ + tunein.png \ + key.png diff --git a/web/auth.xsl b/web/auth.xsl index ef43e8b7..8368ed71 100644 --- a/web/auth.xsl +++ b/web/auth.xsl @@ -1,57 +1,57 @@ - - - - - -Icecast Streaming Media Server - - - - - - - - -
-

Authorization Page

-
-
- -
-
- - - - - -

()

-
- - - - -
Username :
Password :
- -
- - - -

- Not Connected

- - -

-

- -  -
-
- -
-
-



-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + + + + + + +
+

Authorization Page

+
+
+ +
+
+ + + + + +

()

+
+ + + + +
Username :
Password :
+ +
+ + + +

- Not Connected

+ + +

+

+ +  +
+
+ +
+
+



+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/web/key.png b/web/key.png new file mode 100644 index 0000000000000000000000000000000000000000..8c610e7da32fdde6d1e9b4c8bc534c1e75018184 GIT binary patch literal 2228 zcmW+&dsI^S7Ct-#&0|t19q5S7d<&8f^LLB!P3)XI#; z61+{5m6N5FRw^25Ha@5sn`#{M{fq*90rEJP`eW~J?Y-7-ueJC0?cdtx!^5_lE&JCp z007KFg11H(@CSq08e1f(OhJLA z8y7uEs1nfHa}A1&H5C`rImD=F2-54-;+D3~YR7+f#&z|Gk02uFV9k5CNq_dz0$vD;53M7U z&BgC)=rkr+SXem3fQ{l|o#xu`q(lIAcRPdjL6~vbCytl=tM1h*YS;0fO>tCbRpwG2 zZCltz%lLIztb%nA=Q`)d-aEKG7e^!^KZGZ7-GyqMqCiop~E)dALLQwy}C}6M8FU9n2zx>lWOm zDehm19Nm&pSZWSnXe~;s?B9<$CLAx6NPriG4 z7G9KR&DySJZ(|Vluow-eCVj=SnxULdpca}Mg_EUHn8?4LwY=k)$M>RARW#;_zzu5N zvEE&4aVAYV; z*Er29txhpC%mJpS8h~Zj6fRO-O?p6 zSt{kl=(ka`t+@?Lrd{nPniI84y}JAlX;iK~#&SADTbaqFvDTHEE=(ITJst13~M zE-H!zoYs#f$*Uco>2pLl5fS zY(PEqjqy`BFVSDZxho`;@0)`RK&S8SmeW@<6>bbW1x$8N7I_9_tE~Fcgn$C}(83yrj7YOEpVAAB^J?7kZmb!mejaPAyc)+ z`Oj##S1wA?I4VD3Q+2~IA~#Zg9P{*|9hg#)S!(>F^k>|7+w+r>x?_Y3EMCj9sdXjk{{4)+LoEclyC#W2fD)roGc%7=_@0e zi*c2Y%{v?wc*IZ<$|#&b-iom_Aqt8K82?b|zqD+x7}zT|UD$%}i`ZP{wYf*&}dx z;OR=5*@BB>Wz!aMdkcCa_tG>)T;m2q{9l^gAMViQZN=jIP6SE6EfOmn&PiG_dBR^Y z6Btzy&pXfyKG-ufp;s@fZi;O7a5tgh?fN1ZH?!X*WdQ*u#th3=glk6gEhDm1AJa84 zI~&uKKSz#g6}NO_oZk=D(E=`7&QMDRIQlwf-FKa`^%d|3LH`>PTomc^i0YDio0WKh zwIb^m2IHv7JOMA3U~NE{O>@CquP;^4H8&wweQ?GYlPn4(+I_|`{@Yjsl7cr3xX2>8 zvn+t8>2hKGXWYzFTr6n`A`Sk8p}|Tpl&Yqf6QMB6w2J>m*hw?Tos)STKThDpUX13#c>de}0Q tZx=bXi~_ + + + + +Icecast Streaming Media Server + + + +

Icecast2 Status (Version Info)

+
+ +
+
+ +
+ + + + +
+ Administration | + Server Status | + Version
+
+ +
+
+
+
+ + +
+
+ +
+
+

Version Information

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Build
Server Uptime
Downloadicecast.org
Subversionclick here
Documentationclick here
Stream Directory dir.xiph.org
Communityforum.icecast.org
+
+
+ +
+
+
+
+ +
Support icecast development at www.icecast.org
+ + + + \ No newline at end of file diff --git a/web/status.xsl b/web/status.xsl index e4469602..7daf1519 100644 --- a/web/status.xsl +++ b/web/status.xsl @@ -1,91 +1,115 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast Status Page

-
-
- -
-
- - - -

- -() - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Stream Title:
Stream Description:
Stream Type:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Stream Listeners:
Stream Genre:
Stream URL:
Current Song: - -
Listen: - - -Click to Listen - - -Click to Listen - - -
- - -

- Not Connected

- - -

-

- -&nbsp; -
-
- -
-
- -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Status

+
+ +
+
+ +
+ + + + +
+ Administration | + Server Status | + Version |
+
+ +
+
+
+
+ + + + + +
+
+ +
+
+

+ + + Authentication Required + + + Mount Point + + +() + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Stream Title:
Stream Description:
Content Type:
Mount Uptime:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Current Listeners:
Peak Listeners:
Stream Genre:
Stream URL:
Current Song: + -
+
+
+ +
+
+
+
+ + +

- Not Connected

+ + + + +&nbsp; + + +
Support icecast development at www.icecast.org
+ + + + diff --git a/web/status2.xsl b/web/status2.xsl index 3f44d3bf..689dbefb 100644 --- a/web/status2.xsl +++ b/web/status2.xsl @@ -1,12 +1,12 @@ - - - -
-MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
-Global,Client: Source: ,,,,
-
-,,,,, - ,
-
-
- - + + + +
+MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
+Global,Client: Source: ,,,,
+
+,,,,, - ,
+
+
+ + diff --git a/web/style.css b/web/style.css index 10659826..802612ba 100644 --- a/web/style.css +++ b/web/style.css @@ -38,6 +38,14 @@ h2 { color: #fff; margin-top:3px; } +h1 { + font-family: Verdana, sans-serif; + text-decoration: none; + font-weight: bold; + font-size: 100%; + color: #fff; + margin-top:3px; +} .nav { font-family: Verdana, sans-serif; text-decoration: none; @@ -116,7 +124,7 @@ td { font-weight: bold; font-size: 110%; color: #f8ef64; - border-bottom: 3px dashed #000000; + border-bottom: 1px groove #ACACAC; } .newscontent h4 { margin: 10px 0px; @@ -189,11 +197,11 @@ td { } .roundtop { - background: url(corner_topright.jpg) no-repeat top right; + background: url(/corner_topright.jpg) no-repeat top right; } .roundbottom { - background: url(corner_bottomright.jpg) no-repeat top right; + background: url(/corner_bottomright.jpg) no-repeat top right; } img.corner { diff --git a/web/tunein.png b/web/tunein.png new file mode 100644 index 0000000000000000000000000000000000000000..44d93476f281e1fb412f857863ef51d883ed6222 GIT binary patch literal 2042 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 IwOMfL{}*1^eE