From 3cdc0368589018feb569560b351f7a16f1d0a139 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Thu, 5 Sep 2024 13:27:17 +0400 Subject: [PATCH] Updated nojs library page ... to keep it in sync with the JSful library page that has been modified in the previous commit. --- static/skin/index.css | 2 +- static/templates/no_js_library_page.html | 52 +++++----- test/library_server.cpp | 116 +++++++++++++---------- test/server.cpp | 4 +- 4 files changed, 93 insertions(+), 81 deletions(-) diff --git a/static/skin/index.css b/static/skin/index.css index ff90b5711..191a071b2 100644 --- a/static/skin/index.css +++ b/static/skin/index.css @@ -231,6 +231,7 @@ position: relative; width: var(--tile-width); left: calc(0px - var(--tile-border-width)); + text-decoration: none; } .book__download > img { @@ -239,7 +240,6 @@ } .book__download > span { - text-decoration: none; position: relative; font-family: roboto; color: white; diff --git a/static/templates/no_js_library_page.html b/static/templates/no_js_library_page.html index cb7479298..dd34a9b7f 100644 --- a/static/templates/no_js_library_page.html +++ b/static/templates/no_js_library_page.html @@ -50,20 +50,11 @@ pointer-events: none; } - .book__link__wrapper { - grid-column: 1 / 3; - grid-row: 1 / 3; - } - - .book__link { - grid-row: 2 / 3; - } - .kiwixHomeBody__results { flex-basis: 100%; } - #book__title>a, .book__download a { + #book__title>a { text-decoration: none; all: unset; } @@ -117,25 +108,32 @@

{{translations.count-of-matching-books}}

{{#books}}
-
-
-
-
{{title}}
- {{#downloadAvailable}} -
{{translations.download}}
- {{/downloadAvailable}} -
- -
{{description}}
- + +
+
+
+
{{title}}
+
+
{{description}}
+
+ +
+
{{langCode}}
+
+ {{#tagList}} + {{tag}} + {{/tagList}} +
-
{{langCode}}
-
- {{#tagList}} - {{tag}} - {{/tagList}}
-
+ {{#downloadAvailable}} +
+ + + {{translations.download}} + +
+ {{/downloadAvailable}}
{{/books}}
diff --git a/test/library_server.cpp b/test/library_server.cpp index 83d138de9..2d52e5c15 100644 --- a/test/library_server.cpp +++ b/test/library_server.cpp @@ -1033,7 +1033,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access) " />\n" \ " \n" \ " \n" \ @@ -1066,17 +1066,10 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access) " .tag__link {\n" \ " pointer-events: none;\n" \ " }\n\n" \ - " .book__link__wrapper {\n" \ - " grid-column: 1 / 3;\n" \ - " grid-row: 1 / 3;\n" \ - " }\n\n" \ - " .book__link {\n" \ - " grid-row: 2 / 3;\n" \ - " }\n\n" \ " .kiwixHomeBody__results {\n" \ " flex-basis: 100%;\n" \ " }\n\n" \ - " #book__title>a, .book__download a {\n" \ + " #book__title>a {\n" \ " text-decoration: none;\n" \ " all: unset;\n" \ " }\n" \ @@ -1087,62 +1080,83 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access) #define CHARLES_RAY_BOOK_HTML \ "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
Charles, Ray
\n" \ - "
Download
\n" \ - "
\n" \ - " \n" \ - "
Wikipedia articles about Ray Charles
\n" \ - " \n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
Charles, Ray
\n" \ + "
\n" \ + "
Wikipedia articles about Ray Charles
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
fra
\n" \ + "
\n" \ + " unittest\n" \ + " wikipedia\n" \ + "
\n" \ "
\n" \ - "
fra
\n" \ - "
\n" \ - " unittest\n" \ - " wikipedia\n" \ "
\n" \ - "
\n" \ + " \n" \ "
\n" #define RAY_CHARLES_BOOK_HTML \ "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
Ray Charles
\n" \ - "
Download
\n" \ - "
\n" \ - " \n" \ - "
Wikipedia articles about Ray Charles
\n" \ - " \n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
Ray Charles
\n" \ + "
\n" \ + "
Wikipedia articles about Ray Charles
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
eng
\n" \ + "
\n" \ + " public_tag_without_a_value\n" \ + " wikipedia\n" \ + "
\n" \ "
\n" \ - "
eng
\n" \ - "
\n" \ - " public_tag_without_a_value\n" \ - " wikipedia\n" \ "
\n" \ - "
\n" \ + " \n" \ "
\n" #define RAY_CHARLES_UNCTZ_BOOK_HTML \ "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
Ray (uncategorized) Charles
\n" \ - "
Download
\n" \ - "
\n" \ - " \n" \ - "
No category is assigned to this library entry.
\n" \ - " \n" \ + " \n" \ + "
\n" \ + "
\n" \ + "
\n" \ + "
Ray (uncategorized) Charles
\n" \ + "
\n" \ + "
No category is assigned to this library entry.
\n" \ + "
\n" \ + " \n" \ + "
\n" \ + "
rus,eng
\n" \ + "
\n" \ + " public_tag_with_a_value:value_of_a_public_tag\n" \ + " wikipedia\n" \ + "
\n" \ "
\n" \ - "
rus,eng
\n" \ - "
\n" \ - " public_tag_with_a_value:value_of_a_public_tag\n" \ - " wikipedia\n" \ "
\n" \ - "
\n" \ + " \n" \ "
\n" #define FINAL_HTML_TEXT \ diff --git a/test/server.cpp b/test/server.cpp index ed4f71e9d..5c73d2c37 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -61,7 +61,7 @@ const ResourceCollection resources200Compressible{ { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/i18n.js?cacheid=071abc9a" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" }, - { STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=a534f84d" }, + { STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=ae79e41a" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=8f4b6a1e" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" }, @@ -281,7 +281,7 @@ TEST_F(ServerTest, CacheIdsOfStaticResources) { /* url */ "/ROOT%23%3F/", R"EXPECTEDRESULT( href="/ROOT%23%3F/skin/kiwix.css?cacheid=2158fad9" - href="/ROOT%23%3F/skin/index.css?cacheid=a534f84d" + href="/ROOT%23%3F/skin/index.css?cacheid=ae79e41a"