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 16:33:00 +00:00
Code Activity

Grouped recent changes by page (#57).

Browse source 
More tidying up needed though.
This commit is contained in:
Starbeamrainbowlabs 2016-04-04 13:55:43 +01:00
parent 1f1bffa780
commit 995ef39901
4 changed files with 141 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
build/index.php
View file

@ -342,8 +342,8 @@ textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-wei
.page-tags-display li a { color: #FB701A; text-decoration: none; } .page-tags-display li a { color: #FB701A; text-decoration: none; }
.page-tags-display li::before { content: \"\\A\"; position: relative; top: 0.03rem; left: -0.9rem; width: 0; height: 0; border-top: 0.6rem solid transparent; border-bottom: 0.6rem solid transparent; border-right: 0.5rem solid #D2C3DD; } .page-tags-display li::before { content: \"\\A\"; position: relative; top: 0.03rem; left: -0.9rem; width: 0; height: 0; border-top: 0.6rem solid transparent; border-bottom: 0.6rem solid transparent; border-right: 0.5rem solid #D2C3DD; }
.page-list { list-style-type: none; margin: 0.5rem; padding: 0.5rem; } .page-list { list-style-type: none; margin: 0.3rem; padding: 0.3rem; }
.page-list li { margin: 0.5rem; padding: 0.5rem; } .page-list li:not(.header) { margin: 0.3rem; padding: 0.3rem; }
.page-list li .size { margin-left: 0.7rem; color: rgba(30, 30, 30, 0.5); } .page-list li .size { margin-left: 0.7rem; color: rgba(30, 30, 30, 0.5); }
.page-list li .editor { display: inline-block; margin: 0 0.5rem; } .page-list li .editor { display: inline-block; margin: 0 0.5rem; }
.page-list li .tags { margin: 0 1rem; } .page-list li .tags { margin: 0 1rem; }
@ -1692,6 +1692,8 @@ function add_recent_change($rchange)
function render_recent_changes($recent_changes) function render_recent_changes($recent_changes)
{ {
global $pageindex;
// Cache the number of recent changes we are dealing with // Cache the number of recent changes we are dealing with
$rchange_count = count($recent_changes); $rchange_count = count($recent_changes);
@ -1724,9 +1726,43 @@ function render_recent_changes($recent_changes)
{ {
$rchange = $recent_changes[$i]; $rchange = $recent_changes[$i];
if($last_time !== date("dmY", $rchange->timestamp)) if($last_time !== date("dmY", $rchange->timestamp))
$content .= "<li><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n"; $content .= "<li class='header'><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n";
$content .= render_recent_change($rchange);
$rchange_results = [];
for($s = $i; $s < $rchange_count; $s++)
{
if($recent_changes[$s]->page !== $rchange->page)
break;
$rchange_results[$s] = render_recent_change($recent_changes[$s]);
$i++;
}
//$content .= render_recent_change($rchange);
$next_entry = implode("\n", $rchange_results);
if(count($rchange_results) > 1)
{
reset($rchange_results);
$rchange_first = $recent_changes[key($rchange_results)];
end($rchange_results);
$rchange_last = $recent_changes[key($rchange_results)];
$pageDisplayHtml = render_rchange_pagename($rchange_first);
$timeDisplayHtml = render_rchange_timestamp($rchange_first->timestamp);
$users = [];
foreach($rchange_results as $key => $rchange_result)
{
if(!in_array($recent_changes[$key]->user, $users))
$users[] = $recent_changes[$key]->user;
}
$userDisplayHtml = render_rchange_editor(implode(", ", $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>";
$content .= "$next_entry\n";
}
$last_time = date("dmY", $rchange->timestamp); $last_time = date("dmY", $rchange->timestamp);
} }
@ -1737,14 +1773,9 @@ function render_recent_changes($recent_changes)
function render_recent_change($rchange) function render_recent_change($rchange)
{ {
// Render the page's name $pageDisplayHtml = render_rchange_pagename($rchange);
$pageDisplayName = $rchange->page; $editorDisplayHtml = render_rchange_editor($rchange->user);
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect)) $timeDisplayHtml = render_rchange_timestamp($rchange->timestamp);
$pageDisplayName = "<em>$pageDisplayName</em>";
$pageDisplayLink = "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a>";
$editorDisplayHtml = "<span class='editor'>&#9998; $rchange->user</span>";
$timeDisplayHtml = "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $rchange->timestamp) . "'>" . human_time_since($rchange->timestamp) . "</time>";
$result = ""; $result = "";
$resultClasses = []; $resultClasses = [];
@ -1758,22 +1789,22 @@ function render_recent_change($rchange)
$size_display_class .= " significant"; $size_display_class .= " significant";
$title_display = human_filesize($rchange->newsize - $rchange->sizediff) . " -> " . human_filesize($rchange->newsize); $size_title_display = human_filesize($rchange->newsize - $rchange->sizediff) . " -> " . human_filesize($rchange->newsize);
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
$result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$title_display'>($size_display)</span>"; $result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>";
break; break;
case "deletion": case "deletion":
$resultClasses[] = "deletion"; $resultClasses[] = "deletion";
$result .= "$pageDisplayName $editorDisplayHtml $timeDisplayHtml"; $result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml";
break; break;
case "upload": case "upload":
$resultClasses[] = "upload"; $resultClasses[] = "upload";
$result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")"; $result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")";
break; break;
} }
@ -1783,6 +1814,29 @@ function render_recent_change($rchange)
return $result; return $result;
} }
function render_rchange_timestamp($timestamp)
{
return "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $timestamp) . "'>" . human_time_since($timestamp) . "</time>";
}
function render_rchange_pagename($rchange)
{
global $pageindex;
// Render the page's name
$pageDisplayName = $rchange->page;
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect))
$pageDisplayName = "<em>$pageDisplayName</em>";
$pageDisplayLink = "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a>";
return $pageDisplayName;
}
function render_rchange_editor($editorName)
{
return "<span class='editor'>&#9998; $editorName</span>";
}

2
module_index.json
View file

@ -41,7 +41,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": 1459712086, "lastupdate": 1459774466,
"optional": false "optional": false
}, },
{ {

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

@ -96,6 +96,8 @@ function add_recent_change($rchange)
function render_recent_changes($recent_changes) function render_recent_changes($recent_changes)
{ {
global $pageindex;
// Cache the number of recent changes we are dealing with // Cache the number of recent changes we are dealing with
$rchange_count = count($recent_changes); $rchange_count = count($recent_changes);
@ -128,9 +130,43 @@ function render_recent_changes($recent_changes)
{ {
$rchange = $recent_changes[$i]; $rchange = $recent_changes[$i];
if($last_time !== date("dmY", $rchange->timestamp)) if($last_time !== date("dmY", $rchange->timestamp))
$content .= "<li><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n"; $content .= "<li class='header'><h2>" . date("jS F", $rchange->timestamp) . "</h2></li>\n";
$content .= render_recent_change($rchange);
$rchange_results = [];
for($s = $i; $s < $rchange_count; $s++)
{
if($recent_changes[$s]->page !== $rchange->page)
break;
$rchange_results[$s] = render_recent_change($recent_changes[$s]);
$i++;
}
//$content .= render_recent_change($rchange);
$next_entry = implode("\n", $rchange_results);
if(count($rchange_results) > 1)
{
reset($rchange_results);
$rchange_first = $recent_changes[key($rchange_results)];
end($rchange_results);
$rchange_last = $recent_changes[key($rchange_results)];
$pageDisplayHtml = render_rchange_pagename($rchange_first);
$timeDisplayHtml = render_rchange_timestamp($rchange_first->timestamp);
$users = [];
foreach($rchange_results as $key => $rchange_result)
{
if(!in_array($recent_changes[$key]->user, $users))
$users[] = $recent_changes[$key]->user;
}
$userDisplayHtml = render_rchange_editor(implode(", ", $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>";
$content .= "$next_entry\n";
}
$last_time = date("dmY", $rchange->timestamp); $last_time = date("dmY", $rchange->timestamp);
} }
@ -141,14 +177,9 @@ function render_recent_changes($recent_changes)
function render_recent_change($rchange) function render_recent_change($rchange)
{ {
// Render the page's name $pageDisplayHtml = render_rchange_pagename($rchange);
$pageDisplayName = $rchange->page; $editorDisplayHtml = render_rchange_editor($rchange->user);
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect)) $timeDisplayHtml = render_rchange_timestamp($rchange->timestamp);
$pageDisplayName = "<em>$pageDisplayName</em>";
$pageDisplayLink = "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a>";
$editorDisplayHtml = "<span class='editor'>&#9998; $rchange->user</span>";
$timeDisplayHtml = "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $rchange->timestamp) . "'>" . human_time_since($rchange->timestamp) . "</time>";
$result = ""; $result = "";
$resultClasses = []; $resultClasses = [];
@ -162,22 +193,22 @@ function render_recent_change($rchange)
$size_display_class .= " significant"; $size_display_class .= " significant";
$title_display = human_filesize($rchange->newsize - $rchange->sizediff) . " -> " . human_filesize($rchange->newsize); $size_title_display = human_filesize($rchange->newsize - $rchange->sizediff) . " -> " . human_filesize($rchange->newsize);
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
$result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$title_display'>($size_display)</span>"; $result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>";
break; break;
case "deletion": case "deletion":
$resultClasses[] = "deletion"; $resultClasses[] = "deletion";
$result .= "$pageDisplayName $editorDisplayHtml $timeDisplayHtml"; $result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml";
break; break;
case "upload": case "upload":
$resultClasses[] = "upload"; $resultClasses[] = "upload";
$result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")"; $result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")";
break; break;
} }
@ -187,4 +218,27 @@ function render_recent_change($rchange)
return $result; return $result;
} }
function render_rchange_timestamp($timestamp)
{
return "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $timestamp) . "'>" . human_time_since($timestamp) . "</time>";
}
function render_rchange_pagename($rchange)
{
global $pageindex;
// Render the page's name
$pageDisplayName = $rchange->page;
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect))
$pageDisplayName = "<em>$pageDisplayName</em>";
$pageDisplayLink = "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a>";
return $pageDisplayName;
}
function render_rchange_editor($editorName)
{
return "<span class='editor'>&#9998; $editorName</span>";
}
?> ?>

4
settings.fragment.php
View file

@ -339,8 +339,8 @@ textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-wei
.page-tags-display li a { color: #FB701A; text-decoration: none; } .page-tags-display li a { color: #FB701A; text-decoration: none; }
.page-tags-display li::before { content: \"\\A\"; position: relative; top: 0.03rem; left: -0.9rem; width: 0; height: 0; border-top: 0.6rem solid transparent; border-bottom: 0.6rem solid transparent; border-right: 0.5rem solid #D2C3DD; } .page-tags-display li::before { content: \"\\A\"; position: relative; top: 0.03rem; left: -0.9rem; width: 0; height: 0; border-top: 0.6rem solid transparent; border-bottom: 0.6rem solid transparent; border-right: 0.5rem solid #D2C3DD; }
.page-list { list-style-type: none; margin: 0.5rem; padding: 0.5rem; } .page-list { list-style-type: none; margin: 0.3rem; padding: 0.3rem; }
.page-list li { margin: 0.5rem; padding: 0.5rem; } .page-list li:not(.header) { margin: 0.3rem; padding: 0.3rem; }
.page-list li .size { margin-left: 0.7rem; color: rgba(30, 30, 30, 0.5); } .page-list li .size { margin-left: 0.7rem; color: rgba(30, 30, 30, 0.5); }
.page-list li .editor { display: inline-block; margin: 0 0.5rem; } .page-list li .editor { display: inline-block; margin: 0 0.5rem; }
.page-list li .tags { margin: 0 1rem; } .page-list li .tags { margin: 0 1rem; }