From f8830e4141ebcad6e4f1b06104d44eb83830a771 Mon Sep 17 00:00:00 2001
From: Jasmin Jessich <jasmin@anw.at>
Date: Mon, 12 Jun 2017 23:13:27 +0200
Subject: Patched with live-fix-recording-indentation.diff

- Got the patch from Frank Neumann per eMail.
  Adds an indention per directory to the recordings view.
  Original was from here (level.diff):
    http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1260210-live-plugin-einr%C3%BCcken-von-unterverzeichnissen/#post1260210
---
 pages/recordings.ecpp | 8 ++++----
 recman.cpp            | 1 +
 recman.h              | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index f1ae8d6..69deece 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -208,7 +208,7 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 	RecordingsItemPtr recItem = *recIter;
 </%cpp>
 	<li class="recording">
-		<& rec_item_dir name=(recItem->Name()) level=(level) &>
+		<& rec_item_dir name=(recItem->Name()) level=(recItem->Level()) &>
 <%cpp>
 #if TNT_QUERYPARAMS_NO_BOOL
 		tnt::QueryParams recItemParams(qparam);
@@ -264,7 +264,7 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 		{
 </%cpp>
 	<li class="recording">
-	   <& rec_item_file name=(recItem->Name()) level=(level) id=(recItem->Id()) day=(day) dayLen=(dayLen) startTime=(recItem->StartTime()) duration=(duration) hint=(hint) shortDescr=(shortDescr) archived=(RecordingsManager::GetArchiveDescr(recItem->Recording())) &>
+	   <& rec_item_file name=(recItem->Name()) level=(recItem->Level()) id=(recItem->Id()) day=(day) dayLen=(dayLen) startTime=(recItem->StartTime()) duration=(duration) hint=(hint) shortDescr=(shortDescr) archived=(RecordingsManager::GetArchiveDescr(recItem->Recording())) &>
 	</li>
 <%cpp>
 		}
@@ -348,7 +348,7 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 	string folderimg = "folder_closed.png";
 </%args>
 	<div class="recording_item" onclick="Toggle(this)">
-		<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><img class="recording_expander" src="<$ LiveSetup().GetThemedLink("img", collapseimg) $>" alt="" /><img class="recording_folder" src="<$ LiveSetup().GetThemedLink("img", folderimg) $>" alt="" /></div>
+		<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level - 1, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><img class="recording_expander" src="<$ LiveSetup().GetThemedLink("img", collapseimg) $>" alt="" /><img class="recording_folder" src="<$ LiveSetup().GetThemedLink("img", folderimg) $>" alt="" /></div>
 		<div class="recording_spec">
 			<div class="recording_name"><$ name $></div>
 	    </div>
@@ -372,7 +372,7 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 	string archived;
 </%args>
 	<div class="recording_item">
-	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { </%cpp><input type="checkbox" name="deletions" value="<$ id $>" /><%cpp> } </%cpp></div>
+	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { </%cpp><input type="checkbox" name="deletions" value="<$ id $>" /><%cpp> } </%cpp></div>
 	<div class="recording_spec">
 		<div class="recording_day"><$ FormatDateTime(tr("%a,"), startTime) + string(" ") + FormatDateTime(tr("%b %d %y"), startTime) + string(" ") + FormatDateTime(tr("%I:%M %p"), startTime) $></div>
 		<div class="recording_duration"><$ duration $></div>
diff --git a/recman.cpp b/recman.cpp
index 71730d0..7bd7912 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -376,6 +376,7 @@ namespace vdrlive {
 	 *  Implementation of class RecordingsItem:
 	 */
 	RecordingsItem::RecordingsItem(string const & name, RecordingsItemPtr parent) :
+		m_level((parent != NULL) ? parent->Level() + 1 : 0),
 		m_name(name),
 		m_entries(),
 		m_parent(parent)
diff --git a/recman.h b/recman.h
index d9810b9..c5a5fbb 100644
--- a/recman.h
+++ b/recman.h
@@ -179,8 +179,10 @@ namespace vdrlive {
 
 			RecordingsMap::const_iterator begin() const { return m_entries.begin(); }
 			RecordingsMap::const_iterator end() const { return m_entries.end(); }
+			int Level() { return m_level; }
 
 		private:
+			int m_level;
 			std::string m_name;
 			RecordingsMap m_entries;
 			RecordingsItemWeakPtr m_parent;
-- 
cgit v1.2.3