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 $>