From 3e3f0e1e4ccd57b3b32028bf9980f9104ae6f913 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 18:47:27 +0100
Subject: corrected bug when returning back to home

---
 js/istreamdev.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/js/istreamdev.js b/js/istreamdev.js
index 1ce37e9..743eee0 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -95,6 +95,12 @@ function addAudiofiles() {
 $('#home_but').tap(function(event) {
 	event.preventDefault();
 	$(this).parents('div').find('a').unbind("tap");
+	$('#home').bind('pageAnimationEnd', function(event, info){ 
+	if (info.direction == 'in') {
+		$('#jqt div[rel="browser"]').remove();
+		$('#home').unbind('pageAnimationEnd');
+		}
+	});
 	jQT.goTo('#home','flip');
 });
 
@@ -385,6 +391,7 @@ $('#streamchannel span.recButton a').tap(function(event) {
     gen_edittimer(id,name,active,channumber,channame,rec_date,starttime,endtime);
 	return false;
 });
+
 $('#streamrec span.streamButton a').tap(function(event) {
 	event.preventDefault();
 	json_start(this);
@@ -616,17 +623,6 @@ $('div[rel="browser"] a[class="back"]').tap(function(event) {
 	$(this).parents('div[rel="browser"]').remove();
 });
 
-$('div[rel="browser"] #home_but').tap(function(event) {
-	event.preventDefault();
-	$(this).parents('div[rel="browser"]').find('ul[rel="filelist"] li[class="arrow"] a').unbind("tap");
-	$('#home').bind('pageAnimationEnd', function(event, info){ 
-			$('#jqt div[rel="browser"]').remove();
-			$('#home').unbind('pageAnimationEnd');
-		});
-});
-
-
-
 //Generate browser div according to type
 function gen_browser(path,browser,name,foldertype) {
 	browser_template = '<div class="toolbar"></div>';
-- 
cgit v1.2.3


From 6f5594694980ca500e5b9fc88fe2bae04b97df47 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 18:51:17 +0100
Subject: default max encoding to 3 .

---
 config_default.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config_default.php b/config_default.php
index b421482..31badb0 100755
--- a/config_default.php
+++ b/config_default.php
@@ -24,12 +24,12 @@
 	$quality=array (	'edge'	=>	'128k	64k	1		240x160',
 				'3g'	=>	'350k	64k	1		408x272',
 				'wifi'	=>	'512k	128k	2		480x320');
-	$maxencodingprocesses=10;		// Max simultaneous encoding processes
+	$maxencodingprocesses=3;		// Max simultaneous encoding processes
 
 	// Misc
 	$ffmpegpath = '/usr/bin/ffmpeg';	//path to ffmpeg binary
 	$segmenterpath = '/usr/bin/segmenter';	//path to segmenter binary
 
 	// Version
-	$isdversion = "0.3.7";
+	$isdversion = "1.0-alpha1";
 ?>
-- 
cgit v1.2.3


From a4350dcc888871c33003a334beaf3cf00f5e62b7 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 18:59:42 +0100
Subject: removed logos in git

---
 logos/FRANCE 2.png                     | Bin 3490 -> 0 bytes
 logos/FRANCE 3.png                     | Bin 3382 -> 0 bytes
 logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE |   0
 logos/TF1.png                          | Bin 1809 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 logos/FRANCE 2.png
 delete mode 100644 logos/FRANCE 3.png
 create mode 100644 logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE
 delete mode 100644 logos/TF1.png

diff --git a/logos/FRANCE 2.png b/logos/FRANCE 2.png
deleted file mode 100644
index c77d725..0000000
Binary files a/logos/FRANCE 2.png and /dev/null differ
diff --git a/logos/FRANCE 3.png b/logos/FRANCE 3.png
deleted file mode 100644
index 8f20d16..0000000
Binary files a/logos/FRANCE 3.png and /dev/null differ
diff --git a/logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE b/logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE
new file mode 100644
index 0000000..e69de29
diff --git a/logos/TF1.png b/logos/TF1.png
deleted file mode 100644
index 56b1a74..0000000
Binary files a/logos/TF1.png and /dev/null differ
-- 
cgit v1.2.3


From 949ce316278f4a557ca3e442ea31db66b77722b4 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 19:05:28 +0100
Subject: fixed default segmenter install path

---
 logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE | 0
 segmenter/Makefile                     | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE

diff --git a/logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE b/logos/PUT.YOUR.CHANNELS.LOGOS.PNG.HERE
deleted file mode 100644
index e69de29..0000000
diff --git a/segmenter/Makefile b/segmenter/Makefile
index c9ec717..0c9abd2 100644
--- a/segmenter/Makefile
+++ b/segmenter/Makefile
@@ -5,7 +5,7 @@ clean:
 	rm segmenter
 
 install: segmenter
-	cp segmenter /usr/local/bin/
+	cp segmenter /usr/bin/
 
 uninstall:
-	rm /usr/local/bin/segmenter
+	rm /usr/bin/segmenter
-- 
cgit v1.2.3


From 80bdf785d7909f4c11ba98f35417f3b8cb44f317 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 19:11:03 +0100
Subject: added auth

---
 bin/auth.php    | 36 ++++++++++++++++++++++++++++++++++++
 bin/backend.php |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 bin/auth.php

diff --git a/bin/auth.php b/bin/auth.php
new file mode 100644
index 0000000..1545b7c
--- /dev/null
+++ b/bin/auth.php
@@ -0,0 +1,36 @@
+<?php
+
+global $user, $pass;
+
+session_start();
+
+if (isset($_COOKIE['istream']))
+{
+       if(sha1($pass) == $_COOKIE['istream'] ) {
+ 		setcookie ("istream", sha1($pass), time()+60*60*24*30);
+		$authorized = true;
+	} else {
+		$authorised = false;
+	}
+}
+
+# checkup login and password
+if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']))
+{
+    if (($user == $_SERVER['PHP_AUTH_USER']) && ($pass == ($_SERVER['PHP_AUTH_PW'])) )
+    {
+    setcookie ("istream", sha1($pass), time()+60*60*24*30);
+    $authorized = true;
+    }
+}
+
+# login
+if (!$authorized)
+{
+    header('WWW-Authenticate: Basic Realm="Login please"');
+    header('HTTP/1.0 401 Unauthorized');
+    echo "Login";
+    exit;
+}
+
+?>
diff --git a/bin/backend.php b/bin/backend.php
index f312ed0..706dd91 100755
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -6,6 +6,7 @@ if (file_exists('../config.php'))
 	include ('../config.php');
 else
 	include ('../config_default.php');
+include ('./auth.php');
 include ('../getid3/getid3.php');
 include ('./utils.php');
 include ('./files.php');
-- 
cgit v1.2.3


From c88db086ecb9d2b77d1ce77a2d29a90862651cf8 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 19:13:09 +0100
Subject: removed auth temporarely

---
 bin/backend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/backend.php b/bin/backend.php
index 706dd91..a27fac0 100755
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -6,7 +6,7 @@ if (file_exists('../config.php'))
 	include ('../config.php');
 else
 	include ('../config_default.php');
-include ('./auth.php');
+//include ('./auth.php');
 include ('../getid3/getid3.php');
 include ('./utils.php');
 include ('./files.php');
-- 
cgit v1.2.3


From c32c1785108597b3bb500ea7f85d2c63cef00359 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Mar 2010 19:29:29 +0100
Subject: added auth

---
 bin/auth.php    |   6 +-
 bin/backend.php |   2 +-
 index.html      | 258 ------------------------------------------------------
 index.php       | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 269 insertions(+), 262 deletions(-)
 delete mode 100644 index.html
 create mode 100644 index.php

diff --git a/bin/auth.php b/bin/auth.php
index 1545b7c..7e6eace 100644
--- a/bin/auth.php
+++ b/bin/auth.php
@@ -4,9 +4,9 @@ global $user, $pass;
 
 session_start();
 
-if (isset($_COOKIE['istream']))
+if (isset($_COOKIE['istreamdev']))
 {
-       if(sha1($pass) == $_COOKIE['istream'] ) {
+       if(sha1($pass) == $_COOKIE['istreamdev'] ) {
  		setcookie ("istream", sha1($pass), time()+60*60*24*30);
 		$authorized = true;
 	} else {
@@ -19,7 +19,7 @@ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']))
 {
     if (($user == $_SERVER['PHP_AUTH_USER']) && ($pass == ($_SERVER['PHP_AUTH_PW'])) )
     {
-    setcookie ("istream", sha1($pass), time()+60*60*24*30);
+    setcookie ("istreamdev", sha1($pass), time()+60*60*24*30);
     $authorized = true;
     }
 }
diff --git a/bin/backend.php b/bin/backend.php
index a27fac0..706dd91 100755
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -6,7 +6,7 @@ if (file_exists('../config.php'))
 	include ('../config.php');
 else
 	include ('../config_default.php');
-//include ('./auth.php');
+include ('./auth.php');
 include ('../getid3/getid3.php');
 include ('./utils.php');
 include ('./files.php');
diff --git a/index.html b/index.html
deleted file mode 100644
index 79cdea8..0000000
--- a/index.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" manifest="istreamdev.manifest">
-    <head>
-        <meta charset="UTF-8" />
-        <title>iStreamdev</title>
-        <link rel="stylesheet" href="min/?b=css&f=jqtouch.css,theme.css,istreamdev.css,spinningwheel.css" type="text/css" media="screen" />
-        <script src="min/?b=js&f=jquery-1.4.2.min.js,jqtouch.js,jqtouch.transitions.js,istreamdev.js,functions.js,spinningwheel.js" type="text/javascript" charset="utf-8"></script>
-    </head>
-    <body>
-	<div id="loader"></div>
-	<div id="status_box"></div>
-	<div id="jqt">
-	<!---------------------------------- HOME SCREEN (always present) ---------------------------------->
-        	
-		<div id="home" class="current">
-            <div class="toolbar">
-                <h1>HOME</h1>
-            </div>
-			<ul class="rounded" id="runningsessions">
-				<li><span class="menutitle">SESSIONS</span></li>
-				<li>Checking running session</li>
-			</ul>
-        </div>
-	 <!----------------------------------/ HOME SCREEN ---------------------------------->
-	 <!---------------------------------- CHAN CATEGORY SCREEN ---------------------------------->
-        <!----------------------------------categories------------------------------>
-		<div id="categories">
-            <div class="toolbar">
-                <a href="#" class="back">Home</a>
-                <h1><img class="menuicon" src="img/tv.png" /> CATEGORIES</h1>
-            </div>
-            <ul id="cat_menu" class="rounded">
-			</ul>
-        </div>
-	<!----------------------------------channels------------------------------>
-		<div id="channels">
-			<div class="toolbar">
-			<a href="#" class="back">Back</a>
-			<a href="#home" id="home_but" class="button">Home</a>
-                <h1><img class="menuicon" src="img/tv.png" /> CHANNELS</h1>
-			</div>
-			<ul id="chan_menu" class="rounded">
-			</ul>
-		</div>
-	<!---------------------------------- /CHAN CATEGORY SCREEN ---------------------------------->
-	<!---------------------------------- STREAM SCREEN ---------------------------------->
-		<!------------------------ tv start stream ----------------------------------------->
-		<div id="streamchannel">
-			<div class="toolbar">
-			<a href="#" class="back">Back</a>
-			<a href="#home" id="home_but" class="button">Home</a>
-                <h1><img class="menuicon" src="img/tv.png" />Channel</h1>
-			</div>
-			<center><ul class="thumb" style="width:90px"><img class="thumbnail" id="thumbnail" src="" onerror="this.src='img/nologoTV.png'" /></ul></center>
-			<ul class="streaminfo">
-			<li><span class="name_now"></span>
-			<span class="epgtime_now"></span>
-			<span class="desc_now"></span></li>
-			<li>
-			<span class="name_next"></span>
-			<span class="epgtime_next"></span></li>
-			</ul>
-			<center>
-			<br>
-			<span class="streamButton"><a id="edge" href="#">Edge</a></span><span class="streamButton"><a id="3g" href="#" class="cube"> 3G </a></span><span class="streamButton"><a id="wifi" href="#" class="cube">Wifi</a></span><span class="recButton"><a id="rec" href="#" class="cube">Rec.</a></span>
-			<br><br>
-			</center>
-			<div rel="dataholder" style="visibility:hidden">
-                <span rel="type"></span>
-                <span rel="url"></span>
-				<span rel="number"></span>
-				<span rel="channame"></span>
-            </div>			
-		</div>
-		
-		<div id="streamrec">
-			<div class="toolbar">
-			<a href="#" class="back">Back</a>
-			<a href="#home" id="home_but" class="button">Home</a>
-                <h1>Recordings</h1>
-			</div>
-			<center><ul class="thumb" style="width:90px"><img class="thumbnail" id="thumbnail" src="" onerror="this.src='img/nologoTV.png'" /></ul></center>
-			<ul class="streaminfo">
-				<li>
-					<span class="name_now"></span>
-					<span class="epgtime_now"></span>
-					<span class="desc_now"></span>
-				</li>
-			</ul>
-			<center><br>
-			<span class="streamButton"><a id="edge" href="#">Edge</a></span><span class="streamButton"><a id="3g" href="#" class="cube"> 3G </a></span><span class="streamButton"><a id="wifi" href="#" class="cube">Wifi</a></span>
-			<br><br>
-			</center>
-			<div rel="dataholder" style="visibility:hidden">
-                <span rel="type"></span>
-                <span rel="url"></span>
-            </div>	
-		</div>
-		<div id="streamvid">
-			<div class="toolbar">
-			<a href="#" class="back">Back</a>
-			<a href="#home" id="home_but" class="button">Home</a>
-                <h1>Video</h1>
-			</div>
-			<center><ul class="thumb" style="width:190px;"><img class="thumbnail" id="thumbnail" src="" /></ul></center>
-			<ul class="streaminfo">
-				<li>
-					<span class="name_now"></span>
-					<span class="epgtime_now"></span>
-					<span class="desc_now"></span>
-				</li>
-			</ul>
-			<center><br>
-			<span class="streamButton"><a id="edge" href="#">Edge</a></span><span class="streamButton"><a id="3g" href="#" class="cube"> 3G </a></span><span class="streamButton"><a id="wifi" href="#" class="cube">Wifi</a></span>
-			<br><br>
-			</center>
-			<div rel="dataholder" style="visibility:hidden">
-                <span rel="type"></span>
-                <span rel="url"></span>
-            </div>	
-		</div>
-
-		<div id="streaming">
-			<div class="toolbar">
-			<a href="#" class="back">Back</a>
-			<a href="#home" id="home_but" class="button">Home</a>
-                <h1></h1>
-			</div>
-			<center><ul class="thumb" id="player"><img class="thumbnail" id="thumbnail" src="" /></ul></center>
-			<ul class="streamstatus">
-				<span class="title">Status</span>
-				<span class="mode"></span>
-			</ul>
-			<ul class="streaminfo">
-			</ul>
-			<center>
-				<span class="streamButton"><a rel="stopbroadcast" href="#">Stop stream</a></span>
-				<br><br>
-			</center>
-			<div rel="dataholder" style="visibility:hidden">
-                <span rel="session"></span>
-				<span rel="name"></span>
-				<span rel="thumbwidth"></span>
-				<span rel="thumbheight"></span>
-				<span rel="number"></span>
-            </div>						
-		</div>		
-		
-		<!---------------------------------- /STREAM SCREEN ---------------------------------->
-		<!---------------------------------- TIMERS SCREEN ---------------------------------->
-		
-		<div id="timers">
-			<div class="toolbar">
-			<a href="#" class="back">Home</a>
-				<h1><img class="menuicon" src="img/timers.png" /> TIMERS</h1>
-			</div>
-			
-			<ul class="rounded" rel="timers">
-			</ul>
-			<ul class="rounded">
-			<li class="arrow"><a href="#" rel="new"><span class="menuname">New Timer</span></a></li>
-			</ul>
-		</div>
-		
-		<div id="edittimer">
-			<div class="toolbar">
-			<a href="#" class="back">Back</a>
-			<a href="#home" id="home_but" class="button slideup">Home</a>
-                <h1></h1>
-			</div>
-			<form name="timer" id="timer" onsubmit="checktimerform();">
-			<ul class="rounded">
-				<li><span class="timertitle">Active</span><span class="toggle"><input id="timer_active" name="timer_active" type="checkbox" /></span></li>
-			</ul>
-			<ul class="rounded" rel="name">
-				<li><span class="timertitle">Name</span></li>
-				<li class="formerror" id="timer_name_error"><span class="formerrormsg">Recording name is missing</span></li>
-				<li><input type="text" name="name" placeholder="Enter recording name" id="timer_name" style="color: #FFFFFF" /></li>
-			</ul>
-			<ul class="rounded" rel="channel">
-				<li>
-					<span class="timertitle">Channel</span>
-				</li>
-				<li>
-					<select id="timer_chan">
-					</select>
-				</li>
-			</ul>
-			<ul class="rounded" rel="date">
-				<li><span class="timertitle">Date</span></li>
-				<li class="formerror" id="timer_date_error"><span class="formerrormsg">Date is missing</span></li>
-				<li class="arrow"><a id="a_date" class="abutton" href="#" onClick="$('#timer_date_error').hide();"><span class="menuname" id="layer_date">Select date</span></a></li>
-				
-			</ul>
-			<ul class="rounded" rel="stime">
-				<li><span class="timertitle">Start time</span></li>
-				<li class="formerror" id="timer_starttime_error"><span class="formerrormsg">Starting time is missing</span></li>
-				<li class="arrow"><a id="a_starttime" class="abutton" href="#" onClick="$('#timer_starttime_error').hide();"><span class="menuname" id="layer_starttime">Select start time</span></a></li>
-				
-			</ul>
-			<ul class="rounded" rel="etime">
-				<li><span class="timertitle">End time</span></li>
-				<li class="formerror" id="timer_endtime_error"><span class="formerrormsg">Ending time is missing</span></li>
-				<li class="arrow"><a id="a_endtime" class="abutton" href="#" onClick="$('#timer_endtime_error').hide();"><span class="menuname" id="layer_endtime">Select end time</span></a></li>
-			</ul>
-			<input name="timer_id" type="hidden" id="timer_id" value="" />
-			<input name="timer_date" type="hidden" id="timer_date" value="" />
-			<input name="timer_starttime" type="hidden" id="timer_starttime" value="" />
-			<input name="timer_endtime" type="hidden" id="timer_endtime" value="" />
-			</form>
-		</div>
-		<!---------------------------------- /TIMERS SCREEN ---------------------------------->
-		<!------------------------------------ EPG ------------------------------------------->
-		<div id="epg">
-			<div class="toolbar">
-					<a href="#" class="back">Home</a>
-						<h1>EPG</h1>
-				</div>
-			<ul class="rounded">
-				<li class="arrow"><a href="#now"><span class="menuname">What's Now</span></a></li>
-				<li class="arrow"><a href="#at"><span class="menuname">What's At</span></a></li>
-				<li class="arrow"><a href="#on"><span class="menuname">What's On</span></a></li>
-			</ul>
-		</div>
-		
-		<div id="on">
-			<div class="toolbar">
-				<a href="#" class="back">Back</a>
-				<a href="#home" id="home_but" class="button slideup">Home</a>
-                <h1>WHAT'S ON</h1>
-			</div>
-			<form name="epg_chanselector" id="epg_chanselector" action="">
-				<ul class="rounded">
-					<li><span class="timertitle">Select a Channel</span></li>
-					<li><select id="epg_chan" onchange="epg_selectchan()">
-						<optgroup label="NATIONALES & TNT">
-							<option value="1">TF1</option>
-							<option value="2">FRANCE 2</option>
-							<option value="3">FRANCE 3</option>
-							<option value="4">FRANCE 4</option>
-							<option value="5">TV5</option>
-							<option value="6">M6</option>
-						</optgroup>
-						<optgroup label="DIVERTISSEMENT">
-							<option value="11">COMEDIE!</option>
-							<option value="12">13EME RUE</option>
-							<option value="13">FOX LIFE</option>
-						</optgroup>
-					</select>
-					</li>
-				</ul>
-			</form>	
-				
-		</div>
-		<!------------------------------------ /EPG ------------------------------------------->
-	</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..f5d0dee
--- /dev/null
+++ b/index.php
@@ -0,0 +1,265 @@
+<?php
+if (file_exists('config.php'))
+        include ('config.php');
+else
+        include ('config_default.php');
+include ('bin/auth.php');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" manifest="istreamdev.manifest">
+    <head>
+        <meta charset="UTF-8" />
+        <title>iStreamdev</title>
+        <link rel="stylesheet" href="min/?b=css&f=jqtouch.css,theme.css,istreamdev.css,spinningwheel.css" type="text/css" media="screen" />
+        <script src="min/?b=js&f=jquery-1.4.2.min.js,jqtouch.js,jqtouch.transitions.js,istreamdev.js,functions.js,spinningwheel.js" type="text/javascript" charset="utf-8"></script>
+    </head>
+    <body>
+	<div id="loader"></div>
+	<div id="status_box"></div>
+	<div id="jqt">
+	<!---------------------------------- HOME SCREEN (always present) ---------------------------------->
+        	
+		<div id="home" class="current">
+            <div class="toolbar">
+                <h1>HOME</h1>
+            </div>
+			<ul class="rounded" id="runningsessions">
+				<li><span class="menutitle">SESSIONS</span></li>
+				<li>Checking running session</li>
+			</ul>
+        </div>
+	 <!----------------------------------/ HOME SCREEN ---------------------------------->
+	 <!---------------------------------- CHAN CATEGORY SCREEN ---------------------------------->
+        <!----------------------------------categories------------------------------>
+		<div id="categories">
+            <div class="toolbar">
+                <a href="#" class="back">Home</a>
+                <h1><img class="menuicon" src="img/tv.png" /> CATEGORIES</h1>
+            </div>
+            <ul id="cat_menu" class="rounded">
+			</ul>
+        </div>
+	<!----------------------------------channels------------------------------>
+		<div id="channels">
+			<div class="toolbar">
+			<a href="#" class="back">Back</a>
+			<a href="#home" id="home_but" class="button">Home</a>
+                <h1><img class="menuicon" src="img/tv.png" /> CHANNELS</h1>
+			</div>
+			<ul id="chan_menu" class="rounded">
+			</ul>
+		</div>
+	<!---------------------------------- /CHAN CATEGORY SCREEN ---------------------------------->
+	<!---------------------------------- STREAM SCREEN ---------------------------------->
+		<!------------------------ tv start stream ----------------------------------------->
+		<div id="streamchannel">
+			<div class="toolbar">
+			<a href="#" class="back">Back</a>
+			<a href="#home" id="home_but" class="button">Home</a>
+                <h1><img class="menuicon" src="img/tv.png" />Channel</h1>
+			</div>
+			<center><ul class="thumb" style="width:90px"><img class="thumbnail" id="thumbnail" src="" onerror="this.src='img/nologoTV.png'" /></ul></center>
+			<ul class="streaminfo">
+			<li><span class="name_now"></span>
+			<span class="epgtime_now"></span>
+			<span class="desc_now"></span></li>
+			<li>
+			<span class="name_next"></span>
+			<span class="epgtime_next"></span></li>
+			</ul>
+			<center>
+			<br>
+			<span class="streamButton"><a id="edge" href="#">Edge</a></span><span class="streamButton"><a id="3g" href="#" class="cube"> 3G </a></span><span class="streamButton"><a id="wifi" href="#" class="cube">Wifi</a></span><span class="recButton"><a id="rec" href="#" class="cube">Rec.</a></span>
+			<br><br>
+			</center>
+			<div rel="dataholder" style="visibility:hidden">
+                <span rel="type"></span>
+                <span rel="url"></span>
+				<span rel="number"></span>
+				<span rel="channame"></span>
+            </div>			
+		</div>
+		
+		<div id="streamrec">
+			<div class="toolbar">
+			<a href="#" class="back">Back</a>
+			<a href="#home" id="home_but" class="button">Home</a>
+                <h1>Recordings</h1>
+			</div>
+			<center><ul class="thumb" style="width:90px"><img class="thumbnail" id="thumbnail" src="" onerror="this.src='img/nologoTV.png'" /></ul></center>
+			<ul class="streaminfo">
+				<li>
+					<span class="name_now"></span>
+					<span class="epgtime_now"></span>
+					<span class="desc_now"></span>
+				</li>
+			</ul>
+			<center><br>
+			<span class="streamButton"><a id="edge" href="#">Edge</a></span><span class="streamButton"><a id="3g" href="#" class="cube"> 3G </a></span><span class="streamButton"><a id="wifi" href="#" class="cube">Wifi</a></span>
+			<br><br>
+			</center>
+			<div rel="dataholder" style="visibility:hidden">
+                <span rel="type"></span>
+                <span rel="url"></span>
+            </div>	
+		</div>
+		<div id="streamvid">
+			<div class="toolbar">
+			<a href="#" class="back">Back</a>
+			<a href="#home" id="home_but" class="button">Home</a>
+                <h1>Video</h1>
+			</div>
+			<center><ul class="thumb" style="width:190px;"><img class="thumbnail" id="thumbnail" src="" /></ul></center>
+			<ul class="streaminfo">
+				<li>
+					<span class="name_now"></span>
+					<span class="epgtime_now"></span>
+					<span class="desc_now"></span>
+				</li>
+			</ul>
+			<center><br>
+			<span class="streamButton"><a id="edge" href="#">Edge</a></span><span class="streamButton"><a id="3g" href="#" class="cube"> 3G </a></span><span class="streamButton"><a id="wifi" href="#" class="cube">Wifi</a></span>
+			<br><br>
+			</center>
+			<div rel="dataholder" style="visibility:hidden">
+                <span rel="type"></span>
+                <span rel="url"></span>
+            </div>	
+		</div>
+
+		<div id="streaming">
+			<div class="toolbar">
+			<a href="#" class="back">Back</a>
+			<a href="#home" id="home_but" class="button">Home</a>
+                <h1></h1>
+			</div>
+			<center><ul class="thumb" id="player"><img class="thumbnail" id="thumbnail" src="" /></ul></center>
+			<ul class="streamstatus">
+				<span class="title">Status</span>
+				<span class="mode"></span>
+			</ul>
+			<ul class="streaminfo">
+			</ul>
+			<center>
+				<span class="streamButton"><a rel="stopbroadcast" href="#">Stop stream</a></span>
+				<br><br>
+			</center>
+			<div rel="dataholder" style="visibility:hidden">
+                <span rel="session"></span>
+				<span rel="name"></span>
+				<span rel="thumbwidth"></span>
+				<span rel="thumbheight"></span>
+				<span rel="number"></span>
+            </div>						
+		</div>		
+		
+		<!---------------------------------- /STREAM SCREEN ---------------------------------->
+		<!---------------------------------- TIMERS SCREEN ---------------------------------->
+		
+		<div id="timers">
+			<div class="toolbar">
+			<a href="#" class="back">Home</a>
+				<h1><img class="menuicon" src="img/timers.png" /> TIMERS</h1>
+			</div>
+			
+			<ul class="rounded" rel="timers">
+			</ul>
+			<ul class="rounded">
+			<li class="arrow"><a href="#" rel="new"><span class="menuname">New Timer</span></a></li>
+			</ul>
+		</div>
+		
+		<div id="edittimer">
+			<div class="toolbar">
+			<a href="#" class="back">Back</a>
+			<a href="#home" id="home_but" class="button slideup">Home</a>
+                <h1></h1>
+			</div>
+			<form name="timer" id="timer" onsubmit="checktimerform();">
+			<ul class="rounded">
+				<li><span class="timertitle">Active</span><span class="toggle"><input id="timer_active" name="timer_active" type="checkbox" /></span></li>
+			</ul>
+			<ul class="rounded" rel="name">
+				<li><span class="timertitle">Name</span></li>
+				<li class="formerror" id="timer_name_error"><span class="formerrormsg">Recording name is missing</span></li>
+				<li><input type="text" name="name" placeholder="Enter recording name" id="timer_name" style="color: #FFFFFF" /></li>
+			</ul>
+			<ul class="rounded" rel="channel">
+				<li>
+					<span class="timertitle">Channel</span>
+				</li>
+				<li>
+					<select id="timer_chan">
+					</select>
+				</li>
+			</ul>
+			<ul class="rounded" rel="date">
+				<li><span class="timertitle">Date</span></li>
+				<li class="formerror" id="timer_date_error"><span class="formerrormsg">Date is missing</span></li>
+				<li class="arrow"><a id="a_date" class="abutton" href="#" onClick="$('#timer_date_error').hide();"><span class="menuname" id="layer_date">Select date</span></a></li>
+				
+			</ul>
+			<ul class="rounded" rel="stime">
+				<li><span class="timertitle">Start time</span></li>
+				<li class="formerror" id="timer_starttime_error"><span class="formerrormsg">Starting time is missing</span></li>
+				<li class="arrow"><a id="a_starttime" class="abutton" href="#" onClick="$('#timer_starttime_error').hide();"><span class="menuname" id="layer_starttime">Select start time</span></a></li>
+				
+			</ul>
+			<ul class="rounded" rel="etime">
+				<li><span class="timertitle">End time</span></li>
+				<li class="formerror" id="timer_endtime_error"><span class="formerrormsg">Ending time is missing</span></li>
+				<li class="arrow"><a id="a_endtime" class="abutton" href="#" onClick="$('#timer_endtime_error').hide();"><span class="menuname" id="layer_endtime">Select end time</span></a></li>
+			</ul>
+			<input name="timer_id" type="hidden" id="timer_id" value="" />
+			<input name="timer_date" type="hidden" id="timer_date" value="" />
+			<input name="timer_starttime" type="hidden" id="timer_starttime" value="" />
+			<input name="timer_endtime" type="hidden" id="timer_endtime" value="" />
+			</form>
+		</div>
+		<!---------------------------------- /TIMERS SCREEN ---------------------------------->
+		<!------------------------------------ EPG ------------------------------------------->
+		<div id="epg">
+			<div class="toolbar">
+					<a href="#" class="back">Home</a>
+						<h1>EPG</h1>
+				</div>
+			<ul class="rounded">
+				<li class="arrow"><a href="#now"><span class="menuname">What's Now</span></a></li>
+				<li class="arrow"><a href="#at"><span class="menuname">What's At</span></a></li>
+				<li class="arrow"><a href="#on"><span class="menuname">What's On</span></a></li>
+			</ul>
+		</div>
+		
+		<div id="on">
+			<div class="toolbar">
+				<a href="#" class="back">Back</a>
+				<a href="#home" id="home_but" class="button slideup">Home</a>
+                <h1>WHAT'S ON</h1>
+			</div>
+			<form name="epg_chanselector" id="epg_chanselector" action="">
+				<ul class="rounded">
+					<li><span class="timertitle">Select a Channel</span></li>
+					<li><select id="epg_chan" onchange="epg_selectchan()">
+						<optgroup label="NATIONALES & TNT">
+							<option value="1">TF1</option>
+							<option value="2">FRANCE 2</option>
+							<option value="3">FRANCE 3</option>
+							<option value="4">FRANCE 4</option>
+							<option value="5">TV5</option>
+							<option value="6">M6</option>
+						</optgroup>
+						<optgroup label="DIVERTISSEMENT">
+							<option value="11">COMEDIE!</option>
+							<option value="12">13EME RUE</option>
+							<option value="13">FOX LIFE</option>
+						</optgroup>
+					</select>
+					</li>
+				</ul>
+			</form>	
+				
+		</div>
+		<!------------------------------------ /EPG ------------------------------------------->
+	</div>
+    </body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3