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

Handle reversions in recent changes - for #78

Browse source
This commit is contained in:
Starbeamrainbowlabs 2018-07-03 12:28:01 +01:00
parent d0171d041d
commit 3581cc1437
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/index.php
View file

@ -368,6 +368,7 @@ summary { cursor: pointer; }
.move::before { content: "\\1f69a"; font-size: 1.25em; margin: 0 0.1em 0 -1.1em; } .move::before { content: "\\1f69a"; font-size: 1.25em; margin: 0 0.1em 0 -1.1em; }
.upload::before { content: "\\1f845"; margin: 0 0.1em 0 -1.1em; } .upload::before { content: "\\1f845"; margin: 0 0.1em 0 -1.1em; }
.new-comment::before { content: "\\1f4ac"; margin: 0 0.1em 0 -1.1em; } .new-comment::before { content: "\\1f4ac"; margin: 0 0.1em 0 -1.1em; }
.reversion::before { content: "\\23f2"; margin: 0 0.1em 0 -1.1em; }
.comments { padding: 1em 2em; background: hsl(31, 64%, 85%); box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); } .comments { padding: 1em 2em; background: hsl(31, 64%, 85%); box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); }
.comments textarea { background: hsl(270, 60%, 86%); } .comments textarea { background: hsl(270, 60%, 86%); }
@ -404,7 +405,7 @@ if($settings->sessionprefix == "auto")
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** The version of Pepperminty Wiki currently running. */ /** The version of Pepperminty Wiki currently running. */
$version = "v0.17-dev"; $version = "v0.17-dev";
$commit = "819489a7fb17f8e57fe6af7e01c34e9260d4e9ea"; $commit = "1cb72f3a4968fa7311c496c608b217730ed44ce1";
/// Environment /// /// Environment ///
/** Holds information about the current request environment. */ /** Holds information about the current request environment. */
$env = new stdClass(); $env = new stdClass();
@ -3715,8 +3716,10 @@ function render_recent_change($rchange)
$result = ""; $result = "";
$resultClasses = []; $resultClasses = [];
switch(isset($rchange->type) ? $rchange->type : "edit") $rchange_type = isset($rchange->type) ? $rchange->type : "edit";
switch($rchange_type)
{ {
case "revert":
case "edit": case "edit":
// The number (and the sign) of the size difference to display // The number (and the sign) of the size difference to display
$size_display = ($rchange->sizediff > 0 ? "+" : "") . $rchange->sizediff; $size_display = ($rchange->sizediff > 0 ? "+" : "") . $rchange->sizediff;
@ -3729,6 +3732,8 @@ function render_recent_change($rchange)
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
if($rchange_type === "revert")
$resultClasses[] = "reversion";
$result .= "<a href='?page=" . rawurlencode($rchange->page) . ($revisionId !== false ? "&revision=$revisionId" : "") . "'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>"; $result .= "<a href='?page=" . rawurlencode($rchange->page) . ($revisionId !== false ? "&revision=$revisionId" : "") . "'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>";
break; break;

2
module_index.json
View file

@ -86,7 +86,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": 1523988221, "lastupdate": 1530617138,
"optional": false "optional": false
}, },
{ {

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

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Recent Changes", "name" => "Recent Changes",
"version" => "0.3.4", "version" => "0.3.5",
"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",
@ -238,8 +238,10 @@ function render_recent_change($rchange)
$result = ""; $result = "";
$resultClasses = []; $resultClasses = [];
switch(isset($rchange->type) ? $rchange->type : "edit") $rchange_type = isset($rchange->type) ? $rchange->type : "edit";
switch($rchange_type)
{ {
case "revert":
case "edit": case "edit":
// The number (and the sign) of the size difference to display // The number (and the sign) of the size difference to display
$size_display = ($rchange->sizediff > 0 ? "+" : "") . $rchange->sizediff; $size_display = ($rchange->sizediff > 0 ? "+" : "") . $rchange->sizediff;
@ -252,6 +254,8 @@ function render_recent_change($rchange)
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
if($rchange_type === "revert")
$resultClasses[] = "reversion";
$result .= "<a href='?page=" . rawurlencode($rchange->page) . ($revisionId !== false ? "&revision=$revisionId" : "") . "'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>"; $result .= "<a href='?page=" . rawurlencode($rchange->page) . ($revisionId !== false ? "&revision=$revisionId" : "") . "'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>";
break; break;

1
theme_default.css
View file

@ -130,6 +130,7 @@ summary { cursor: pointer; }
.move::before { content: "\\1f69a"; font-size: 1.25em; margin: 0 0.1em 0 -1.1em; } .move::before { content: "\\1f69a"; font-size: 1.25em; margin: 0 0.1em 0 -1.1em; }
.upload::before { content: "\\1f845"; margin: 0 0.1em 0 -1.1em; } .upload::before { content: "\\1f845"; margin: 0 0.1em 0 -1.1em; }
.new-comment::before { content: "\\1f4ac"; margin: 0 0.1em 0 -1.1em; } .new-comment::before { content: "\\1f4ac"; margin: 0 0.1em 0 -1.1em; }
.reversion::before { content: "\\23f2"; margin: 0 0.1em 0 -1.1em; }
.comments { padding: 1em 2em; background: hsl(31, 64%, 85%); box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); } .comments { padding: 1em 2em; background: hsl(31, 64%, 85%); box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); }
.comments textarea { background: hsl(270, 60%, 86%); } .comments textarea { background: hsl(270, 60%, 86%); }