// dashboard date range picker wip
This commit is contained in:
Kevin Granger committed
1 parent
7126397bfe
commit
d523d739e7
6 files changed
+180
-132
No files matched your search
@@ -30,7 +30,7 @@
|
|||||||
* Email: dave@fontawesome.io
|
* Email: dave@fontawesome.io
|
||||||
* Twitter: http://twitter.com/byscuits
|
* Twitter: http://twitter.com/byscuits
|
||||||
* Work: Lead Product Designer @ Kyruus - http://kyruus.com
|
* Work: Lead Product Designer @ Kyruus - http://kyruus.com
|
||||||
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3:not(.modal-title) .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3:not(.modal-title) [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3:not(.modal-title) [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:nonLine truncated
|
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3:not(.modal-title) .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3:not(.modal-title) [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3:not(.modal-title) [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:nonLine truncated
|
||||||
* Ladda
|
* Ladda
|
||||||
* http://lab.hakim.se/ladda
|
* http://lab.hakim.se/ladda
|
||||||
* MIT licensed
|
* MIT licensed
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
.row-padding-top
|
.row-padding-top
|
||||||
padding-top: 15px
|
padding-top: 15px
|
||||||
|
|
||||||
.thumbnail
|
.thumbnail, .img-thumbnail
|
||||||
background-color: white
|
background-color: white
|
||||||
border-color: #ccc!important
|
border-color: #ccc!important
|
||||||
|
|
||||||
|
|||||||
@@ -258,6 +258,7 @@ function setPreviousYear() {
|
|||||||
$("#date-end-compare").val(endDate.format($("#date-start").data('date-format')));
|
$("#date-end-compare").val(endDate.format($("#date-start").data('date-format')));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$( document ).ready(function() {
|
$( document ).ready(function() {
|
||||||
//Instanciate datepickers
|
//Instanciate datepickers
|
||||||
datepickerStart = $('.datepicker1').daterangepicker({
|
datepickerStart = $('.datepicker1').daterangepicker({
|
||||||
@@ -321,7 +322,7 @@ $( document ).ready(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$('#datepicker-cancel').click(function() {
|
$('#datepicker-cancel').click(function() {
|
||||||
$('#datepicker').slideUp(200);
|
$('#datepicker').addClass('hide');
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#datepicker').show(function() {
|
$('#datepicker').show(function() {
|
||||||
@@ -375,4 +376,40 @@ $( document ).ready(function() {
|
|||||||
datepickerStart.setCompare(true);
|
datepickerStart.setCompare(true);
|
||||||
datepickerEnd.setCompare(true);
|
datepickerEnd.setCompare(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#datepickerFrom').click(function() {
|
||||||
|
$('#datepicker').removeClass('hide');
|
||||||
|
$('#date-start').focus();
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#datepickerTo').click(function() {
|
||||||
|
$('#datepicker').removeClass('hide');
|
||||||
|
$('#date-end').focus();
|
||||||
|
});
|
||||||
|
|
||||||
|
$('.submitDateDay').on('click',function(e){
|
||||||
|
e.preventDefault;
|
||||||
|
setDayPeriod();
|
||||||
|
});
|
||||||
|
$('.submitDateMonth').on('click',function(e){
|
||||||
|
e.preventDefault;
|
||||||
|
setMonthPeriod()
|
||||||
|
});
|
||||||
|
$('.submitDateYear').on('click',function(e){
|
||||||
|
e.preventDefault;
|
||||||
|
setYearPeriod();
|
||||||
|
});
|
||||||
|
$('.submitDateDayPrev').on('click',function(e){
|
||||||
|
e.preventDefault;
|
||||||
|
setPreviousDayPeriod();
|
||||||
|
});
|
||||||
|
$('.submitDateMonthPrev').on('click',function(e){
|
||||||
|
e.preventDefault;
|
||||||
|
setPreviousMonthPeriod();
|
||||||
|
});
|
||||||
|
$('.submitDateYearPrev').on('click',function(e){
|
||||||
|
e.preventDefault;
|
||||||
|
setPreviousYearPeriod();
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
@@ -36,46 +36,67 @@
|
|||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
{if $warning}
|
{if $warning}
|
||||||
<div class="alert alert-warning">{$warning}</div>
|
<div class="alert alert-warning">{$warning}</div>
|
||||||
{/if}
|
{/if}
|
||||||
<div id="calendar" class="panel">
|
<div id="calendar" class="panel">
|
||||||
<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
|
<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
|
||||||
<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="button" name="submitDateDay" class="btn btn-default submitDateDay">
|
||||||
<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth" onclick="setMonthPeriod()">{$translations.Month}</button>
|
{l s='Day'}
|
||||||
<button type="button" name="submitDateYear" class="btn btn-default submitDateYear" onclick="setYearPeriod()">{$translations.Year}</button>
|
</button>
|
||||||
<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" onclick="setPreviousDayPeriod()">{$translations.Day}-1</button>
|
<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth">
|
||||||
<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" onclick="setPreviousMonthPeriod()">{$translations.Month}-1</button>
|
{l s='Month'}
|
||||||
<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" onclick="setPreviousYearPeriod()">{$translations.Year}-1</button>
|
</button>
|
||||||
|
<button type="button" name="submitDateYear" class="btn btn-default submitDateYear">
|
||||||
|
{l s='Year'}
|
||||||
|
</button>
|
||||||
|
<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev">
|
||||||
|
{l s='Day'}-1
|
||||||
|
</button>
|
||||||
|
<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev">
|
||||||
|
{l s='Month'}-1
|
||||||
|
</button>
|
||||||
|
<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev">
|
||||||
|
{l s='Year'}-1
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
<div class="row">
|
<div class="form-group">
|
||||||
<div class="col-md-8">
|
<div class="input-group fixed-width-lg">
|
||||||
<div class="row">
|
<label class="input-group-addon">{l s='From'}</label>
|
||||||
<div class="col-xs-6">
|
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
|
||||||
<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="form-group">
|
||||||
|
<div class="input-group fixed-width-lg inline-form-element">
|
||||||
|
<label class="input-group-addon">{l s='To'}</label>
|
||||||
|
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<p class="form-control-static">
|
||||||
|
13 Days
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<p class="checkbox">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox">
|
||||||
|
Compare
|
||||||
|
</label>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="form-group pull-right">
|
||||||
|
<button class="btn btn-default" type="button">
|
||||||
|
<i class="icon-calendar-empty"></i>
|
||||||
|
<i class="icon-caret-down"></i>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
{$calendar}
|
||||||
<div class="col-lg-12">
|
|
||||||
{$calendar}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -95,14 +116,15 @@
|
|||||||
<div class="col-lg-2">
|
<div class="col-lg-2">
|
||||||
|
|
||||||
<section class="dash_news panel">
|
<section class="dash_news panel">
|
||||||
<h4><i class="icon-rss"></i> PrestaShop News</h4>
|
<h3><i class="icon-rss"></i> PrestaShop News</h3>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section id="dash_version" class="visible-lg">
|
<section id="dash_version" class="visible-lg">
|
||||||
<iframe frameborder="no" scrolling="no" allowtransparency="true" src="{$new_version_url}"></iframe>
|
<iframe frameborder="no" scrolling="no" allowtransparency="true" src="{$new_version_url}"></iframe>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="dash_links panel">
|
<section class="dash_links panel">
|
||||||
<h4><i class="icon-link"></i> {l s="Useful PrestaShop Links"}</h4>
|
<h3><i class="icon-link"></i> {l s="Useful Links"}</h3>
|
||||||
<dl>
|
<dl>
|
||||||
<dt>{l s="Discover the official documentation"}</dt>
|
<dt>{l s="Discover the official documentation"}</dt>
|
||||||
<dd><a href="http://doc.prestashop.com/display/PS16?utm_source=backoffice_dashboard" target="_blank">{l s="Go to doc.prestashop.com"}</a></dd>
|
<dd><a href="http://doc.prestashop.com/display/PS16?utm_source=backoffice_dashboard" target="_blank">{l s="Go to doc.prestashop.com"}</a></dd>
|
||||||
@@ -126,17 +148,4 @@
|
|||||||
</section>
|
</section>
|
||||||
</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>
|
|
||||||
@@ -1,80 +1,82 @@
|
|||||||
<div id="datepicker" class="daterangepicker-days">
|
<div id="datepicker" class="row row-padding-top hide">
|
||||||
<div class="row">
|
<div class="col-lg-12">
|
||||||
{if $is_rtl}
|
<div class="daterangepicker-days">
|
||||||
<div class="col-sm-6 col-lg-4">
|
<div class="row">
|
||||||
<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
|
{if $is_rtl}
|
||||||
</div>
|
<div class="col-sm-6 col-lg-4">
|
||||||
<div class="col-sm-6 col-lg-4">
|
<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
|
||||||
<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
|
</div>
|
||||||
</div>
|
<div class="col-sm-6 col-lg-4">
|
||||||
{else}
|
<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
|
||||||
<div class="col-sm-6 col-lg-4">
|
</div>
|
||||||
<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
|
{else}
|
||||||
</div>
|
<div class="col-sm-6 col-lg-4">
|
||||||
<div class="col-sm-6 col-lg-4">
|
<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
|
||||||
<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
|
</div>
|
||||||
</div>
|
<div class="col-sm-6 col-lg-4">
|
||||||
{/if}
|
<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
|
||||||
<div class="col-lg-4 clearfix">
|
</div>
|
||||||
<div id='datepicker-form' class='form-inline'>
|
{/if}
|
||||||
|
<div class="col-lg-4 clearfix">
|
||||||
<div id='date-range' class='form-date-group'>
|
<div id='datepicker-form' class='form-inline'>
|
||||||
<div class='form-date-heading'>
|
<div id='date-range' class='form-date-group'>
|
||||||
<span class="title">{l s='Date range'}</span>
|
<div class='form-date-heading'>
|
||||||
{if isset($actions) && $actions|count > 0}
|
<span class="title">{l s='Date range'}</span>
|
||||||
{if $actions|count > 1}
|
{if isset($actions) && $actions|count > 0}
|
||||||
<button class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown' type="button">
|
{if $actions|count > 1}
|
||||||
{l s='Custom'}
|
<button class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown' type="button">
|
||||||
<i class='icon-angle-down'></i>
|
{l s='Custom'}
|
||||||
|
<i class='icon-angle-down'></i>
|
||||||
|
</button>
|
||||||
|
<ul class='dropdown-menu'>
|
||||||
|
{foreach from=$actions item=action}
|
||||||
|
<li><a{if isset($action.href)} href="{$action.href}"{/if}{if isset($action.class)} class="{$action.class}"{/if}>{if isset($action.icon)}<i class="{$action.icon}"></i> {/if}{$action.label}</a></li>
|
||||||
|
{/foreach}
|
||||||
|
</ul>
|
||||||
|
{else}
|
||||||
|
<a{if isset($actions[0].href)} href="{$actions[0].href}"{/if} class="btn btn-default btn-xs pull-right{if isset($actions[0].class)} {$actions[0].class}{/if}">{if isset($actions[0].icon)}<i class="{$actions[0].icon}"></i> {/if}{$actions[0].label}</a>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<div class='form-date-body'>
|
||||||
|
<label>{l s='From'}</label>
|
||||||
|
<input class='date-input form-control' id='date-start' placeholder='Start' type='text' name="date_from" value="{$date_from}" data-date-format="{$date_format}" />
|
||||||
|
<label>{l s='to'}</label>
|
||||||
|
<input class='date-input form-control' id='date-end' placeholder='End' type='text' name="date_to" value="{$date_to}" data-date-format="{$date_format}" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="date-compare" class='form-date-group'>
|
||||||
|
<div class='form-date-heading'>
|
||||||
|
<span class="checkbox-title">
|
||||||
|
<label >
|
||||||
|
<input type='checkbox' id="datepicker-compare" name="datepicker_compare"{if isset($compare_date_from) && isset($compare_date_to)} checked="checked"{/if}>
|
||||||
|
{l s='Compare to'}
|
||||||
|
</label>
|
||||||
|
</span>
|
||||||
|
<select id="compare-options" class="form-control fixed-width-lg pull-right" name="compare_date_option"{if is_null($compare_date_from) || is_null($compare_date_to)} disabled="disabled"{/if}>
|
||||||
|
<option value="1"{if $compare_option == 1}selected="selected"{/if} label="{l s='Previous period'}">{l s='Previous period'}</option>
|
||||||
|
<option value="2"{if $compare_option == 2}selected="selected"{/if} label="{l s='Previous Year'}">{l s='Previous Year'}</option>
|
||||||
|
<option value="3"{if $compare_option == 3}selected="selected"{/if} label="{l s='Custom'}">{l s='Custom'}</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-date-body" id="form-date-body-compare"{if is_null($compare_date_from) || is_null($compare_date_to)} style="display: none;"{/if}>
|
||||||
|
<label>{l s='From'}</label>
|
||||||
|
<input id="date-start-compare" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" data-date-format="{$date_format}" />
|
||||||
|
<label>{l s='to'}</label>
|
||||||
|
<input id="date-end-compare" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" data-date-format="{$date_format}" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class='form-date-actions'>
|
||||||
|
<button class='btn btn-default' type='button' id="datepicker-cancel">
|
||||||
|
<i class='icon-remove text-danger'></i>
|
||||||
|
{l s='Cancel'}
|
||||||
</button>
|
</button>
|
||||||
<ul class='dropdown-menu'>
|
<button class='btn btn-default pull-right' type='submit' name="submitDateRange">
|
||||||
{foreach from=$actions item=action}
|
<i class='icon-ok text-success'></i>
|
||||||
<li><a{if isset($action.href)} href="{$action.href}"{/if}{if isset($action.class)} class="{$action.class}"{/if}>{if isset($action.icon)}<i class="{$action.icon}"></i> {/if}{$action.label}</a></li>
|
{l s='Apply'}
|
||||||
{/foreach}
|
</button>
|
||||||
</ul>
|
</div>
|
||||||
{else}
|
|
||||||
<a{if isset($actions[0].href)} href="{$actions[0].href}"{/if} class="btn btn-default btn-xs pull-right{if isset($actions[0].class)} {$actions[0].class}{/if}">{if isset($actions[0].icon)}<i class="{$actions[0].icon}"></i> {/if}{$actions[0].label}</a>
|
|
||||||
{/if}
|
|
||||||
{/if}
|
|
||||||
</div>
|
</div>
|
||||||
<div class='form-date-body'>
|
|
||||||
<label>{l s='From'}</label>
|
|
||||||
<input class='date-input form-control' id='date-start' placeholder='Start' type='text' name="date_from" value="{$date_from}" data-date-format="{$date_format}" />
|
|
||||||
<label>{l s='to'}</label>
|
|
||||||
<input class='date-input form-control' id='date-end' placeholder='End' type='text' name="date_to" value="{$date_to}" data-date-format="{$date_format}" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="date-compare" class='form-date-group'>
|
|
||||||
<div class='form-date-heading'>
|
|
||||||
<span class="checkbox-title">
|
|
||||||
<label >
|
|
||||||
<input type='checkbox' id="datepicker-compare" name="datepicker_compare"{if isset($compare_date_from) && isset($compare_date_to)} checked="checked"{/if}>
|
|
||||||
{l s='Compare to'}
|
|
||||||
</label>
|
|
||||||
</span>
|
|
||||||
<select id="compare-options" class="form-control fixed-width-lg pull-right" name="compare_date_option"{if is_null($compare_date_from) || is_null($compare_date_to)} disabled="disabled"{/if}>
|
|
||||||
<option value="1"{if $compare_option == 1}selected="selected"{/if} label="{l s='Previous period'}">{l s='Previous period'}</option>
|
|
||||||
<option value="2"{if $compare_option == 2}selected="selected"{/if} label="{l s='Previous Year'}">{l s='Previous Year'}</option>
|
|
||||||
<option value="3"{if $compare_option == 3}selected="selected"{/if} label="{l s='Custom'}">{l s='Custom'}</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-date-body" id="form-date-body-compare"{if is_null($compare_date_from) || is_null($compare_date_to)} style="display: none;"{/if}>
|
|
||||||
<label>{l s='From'}</label>
|
|
||||||
<input id="date-start-compare" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" data-date-format="{$date_format}" />
|
|
||||||
<label>{l s='to'}</label>
|
|
||||||
<input id="date-end-compare" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" data-date-format="{$date_format}" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class='form-date-actions'>
|
|
||||||
<button class='btn btn-default' type='button' id="datepicker-cancel">
|
|
||||||
<i class='icon-remove text-danger'></i>
|
|
||||||
{l s='Cancel'}
|
|
||||||
</button>
|
|
||||||
<button class='btn btn-default pull-right' type='submit' name="submitDateRange">
|
|
||||||
<i class='icon-ok text-success'></i>
|
|
||||||
{l s='Apply'}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -194,15 +194,15 @@ class AdminDashboardControllerCore extends AdminController
|
|||||||
if (Tools::isSubmit('profitability_conf'))
|
if (Tools::isSubmit('profitability_conf'))
|
||||||
return parent::renderOptions();
|
return parent::renderOptions();
|
||||||
|
|
||||||
$translations = array(
|
// $translations = array(
|
||||||
'Calendar' => $this->l('Calendar', 'AdminStatsTab'),
|
// 'Calendar' => $this->l('Calendar', 'AdminStatsTab'),
|
||||||
'Day' => $this->l('Day', 'AdminStatsTab'),
|
// 'Day' => $this->l('Day', 'AdminStatsTab'),
|
||||||
'Month' => $this->l('Month', 'AdminStatsTab'),
|
// 'Month' => $this->l('Month', 'AdminStatsTab'),
|
||||||
'Year' => $this->l('Year', 'AdminStatsTab'),
|
// 'Year' => $this->l('Year', 'AdminStatsTab'),
|
||||||
'From' => $this->l('From:', 'AdminStatsTab'),
|
// 'From' => $this->l('From:', 'AdminStatsTab'),
|
||||||
'To' => $this->l('To:', 'AdminStatsTab'),
|
// 'To' => $this->l('To:', 'AdminStatsTab'),
|
||||||
'Save' => $this->l('Save', 'AdminStatsTab')
|
// 'Save' => $this->l('Save', 'AdminStatsTab')
|
||||||
);
|
// );
|
||||||
|
|
||||||
$calendar_helper = new HelperCalendar();
|
$calendar_helper = new HelperCalendar();
|
||||||
|
|
||||||
@@ -230,7 +230,7 @@ class AdminDashboardControllerCore extends AdminController
|
|||||||
$this->tpl_view_vars = array(
|
$this->tpl_view_vars = array(
|
||||||
'hookDashboardZoneOne' => Hook::exec('dashboardZoneOne', $params),
|
'hookDashboardZoneOne' => Hook::exec('dashboardZoneOne', $params),
|
||||||
'hookDashboardZoneTwo' => Hook::exec('dashboardZoneTwo', $params),
|
'hookDashboardZoneTwo' => Hook::exec('dashboardZoneTwo', $params),
|
||||||
'translations' => $translations,
|
//'translations' => $translations,
|
||||||
'action' => '#',
|
'action' => '#',
|
||||||
'warning' => $this->getWarningDomainName(),
|
'warning' => $this->getWarningDomainName(),
|
||||||
'new_version_url' => Tools::getCurrentUrlProtocolPrefix().'api.prestashop.com/version/check_version.php?v='._PS_VERSION_.'&lang='.$this->context->language->iso_code,
|
'new_version_url' => Tools::getCurrentUrlProtocolPrefix().'api.prestashop.com/version/check_version.php?v='._PS_VERSION_.'&lang='.$this->context->language->iso_code,
|
||||||
|
|||||||
Reference in new issue
Block a user