Updated screenshot functionality on the LIVE homepage for the nextcvs-commit-355

release.

37 files changed, 51 insertions, 19 deletions

diff --git a/doc/web/homepage/de/features_0-2-0.inc b/doc/web/homepage/de/features_0-2-0.inc
index 190d164..94bae13 100644
--- a/doc/web/homepage/de/features_0-2-0.inc
+++ b/doc/web/homepage/de/features_0-2-0.inc
@@ -98,6 +98,11 @@
 	      auszuwählen.
 	    </li>
 	    <li>
+	      Unterst&uuml;tzung f&uuml;r https Datentransfer zwischen
+	      LIVE und dem Browser
+	      via <strong>SSL-Unterst&uuml;tzung</strong> in tntnet.
+	    </li>
+	    <li>
 	      Weiterhin gibt es viele <strong>kleine
 	      Neuerungen</strong> wie z.B. die Anzeige der
 	      Aufnahmenl&auml;nge in Minuten, die zu entdecken sich
diff --git a/doc/web/homepage/de/img/edit_searchtimer.jpg b/doc/web/homepage/de/img/edit_searchtimer.jpg
deleted file mode 100644
index d1c1706..0000000
--- a/doc/web/homepage/de/img/edit_searchtimer.jpg
+++ /dev/null
diff --git a/doc/web/homepage/de/img/edit_searchtimer_thumb.jpg b/doc/web/homepage/de/img/edit_searchtimer_thumb.jpg
deleted file mode 100644
index 4b1bbcf..0000000
--- a/doc/web/homepage/de/img/edit_searchtimer_thumb.jpg
+++ /dev/null
diff --git a/doc/web/homepage/de/img/editsearchtimer.jpg b/doc/web/homepage/de/img/editsearchtimer.jpg
new file mode 100644
index 0000000..385043e
--- /dev/null
+++ b/doc/web/homepage/de/img/editsearchtimer.jpg
diff --git a/doc/web/homepage/de/img/editsearchtimer_thumb.jpg b/doc/web/homepage/de/img/editsearchtimer_thumb.jpg
new file mode 100644
index 0000000..6bf65a8
--- /dev/null
+++ b/doc/web/homepage/de/img/editsearchtimer_thumb.jpg
diff --git a/doc/web/homepage/de/img/edittimer.jpg b/doc/web/homepage/de/img/edittimer.jpg
new file mode 100644
index 0000000..b461653
--- /dev/null
+++ b/doc/web/homepage/de/img/edittimer.jpg
diff --git a/doc/web/homepage/de/img/edittimer_thumb.jpg b/doc/web/homepage/de/img/edittimer_thumb.jpg
new file mode 100644
index 0000000..b1347ff
--- /dev/null
+++ b/doc/web/homepage/de/img/edittimer_thumb.jpg
diff --git a/doc/web/homepage/de/img/favourites.jpg b/doc/web/homepage/de/img/favourites.jpg
new file mode 100644
index 0000000..9e40a48
--- /dev/null
+++ b/doc/web/homepage/de/img/favourites.jpg
diff --git a/doc/web/homepage/de/img/favourites_thumb.jpg b/doc/web/homepage/de/img/favourites_thumb.jpg
new file mode 100644
index 0000000..4a8a406
--- /dev/null
+++ b/doc/web/homepage/de/img/favourites_thumb.jpg
diff --git a/doc/web/homepage/de/img/recordings.jpg b/doc/web/homepage/de/img/recordings.jpg
index 2470db1..8049cba 100644
--- a/doc/web/homepage/de/img/recordings.jpg
+++ b/doc/web/homepage/de/img/recordings.jpg
diff --git a/doc/web/homepage/de/img/recordings_thumb.jpg b/doc/web/homepage/de/img/recordings_thumb.jpg
index c439449..6d4eeee 100644
--- a/doc/web/homepage/de/img/recordings_thumb.jpg
+++ b/doc/web/homepage/de/img/recordings_thumb.jpg
diff --git a/doc/web/homepage/de/img/remote.jpg b/doc/web/homepage/de/img/remote.jpg
index d1683e0..5177a3a 100644
--- a/doc/web/homepage/de/img/remote.jpg
+++ b/doc/web/homepage/de/img/remote.jpg
diff --git a/doc/web/homepage/de/img/remote_thumb.jpg b/doc/web/homepage/de/img/remote_thumb.jpg
index 18a9e7d..03719f5 100644
--- a/doc/web/homepage/de/img/remote_thumb.jpg
+++ b/doc/web/homepage/de/img/remote_thumb.jpg
diff --git a/doc/web/homepage/de/img/schedule.jpg b/doc/web/homepage/de/img/schedule.jpg
index 8ce47bb..93fd164 100644
--- a/doc/web/homepage/de/img/schedule.jpg
+++ b/doc/web/homepage/de/img/schedule.jpg
diff --git a/doc/web/homepage/de/img/schedule_thumb.jpg b/doc/web/homepage/de/img/schedule_thumb.jpg
index b2d1895..33cc499 100644
--- a/doc/web/homepage/de/img/schedule_thumb.jpg
+++ b/doc/web/homepage/de/img/schedule_thumb.jpg
diff --git a/doc/web/homepage/de/img/search.jpg b/doc/web/homepage/de/img/search.jpg
new file mode 100644
index 0000000..8e2f034
--- /dev/null
+++ b/doc/web/homepage/de/img/search.jpg
diff --git a/doc/web/homepage/de/img/search_thumb.jpg b/doc/web/homepage/de/img/search_thumb.jpg
new file mode 100644
index 0000000..c4c38b3
--- /dev/null
+++ b/doc/web/homepage/de/img/search_thumb.jpg
diff --git a/doc/web/homepage/de/img/searchepg.jpg b/doc/web/homepage/de/img/searchepg.jpg
deleted file mode 100644
index fa5643a..0000000
--- a/doc/web/homepage/de/img/searchepg.jpg
+++ /dev/null
diff --git a/doc/web/homepage/de/img/searchepg_thumb.jpg b/doc/web/homepage/de/img/searchepg_thumb.jpg
deleted file mode 100644
index c54048b..0000000
--- a/doc/web/homepage/de/img/searchepg_thumb.jpg
+++ /dev/null
diff --git a/doc/web/homepage/de/img/searchtimer.jpg b/doc/web/homepage/de/img/searchtimer.jpg
new file mode 100644
index 0000000..68a878d
--- /dev/null
+++ b/doc/web/homepage/de/img/searchtimer.jpg
diff --git a/doc/web/homepage/de/img/searchtimer_thumb.jpg b/doc/web/homepage/de/img/searchtimer_thumb.jpg
new file mode 100644
index 0000000..7be9633
--- /dev/null
+++ b/doc/web/homepage/de/img/searchtimer_thumb.jpg
diff --git a/doc/web/homepage/de/img/setup.jpg b/doc/web/homepage/de/img/setup.jpg
index 5c54e09..8f4c570 100644
--- a/doc/web/homepage/de/img/setup.jpg
+++ b/doc/web/homepage/de/img/setup.jpg
diff --git a/doc/web/homepage/de/img/setup_thumb.jpg b/doc/web/homepage/de/img/setup_thumb.jpg
index 0bc2486..1947dbb 100644
--- a/doc/web/homepage/de/img/setup_thumb.jpg
+++ b/doc/web/homepage/de/img/setup_thumb.jpg
diff --git a/doc/web/homepage/de/img/timerconflict.jpg b/doc/web/homepage/de/img/timerconflict.jpg
new file mode 100644
index 0000000..184c9dd
--- /dev/null
+++ b/doc/web/homepage/de/img/timerconflict.jpg
diff --git a/doc/web/homepage/de/img/timerconflict_thumb.jpg b/doc/web/homepage/de/img/timerconflict_thumb.jpg
new file mode 100644
index 0000000..a434ad4
--- /dev/null
+++ b/doc/web/homepage/de/img/timerconflict_thumb.jpg
diff --git a/doc/web/homepage/de/img/timers.jpg b/doc/web/homepage/de/img/timers.jpg
deleted file mode 100644
index 6626f55..0000000
--- a/doc/web/homepage/de/img/timers.jpg
+++ /dev/null
diff --git a/doc/web/homepage/de/img/timers_thumb.jpg b/doc/web/homepage/de/img/timers_thumb.jpg
deleted file mode 100644
index 1a590a9..0000000
--- a/doc/web/homepage/de/img/timers_thumb.jpg
+++ /dev/null
diff --git a/doc/web/homepage/de/img/whatson.jpg b/doc/web/homepage/de/img/whatson.jpg
index 5e0da11..7e373ed 100644
--- a/doc/web/homepage/de/img/whatson.jpg
+++ b/doc/web/homepage/de/img/whatson.jpg
diff --git a/doc/web/homepage/de/img/whatson_thumb.jpg b/doc/web/homepage/de/img/whatson_thumb.jpg
index 63919f2..7393c79 100644
--- a/doc/web/homepage/de/img/whatson_thumb.jpg
+++ b/doc/web/homepage/de/img/whatson_thumb.jpg
diff --git a/doc/web/homepage/de/img/whatsonlist.jpg b/doc/web/homepage/de/img/whatsonlist.jpg
new file mode 100644
index 0000000..16bd48b
--- /dev/null
+++ b/doc/web/homepage/de/img/whatsonlist.jpg
diff --git a/doc/web/homepage/de/img/whatsonlist_thumb.jpg b/doc/web/homepage/de/img/whatsonlist_thumb.jpg
new file mode 100644
index 0000000..b93d2be
--- /dev/null
+++ b/doc/web/homepage/de/img/whatsonlist_thumb.jpg
diff --git a/doc/web/homepage/de/screenshots.php b/doc/web/homepage/de/screenshots.php
index 2c1dac2..28452cc 100644
--- a/doc/web/homepage/de/screenshots.php
+++ b/doc/web/homepage/de/screenshots.php
@@ -18,8 +18,17 @@
 
     <div class="inhalt">
 
-      <div style="width: 800px; margin-top: 15px">
-	<div class="boxheader"><div><div>Screenshots</div></div></div>
+      <div style="width: 840px; margin-top: 15px">
+	<div class="boxheader"><div><div>
+	  <?php
+	     if (isset($_GET["img"])) {
+	     	echo "Screenshot: " . $screenshots->ImageDescr($_GET["img"], "Unbekanntes Bild");
+	     }
+	     else {
+	     	echo "Screenshots: &Uuml;bersicht";
+	     }
+	  ?>
+	</div></div></div>
 	<div class="screenshots">
 	  <?php
 	     if (isset($_GET["img"])) {
diff --git a/doc/web/homepage/de/settings-de.inc b/doc/web/homepage/de/settings-de.inc
index eb1c606..be4163d 100644
--- a/doc/web/homepage/de/settings-de.inc
+++ b/doc/web/homepage/de/settings-de.inc
@@ -3,7 +3,8 @@
 $status = new Status("LIVE Plugin Status",
 					 "Aktuelle stabile Version",
 					 "0.2.0",
-					 "d.m.Y");
+					 "d.m.Y",
+					 "Sprache: ");
 
 $menu = new Menu(array("index.php" => "&Uuml;ber Live",
 					   "news.php" => "Neuerungen",
@@ -12,12 +13,17 @@ $menu = new Menu(array("index.php" => "&Uuml;ber Live",
 					   "index.php#links" => "Links und Kontakt"
 					 ));
 
-$screenshots = new Screenshots(array("whatson",
-									 "schedule",
-									 "timers",
-									 "searchepg",
-									 "edit_searchtimer",
-									 "recordings",
-									 "remote",
-									 "setup"));
+$screenshots = new Screenshots(array("whatson" => "Was l&auml;uft (Ausf&uuml;hrliche Ansicht)",
+									 "whatsonlist" => "Was l&auml;uft (Listenansicht)",
+									 "schedule" => "Programm eines Kanals f&uuml;r die n&auml;chsten Tage",
+									 "edittimer" => "Timer editieren",
+									 "search" => "Suche in den EPG Daten",
+									 "searchtimer" => "Suchtimer",
+									 "editsearchtimer" => "Suchtimer editieren",
+									 "timerconflict" => "Timer Konflikt Anzeige",
+									 "edittimer" => "Timer editieren",
+									 "recordings" => "Aufnahmen",
+									 "remote" => "Fernbedienung",
+									 "setup" => "LIVE Einstellungen",
+								     "favourites" => "Was l&auml;uft (Favoritenansicht)"));
 ?>
diff --git a/doc/web/homepage/page-header.inc b/doc/web/homepage/page-header.inc
index d1023bc..5224d9e 100644
--- a/doc/web/homepage/page-header.inc
+++ b/doc/web/homepage/page-header.inc
@@ -10,9 +10,10 @@
 	    <div id="infobox_duration" class="duration"><?php echo $status->vers_number; ?></div>
 	  </div>
 	  <div class="st_controls">
-	    <div id="infobox_channel_buttons">
-	      <a id="infobox_prevchan" href="vdr_request/switch_channel?param=" title="Sender zurück"><img src="../img/one_downarrow.png" alt=""></img></a>
-	      <a id="infobox_nextchan" href="vdr_request/switch_channel?param=" title="Sender vor"><img src="../img/one_uparrow.png" alt=""></img></a>
+	    <div>
+	      <div style="padding-right: 5px"><?php echo $status->language; ?></div>
+	      <a href="../en/index.php" ><img src="../img/english.png" alt=""></img></a>
+	      <a href="../de/index.php" ><img src="../img/german.png" alt=""></img></a>
 	    </div>
 	  </div>
 	</div>
diff --git a/doc/web/homepage/page-php-classes.inc b/doc/web/homepage/page-php-classes.inc
index 7ad2341..17d03ab 100644
--- a/doc/web/homepage/page-php-classes.inc
+++ b/doc/web/homepage/page-php-classes.inc
@@ -5,13 +5,15 @@ class Status
 	var $vers_string;
 	var $vers_number;
 	var $datefmt;
+	var $language;
 
-	function Status($title, $vname, $vnum, $datefmt)
+	function Status($title, $vname, $vnum, $datefmt, $lang)
 	{
 		$this->title = $title;
 		$this->vers_string = $vname;
 		$this->vers_number = $vnum;
 		$this->datefmt = $datefmt;
+		$this->language = $lang;
 	}
 }
 
@@ -39,14 +41,14 @@ class Screenshots
 	function RandomImg()
 	{
 		$idx = array_rand($this->images);
-		$this->MakeAnchor($this->images[$idx]);
+		$this->MakeAnchor($idx);
 	}
 
 
 	function AllImg()
 	{
-		foreach($this->images as $img) {
-			$this->MakeAnchor($img);
+		foreach($this->images as $idx => $descr) {
+			$this->MakeAnchor($idx);
 		}
 	}
 
@@ -58,7 +60,16 @@ class Screenshots
 	function FullImage($img)
 	{
 		$img = basename($img);
-		echo "<a href=\"screenshots.php\"><img src=\"img/${img}.jpg\" alt=\"img/${img}.jpg\"/ style=\"width: 770px\"></a>\n";
+		echo "<a href=\"screenshots.php\"><img src=\"img/${img}.jpg\" alt=\"img/${img}.jpg\"/ style=\"width: 810px\"></a>\n";
+	}
+
+	function ImageDescr($img, $error)
+	{
+		$img = basename($img);
+		if (isset($this->images[$img]))
+			return $this->images[$img];
+		else
+			return $error;
 	}
 }
 ?>
diff --git a/live/img/english.png b/live/img/english.png
new file mode 100644
index 0000000..5637410
--- /dev/null
+++ b/live/img/english.png
diff --git a/live/img/german.png b/live/img/german.png
new file mode 100644
index 0000000..4b54e8c
--- /dev/null
+++ b/live/img/german.png