Merge pull request #68 from kiwix/css_taskbar

Css taskbar
9 years ago · a210cb3a4b
parent 4a1b9cbfa9 63cb47247b
commit a210cb3a4b
4 changed files with 8 additions and 13 deletions
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@ -129,15 +129,11 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
        content,
        "<head>",
        replaceRegex(
-            RESOURCE::include_html_part, humanReadableBookId, "__CONTENT__"));
-    content = appendToFirstOccurence(
-        content,
-        "<head>",
-        "<style>" + RESOURCE::taskbar_css
-            + (noLibraryButtonFlag
-                   ? " #kiwix_serve_taskbar_library_button { display: none }"
-                   : "")
-            + "</style>");
+            RESOURCE::include_html_part, humanReadableBookId, "__CONTENT__")
+        + (noLibraryButtonFlag
+            ? "<style>#kiwix_serve_taskbar_library_button { display: none }</style>"
+            : "")
+    );
    if ( humanReadableBookId.empty() ) {
      content = appendToFirstOccurence(
          content,
--- a/static/server/global_taskbar.html.part
+++ b/static/server/global_taskbar.html.part
@ -1,5 +1,3 @@
-<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
-<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
 <span class="kiwix">
  <span id="kiwixtoolbar" class="ui-widget-header">
    <div class="kiwix_centered">
--- a/static/server/include.html.part
+++ b/static/server/include.html.part
@ -1,3 +1,6 @@
+<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
+<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
+<link type="text/css" href="/skin/taskbar.css" rel="Stylesheet" />
 <script type="text/javascript" src="/skin/jquery-ui/external/jquery/jquery.js"></script>
 <script type="text/javascript" src="/skin/jquery-ui/jquery-ui.min.js"></script>
 <script>
--- a/static/server/taskbar.html.part
+++ b/static/server/taskbar.html.part
@ -1,5 +1,3 @@
-<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
-<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
 <span class="kiwix">
  <span id="kiwixtoolbar" class="ui-widget-header">
    <div class="kiwix_centered">