From 95b7d92a5d1e71f6b82be26157644c93684fcd26 Mon Sep 17 00:00:00 2001
From: Markus Ehrnsperger <>
Date: Sun, 12 Nov 2023 16:42:07 +0100
Subject: [PATCH] css_fixes

---
 live/css/styles.css   | 6 +++++-
 pages/pageelems.ecpp  | 2 +-
 pages/recordings.ecpp | 5 +++--
 pages/whats_on.ecpp   | 2 +-
 recman.cpp            | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/live/css/styles.css b/live/css/styles.css
index d80dae1a..708be3e9 100644
--- a/live/css/styles.css
+++ b/live/css/styles.css
@@ -812,9 +812,13 @@ div.info div.time {
 	margin: 0px 5px 0px 5px;
 }
 
+.margin_right {
+  margin-right: 5px;
+}
+
 div.info div.date {
 	float: left;
-        padding: 0px;
+  padding: 0px;
 }
 
 div.progress {
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 7aba684e..bf79761b 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -744,7 +744,7 @@ const bool episodeFound = scraperMovieOrTv.found && (!scraperMovieOrTv.movie) &&
 if (scraperMovieOrTv.found) {
 //  esyslog("live: create caption menu");
 </%cpp>
-<div class = "caption menu">
+<div class = "caption">
   <a id="<$ boxId $>_epg_m"     class = "active"   onclick="displayEPG('<$ boxId $>')" ><$ trVDR("EPG") $></a>
 | <a id="<$ boxId $>_scraper_m" class = "inactive" onclick="displayScraper('<$ boxId $>')"><$ tr("Scraper") $></a>
 | <a id="<$ boxId $>_actors_m"  class = "inactive" onclick="displayActors('<$ boxId $>')" ><$ tr("Actors") $></a>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index c057aad4..920bd90f 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -367,7 +367,7 @@ cLargeString *recoring_item = static_cast<cLargeString *>((void *)irecoring_item
 std::vector<RecordingsItemPtr> recItems;
 const std::vector<RecordingsItemPtr> *recItemsC = NULL;
 
-// data for dirs, an loop over dirs
+// data for dirs, and loop over dirs
 const std::vector<RecordingsItemPtr> *dirItems = recItemThisDir->getDirs();
 std::vector<RecordingsItemPtr>::const_iterator dirIterS, dirIterE, dirIter;
 int direction; // for dirs
@@ -455,7 +455,8 @@ if (currentSort != "duplicates" || currentFlat == "true") {
     </script>
   <%cpp> } else {
     bool first = true;
-    const char *displayFolder = currentFlat == "true"?"1":"0";
+//    const char *displayFolder = currentFlat == "true"?"1":"0";
+    const char *displayFolder = "1";
     recoring_item->clear();
     RecordingsItemRec::AppendAsJSArray(*recoring_item, recItemsC->begin(), recItemsC->end(), first, currentFilter, reverse);
     if (level == 0) { </%cpp>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 928accca..e53855b5 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -220,7 +220,7 @@ if (type == "now") {
 						<& pageelems.epg_tool_box detail=(1) epgid=(epgEvent->Id()) title=(epgEvent->Title()) startTime=(epgEvent->GetStartTime()) endTime=(epgEvent->GetEndTime()) &>
 					</div>
 					<div>
-						<div class="info nowrap"><div class="date"><$ (startDate) $></div><div class="time"><$ (timeSpan) $></div></div>
+						<div class="info nowrap"><div class="date margin_right"><$ (startDate) $></div><div class="time"><$ (timeSpan) $></div></div>
 						<div class="progress"><div><& pageelems.progressbar progress=(epgEvent->Elapsed()) duration=(epgEvent->Duration()) &></div></div>
 						<div class="title withmargin"><$ (epgEvent->Title()) $></div>
 						<div class="short withmargin"><$ (epgEvent->ShortDescr()) $></div>
diff --git a/recman.cpp b/recman.cpp
index 7c3987cb..0b23b640 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -936,11 +936,11 @@ void AppendScraperData(cLargeString &target, const std::string &s_IMDB_ID, const
           target.append(DurationDeviation());
 // [18] Path / folder
           target.append(",");
-          if(displayFolder) {
+//          if(displayFolder) {
             target.append("\"");
             if( *(const char *)Recording()->Folder() ) AppendHtmlEscapedAndCorrectNonUTF8(target, (const char *)Recording()->Folder() );
             target.append("\"");
-          }
+//          }
 // [19] duration
           target.append(",\"");
           if(Duration() >= 0)