diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index bb91f96b5..a03e40fab 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -16,13 +16,14 @@ - bMancone - bumbu - Burhan -- Cédric Mouleyre - Caleydon Media - cam.lafit - Captain FLAM - Captain-FLAM - ccauw +- Cédric Mouleyre - ChristopheBoucaut +- CINS - cippest - cmouleyre - Corentin Delcourt @@ -34,42 +35,50 @@ - David Gasperoni - Davy Rolink - djfm +- dlage - dMetzger - (d)oekia - Dragan Skrbic -- DrÿSs' - dreammeup - DrySs +- DrÿSs +- DrÿSs' - dSevere - Edouard Gaulué - emily-d - Fabio Chelly - fBrignoli - fram +- Francois Gaillard - François Gaillard +- Fran?s Gaillard - fSerny - Gabriel Schwardy - gBrunier - gCharmes - gPoulain +- gr4devel - Grégoire Bélorgey - Gregory Roussac - gRoussac - Guillaume DELOINCE +- ha99y - hAitmansour - Ha!*!*y - indesign47 - inem0o - ivancasasempere -- Jérôme Nadaud - jBreux +- jeckyl - jeromenadaud - Jerome Nadaud +- Jérôme Nadaud - jessylenne - jmCollin - jObregon - Jonathan Danse - joseantgv +- Julien - Kevin Granger - kpodemski - Krystian Podemski @@ -77,8 +86,11 @@ - lCherifi - ldecoker - lLefevre +- LOIC ROSSET ltd +- makk1ntosh - marcinsz101 - Marco Cervellin +- matiasiglesias - Mats Rynge - MatthieuB - Maxence @@ -101,32 +113,39 @@ - PhpMadman - Pierre - Piotr Kaczor -- Piotr Moćko +- Piotr Mocko - PrestaEdit - prestarocket +- Prestaspirit - pxls -- Rémi Gaillard - Raphaël Malié - raulgundin +- Rémi Gaillard - rGaillard - Rimas Kudelis - rMalie - rMontagne +- romainberger - root - runningz -- Sébastien -- Sébastien Bocahu +- sagaradonis - Samy Rabih - Sarah Lorenzini - Seb +- Sébastien +- Sébastien Bocahu - Seynaeve - Shagshag +- sjousse - sLorenzini +- smartdatasoft +- soufyan - soware - Staging - sThiebaut - Sylvain WITMEYER - tDidierjean +- unknown - vAugagneur - vChabot - Vincent Augagneur @@ -138,3 +157,5 @@ - Xavier - Xavier POITAU - Yoozio +- zimmi1 + diff --git a/admin-dev/index.php b/admin-dev/index.php index f5fcc246d..33da0908a 100644 --- a/admin-dev/index.php +++ b/admin-dev/index.php @@ -27,6 +27,9 @@ $timer_start = microtime(true); define('_PS_ADMIN_DIR_', getcwd()); +if (!defined('PS_ADMIN_DIR')) + define('PS_ADMIN_DIR', _PS_ADMIN_DIR_); + require(_PS_ADMIN_DIR_.'/../config/config.inc.php'); require(_PS_ADMIN_DIR_.'/functions.php'); diff --git a/admin-dev/init.php b/admin-dev/init.php index 441433a2a..74e960149 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -49,9 +49,12 @@ try AdminTab::$currentIndex = $currentIndex; $iso = $context->language->iso_code; - include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'); - include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'); - include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'); + if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php')) + include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'); + if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php')) + include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'); + if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php')) + include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'); /* Server Params */ $protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://'; diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index f23c67a78..40d2776b1 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -9565,6 +9565,54 @@ textarea { .ladda-button[data-size=xl] .ladda-label { font-size: 1.5em; } +/* line 1, admin-theme/_admin-login.sass */ +#login-panel { + margin: 0 auto; + width: 420px; } +/* line 5, admin-theme/_admin-login.sass */ +#login-panel .flip-container { + height: 500px; + -webkit-perspective: 1000px; + -moz-perspective: 1000px; + -ms-perspective: 1000px; + -o-perspective: 1000px; + perspective: 1000px; } +/* line 8, admin-theme/_admin-login.sass */ +#login-panel .flip-container.flip .flipper { + -webkit-transform: rotateY(180deg); + -moz-transform: rotateY(180deg); + -ms-transform: rotateY(180deg); + -o-transform: rotateY(180deg); + transform: rotateY(180deg); } +/* line 13, admin-theme/_admin-login.sass */ +#login-panel .flipper { + -webkit-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transform-style: preserve-3d; + -moz-transform-style: preserve-3d; + -ms-transform-style: preserve-3d; + -o-transform-style: preserve-3d; + transform-style: preserve-3d; + position: relative; } +/* line 18, admin-theme/_admin-login.sass */ +#login-panel .front, #login-panel .back { + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; + backface-visibility: hidden; + position: absolute; + top: 0; + left: 0; } +/* line 24, admin-theme/_admin-login.sass */ +#login-panel .front { + z-index: 2; } +/* line 27, admin-theme/_admin-login.sass */ +#login-panel .back { + -webkit-transform: rotateY(180deg); + -moz-transform: rotateY(180deg); + -ms-transform: rotateY(180deg); + -o-transform: rotateY(180deg); + transform: rotateY(180deg); } + /* line 1, admin-theme/_admin-carrier-wizard.sass */ #carrier_wizard { position: relative; diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 832eed756..1866afa82 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -106,8 +106,8 @@ fieldset > .row @import "admin-theme/ladda" @import "admin-theme/ladda-theme" - //page specific +@import "admin-theme/admin-login" @import "admin-theme/admin-carrier-wizard" @import "admin-theme/admin-modules" @import "admin-theme/admin-dashboard" diff --git a/admin-dev/themes/default/css/admin-theme/_admin-login.sass b/admin-dev/themes/default/css/admin-theme/_admin-login.sass new file mode 100644 index 000000000..785a56088 --- /dev/null +++ b/admin-dev/themes/default/css/admin-theme/_admin-login.sass @@ -0,0 +1,28 @@ +#login-panel + margin: 0 auto + width: 420px + + .flip-container + height: 500px + @include perspective(1000px) + &.flip .flipper + @include rotateY(180deg) + + .flip-container, .front, .back + + .flipper + @include transition-duration(0.6s) + @include transform-style(preserve-3d) + position: relative + + .front, .back + @include backface-visibility(hidden) + position: absolute + top: 0 + left: 0 + + .front + z-index: 2 + + .back + @include rotateY(180deg) \ No newline at end of file diff --git a/admin-dev/themes/default/js/date-range-picker.js b/admin-dev/themes/default/js/date-range-picker.js index e2faae88f..a289bade4 100644 --- a/admin-dev/themes/default/js/date-range-picker.js +++ b/admin-dev/themes/default/js/date-range-picker.js @@ -24,11 +24,7 @@ // Picker object var Datepicker = function(element, options){ this.element = $(element); - - if (typeof options.dates != 'undefined') - DPGlobal.dates = options.dates; - - this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'Y-m-d'); + this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy'); this.picker = $(DPGlobal.template).appendTo(this.element).show() .on({ click: $.proxy(this.click, this), @@ -287,7 +283,7 @@ $(".start-selected").removeClass("start-selected"); target.addClass("start-selected"); start = target.data("val"); - $("#date-start").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))); + $("#date-start").val(start); if(!switched) {click = 1;} else {click = 2;} if(!switched){ $("#date-end").val(null).focus().addClass("input-selected"); @@ -300,7 +296,7 @@ $(".end-selected").removeClass("end-selected"); target.addClass("end-selected"); end = target.data("val"); - $("#date-end").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))); + $("#date-end").val(end); click = 2; $("#date-end").removeClass("input-selected").addClass("input-complete"); //this.range(); @@ -357,14 +353,14 @@ //switch if (start && over < start ){ end = start; - $("#date-end").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected"); + $("#date-end").val(start).removeClass("input-selected"); $("#date-start").val(null).focus().addClass("input-selected"); $("#datepicker .start-selected").removeClass("start-selected").addClass("end-selected"); start = null; switched = true; } else if (end && over > end ){ start = end; - $("#date-start").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected"); + $("#date-start").val(end).removeClass("input-selected"); $("#date-end").val(null).focus().addClass("input-selected"); $("#datepicker .end-selected").removeClass("end-selected").addClass("start-selected"); end = null; @@ -489,12 +485,10 @@ date.setMonth(val - 1); break; case 'yy': - case 'y': year = 2000 + val; date.setFullYear(2000 + val); break; case 'yyyy': - case 'Y': year = val; date.setFullYear(val); break; @@ -509,12 +503,10 @@ d: date.getDate(), m: date.getMonth() + 1, yy: date.getFullYear().toString().substring(2), - y: date.getFullYear().toString().substring(2), - yyyy: date.getFullYear(), - Y: date.getFullYear() + yyyy: date.getFullYear() }; - val.d = (val.d < 10 ? '0' : '') + val.d; - val.m = (val.m < 10 ? '0' : '') + val.m; + val.dd = (val.d < 10 ? '0' : '') + val.d; + val.mm = (val.m < 10 ? '0' : '') + val.m; var date = []; for (var i=0, cnt = format.parts.length; i < cnt; i++) { date.push(val[format.parts[i]]); diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 6a7793938..73a3f68d4 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -112,11 +112,11 @@
  • {l s='Newsletter:'} {if $customer->newsletter} - {l s='Yes'} + {l s='Registered'} {else} - {l s='No'} + {l s='Unregistered'} {/if}
    • @@ -125,19 +125,23 @@ {if $customer->optin} - {l s='Yes'} + {l s='Registered'} {else} - {l s='No'} + {l s='Unregistered'} {/if}
  • {l s='Age:'} - {$customer_stats['age']} - {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='Unknown'}{/if}
    • + {if isset($customer->birthday)} + {$customer_stats['age']} {l s='years old'} ({l s='Birth date:'} {$customer_birthday}) + {else} + {l s='Unknown'} + {/if} +
  • {l s='Last update:'} {$last_update} @@ -147,12 +151,12 @@ {if $customer->active} - {l s='Yes'} + {l s='Active'} {else} - {l s='No'} + {l s='Inactive'} {/if}
    • @@ -193,11 +197,11 @@
    - {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} + {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok}
    - {l s='Invalid orders:'} {$count_ko} + {l s='Invalid orders:'} {$count_ko}
    diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl index e840e8e46..fe29bf17b 100755 --- a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl @@ -76,6 +76,8 @@
    +

    {l s='Members of this customer group'}

    +

    {l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}

    {$customerList}
    {/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 3ed53c68c..3d96e8795 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -71,37 +71,60 @@ {if count($files_to_import)} {/if} -   + {l s='Upload'} + +
    -

    - - {l s='Click to view our sample import csv files.'} - -

    - +
    @@ -140,14 +163,14 @@
    {l s='e.g. '}"1; Ipod; 129.90; 5" - +
    {l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90" - +
    @@ -172,7 +195,6 @@
    -