dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix Stats datepicker

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-10-23 16:48:55 +02:00
1 parent ff3455be78
commit a27f8bc999
2 files changed
+78 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+54 -1
View File
@@ -37,7 +37,47 @@
{if $warning} {if $warning}
<div class="alert alert-warning">{$warning}</div> <div class="alert alert-warning">{$warning}</div>
{/if} {/if}
{include file="../../../../form_date_range_picker.tpl"} <div id="calendar" class="panel">
<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
<div class="row">
<div class="col-lg-6">
<div class="btn-group">
<button type="button" name="submitDateDay" class="btn btn-default submitDateDay" onclick="setDayPeriod()">{$translations.Day}</button>
<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth" onclick="setMonthPeriod()">{$translations.Month}</button>
<button type="button" name="submitDateYear" class="btn btn-default submitDateYear" onclick="setYearPeriod()">{$translations.Year}</button>
<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" onclick="setPreviousDayPeriod()">{$translations.Day}-1</button>
<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" onclick="setPreviousMonthPeriod()">{$translations.Month}-1</button>
<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" onclick="setPreviousYearPeriod()">{$translations.Year}-1</button>
</div>
</div>
<div class="col-lg-6">
<div class="row">
<div class="col-md-8">
<div class="row">
<div class="col-xs-6">
<div class="input-group">
<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
</div>
</div>
<div class="col-xs-6">
<div class="input-group">
<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
{$calendar}
</div>
</div>
</form>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -87,3 +127,16 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).ready(function() {
$('#datepickerFrom').click(function() {
$('#datepicker').slideDown(200);
$('#date-start').focus();
});
$('#datepickerTo').click(function() {
$('#datepicker').slideDown(200);
$('#date-end').focus();
});
});
</script>
admin-dev/themes/default/template/form_date_range_picker.tpl
+24 -27
View File
@@ -3,12 +3,12 @@
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
<div class="btn-group"> <div class="btn-group">
<button type="button" name="submitDateDay" class="btn btn-default submitDateDay" onclick="setDayPeriod()">{$translations.Day}</button> <button type="submit" name="submitDateDay" class="btn btn-default submitDateDay">{$translations.Day}</button>
<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth" onclick="setMonthPeriod()">{$translations.Month}</button> <button type="submit" name="submitDateMonth" class="btn btn-default submitDateMonth">{$translations.Month}</button>
<button type="button" name="submitDateYear" class="btn btn-default submitDateYear" onclick="setYearPeriod()">{$translations.Year}</button> <button type="submit" name="submitDateYear" class="btn btn-default submitDateYear">{$translations.Year}</button>
<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" onclick="setPreviousDayPeriod()">{$translations.Day}-1</button> <button type="submit" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev">{$translations.Day}-1</button>
<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" onclick="setPreviousMonthPeriod()">{$translations.Month}-1</button> <button type="submit" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev">{$translations.Month}-1</button>
<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" onclick="setPreviousYearPeriod()">{$translations.Year}-1</button> <button type="submit" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev">{$translations.Year}-1</button>
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
@@ -18,37 +18,34 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="input-group"> <div class="input-group">
<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label> <label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control"> <input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker form-control">
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
<div class="input-group"> <div class="input-group">
<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label> <label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control"> <input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker form-control">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4">
<div class="row">
<button type="submit" name="submitDatePicker" id="submitDatePicker" class="btn btn-default"><i class="icon-save"></i> {l s='Save'}</button>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> </form>
<div class="col-lg-12"> </div>
{$calendar} <script type="text/javascript">
</div> $(document).ready(function() {
</div> if ($("form#calendar_form .datepicker").length > 0)
</form> $("form#calendar_form .datepicker").datepicker({
<script type="text/javascript"> prevText: '',
$(document).ready(function() { nextText: '',
$('#datepickerFrom').click(function() { dateFormat: 'yy-mm-dd'
$('#datepicker').slideDown(200);
$('#date-start').focus();
}); });
});
$('#datepickerTo').click(function() { </script>
$('#datepicker').slideDown(200);
$('#date-end').focus();
});
});
</script>
</div>