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

// Fix names

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-16 16:36:05 +02:00
parent c7f8b30e88
commit 6ed8afd1be
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/js/date-range-picker.js
+9 -9
View File
@@ -400,7 +400,7 @@
$(".start-selected-compare").removeClass("start-selected-compare"); $(".start-selected-compare").removeClass("start-selected-compare");
target.addClass("start-selected-compare"); target.addClass("start-selected-compare");
startCompare = target.data("val"); startCompare = target.data("val");
$("#compare-date-start").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d'))); $("#date-start-compare").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d')));
} else { } else {
$(".start-selected").removeClass("start-selected"); $(".start-selected").removeClass("start-selected");
target.addClass("start-selected"); target.addClass("start-selected");
@@ -411,7 +411,7 @@
if(!switched) {click = 1;} else {click = 2;} if(!switched) {click = 1;} else {click = 2;}
if(!switched){ if(!switched){
if (compare) { if (compare) {
$("#compare-date-end").val(null).focus().addClass("input-selected"); $("#date-end-compare").val(null).focus().addClass("input-selected");
target.addClass("start-selected-compare").addClass("end-selected-compare"); target.addClass("start-selected-compare").addClass("end-selected-compare");
} else { } else {
$("#date-end").val(null).focus().addClass("input-selected"); $("#date-end").val(null).focus().addClass("input-selected");
@@ -420,7 +420,7 @@
} }
if (compare) if (compare)
$("#compare-date-start").removeClass("input-selected").addClass("input-complete"); $("#date-start-compare").removeClass("input-selected").addClass("input-complete");
else else
$("#date-start").removeClass("input-selected").addClass("input-complete"); $("#date-start").removeClass("input-selected").addClass("input-complete");
} }
@@ -430,9 +430,9 @@
$(".end-selected-compare").removeClass("end-selected-compare"); $(".end-selected-compare").removeClass("end-selected-compare");
target.addClass("end-selected-compare"); target.addClass("end-selected-compare");
endCompare = target.data("val"); endCompare = target.data("val");
$("#compare-date-end").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d'))); $("#date-end-compare").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d')));
click = 2; click = 2;
$("#compare-date-end").removeClass("input-selected").addClass("input-complete"); $("#date-end-compare").removeClass("input-selected").addClass("input-complete");
} else { } else {
$(".end-selected").removeClass("end-selected"); $(".end-selected").removeClass("end-selected");
target.addClass("end-selected"); target.addClass("end-selected");
@@ -516,8 +516,8 @@
if (startCompare && over < startCompare) if (startCompare && over < startCompare)
{ {
endCompare = startCompare; endCompare = startCompare;
$("#compare-date-end").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected"); $("#date-end-compare").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$("#compare-date-start").val(null).focus().addClass("input-selected"); $("#date-start-compare").val(null).focus().addClass("input-selected");
$("#datepicker .start-selected-compare").removeClass("start-selected-compare").addClass("end-selected-compare"); $("#datepicker .start-selected-compare").removeClass("start-selected-compare").addClass("end-selected-compare");
startCompare = null; startCompare = null;
switched = true; switched = true;
@@ -525,8 +525,8 @@
else if (endCompare && over > endCompare) else if (endCompare && over > endCompare)
{ {
startCompare = endCompare; startCompare = endCompare;
$("#compare-date-start").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected"); $("#date-start-compare").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$("#compare-date-end").val(null).focus().addClass("input-selected"); $("#date-end-compare").val(null).focus().addClass("input-selected");
$("#datepicker .end-selected-compare").removeClass("end-selected-compare").addClass("start-selected-compare"); $("#datepicker .end-selected-compare").removeClass("end-selected-compare").addClass("start-selected-compare");
endCompare = null; endCompare = null;
switched = false; switched = false;
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+12 -12
View File
@@ -57,11 +57,11 @@
</button> </button>
</div> </div>
<div class="form-date-body" id="compare-form-date-body" style="display: none;"> <div class="form-date-body" id="form-date-body-compare" style="display: none;">
<label>{l s='From'}</label> <label>{l s='From'}</label>
<input id="compare-date-start" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" /> <input id="date-start-compare" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" />
<label>{l s='to'}</label> <label>{l s='to'}</label>
<input id="compare-date-end" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" /> <input id="date-end-compare" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" />
</div> </div>
</div> </div>
<div class='form-date-actions'> <div class='form-date-actions'>
@@ -125,14 +125,14 @@
$(this).addClass("input-selected"); $(this).addClass("input-selected");
}); });
$("#compare-date-start").focus(function() { $("#date-start-compare").focus(function() {
datepickerStart.setCompare(true); datepickerStart.setCompare(true);
datepickerEnd.setCompare(true); datepickerEnd.setCompare(true);
$(".date-input").removeClass("input-selected"); $(".date-input").removeClass("input-selected");
$(this).addClass("input-selected"); $(this).addClass("input-selected");
}); });
$("#compare-date-end").focus(function() { $("#date-end-compare").focus(function() {
datepickerStart.setCompare(true); datepickerStart.setCompare(true);
datepickerEnd.setCompare(true); datepickerEnd.setCompare(true);
$(".date-input").removeClass("input-selected"); $(".date-input").removeClass("input-selected");
@@ -149,18 +149,18 @@
$('#datepicker-compare').click(function() { $('#datepicker-compare').click(function() {
if ($(this).attr("checked")) { if ($(this).attr("checked")) {
datepickerStart.setStartCompare($("#compare-date-start").val()); datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#compare-date-end").val()); datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#compare-date-start").val()); datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#compare-date-end").val()); datepickerEnd.setEndCompare($("#date-end-compare").val());
$('#compare-form-date-body').show(); $('#form-date-body-compare').show();
$('#compare-date-start').focus(); $('#date-start-compare').focus();
} else { } else {
datepickerStart.setStartCompare(null); datepickerStart.setStartCompare(null);
datepickerStart.setEndCompare(null); datepickerStart.setEndCompare(null);
datepickerEnd.setStartCompare(null); datepickerEnd.setStartCompare(null);
datepickerEnd.setEndCompare(null); datepickerEnd.setEndCompare(null);
$('#compare-form-date-body').hide(); $('#form-date-body-compare').hide();
$('#date-start').focus(); $('#date-start').focus();
} }
}) })