Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8bdb491

Browse files
rvanlaakrvanlaak
committed
[WebProfilerBundle] Filter links in search results
1 parent d657834 commit 8bdb491

File tree

7 files changed

+87
-18
lines changed

7 files changed

+87
-18
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ public function toolbarAction(Request $request, $token)
198198
}
199199

200200
return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array(
201+
'request' => $request,
201202
'position' => $position,
202203
'profile' => $profile,
203204
'templates' => $this->getTemplateManager()->getTemplates($profile),
@@ -232,13 +233,13 @@ public function searchBarAction(Request $request)
232233
$limit =
233234
$token = null;
234235
} else {
235-
$ip = $session->get('_profiler_search_ip');
236-
$method = $session->get('_profiler_search_method');
237-
$url = $session->get('_profiler_search_url');
238-
$start = $session->get('_profiler_search_start');
239-
$end = $session->get('_profiler_search_end');
240-
$limit = $session->get('_profiler_search_limit');
241-
$token = $session->get('_profiler_search_token');
236+
$ip = $request->query->get('ip', $session->get('_profiler_search_ip'));
237+
$method = $request->query->get('method', $session->get('_profiler_search_method'));
238+
$url = $request->query->get('url', $session->get('_profiler_search_url'));
239+
$start = $request->query->get('start', $session->get('_profiler_search_start'));
240+
$end = $request->query->get('end', $session->get('_profiler_search_end'));
241+
$limit = $request->query->get('limit', $session->get('_profiler_search_limit'));
242+
$token = $request->query->get('token', $session->get('_profiler_search_token'));
242243
}
243244

244245
return new Response(
@@ -285,6 +286,7 @@ public function searchResultsAction(Request $request, $token)
285286
$limit = $request->query->get('limit');
286287

287288
return new Response($this->twig->render('@WebProfiler/Profiler/results.html.twig', array(
289+
'request' => $request,
288290
'token' => $token,
289291
'profile' => $profile,
290292
'tokens' => $this->profiler->find($ip, $url, $limit, $method, $start, $end),
@@ -340,6 +342,7 @@ public function searchAction(Request $request)
340342
$tokens = $this->profiler->find($ip, $url, $limit, $method, $start, $end);
341343

342344
return new RedirectResponse($this->generator->generate('_profiler_search_results', array(
345+
'request' => $request,
343346
'token' => $tokens ? $tokens[0]['token'] : 'empty',
344347
'ip' => $ip,
345348
'method' => $method,

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% if token is not empty %}
22
<div class="search import clearfix" id="adminBar">
33
<h3>
4-
<img style="margin: 0 5px 0 0; vertical-align: middle; height: 16px" width="16" height="16" alt="Import" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAADo0lEQVR42u2XS0hUURjHD5njA1oYbXQ2MqCmIu2iEEISUREEEURxFB8ovt+DEsLgaxBRQQeUxnQ0ZRYSQasgiDaFqxAy2jUtCjdCoEjFwHj6/+F+dbvN6PQAN37wm++c7/z/35x7uPcOo7TW58rFBs59A7GGQ51XBAIBlZmZuYOhE1zm/A/4PxvY3NwMO53OYEJCgp+nccqXXQc94D54boAxalyLNayNtra2NJmbmzvOyMj4cRqoKYK4AsZzc3Nft7e3f5qZmTnCpk8Ix6xxjRpDGzmkUU5Ozuu2trZP09PTR+vr6ycbGxtaWFtbC9fU1AQTExPdmNNzLSUlZXt4ePhANNGghlp6lDWkkcvlOsCX6LNYXV0N8BTS0tK2cDJfWIsFaumhV0lIIxzXl5WVFX0aPp8vhDwJbMnJyc6JiYkji8YP7oI4YowfmDX00KskOHG73UfLy8vahB/cBXFSW1pa2kPOA7RdqqysfGtaCyOXA2VGgmvUiJ5e9lD8qKioeOv1ejVZXFwMI5eLEWOFWgh5Etg4J0lJSTdwYiHxLSwseFi3Yg5qRE8veyh+TE1Nhebn5zWZnZ31mE2okTxmM6WlpS7xeDyeQ2Qb61bMQQ214mMPVVxc7MJuNBkfHz9EtplNmEcET4JPfL29va+i6azR19f3UnzV1dUrqqqqyocT0KSzs/OV1YB6ROrr67fF19TU9DSazhp1dXXPxdfS0vJQNTY2+sfGxjSpra19YTWgHhHs/pn40OhRNJ0lLuON+kF8ra2tY9yAe3R0VBMc6wfr84n6b1BDrfiam5snImgczObAq7ylv7//q/hGRkbuqMHBwTt4Q2nS3d39jSKzCfXfoKarq+ur+NhD1owLcNrt9h3OTXGrqKgoKJ6hoaFD5DhuIA43xiGyJoWFhUGKxYXaL3CNGtH39PR8Zg9jzREfH+8vKCgI4krDRu0GcGVnZ78ZGBg4ER/Wf+4OVzOMRhrwFE6ysrLe0EQzaopII65RI3p478lVp6am7uDmPJY11F44HI7dsrKyfc5Nnj1km5Lo6Oiw4cdnD1kLJSUl++np6btsQjhmzayB5x29uGp3fn5+EPMw66eBX8b3yHZlDdyRdtzN75F1LED7kR6gMA7E6HsMrqpogbv5KngM9Bk8MbTKwAYmQSiCdhd4wW0VazQ0NNwEXrALNDHGS+A2UFHIA3smj/rX4JvrT7GBSRDi/J8Db8e/JY/5jLj4Y3KxgfPfwHc53iL+IQDMOgAAAABJRU5ErkJggg==">
4+
<span title="Import" class="sf-icon sf-admin sf-medium"></span>
55
Admin
66
</h3>
77

8-
<div style="margin-bottom: 10px">&#187;&#160;<a href="{{ path('_profiler_purge', { 'token': token }) }}">Purge</a></div>
8+
<div style="margin: 0 10px 10px;">&#187;&#160;<a href="{{ path('_profiler_purge', { 'token': token }) }}">Purge</a></div>
99
</div>
1010
{% endif %}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/header.html.twig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<form method="get" action="https://symfony.com/search" target="_blank">
88
<div class="form-row">
99
<label for="search-id">
10-
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAABUElEQVQoz2NgAIJ29iBdD0d7X2cPb+tY2f9MDMjgP2O2hKu7vS8CBlisZUNSMJ3fxRMkXO61wm2ue6I3iB1q8Z8ZriDZFCS03fm/wX+1/xp/TBo8QPxeqf+MUAW+QIFKj/+q/wX/c/3n/i/6Qd/bx943z/Q/K1SBI1D9fKv/AhCn/Wf5L5EHdFGKw39OqAIXoPpOMziX4T9/DFBBnuN/HqhAEtCKCNf/XDA/rZRyAmrpsvrPDVUw3wrkqCiLaewg6TohX1d7X0ffs5r/OaAKfinmgt3t4ulr4+Xg4ANip3j+l/zPArNT4LNOD0pAgWCSOUIBy3+h/+pXbBa5tni0eMx23+/mB1YSYnENroT5Pw/QSOX/mkCo+l/jgo0v2KJA643s8PgAmsMBDCbu/5xALHPB2husxN9uCzsDOgAq5kAoaZVnYMCh5Ky1r88Eh/+iABM8jUk7ClYIAAAAAElFTkSuQmCC" alt="Search on Symfony website">
10+
<span title="Search" class="sf-icon sf-search sf-medium" alt="Search on Symfony website">
11+
{{ include('@WebProfiler/Icon/search.svg') }}
12+
</span>
1113
</label>
1214

1315
<input name="q" id="search-id" type="search" placeholder="Search on Symfony website">

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
</li>
5454
</ul>
5555
{% endif %}
56-
{{ render(path('_profiler_search_bar')) }}
57-
{% include '@WebProfiler/Profiler/admin.html.twig' with { 'token': token } only %}
56+
{{ render(path('_profiler_search_bar', request.query.all)) }}
57+
{% include '@WebProfiler/Profiler/admin.html.twig' with { 'token': token} only %}
5858
</div>
5959
</div>
6060
</div>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,13 +332,14 @@ td.main, td.menu {
332332
text-transform: uppercase;
333333
margin-left: 10px;
334334
font-size: 13px;
335+
margin-bottom: 10px;
335336
}
336337
#navigation .search form {
337338
padding: 15px 0;
338339
}
339340
#navigation .search button {
340341
float: right;
341-
margin-right: 20px;
342+
margin-right: 16px;
342343
}
343344
#navigation .search label {
344345
display: block;
@@ -406,3 +407,37 @@ td.main, td.menu {
406407
.collapsed-menu #minimizePanelIcon {
407408
transform: rotate(180deg);
408409
}
410+
411+
.sf-icon {
412+
vertical-align: middle;
413+
background-repeat: no-repeat;
414+
background-size: contain;
415+
width: 16px;
416+
height: 16px;
417+
display: inline-block;
418+
}
419+
.sf-icon svg {
420+
width: 16px;
421+
height: 16px;
422+
}
423+
.sf-icon.sf-medium,
424+
.sf-icon.sf-medium svg {
425+
width: 24px;
426+
height: 24px;
427+
}
428+
.sf-icon.sf-large,
429+
.sf-icon.sf-large svg {
430+
width: 32px;
431+
height: 32px;
432+
}
433+
.sf-icon.sf-admin {
434+
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAADo0lEQVR42u2XS0hUURjHD5njA1oYbXQ2MqCmIu2iEEISUREEEURxFB8ovt+DEsLgaxBRQQeUxnQ0ZRYSQasgiDaFqxAy2jUtCjdCoEjFwHj6/+F+dbvN6PQAN37wm++c7/z/35x7uPcOo7TW58rFBs59A7GGQ51XBAIBlZmZuYOhE1zm/A/4PxvY3NwMO53OYEJCgp+nccqXXQc94D54boAxalyLNayNtra2NJmbmzvOyMj4cRqoKYK4AsZzc3Nft7e3f5qZmTnCpk8Ix6xxjRpDGzmkUU5Ozuu2trZP09PTR+vr6ycbGxtaWFtbC9fU1AQTExPdmNNzLSUlZXt4ePhANNGghlp6lDWkkcvlOsCX6LNYXV0N8BTS0tK2cDJfWIsFaumhV0lIIxzXl5WVFX0aPp8vhDwJbMnJyc6JiYkji8YP7oI4YowfmDX00KskOHG73UfLy8vahB/cBXFSW1pa2kPOA7RdqqysfGtaCyOXA2VGgmvUiJ5e9lD8qKioeOv1ejVZXFwMI5eLEWOFWgh5Etg4J0lJSTdwYiHxLSwseFi3Yg5qRE8veyh+TE1Nhebn5zWZnZ31mE2okTxmM6WlpS7xeDyeQ2Qb61bMQQ214mMPVVxc7MJuNBkfHz9EtplNmEcET4JPfL29va+i6azR19f3UnzV1dUrqqqqyocT0KSzs/OV1YB6ROrr67fF19TU9DSazhp1dXXPxdfS0vJQNTY2+sfGxjSpra19YTWgHhHs/pn40OhRNJ0lLuON+kF8ra2tY9yAe3R0VBMc6wfr84n6b1BDrfiam5snImgczObAq7ylv7//q/hGRkbuqMHBwTt4Q2nS3d39jSKzCfXfoKarq+ur+NhD1owLcNrt9h3OTXGrqKgoKJ6hoaFD5DhuIA43xiGyJoWFhUGKxYXaL3CNGtH39PR8Zg9jzREfH+8vKCgI4krDRu0GcGVnZ78ZGBg4ER/Wf+4OVzOMRhrwFE6ysrLe0EQzaopII65RI3p478lVp6am7uDmPJY11F44HI7dsrKyfc5Nnj1km5Lo6Oiw4cdnD1kLJSUl++np6btsQjhmzayB5x29uGp3fn5+EPMw66eBX8b3yHZlDdyRdtzN75F1LED7kR6gMA7E6HsMrqpogbv5KngM9Bk8MbTKwAYmQSiCdhd4wW0VazQ0NNwEXrALNDHGS+A2UFHIA3smj/rX4JvrT7GBSRDi/J8Db8e/JY/5jLj4Y3KxgfPfwHc53iL+IQDMOgAAAABJRU5ErkJggg==);
435+
}
436+
437+
#sf-search-results .sf-search {
438+
visibility: hidden;
439+
float: right;
440+
}
441+
#sf-search-results tr:hover .sf-search {
442+
visibility: visible;
443+
}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h2>Search Results</h2>
55

66
{% if tokens %}
7-
<table>
7+
<table id="sf-search-results">
88
<thead>
99
<tr>
1010
<th scope="col">Token</th>
@@ -19,9 +19,30 @@
1919
{% for elements in tokens %}
2020
<tr>
2121
<td><a href="{{ path('_profiler', { 'token': elements.token }) }}">{{ elements.token }}</a></td>
22-
<td>{{ elements.ip }}</td>
23-
<td>{{ elements.method }}</td>
24-
<td>{{ elements.url }}</td>
22+
<td>
23+
{{ elements.ip }}
24+
{% if request.session is not null %}
25+
<a href="{{ path('_profiler_search_results', request.query.all|merge({'ip': elements.ip, 'token': elements.token})) }}" title="Search">
26+
<span title="Search" class="sf-icon sf-search">{{ include('@WebProfiler/Icon/search.svg') }}</span>
27+
</a>
28+
{% endif %}
29+
</td>
30+
<td>
31+
{{ elements.method }}
32+
{% if request.session is not null %}
33+
<a href="{{ path('_profiler_search_results', request.query.all|merge({'method': elements.method, 'token': elements.token})) }}" title="Search">
34+
<span title="Search" class="sf-icon sf-search">{{ include('@WebProfiler/Icon/search.svg') }}</span>
35+
</a>
36+
{% endif %}
37+
</td>
38+
<td>
39+
{{ elements.url }}
40+
{% if request.session is not null %}
41+
<a href="{{ path('_profiler_search_results', request.query.all|merge({'url': elements.url, 'token': elements.token})) }}" title="Search">
42+
<span title="Search" class="sf-icon sf-search">{{ include('@WebProfiler/Icon/search.svg') }}</span>
43+
</a>
44+
{% endif %}
45+
</td>
2546
<td>{{ elements.time|date('r') }}</td>
2647
<td>
2748
{% if elements.status_code is defined and elements.status_code %}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="search clearfix" id="searchBar">
22
<h3>
3-
<img style="margin: 0 5px 0 0; vertical-align: middle;" width="16" height="16" alt="Search" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC2ElEQVR42u3XvUtbYRQG8JcggSxSiqlQoXUQUfEDnDoIEkK30ulKh0REFEOkitaIaBUU4gchQ8BBGyKGIC79B7rVxaGlm+JooYtQCq2U0oq9OX0eOBeCRXrf69DFwI9z73nPeTlJbrxXIyL/1e0AfyWueTVAEgrwGt5qLGge675e1gPUQaqxsfEgmUyerq6uft3e3v61v78vjDxnnuusYz3WTI0bDXAnHA6/Gh0d/bS7u+vu7e3JdbjOOtazDzmjAg9QF41Gy+vr6+eVSkX8Yj372I9zA8EGiEQi6bW1tfNyuSyK7/II0YEmMBodzYuHfezXmkADNAwNDX3c2dkRKpVKl4hZCIO5SvNZ1LleD/uxzz0c2w/Q0tLyAheYWywWRT0H4wPrhNjf1taWYd56gOHh4XdbW1tC+Xz+CNH4pfVCuo/9AAsLC182NzeFVlZWUojGL60X0n3sB8BFdFEoFISWlpYeIhq/tF5I97EfIJfLufgohZqbm+8jGr+0Xkj3sR9geXn5x8bGhlBHR8czROOX1gvpPvYDzM3NnWSzWaFYLPYG0fil9UK6j/0As7OzWVxMQul0+ht6nuDY/AvrWO/16j7WA/BCerC4uHiJKNTX13eid7wQzs1VzHOddV4P+n9zHwj0l5BfQ35+fl4Ix248Hj8NhUIlLPXDXeQNI8+Z5zrrvJ6BgYEzrMVxHGgAfg3hmZmZD4jiwd3ue3d393F9ff0hnwcYec4812tlMplqb2/vMepigW/H09PTUXgPEsTU1FS1p6dHhwj4QDI5ORmBHFyAXEfXK+DW5icmJqpdXV21Q9g/ko2Pj1MTvIQDOAPReKD5Jq1zwAVR/CVVOzs7OUR/oAFSqZQtB1wQz9jYWLW9vf0I2z2yHgAXWRAOuCCekZGRamtr66HtALw9B+WAC+JJJBI/rQfA081NOOCCEJ6gP1sPMDg4eFNP4Uw9vv3X7HaAq/4AszA5PJFqlwgAAAAASUVORK5CYII=">
3+
<span title="Search" class="sf-icon sf-search sf-medium">{{ include('@WebProfiler/Icon/search.svg') }}</span>
44
Search
55
</h3>
66
<form action="{{ path('_profiler_search') }}" method="get">
@@ -34,13 +34,21 @@
3434
{% endfor %}
3535
</select>
3636

37+
<div class="clear-fix"></div>
3738
<button type="submit" class="sf-button">
3839
<span class="border-l">
3940
<span class="border-r">
4041
<span class="btn-bg">SEARCH</span>
4142
</span>
4243
</span>
4344
</button>
45+
<button type="reset" class="sf-button">
46+
<span class="border-l">
47+
<span class="border-r">
48+
<span class="btn-bg">RESET</span>
49+
</span>
50+
</span>
51+
</button>
4452
<div class="clear-fix"></div>
4553
</form>
4654
</div>

0 commit comments

Comments
 (0)