Merge pull request #812 from romainneutron/fix-1596

[3.8] Fix #1596 : Add datepicker input placeholder
This commit is contained in:
Romain Neutron
2013-11-28 05:05:46 -08:00
3 changed files with 12 additions and 2 deletions

View File

@@ -423,14 +423,14 @@
<td style="padding-right: 5px;"> <td style="padding-right: 5px;">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on"><i class="icon-calendar"></i></span> <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> </div>
</td> </td>
<td>{% trans 'phraseanet::time:: a' %}</td> <td>{% trans 'phraseanet::time:: a' %}</td>
<td> <td>
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on"><i class="icon-calendar"></i></span> <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> </div>
</td> </td>
</tr> </tr>

View File

@@ -1784,6 +1784,11 @@ H4 {
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
#searchForm input.input-small.datepicker::-webkit-input-placeholder { font-size:12px; }
#searchForm input.input-small.datepicker::-moz-placeholder { font-size:12px; } /* firefox 19+ */
#searchForm input.input-small.datepicker:-ms-input-placeholder { font-size:12px; } /* ie */
#searchForm input.input-small.datepicker:-moz-placeholder { font-size:12px; }
#adv_search .sbasglob hr, #adv_search .sbasglob hr,
.adv_options .sbasglob hr, .adv_options .sbasglob hr,
.adv_options #sbasfiltercont hr { .adv_options #sbasfiltercont hr {

View File

@@ -1814,6 +1814,11 @@ H4 {
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
#searchForm input.input-small.datepicker::-webkit-input-placeholder { font-size:12px; }
#searchForm input.input-small.datepicker::-moz-placeholder { font-size:12px; } /* firefox 19+ */
#searchForm input.input-small.datepicker:-ms-input-placeholder { font-size:12px; } /* ie */
#searchForm input.input-small.datepicker:-moz-placeholder { font-size:12px; }
#adv_search .sbasglob hr, #adv_search .sbasglob hr,
.adv_options .sbasglob hr, .adv_options .sbasglob hr,
.adv_options #sbasfiltercont hr { .adv_options #sbasfiltercont hr {