simon987/od-database
1
0
Fork 0
mirror of https://github.com/simon987/od-database.git synced 2025-12-13 14:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Simon
2018-09-06 19:46:56 -04:00
parent 53db765856 8b13de4a6b
commit 85437b1ef9
17 changed files with 404 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/home.html
View File

@@ -23,13 +23,23 @@
<div class="card">
<div class="card-header">Search</div>
<div class="card-body">
<form action="/search">
<form action="/search" id="sfrm">
<div class="form-group">
<input class="form-control" name="q" id="q" placeholder="Query">
<div class="form-row">
<div class="col-md-11">
<input class="form-control" name="q" id="q" placeholder="Query">
</div>
<div class="col-md-1">
{% if show_captcha %}
<script>function f(token) {document.getElementById("sfrm").submit();}</script>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
<button class="g-recaptcha btn btn-primary btn-shadow" data-sitekey="6LcCXWkUAAAAAJo2NR9_m09Obn5YmDrI97sGrr2f" data-callback="f">Search</button>
{% else %}
<input class="btn btn-primary btn-shadow" type="submit" value="Search nocap">
{% endif %}
</div>
</div>
<input class="btn btn-primary btn-shadow" type="submit" value="Search">
</form>
</div>
</div>

2
templates/layout.html
View File

@@ -32,7 +32,7 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link {{ "active" if current_page == "website" else "" }}" href="/website">Websites</a>
<a class="nav-link {{ "active" if current_page == "website" else "" }}" href="/website/">Websites</a>
</li>
<li class="nav-item">
<a class="nav-link {{ "active" if current_page == "submit" else "" }}" href="/submit">Submit website</a>

32
templates/search.html
View File

@@ -9,7 +9,7 @@
<div class="card">
<div class="card-header">Search</div>
<div class="card-body">
<form action="/search">
<form action="/search" id="sfrm">
<div class="form-row">
@@ -22,6 +22,7 @@
</div>
</div>
<input class="form-control" name="q" id="q" placeholder="Query" value="{{ q }}">
<input type="hidden" name="p" id="page" value="{{ p }}">
</div>
</div>
{# Size #}
@@ -90,9 +91,19 @@
</select>
</div>
{# Search button #}
<div class="form-group col-md-7">
<input class="btn btn-primary btn-shadow" type="submit" value="Search" style="float: right">
{% if show_captcha %}
<script>function f(token) {
document.getElementById("sfrm").submit();
}</script>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
<button id="s" class="g-recaptcha btn btn-primary btn-shadow" data-sitekey="6LcCXWkUAAAAAJo2NR9_m09Obn5YmDrI97sGrr2f" data-callback="f" style="float: right" onclick="document.getElementById('page').value = 0">Search</button>
{% else %}
<input id="s" class="btn btn-primary btn-shadow" type="submit" value="Search" style="float: right">
{% endif %}
</div>
</div>
@@ -156,12 +167,10 @@
</table>
</div>
{% if results["hits"]["total"] > (p + 1) * per_page %}
<a href="/search?q={{ q }}&p={{ p + 1 }}&sort_order={{ sort_order }}&per_page={{ per_page }}&ext={{ extensions }}&size_min={{ size_min }}&size_max={{ size_max }}{{ "&field_path" if field_path else "" }}{{ "&field_name" if field_name else "" }}{{ "&field_trigram" if field_trigram else "" }}&date_min={{ date_min }}&date_max={{ date_max }}"
class="btn btn-primary" style="float: right">Next</a>
<button class="btn btn-primary" onclick="nextPage()" style="float: right">Next</button>
{% endif %}
{% if p > 0 %}
<a href="/search?q={{ q }}&p={{ p - 1 }}&sort_order={{ sort_order }}&per_page={{ per_page }}&ext={{ extensions }}&size_min={{ size_min }}&size_max={{ size_max }}{{ "&field_path" if field_path else "" }}{{ "&field_name" if field_name else "" }}{{ "&field_trigram" if field_trigram else "" }}&date_min={{ date_min }}&date_max={{ date_max }}"
class="btn btn-primary">Previous</a>
<button class="btn btn-primary" onclick="prevPage()">Previous</button>
{% endif %}
</div>
@@ -174,6 +183,7 @@
<ul>
<li>Try checking the 'Match any word' box for a broader search.</li>
<li>Make sure you don't include the file extension in your query (Use the appropriate field to filter file types)</li>
<li>If you're searching for files in a particular website, use the <a href="/website">website search page</a></li>
</ul>
</div>
@@ -245,6 +255,16 @@
}
});
//Next button
function nextPage() {
document.getElementById("page").value = parseInt(document.getElementById("page").value) + 1;
grecaptcha.execute();
}
function prevPage() {
document.getElementById("page").value = parseInt(document.getElementById("page").value) - 1;
grecaptcha.execute();
}
</script>
</div>