- 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
author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> 2007-01-10 21:34:39 +0000
committer: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> 2007-01-10 21:34:39 +0000
commit: b405e4e3d31ceda6fa3de366d8c5374a160e1266 (patch)
tree: f6473215ddd4b747543a02c596f0536c1a03d72b
parent: 6b9321410df7616f8f5fe29d98da809d4ac40e90 (diff)
download: vdr-plugin-live-b405e4e3d31ceda6fa3de366d8c5374a160e1266.tar.gz
vdr-plugin-live-b405e4e3d31ceda6fa3de366d8c5374a160e1266.tar.bz2
7 files changed, 38 insertions, 17 deletions
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
--- a/images/del.png
+++ b/images/del.png
diff --git a/images/edit.png b/images/edit.png
index d21d86f..078f5e2 100644
--- a/images/edit.png
+++ b/images/edit.png
diff --git a/images/play.png b/images/play.png
new file mode 100644
index 0000000..2934d8c
--- /dev/null
+++ b/images/play.png
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;
 	<head>
 		<title>VDR-Live - <$ pageTitle $></title>
 		<link rel="stylesheet" type="text/css" href="styles.css" />
-		<script src="treeview.js" type="text/javascript" />
+		<script type="text/javascript" language="javascript" src="treeview.js" />
+		<script type="text/javascript" language="javascript" src="domLib.js"></script>
+    	<script type="text/javascript" language="javascript" src="domTT.js"></script>
+    	<script type="text/javascript" language="javascript">
+			var domTT_styleClass = 'recording_tt';
+    	</script>
 	</head>
 	<body>
 		<div class="left_area">
@@ -63,18 +68,18 @@ else {
 } // if (level > 0)
 RecordingsTree::Map::iterator iter;
 RecordingsTree::Map::iterator end = recordingsTree.end(path);
+}>
+		<li class="recording">
+<{
 for (iter = recordingsTree.begin(path); iter != end; iter++) {
 	RecordingsTree::RecordingsItemPtr recItem = iter->second;
 	std::string folderimg("folder_closed.png");
 	std::string collapseimg("plus.png");
-}>
-		<li class="recording">
-<{
 	if (recItem->IsDir()) {
 		reply.out() << std::string("\t\t\t")
 			+ std::string("<div class=\"recording_item\" onclick=\"Toggle(this)\">\n")
 			+ std::string("\t\t\t<div class=\"recording_imgs\">")
-			+ StringRepeat(level, "<img src=\"transparent.png\" alt=\"\" width=\"16\" height=\"16\" />")
+			+ StringRepeat(level, "<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />")
 			+ std::string("<img class=\"recording_expander\" src=\"") + collapseimg + std::string("\" alt=\"\" />")
 			+ std::string("<img class=\"recording_folder\" src=\"") + folderimg + std::string("\" alt=\"\" />")
 			+ std::string("</div>");
@@ -90,20 +95,32 @@ for (iter = recordingsTree.begin(path); iter != end; iter++) {
 		recItemParams.add("path", recItem->Name());
 		recItemParams.add("level", lexical_cast<std::string, int>(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<std::string, int>(day.length() - 1) + ".25em;");
 		reply.out() << std::string("\t\t\t")
 			+ std::string("<div class=\"recording_item\">\n")
 			+ std::string("\t\t\t<div class=\"recording_imgs\">")
-			+ StringRepeat(level, "<img src=\"transparent.png\" alt=\"\" width=\"16\" height=\"16\" />")
+			+ StringRepeat(level, "<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />")
 			+ std::string("<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />")
 			+ std::string("<img src=\"movie.png\" alt=\"movie\" />")
 			+ std::string("</div>");
 }>
-			<div class="recording_day"><$ FormatDateTime("%a,", recItem->StartTime()) $></div>
+			<div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
 			<div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $></div>
 			<div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div>
 			<div class="recording_name"><$ recItem->Name() $></div>
-			<div class="recording_actions">&nbsp;</div>
+			<div class="recording_actions">
+				 <img src="play.png" alt="">
+				 <img src="edit.png" alt"">
+				 <img src="del.png" alt="">
+			</div>
 			</div>
 %	}
 		</li>
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") {
 						<div><div><div><$ channel_name $></div></div></div>
 					</div>
 					<div class="tools">
-						<a href="edit_timer.html?channel=<$ channel_id $>&title=<$ title $>&start_h=<$ start_h $>&end_h=<$ end_h $>&start_m=<$ start_m $>&end_m=<$ end_m $>"><img src="/record.png" alt="" <& tooltip_widget tooltip=(tr("Record this")) &> border="0" /></a>
+						<a href="edit_timer.html?channel=<$ channel_id $>&title=<$ title $>&start_h=<$ start_h $>&end_h=<$ end_h $>&start_m=<$ start_m $>&end_m=<$ end_m $>"><img src="/record.png" alt="" <& tooltip_widget tooltip=(tr("Record this")) &> /></a>
 					</div>
 					<div class="content">
 						<div class="info"><$ start $> - <$ end $></div>
author	Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>	2007-01-10 21:34:39 +0000
committer	Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>	2007-01-10 21:34:39 +0000
commit	b405e4e3d31ceda6fa3de366d8c5374a160e1266 (patch)
tree	f6473215ddd4b747543a02c596f0536c1a03d72b
parent	6b9321410df7616f8f5fe29d98da809d4ac40e90 (diff)
download	vdr-plugin-live-b405e4e3d31ceda6fa3de366d8c5374a160e1266.tar.gz vdr-plugin-live-b405e4e3d31ceda6fa3de366d8c5374a160e1266.tar.bz2