From 2edd2fec1e4376e76c6935ebfab23dc86dfdb1b6 Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Fri, 1 Aug 2014 21:47:42 +0200
Subject: Sub directory name is shown in Header

---
 History     |  2 ++
 index.html  | 16 +++++++++++-----
 settings.js |  3 ++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/History b/History
index 94b8a11..013fba4 100644
--- a/History
+++ b/History
@@ -10,6 +10,8 @@ VDR 1.7.29+
 	Added German translation (Google Translate) so it must be corrected.
 	Fixed in GuideView the functionkey information. (After pressing Yellow, Back it wasn't right)
 	Duration of recording is show in Recordings list.
+	In recordings listing there is an other sublevel for directories, (use subgroup_old = 0 for old version)
+	In recordings listing, first sub directory is shown in Header
 
 
 0.24	vip.getmarks used for selecting getmarks 0 = restfulapi, 1 = SmartTVWeb (not all users have the newest SmartTVWeb)
diff --git a/index.html b/index.html
index 016a14b..37f5977 100644
--- a/index.html
+++ b/index.html
@@ -3413,9 +3413,14 @@ if (DelisOK) {
     case "BrowserBack":
 	if (subgroup && osdepginfo.style.opacity == 0) { 	
 		mediaList.innerHTML = "<h1><center style='font-size:" + fsRec + ";" + color_main_head + ";'>" + Lang[0] + "</center></h1>";
-		setTimeout("getRecList(); showMediaList();",100)
 		subgroup = 0;
 		subsubgroup = 0;
+		if (ShowSubDir) {
+			MakeRecList2();
+		} else {
+			MakeRecList();
+		}
+		setTimeout("showMediaList();",100)
 		break;
 	}
 	if (osdepginfo.style.opacity == 1) { osdepginfo.style.opacity = 0; break; }
@@ -3484,13 +3489,13 @@ if (DelisOK) {
 	}
 	if (getRecOK == 1) {
 		if (recGroup[currMed] !== 0 && subgroup == 0 && ShowSubDir) {
-			if (test_subgroup) {
+			if (subgroup_old) {
 			setTimeout("MakeRecList_sublevel(recGroup[currMed]); showMediaList();",100)
 			} else {
 			setTimeout("MakeRecList3(recGroup[currMed]); showMediaList();",100)
 			}
 			subgroup = 1;
-		} else if (recSubGroup[currMed] !== 0 && subgroup == 1 && subsubgroup == 0 && ShowSubDir && test_subgroup) {
+		} else if (recSubGroup[currMed] !== 0 && subgroup == 1 && subsubgroup == 0 && ShowSubDir && subgroup_old) {
 			setTimeout("MakeRecList_sublevel2(recGroup[currMed],recSubGroup[currMed]); showMediaList();",100)
 			subsubgroup = 1;
 		} else {
@@ -4325,7 +4330,6 @@ function MakeRecList2() {
 	{
 	 if (recTitl[i][1]) { 
 					if (recTitl[i][0] != x) {
-						
 						recList[i] = "\uE002\uE003" + recTitl[i][0];
 						xx += 1;
 					} else {
@@ -4400,6 +4404,7 @@ function MakeRecList_sublevel(GroupID) {
    for (var i=0;i<recTitl.length;i++)
 	{
 	if (recGroup[i] == GroupID) {
+	 Group_Header[GroupID] = recTitl[i][0];
 	 if (recTitl[i][2]) { 
 					if (recTitl[i][1] != x) {
 						
@@ -4507,7 +4512,8 @@ function showMediaList() {
 	if (getRecOK == 1) {
 		var htmlstring = "<h1><center style='font-size:" + fsRec + ";" + color_main_head + ";'>" + Lang[38] + "(" + Lang[46] + (100 - perc_space) + "%, " + (free_space/1024).toFixed(0) + " GB) </center></h1><table border='0'><tr>";
 
-		if (subgroup) { 
+		if (subgroup) {
+			htmlstring = "<h1><center style='font-size:" + fsRec + ";" + color_main_head + ";'>" + Group_Header[Number(recGroup[currMed])] + "</center></h1><table border='0'><tr>";
 			if (MaxInGroup < 14){ MaxMed = MaxInGroup; } else {MaxMed = 14; }
 		}
 		if (!subgroup) { 
diff --git a/settings.js b/settings.js
index 9e4175d..4dca93f 100644
--- a/settings.js
+++ b/settings.js
@@ -20,7 +20,7 @@ var get_timer = 1; // gettimersserver 1 = smarttvweb, 0 = restfulapi
 var get_recordings = 1; // getrecordings 0 = restfulapi(only showing no play), 1 = smarttvweb, 2 = streamdev
 var get_marks = 1;// getmarks 1 = smarttvweb, 0 = restfulapi
 
-var test_subgroup = 1 ;// testing of sub-sub group in recordings listing.
+var subgroup_old = 1 ;// 0 = use old routine for sub group in recordings listing.
 
 var SortByDate = 1; //Sort recordings by date
 var UseNewReclist = 1 ; //use new recordingslist function
@@ -303,6 +303,7 @@ var recSubGroup = new Array(); // used for subgroups
 var subgroup= 0 ; // Used for subdirs in recording view
 var subsubgroup = 0;// Used for subdirs in recording view
 var MaxInGroup=14; // Used for subdirs in recording view
+var Group_Header = new Array(); // Header for submenu.
 
 var posMark = 0;
 var recMap = 0;
-- 
cgit v1.2.3