kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 12:00:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from kiwix/dattaz-patch_issue_19_good

Browse Source 
Dattaz patch issue 19 good
This commit is contained in:
Kelson 2017-11-08 20:19:57 +01:00 committed by GitHub
commit 03bac00019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/kiwix-serve.cpp
View File

@ -162,9 +162,7 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
content = appendToFirstOccurence( content = appendToFirstOccurence(
content, content,
"<head>", "<head>",
replaceRegex( RESOURCE::include_html_part + (noLibraryButtonFlag
RESOURCE::include_html_part, humanReadableBookId, "__CONTENT__")
+ (noLibraryButtonFlag
? "<style>#kiwix_serve_taskbar_library_button { display: none }</style>" ? "<style>#kiwix_serve_taskbar_library_button { display: none }</style>"
: "") : "")
); );
@ -183,6 +181,7 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
"__CONTENT__")); "__CONTENT__"));
} }
content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__"); content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
} }
pthread_mutex_unlock(&regexLock); pthread_mutex_unlock(&regexLock);
} }

2
static/server/include.html.part
View File

@ -8,7 +8,7 @@
jk(function() { jk(function() {
jk( "#kiwixsearchbox" ).autocomplete({ jk( "#kiwixsearchbox" ).autocomplete({
source: "__ROOT_LOCATION__/suggest?content=__CONTENT__", source: "__ROOT_LOCATION__/suggest?content=__CONTENT_ESCAPED__",
dataType: "json", dataType: "json",
cache: false, cache: false,

2
static/server/taskbar.html.part
View File

@ -4,7 +4,7 @@
<div class="kiwix_button_wrapper"> <div class="kiwix_button_wrapper">
<a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>Library</button></a> <a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>Library</button></a>
<a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>Home</button></a> <a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>Home</button></a>
<a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT__"><button>Random</button></a> <a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPED__"><button>Random</button></a>
</div> </div>
<div class="kiwix_searchform"> <div class="kiwix_searchform">
<form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform"> <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">