Removed old-style taskbar injection

Double-toolbar in the viewer has gone. Some clean-up has to be performed after this change.
2026-05-24 23:05:03 -04:00 · 2022-08-11 17:03:57 +04:00
parent 9a193735fb
commit 40c496d401
7 changed files with 10 additions and 323 deletions
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -43,7 +43,6 @@ typedef std::vector<Resource> ResourceCollection;
 const ResourceCollection resources200Compressible{
  { WITH_ETAG, "/ROOT/" },

-  { WITH_ETAG, "/ROOT/skin/taskbar.js" },
  { WITH_ETAG, "/ROOT/skin/autoComplete.min.js" },
  { WITH_ETAG, "/ROOT/skin/css/autoComplete.css" },
  { WITH_ETAG, "/ROOT/skin/taskbar.css" },
@@ -55,8 +54,6 @@ const ResourceCollection resources200Compressible{

  { NO_ETAG,   "/ROOT/suggest?content=zimfile&term=ray" },

-  { NO_ETAG,   "/ROOT/catch/external?source=www.example.com" },
-
  { WITH_ETAG, "/ROOT/content/zimfile/A/index" },
  { WITH_ETAG, "/ROOT/content/zimfile/A/Ray_Charles" },

@@ -79,6 +76,8 @@ const ResourceCollection resources200Uncompressible{

  { NO_ETAG, "/ROOT/catalog/v2/illustration/6f1d19d0-633f-087b-fb55-7ac324ff9baf?size=48" },

+  { NO_ETAG,   "/ROOT/catch/external?source=www.example.com" },
+
  { WITH_ETAG, "/ROOT/content/zimfile/I/m/Ray_Charles_classic_piano_pose.jpg" },

  { WITH_ETAG, "/ROOT/content/corner_cases/A/empty.html" },
@@ -210,23 +209,13 @@ R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=2608
    },
    {
      /* url */ "/ROOT/content/zimfile/A/index",
-R"EXPECTEDRESULT(<link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/taskbar.css?cacheid=26082885" rel="Stylesheet" />
-<link type="text/css" href="/ROOT/skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
-<script type="text/javascript" src="/ROOT/skin/taskbar.js?cacheid=1aec4a68" defer></script>
-<script type="text/javascript" src="/ROOT/skin/autoComplete.min.js?cacheid=1191aaaf"></script>
-        <label for="kiwix_button_show_toggle"><img src="/ROOT/skin/caret.png?cacheid=22b942b4" alt=""></label>
-)EXPECTEDRESULT"
+      ""
    },
    {
      // Searching in a ZIM file without a full-text index returns
      // a page rendered from static/templates/no_search_result_html
      /* url */ "/ROOT/search?content=poor&pattern=whatever",
 R"EXPECTEDRESULT(    <link type="text/css" href="/ROOT/skin/search_results.css?cacheid=76d39c84" rel="Stylesheet" />
-  <link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/taskbar.css?cacheid=26082885" rel="Stylesheet" />
-<link type="text/css" href="/ROOT/skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
-<script type="text/javascript" src="/ROOT/skin/taskbar.js?cacheid=1aec4a68" defer></script>
-<script type="text/javascript" src="/ROOT/skin/autoComplete.min.js?cacheid=1191aaaf"></script>
-        <label for="kiwix_button_show_toggle"><img src="/ROOT/skin/caret.png?cacheid=22b942b4" alt=""></label>
 )EXPECTEDRESULT"
    },
  };
@@ -442,13 +431,8 @@ public:
  std::string expectedResponse() const;

 private:
-  bool isTranslatedVersion() const;
  virtual std::string pageTitle() const;
  std::string pageCssLink() const;
-  std::string hiddenBookNameInput() const;
-  std::string searchPatternInput() const;
-  std::string taskbarLinks() const;
-  std::string goToWelcomePageText() const;
 };

 std::string TestContentIn404HtmlResponse::expectedResponse() const
@@ -464,40 +448,8 @@ std::string TestContentIn404HtmlResponse::expectedResponse() const
 )FRAG",

    R"FRAG(
-  <link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/taskbar.css?cacheid=26082885" rel="Stylesheet" />
-<link type="text/css" href="/ROOT/skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
-<script type="text/javascript" src="/ROOT/skin/taskbar.js?cacheid=1aec4a68" defer></script>
-<script type="text/javascript" src="/ROOT/skin/autoComplete.min.js?cacheid=1191aaaf"></script>
-</head>
-  <body><span class="kiwix">
-  <span id="kiwixtoolbar" class="ui-widget-header">
-    <div class="kiwix_centered">
-      <div class="kiwix_searchform">
-        <form class="kiwixsearch" method="GET" action="/ROOT/search" id="kiwixsearchform">
-          )FRAG",
-
-  R"FRAG(
-          <label for="kiwixsearchbox">&#x1f50d;</label>
-)FRAG",
-
-  R"FRAG(        </form>
-      </div>
-        <input type="checkbox" id="kiwix_button_show_toggle">
-        <label for="kiwix_button_show_toggle"><img src="/ROOT/skin/caret.png?cacheid=22b942b4" alt=""></label>
-        <div class="kiwix_button_cont">
-            <a id="kiwix_serve_taskbar_library_button" title=")FRAG",
-
-  R"FRAG(" aria-label=")FRAG",
-
-  R"FRAG(" href="/ROOT/"><button>&#x1f3e0;</button></a>
-          )FRAG",
-
-  R"FRAG(
-        </div>
-    </div>
-  </span>
-</span>
-)FRAG",
+  <link type="root" href="/ROOT"></head>
+  <body>)FRAG",

  R"FRAG(  </body>
 </html>
@@ -509,18 +461,8 @@ std::string TestContentIn404HtmlResponse::expectedResponse() const
       + frag[1]
       + pageCssLink()
       + frag[2]
-       + hiddenBookNameInput()
-       + frag[3]
-       + searchPatternInput()
-       + frag[4]
-       + goToWelcomePageText()
-       + frag[5]
-       + goToWelcomePageText()
-       + frag[6]
-       + taskbarLinks()
-       + frag[7]
       + expectedBody
-       + frag[8];
+       + frag[3];
 }

 std::string TestContentIn404HtmlResponse::pageTitle() const
@@ -540,71 +482,6 @@ std::string TestContentIn404HtmlResponse::pageCssLink() const
       + R"(" rel="Stylesheet" />)";
 }

-std::string TestContentIn404HtmlResponse::hiddenBookNameInput() const
-{
-  return bookName.empty()
-       ? ""
-       : R"(<input type="hidden" name="content" value=")" + bookName + R"(" />)";
-}
-
-std::string TestContentIn404HtmlResponse::searchPatternInput() const
-{
-  const std::string searchboxTooltip = isTranslatedVersion()
-                                    ? "Որոնել '" + bookTitle + "'֊ում"
-                                    : "Search '" + bookTitle + "'";
-  return R"(          <input autocomplete="off" id="kiwixsearchbox" name="pattern" type="text" size="50" title=")"
-       + searchboxTooltip
-       + R"(" aria-label=")"
-       + searchboxTooltip
-       + R"(">
-)";
-}
-
-std::string TestContentIn404HtmlResponse::taskbarLinks() const
-{
-  if ( bookName.empty() )
-    return "";
-
-  const auto goToMainPageOfBook = isTranslatedVersion()
-                                ? "Դեպի '" + bookTitle + "'֊ի գլխավոր էջը"
-                                : "Go to the main page of '" + bookTitle + "'";
-
-  const std::string goToRandomPage = isTranslatedVersion()
-                                   ? "Բացել պատահական էջ"
-                                   : "Go to a randomly selected page";
-
-  return R"(<a id="kiwix_serve_taskbar_home_button" title=")"
-       + goToMainPageOfBook
-       + R"(" aria-label=")"
-       + goToMainPageOfBook
-       + R"(" href="/ROOT/)"
-       + bookName
-       + R"(/"><button>)"
-       + bookTitle
-       + R"(</button></a>
-          <a id="kiwix_serve_taskbar_random_button" title=")"
-       + goToRandomPage
-       + R"(" aria-label=")"
-       + goToRandomPage
-       + R"("
-            href="/ROOT/random?content=)"
-       + bookName
-       + R"("><button>&#x1F3B2;</button></a>)";
-}
-
-bool TestContentIn404HtmlResponse::isTranslatedVersion() const
-{
-  return url.find("userlang=hy") != std::string::npos;
-}
-
-std::string TestContentIn404HtmlResponse::goToWelcomePageText() const
-{
-  return isTranslatedVersion()
-       ? "Գրադարանի էջ"
-       : "Go to welcome page";
-}
-
-
 class TestContentIn400HtmlResponse : public TestContentIn404HtmlResponse
 {
 public:
@@ -1156,7 +1033,7 @@ TEST_F(ServerTest, RawEntry)
  p = zfs1_->GET("/ROOT/content/zimfile/A/Ray_Charles");
  EXPECT_EQ(200, p->status);
  EXPECT_NE(std::string(p->body), std::string(entry.getItem(true).getData()));
-  EXPECT_TRUE(p->body.find("taskbar") != std::string::npos);
+  EXPECT_TRUE(p->body.find("<link type=\"root\" href=\"/ROOT\">") != std::string::npos);
 }

 TEST_F(ServerTest, HeadMethodIsSupported)