hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
This commit is contained in:
Romain Neutron
2013-12-02 18:17:38 +01:00
parent 845a53f545 7285717b80
commit 4f31cfeefc
14 changed files with 95 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/index.html.twig
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;position: relative; z-index: 10001;" />
<input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_min" placeholder="YYYY/MM/DD" 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;position: relative; z-index: 10001;" />
<input onchange="checkFilters(true);" class="datepicker input-small" type="text" name="date_max" placeholder="YYYY/MM/DD" style="margin: 0;position: relative; z-index: 10001;" />
</div>
</td>
</tr>