diff options
| -rw-r--r-- | index.html | 103 | ||||
| -rw-r--r-- | settings.js | 6 |
2 files changed, 107 insertions, 2 deletions
@@ -1,4 +1,4 @@ -> +<html> <head> <script type="text/javascript" src="settings.js" /> <script type="text/javascript" src="lang_eng.js" /> @@ -3482,7 +3482,14 @@ if (DelisOK) { } if (getRecOK == 1) { if (recGroup[currMed] !== 0 && subgroup == 0 && ShowSubDir) { + if (test_subgroup) { + setTimeout("MakeRecList_sublevel(recGroup[currMed]); showMediaList();",100) + } else { setTimeout("MakeRecList3(recGroup[currMed]); showMediaList();",100) + } + subgroup = 1; + } else if (recGroup[currMed] !== 0 && subgroup == 1 && ShowSubDir && test_subgroup) { + setTimeout("MakeRecList_sublevel2(recGroup[currMed],recSubGroup[currMed]); showMediaList();",100) subgroup = 1; } else { recList[currMed] = "\u0003" + recList[currMed].substring(1); @@ -4039,6 +4046,7 @@ try { } + //end of get_recordings if (ShowSubDir) { MakeRecList2(); @@ -4049,6 +4057,7 @@ try { getRecOK = 0; mediaList.innerHTML = "<h1><center style='font-size:" + fsRec + ";" + color_main_head + ";'>" + Lang[38] + "</center><pre>\n\n\n" + Lang[37] + "</pre></h1>"; } + } catch(e) { alert("Get Recordings problem: " + e); getRecOK = 0; @@ -4342,6 +4351,7 @@ function MakeRecList2() { } function MakeRecList3(GroupID) { + MaxInGroup = -1; for (var i=0;i<recTitl.length;i++) { @@ -4372,6 +4382,97 @@ function MakeRecList3(GroupID) { } } +// +// +// sub-sublevel testing +// +// + +function MakeRecList_sublevel(GroupID) { +//new style with sub maps on sub maps + var x = ""; + var xx = 0; + recList.length = 0; + MaxInGroup = -1; + for (var i=0;i<recTitl.length;i++) + { + if (recGroup[i] == GroupID) { + if (recTitl[i][2]) { + if (recTitl[i][1] != x) { + + recList[i] = "\uE002\uE003" + recTitl[i][1]; + xx += 1; + } else { + recList[i] = "" ; + } + recSubGroup[i] = xx; + alert(recSubGroup[i] + " " + recList[i]); + } else { + recSubGroup[i] = 0; + var tmp = ""; + for (var ii=1;ii<recTitl[i].length;ii++) + { + tmp += "\uE003" + recTitl[i][ii]; + } + if (get_recordings == 2 ) { + result = recStrt[i]; + } else{ + AddInfo(i); + if (recChan[i] !== "Media File") {result += "\uE003" + (recDura[i]/60).toFixed(0);} + } + if (rec_New[i] == "true" ) { + recList[i] = "\uE010" + result + tmp; // recTitl[i]; + } else { + recList[i] = "\uE003" + result + tmp; //recTitl[i]; + } + MaxInGroup = MaxInGroup + 1; + } + if ((recProt[i] == 1) && (ShowProtectedChannels == 1)) { recList[i] = "";} + x = recTitl[i][1]; + } + } +//MakeRecList_sublevel2(GroupID,0); +} + + +function MakeRecList_sublevel2(GroupID,SubGroupID) { + + MaxInGroup = -1; + for (var i=0;i<recTitl.length;i++) + { + if (recGroup[i] == GroupID && recSubGroup[i] == SubGroupID) { + var tmp = ""; + for (var ii=(SubGroupID+1);ii<recTitl[i].length;ii++) + { + tmp += "\uE003" + recTitl[i][ii]; + } + if (get_recordings == 2 ) { + result = recStrt[i]; + } else{ + AddInfo(i); + if (recChan[i] !== "Media File") {result += "\uE003" + (recDura[i]/60).toFixed(0);} + } + if (rec_New[i] == "true" ) { + recList[i] = "\uE010" + result + tmp; // recTitl[i]; + } else { + recList[i] = "\uE003" + result + tmp; //recTitl[i]; + } + + MaxInGroup = MaxInGroup + 1; + if ((recProt[i] == 1) && (ShowProtectedChannels == 1)) { recList[i] = "";} + + } else { + recList[i] = "" ; + } + } +} + +// +// +// End of sub-sublevel testing +// +// + function AddInfo(info) { //Add Date to item date = new Date(Number(recStrt[info])*1000); diff --git a/settings.js b/settings.js index b9576b6..21f19c5 100644 --- a/settings.js +++ b/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.25.10"; +var Version = "0.25.11"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://easyvdr","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); @@ -20,6 +20,9 @@ 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 SortByDate = 1; //Sort recordings by date var UseNewReclist = 1 ; //use new recordingslist function var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings @@ -296,6 +299,7 @@ var recChan = new Array(); // Channel ID var recDummy= new Array(); // var recGroup= new Array(); // group index var recProt = new Array(); // protect recording based on channelgroup +var recSubGroup = new Array(); // used for subgroups var subgroup= 0 ; // Used for subdirs in recording view var MaxInGroup=14; // Used for subdirs in recording view |