Merge branch '3.8'

Conflicts:
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
This commit is contained in:
Romain Neutron
2013-10-31 17:56:48 +01:00
22 changed files with 144 additions and 107 deletions

View File

@@ -427,14 +427,14 @@
<td style="padding-right: 5px;">
<div class="input-prepend">
<span class="add-on"><i class="icon-calendar"></i></span>
<input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_min" style="margin: 0;" />
<input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_min" style="margin: 0;position: relative; z-index: 10001;" />
</div>
</td>
<td>{% trans 'phraseanet::time:: a' %}</td>
<td>
<div class="input-prepend">
<span class="add-on"><i class="icon-calendar"></i></span>
<input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_max" style="margin: 0;" />
<input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_max" style="margin: 0;position: relative; z-index: 10001;" />
</div>
</td>
</tr>