From b613d2b2dcaadbe0795fd610ec536406e2993510 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Tue, 3 Jul 2018 12:54:57 +0100 Subject: [PATCH] Add moar icons to nav & more menus --- Changelog.md | 3 ++- build/index.php | 32 ++++++++++++++++---------------- module_index.json | 8 ++++---- modules/page-credits.php | 4 ++-- peppermint.guiconfig.json | 22 +++++++++++----------- theme_default.css | 2 +- 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index fe26f87..8cb09d6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -37,7 +37,8 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t - Tuned the default value for `search_characters_context` down to 75 (this won't be the case for existing wikis, so you'll need to adjust it manually) - Added new `search_characters_context_total` setting to control the maximum characters in a search context - The `index` action's output should now be formatted nicely. - - Restyled "matching tags" in the search results in the default stylesheet. + - Restyled "matching tags" in the search results in the default stylesheet + - Added moar icons to the nav / more menus. Delete the appropriate entries in `peppermint.json` to get the updated ones! ## v0.16 _(No changes since v0.16-beta1)_ diff --git a/build/index.php b/build/index.php index 5410b34..781216b 100644 --- a/build/index.php +++ b/build/index.php @@ -89,7 +89,7 @@ $guiConfig = <<<'GUICONFIG' ]}, "nav_links_extra": { "type": "nav", "description": "An array of additional links in the above format that will be shown under \"More\" subsection.", "default": [ [ - "🕓 Page History", + "⌛ Page History", "?action=history&page={page}" ], [ @@ -101,41 +101,41 @@ $guiConfig = <<<'GUICONFIG' "index.php?action=user-list" ], [ - "⇝ Random Page", + "🎊 Random Page", "?action=random" ], [ - "Recent changes", + "🗓 Recent changes", "?action=recent-changes" ], [ - "Statistics", + "📊 Statistics", "?action=stats" ], [ - "🡅 Upload", + "🌥 Upload", "index.php?action=upload" ], [ - "⌧ ◆Delete", + "◆ 🚫 Delete", "index.php?action=delete&page={page}" ], [ - "⎘ ◆Move", + "◆ 🚠 Move", "index.php?action=move&page={page}" ], [ - "🔐 ◆Toggle Protection", + "◆ 🔐 Toggle Protection", "index.php?action=protect&page={page}" ], [ - "⚙ ◆Edit master settings", + "◆ 🔧 Edit master settings", "index.php?action=configure" ] ]}, "nav_links_bottom": { "type": "nav", "description": "An array of links in the above format that will be shown at the bottom of the page.", "default": [ [ - "🖶 Printable version", + "🖨 Printable version", "index.php?action=view&mode=printable&page={page}" ], [ @@ -143,7 +143,7 @@ $guiConfig = <<<'GUICONFIG' "index.php?action=credits" ], [ - "Help", + "🚪 Help", "index.php?action=help" ] ]}, @@ -368,7 +368,7 @@ summary { cursor: pointer; } .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; } .new-comment::before { content: "\\1f4ac"; margin: 0 0.1em 0 -1.1em; } -.reversion::before { content: "\\23f2"; margin: 0 0.1em 0 -1.1em; } +.reversion::before { content: "\\231b"; 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 textarea { background: hsl(270, 60%, 86%); } @@ -405,7 +405,7 @@ if($settings->sessionprefix == "auto") ///////////////////////////////////////////////////////////////////////////// /** The version of Pepperminty Wiki currently running. */ $version = "v0.17-dev"; -$commit = "1cb72f3a4968fa7311c496c608b217730ed44ce1"; +$commit = "3581cc1437ab2b9033b10b84e896d829f0234985"; /// Environment /// /** Holds information about the current request environment. */ $env = new stdClass(); @@ -3479,7 +3479,7 @@ function history_add_revision(&$pageinfo, &$newsource, &$oldsource, $save_pagein register_module([ "name" => "Recent Changes", - "version" => "0.3.4", + "version" => "0.3.5", "author" => "Starbeamrainbowlabs", "description" => "Adds recent changes. Access through the 'recent-changes' action.", "id" => "feature-recent-changes", @@ -6370,7 +6370,7 @@ function generate_password($length) { register_module([ "name" => "Credits", - "version" => "0.7.8", + "version" => "0.7.9", "author" => "Starbeamrainbowlabs", "description" => "Adds the credits page. You *must* have this module :D", "id" => "page-credits", @@ -6505,7 +6505,7 @@ register_module([ $credits_html

Site status

- + diff --git a/module_index.json b/module_index.json index c1281f8..3739a1e 100755 --- a/module_index.json +++ b/module_index.json @@ -82,11 +82,11 @@ }, { "name": "Recent Changes", - "version": "0.3.4", + "version": "0.3.5", "author": "Starbeamrainbowlabs", "description": "Adds recent changes. Access through the 'recent-changes' action.", "id": "feature-recent-changes", - "lastupdate": 1530617138, + "lastupdate": 1530617266, "optional": false }, { @@ -145,11 +145,11 @@ }, { "name": "Credits", - "version": "0.7.8", + "version": "0.7.9", "author": "Starbeamrainbowlabs", "description": "Adds the credits page. You *must* have this module :D", "id": "page-credits", - "lastupdate": 1530530402, + "lastupdate": 1530618422, "optional": false }, { diff --git a/modules/page-credits.php b/modules/page-credits.php index 3e33b12..ea52f88 100644 --- a/modules/page-credits.php +++ b/modules/page-credits.php @@ -1,7 +1,7 @@ "Credits", - "version" => "0.7.8", + "version" => "0.7.9", "author" => "Starbeamrainbowlabs", "description" => "Adds the credits page. You *must* have this module :D", "id" => "page-credits", @@ -136,7 +136,7 @@ register_module([ $credits_html

Site status

Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar}Edit master settings, {$settings->admindisplaychar} Edit user table, Export as zip - Check for permission first)
Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar} 🔧 Edit master settings, {$settings->admindisplaychar} 👥 Edit user table, 🏛 Export as zip - Check for permission first)
Pepperminty Wiki version:$version
Number of pages:" . count(get_object_vars($pageindex)) . "
Number of modules:" . count($modules) . "
- + diff --git a/peppermint.guiconfig.json b/peppermint.guiconfig.json index c5adc38..d9f161a 100644 --- a/peppermint.guiconfig.json +++ b/peppermint.guiconfig.json @@ -66,7 +66,7 @@ ]}, "nav_links_extra": { "type": "nav", "description": "An array of additional links in the above format that will be shown under \"More\" subsection.", "default": [ [ - "🕓 Page History", + "⌛ Page History", "?action=history&page={page}" ], [ @@ -78,41 +78,41 @@ "index.php?action=user-list" ], [ - "⇝ Random Page", + "🎊 Random Page", "?action=random" ], [ - "Recent changes", + "🗓 Recent changes", "?action=recent-changes" ], [ - "Statistics", + "📊 Statistics", "?action=stats" ], [ - "🡅 Upload", + "🌥 Upload", "index.php?action=upload" ], [ - "⌧ ◆Delete", + "◆ 🚫 Delete", "index.php?action=delete&page={page}" ], [ - "⎘ ◆Move", + "◆ 🚠 Move", "index.php?action=move&page={page}" ], [ - "🔐 ◆Toggle Protection", + "◆ 🔐 Toggle Protection", "index.php?action=protect&page={page}" ], [ - "⚙ ◆Edit master settings", + "◆ 🔧 Edit master settings", "index.php?action=configure" ] ]}, "nav_links_bottom": { "type": "nav", "description": "An array of links in the above format that will be shown at the bottom of the page.", "default": [ [ - "🖶 Printable version", + "🖨 Printable version", "index.php?action=view&mode=printable&page={page}" ], [ @@ -120,7 +120,7 @@ "index.php?action=credits" ], [ - "Help", + "🚪 Help", "index.php?action=help" ] ]}, diff --git a/theme_default.css b/theme_default.css index 635148c..598d051 100644 --- a/theme_default.css +++ b/theme_default.css @@ -130,7 +130,7 @@ summary { cursor: pointer; } .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; } .new-comment::before { content: "\\1f4ac"; margin: 0 0.1em 0 -1.1em; } -.reversion::before { content: "\\23f2"; margin: 0 0.1em 0 -1.1em; } +.reversion::before { content: "\\231b"; 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 textarea { background: hsl(270, 60%, 86%); }
Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar}Edit master settings, {$settings->admindisplaychar} Edit user table, Export as zip - Check for permission first)
Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar} 🔧 Edit master settings, {$settings->admindisplaychar} 👥 Edit user table, 🏛 Export as zip - Check for permission first)
Pepperminty Wiki version:$version
Number of pages:" . count(get_object_vars($pageindex)) . "
Number of modules:" . count($modules) . "