diff options
-rw-r--r-- | doc/web/homepage/de/features_0-2-0.inc | 2 | ||||
-rw-r--r-- | doc/web/homepage/de/index.php | 16 | ||||
-rw-r--r-- | doc/web/homepage/de/install_0-1-0.inc | 47 | ||||
-rw-r--r-- | doc/web/homepage/de/install_0-2-0.inc | 60 | ||||
-rw-r--r-- | doc/web/homepage/de/install_devel.inc | 60 | ||||
-rw-r--r-- | doc/web/homepage/en/download.php | 18 | ||||
-rw-r--r-- | doc/web/homepage/en/features_0-1-0.inc | 2 | ||||
-rw-r--r-- | doc/web/homepage/en/features_0-2-0.inc | 153 | ||||
-rw-r--r-- | doc/web/homepage/en/index.php | 41 | ||||
-rw-r--r-- | doc/web/homepage/en/install_0-1-0.inc | 65 | ||||
-rw-r--r-- | doc/web/homepage/en/install_0-2-0.inc | 98 | ||||
-rw-r--r-- | doc/web/homepage/en/install_devel.inc | 98 | ||||
-rw-r--r-- | doc/web/homepage/en/news.php | 6 | ||||
-rw-r--r-- | doc/web/homepage/en/screenshots.php | 2 | ||||
-rw-r--r-- | doc/web/homepage/html-header.inc | 3 | ||||
-rw-r--r-- | doc/web/homepage/live-sw-configs.php | 50 | ||||
-rw-r--r-- | doc/web/homepage/page-php-classes.inc | 117 |
17 files changed, 453 insertions, 385 deletions
diff --git a/doc/web/homepage/de/features_0-2-0.inc b/doc/web/homepage/de/features_0-2-0.inc index 94bae13..dcbd96b 100644 --- a/doc/web/homepage/de/features_0-2-0.inc +++ b/doc/web/homepage/de/features_0-2-0.inc @@ -48,7 +48,7 @@ </li> <li> Mit der entsprechenden Version vom Epgsearch-Plugin (ab - epgsearch-0.9.25) gibt es bei Timer nun auch einen + epgsearch-0.9.24) gibt es bei Timer nun auch einen Menüpunkt: <strong>„Timerkonflikte”</strong>. Dieser Menüpunkt wertet aus, welche programmierte Timer nicht funktionieren können, weil z.B. keine diff --git a/doc/web/homepage/de/index.php b/doc/web/homepage/de/index.php index 1231a97..181cbe3 100644 --- a/doc/web/homepage/de/index.php +++ b/doc/web/homepage/de/index.php @@ -23,6 +23,9 @@ <div class="boxheader"><div><div>Über LIVE</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <div class="screenshots" style="float: right; border: 0; padding-top: 15px"><?php $screenshots->RandomImg(); ?></div> + <p> + <b>LIVE</b> + </p> <p> LIVE, das <strong><em>LIVE Interactive VDR Environment</em></strong>, ermöglicht die komfortable Bedienung des VDR und mancher seiner Plugins @@ -52,6 +55,17 @@ der <a href="screenshots.php"><?php echo $menu->urls["screenshots.php"]; ?>-Seite</a> verschaffen. </p> + <p> + <b>Lizenz</b> + </p> + <p> + LIVE wird unter + der <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU + General Public License, Version 2</a> (GPLv2) + veröffentlicht. Nähere Informationen erhalten Sie + durch verfolgen des Links und/oder in der + Datei <tt>COPYING</tt> im Quellcode Verzeichnis von LIVE. + </p> </div> </div> @@ -61,7 +75,7 @@ <?php include ("features_0-2-0.inc"); ?> <p> Alle bisherigen Änderungen an LIVE sind auf der Seite - mit den <a href="news.php"><?php echo + mit den <a href="news.php">archivierten <?php echo $menu->urls["news.php"];?></a> aufgelistet. </p> </div> diff --git a/doc/web/homepage/de/install_0-1-0.inc b/doc/web/homepage/de/install_0-1-0.inc index 5702630..dc7cf36 100644 --- a/doc/web/homepage/de/install_0-1-0.inc +++ b/doc/web/homepage/de/install_0-1-0.inc @@ -1,3 +1,8 @@ +<?php + require_once ("../live-sw-configs.php"); + + $selectedConfig = '0.1.0'; +?> <div class="tab"> <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0"> <tr class="description"> @@ -6,48 +11,30 @@ <td><div class="withmargin">Empfohlen</div></td> <td><div class="withmargin">URL</div></td> </tr> - <tr> - <td><div class="withmargin">VDR</td> - <td><div class="withmargin">1.4.3</td> - <td><div class="withmargin"><= 1.5.7</td> - <td><div class="withmargin"><a href="http://www.cadsoft.de/vdr/download.htm">http://www.cadsoft.de/vdr/download.htm</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Tntnet</div></td> - <td><div class="withmargin">1.5.3</div></td> - <td><div class="withmargin">>= 1.5.3</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Cxxtools</div></td> - <td><div class="withmargin">1.4.3</div></td> - <td><div class="withmargin">>= 1.4.3</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">boost</div></td> - <td><div class="withmargin">1.32.0</div></td> - <td><div class="withmargin"></div></td> - <td><div class="withmargin"><a href="http://www.boost.org">http://www.boost.org</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> <td colspan="4"></td> </tr> <tr class="description"> <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td> </tr> - <tr> - <td><div class="withmargin">epgsearch</div></td> - <td><div class="withmargin">0.9.22</div></td> - <td><div class="withmargin">>= 0.9.22</div></td> - <td><div class="withmargin"><a href="http://winni.vdr-developer.org/epgsearch/index.html#download">http://winni.vdr-developer.org/epgsearch/index.html#download</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) { + SWConfTableRow($sc); + } + ?> </table> </div> + <p> Tntnet stellt grundlegende Webserver-Funktionen für LIVE zur Verfügung. Cxxtools wird von Tntnet benötigt.<br /> Boost stellt wichtige Datenstrukturen. Gegenwärtig benötigen wir das Gesamtpaket, demnächst könnte es aber eine abgespeckte Version, die nur das benötigte bereitstellt, von uns geben. + </p> diff --git a/doc/web/homepage/de/install_0-2-0.inc b/doc/web/homepage/de/install_0-2-0.inc index f270bac..71f2a89 100644 --- a/doc/web/homepage/de/install_0-2-0.inc +++ b/doc/web/homepage/de/install_0-2-0.inc @@ -1,3 +1,8 @@ +<?php + require_once ("../live-sw-configs.php"); + + $selectedConfig = '0.2.0'; +?> <div class="tab"> <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0"> <tr class="description"> @@ -6,58 +11,39 @@ <td><div class="withmargin">Empfohlen</div></td> <td><div class="withmargin">URL</div></td> </tr> - <tr> - <td><div class="withmargin">VDR</td> - <td><div class="withmargin">1.4.0</td> - <td><div class="withmargin">>= 1.4.7</td> - <td><div class="withmargin"><a href="http://www.cadsoft.de/vdr/download.htm">http://www.cadsoft.de/vdr/download.htm</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Tntnet</div></td> - <td><div class="withmargin">1.5.3</div></td> - <td><div class="withmargin">>= 1.6.1</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Cxxtools</div></td> - <td><div class="withmargin">1.4.3</div></td> - <td><div class="withmargin">>= 1.4.7</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> <td colspan="4"></td> </tr> <tr class="description"> <td colspan="4"><div class="withmargin">Optional:</div></td> </tr> - <tr> - <td><div class="withmargin">boost</div></td> - <td><div class="withmargin">1.32.0</div></td> - <td><div class="withmargin">nur für GCC < 4.1</div></td> - <td><div class="withmargin"><a href="http://www.boost.org">http://www.boost.org</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> <td colspan="4"></td> </tr> <tr class="description"> <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td> </tr> - <tr> - <td><div class="withmargin">epgsearch</div></td> - <td><div class="withmargin">0.9.22</div></td> - <td><div class="withmargin">>= 0.9.24</div></td> - <td><div class="withmargin"><a href="http://winni.vdr-developer.org/epgsearch/index.html#download">http://winni.vdr-developer.org/epgsearch/index.html#download</a></div></td> - </tr> - <tr> - <td><div class="withmargin">streamdev</div></td> - <td><div class="withmargin">0.3.3</div></td> - <td><div class="withmargin">>= 0.3.4</div></td> - <td><div class="withmargin"><a href="http://streamdev.vdr-developer.org/">http://streamdev.vdr-developer.org</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) { + SWConfTableRow($sc); + } + ?> </table> </div> + <p> Tntnet stellt grundlegende Webserver-Funktionen für LIVE zur - Verfügung. Cxxtools wird von Tntnet benötigt.<br /> Boost + Verfügung. Cxxtools wird von Tntnet benötigt.<br />*) Boost stellt TR1 C++-Erweiterungen bereit und wird nur von GCC < 4.1 benötigt. + </p> diff --git a/doc/web/homepage/de/install_devel.inc b/doc/web/homepage/de/install_devel.inc index f270bac..c57889e 100644 --- a/doc/web/homepage/de/install_devel.inc +++ b/doc/web/homepage/de/install_devel.inc @@ -1,3 +1,8 @@ +<?php + require_once ("../live-sw-configs.php"); + + $selectedConfig = 'devel'; +?> <div class="tab"> <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0"> <tr class="description"> @@ -6,58 +11,39 @@ <td><div class="withmargin">Empfohlen</div></td> <td><div class="withmargin">URL</div></td> </tr> - <tr> - <td><div class="withmargin">VDR</td> - <td><div class="withmargin">1.4.0</td> - <td><div class="withmargin">>= 1.4.7</td> - <td><div class="withmargin"><a href="http://www.cadsoft.de/vdr/download.htm">http://www.cadsoft.de/vdr/download.htm</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Tntnet</div></td> - <td><div class="withmargin">1.5.3</div></td> - <td><div class="withmargin">>= 1.6.1</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Cxxtools</div></td> - <td><div class="withmargin">1.4.3</div></td> - <td><div class="withmargin">>= 1.4.7</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> <td colspan="4"></td> </tr> <tr class="description"> <td colspan="4"><div class="withmargin">Optional:</div></td> </tr> - <tr> - <td><div class="withmargin">boost</div></td> - <td><div class="withmargin">1.32.0</div></td> - <td><div class="withmargin">nur für GCC < 4.1</div></td> - <td><div class="withmargin"><a href="http://www.boost.org">http://www.boost.org</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> <td colspan="4"></td> </tr> <tr class="description"> <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td> </tr> - <tr> - <td><div class="withmargin">epgsearch</div></td> - <td><div class="withmargin">0.9.22</div></td> - <td><div class="withmargin">>= 0.9.24</div></td> - <td><div class="withmargin"><a href="http://winni.vdr-developer.org/epgsearch/index.html#download">http://winni.vdr-developer.org/epgsearch/index.html#download</a></div></td> - </tr> - <tr> - <td><div class="withmargin">streamdev</div></td> - <td><div class="withmargin">0.3.3</div></td> - <td><div class="withmargin">>= 0.3.4</div></td> - <td><div class="withmargin"><a href="http://streamdev.vdr-developer.org/">http://streamdev.vdr-developer.org</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) { + SWConfTableRow($sc); + } + ?> </table> </div> + <p> Tntnet stellt grundlegende Webserver-Funktionen für LIVE zur - Verfügung. Cxxtools wird von Tntnet benötigt.<br /> Boost + Verfügung. Cxxtools wird von Tntnet benötigt.<br />*) Boost stellt TR1 C++-Erweiterungen bereit und wird nur von GCC < 4.1 benötigt. + </p> diff --git a/doc/web/homepage/en/download.php b/doc/web/homepage/en/download.php index df8ff5b..2cedca3 100644 --- a/doc/web/homepage/en/download.php +++ b/doc/web/homepage/en/download.php @@ -19,7 +19,7 @@ <div class="inhalt"> <div style="width: 800px; margin-top: 15px"> - <div class="boxheader"><div><div>Stabile Version:</div></div></div> + <div class="boxheader"><div><div>Stable version:</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <p> <b>Version 0.2.0</b> @@ -28,7 +28,7 @@ </ul> </p> <p> - <b>Vorausetzungen für die Installation:</b> + <b>Installation prerequisites:</b> <?php include ("install_0-2-0.inc"); ?> </p> <p></p> @@ -36,21 +36,23 @@ </div> <div style="width: 800px; margin-top: 15px"> - <div class="boxheader"><div><div>Entwickler Version:</div></div></div> + <div class="boxheader"><div><div>Development version:</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <p> - <b>Akuteller CVS-Snapshot</b> + <b>Current CVS snapshot</b> <ul> <li> Download: <a href="http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/live.tar.gz?tarball=1">http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/</a> <p> - <strong>WICHTIG:</strong> unbedingt auch immer die Datei README in LIVE Quellen-Verzeichnis beachten! + <strong>IMPORTANT:</strong> when using this version + please always check the README file in the LIVE + source directory. </p> </li> </ul> </p> <p> - <b>Vorausetzungen für die Installation:</b> + <b>Installation prerequisites:</b> <?php include ("install_devel.inc"); ?> </p> <p></p> @@ -58,7 +60,7 @@ </div> <div style="width: 800px; margin-top: 15px"> - <div class="boxheader"><div><div>Ältere Version:</div></div></div> + <div class="boxheader"><div><div>Old version:</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <p> <b>Version 0.1.0</b> @@ -67,7 +69,7 @@ </ul> </p> <p> - <b>Vorausetzungen für die Installation:</b> + <b>Installation prerequisites:</b> <?php include ("install_0-1-0.inc"); ?> </p> <p></p> diff --git a/doc/web/homepage/en/features_0-1-0.inc b/doc/web/homepage/en/features_0-1-0.inc index 85cefa7..a6954c5 100644 --- a/doc/web/homepage/en/features_0-1-0.inc +++ b/doc/web/homepage/en/features_0-1-0.inc @@ -1,3 +1,3 @@ <ul> - <li>Initiale Version :)</li> + <li>Initial version :)</li> </ul> diff --git a/doc/web/homepage/en/features_0-2-0.inc b/doc/web/homepage/en/features_0-2-0.inc index 94bae13..4d231ce 100644 --- a/doc/web/homepage/en/features_0-2-0.inc +++ b/doc/web/homepage/en/features_0-2-0.inc @@ -1,111 +1,98 @@ <p> - Die folgende Liste enthält die wichtigsten für - den Benutzer sichtbaren Änderungen an LIVE seit der - letzten stabilen Version. Daneben wurde auch unter der - Haube einiges verändert. Z.B. wurde auf das - Javascript - Framework <a href="http://www.mootools.net/">Mootools</a> - umgestellt. + The following list contains the most important user + visible changes in LIVE since the release of the last + stable version. Underneath the visible parts changes took + place too: e.g. the used Javascript is now based in large + parts on + the <a href="http://www.mootools.net/">Mootools</a> + framework. </p> <ul> <li> - Die <strong>Infobox ist noch - „intelligenter”</strong> - geworden. Hierüber kann z.B. eine Aufnahme - vorgespult werden, welche über die VDR TV Ausgabe - abgespielt werden. Auch kann man hierüber die - Programme direkt am TV umschalten. + + The <strong>InfoBox</strong> has + become <strong>“more intelligent”</strong>, + e.g. a recording can be fast-forwarded, while playing it + over VDR TV out. And channels of the primary output + device can be switched with the controls in the InfoBox. </li> <li> - Unter „Was läuft?” gibt es nun eine - <strong>Favoritenliste</strong>. Hier werden die - Sendungen dargestellt, die man via - „Suchtimer” suchen lässt und hier - dargestellt haben will. Ein Beispiel: Beim - „Suchtimer-Anlegen” gebe ich den Suchbegriff - „Volksmusik” ein und setze den Haken bei - „Im Favoritenmenü verwenden”. Bei - „Was läuft?” → - „Favoriten” werden dann alle Sendungen mit - Volksmusik in der Beschreibung angezeigt. Auch neu unter - „Was läuft?” ist - die <strong>Listenansicht</strong>. + A <strong>favorite list</strong> found place under + “whats on?”. It is populated by + “search timers” with set option “use + in favorite menu” while creating the timer. Also + new is an option to display the “whats on?” + entries in a list. </li> <li> - Bei den einzelnen Sendungen (also nur bei Sendungen - für die EPG-Daten vorliegen) gibt es jetzt einen - Knopf <strong>„Sendung im Browser - anzeigen”</strong>: Dieser Knopf ruft das - VLC-Plugin auf und erlaubt das Streamen von LiveTV. + Each schedules entry (only those with EPG data) owns a + button + <strong>“show in browser”</strong>: This + button calls the VLC plugin and shows a liveTV + stream. This does not work for recordings. </li> <li> - Bei dem Menü „Programm” gibt es bei der - Programmauswahl den Knopf <strong>”Im Browser - anzeigen”</strong>. Hier können auch Sender - ausgewählt werden, die keine EPG-Daten liefern, - aber in der channels.conf vorhanden sind. Zum Beispiel - kleinere TV-Sender oder Radio Stationen. + On “schedule” page, there is a + button <strong>“show in browser”</strong>. + All channels can be selected here, also those without + EPG data but which are present in the + channels.conf. Smaller TV providers or radio stations + are affected by this from time to time. </li> <li> - Mit der entsprechenden Version vom Epgsearch-Plugin (ab - epgsearch-0.9.25) gibt es bei Timer nun auch einen - Menüpunkt: <strong>„Timerkonflikte”</strong>. - Dieser Menüpunkt wertet aus, welche programmierte - Timer nicht funktionieren können, weil z.B. keine - Karte mehr frei ist. Wenn die Infobox aktiv ist, wird - eine entsprechende Einblendung angezeigt, wenn Epgsearch - eine Änderung an den Timerkonflikten festgestellt - hat. + With newer versions of the Epgsearch plugin (starting from + epgsearch-0.9.24) there is a menu option for timers: + <strong>“timer conflicts”</strong>. This + option evaluates, which programmed timers could not be + recorded, because there are no more free DVB devices + available, or similar reasons. When the InfoBox is + switched active, a message is displayed on the current + page if Epgsearch detected a change of the timer + conflicts. </li> <li> - Im Menüpunkt „Suchtimer” gibt es jetzt - die Möglichkeit direkt ein <strong>manuelles - Suchtimer-Update</strong> anzustoßen. So kann man - direkt das Epgsearch-Plugin dazu zwingen, - unverzüglich ein Update durchzuführen. + On the “search timers” page it is now + possible to start direct <strong>manual search timer + updates</strong>. Use it and Epgsearch plugin will + immediately update all search timers. </li> <li> - Bei „Neuen Suchtimer anlegen” gibt es nun - unter „Als Suchtimer verwenden:” die - Möglichkeit eine <strong>Benutzer-definierte - Suche</strong> durchzuführen. Hier bestimmt der - Benutzer, ab welchem Datum und bis zu welchem Datum - Epgsearch im Hintergrund seiner Tätigkeit nachgehen - soll. Somit kann man z.B. Suchtimer bauen, die z.B. nur - einen Zeitraum der Herbstfolgen einer Serie durchsuchen. + Within the “edit search timers” page the new + option “use as search timer” provides a + <strong>user-defined search</strong>. Here the user + determines start and stop date for Epgsearch in the + background. So you are able to build search timers, + which scan for example only during the period of the + autumn all transmissions of a series. </li> <li> - Beim - Menüpunkt <strong>„Aufnahmen”</strong> - gibt es jetzt - den <strong>„Löschen”–Knopf</strong> - neben dem Namen einer Aufnahme. Die Aufnahme wird via - VDR als gelöscht markiert. D.h. die Aufnahme wird - in „.del” umbenannt und beim nächsten - Aufräumen des VDR entsorgt. + In <strong>“recordings”</strong> now you + will find a + button <strong>“delete”</strong>. The + recording will be marked with VDRs methods as + deleted. That means the recording will be renamed with + the suffix “.del” and removed at the next + time when VDR cleans up deleted recordings. </li> <li> - Die „Einstellungen” sollte man nach einem - Update von live 0.1.0 auf 0.2.0 direkt aufsuchen. Dort - gibt es <strong>Einstellungen für die neuen - Funktionen</strong>, die man überprüfen - sollte. + You should visit “setup” directly after + updating live 0.1.0 to 0.2.0. There might + be <strong>settings</strong> for the new functions, + which you would like to <strong>examine</strong>. </li> <li> - Überarbeitet ist auch die Möglichkeit sich ein - passendes <strong>„Thema”</strong> - auszusuchen, sprich farblich unterschiedliche Designs - auszuwählen. + Revised is the possibility to selected a suitable + <strong>“theme”</strong>, a small set of + different colored designs to select. </li> <li> - Unterstützung für https Datentransfer zwischen - LIVE und dem Browser - via <strong>SSL-Unterstützung</strong> in tntnet. + Support for https data transfer between LIVE and the + browser due to <strong>SSL support</strong> in Tntnet. </li> <li> - Weiterhin gibt es viele <strong>kleine - Neuerungen</strong> wie z.B. die Anzeige der - Aufnahmenlänge in Minuten, die zu entdecken sich - lohnt :). + Further there are many <strong>small + innovations</strong> like the length of recordings in + minutes ', but we are sure you will discover them by + yourself. </li> </ul> diff --git a/doc/web/homepage/en/index.php b/doc/web/homepage/en/index.php index f509dbc..4cf5f8e 100644 --- a/doc/web/homepage/en/index.php +++ b/doc/web/homepage/en/index.php @@ -23,36 +23,49 @@ <div class="boxheader"><div><div>About LIVE</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <div class="screenshots" style="float: right; border: 0; padding-top: 15px"><?php $screenshots->RandomImg(); ?></div> + <p> + <b>LIVE</b> + </p> <p> LIVE, the <strong><em>LIVE Interactive VDR Environment</em></strong>, allows a comfortable operation - of VDR and some of his plugins trough a web interface. + of VDR and some of its plugins trough a web interface. </p> <p> Unlike external programs, which communicate with VDR and - his plugins through the SVDRP interface, LIVE has direct + its plugins through the SVDRP interface, LIVE has direct access to the internal data structures of VDR. This makes LIVE very fast. </p> <p> - Additionaly LIVE introduces an interface which allows the + Additionally LIVE introduces an interface which allows the direct integration of user interfaces for VDR plugins.<br/> Currently this interface was implemented for the <a href="http://winni.vdr-developer.org/epgsearch/index.html">EPGSearch</a> - plugin. A substancial part of the LIVE web interface is + plugin. A substantial part of the LIVE web interface is based on this implementation. There exist plans to extend other plugins (like taste, burn, femon and others) with this interface too.<br/> LIVE works even when these plugins are missing. LIVE detects the available plugins and adapts its user interface accordingly. Therefor it can - happen, that certain functions apear and can be used only + happen, that certain functions appear and can be used only when the appropriate plugin is activated in VDR. </p> <p> You can get a first optical impression of LIVE on the <a href="screenshots.php"><?php echo $menu->urls["screenshots.php"]; ?> page</a> </p> + <p> + <b>License</b> + </p> + <p> + LIVE is distributed under + the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU + General Public License, version 2</a>(GPLv2). For more + information follow the Link and/or see the file <tt>COPYING</tt> in + the LIVE source code directory. + </p> </div> </div> @@ -61,9 +74,10 @@ <div style="border: 1px solid black; padding: 0px 10px"> <?php include ("features_0-2-0.inc"); ?> <p> - Alle bisherigen Änderungen an LIVE sind auf der Seite - mit den <a href="news.php"><?php echo - $menu->urls["news.php"];?></a> aufgelistet. + All past feature additions or changes of LIVE can be found on + the + <a href="news.php"><?php echo + $menu->urls["news.php"];?> archive page</a>. </p> </div> </div> @@ -77,20 +91,19 @@ <li> Download: <?php echo "<a href=\"http://live.vdr-developer.org/downloads/vdr-live-" . $status->vers_number . ".tar.gz\">" . "http://live.vdr-developer.org/downloads/vdr-live-" . $status->vers_number . ".tar.gz</a>"; ?> <p> - <strong>WICHTIG:</strong> unbedingt auch immer die Datei README in LIVE Quellen-Verzeichnis beachten! + <strong>IMPORTANT:</strong> please allways have a look at the <tt>README</tt> file in the LIVE source code directory! </p> </li> </ul> </p> <p> - <b>Vorausetzungen für die Installation:</b> + <b>Installation prerequisites:</b> <?php include ("install_0-2-0.inc"); ?> </p> <p> - Andere Versionen von LIVE können von - der <a href="download.php"><?php echo - $menu->urls["download.php"]; ?>-Seite</a> herunter geladen - werden. + Different versions of LIVE can be downloaded from the + <a href="download.php"><?php echo + $menu->urls["download.php"]; ?> page</a>. </p> </div> </div> diff --git a/doc/web/homepage/en/install_0-1-0.inc b/doc/web/homepage/en/install_0-1-0.inc index 5702630..6db40f6 100644 --- a/doc/web/homepage/en/install_0-1-0.inc +++ b/doc/web/homepage/en/install_0-1-0.inc @@ -1,53 +1,38 @@ +<?php + require_once ("../live-sw-configs.php"); + + $selectedConfig = '0.1.0'; +?> <div class="tab"> <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0"> <tr class="description"> <td><div class="withmargin">Software</div></td> - <td><div class="withmargin">Mindestversion</div></td> - <td><div class="withmargin">Empfohlen</div></td> + <td><div class="withmargin">minimal version</div></td> + <td><div class="withmargin">recommended</div></td> <td><div class="withmargin">URL</div></td> </tr> - <tr> - <td><div class="withmargin">VDR</td> - <td><div class="withmargin">1.4.3</td> - <td><div class="withmargin"><= 1.5.7</td> - <td><div class="withmargin"><a href="http://www.cadsoft.de/vdr/download.htm">http://www.cadsoft.de/vdr/download.htm</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Tntnet</div></td> - <td><div class="withmargin">1.5.3</div></td> - <td><div class="withmargin">>= 1.5.3</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Cxxtools</div></td> - <td><div class="withmargin">1.4.3</div></td> - <td><div class="withmargin">>= 1.4.3</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">boost</div></td> - <td><div class="withmargin">1.32.0</div></td> - <td><div class="withmargin"></div></td> - <td><div class="withmargin"><a href="http://www.boost.org">http://www.boost.org</a></div></td> - </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> <td colspan="4"></td> </tr> <tr class="description"> - <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td> - </tr> - <tr> - <td><div class="withmargin">epgsearch</div></td> - <td><div class="withmargin">0.9.22</div></td> - <td><div class="withmargin">>= 0.9.22</div></td> - <td><div class="withmargin"><a href="http://winni.vdr-developer.org/epgsearch/index.html#download">http://winni.vdr-developer.org/epgsearch/index.html#download</a></div></td> + <td colspan="4"><div class="withmargin">Used VDR Plugins:</div></td> </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) { + SWConfTableRow($sc); + } + ?> </table> </div> - - Tntnet stellt grundlegende Webserver-Funktionen für LIVE zur - Verfügung. Cxxtools wird von Tntnet benötigt.<br /> - Boost stellt wichtige Datenstrukturen. Gegenwärtig benötigen - wir das Gesamtpaket, demnächst könnte es aber eine - abgespeckte Version, die nur das benötigte bereitstellt, von - uns geben. + <p> + Tntnet provides the basic web server function for LIVE. + Cxxtools is needed for Tntnet.<br /> *) Boost provides + important data structures. Currently the complete package is + needed. In the future a stripped down version might be part + of the LIVE distribution. + </p> diff --git a/doc/web/homepage/en/install_0-2-0.inc b/doc/web/homepage/en/install_0-2-0.inc index f270bac..c3c1b53 100644 --- a/doc/web/homepage/en/install_0-2-0.inc +++ b/doc/web/homepage/en/install_0-2-0.inc @@ -1,63 +1,49 @@ - <div class="tab"> +<?php + require_once ("../live-sw-configs.php"); + + $selectedConfig = '0.2.0'; +?> + <div class="tab"> <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0"> <tr class="description"> - <td><div class="withmargin">Software</div></td> - <td><div class="withmargin">Mindestversion</div></td> - <td><div class="withmargin">Empfohlen</div></td> - <td><div class="withmargin">URL</div></td> - </tr> - <tr> - <td><div class="withmargin">VDR</td> - <td><div class="withmargin">1.4.0</td> - <td><div class="withmargin">>= 1.4.7</td> - <td><div class="withmargin"><a href="http://www.cadsoft.de/vdr/download.htm">http://www.cadsoft.de/vdr/download.htm</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Tntnet</div></td> - <td><div class="withmargin">1.5.3</div></td> - <td><div class="withmargin">>= 1.6.1</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Cxxtools</div></td> - <td><div class="withmargin">1.4.3</div></td> - <td><div class="withmargin">>= 1.4.7</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> + <td><div class="withmargin">Software</div></td> + <td><div class="withmargin">minimal version</div></td> + <td><div class="withmargin">recommended</div></td> + <td><div class="withmargin">URL</div></td> + </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> - <td colspan="4"></td> - </tr> + <td colspan="4"></td> + </tr> <tr class="description"> - <td colspan="4"><div class="withmargin">Optional:</div></td> - </tr> - <tr> - <td><div class="withmargin">boost</div></td> - <td><div class="withmargin">1.32.0</div></td> - <td><div class="withmargin">nur für GCC < 4.1</div></td> - <td><div class="withmargin"><a href="http://www.boost.org">http://www.boost.org</a></div></td> - </tr> + <td colspan="4"><div class="withmargin">Optional:</div></td> + </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> - <td colspan="4"></td> - </tr> + <td colspan="4"></td> + </tr> <tr class="description"> - <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td> - </tr> - <tr> - <td><div class="withmargin">epgsearch</div></td> - <td><div class="withmargin">0.9.22</div></td> - <td><div class="withmargin">>= 0.9.24</div></td> - <td><div class="withmargin"><a href="http://winni.vdr-developer.org/epgsearch/index.html#download">http://winni.vdr-developer.org/epgsearch/index.html#download</a></div></td> - </tr> - <tr> - <td><div class="withmargin">streamdev</div></td> - <td><div class="withmargin">0.3.3</div></td> - <td><div class="withmargin">>= 0.3.4</div></td> - <td><div class="withmargin"><a href="http://streamdev.vdr-developer.org/">http://streamdev.vdr-developer.org</a></div></td> - </tr> + <td colspan="4"><div class="withmargin">Used VDR Plugins:</div></td> + </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) { + SWConfTableRow($sc); + } + ?> </table> - </div> - - Tntnet stellt grundlegende Webserver-Funktionen für LIVE zur - Verfügung. Cxxtools wird von Tntnet benötigt.<br /> Boost - stellt TR1 C++-Erweiterungen bereit und wird nur von GCC - < 4.1 benötigt. + </div> + <p> + Tntnet provides the basic web server function for LIVE. + Cxxtools is needed for Tntnet.<br />*) Boost provides the + TR1 C++ extensions. These are only needed when compiled with + GCC < 4.1. Later GCC versions provide the TR1 extensions + natively. + </p> diff --git a/doc/web/homepage/en/install_devel.inc b/doc/web/homepage/en/install_devel.inc index f270bac..0c059b7 100644 --- a/doc/web/homepage/en/install_devel.inc +++ b/doc/web/homepage/en/install_devel.inc @@ -1,63 +1,49 @@ - <div class="tab"> +<?php + require_once ("../live-sw-configs.php"); + + $selectedConfig = 'devel'; +?> + <div class="tab"> <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0"> <tr class="description"> - <td><div class="withmargin">Software</div></td> - <td><div class="withmargin">Mindestversion</div></td> - <td><div class="withmargin">Empfohlen</div></td> - <td><div class="withmargin">URL</div></td> - </tr> - <tr> - <td><div class="withmargin">VDR</td> - <td><div class="withmargin">1.4.0</td> - <td><div class="withmargin">>= 1.4.7</td> - <td><div class="withmargin"><a href="http://www.cadsoft.de/vdr/download.htm">http://www.cadsoft.de/vdr/download.htm</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Tntnet</div></td> - <td><div class="withmargin">1.5.3</div></td> - <td><div class="withmargin">>= 1.6.1</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> - <tr> - <td><div class="withmargin">Cxxtools</div></td> - <td><div class="withmargin">1.4.3</div></td> - <td><div class="withmargin">>= 1.4.7</div></td> - <td><div class="withmargin"><a href="http://www.tntnet.org/download.html">http://www.tntnet.org/download.html</a></div></td> - </tr> + <td><div class="withmargin">Software</div></td> + <td><div class="withmargin">minimal version</div></td> + <td><div class="withmargin">recommended</div></td> + <td><div class="withmargin">URL</div></td> + </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> - <td colspan="4"></td> - </tr> + <td colspan="4"></td> + </tr> <tr class="description"> - <td colspan="4"><div class="withmargin">Optional:</div></td> - </tr> - <tr> - <td><div class="withmargin">boost</div></td> - <td><div class="withmargin">1.32.0</div></td> - <td><div class="withmargin">nur für GCC < 4.1</div></td> - <td><div class="withmargin"><a href="http://www.boost.org">http://www.boost.org</a></div></td> - </tr> + <td colspan="4"><div class="withmargin">Optional:</div></td> + </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) { + SWConfTableRow($sc); + } + ?> <tr class="spacer"> - <td colspan="4"></td> - </tr> + <td colspan="4"></td> + </tr> <tr class="description"> - <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td> - </tr> - <tr> - <td><div class="withmargin">epgsearch</div></td> - <td><div class="withmargin">0.9.22</div></td> - <td><div class="withmargin">>= 0.9.24</div></td> - <td><div class="withmargin"><a href="http://winni.vdr-developer.org/epgsearch/index.html#download">http://winni.vdr-developer.org/epgsearch/index.html#download</a></div></td> - </tr> - <tr> - <td><div class="withmargin">streamdev</div></td> - <td><div class="withmargin">0.3.3</div></td> - <td><div class="withmargin">>= 0.3.4</div></td> - <td><div class="withmargin"><a href="http://streamdev.vdr-developer.org/">http://streamdev.vdr-developer.org</a></div></td> - </tr> + <td colspan="4"><div class="withmargin">Used VDR Plugins:</div></td> + </tr> + <?php + foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) { + SWConfTableRow($sc); + } + ?> </table> - </div> - - Tntnet stellt grundlegende Webserver-Funktionen für LIVE zur - Verfügung. Cxxtools wird von Tntnet benötigt.<br /> Boost - stellt TR1 C++-Erweiterungen bereit und wird nur von GCC - < 4.1 benötigt. + </div> + <p> + Tntnet provides the basic web server function for LIVE. + Cxxtools is needed for Tntnet.<br />*) Boost provides the + TR1 C++ extensions. These are only needed when compiled with + GCC < 4.1. Later GCC versions provide the TR1 extensions + natively. + </p> diff --git a/doc/web/homepage/en/news.php b/doc/web/homepage/en/news.php index 1ba5caa..879c549 100644 --- a/doc/web/homepage/en/news.php +++ b/doc/web/homepage/en/news.php @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head> - <title>VDR Live - Neuerungen</title> + <title>VDR Live - News</title> <?php include ("../html-header.inc") ?> </head> <body> @@ -19,14 +19,14 @@ <div class="inhalt"> <div style="width: 800px; margin-top: 15px"> - <div class="boxheader"><div><div>Features von LIVE 0.2.0</div></div></div> + <div class="boxheader"><div><div>Features of LIVE 0.2.0</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <?php include ("features_0-2-0.inc"); ?> </div> </div> <div style="width: 800px; margin-top: 15px"> - <div class="boxheader"><div><div>Features von LIVE 0.1.0</div></div></div> + <div class="boxheader"><div><div>Features of LIVE 0.1.0</div></div></div> <div style="border: 1px solid black; padding: 0px 10px"> <?php include ("features_0-1-0.inc"); ?> </div> diff --git a/doc/web/homepage/en/screenshots.php b/doc/web/homepage/en/screenshots.php index 4ba3e62..4eb8693 100644 --- a/doc/web/homepage/en/screenshots.php +++ b/doc/web/homepage/en/screenshots.php @@ -25,7 +25,7 @@ echo "Screenshot: " . $screenshots->ImageDescr($_GET["img"], "Unbekanntes Bild"); } else { - echo "Screenshots: Übersicht"; + echo "Screenshots: Overview"; } ?> </div></div></div> diff --git a/doc/web/homepage/html-header.inc b/doc/web/homepage/html-header.inc index 43c7110..583a7b2 100644 --- a/doc/web/homepage/html-header.inc +++ b/doc/web/homepage/html-header.inc @@ -24,5 +24,8 @@ table.listing a { color: blue; } +div.inhalt p { + padding-left: 1em; +} --> </style> diff --git a/doc/web/homepage/live-sw-configs.php b/doc/web/homepage/live-sw-configs.php new file mode 100644 index 0000000..786a469 --- /dev/null +++ b/doc/web/homepage/live-sw-configs.php @@ -0,0 +1,50 @@ +<?php +$LiveSWConfigs = array( +/* + * devel currently same as '0.2.0'. See below! + 'devel' => new LiveSWConfig( + array(), + array(), + array() + ), +*/ + '0.2.0' => new LiveSWConfig( + array( + new SoftwareComponent('VDR', '1.4.0', '>= 1.4.7', 'http://www.cadsoft.de/vdr/download.htm'), + new SoftwareComponent('Tntnet', '1.5.3', '>= 1.6.1', 'http://www.tntnet.org/download.html'), + new SoftwareComponent('Cxxtools', '1.4.3', '>= 1.4.7', 'http://www.tntnet.org/download.html') + ), + array( + new SoftwareComponent('boost', '1.32.0', 'GCC < 4.1<sup><small>*</small></sup>', 'http://www.boost.org') + ), + array( + new SoftwareComponent('epgsearch', '0.9.22', '>= 0.9.24', 'http://winni.vdr-developer.org/epgsearch/index.html#download'), + new SoftwareComponent('streamdev', '0.3.3', '>= 0.3.4', 'http://streamdev.vdr-developer.org/') + ) + ), + '0.1.0' => new LiveSWConfig( + array( + new SoftwareComponent('VDR', '1.4.0', '<= 1.5.7', 'http://www.cadsoft.de/vdr/download.htm'), + new SoftwareComponent('Tntnet', '1.5.3', '>= 1.5.3', 'http://www.tntnet.org/download.html'), + new SoftwareComponent('Cxxtools', '1.4.3', '>= 1.4.3', 'http://www.tntnet.org/download.html'), + new SoftwareComponent('boost<sup><small>*</small></sup>', '1.32.0', '', 'http://www.boost.org') + ), + array(), + array( + new SoftwareComponent('epgsearch', '0.9.22', '>= 0.9.22', 'http://winni.vdr-developer.org/epgsearch/index.html#download') + ) + ) + ); + +$LiveSWConfigs['devel'] = $LiveSWConfigs['0.2.0']; + +function SWConfTableRow($sc) +{ + echo "<tr>\n"; + echo " <td><div class=\"withmargin\">" . $sc->Name() . "</div></td>\n"; + echo " <td><div class=\"withmargin\">" . $sc->MinVersion() . "</div></td>\n"; + echo " <td><div class=\"withmargin\">" . $sc->RecommendedVersion() . "</div></td>\n"; + echo " <td><div class=\"withmargin\"><a href=\"" . $sc->Homepage() . "\">" . $sc->Homepage() . "</a></div></td>\n"; + echo "</tr>\n"; +} +?> diff --git a/doc/web/homepage/page-php-classes.inc b/doc/web/homepage/page-php-classes.inc index 17d03ab..fc6b2f7 100644 --- a/doc/web/homepage/page-php-classes.inc +++ b/doc/web/homepage/page-php-classes.inc @@ -1,13 +1,17 @@ <?php +/** + * class Status: + * Contains the localized current status of the LIVE plugin. + */ class Status { - var $title; - var $vers_string; - var $vers_number; - var $datefmt; - var $language; + public $title; + public $vers_string; + public $vers_number; + public $datefmt; + public $language; - function Status($title, $vname, $vnum, $datefmt, $lang) + public function __construct($title, $vname, $vnum, $datefmt, $lang) { $this->title = $title; $this->vers_string = $vname; @@ -17,53 +21,61 @@ class Status } } - +/** + * class Menu: + * holds the localized names and the urls to the pages of the main + * menu. + */ class Menu { - var $urls; + public $urls; - function Menu($entries) + public function __construct($entries) { $this->urls = $entries; } } - +/** + * class Screenshots: + * Contains the localized 'basic' names of the screenshot images and a + * description of the single images. + */ class Screenshots { - var $images; + private $images; - function Screenshots($imgNames) + public function __construct($imgNames) { $this->images = $imgNames; } - function RandomImg() + public function RandomImg() { $idx = array_rand($this->images); $this->MakeAnchor($idx); } - function AllImg() + public function AllImg() { foreach($this->images as $idx => $descr) { $this->MakeAnchor($idx); } } - function MakeAnchor($img) + private function MakeAnchor($img) { echo "<a href=\"screenshots.php?img=$img\"><img src=\"img/${img}_thumb.jpg\" alt=\"$img\"/></a>\n"; } - function FullImage($img) + public function FullImage($img) { $img = basename($img); echo "<a href=\"screenshots.php\"><img src=\"img/${img}.jpg\" alt=\"img/${img}.jpg\"/ style=\"width: 810px\"></a>\n"; } - function ImageDescr($img, $error) + public function ImageDescr($img, $error) { $img = basename($img); if (isset($this->images[$img])) @@ -72,4 +84,75 @@ class Screenshots return $error; } } + +/** + * class SoftwareComponnent: + * Describes one software component which has some kind of relation + * with the LIVE plugin. + */ +class SoftwareComponent +{ + private $name; + private $minVers; + private $recVers; + private $homepage; + + public function __construct($n, $m, $r, $h) + { + $this->name = $n; + $this->minVers = $m; + $this->recVers = $r; + $this->homepage = $h; + } + + public function Name() + { + return $this->name; + } + + public function MinVersion() + { + return $this->minVers; + } + + public function RecommendedVersion() + { + return $this->recVers; + } + + public function Homepage() + { + return $this->homepage; + } +} + +class LiveSWConfig +{ + private $required; + private $optional; + private $plugins; + + public function __construct(array $r, array $o, array $p) + { + $this->required = $r; + $this->optional = $o; + $this->plugins = $p; + } + + public function Required() + { + return $this->required; + } + + public function Optional() + { + return $this->optional; + } + + public function Plugins() + { + return $this->plugins; + } +} + ?> |