Added switch to this channel in the schedule page submenu.

There the switch channel button is always present, even if the selected
channel has no EPG data associated with it.

24 files changed, 15 insertions, 102 deletions

diff --git a/i18n-generated.h b/i18n-generated.h
index 236f200..175b5ee 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -7081,41 +7081,6 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
-  { "Stream into browser",
-    "Im Browser anzeigen",
-    "",
-    "Trasmetti nel browser",
-    "",
-    "",
-    "Diffusez cette chaîne vers le navigateur.",
-    "",
-    "Suoratoisto selaimeen",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10302
-    "",
-#endif
-#if VDRVERSNUM >= 10307
-    "",
-#endif
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-#if VDRVERSNUM >= 10342
-    "",
-#endif
-#if VDRVERSNUM >= 10502
-    "",
-#endif
-  },
   { "Search settings",
     "Einstellungen zur Suche",
     "",
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 785f37f..e8dd1fb 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -105,9 +105,8 @@ int update_status(1);
 <%def vlc_stream_channel>
 <%args>
 	tChannelID channelId;
-	string linkText;
 </%args>
-<%cpp> if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().Loaded()) { </%cpp><a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "stream_button.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img> <$ linkText $></a><%cpp> } </%cpp>
+<%cpp> if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().Loaded()) { </%cpp><a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "stream_button.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img></a><%cpp> } </%cpp>
 </%def>
 
 
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index f2a0907..1417eee 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -145,5 +145,5 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 <%include>page_exit.eh</%include>
 
 <%def channel_selection>
-<form action="schedule.html" method="get" id="channels"><span><label for="channel"><$ tr("Show schedule of channel") $>: </label><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) linkText=(tr("Stream into browser")) &></span></form>
+<form action="schedule.html" method="get" id="channels"><span><label for="channel"><$ tr("Show schedule of channel") $>: </label><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &><& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &></span></form>
 </%def>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8d0285d..574b8ec 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -624,9 +624,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index c3e0c71..a513e0f 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 507009a..38a0f62 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 1822572..ec3f8be 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -624,9 +624,6 @@ msgstr "%A, %d.%m.%Y"
 msgid "Show schedule of channel"
 msgstr "Zeige Programm dieses Kanals"
 
-msgid "Stream into browser"
-msgstr "Im Browser anzeigen"
-
 msgid "Search settings"
 msgstr "Einstellungen zur Suche"
 
@@ -801,6 +798,9 @@ msgstr "Listenansicht"
 msgid "Live Interactive VDR Environment"
 msgstr ""
 
+#~ msgid "Stream into browser"
+#~ msgstr "Im Browser anzeigen"
+
 #~ msgid "Edit this"
 #~ msgstr "Timer editieren"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 70560b1..d327f0f 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 1330072..8ec2dc9 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 18a64f6..30e8987 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index d4baf3a..5e58344 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -623,9 +623,6 @@ msgstr "%A, %d.%m.%Y"
 msgid "Show schedule of channel"
 msgstr "Näytä kanavan ohjelmisto"
 
-msgid "Stream into browser"
-msgstr "Suoratoisto selaimeen"
-
 msgid "Search settings"
 msgstr "Hakuasetukset"
 
@@ -801,6 +798,9 @@ msgstr "Listanäkymä"
 msgid "Live Interactive VDR Environment"
 msgstr "Interaktiivinen VDR-ympäristö"
 
+#~ msgid "Stream into browser"
+#~ msgstr "Suoratoisto selaimeen"
+
 #~ msgid "Edit this"
 #~ msgstr "Muokkaa ajastinta"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 32b44bf..d2f847d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -630,10 +630,6 @@ msgstr "%A, %d.%m.%Y"
 msgid "Show schedule of channel"
 msgstr "Montrer le programme de la chaîne"
 
-#, fuzzy
-msgid "Stream into browser"
-msgstr "Diffusez cette chaîne vers le navigateur."
-
 msgid "Search settings"
 msgstr "Règlages de recherche"
 
@@ -812,6 +808,10 @@ msgstr "Vue en liste"
 msgid "Live Interactive VDR Environment"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Stream into browser"
+#~ msgstr "Diffusez cette chaîne vers le navigateur."
+
 #~ msgid "Edit this"
 #~ msgstr "Changer cette programmation"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 6d88003..2575207 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index baac67a..d3b7e1e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 6c366f4..173b393 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -626,9 +626,6 @@ msgstr "%A, %b %d %Y"
 msgid "Show schedule of channel"
 msgstr "Mostra scheda programmi canale"
 
-msgid "Stream into browser"
-msgstr "Trasmetti nel browser"
-
 msgid "Search settings"
 msgstr "Impostazioni ricerca"
 
@@ -804,6 +801,9 @@ msgstr "Vedi come elenco"
 msgid "Live Interactive VDR Environment"
 msgstr "Ambiente interattivo LIVE per VDR"
 
+#~ msgid "Stream into browser"
+#~ msgstr "Trasmetti nel browser"
+
 #~ msgid "Edit this"
 #~ msgstr "Modifica timer"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 4945d46..3d21d0b 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -629,9 +629,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 21b5b54..b3fcef2 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 43d45e8..92e4d21 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 156ee63..3b856da 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 67ee58b..5a5ec53 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 40c2767..8394a2c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -622,9 +622,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 674ab4e..c6b205d 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 2a46666..bda087d 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 6da86a6..9596298 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -623,9 +623,6 @@ msgstr ""
 msgid "Show schedule of channel"
 msgstr ""
 
-msgid "Stream into browser"
-msgstr ""
-
 msgid "Search settings"
 msgstr ""