Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2011-personalization-log

This commit is contained in:
aina-esokia
2018-08-31 15:41:55 +04:00

View File

@@ -244,7 +244,7 @@ class QueryController extends Controller
$infoResult = '<div id="docInfo">'
. $this->app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>'])
. '<a href="#" class="detailed_info_btn"><img src="/assets/common/images/icons/dots.png" class="image-normal"><img src="/assets/common/images/icons/dots-darkgreen-hover.png" class="image-hover"></a>'
. '<div class="detailed_info_holder"><img src="/assets/common/images/icons/dots.png" class="image-normal"><img src="/assets/common/images/icons/dots-darkgreen-hover.png" class="image-hover">'
. '<div class="detailed_info">
<table>
<thead>
@@ -255,14 +255,6 @@ class QueryController extends Controller
<th>Duration</th>
</tr>
</thead>
<tfoot>
<tr>
<td>6</td>
<td>Total</td>
<td>24.20 Mb</td>
<td>00:25:17</td>
</tr>
</tfoot>
<tbody>
<tr>
<td>1</td>
@@ -289,7 +281,15 @@ class QueryController extends Controller
<td>00:20:36</td>
</tr>
</tbody>
</table></div>'
<tfoot>
<tr>
<td>6</td>
<td>Total</td>
<td>24.20 Mb</td>
<td>00:25:17</td>
</tr>
</tfoot>
</table></div></div>'
. '</div><a href="#" class="search-display-info" data-infos="' . str_replace('"', '&quot;', $explain) . '">'
. $this->app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a>';