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

Fight the build system to make open search work. I win! I should really consider upgrading it though.

Browse source
This commit is contained in:
Starbeamrainbowlabs 2017-06-06 21:33:11 +01:00
parent 3c2ef9895d
commit 677e1340aa
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/index.php
View file

@ -230,6 +230,7 @@ input[type=search] { width: 14rem; padding: 0.3rem 0.4rem; font-size: 1rem; colo
input[type=search]::-webkit-input-placeholder { color : rgba(255, 255, 255, 0.75); } input[type=search]::-webkit-input-placeholder { color : rgba(255, 255, 255, 0.75); }
input[type=button], input[type=submit] { cursor: pointer; } input[type=button], input[type=submit] { cursor: pointer; }
.sidebar + .main-container nav.bottom { position: relative; }
.sidebar { position: relative; z-index: 100; margin-top: 0.6rem; padding: 1rem 3rem 2rem 0.4rem; background: #9e7eb4; box-shadow: inset -0.6rem 0 0.8rem -0.5rem rgba(50, 50, 50, 0.5); } .sidebar { position: relative; z-index: 100; margin-top: 0.6rem; padding: 1rem 3rem 2rem 0.4rem; background: #9e7eb4; box-shadow: inset -0.6rem 0 0.8rem -0.5rem rgba(50, 50, 50, 0.5); }
.sidebar a { color: #ffa74d; } .sidebar a { color: #ffa74d; }
@ -1409,7 +1410,7 @@ class page_renderer
$result .= self::getJS(); $result .= self::getJS();
if(module_exists("feature-search")) if(module_exists("feature-search"))
$result .= "\t\t<link type='application/opensearchdescription+xml' rel='search' href='?action=opensearch-description' />\n"; $result .= "\t\t<link rel='search' type='application/opensearchdescription+xml' href='?action=opensearch-description' title='$settings->sitename Search' />\n";
if(!empty($settings->enable_math_rendering)) if(!empty($settings->enable_math_rendering))
{ {
@ -2067,7 +2068,10 @@ function render_sidebar($pageindex, $root_pagename = "")
// The current page is the same as the root page, skip it // The current page is the same as the root page, skip it
if($pagename == $root_pagename) if($pagename == $root_pagename)
continue; continue;
// If the page already appears on the sidebar, skip it
if(preg_match("/>$pagename<\a>/m", $result) === 1)
continue;
// If the part of the current pagename that comes after the root // If the part of the current pagename that comes after the root
// pagename has a slash in it, skip it as it is a sub-sub page. // pagename has a slash in it, skip it as it is a sub-sub page.
@ -3235,8 +3239,8 @@ register_module([
else else
header("content-type: text/plain"); header("content-type: text/plain");
exit(utf8_encode("<?xml version=\"1.0\" encoding=\"UTF-8\" exit('<?xml version="1.0" encoding="UTF-8"?' . '>' . // hack The build system strips it otherwise O.o I should really fix that.
<OpenSearchDescription xmlns=\"http://a9.com/-/spec/opensearch/1.1/\"> "\n<OpenSearchDescription xmlns=\"http://a9.com/-/spec/opensearch/1.1/\">
<ShortName>Search $settings->sitename</ShortName> <ShortName>Search $settings->sitename</ShortName>
<Description>Search $settings->sitename, which is powered by Pepperminty Wiki.</Description> <Description>Search $settings->sitename, which is powered by Pepperminty Wiki.</Description>
<Tags>$settings->sitename Wiki</Tags> <Tags>$settings->sitename Wiki</Tags>
@ -3247,7 +3251,7 @@ register_module([
<OutputEncoding>UTF-8</OutputEncoding> <OutputEncoding>UTF-8</OutputEncoding>
<Url type=\"text/html\" method=\"get\" template=\"$siteRoot?action=search&amp;query={searchTerms}&amp;offset={startIndex?}&amp;count={count}\" /> <Url type=\"text/html\" method=\"get\" template=\"$siteRoot?action=search&amp;query={searchTerms}&amp;offset={startIndex?}&amp;count={count}\" />
</OpenSearchDescription>")); </OpenSearchDescription>");
}); });
add_action("suggest-pages", function() { add_action("suggest-pages", function() {

2
core.php
View file

@ -1064,7 +1064,7 @@ class page_renderer
$result .= self::getJS(); $result .= self::getJS();
if(module_exists("feature-search")) if(module_exists("feature-search"))
$result .= "\t\t<link type='application/opensearchdescription+xml' rel='search' href='?action=opensearch-description' />\n"; $result .= "\t\t<link rel='search' type='application/opensearchdescription+xml' href='?action=opensearch-description' title='$settings->sitename Search' />\n";
if(!empty($settings->enable_math_rendering)) if(!empty($settings->enable_math_rendering))
{ {

4
module_index.json
View file

@ -41,7 +41,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds a sidebar to the left hand side of every page. Add '$settings->sidebar_show = true;' to your configuration, or append '&sidebar=yes' to the url to enable. Adding to the url sets a cookie to remember your setting.", "description": "Adds a sidebar to the left hand side of every page. Add '$settings->sidebar_show = true;' to your configuration, or append '&sidebar=yes' to the url to enable. Adding to the url sets a cookie to remember your setting.",
"id": "extra-sidebar", "id": "extra-sidebar",
"lastupdate": 1450704211, "lastupdate": 1496779827,
"optional": false "optional": false
}, },
{ {
@ -95,7 +95,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.", "description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.",
"id": "feature-search", "id": "feature-search",
"lastupdate": 1490304455, "lastupdate": 1496781067,
"optional": false "optional": false
}, },
{ {

6
modules/feature-search.php
View file

@ -256,8 +256,8 @@ register_module([
else else
header("content-type: text/plain"); header("content-type: text/plain");
exit(utf8_encode("<?xml version=\"1.0\" encoding=\"UTF-8\"?> exit('<?xml version="1.0" encoding="UTF-8"?' . '>' . // hack The build system strips it otherwise O.o I should really fix that.
<OpenSearchDescription xmlns=\"http://a9.com/-/spec/opensearch/1.1/\"> "\n<OpenSearchDescription xmlns=\"http://a9.com/-/spec/opensearch/1.1/\">
<ShortName>Search $settings->sitename</ShortName> <ShortName>Search $settings->sitename</ShortName>
<Description>Search $settings->sitename, which is powered by Pepperminty Wiki.</Description> <Description>Search $settings->sitename, which is powered by Pepperminty Wiki.</Description>
<Tags>$settings->sitename Wiki</Tags> <Tags>$settings->sitename Wiki</Tags>
@ -268,7 +268,7 @@ register_module([
<OutputEncoding>UTF-8</OutputEncoding> <OutputEncoding>UTF-8</OutputEncoding>
<Url type=\"text/html\" method=\"get\" template=\"$siteRoot?action=search&amp;query={searchTerms}&amp;offset={startIndex?}&amp;count={count}\" /> <Url type=\"text/html\" method=\"get\" template=\"$siteRoot?action=search&amp;query={searchTerms}&amp;offset={startIndex?}&amp;count={count}\" />
</OpenSearchDescription>")); </OpenSearchDescription>");
}); });
add_action("suggest-pages", function() { add_action("suggest-pages", function() {