summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-06-13 22:11:44 +0000
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-06-13 22:11:44 +0000
commitad1ba059f537239c7c9585dec4b813384adafe21 (patch)
treee56d498ccb532863437f70d2e19b4e04b576315b
parent21dce4ff58c6e1da3691a874ca03cf77c696cda4 (diff)
downloadvdr-plugin-live-ad1ba059f537239c7c9585dec4b813384adafe21.tar.gz
vdr-plugin-live-ad1ba059f537239c7c9585dec4b813384adafe21.tar.bz2
- show 'user friendly' error message in infobox. Fixes #315
- Tooltip text now independant of update state. Fixes #328
-rw-r--r--doc/ChangeLog10
-rw-r--r--i18n.cpp33
-rw-r--r--javascript/vdr_status.js6
-rw-r--r--pages/pageelems.ecpp6
4 files changed, 45 insertions, 10 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 13bb80a..2b2da73 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,8 +1,14 @@
+2007-06-14 Dieter Hametner <dh+vdr at gekrumbel dot de>
+
+ * infobox: show 'user friendly' error message when something went
+ wrong while updating the status box.
+ Fixed tooltip message for toggle update on/off of status box.
+
2007-06-13 Dieter Hametner <dh+vdr at gekrumbel dot de>
* pages/schedule.ecpp: If no channel is given, and a current
- channel is know to vdr select it when calling the schedule page
- in live.
+ channel is known to vdr, select it when calling the schedule
+ page in live.
2007-06-12 Dieter Hametner <dh+vdr at gekrumbel dot de>
diff --git a/i18n.cpp b/i18n.cpp
index 16eb668..8850362 100644
--- a/i18n.cpp
+++ b/i18n.cpp
@@ -178,7 +178,8 @@ const tI18nPhrase Phrases[] = {
"", // Eesti
"", // Dansk
"", // Czech
- }, { "Date", // English
+ },
+ { "Date", // English
"Datum", // Deutsch
"", // Slovenski
"", // Italiano
@@ -1146,7 +1147,7 @@ const tI18nPhrase Phrases[] = {
"", // Dansk
"", // Czech
},
- { "toggle status update.", // English
+ { "Toggle updates on/off.", // English
"Statusabfrage ein- oder ausschalten.", // Deutsch
"", // Slovenski
"", // Italiano
@@ -1256,15 +1257,37 @@ const tI18nPhrase Phrases[] = {
"", // Dansk
"", // Czech
},
- { "Stop updates", // English
- "Updates anhalten", // Deutsch
+ { "No server response!", // English
+ "Der Server antwortet nicht!", // Deutsch
+ "", // Slovenski
+ "", // Italiano
+ "", // Nederlands
+ "", // Português
+ "", // Français
+ "", // Norsk
+ "", // Finnish
+ "", // Polski
+ "", // Español
+ "", // Greek
+ "", // Svenska
+ "", // Românã
+ "", // Magyar
+ "", // Català
+ "", // Russian
+ "", // Hrvatski
+ "", // Eesti
+ "", // Dansk
+ "", // Czech
+ },
+ { "Failed to update infobox!", // English
+ "Kann Infobox nicht aktualisieren!", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Português
"", // Français
"", // Norsk
- "Aseta päivitys päälle/pois",
+ "", // Finnish
"", // Polski
"", // Español
"", // Greek
diff --git a/javascript/vdr_status.js b/javascript/vdr_status.js
index 158bc1a..73a20dd 100644
--- a/javascript/vdr_status.js
+++ b/javascript/vdr_status.js
@@ -136,15 +136,17 @@ function LiveStatusRequest(url, containerid)
LiveStatusShowInfo(this.xml.responseXML, containerid);
}
catch (e) {
- LiveStatusReportError(e.message, containerid);
+ var updateMsg = document.getElementById("__infobox_update_err").firstChild.nodeValue;
+ LiveStatusReportError(updateMsg, containerid);
}
if (vst_reload)
vst_timer = window.setTimeout("LiveStatusRequest('" + url + "', '" + containerid + "')", 1000);
}
status.onerror = function(message)
{
+ var requestMsg = document.getElementById("__infobox_request_err").firstChild.nodeValue;
LiveStatusToggleUpdate();
- LiveStatusReportError(message, containerid);
+ LiveStatusReportError(requestMsg, containerid);
}
status.request("update", vst_reload ? "1" : "0");
}
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 799e332..b6f4f8d 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -54,7 +54,7 @@ using namespace vdrlive;
</div>
<div class="st_controls">
<div class="st_update">
- <a href="javascript:LiveStatusToggleUpdate()" <& tooltip.hint text=(tr("Stop updates")) &>><img id="statusReloadBtn" src="<$ LiveSetup().GetThemedLink("img", "stop_update.png") $>" alt="" /></a>
+ <a href="javascript:LiveStatusToggleUpdate()" <& tooltip.hint text=(tr("Toggle updates on/off.")) &>><img id="statusReloadBtn" src="<$ LiveSetup().GetThemedLink("img", "stop_update.png") $>" alt="" /></a>
</div>
<div id="infobox_recording_buttons" style="display: none">
<& ajax_action_href action=("stop_recording") id=("infobox_stop") image=("stop.png") tip=(tr("stop playback")) &>
@@ -72,6 +72,10 @@ using namespace vdrlive;
</div>
</div>
</div>
+ <div style="display: none;">
+ <span id="__infobox_request_err"><$ tr("No server response!") $></span>
+ <span id="__infobox_update_err"><$ tr("Failed to update infobox!") $></span>
+ </div>
</div>
</%def>