From 8f9342e733730ac36f296140367e7b6b21d941c6 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sat, 6 Jan 2007 02:24:11 +0000
Subject: added recordings_items.ecpp; Updated html structure for recordings
---
pages/Makefile | 3 ++-
pages/recordings.ecpp | 36 +++++-------------------------------
pages/recordings_item.ecpp | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 32 deletions(-)
create mode 100644 pages/recordings_item.ecpp
(limited to 'pages')
diff --git a/pages/Makefile b/pages/Makefile
index 246a6c5..5c96adc 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -17,7 +17,8 @@ VDRDIR ?= ../../../..
OBJS = menu.o event_widget.o channels.o recordings.o schedule.o \
screenshot.o timers.o whats_on_now.o whats_on_next.o \
- keypress.o remote.o channels_widget.o edit_timer.o
+ keypress.o remote.o channels_widget.o edit_timer.o \
+ recordings_item.o
### Default rules:
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index ea5c02b..6a3a8cf 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -11,8 +11,6 @@ using namespace vdrlive;
<%args>
</%args>
<{
-
-
}>
<html>
<head>
@@ -22,7 +20,7 @@ using namespace vdrlive;
<body>
<div class="left_area">
<img src="logo.png" alt="VDR Live!" border="0" />
-<& menu >
+<& menu &>
</div>
<div class="inhalt">
<div class="head_box">
@@ -36,38 +34,14 @@ using namespace vdrlive;
<td class="head"><$ tr("Structure") $></td>
<td class="head"><$ tr("Date") $></td>
<td class="head"><$ tr("Time") $></td>
- <td class="head"><$ tr("Levels") $></td>
<td class="head"><$ tr("Name") $></td>
</tr>
+ </table>
% RecordingsTree recordingsTree;
<div class="recordings">
- <ul>
-<{
- bool active = false;
- RecordingsTree::Map::iterator iter;
- for (iter = recordingsTree.begin(); iter != recordingsTree.end(); iter++) {
- RecordingsTree::RecordingsItemPtr recItem = iter->second;
- active = !active;
-}>
- <table class="recording" cellspacing="0" cellpadding="0">
- <tr class="<? active ? "active" ?>">
- <td> </td>
-% if (recItem->IsDir()) {
- <td><$ recItem->StartTime() $></td>
- <td><$ recItem->StartTime() $></td>
-% } else {
- <td> </td>
- <td><$ FormatDateTime(tr("%a, %b %d"), recItem->StartTime()) $></td>
- <td><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></td>
-% }
- <td><$ recItem->Name() $></td>
- </tr>
- </table>
-<{
- }
- }
-}>
- </table>
+<& recordings_item &>
+ </div>
+% }
</div>
</body>
</html>
diff --git a/pages/recordings_item.ecpp b/pages/recordings_item.ecpp
new file mode 100644
index 0000000..bb96d53
--- /dev/null
+++ b/pages/recordings_item.ecpp
@@ -0,0 +1,34 @@
+<%pre>
+#include "recordings.h"
+#include "tools.h"
+
+using namespace vdrlive;
+
+</%pre>
+<%args>
+</%args>
+<ul class="recordingslist">
+<{
+RecordingsTree& recordingsTree = LiveRecordingsTree();
+bool active = false;
+RecordingsTree::Map::iterator iter;
+for (iter = recordingsTree.begin(); iter != recordingsTree.end(); iter++) {
+ RecordingsTree::RecordingsItemPtr recItem = iter->second;
+ active = !active;
+}>
+ <li class="recording <? active ? "active" ?>">
+% if (recItem->IsDir()) {
+ <span class="recordingexpand"></span>
+ <span class="recordingdate"><$ recItem->StartTime() $></span>
+ <span class="recordingtime"><$ recItem->StartTime() $></span>
+% } else {
+ <span class="recordingexpand">FileIcon</span>
+ <span class="recordingdate"><$ FormatDateTime(tr("%a, %b %d"), recItem->StartTime()) $></span>
+ <span class="recordingtime"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></span>
+% }
+ <span class="recordingname"><$ recItem->Name() $></span>
+ </li>
+<(
+}
+}>
+</ul>
--
cgit v1.2.3