maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

show search-text on listings with link to remove set filter

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-02 10:35:43 +02:00
parent 8bd133b488
commit 13c53b074c
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/init.php
View File

@@ -296,6 +296,7 @@ unset($css);
$action = Request::get('action'); $action = Request::get('action');
$page = Request::get('page', 'overview'); $page = Request::get('page', 'overview');
$gSearchText = Request::get('searchtext');
// clear request data // clear request data
if (!$action && isset($_SESSION)) { if (!$action && isset($_SESSION)) {
@@ -305,6 +306,7 @@ if (!$action && isset($_SESSION)) {
UI::twig()->addGlobal('action', $action); UI::twig()->addGlobal('action', $action);
UI::twig()->addGlobal('page', $page); UI::twig()->addGlobal('page', $page);
UI::twig()->addGlobal('area', AREA); UI::twig()->addGlobal('area', AREA);
UI::twig()->addGlobal('gSearchText', $gSearchText);
/** /**
* Initialize the mailingsystem * Initialize the mailingsystem

3
templates/Froxlor/table/table.html.twig
View File

@@ -12,6 +12,9 @@
{% else %} {% else %}
<div class="d-flex flex-column align-items-end mt-n2"> <div class="d-flex flex-column align-items-end mt-n2">
<div class="rounded-top bg-white small py-1 px-2 me-3 opacity-75 text-dark"> <div class="rounded-top bg-white small py-1 px-2 me-3 opacity-75 text-dark">
{% if gSearchText is not empty %}
<span class="me-2"><a href="{{ linker(listing.self_overview) }}"><i class="fa-solid fa-xmark"></i></a> Filter: <strong>{{ gSearchText }}</strong></span>
{% endif %}
<span type="button" data-bs-toggle="modal" data-bs-target="#searchColumnsModal" class="me-2"><i class="fa-solid fa-search"></i></span> <span type="button" data-bs-toggle="modal" data-bs-target="#searchColumnsModal" class="me-2"><i class="fa-solid fa-search"></i></span>
<span type="button" data-bs-toggle="modal" data-bs-target="#manageColumnsModal"><i class="fa-solid fa-cog"></i></span> <span type="button" data-bs-toggle="modal" data-bs-target="#manageColumnsModal"><i class="fa-solid fa-cog"></i></span>
</div> </div>