diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index a0d0f4a..c618cba 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -85,7 +85,8 @@ extern "C" { using namespace std; -static bool nosearchbarFlag = false; +static bool noLibraryButtonFlag = false; +static bool noSearchBarFlag = false; static string welcomeHTML; static bool verboseFlag = false; static std::map extMimeTypes; @@ -120,12 +121,16 @@ static std::string getMimeTypeForFile(const std::string& filename) { } void introduceTaskbar(string &content, const string &humanReadableBookId) { - if (!nosearchbarFlag) { + if (!noSearchBarFlag) { content = appendToFirstOccurence(content, "", replaceRegex(RESOURCE::include_html_part, humanReadableBookId, "__CONTENT__")); - content = appendToFirstOccurence(content, "", ""); + content = appendToFirstOccurence(content, + "", + ""); content = appendToFirstOccurence(content, "]*>", replaceRegex(RESOURCE::taskbar_html_part, humanReadableBookId, "__CONTENT__")); @@ -713,6 +718,7 @@ int main(int argc, char **argv) { {"daemon", no_argument, 0, 'd'}, {"verbose", no_argument, 0, 'v'}, {"library", no_argument, 0, 'l'}, + {"nolibrarybutton", no_argument, 0, 'm'}, {"nosearchbar", no_argument, 0, 'n'}, {"index", required_argument, 0, 'i'}, {"attachToProcess", required_argument, 0, 'a'}, @@ -724,7 +730,7 @@ int main(int argc, char **argv) { /* Argument parsing */ while (true) { int option_index = 0; - int c = getopt_long(argc, argv, "ndvli:a:p:f:", long_options, &option_index); + int c = getopt_long(argc, argv, "mndvli:a:p:f:", long_options, &option_index); if (c != -1) { @@ -739,7 +745,10 @@ int main(int argc, char **argv) { libraryFlag = true; break; case 'n': - nosearchbarFlag = true; + noSearchBarFlag = true; + break; + case 'm': + noLibraryButtonFlag = true; break; case 'i': indexPath = optarg; @@ -771,8 +780,8 @@ int main(int argc, char **argv) { /* Print usage)) if necessary */ if (zimPathes.empty() && libraryPath.empty()) { - cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] [--nosearchbar] [--daemon] [--attachToProcess=PID] [--interface=IF_NAME] ZIM_PATH+" << endl; - cerr << " kiwix-serve --library [--port=PORT] [--verbose] [--daemon] [--nosearchbar] [--attachToProcess=PID] [--interface=IF_NAME] LIBRARY_PATH" << endl; + cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] [--nosearchbar] [--nolibrarybutton] [--daemon] [--attachToProcess=PID] [--interface=IF_NAME] ZIM_PATH+" << endl; + cerr << " kiwix-serve --library [--port=PORT] [--verbose] [--daemon] [--nosearchbar] [--nolibrarybutton] [--attachToProcess=PID] [--interface=IF_NAME] LIBRARY_PATH" << endl; cerr << "\n If you set more than one ZIM_PATH, you cannot set a INDEX_PATH." << endl; exit(1); } diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part index 832e623..5b52eaa 100644 --- a/static/server/taskbar.html.part +++ b/static/server/taskbar.html.part @@ -4,9 +4,9 @@
- - - + + +