VDR-Live - <$ pageTitle $>

From b405e4e3d31ceda6fa3de366d8c5374a160e1266 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Wed, 10 Jan 2007 21:34:39 +0000 Subject: - additional buttons in recordings at the right - Adjusted styles for recordings - recodings folders are now on top of one group - changed some images and added play.png --- css/styles.css | 16 ++++++++++------ images/Makefile | 2 +- images/del.png | Bin 756 -> 832 bytes images/edit.png | Bin 622 -> 392 bytes images/play.png | Bin 0 -> 695 bytes pages/recordings.ecpp | 35 ++++++++++++++++++++++++++--------- pages/whats_on.ecpp | 2 +- 7 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 images/play.png diff --git a/css/styles.css b/css/styles.css index 74208f1..fa2b215 100644 --- a/css/styles.css +++ b/css/styles.css @@ -308,17 +308,17 @@ div.recordings { .recordings ul { list-style-type: none; - padding: 0px; - margin: 0px; + padding: 0px; + margin: 0px; } div.recording_item { overflow: hidden; - border: 0px dotted green; + border: 0px dotted green; } .recording_item div { - float: left; + float: left; } .recording_item div.recording_imgs{ @@ -326,11 +326,10 @@ div.recording_item { } .recording_item div.recording_day { - width: 2.25em; } .recording_item div.recording_date { - width: 5.25em; + width: 5.25em; } .recording_item div.recording_time { @@ -341,6 +340,11 @@ div.recording_item { font-weight: bold; } +.recording_item div.recording_actions { + float: right; + margin-left: 3em; +} + /* ############################## # Remote Control Keypad diff --git a/images/Makefile b/images/Makefile index 86c0316..a8ef343 100644 --- a/images/Makefile +++ b/images/Makefile @@ -16,7 +16,7 @@ VDRDIR ?= ../../../.. OBJS = logo.o record.o active.o inactive.o button_blue.o \ file.o folder_closed.o folder_open.o plus.o minus.o \ - transparent.o edit.o del.o \ + transparent.o edit.o del.o play.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 diff --git a/images/del.png b/images/del.png index cdb5fd3..88a48fd 100644 Binary files a/images/del.png and b/images/del.png differ diff --git a/images/edit.png b/images/edit.png index d21d86f..078f5e2 100644 Binary files a/images/edit.png and b/images/edit.png differ diff --git a/images/play.png b/images/play.png new file mode 100644 index 0000000..2934d8c Binary files /dev/null and b/images/play.png differ diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 240df28..8841bcf 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -22,7 +22,12 @@ RecordingsTree recordingsTree; VDR-Live - <$ pageTitle $> - + +

@@ -63,18 +68,18 @@ else { } // if (level > 0) RecordingsTree::Map::iterator iter; RecordingsTree::Map::iterator end = recordingsTree.end(path); +}> +

+<{ for (iter = recordingsTree.begin(path); iter != end; iter++) { RecordingsTree::RecordingsItemPtr recItem = iter->second; std::string folderimg("folder_closed.png"); std::string collapseimg("plus.png"); -}> -

-<{ if (recItem->IsDir()) { reply.out() << std::string("\t\t\t") + std::string("

\n") + std::string("\t\t\t

") - + StringRepeat(level, " $\"\"$ ") + + StringRepeat(level, " $\"\"$ ") + std::string(" $\"\"$ ") + std::string(" $\"\"$ ") + std::string("

"); @@ -90,20 +95,32 @@ for (iter = recordingsTree.begin(path); iter != end; iter++) { recItemParams.add("path", recItem->Name()); recItemParams.add("level", lexical_cast(level + 1)); callComp("recordings.recordings_item", request, reply, recItemParams); - } else { + } +} +for (iter = recordingsTree.begin(path); iter != end; iter++) { + RecordingsTree::RecordingsItemPtr recItem = iter->second; + std::string folderimg("folder_closed.png"); + std::string collapseimg("plus.png"); + if (!recItem->IsDir()) { + std::string day(FormatDateTime("%a,", recItem->StartTime())); + std::string dayLen(lexical_cast(day.length() - 1) + ".25em;"); reply.out() << std::string("\t\t\t") + std::string("

\n") + std::string("\t\t\t

") - + StringRepeat(level, " $\"\"$ ") + + StringRepeat(level, " $\"\"$ ") + std::string(" $\"\"$ ") + std::string(" $\"movie\"$ ") + std::string("

"); }> -

<$ FormatDateTime("%a,", recItem->StartTime()) $>

+

<$ day $>

<$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $>

<$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $>

<$ recItem->Name() $>

-

+

+

+

+

+

% }

diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 25586a4..b4dc791 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -78,7 +78,7 @@ if (type == "now") {

<$ channel_name $>

-

border="0" /> +

/>

<$ start $> - <$ end $>

-- cgit v1.2.3