sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 04:23:01 +00:00
Code Activity

Correct rendering of recent changes list. Fixes #106.

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-09-11 18:57:33 +01:00
parent 06a3a4a19f
commit 9f2efb2c02
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/index.php
View file

@ -1989,10 +1989,10 @@ function render_recent_changes($recent_changes)
for($i = 0; $i < $rchange_count; $i++) for($i = 0; $i < $rchange_count; $i++)
{ {
$rchange = $recent_changes[$i]; $rchange = $recent_changes[$i];
if($last_time !== date("dmY", $rchange->timestamp)) if($last_time !== date("dmY", $rchange->timestamp))
$content .= "<li class='header'><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n"; $content .= "<li class='header'><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n";
$rchange_results = []; $rchange_results = [];
for($s = $i; $s < $rchange_count; $s++) for($s = $i; $s < $rchange_count; $s++)
{ {
@ -2002,9 +2002,13 @@ function render_recent_changes($recent_changes)
$rchange_results[$s] = render_recent_change($recent_changes[$s]); $rchange_results[$s] = render_recent_change($recent_changes[$s]);
$i++; $i++;
} }
//$content .= render_recent_change($rchange); // Take one from i to account for when we tick over to the next
// iteration of the main loop
$i -= 1;
$next_entry = implode("\n", $rchange_results); $next_entry = implode("\n", $rchange_results);
// If the change count is greater than 1, then we should enclose it
// in a <details /> tag.
if(count($rchange_results) > 1) if(count($rchange_results) > 1)
{ {
reset($rchange_results); reset($rchange_results);
@ -2022,7 +2026,7 @@ function render_recent_changes($recent_changes)
} }
$userDisplayHtml = render_editor(implode(", ", $users)); $userDisplayHtml = render_editor(implode(", ", $users));
// TODO: COllect up and render a list of participating users // TODO: Collect up and render a list of participating users
$next_entry = "<li><details><summary>$pageDisplayHtml $userDisplayHtml $timeDisplayHtml</summary><ul class='page-list'>$next_entry</ul></details></li>"; $next_entry = "<li><details><summary>$pageDisplayHtml $userDisplayHtml $timeDisplayHtml</summary><ul class='page-list'>$next_entry</ul></details></li>";
$content .= "$next_entry\n"; $content .= "$next_entry\n";

2
module_index.json
View file

@ -50,7 +50,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds recent changes. Access through the 'recent-changes' action.", "description": "Adds recent changes. Access through the 'recent-changes' action.",
"id": "feature-recent-changes", "id": "feature-recent-changes",
"lastupdate": 1476813024, "lastupdate": 1476813264,
"optional": false "optional": false
}, },
{ {

10
modules/feature-recent-changes.php
View file

@ -136,10 +136,10 @@ function render_recent_changes($recent_changes)
for($i = 0; $i < $rchange_count; $i++) for($i = 0; $i < $rchange_count; $i++)
{ {
$rchange = $recent_changes[$i]; $rchange = $recent_changes[$i];
if($last_time !== date("dmY", $rchange->timestamp)) if($last_time !== date("dmY", $rchange->timestamp))
$content .= "<li class='header'><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n"; $content .= "<li class='header'><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n";
$rchange_results = []; $rchange_results = [];
for($s = $i; $s < $rchange_count; $s++) for($s = $i; $s < $rchange_count; $s++)
{ {
@ -149,9 +149,13 @@ function render_recent_changes($recent_changes)
$rchange_results[$s] = render_recent_change($recent_changes[$s]); $rchange_results[$s] = render_recent_change($recent_changes[$s]);
$i++; $i++;
} }
//$content .= render_recent_change($rchange); // Take one from i to account for when we tick over to the next
// iteration of the main loop
$i -= 1;
$next_entry = implode("\n", $rchange_results); $next_entry = implode("\n", $rchange_results);
// If the change count is greater than 1, then we should enclose it
// in a <details /> tag.
if(count($rchange_results) > 1) if(count($rchange_results) > 1)
{ {
reset($rchange_results); reset($rchange_results);
@ -169,7 +173,7 @@ function render_recent_changes($recent_changes)
} }
$userDisplayHtml = render_editor(implode(", ", $users)); $userDisplayHtml = render_editor(implode(", ", $users));
// TODO: COllect up and render a list of participating users // TODO: Collect up and render a list of participating users
$next_entry = "<li><details><summary>$pageDisplayHtml $userDisplayHtml $timeDisplayHtml</summary><ul class='page-list'>$next_entry</ul></details></li>"; $next_entry = "<li><details><summary>$pageDisplayHtml $userDisplayHtml $timeDisplayHtml</summary><ul class='page-list'>$next_entry</ul></details></li>";
$content .= "$next_entry\n"; $content .= "$next_entry\n";