From 3316f1290470b02388917b03810f6584bbf9e358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?s=C3=B8renpeter?= <sp@darch.dk>
Date: Fri, 2 Feb 2024 21:55:56 +0100
Subject: [PATCH] merging stuff

---
 style.css                                     | 25 ++++++++++++++++---
 ...oad_twt_files.php => __load_twt_files.php} |  0
 views/refresh.php                             | 23 ++++++++++++-----
 3 files changed, 38 insertions(+), 10 deletions(-)
 rename views/{load_twt_files.php => __load_twt_files.php} (100%)

diff --git a/style.css b/style.css
index a1dfd8c..8154c09 100644
--- a/style.css
+++ b/style.css
@@ -254,10 +254,18 @@ nav.pagnation {
     padding: 0.5rem 0;
 }
 
-footer {
-    border-top: thin solid grey;
-    margin-top: 1rem;
-    text-align: center;
+/* === REFRESH === */
+
+#refreshInfo {
+    display: block;
+    text-align: center:
+}
+
+#refreshURL {
+}
+
+#refreshCounter {
+    float: right;
 }
 
 /* == Gallery ===================== */
@@ -280,4 +288,13 @@ footer {
     object-fit: cover;
     /*background-color: var(--border-color);*/
     border-radius: 0.25rem;
+}
+
+
+/* === FOOTER === */
+
+footer {
+    border-top: thin solid grey;
+    margin-top: 1rem;
+    text-align: center;
 }
\ No newline at end of file
diff --git a/views/load_twt_files.php b/views/__load_twt_files.php
similarity index 100%
rename from views/load_twt_files.php
rename to views/__load_twt_files.php
diff --git a/views/refresh.php b/views/refresh.php
index 5ec5e2e..7c4f247 100644
--- a/views/refresh.php
+++ b/views/refresh.php
@@ -17,13 +17,16 @@ include 'partials/header.php';
 
 ?>
 
-<label id="refreshLabel" for="refreshProgress">Loading feeds followed by: <?=$url?></label><br>
+<p id="refreshLabel">
+    <strong id="refreshInfo">Loading feeds followed by:</strong>
+    <span id="refreshURL"><?= preg_replace('(^https?://)', '', $url) ?></span>
+    <span id="refreshCounter"></span>
+</p>
 <progress id="refreshProgress" value=""></progress>
 
 <?php
 
 include 'partials/footer.php';
-//echo str_repeat(' ',1024*64);
 ob_start();
 
 flush();
@@ -58,14 +61,21 @@ foreach ($fileLines as $currentLine) {
 $i = 1;
 $total = count($twtFollowingList);
 
+echo '<script language="javascript">document.getElementById("refreshInfo").innerHTML = "Updating feed from:"</script>';
+
 foreach ($twtFollowingList as $following) { 
     //ob_start();
     $float = $i/$total;
     $percent = intval($float * 100)."%";
-    
+    $feed = $following[1];
+    //$feed = preg_replace('(^https?://)', '', $feed);
+    //$feed = $following[0].'@'. parse_url($following[1], PHP_URL_HOST);
+    $feed = $following[0].' ('.$following[1].')';
+
     // Javascript for updating the progress bar and information
     echo '<script language="javascript">
-            document.getElementById("refreshLabel").innerHTML = "Updating: '.$following[1].' ('.$i.' of '.$total.')";
+            document.getElementById("refreshURL").innerHTML = "'.$feed.'";
+            document.getElementById("refreshCounter").innerHTML = "('.$i.' of '.$total.')";
             document.getElementById("refreshProgress").value = "'.$float.'"; 
             document.getElementById("refreshProgress").innerHTML = "'.$percent.'"; 
         </script>';
@@ -78,7 +88,8 @@ foreach ($twtFollowingList as $following) {
 
 // Tell user that the process is completed
 echo '<script language="javascript">
-        document.getElementById("refreshLabel").innerHTML="Refreshed '.$total.' feeds";
+        document.getElementById("refreshInfo").innerHTML="Refreshed '.$total.' feeds from:";
+        document.getElementById("refreshURL").innerHTML = "'.preg_replace('(^https?://)', '', $url).'";
+        document.getElementById("refreshCounter").innerHTML = "";
         history.back();
     </script>';
-