backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

Modify search template buttons (#801)

Browse Source 
* Modify search page button colors

* Rename Clear Options to Reset and reset URL as well

* Add search improvements to CHANGES
This commit is contained in:
Tessa Walsh 2023-01-25 13:33:18 -05:00 committed by GitHub
parent 43e5c8bac0
commit 9bc8a2e1ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@ -4,9 +4,9 @@ pywb 2.7.3 changelist
(In progress) (In progress)
* Catch warcio exceptions when indexing CDX by @oskarhek * Catch warcio exceptions when indexing CDX by @oskarhek
oskarhek
* Add ui.logo_home_url as config.yaml option * Add ui.logo_home_url as config.yaml option
* wb-manager: Show error when adding duplicate warc files by @kuechensofa * wb-manager: Show error when adding duplicate warc files by @kuechensofa
* Improve search template and add help text by @krakan
pywb 2.7.2 changelist pywb 2.7.2 changelist
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~

7
pywb/static/search.js
View File

@ -25,11 +25,12 @@ var elemIds = {
form: 'search-form', form: 'search-form',
resultsNewWindow: 'open-results-new-window', resultsNewWindow: 'open-results-new-window',
advancedOptions: 'advanced-options', advancedOptions: 'advanced-options',
clearOptions: 'clear-options', resetSearchForm: 'reset-search-form',
}; };
function clearOptions(event) { function resetSearchForm(event) {
for (const field of [ for (const field of [
elemIds.url,
elemIds.match, elemIds.match,
elemIds.dateTime.from, elemIds.dateTime.from,
elemIds.dateTime.fromTime, elemIds.dateTime.fromTime,
@ -206,7 +207,7 @@ $(document).ready(function() {
elemIds.dateTime.to, elemIds.dateTime.to,
document.getElementById(elemIds.dateTime.toBad) document.getElementById(elemIds.dateTime.toBad)
); );
document.getElementById(elemIds.clearOptions).onclick = clearOptions; document.getElementById(elemIds.resetSearchForm).onclick = resetSearchForm;
document.getElementById(elemIds.filtering.add).onclick = addFilter; document.getElementById(elemIds.filtering.add).onclick = addFilter;
document.getElementById(elemIds.filtering.clear).onclick = clearFilters; document.getElementById(elemIds.filtering.clear).onclick = clearFilters;
var searchURLInput = document.getElementById(elemIds.url); var searchURLInput = document.getElementById(elemIds.url);

10
pywb/templates/search.html
View File

@ -58,16 +58,16 @@
</div> </div>
</div> </div>
<div class="col-7"> <div class="col-7">
<button type="submit" id="search-button" class="btn btn-outline-primary float-right" role="button" aria-label="{{ _('Search') }}"> <button type="submit" id="search-button" class="btn btn-primary float-right" role="button" aria-label="{{ _('Search') }}">
{% trans %}Search{% endtrans %} {% trans %}Search{% endtrans %}
</button> </button>
<button class="btn btn-outline-info float-right mr-3" type="button" role="button" <button class="btn btn-outline-secondary float-right mr-3" type="button" role="button"
data-toggle="collapse" data-target="#advancedOptions" id="advanced-options" data-toggle="collapse" data-target="#advancedOptions" id="advanced-options"
aria-expanded="false" aria-controls="advancedOptions" aria-label="{{ _('Search Options') }}"> aria-expanded="false" aria-controls="advancedOptions" aria-label="{{ _('Search Options') }}">
{{ _('Search Options') }} {{ _('Search Options') }}
</button> </button>
<button id="clear-options" class="btn btn-outline-warning float-right mr-3" type="button" role="button" aria-label="{{ _('Reset Options') }}"> <button id="reset-search-form" class="btn btn-outline-danger float-right mr-3" type="button" role="button" aria-label="{{ _('Reset Options') }}">
{{ _('Reset Options') }} {{ _('Reset') }}
</button> </button>
</div> </div>
</div> </div>
@ -153,7 +153,7 @@
<ul id="filter-list" class="filter-list"> <ul id="filter-list" class="filter-list">
<li id="filtering-nothing">{% trans %}No Filter{% endtrans %}</li> <li id="filtering-nothing">{% trans %}No Filter{% endtrans %}</li>
</ul> </ul>
<button id="clear-filters" class="btn btn-outline-warning float-right mr-2" type="button"> <button id="clear-filters" class="btn btn-outline-danger float-right mr-2" type="button">
{% trans %}Clear Filters{% endtrans %} {% trans %}Clear Filters{% endtrans %}
</button> </button>
</div> </div>