From 850fe0ddff35d86a0a3c876ee518ecfb778767d5 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Thu, 18 Jan 2007 00:11:42 +0000 Subject: - Changed default tooltip style class to domTThint - Added tooltip style class domTTepg for epg infos like in recordings - Added new pageelement.epg_tt_box to create epg box tooltips. Used at moment in recordings. Planned also for whats_on and schedule. - Changed structure of event box in whats_on to same structure like epg box. This makes the styling comparable between the two boxes. - added bg_tools.png to with a vertical fadeing border to resemble the fading bottom of more line oriented pages. --- pages/pageelems.ecpp | 31 +++++++++++++++++++++++++++++++ pages/recordings.ecpp | 28 +++++++++------------------- pages/tooltip.ecpp | 4 ++-- pages/whats_on.ecpp | 18 ++++++++++-------- 4 files changed, 52 insertions(+), 29 deletions(-) (limited to 'pages') diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 79d5d51..869f362 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -6,6 +6,7 @@ using namespace std; + <%def doc_type> @@ -59,3 +60,33 @@ component; <$ alt $> + +<%def epg_tt_box> +<%args> + string boxId; + string caption; + string tools_comp; + string time; + string title; + string short_descr; + string long_descr; + +
+
+
<$ (caption) $><& tooltip.close domId=(boxId) &>
+
+
+
+ <& (tools_comp) &> +
+
+
<$ (time) $>
+
<$ (title) $>
+
<$ (short_descr) $>
+
+ <$ (long_descr) $> +
+
+
+
+ diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 6139d1f..c9427c8 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -12,6 +12,7 @@ using namespace vdrlive; <%request scope="page"> RecordingsTree recordingsTree(LiveRecordingsManager()); +RecordingsTree::RecordingsItemPtr currRecItem; <%include>page_init.eh <%cpp> @@ -23,7 +24,7 @@ RecordingsTree recordingsTree(LiveRecordingsManager()); VDR-Live - <$ pageTitle $> - <& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTrecordings") &> + <& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> @@ -97,6 +98,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { std::string folderimg("folder_closed.png"); std::string collapseimg("plus.png"); if (!recItem->IsDir()) { + currRecItem = recItem; std::string day(FormatDateTime("%a,", recItem->StartTime())); std::string dayLen(lexical_cast(day.length() - 1) + ".25em;"); reply.out() << std::string("\t\t\t") @@ -149,6 +151,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { callComp("recordings.recordings_data", request, reply, recItemParams); } else { + currRecItem = recItem; const cRecordingInfo* info = recItem->RecInfo(); if (info) { std::string start(FormatDateTime("%a,", recItem->StartTime()) + std::string(" ") @@ -158,27 +161,14 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { std::string shortDescr; if (info->ShortText()) shortDescr = info->ShortText(); std::string longDescr; if (info->Description()) longDescr = info->Description(); }> -
-
-
<$ recItem->Name() $><& tooltip.close domId=(recItem->Id()) &>
-
-
-
- <& pageelems.play_recording recordingid=(recItem->Id()) image="play.png" alt="" &> -
-
-
<$ (start) $>
-
<$ (title) $>
-
<$ (shortDescr) $>
-
- <$ (longDescr) $> -
-
-
-
+ <& pageelems.epg_tt_box boxId=(recItem->Id()) caption=(recItem->Name()) tools_comp=("recordings.rec_tools") time=(start) title=(title) short_descr=(shortDescr) long_descr=(longDescr) &> <{ } } } }> + +<%def rec_tools> +<& pageelems.play_recording recordingid=(currRecItem->Id()) image="play.png" alt="" &> + diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp index 1c012f3..edde0ec 100644 --- a/pages/tooltip.ecpp +++ b/pages/tooltip.ecpp @@ -1,6 +1,6 @@ <%def javascript> <%args> -styleClass="domTTOverlib"; +styleClass="domTThint"; var[]; value[]; @@ -12,7 +12,7 @@ value[]; % for (var_type::const_iterator it = var.begin(); it != var.end(); ++it, idx++) { var <$ *it $> = "<$ (value[idx]) $>"; % } - domTT_addPredefined('tipHint', 'trail', true, 'delay', 0, 'styleClass', 'domTTOverlib'); + domTT_addPredefined('tipHint', 'trail', true, 'delay', 0, 'styleClass', 'domTThint'); domTT_addPredefined('tipInfo', 'trail', true, 'delay', 0); domTT_addPredefined('tipDisp', 'trail', false, 'delay', 0, 'type', 'sticky', 'caption', false, 'offsetX', -30, 'offsetY', -30, 'draggable', true); diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 50fb460..ffde366 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -68,16 +68,18 @@ if (type == "now") {
<$ channel_name $>
-
- <& pageelems.event_timer channelid=(channel_id) eventid=(event) &> -
-
<$ start $> - <$ end $>
-
<$ title $>
-
<$ short_description $>
-
- <$ description $> +
+ <& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
+
+
<$ start $> - <$ end $>
+
<$ title $>
+
<$ short_description $>
+
+ <$ description $> +
+
-- cgit v1.2.3