summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-06-22 21:38:45 +0000
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-06-22 21:38:45 +0000
commitd9e1b706df7ebcb0fa7e7e716291f9c88aad6a24 (patch)
treecc8464e145ca39021d2dbc81bb8d5969b47ed947 /pages
parent14141f08e8ae6fddb8215de51ce56972dfbb6ff4 (diff)
downloadvdr-plugin-live-d9e1b706df7ebcb0fa7e7e716291f9c88aad6a24.tar.gz
vdr-plugin-live-d9e1b706df7ebcb0fa7e7e716291f9c88aad6a24.tar.bz2
- Introducing Mootools as base javascript library.
- ported Infobox javascript code to this library. - LiveSimpleAjaxRequest uses Ajax-Object from mootools. - Start of distribution of javascript in source form (not compiled into the live binary).
Diffstat (limited to 'pages')
-rw-r--r--pages/edit_searchtimer.ecpp2
-rw-r--r--pages/edit_timer.ecpp2
-rw-r--r--pages/pageelems.ecpp24
-rw-r--r--pages/recordings.ecpp2
-rw-r--r--pages/remote.ecpp2
-rw-r--r--pages/schedule.ecpp2
-rw-r--r--pages/searchepg.ecpp2
-rw-r--r--pages/searchresults.ecpp2
-rw-r--r--pages/searchtimers.ecpp2
-rw-r--r--pages/setup.ecpp2
-rw-r--r--pages/timers.ecpp2
-rw-r--r--pages/whats_on.ecpp2
12 files changed, 26 insertions, 20 deletions
diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index 5404c1a..c541ede 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -450,7 +450,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
}
//--></script>
</head>
- <body onload="<& pageelems.infobox_start_update &>; initform()">
+ <body onload="initform()">
<& pageelems.logo &>
<& menu active=("searchtimers") &>
<div class="inhalt">
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index 3c071d1..73e2852 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -129,7 +129,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
<& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &>
<& pageelems.ajax_js &>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("timers") &>
<div class="inhalt">
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 26cbf27..cab4a5c 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -57,7 +57,7 @@ int update_status(1);
</div>
<div class="st_controls">
<div class="st_update">
- <a href="javascript:LiveStatusToggleUpdate()" <& tooltip.hint text=(tr("Toggle updates on/off.")) &>><img id="statusReloadBtn" src="<$ LiveSetup().GetThemedLink("img", "stop_update.png") $>" alt="" /></a>
+ <a href="javascript:InfoBox.toggleUpdate()" <& 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")) &>
@@ -84,12 +84,6 @@ int update_status(1);
<# ---------------------------------------------------------------------- #>
-<%def infobox_start_update>
-<%cpp> if (LiveSetup().GetShowInfoBox()) { </%cpp>LiveStatusRequest('ibox.xml', 'infobox', <%cpp> if (update_status) { reply.sout() << "true"; } else { reply.sout() << "false"; } </%cpp>)<%cpp> } </%cpp>
-</%def>
-
-<# ---------------------------------------------------------------------- #>
-
<%def hide_element>
<%args>
bool hide = true;
@@ -129,8 +123,20 @@ int update_status(1);
<# ---------------------------------------------------------------------- #>
<%def ajax_js>
- <script type="text/javascript" src="ajax.js"></script>
- <%cpp>if (LiveSetup().GetShowInfoBox()) { </%cpp><script type="text/javascript" src="vdr_status.js"></script><%cpp> } </%cpp>
+ <script type="text/javascript" src="js/mootools/mootools.v1.11.js"></script>
+ <script type="text/javascript" src="js/live/liveajax.js"></script>
+<%cpp>if (LiveSetup().GetShowInfoBox()) { </%cpp>
+ <script type="text/javascript" src="js/live/vdr_status.js"></script>
+ <script type="text/javascript"><!--
+ var InfoBox = new LiveVdrInfo('ibox.xml', 'infobox');
+ window.addEvent('domready', function(){
+ InfoBox.request(<%cpp> if (update_status) { reply.sout() << "true"; } else { reply.sout() << "false"; } </%cpp>);
+ });
+ window.addEvent('unload', function(){
+ InfoBox.pageFinished();
+ });
+ --></script>
+<%cpp> } </%cpp>
</%def>
<# ---------------------------------------------------------------------- #>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 21d1f14..2132541 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -37,7 +37,7 @@ EpgEvents epgEvents;
<& pageelems.ajax_js &>
<script type="text/javascript" src="treeview.js"></script>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("recordings") &>
<div class="inhalt">
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index 8bc474e..10eea15 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -78,7 +78,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
//--></script>
% reply.sout().imbue(locale());
</head>
- <body onload="<& pageelems.infobox_start_update &>; StreamInit(); FillIntervals();">
+ <body onload="StreamInit(); FillIntervals();">
<& pageelems.logo &>
<& menu active="remote" component=("remote.remote_actions")>
<div class="inhalt">
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index e27ef4b..39942bb 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -62,7 +62,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
<& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &>
<& pageelems.ajax_js &>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("schedule") component=("schedule.channel_selection")>
<div class="inhalt">
diff --git a/pages/searchepg.ecpp b/pages/searchepg.ecpp
index 846d1f6..9ed1387 100644
--- a/pages/searchepg.ecpp
+++ b/pages/searchepg.ecpp
@@ -248,7 +248,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
}
//--></script>
</head>
- <body onload="<& pageelems.infobox_start_update &>; initform()">
+ <body onload="initform()">
<& pageelems.logo &>
<& menu active=("searchepg") &>
<div class="inhalt">
diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp
index 74a424e..e2b83a2 100644
--- a/pages/searchresults.ecpp
+++ b/pages/searchresults.ecpp
@@ -50,7 +50,7 @@ bool logged_in(false);
<& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &>
<& pageelems.ajax_js &>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("searchepg") &>
<div class="inhalt">
diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp
index 5594293..4cb4a1b 100644
--- a/pages/searchtimers.ecpp
+++ b/pages/searchtimers.ecpp
@@ -41,7 +41,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
<& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &>
<& pageelems.ajax_js &>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("searchtimers") component=("searchtimers.searchtimer_actions")>
<div class="inhalt">
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 46ccf66..1d832f6 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -94,7 +94,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
}
//--></script>
</head>
- <body onload="<& pageelems.infobox_start_update &>; initform()">
+ <body onload="initform()">
<& pageelems.logo &>
<& menu active=("setup") &>
<div class="inhalt">
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index bba08cd..292f26f 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -50,7 +50,7 @@ using namespace vdrlive;
<& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &>
<& pageelems.ajax_js &>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("timers") component=("timers.timer_actions")>
<div class="inhalt">
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 1b3a012..8f052ce 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -94,7 +94,7 @@ if (type == "now") {
}
//--></script>
</head>
- <body onload="<& pageelems.infobox_start_update &>">
+ <body>
<& pageelems.logo &>
<& menu active=("whats_on") component=("whats_on.whats_on_actions")>
<div class="inhalt">