Got rid of static/templates/no_search_result.html #744
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I extracted these two commits into a PR of their own because they interfere with #712. In #712 (review) @mgautierfr asked a question which proved to be prophetic:
As a result of unifying various error templates, now we have to generate a link to a static resource from C++ code (see 53f5a3d#diff-9e3da86d6232708bc11700bf2326552f6ad16b40c029c3ac138470bf4e7d9be7R602). At this point the easiest solution seems to preserve no_search_result.html as a separate template. I have published this PR so that we can discuss it together with #712. |
This was referenced Apr 5, 2022
mgautierfr
requested changes
Apr 6, 2022
There was a problem hiding this comment.
We should just change the details message but else we are good.
The question about the md5id in cpp is interesting but this PR is working as it is, and we should discuss about this in #712. So this is not a blocker for this PR.
Codecov Report
@@ Coverage Diff @@
## master #744 +/- ##
==========================================
+ Coverage 59.98% 60.47% +0.48%
==========================================
Files 56 56
Lines 3724 3724
Branches 2057 2058 +1
==========================================
+ Hits 2234 2252 +18
+ Misses 1489 1471 -18
Partials 1 1
Continue to review full report at Codecov.
|
The "Fulltext search unavailable" error page is now generated using the static/templates/error.html template. Also added two test cases checking that error page.
mgautierfr
force-pushed
the
fullsearch_text_unavailable_error
branch
from
6e79a66 to
ae1bf39
Compare
mgautierfr
approved these changes
Apr 6, 2022
|
Rebased/fixup on master |
veloman-yunkan
added a commit
that referenced
this pull request
May 8, 2022
In #727 inline CSS [was extracted](e4a4b2f) from `static/templates/no_search_result.html` into a separate stylesheet resource. The purpose was to later 1. get rid of the custom `static/templates/no_search_result.html` error template and use a general purpose error template instead (this was accomplished by PR #744). 2. deduplicate the CSS code between `static/templates/no_search_result.html` and `static/templates/search_result.html` by making the latter to also refer to an internal CSS resource rather than containing inline stylesheet code. While preparing to implement the 2nd point, I figured out that `kiwix::SearchRenderer` is used as a component in `kiwix-desktop` too, which probably would be upset by a link to a libkiwix's internal CSS resource. This commit documents that finding.
veloman-yunkan
added a commit
that referenced
this pull request
May 10, 2022
In #727 inline CSS [was extracted](e4a4b2f) from `static/templates/no_search_result.html` into a separate stylesheet resource. The purpose was to later 1. get rid of the custom `static/templates/no_search_result.html` error template and use a general purpose error template instead (this was accomplished by PR #744). 2. deduplicate the CSS code between `static/templates/no_search_result.html` and `static/templates/search_result.html` by making the latter to also refer to an internal CSS resource rather than containing inline stylesheet code. While preparing to implement the 2nd point, I figured out that `kiwix::SearchRenderer` is used as a component in `kiwix-desktop` too, which probably would be upset by a link to a libkiwix's internal CSS resource. This commit documents that finding.
veloman-yunkan
added a commit
that referenced
this pull request
May 15, 2022
In #727 inline CSS [was extracted](e4a4b2f) from `static/templates/no_search_result.html` into a separate stylesheet resource. The purpose was to later 1. get rid of the custom `static/templates/no_search_result.html` error template and use a general purpose error template instead (this was accomplished by PR #744). 2. deduplicate the CSS code between `static/templates/no_search_result.html` and `static/templates/search_result.html` by making the latter to also refer to an internal CSS resource rather than containing inline stylesheet code. While preparing to implement the 2nd point, I figured out that `kiwix::SearchRenderer` is used as a component in `kiwix-desktop` too, which probably would be upset by a link to a libkiwix's internal CSS resource. This commit documents that finding.
veloman-yunkan
added a commit
that referenced
this pull request
May 15, 2022
In #727 inline CSS [was extracted](e4a4b2f) from `static/templates/no_search_result.html` into a separate stylesheet resource. The purpose was to later 1. get rid of the custom `static/templates/no_search_result.html` error template and use a general purpose error template instead (this was accomplished by PR #744). 2. deduplicate the CSS code between `static/templates/no_search_result.html` and `static/templates/search_result.html` by making the latter to also refer to an internal CSS resource rather than containing inline stylesheet code. While preparing to implement the 2nd point, I figured out that `kiwix::SearchRenderer` is used as a component in `kiwix-desktop` too, which probably would be upset by a link to a libkiwix's internal CSS resource. This commit documents that finding.
veloman-yunkan
added a commit
that referenced
this pull request
May 17, 2022
In #727 inline CSS [was extracted](e4a4b2f) from `static/templates/no_search_result.html` into a separate stylesheet resource. The purpose was to later 1. get rid of the custom `static/templates/no_search_result.html` error template and use a general purpose error template instead (this was accomplished by PR #744). 2. deduplicate the CSS code between `static/templates/no_search_result.html` and `static/templates/search_result.html` by making the latter to also refer to an internal CSS resource rather than containing inline stylesheet code. While preparing to implement the 2nd point, I figured out that `kiwix::SearchRenderer` is used as a component in `kiwix-desktop` too, which probably would be upset by a link to a libkiwix's internal CSS resource. This commit documents that finding.
veloman-yunkan
added a commit
that referenced
this pull request
May 18, 2022
In #727 inline CSS [was extracted](e4a4b2f) from `static/templates/no_search_result.html` into a separate stylesheet resource. The purpose was to later 1. get rid of the custom `static/templates/no_search_result.html` error template and use a general purpose error template instead (this was accomplished by PR #744). 2. deduplicate the CSS code between `static/templates/no_search_result.html` and `static/templates/search_result.html` by making the latter to also refer to an internal CSS resource rather than containing inline stylesheet code. While preparing to implement the 2nd point, I figured out that `kiwix::SearchRenderer` is used as a component in `kiwix-desktop` too, which probably would be upset by a link to a libkiwix's internal CSS resource. This commit documents that finding.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This follow-up to #738 is probably the last step before removing the WIP status from #679.