summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--css/styles.css139
-rw-r--r--images/Makefile2
-rw-r--r--images/bg_tools.pngbin0 -> 151 bytes
-rw-r--r--pages/pageelems.ecpp31
-rw-r--r--pages/recordings.ecpp28
-rw-r--r--pages/tooltip.ecpp4
-rw-r--r--pages/whats_on.ecpp18
7 files changed, 120 insertions, 102 deletions
diff --git a/css/styles.css b/css/styles.css
index 571effe..d4f04a1 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -32,25 +32,69 @@ img {
}
/* ######################
- # Overlib Style for Tooltips
+ # Tooltip style for hints
######################
*/
-div.domTTOverlib {
+div.domTThint {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
border: 1px solid #EBC94C;
background-color: #F4FFC3;
}
-div.domTTOverlib .caption {
+div.domTThint .caption {
font-weight: bold;
}
-div.domTTOverlib .contents {
+div.domTThint .contents {
padding: 2px;
}
+/* ##############################
+ # Tooltip style for epg infos
+ ##############################
+*/
+
+div.domTTepg {
+ width: 66%;
+ border: none;
+}
+
+.domTTepg div.epg_description {
+}
+
+.domTTepg div.epg_content {
+ padding: 0;
+ margin: 0;
+
+ border-left: 1px solid #000000;
+ border-right: 1px solid #000000;
+ border-bottom: 1px solid #000000;
+ background: white url(bg_tools.png) top left repeat-y;
+}
+
+.domTTepg div.epg_content div.epg_tools {
+ float: left;
+ width: 26px;
+ margin: 0;
+ padding: 0;
+
+ text-align: center;
+ vertical-align: top;
+}
+
+.domTTepg div.epg_content div div {
+ margin-left: 40px;
+}
+
+.domTTepg div.epg_content div.epg_tools img {
+ margin-top: 5px;
+}
+
+.domTTepg div.boxheader div div a {
+}
+
/* #######################
# Menue
@@ -159,13 +203,14 @@ div.event {
width: 255px;
height: 255px;
padding: 0;
+ margin-right: 5px;
float: left;
}
div.event div.station {
margin: 0;
padding: 0;
- width: 250px;
+ width: 255px;
}
div.station div {
@@ -191,39 +236,38 @@ div.station div div div {
font-weight: bold;
}
-
-
-div.tools {
- float: left;
- width: 26px;
+div.content {
+ width: 253px;
height: 220px;
- margin: 0;
padding: 0;
+ margin: 0;
- background: #E9EFFF;
- text-align: center;
- vertical-align: top;
+ background: white url(bg_tools.png) top left repeat-y;
border-left: 1px solid #000000;
+ border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
- border-right: 1px solid #C0C1DA;
}
-div.content {
- width: 224px;
+div.content div.tools {
+ float: left;
+ width: 26px;
height: 220px;
- padding: 0;
margin: 0;
- margin-left: 25px;
+ padding: 0;
- border-right: 1px solid #000000;
- border-bottom: 1px solid #000000;
+ text-align: center;
+ vertical-align: top;
}
-div.tools img {
+div.content div.tools img {
margin: 5px 2px;
border: 0px;
}
+div.content div {
+ padding-left: 15px;
+}
+
div.description {
margin: 5px;
}
@@ -243,11 +287,6 @@ div.short {
margin: 5px;
}
-div.hint {
- font-style: italic;
- margin: 0px 5px 5px 5px;
-}
-
/* #############
# Timers
#############
@@ -313,7 +352,7 @@ table.schedule tr.active {
/*
##############################
- # Blue Baground Thingy
+ # Blue Background Thingy
##############################
*/
@@ -392,50 +431,6 @@ div.recording_item {
padding-right: 3em;
}
-/* ##############################
- # Recording style for tooltips
- ##############################
-*/
-
-div.domTTrecordings {
- width: 66%;
- border: none;
-}
-
-.domTTrecordings div.re_description {
-}
-
-.domTTrecordings div.re_content {
- padding: 0;
- margin: 0;
-
- border-right: 1px solid #000000;
- border-bottom: 1px solid #000000;
- background: white;
-}
-
-.domTTrecordings div.re_content div.re_tools {
- float: left;
- width: 26px;
- margin: 0;
- padding: 0;
-
- text-align: center;
- vertical-align: top;
- border-right: 1px solid #C0C1DA;
-}
-
-.domTTrecordings div.re_content div div {
- margin-left: 50px;
-}
-
-.domTTrecordings div.re_content div.re_tools a img {
- margin-top: 5px;
-}
-
-.domTTrecordings div.boxheader div div a {
-}
-
/*
##############################
# Remote Control Keypad
diff --git a/images/Makefile b/images/Makefile
index 2202542..4375504 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -19,7 +19,7 @@ OBJS = logo.o record.o active.o inactive.o button_blue.o \
transparent.o edit.o del.o play.o close.o \
bg_header_h.o bg_header_l.o bg_header_r.o \
bg_box_h.o bg_box_l.o bg_box_r.o \
- movie.o menu_line_bg.o bg_line.o
+ movie.o menu_line_bg.o bg_line.o bg_tools.o
### Default rules:
diff --git a/images/bg_tools.png b/images/bg_tools.png
new file mode 100644
index 0000000..48c8f64
--- /dev/null
+++ b/images/bg_tools.png
Binary files differ
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;
</%pre>
+
<%def doc_type>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
</%def>
@@ -59,3 +60,33 @@ component;
</%args>
<a href="javascript:LiveSimpleAjaxRequest('play_recording.xml', 'recording', '<$ recordingid $>');"><img src="<$ image $>" alt="<$ alt $>" /></a>
</%def>
+
+<%def epg_tt_box>
+<%args>
+ string boxId;
+ string caption;
+ string tools_comp;
+ string time;
+ string title;
+ string short_descr;
+ string long_descr;
+</%args>
+ <div class="epg_description" id="<$ (boxId) $>">
+ <div class="station">
+ <div class="boxheader"><div><div><$ (caption) $><& tooltip.close domId=(boxId) &></div></div></div>
+ </div>
+ <div class="epg_content">
+ <div class="epg_tools">
+ <& (tools_comp) &>
+ </div>
+ <div>
+ <div class="info"><$ (time) $></div>
+ <div class="title"><$ (title) $></div>
+ <div class="short"><$ (short_descr) $></div>
+ <div class="description">
+ <$ (long_descr) $>
+ </div>
+ </div>
+ </div>
+ </div>
+</%def>
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;
</%args>
<%request scope="page">
RecordingsTree recordingsTree(LiveRecordingsManager());
+RecordingsTree::RecordingsItemPtr currRecItem;
</%request>
<%include>page_init.eh</%include>
<%cpp>
@@ -23,7 +24,7 @@ RecordingsTree recordingsTree(LiveRecordingsManager());
<title>VDR-Live - <$ pageTitle $></title>
<link rel="stylesheet" type="text/css" href="styles.css" />
<script type="text/javascript" language="javascript" src="treeview.js"></script>
- <& 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 &>
</head>
<body>
@@ -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<std::string, int>(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();
}>
- <div class="re_description" id="<$ (recItem->Id()) $>">
- <div class="station">
- <div class="boxheader"><div><div><$ recItem->Name() $><& tooltip.close domId=(recItem->Id()) &></div></div></div>
- </div>
- <div class="re_content">
- <div class="re_tools">
- <& pageelems.play_recording recordingid=(recItem->Id()) image="play.png" alt="" &>
- </div>
- <div>
- <div class="info"><$ (start) $></div>
- <div class="title"><$ (title) $></div>
- <div class="short"><$ (shortDescr) $></div>
- <div class="description">
- <$ (longDescr) $>
- </div>
- </div>
- </div>
- </div>
+ <& 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>
+
+<%def rec_tools>
+<& pageelems.play_recording recordingid=(currRecItem->Id()) image="play.png" alt="" &>
+</%def>
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[];
</%args>
@@ -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);
</script>
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") {
<div class="station">
<div><div><div><$ channel_name $></div></div></div>
</div>
- <div class="tools">
- <& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
- </div>
<div class="content">
- <div class="info"><$ start $> - <$ end $></div>
- <div class="title"><$ title $></div>
- <div class="short"><$ short_description $></div>
- <div class="description">
- <$ description $>
+ <div class="tools">
+ <& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
</div>
+ <div>
+ <div class="info"><$ start $> - <$ end $></div>
+ <div class="title"><$ title $></div>
+ <div class="short"><$ short_description $></div>
+ <div class="description">
+ <$ description $>
+ </div>
+ </div>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 04:11:50 +0000