Merge pull request #203 from kiwix/version_0.6.0

New version 0.6.0

.travis.yml

@@ -2,22 +2,11 @@ language: cpp
 dist: trusty
 sudo: required
 cache: ccache
-before_install:
-- eval "${MATRIX_EVAL}"
-- ${CXX} --version
 install: travis/install_deps.sh
 script: travis/compile.sh
 env:
-  global:
-    - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
   matrix:
     - PLATFORM="native_static"
     - PLATFORM="native_dyn"
     - PLATFORM="win32_static"
     - PLATFORM="win32_dyn"
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-5

Changelog

@@ -1,3 +1,22 @@
+kiwix-tools 0.6.0
+=================
+
+ * remove kiwix-install tool.
+
+kiwix-serve
+-----------
+
+ * Improved taskbar #160
+ * Fix global page when using the option `--nosearchbar`
+ * Return 404 for missing resources
+ * Fix compilation for gcc 4.8.
+
+kiwix-manage
+------------
+
+ * Returns proper exit code (not always 0)
+
+
 kiwix-tools 0.5.0
 =================
 
@@ -5,7 +24,7 @@ kiwix-tools 0.5.0
  * Compile without warning.
 
 
-kiwix-server
+kiwix-serve
 ------------
 
  * Serve metadata information using the "/meta" url.

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '0.5.0',
+  version : '0.6.0',
   license : 'GPL',
   default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 
@@ -11,7 +11,7 @@ if static_linkage
 endif
 
 thread_dep = dependency('threads')
-kiwixlib_dep = dependency('kiwix', version:'>=2.0.0', static:static_linkage)
+kiwixlib_dep = dependency('kiwix', version:'>=2.0.1', static:static_linkage)
 microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
 z_dep = dependency('zlib', static:static_linkage)
 

src/installer/kiwix-install.cpp

@@ -1,173 +0,0 @@
-/*
- * Copyright 2011-2014 Emmanuel Engelhart <kelson@kiwix.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <getopt.h>
-#include <kiwix/common/pathTools.h>
-#include <kiwix/manager.h>
-#include <kiwix/reader.h>
-
-enum supportedAction { NONE, ADDCONTENT };
-
-void usage()
-{
-  cout << "Usage: kiwix-install [--verbose] addcontent ZIM_PATH KIWIX_PATH"
-       << endl;
-  exit(1);
-}
-
-int main(int argc, char** argv)
-{
-  /* Init the variables */
-  const char* contentPath = NULL;
-  const char* kiwixPath = NULL;
-  supportedAction action = NONE;
-  bool verboseFlag = false;
-  int option_index = 0;
-  int c = 0;
-
-  /* Argument parsing */
-  while (42) {
-    static struct option long_options[]
-        = {{"verbose", no_argument, 0, 'v'}, {0, 0, 0, 0}};
-
-    if (c != -1) {
-      c = getopt_long(argc, argv, "vi", long_options, &option_index);
-
-      switch (c) {
-        case 'v':
-          verboseFlag = true;
-          break;
-      }
-    } else {
-      if (optind < argc) {
-        if (action == NONE) {
-          string actionString = argv[optind++];
-          if (actionString == "addcontent" || actionString == "ADDCONTENT") {
-            action = ADDCONTENT;
-          }
-        } else if (contentPath == NULL) {
-          contentPath = argv[optind++];
-        } else if (kiwixPath == NULL) {
-          kiwixPath = argv[optind++];
-        } else {
-          usage();
-        }
-      } else {
-        break;
-      }
-    }
-  }
-
-  /* Check if we have enough arguments */
-  if (contentPath == NULL || kiwixPath == NULL) {
-    usage();
-  }
-
-  /* Make the action */
-  if (action == ADDCONTENT) {
-    /* Check if the content path exists and is readable */
-    if (verboseFlag) {
-      std::cout << "Check if the ZIM file exists..." << std::endl;
-    }
-    if (!fileExists(contentPath)) {
-      cerr << "The content path '" << contentPath
-           << "' does not exist or is not readable." << endl;
-      exit(1);
-    }
-
-    /* Check if this is a ZIM file */
-    try {
-      if (verboseFlag) {
-        std::cout << "Check if the ZIM file is valid..." << std::endl;
-      }
-      kiwix::Reader* reader = new kiwix::Reader(contentPath);
-      delete reader;
-    } catch (exception& e) {
-      cerr << "The content available at '" << contentPath
-           << "' is not a ZIM file." << endl;
-      exit(1);
-    }
-    string contentFilename = getLastPathElement(contentPath);
-
-    /* Check if kiwixPath/kiwix/kiwix.exe exists */
-    if (verboseFlag) {
-      std::cout << "Check if the Kiwix path is valid..." << std::endl;
-    }
-    string kiwixBinaryPath = computeAbsolutePath(kiwixPath, "kiwix/kiwix.exe");
-    if (!fileExists(kiwixBinaryPath)) {
-      kiwixBinaryPath = computeAbsolutePath(kiwixPath, "kiwix/kiwix");
-      if (!fileExists(kiwixBinaryPath)) {
-        cerr << "Unable to find the Kiwix binary at '" << kiwixBinaryPath
-             << "[.exe]'." << endl;
-        exit(1);
-      }
-    }
-
-    /* Check if the directory "data" structure exists */
-    if (verboseFlag) {
-      std::cout << "Check the target data directory structure..." << std::endl;
-    }
-    string dataPath = computeAbsolutePath(kiwixPath, "data/");
-    if (!fileExists(dataPath)) {
-      makeDirectory(dataPath);
-    }
-
-    /* Check if the directory "data/content" structure exists */
-    string dataContentPath = computeAbsolutePath(kiwixPath, "data/content/");
-    if (!fileExists(dataContentPath)) {
-      makeDirectory(dataContentPath);
-    }
-
-    /* Check if the directory "data/library" structure exists */
-    string dataLibraryPath = computeAbsolutePath(kiwixPath, "data/library/");
-    if (!fileExists(dataLibraryPath)) {
-      makeDirectory(dataLibraryPath);
-    }
-
-    /* Copy the file to the data/content directory */
-    if (verboseFlag) {
-      std::cout << "Copy ZIM file to the target directory..." << std::endl;
-    }
-    string newContentPath
-        = computeAbsolutePath(dataContentPath, contentFilename);
-    if (!fileExists(newContentPath)
-        || getFileSize(contentPath) != getFileSize(newContentPath)) {
-      copyFile(contentPath, newContentPath);
-    }
-
-    /* Add the file to the library.xml */
-    if (verboseFlag) {
-      std::cout << "Create the library XML file..." << std::endl;
-    }
-    kiwix::Manager libraryManager;
-    string libraryPath
-        = computeAbsolutePath(dataLibraryPath, contentFilename + ".xml");
-    string bookId = libraryManager.addBookFromPathAndGetId(
-        newContentPath, "../content/" + contentFilename, "", false);
-    if (!bookId.empty()) {
-      libraryManager.setCurrentBookId(bookId);
-      libraryManager.writeFile(libraryPath);
-    } else {
-      cerr << "Unable to build or save library file '" << libraryPath << "'"
-           << endl;
-    }
-  }
-
-  exit(0);
-}

src/installer/meson.build

@@ -1,4 +0,0 @@
-executable('kiwix-install', ['kiwix-install.cpp'],
-  dependencies:all_deps,
-  install:true,
-  install_rpath: join_paths(get_option('prefix'), get_option('libdir')))

src/man/fr/kiwix-install.1

@@ -1,40 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix\-install \- Installeur de fichiers ZIM
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix\-install [\-\-verbose|-v] [\-\-backend|\-b=xapian|clucene] [\-\-buildIndex|\-i] addcontent ZIM_PATH KIWIX_PATH
-.SH DESCRIPTION
-.PP
-Créé une arborescence contenant Kiwix et des données pour redistribution.
-.br
-Si demandé, créé aussi un index plein texte.
-
-.TP
-\fB\-\-verbose\fR
-Active le mode verbeux de la sortie.
-
-.TP
-\fB\-\-backend=xapian|clucene\fR
-Séléctionne un moteur d'indexation.
-
-.TP
-\fB\-\-buildIndex\fR
-Créer un index plein texte pour le fichier ZIM.
-
-.TP
-\fBZIM_PATH\fR
-Chemin du fichier de contenu ZIM.
-
-.TP
-\fBKIWIX_PATH\fR
-Chemin d'accès dossier kiwix/.
-.br
-Le chemin doit contenit le binaire statique de Kiwix.
-
-.SH SEE ALSO
-kiwix(1) kiwix\-serve(1) kiwix\-manage(1)
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/kiwix.1

@@ -1,52 +0,0 @@
-.TH KIWIX 1 "12 juin 2012"
-.SH NAME
-Kiwix \- Lecteur hors-ligne de fichiers ZIM
-.SH SYNOPSIS
-.B kiwix [-jsconsole] [-articleByUrl] [-articleByTitle] [FILE]
-.SH DESCRIPTION
-.PP
-Kiwix est un lecteur de content au format ZIM.
-.br
-Les fichiers ZIM sont des archives de contenus compressés (généralement HTML)
-.br
-Les fichiers ZIM les plus populaires sont ceux de Wikipédia et Wikileaks.
-
-.TP
-\fB\-jsconsole\fR
-Active la console de debogage JavaScript de Xulrunner.
-\fB\-articleByUrl url\fR
-Ouvre un article en particulier en renseignant son url. FILE doit être donné.
-.TP
-\fB\-articleByTitle title\fR
-Ouvre un article en particulier en renseignant son titre. FILE doit être donné.
-
-.PP
-Fonctionnalités:
- * Lecteur de ZIM natif
- * Moteur de recherche plein texte
- * Signets et Notes
- * Serveur Web pour diffuser les fichiers ZIM sur le réseau
- * Export HTML et PDF
- * Traduits dans de nombreuses langues
- * Suggestions de recherche
- * Indexation des fichiers ZIM
- * Onglets de navigation
- * Bibliothèque de contenus intégrée
-
-.SH SEE ALSO
-kiwix\-install(1) kiwix\-serve(1)
-.br
-kiwix\-manage(1)
-
-
-.SH TROUBLESHOOTING
-Aller à http://reportabug.kiwix.org pour plus de détails sur comment rapporter un bogue.
-
-.SH AUTHORS
- Emmanuel Engelhart <kelson@kiwix.org>
- Guillaume Duhamel <gduhamel@linterweb.com>
- Fabien Coullon <fcoulon@linterweb.com>
- Renaud Gaudin <rgaudin@gmail.com>
- Wilfredo Rodriguez <wilfredor@kiwix.org>
-.br
- Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/fr/meson.build

@@ -1,4 +1,3 @@
-install_man('kiwix-install.1',
-            'kiwix-manage.1',
+install_man('kiwix-manage.1',
             'kiwix-serve.1',
-            install_dir:get_option('mandir')+'/fr/man1')
+            install_dir:get_option('mandir')+'/fr/man1')

src/man/kiwix-install.1

@@ -1,40 +0,0 @@
-.TH KIWIX 1 "21 May 2012"
-.SH NAME
-kiwix\-install \- Kiwix ZIM Installer
-.SH SYNOPSIS
-.IX Header SYNOPSIS
-kiwix\-install [\-\-verbose|-v] [\-\-backend|\-b=xapian|clucene] [\-\-buildIndex|\-i] addcontent ZIM_PATH KIWIX_PATH
-.SH DESCRIPTION
-.PP
-Creates a standalone Kiwix + data hierarchy.
-.br
-If specified, also creates a full\-text index.
-
-.TP
-\fB\-\-verbose\fR
-Enable verbose output.
-
-.TP
-\fB\-\-backend=xapian|clucene\fR
-Select an indexing backend.
-
-.TP
-\fB\-\-buildIndex\fR
-Build an index for the ZIM file.
-
-.TP
-\fBZIM_PATH\fR
-ZIM content file path.
-
-.TP
-\fBKIWIX_PATH\fR
-Path to the kiwix/ folder.
-.br
-The path must contain the kiwix standalone binary.
-
-.SH SEE ALSO
-kiwix(1) kiwix\-serve(1) kiwix\-manage(1)
-.SH AUTHOR
-Emmanuel Engelhart <kelson@kiwix.org>
-.br
-Vasudev Kamath <kamathvasudev@gmail.com> (Manual)

src/man/meson.build

@@ -1,4 +1,3 @@
-install_man('kiwix-install.1',
-            'kiwix-manage.1',
+install_man('kiwix-manage.1',
             'kiwix-serve.1')
 subdir('fr')

src/manager/kiwix-manage.cpp

@@ -68,13 +68,14 @@ void usage()
 }
 
 
-void handle_show(kiwix::Manager* libraryManager, const std::string& libraryPath,
+bool handle_show(kiwix::Manager* libraryManager, const std::string& libraryPath,
                  int argc, char* argv[])
 {
   show(libraryManager->cloneLibrary());
+  return(0);
 }
 
-void handle_add(kiwix::Manager* libraryManager, const std::string& libraryPath,
+bool handle_add(kiwix::Manager* libraryManager, const std::string& libraryPath,
                 int argc, char* argv[])
 {
   string zimPath;
@@ -86,6 +87,7 @@ void handle_add(kiwix::Manager* libraryManager, const std::string& libraryPath,
   bool setCurrent = false;
   int option_index = 0;
   int c = 0;
+  bool resultCode = 0;
 
   if (argc > 3) {
     zimPath = argv[3];
@@ -153,17 +155,22 @@ void handle_add(kiwix::Manager* libraryManager, const std::string& libraryPath,
      } else {
       cerr << "Unable to build or save library file '" << libraryPath << "'"
            << endl;
+      resultCode = 1;
     }
   } else {
     std::cerr << "Invalid zim file path" << std::endl;
+    resultCode = 1;
   }
+
+  return(resultCode);
 }
 
-void handle_remove(kiwix::Manager* libraryManager, const std::string& libraryPath,
+bool handle_remove(kiwix::Manager* libraryManager, const std::string& libraryPath,
                    int argc, char* argv[])
 {
   unsigned int bookIndex = 0;
   const unsigned int totalBookCount = libraryManager->getBookCount(true, true);
+  bool exitCode = 0;
 
   if (argc > 3) {
     bookIndex = atoi(argv[3]);
@@ -176,12 +183,16 @@ void handle_remove(kiwix::Manager* libraryManager, const std::string& libraryPat
       std::cerr
           << "Invalid book index number. Please give a number between 1 and "
           << totalBookCount << std::endl;
+      exitCode = 1;
     } else {
       std::cerr
           << "Invalid book index number. Library is empty, no book to delete."
           << std::endl;
+      exitCode = 1;
     }
   }
+
+  return(exitCode);
 }
 
 int main(int argc, char** argv)
@@ -216,12 +227,13 @@ int main(int argc, char** argv)
   libraryManager.readFile(libraryPath, false);
 
   /* SHOW */
+  bool exitCode = 0;
   if (action == SHOW) {
-    handle_show(&libraryManager, libraryPath, argc, argv);
+    exitCode = handle_show(&libraryManager, libraryPath, argc, argv);
   } else if (action == ADD) {
-    handle_add(&libraryManager, libraryPath, argc, argv);
+    exitCode = handle_add(&libraryManager, libraryPath, argc, argv);
   } else if (action == REMOVE) {
-    handle_remove(&libraryManager, libraryPath, argc, argv);
+    exitCode = handle_remove(&libraryManager, libraryPath, argc, argv);
   }
 
   /* Rewrite the library file */
@@ -229,5 +241,5 @@ int main(int argc, char** argv)
     libraryManager.writeFile(libraryPath);
   }
 
-  exit(0);
+  exit(exitCode);
 }

src/meson.build

@@ -1,5 +1,4 @@
 
-subdir('installer')
 subdir('manager')
 subdir('reader')
 subdir('searcher')

src/server/kiwix-serve.cpp

@@ -105,6 +105,27 @@ static pthread_mutex_t searchLock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t compressorLock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t regexLock = PTHREAD_MUTEX_INITIALIZER;
 
+template<typename T>
+inline std::string _tostring(const T& value)
+{
+    std::ostringstream stream;
+    stream << value;
+    return stream.str();
+}
+
+
+std::pair<kiwix::Reader*, kiwix::Searcher*>
+get_from_humanReadableBookId(const std::string& humanReadableBookId) {
+  kiwix::Searcher* searcher
+        = searchers.find(humanReadableBookId) != searchers.end()
+              ? searchers.find(humanReadableBookId)->second
+              : globalSearcher;
+  kiwix::Reader* reader = readers.find(humanReadableBookId) != readers.end()
+                                ? readers.find(humanReadableBookId)->second
+                                : NULL;
+  return std::pair<kiwix::Reader*, kiwix::Searcher*>(reader, searcher);
+}
+
 /* Try to get the mimeType from the file extension */
 static std::string getMimeTypeForFile(const std::string& filename)
 {
@@ -138,7 +159,10 @@ static bool startswith(const std::string& base, const std::string& start)
 
 void introduceTaskbar(string& content, const string& humanReadableBookId)
 {
+  string zimTitle;
+
   pthread_mutex_lock(&regexLock);
+
   if (!noSearchBarFlag) {
     content = appendToFirstOccurence(
         content,
@@ -160,10 +184,18 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
              RESOURCE::taskbar_html_part,
              humanReadableBookId,
              "__CONTENT__"));
+
+      auto reader = get_from_humanReadableBookId(humanReadableBookId).first;
+      if (reader != nullptr) {
+        zimTitle = reader->getTitle();
+      }
     }
-    content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
-    content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
   }
+
+  content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
+  content = replaceRegex(content, replaceRegex(zimTitle, "%26", "&"), "__ZIM_TITLE__");
+  content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
+
   pthread_mutex_unlock(&regexLock);
 }
 
@@ -352,7 +384,7 @@ static struct MHD_Response* build_callback_response_from_entry(
   MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_RANGE, oss.str().c_str());
 
   MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_LENGTH,
-    std::to_string(range_len).c_str());
+    _tostring(range_len).c_str());
 
   /* Specify the mime type */
   MHD_add_response_header(
@@ -369,18 +401,6 @@ static struct MHD_Response* build_callback_response_from_entry(
   return response;
 }
 
-std::pair<kiwix::Reader*, kiwix::Searcher*>
-get_from_humanReadableBookId(const std::string& humanReadableBookId) {
-  kiwix::Searcher* searcher
-        = searchers.find(humanReadableBookId) != searchers.end()
-              ? searchers.find(humanReadableBookId)->second
-              : globalSearcher;
-  kiwix::Reader* reader = readers.find(humanReadableBookId) != readers.end()
-                                ? readers.find(humanReadableBookId)->second
-                                : NULL;
-  return std::pair<kiwix::Reader*, kiwix::Searcher*>(reader, searcher);
-}
-
 static struct MHD_Response* handle_meta(RequestContext* request)
 {
   std::string humanReadableBookId;
@@ -443,7 +463,7 @@ static struct MHD_Response* handle_suggest(RequestContext* request)
     humanReadableBookId = request->get_argument("content");
     term = request->get_argument("term");
   } catch (const std::out_of_range&) {
-    return build_homepage(request);
+    return build_404(request, "");
   }
 
   if (isVerbose.load()) {
@@ -628,12 +648,12 @@ static struct MHD_Response* handle_random(RequestContext* request)
   try {
     humanReadableBookId = request->get_argument("content");
   } catch (const std::out_of_range&) {
-    return build_homepage(request);
+    return build_404(request, "");
   }
 
   auto reader = get_from_humanReadableBookId(humanReadableBookId).first;
   if (reader == nullptr) {
-    return build_homepage(request);
+    return build_404(request, "");
   }
 
   try {
@@ -728,7 +748,11 @@ static struct MHD_Response* handle_content(RequestContext* request)
 
   auto reader = get_from_humanReadableBookId(humanReadableBookId).first;
   if (reader == nullptr) {
-    return build_homepage(request);
+    if (humanReadableBookId.size() == 0){
+        return build_homepage(request);
+    } else {
+        return build_404(request, "");
+    }
   }
 
   auto urlStr = request->get_url().substr(humanReadableBookId.size()+1);
@@ -842,7 +866,7 @@ static int accessHandlerCallback(void* cls,
   request.httpResponseCode = request.has_range() ? MHD_HTTP_PARTIAL_CONTENT : MHD_HTTP_OK;
 
   if (! request.is_valid_url()) {
-    response = build_homepage(&request);
+    response = build_404(&request, "");
   } else {
     if (startswith(request.get_url(), "/skin/")) {
       response = handle_skin(&request);

src/server/request_context.cpp

@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdexcept>
 #include <sstream>
+#include <cstdio>
 
 RequestContext::RequestContext(struct MHD_Connection* connection,
                                std::string rootLocation,
@@ -196,16 +197,6 @@ std::string RequestContext::get_argument(const std::string& name) {
   return arguments.at(name);
 }
 
-template<>
-unsigned int RequestContext::get_argument(const std::string& name) {
-  return std::stoi(arguments.at(name).c_str());
-}
-
-template<>
-float RequestContext::get_argument(const std::string& name) {
-  return std::stof(arguments.at(name).c_str());
-}
-
 std::string RequestContext::get_header(const std::string& name) {
   return headers.at(name);
 }

src/server/request_context.h

@@ -62,7 +62,13 @@ class RequestContext {
 
     std::string get_header(const std::string& name);
     template<typename T=std::string>
-    T get_argument(const std::string& name);
+    T get_argument(const std::string& name) {
+        std::istringstream stream(arguments.at(name));
+        T v;
+        stream >> v;
+        return v;
+    }
+
 
     RequestMethod get_method();
     std::string get_url();
@@ -96,5 +102,7 @@ class RequestContext {
     static int fill_argument(void *, enum MHD_ValueKind, const char*, const char*);
 };
 
+template<> std::string RequestContext::get_argument(const std::string& name);
+
 
 #endif //REQUEST_CONTEXT_H

static/server/global_taskbar.html.part

@@ -4,7 +4,7 @@
       <div class="kiwix_searchform">
         <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">
           <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-          <input type="submit" value="Search">
+          <input type="submit" value="&#x1f50d;">
         </form>
       </div>
     </div>

static/server/taskbar.html.part

@@ -2,15 +2,15 @@
   <span id="kiwixtoolbar" class="ui-widget-header">
     <div class="kiwix_centered">
       <div class="kiwix_button_wrapper">
-        <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_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPED__"><button>Random</button></a>
+        <a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>&#x1f3e0;</button></a>
+        <a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>__ZIM_TITLE__</button></a>
+        <a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPED__"><button>&#x1F3B2;</button></a>
       </div>
       <div class="kiwix_searchform">
         <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">
           <input type="hidden" name="content" value="__CONTENT__" />
           <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-          <input type="submit" value="Search">
+          <input type="submit" value="&#x1f50d;">
         </form>
       </div>
     </div>