26 files changed, 20 insertions, 24 deletions
diff --git a/web/stream.tg13.gathering.org/fix_count.pl b/web/stream.gathering.org/fix_count.pl
index aaaf42e..aaaf42e 100755
--- a/web/stream.tg13.gathering.org/fix_count.pl
+++ b/web/stream.gathering.org/fix_count.pl
diff --git a/web/stream.tg13.gathering.org/img/cam-map.png b/web/stream.gathering.org/img/cam-map.png
index 759641a..759641a 100644
--- a/web/stream.tg13.gathering.org/img/cam-map.png
+++ b/web/stream.gathering.org/img/cam-map.png
diff --git a/web/stream.tg13.gathering.org/img/icon_1.png b/web/stream.gathering.org/img/icon_1.png
index 6d6e67e..6d6e67e 100644
--- a/web/stream.tg13.gathering.org/img/icon_1.png
+++ b/web/stream.gathering.org/img/icon_1.png
diff --git a/web/stream.tg13.gathering.org/img/icon_2.png b/web/stream.gathering.org/img/icon_2.png
index 599d5f6..599d5f6 100644
--- a/web/stream.tg13.gathering.org/img/icon_2.png
+++ b/web/stream.gathering.org/img/icon_2.png
diff --git a/web/stream.tg13.gathering.org/img/icon_3.png b/web/stream.gathering.org/img/icon_3.png
index 4d1de76..4d1de76 100644
--- a/web/stream.tg13.gathering.org/img/icon_3.png
+++ b/web/stream.gathering.org/img/icon_3.png
diff --git a/web/stream.tg13.gathering.org/img/icon_camera.png b/web/stream.gathering.org/img/icon_camera.png
index e1bf2c3..e1bf2c3 100644
--- a/web/stream.tg13.gathering.org/img/icon_camera.png
+++ b/web/stream.gathering.org/img/icon_camera.png
diff --git a/web/stream.tg13.gathering.org/img/icon_event.png b/web/stream.gathering.org/img/icon_event.png
index 9ce6df4..9ce6df4 100644
--- a/web/stream.tg13.gathering.org/img/icon_event.png
+++ b/web/stream.gathering.org/img/icon_event.png
diff --git a/web/stream.tg13.gathering.org/img/icon_hd.png b/web/stream.gathering.org/img/icon_hd.png
index d9086bc..d9086bc 100644
--- a/web/stream.tg13.gathering.org/img/icon_hd.png
+++ b/web/stream.gathering.org/img/icon_hd.png
diff --git a/web/stream.tg13.gathering.org/img/icon_sd.png b/web/stream.gathering.org/img/icon_sd.png
index 3bddbe9..3bddbe9 100644
--- a/web/stream.tg13.gathering.org/img/icon_sd.png
+++ b/web/stream.gathering.org/img/icon_sd.png
diff --git a/web/stream.tg13.gathering.org/index-bak.pl b/web/stream.gathering.org/index-bak.pl
index 3e31107..3e31107 100755
--- a/web/stream.tg13.gathering.org/index-bak.pl
+++ b/web/stream.gathering.org/index-bak.pl
diff --git a/web/stream.tg13.gathering.org/index-bak.tmpl b/web/stream.gathering.org/index-bak.tmpl
index c0aa95d..c0aa95d 100644
--- a/web/stream.tg13.gathering.org/index-bak.tmpl
+++ b/web/stream.gathering.org/index-bak.tmpl
diff --git a/web/stream.tg13.gathering.org/index.pl b/web/stream.gathering.org/index.pl
index e5f103c..e5f103c 100755
--- a/web/stream.tg13.gathering.org/index.pl
+++ b/web/stream.gathering.org/index.pl
diff --git a/web/stream.tg13.gathering.org/index.tmpl b/web/stream.gathering.org/index.tmpl
index a565f0e..853577b 100644
--- a/web/stream.tg13.gathering.org/index.tmpl
+++ b/web/stream.gathering.org/index.tmpl
@@ -1,7 +1,7 @@
 <html>
 <head>
 	<title>The Gathering <TMPL_VAR NAME=TG_FULL> Streams</title>
-	<link rel="stylesheet" type="text/css" href="singularity.css" media="all">
+	<link rel="stylesheet" type="text/css" href="style.css" media="all">
 </head>
 <body>
 	<div id="innhold">
@@ -20,10 +20,6 @@
 				</div>
 			</div>
 		</TMPL_LOOP>
-		<div id="map">
-			<img src="img/cam-map.png">
-		</div>
-
 	</div>
 
 	<p>Problems with the non game streams? The easiest way to get hold of us is on IRC (EFNet); one of ViD, Rockj and Sesse should be available if there's too much traffic on #tg to be heard.</p>
diff --git a/web/stream.tg13.gathering.org/ios/PLACEHOLDER b/web/stream.gathering.org/ios/PLACEHOLDER
index e69de29..e69de29 100644
--- a/web/stream.tg13.gathering.org/ios/PLACEHOLDER
+++ b/web/stream.gathering.org/ios/PLACEHOLDER
diff --git a/web/stream.tg13.gathering.org/ios/event.m3u8 b/web/stream.gathering.org/ios/event.m3u8
index 11152d3..11152d3 100644
--- a/web/stream.tg13.gathering.org/ios/event.m3u8
+++ b/web/stream.gathering.org/ios/event.m3u8
diff --git a/web/stream.tg13.gathering.org/ios/stream.m3u8 b/web/stream.gathering.org/ios/stream.m3u8
index d3d46a6..d3d46a6 100644
--- a/web/stream.tg13.gathering.org/ios/stream.m3u8
+++ b/web/stream.gathering.org/ios/stream.m3u8
diff --git a/web/stream.tg13.gathering.org/singularity.png b/web/stream.gathering.org/singularity.png
index 3a13cdf..3a13cdf 100644
--- a/web/stream.tg13.gathering.org/singularity.png
+++ b/web/stream.gathering.org/singularity.png
diff --git a/web/stream.tg13.gathering.org/stream.pl b/web/stream.gathering.org/stream.pl
index 8ccf05c..9415389 100755
--- a/web/stream.tg13.gathering.org/stream.pl
+++ b/web/stream.gathering.org/stream.pl
@@ -35,7 +35,7 @@ my $url = "";
 my $port_del = "";
 my $port_str = "";
 my $extinf = "";
-my $flash_appendix = "";
+my $url_path = "";
 
 my $clip = $client->remote_addr();
 
@@ -49,14 +49,10 @@ if (exists($streams{$stream})) {
 		$extinf .= "Multicasted";
 		$url = $streams{$stream}->{multicast_ip};
 	} else {
-		$port_del = 30;
+		#$port_del = 80;
 		$extinf .= "Unicasted";
-		$url = $base_url;
-		
-		if ($streams{$stream}->{is_flash}) {
-			$port_del = 50;
-			$flash_appendix = "/stream.flv";
-		}
+                $url = $base_url;
+		$url_path = $streams{$stream}->{url};
 	}
 
 	$port_del = $streams{$stream}->{preport} if (defined($streams{$stream}->{preport}));
@@ -78,7 +74,11 @@ if(defined $interlaced && $interlaced == 1) {
 	print "#EXTVLCOPT:deinterlace=1\n";
 	print "#EXTVLCOPT:deinterlace-mode=linear\n";
 }
-print "$url:$port_del$port_str$flash_appendix\n";
+if ($port_str == 80) {
+  print "$url$url_path\n";
+} else {
+  print "$url:$port_del$port_str$url_path\n";
+}
 
 sub error($) {
 	my $message = shift;
diff --git a/web/stream.tg13.gathering.org/streamstats-fast.pl b/web/stream.gathering.org/streamstats-fast.pl
index f4caa24..f4caa24 100755
--- a/web/stream.tg13.gathering.org/streamstats-fast.pl
+++ b/web/stream.gathering.org/streamstats-fast.pl
diff --git a/web/stream.tg13.gathering.org/streamstats.cpp b/web/stream.gathering.org/streamstats.cpp
index e81419f..e81419f 100644
--- a/web/stream.tg13.gathering.org/streamstats.cpp
+++ b/web/stream.gathering.org/streamstats.cpp
diff --git a/web/stream.tg13.gathering.org/streamstats.html b/web/stream.gathering.org/streamstats.html
index 5d6adc7..5d6adc7 100644
--- a/web/stream.tg13.gathering.org/streamstats.html
+++ b/web/stream.gathering.org/streamstats.html
diff --git a/web/stream.tg13.gathering.org/streamstats.pl b/web/stream.gathering.org/streamstats.pl
index e4c20f9..e4c20f9 100755
--- a/web/stream.tg13.gathering.org/streamstats.pl
+++ b/web/stream.gathering.org/streamstats.pl
diff --git a/web/stream.tg13.gathering.org/singularity.css b/web/stream.gathering.org/style.css
index 05e1518..0d21d45 100644
--- a/web/stream.tg13.gathering.org/singularity.css
+++ b/web/stream.gathering.org/style.css
@@ -79,7 +79,7 @@ blockquote p::before {
     content: "\201D";
     font-size: 150px;
     font-style: normal;
-    color: #00aaad;
+    color: #b20f15;
 }
 blockquote p {
     display: block;
@@ -109,7 +109,7 @@ ul li:before {
     left: -17px;
     width: 15px;
     text-align: right;
-    color: #00aaad;
+    color: #b20f15;
     font-size: 13px;
     line-height: 21px;
 }
@@ -130,14 +130,14 @@ ol > li:before {
     left: -30px;
     width: 23px;
     text-align: right;
-    color: #00aaad;
+    color: #b20f15;
     font-size: 12px;
     line-height: 22px;
 }
 dl dt			{ font-weight: bold; }
 dd				{ margin: 0 0 0 20px; }
 
-a 				{ color: #00aaad; text-decoration: none; }
+a 				{ color: #b20f15; text-decoration: none; }
 a:hover 		{ color: #c3027b; }
 code, pre {
     padding: 0 3px 2px;
@@ -152,7 +152,7 @@ code, pre {
 }
 code {
     padding: 3px 4px;
-    color: #00aaad;
+    color: #b20f15;
 }
 pre {
     display: block;
@@ -333,7 +333,7 @@ h2.size100 { font-size: 100px; }
     position: relative; 
     top: -2px;
     margin: 0 5px 0 3px; 
-    color: #00aaad;
+    color: #b20f15;
 }
 .breadcrumbs {
     font-size: 12px;
@@ -360,7 +360,7 @@ h2.size100 { font-size: 100px; }
     position: relative; 
     top: -2px;
     margin: 0 5px 0 5px; 
-    color: #00aaad;
+    color: #b20f15;
 }
 .phototext {
     margin-top: 5px;
@@ -433,7 +433,7 @@ div.category-news h2 a {
 /* HTML & BODY
 ------------------------------------------------------ */
 body {
-    background: url('/tg13/files/content/design/images/background.jpg') no-repeat;
+    //background: url('/tg13/files/content/design/images/background.jpg') no-repeat;
     background-position: top center;
 }
 
@@ -731,7 +731,7 @@ li.menu-game a, li.menu-game span, li.menu-game + menu.sub-menu a, li.menu-game
     color: #fba51e;
 }
 li.menu-tickets a, li.menu-tickets span, li.menu-tickets + menu.sub-menu a, li.menu-tickets + menu.submenu span {
-    color: #00aaad;
+    color: #b20f15;
 }
 li.menu-guide a, li.menu-guide span, li.menu-guide + menu.sub-menu a, li.menu-guide + menu.submenu span {
     color: #034ea2;
diff --git a/web/stream.tg13.gathering.org/superawesomeness.css b/web/stream.gathering.org/superawesomeness.css
index b8c5545..b8c5545 100644
--- a/web/stream.tg13.gathering.org/superawesomeness.css
+++ b/web/stream.gathering.org/superawesomeness.css
diff --git a/web/stream.tg13.gathering.org/test.pl b/web/stream.gathering.org/test.pl
index 3b440d5..3b440d5 100755
--- a/web/stream.tg13.gathering.org/test.pl
+++ b/web/stream.gathering.org/test.pl
diff --git a/web/stream.tg13.gathering.org/test.tmpl b/web/stream.gathering.org/test.tmpl
index ea0eaca..fe88674 100644
--- a/web/stream.tg13.gathering.org/test.tmpl
+++ b/web/stream.gathering.org/test.tmpl
@@ -1,7 +1,7 @@
 <html>
 <head>
 	<title>The Gathering <TMPL_VAR NAME=TG_FULL> Streams</title>
-	<link rel="stylesheet" type="text/css" href="singularity.css" media="all">
+	<link rel="stylesheet" type="text/css" href="style.css" media="all">
 </head>
 <body>
 	<div id="innhold">