mirror of
https://github.com/sorenpeter/timeline.git
synced 2025-12-16 19:37:01 +00:00
merging stuff
This commit is contained in:
parent
50851efcbb
commit
3316f12904
3 changed files with 38 additions and 10 deletions
25
style.css
25
style.css
|
|
@ -254,10 +254,18 @@ nav.pagnation {
|
||||||
padding: 0.5rem 0;
|
padding: 0.5rem 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
/* === REFRESH === */
|
||||||
border-top: thin solid grey;
|
|
||||||
margin-top: 1rem;
|
#refreshInfo {
|
||||||
text-align: center;
|
display: block;
|
||||||
|
text-align: center:
|
||||||
|
}
|
||||||
|
|
||||||
|
#refreshURL {
|
||||||
|
}
|
||||||
|
|
||||||
|
#refreshCounter {
|
||||||
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* == Gallery ===================== */
|
/* == Gallery ===================== */
|
||||||
|
|
@ -280,4 +288,13 @@ footer {
|
||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
/*background-color: var(--border-color);*/
|
/*background-color: var(--border-color);*/
|
||||||
border-radius: 0.25rem;
|
border-radius: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* === FOOTER === */
|
||||||
|
|
||||||
|
footer {
|
||||||
|
border-top: thin solid grey;
|
||||||
|
margin-top: 1rem;
|
||||||
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
@ -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>
|
<progress id="refreshProgress" value=""></progress>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
include 'partials/footer.php';
|
include 'partials/footer.php';
|
||||||
//echo str_repeat(' ',1024*64);
|
|
||||||
ob_start();
|
ob_start();
|
||||||
|
|
||||||
flush();
|
flush();
|
||||||
|
|
@ -58,14 +61,21 @@ foreach ($fileLines as $currentLine) {
|
||||||
$i = 1;
|
$i = 1;
|
||||||
$total = count($twtFollowingList);
|
$total = count($twtFollowingList);
|
||||||
|
|
||||||
|
echo '<script language="javascript">document.getElementById("refreshInfo").innerHTML = "Updating feed from:"</script>';
|
||||||
|
|
||||||
foreach ($twtFollowingList as $following) {
|
foreach ($twtFollowingList as $following) {
|
||||||
//ob_start();
|
//ob_start();
|
||||||
$float = $i/$total;
|
$float = $i/$total;
|
||||||
$percent = intval($float * 100)."%";
|
$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
|
// Javascript for updating the progress bar and information
|
||||||
echo '<script language="javascript">
|
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").value = "'.$float.'";
|
||||||
document.getElementById("refreshProgress").innerHTML = "'.$percent.'";
|
document.getElementById("refreshProgress").innerHTML = "'.$percent.'";
|
||||||
</script>';
|
</script>';
|
||||||
|
|
@ -78,7 +88,8 @@ foreach ($twtFollowingList as $following) {
|
||||||
|
|
||||||
// Tell user that the process is completed
|
// Tell user that the process is completed
|
||||||
echo '<script language="javascript">
|
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();
|
history.back();
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue