Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/config.rb

@@ -1,7 +1,7 @@
 # Require any additional compass plugins here.
 http_path = "/"
 css_dir = "css"
-sass_dir = "css"
+sass_dir = "scss"
 images_dir = "img"
 javascripts_dir = "js"
 fonts_dir = "font"

admin-dev/themes/default/css/admin-theme.css

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Ubuntu:300|Open+Sans&subset=latin,cyrillic-ext,greek-ext,greek,latin-ext,cyrillic,vietnamese);/*!
+@import url(http://fonts.googleapis.com/css?family=Ubuntu:300|Open+Sans&subset=latin,cyrillic-ext,greek-ext,greek,latin-ext,cyrillic,vietnamese);/*
  * Bootstrap v3.0.0
  *
  * Copyright 2013 Twitter, Inc
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world by @mdo and @fat.
- *//*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:0.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:2cm .5cm}p,h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{orphans:3;widows:3}h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{page-break-after:avoid}select{background:#fff !important}.navbar,#header_infos{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:12px;line-height:1.42857;color:#555;background-color:#515561}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#1ba6e5;text-decoration:none}a:hover,a:focus{color:#1275a1;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail,.thumbnail{padding:4px;line-height:1.42857;background-color:#515561;border:1px solid #ddd;border-radius:3px;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:17px;margin-bottom:17px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}p{margin:0 0 8.5px}.lead{margin-bottom:17px;font-size:13px;font-weight:200;line-height:1.4}@media (min-width: 768px){.lead{font-size:18px}}small,.small{font-size:85%}cite{font-style:normal}.text-muted,.module_description,.hook_panel_header .hook_description{color:#999}.text-primary{color:#1ba6e5}.text-primary:hover{color:#1585b8}.text-warning{color:#c09853}.text-warning:hover{color:#a47e3c}.text-danger{color:#b94a48}.text-danger:hover{color:#953b39}.text-success{color:#468847}.text-success:hover{color:#356635}.text-info{color:#3a87ad}.text-info:hover{color:#2d6987}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_headeLine truncated
+ *//* normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:0.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:2cm .5cm}p,h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{orphans:3;widows:3}h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{page-break-after:avoid}.navbar,#header_infos{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:12px;line-height:1.42857;color:#555;background-color:#515561}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#1ba6e5;text-decoration:none}a:hover,a:focus{color:#1275a1;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail,.thumbnail{padding:4px;line-height:1.42857;background-color:#515561;border:1px solid #ddd;border-radius:3px;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:17px;margin-bottom:17px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 8.5px}.lead{margin-bottom:17px;font-size:13.8px;font-weight:200;line-height:1.4}@media (min-width: 768px){.lead{font-size:18px}}small{font-size:85%}cite{font-style:normal}.text-muted,.module_description,.hook_panel_header .hook_description{color:#999}.text-primary{color:#1ba6e5}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Ubuntu",sans-serif;font-weight:300;line-height:1.1Line truncated
  *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
@@ -30,10 +30,9 @@
  *  Email: dave@fontawesome.io
  *  Twitter: http://twitter.com/byscuits
  *  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: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-"],Line 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
  * http://lab.hakim.se/ladda
  * MIT licensed
  *
  * Copyright (C) 2013 Hakim El Hattab, http://hakim.se
- */.ladda-button{position:relative}.ladda-button .ladda-spinner{position:absolute;z-index:2;display:inline-block;width:32px;height:32px;top:50%;margin-top:-16px;opacity:0;pointer-events:none}.ladda-button .ladda-label{position:relative;z-index:3}.ladda-button .ladda-progress{position:absolute;width:0;height:100%;left:0;top:0;background:rgba(0,0,0,0.2);visibility:hidden;opacity:0;-webkit-transition:0.1s linear all !important;-moz-transition:0.1s linear all !important;-ms-transition:0.1s linear all !important;-o-transition:0.1s linear all !important;transition:0.1s linear all !important}.ladda-button .ladda-progress[data-loading] .ladda-progress{opacity:1;visibility:visible}.ladda-button,.ladda-button .ladda-spinner,.ladda-button .ladda-label{-webkit-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;-moz-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;-ms-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;-o-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important}.ladda-button[data-style=zoom-in],.ladda-button[data-style=zoom-in] .ladda-spinner,.ladda-button[data-style=zoom-in] .ladda-label,.ladda-button[data-style=zoom-out],.ladda-button[data-style=zoom-out] .ladda-spinner,.ladda-button[data-style=zoom-out] .ladda-label{-webkit-transition:0.3s ease all !important;-moz-transition:0.3s ease all !important;-ms-transition:0.3s ease all !important;-o-transition:0.3s ease all !important;transition:0.3s ease all !important}.ladda-button[data-style=expand-right] .ladda-spinner{right:14px}.ladda-button[data-style=expand-right][data-size="s"] .ladda-spinner,.ladda-button[data-style=expand-right][data-size="xs"] .ladda-spinner{right:4px}.ladda-button[data-style=expand-right][data-loading]{padding-right:56px}.ladda-button[data-style=expand-right][data-loading] .ladda-spinner{opacity:1}.ladda-button[data-style=expand-right][data-loading][data-size="s"],.ladda-button[data-style=expand-right][data-loading][data-size="xs"]{padding-right:40px}.ladda-button[data-style=expand-left] .ladda-spinner{left:14px}.ladda-button[data-style=expand-left][data-size="s"] .ladda-spinner,.ladda-button[data-style=expand-left][data-size="xs"] .ladda-spinner{left:4px}.ladda-button[data-style=expand-left][data-loading]{padding-left:56px}.ladda-button[data-style=expand-left][data-loading] .ladda-spinner{opacity:1}.ladda-button[data-style=expand-left][data-loading][data-size="s"],.ladda-button[data-style=expand-left][data-loading][data-size="xs"]{padding-left:40px}.ladda-button[data-style=expand-up]{overflow:hidden}.ladda-button[data-style=expand-up] .ladda-spinner{top:-32px;left:50%;margin-left:-16px}.ladda-button[data-style=expand-up][data-loading]{padding-top:54px}.ladda-button[data-style=expand-up][data-loading] .ladda-spinner{opacity:1;top:14px;margin-top:0}.ladda-button[data-style=expand-up][data-loading][data-size="s"],.ladda-button[data-style=expand-up][data-loading][data-size="xs"]{padding-top:32px}.ladda-button[data-style=expand-up][data-loading][data-size="s"] .ladda-spinner,.ladda-button[data-style=expand-up][data-loading][data-size="xs"] .ladda-spinner{top:4px}.ladda-button[data-style=slide-left]{overflow:hidden}.ladda-button[data-style=slide-left] .ladda-label{position:relative}.ladda-button[data-style=slide-left] .ladda-spinner{left:100%;margin-left:-16px}.ladda-button[data-style=slide-left][data-loading] .ladda-label{opacity:0;left:-100%}.ladda-button[data-style=slide-left][data-loading] .ladda-spinner{opacity:1;left:50%}.ladda-button[data-style=slide-right]{overflow:hidden}.ladda-button[data-style=slide-right] .ladda-label{position:relative}.ladda-button[data-style=slide-right] .ladda-spinner{right:100%;margin-left:-16px}.ladda-button[data-style=slide-right][data-loading] .ladda-label{opacity:0;left:100%}.ladda-button[data-style=slide-right][data-loading] .ladda-spinner{opacity:1;left:50%}.ladda-button[data-style=slide-up]{overflow:hidden}.ladda-button[data-style=slide-up] .ladda-label{position:relative}.ladda-button[data-style=slide-up] .ladda-spinner{left:50%;margin-left:-16px;margin-top:1em}.ladda-button[data-style=slide-up][data-loading] .ladda-label{opacity:0;top:-1em}.ladda-button[data-style=slide-up][data-loading] .ladda-spinner{opacity:1;margin-top:-16px}.ladda-button[data-style=slide-down]{overflow:hidden}.ladda-button[data-style=slide-down] .ladda-label{position:relative}.ladda-button[data-style=slide-down] .ladda-spinner{left:50%;margin-left:-16px;margin-top:-2em}.ladda-button[data-style=slide-down][data-loading] .ladda-label{opacity:0;top:1em}.ladda-button[data-style=slide-down][data-loading] .ladda-spinner{opacity:1;margin-top:-16px}.ladda-button[data-style=zoom-out]{overflow:hidden}.ladda-button[data-style=zoom-out] .ladda-spinner{left:50%;margin-left:-16px;-webkit-transform:scale(2.5);-moz-transform:scale(2.5);-ms-transform:scale(2.5);-o-transform:scale(2.5);transformLine truncated
+ */.ladda-button{position:relative}.ladda-button .ladda-spinner{position:absolute;z-index:2;display:inline-block;width:32px;height:32px;top:50%;margin-top:-16px;opacity:0;pointer-events:none}.ladda-button .ladda-label{position:relative;z-index:3}.ladda-button .ladda-progress{position:absolute;width:0;height:100%;left:0;top:0;background:rgba(0,0,0,0.2);visibility:hidden;opacity:0;-webkit-transition:0.1s linear all !important;-moz-transition:0.1s linear all !important;-ms-transition:0.1s linear all !important;-o-transition:0.1s linear all !important;transition:0.1s linear all !important}.ladda-button .ladda-progress[data-loading] .ladda-progress{opacity:1;visibility:visible}.ladda-button,.ladda-button .ladda-spinner,.ladda-button .ladda-label{-webkit-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;-moz-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;-ms-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;-o-transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;transition:0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important}.ladda-button[data-style=zoom-in],.ladda-button[data-style=zoom-in] .ladda-spinner,.ladda-button[data-style=zoom-in] .ladda-label,.ladda-button[data-style=zoom-out],.ladda-button[data-style=zoom-out] .ladda-spinner,.ladda-button[data-style=zoom-out] .ladda-label{-webkit-transition:0.3s ease all !important;-moz-transition:0.3s ease all !important;-ms-transition:0.3s ease all !important;-o-transition:0.3s ease all !important;transition:0.3s ease all !important}.ladda-button[data-style=expand-right] .ladda-spinner{right:14px}.ladda-button[data-style=expand-right][data-size="s"] .ladda-spinner,.ladda-button[data-style=expand-right][data-size="xs"] .ladda-spinner{right:4px}.ladda-button[data-style=expand-right][data-loading]{padding-right:56px}.ladda-button[data-style=expand-right][data-loading] .ladda-spinner{opacity:1}.ladda-button[data-style=expand-right][data-loading][data-size="s"],.ladda-button[data-style=expand-right][data-loading][data-size="xs"]{padding-right:40px}.ladda-button[data-style=expand-left] .ladda-spinner{left:14px}.ladda-button[data-style=expand-left][data-size="s"] .ladda-spinner,.ladda-button[data-style=expand-left][data-size="xs"] .ladda-spinner{left:4px}.ladda-button[data-style=expand-left][data-loading]{padding-left:56px}.ladda-button[data-style=expand-left][data-loading] .ladda-spinner{opacity:1}.ladda-button[data-style=expand-left][data-loading][data-size="s"],.ladda-button[data-style=expand-left][data-loading][data-size="xs"]{padding-left:40px}.ladda-button[data-style=expand-up]{overflow:hidden}.ladda-button[data-style=expand-up] .ladda-spinner{top:-32px;left:50%;margin-left:-16px}.ladda-button[data-style=expand-up][data-loading]{padding-top:54px}.ladda-button[data-style=expand-up][data-loading] .ladda-spinner{opacity:1;top:14px;margin-top:0}.ladda-button[data-style=expand-up][data-loading][data-size="s"],.ladda-button[data-style=expand-up][data-loading][data-size="xs"]{padding-top:32px}.ladda-button[data-style=expand-up][data-loading][data-size="s"] .ladda-spinner,.ladda-button[data-style=expand-up][data-loading][data-size="xs"] .ladda-spinner{top:4px}.ladda-button[data-style=slide-left]{overflow:hidden}.ladda-button[data-style=slide-left] .ladda-label{position:relative}.ladda-button[data-style=slide-left] .ladda-spinner{left:100%;margin-left:-16px}.ladda-button[data-style=slide-left][data-loading] .ladda-label{opacity:0;left:-100%}.ladda-button[data-style=slide-left][data-loading] .ladda-spinner{opacity:1;left:50%}.ladda-button[data-style=slide-right]{overflow:hidden}.ladda-button[data-style=slide-right] .ladda-label{position:relative}.ladda-button[data-style=slide-right] .ladda-spinner{right:100%;margin-left:-16px}.ladda-button[data-style=slide-right][data-loading] .ladda-label{opacity:0;left:100%}.ladda-button[data-style=slide-right][data-loading] .ladda-spinner{opacity:1;left:50%}.ladda-button[data-style=slide-up]{overflow:hidden}.ladda-button[data-style=slide-up] .ladda-label{position:relative}.ladda-button[data-style=slide-up] .ladda-spinner{left:50%;margin-left:-16px;margin-top:1em}.ladda-button[data-style=slide-up][data-loading] .ladda-label{opacity:0;top:-1em}.ladda-button[data-style=slide-up][data-loading] .ladda-spinner{opacity:1;margin-top:-16px}.ladda-button[data-style=slide-down]{overflow:hidden}.ladda-button[data-style=slide-down] .ladda-label{position:relative}.ladda-button[data-style=slide-down] .ladda-spinner{left:50%;margin-left:-16px;margin-top:-2em}.ladda-button[data-style=slide-down][data-loading] .ladda-label{opacity:0;top:1em}.ladda-button[data-style=slide-down][data-loading] .ladda-spinner{opacity:1;margin-top:-16px}.ladda-button[data-style=zoom-out]{overflow:hidden}.ladda-button[data-style=zoom-out] .ladda-spinner{left:50%;margin-left:-16px;-webkit-transform:scale(2.5);-moz-transform:scale(2.5);-ms-transform:scale(2.5);-o-transform:scale(2.5);transformLine truncated

admin-dev/themes/default/css/backward-admin-bootstrap-reset.css

@@ -0,0 +1 @@
+#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap a{line-height:normal}#nobootstrap .categorieList a{line-height:20px}#nobootstrap p{line-height:normal}#nobootstrap legend{font-size:13px;line-height:20px;width:auto}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap fieldset{clear:both}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px}#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"]{margin:0}#nobootstrap input[type="text"]{height:14px !important}#nobootstrap table.table{margin:0;padding:0;width:100%;border-collapse:collapse}#nobootstrap table.widthfull{width:100%}#nobootstrap .table thead th{vertical-align:top}#nobootstrap .table th,#nobootstrap .table td{line-height:normal;vertical-align:middle;border-top:none}#nobootstrap #header #header_search #bo_search_submit{height:25px !important}#nobootstrap [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}

admin-dev/themes/default/css/backward-admin-old.css

@@ -1 +1 @@
-#nobootstrap body{font-family:Arial, Helvetica, sans-serif}#nobootstrap h1,#nobootstrap h2,#nobootstrap h3,#nobootstrap h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}#nobootstrap h2{font-size:1.7em}#nobootstrap h3{font-size:1.25em}#nobootstrap h4{font-size:1.05em}#nobootstrap h6{font-size:1em}#nobootstrap ul,#nobootstrap ol{list-style:none;margin:0;padding:0}#nobootstrap ul li{color:#585A69}#nobootstrap label{color:#585a69}#nobootstrap fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;font-size:1.1em;margin:0;padding:1em}#nobootstrap .Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}#nobootstrap legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}#nobootstrap input[type=text],#nobootstrap input[type=password],#nobootstrap input[type=file],#nobootstrap textarea{background-color:#fff;border:1px solid #ccc}#nobootstrap input[type=text]:disabled,#nobootstrap input[type=password]:disabled,#nobootstrap input[type=file]:disabled,#nobootstrap textarea:disabled{background-color:#dedede;border:1px solid #ccc;color:#444}#nobootstrap select{border:1px solid #ccc;font-size:12px}#nobootstrap select[disabled=disabled],#nobootstrap input[disabled=disabled],#nobootstrap textarea[disabled=disabled],#nobootstrap option[disabled=disabled]{border:1px solid #CCC;color:#AAA}#nobootstrap .header_module{background:url(../img/header_module.png);border:solid 1px #CCC;color:#812143;height:20px;padding-left:.5em;padding-top:.8em}#nobootstrap .double_select select{height:160px;width:300px}#nobootstrap .double_select a{background-color:#fafafa;border:1px solid #aaa;color:#123456;display:block;margin:2px;padding:2px;text-align:center;text-decoration:none}#nobootstrap .icon{vertical-align:middle}#nobootstrap .icon-top{vertical-align:top}#nobootstrap .button{background:#E3E3E3 repeat scroll 0 0 transparent;border-color:#CCC #BBB #A0A0A0;border-left:1px solid #BBB;border-right:1px solid #BBB;border-style:solid;border-width:1px;color:#000;cursor:pointer;margin:0;outline:medium none;padding:3px 8px;text-align:center;vertical-align:middle;white-space:nowrap}#nobootstrap .button[disabled=disabled]{color:#8C8C8C}#nobootstrap .button.bt-icon{display:inline-block;margin-bottom:7px}#nobootstrap .button.bt-icon span{padding-left:5px}#nobootstrap input.button[disabled=disabled]:hover{background-color:#FFF6D3}#nobootstrap .button.export-csv span{background:transparent url(../img/export-csv.png) no-repeat scroll left top;padding:1px 0 1px 20px}#nobootstrap #top_container{margin:0;padding:0}#nobootstrap #header{background-color:#394049;height:90px}#nobootstrap #header #header_infos{height:60px;margin:0;padding:0;position:relative}#nobootstrap #header #header_shopname{float:left;margin:10px 15px 0 10px}#nobootstrap #header #employee_box{display:block;float:right}#nobootstrap #header #employee_infos{display:block;margin:5px 15px 0 10px}#nobootstrap #header #employee_infos a{color:#BABABA;margin-right:5px;text-transform:capitalize}#nobootstrap #header #employee_infos .employee_name{color:#fff;float:left;padding:0 20px 0 0}#nobootstrap #header .separator{background:transparent url(../img/separator.png) no-repeat scroll center top;height:19px;margin-right:5px;width:16px}#nobootstrap #header ul#employee_links{display:block;list-style:none;text-align:left}#nobootstrap #header ul#employee_links li{display:inline;line-height:20px}#nobootstrap #header #header_infos #header_shopname span{color:#fff;display:block;font-size:24px;height:28px;margin:0;overflow:hidden}#nobootstrap #header #header_infos a#header_logout{background:transparent url(../img/logout.png) no-repeat scroll left top;color:#bababa;padding-left:20px}#nobootstrap #header #header_infos #header_logout a span{color:#bababa}#nobootstrap #header #header_infos #header_foaccess{color:#bababa;text-decoration:none}#nobootstrap #header #header_infos #header_foaccess a{color:#bababa !important}#nobootstrap #header #header_search{background-color:#fff;border:2px solid #000;float:left;height:25px;margin-top:15px;position:relative}#nobootstrap #header #header_search #bo_query{background:none repeat scroll 0 0 transparent;border:none;float:left;font:13px Arial,sans-serif;padding:5px 0 5px 4px;width:160px}#nobootstrap #header #header_search #bo_search_type_chzn{border:none;float:left;font-size:13px;height:27px;margin:0 23px 0 0;padding:0 4px;vertical-align:middle;width:80px !important}#nobootstrap #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single{border:none;border-left:1px dotted #ccc}#nobootstrap #header #header_search #bo_search_submit{background:url(../img/icon-search2.png) no-repeat scroll center;border:none;border-left:1px solid #3079ED;color:transparent;cursor:pointer;display:block;float:left;font-weight:400;height:25px;margin:0;padding:0;position:absolute;right:0;text-indent:-9999eLine truncated
+#nobootstrap h1,#nobootstrap h2,#nobootstrap h3,#nobootstrap h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}#nobootstrap h2{font-size:1.7em}#nobootstrap h3{font-size:1.25em}#nobootstrap h4{font-size:1.05em}#nobootstrap h6{font-size:1em}#nobootstrap ul,#nobootstrap ol{list-style:none;margin:0;padding:0}#nobootstrap ul li{color:#585A69}#nobootstrap label{color:#585a69}#nobootstrap fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;font-size:1.1em;margin:0;padding:1em}#nobootstrap .Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}#nobootstrap legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}#nobootstrap input[type=text],#nobootstrap input[type=password],#nobootstrap input[type=file],#nobootstrap textarea{background-color:#fff;border:1px solid #ccc}#nobootstrap input[type=text]:disabled,#nobootstrap input[type=password]:disabled,#nobootstrap input[type=file]:disabled,#nobootstrap textarea:disabled{background-color:#dedede;border:1px solid #ccc;color:#444}#nobootstrap select{border:1px solid #ccc;font-size:12px}#nobootstrap select[disabled=disabled],#nobootstrap input[disabled=disabled],#nobootstrap textarea[disabled=disabled],#nobootstrap option[disabled=disabled]{border:1px solid #CCC;color:#AAA}#nobootstrap .header_module{background:url(../img/header_module.png);border:solid 1px #CCC;color:#812143;height:20px;padding-left:.5em;padding-top:.8em}#nobootstrap .double_select select{height:160px;width:300px}#nobootstrap .double_select a{background-color:#fafafa;border:1px solid #aaa;color:#123456;display:block;margin:2px;padding:2px;text-align:center;text-decoration:none}#nobootstrap .icon{vertical-align:middle}#nobootstrap .icon-top{vertical-align:top}#nobootstrap .button{background:#E3E3E3 repeat scroll 0 0 transparent;border-color:#CCC #BBB #A0A0A0;border-left:1px solid #BBB;border-right:1px solid #BBB;border-style:solid;border-width:1px;color:#000;cursor:pointer;margin:0;outline:medium none;padding:3px 8px;text-align:center;vertical-align:middle;white-space:nowrap}#nobootstrap .button[disabled=disabled]{color:#8C8C8C}#nobootstrap .button.bt-icon{display:inline-block;margin-bottom:7px}#nobootstrap .button.bt-icon span{padding-left:5px}#nobootstrap input.button[disabled=disabled]:hover{background-color:#FFF6D3}#nobootstrap .button.export-csv span{background:transparent url(../img/export-csv.png) no-repeat scroll left top;padding:1px 0 1px 20px}#nobootstrap #top_container{margin:0;padding:0}#nobootstrap #header{background-color:#394049;height:90px}#nobootstrap #header #header_infos{height:60px;margin:0;padding:0;position:relative}#nobootstrap #header #header_shopname{float:left;margin:10px 15px 0 10px}#nobootstrap #header #employee_box{display:block;float:right}#nobootstrap #header #employee_infos{display:block;margin:5px 15px 0 10px}#nobootstrap #header #employee_infos a{color:#BABABA;margin-right:5px;text-transform:capitalize}#nobootstrap #header #employee_infos .employee_name{color:#fff;float:left;padding:0 20px 0 0}#nobootstrap #header .separator{background:transparent url(../img/separator.png) no-repeat scroll center top;height:19px;margin-right:5px;width:16px}#nobootstrap #header ul#employee_links{display:block;list-style:none;text-align:left}#nobootstrap #header ul#employee_links li{display:inline;line-height:20px}#nobootstrap #header #header_infos #header_shopname span{color:#fff;display:block;font-size:24px;height:28px;margin:0;overflow:hidden}#nobootstrap #header #header_infos a#header_logout{background:transparent url(../img/logout.png) no-repeat scroll left top;color:#bababa;padding-left:20px}#nobootstrap #header #header_infos #header_logout a span{color:#bababa}#nobootstrap #header #header_infos #header_foaccess{color:#bababa;text-decoration:none}#nobootstrap #header #header_infos #header_foaccess a{color:#bababa !important}#nobootstrap #header #header_search{background-color:#fff;border:2px solid #000;float:left;height:25px;margin-top:15px;position:relative}#nobootstrap #header #header_search #bo_query{background:none repeat scroll 0 0 transparent;border:none;float:left;font:13px Arial,sans-serif;padding:5px 0 5px 4px;width:160px}#nobootstrap #header #header_search #bo_search_type_chzn{border:none;float:left;font-size:13px;height:27px;margin:0 23px 0 0;padding:0 4px;vertical-align:middle;width:80px !important}#nobootstrap #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single{border:none;border-left:1px dotted #ccc}#nobootstrap #header #header_search #bo_search_submit{background:url(../img/icon-search2.png) no-repeat scroll center;border:none;border-left:1px solid #3079ED;color:transparent;cursor:pointer;display:block;float:left;font-weight:400;height:25px;margin:0;padding:0;position:absolute;right:0;text-indent:-9999em;width:27px}#nobootstrap #header #header_quick{display:bloLine truncated

admin-dev/themes/default/css/backward/bootstrap_admin_reset.css

@@ -1,49 +0,0 @@
-#nobootstrap a {
-  line-height: normal; }
-#nobootstrap .categorieList a {
-  line-height: 20px; }
-#nobootstrap p {
-  line-height: normal; }
-#nobootstrap legend {
-  font-size: 13px;
-  line-height: 20px;
-  width: auto !important; }
-#nobootstrap label {
-  font-size: 13px;
-  display: inline;
-  line-height: normal; }
-#nobootstrap .breadcrumb {
-  padding: 0; }
-#nobootstrap select, #nobootstrap textarea, #nobootstrap input {
-  height: auto !important;
-  font-size: 12px !important;
-  line-height: normal;
-  margin-bottom: auto;
-  font-family: Arial, Verdana, Helvetica, sans-serif;
-  margin-bottom: 0 !important;
-  width: auto; }
-#nobootstrap label, #nobootstrap input, #nobootstrap button, #nobootstrap select, #nobootstrap textarea {
-  font-size: 12px;
-  line-height: 13px; }
-#nobootstrap input[type="radio"], #nobootstrap input[type="checkbox"] {
-  margin: 0; }
-#nobootstrap input[type="text"] {
-  height: 14px !important; }
-#nobootstrap table.table {
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  border-collapse: collapse; }
-#nobootstrap table.widthfull {
-  width: 100%; }
-#nobootstrap .table th, #nobootstrap .table td {
-  line-height: normal;
-  vertical-align: middle;
-  border-top: none; }
-#nobootstrap #header #header_search #bo_search_submit {
-  height: 25px !important; }
-#nobootstrap [class^="icon-"], #nobootstrap [class*=" icon-"] {
-  width: auto; }
-#nobootstrap .toolbarBox [class^="process-icon-"], #nobootstrap .toolbarBox [class*=" process-icon-"] {
-  text-indent: -9000px;
-  overflow: hidden; }

admin-dev/themes/default/scss/admin-theme.sass

@@ -21,7 +21,7 @@ html, body
 	@include transition-property(margin)
 	@include transition-duration(0.4s)
 	@include transition-timing-function(ease-out)
-	fieldset, .panel
+	.panel
 		padding: 20px
 		margin-bottom: 20px
 		border: solid 1px darken($bg-content-color,10%)

admin-dev/themes/default/scss/admin-theme/_admin-modules.sass

@@ -66,6 +66,7 @@
 		@include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset)
 		border: solid 1px #ccc
 		background-color: #eee
+		cursor: n-resize
 .module_col_icon
 	display: table-cell
 	width: 50px

admin-dev/themes/default/scss/admin-theme/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/scss/admin-theme/mixins/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/scss/admin-theme/modules/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/scss/admin-theme/partials/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/scss/admin-theme/vendor/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/scss/backward-admin-bootstrap-reset.sass

@@ -1,4 +1,7 @@
+@import compass
 #nobootstrap
+	*, *:before, *:after
+		@include box-sizing(content-box)
 	a
 		line-height: normal
 	.categorieList a
@@ -8,26 +11,25 @@
 	legend
 		font-size: 13px
 		line-height: 20px
-		width: auto!important
+		width: auto
 	label
 		font-size: 13px
 		display: inline
 		line-height: normal
+	fieldset
+		clear: both
+
 	.breadcrumb
 		padding: 0
 	li
 		line-height: normal
 	select, textarea, input
-		height: auto!important
+		height: inherit
-		font-size: 12px!important
+
-		line-height: normal
-		margin-bottom: auto
-		font-family: Arial,Verdana,Helvetica,sans-serif
-		margin-bottom: 0!important
-		width: auto
 	label, input, button, select, textarea
 		font-size: 12px
 		line-height: 13px
+
 	input[type="radio"], input[type="checkbox"]
 		margin: 0
 	input[type="text"]

admin-dev/themes/default/scss/backward-admin-old.scss

@@ -1,6 +1,5 @@
 #nobootstrap {
 	//old admin theme
-	body{font-family:Arial, Helvetica, sans-serif}
 	h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}
 	h2{font-size:1.7em}
 	h3{font-size:1.25em}
@@ -121,14 +120,8 @@
 	.multishop_toolbar .chzn-container .chzn-results .first{background-color:#408BD5;color:#fff;font-weight:700}
 	.multishop_toolbar .chzn-container .chzn-results .group{background-color:#C6DEFC;font-style:italic;font-weight:700;padding-left:15px}
 	.multishop_toolbar .chzn-container .chzn-results .shop{background-color:#EAF2FC;padding-left:30px}
-	.toolbarBox{background-color:#F8F8F8;border:1px solid #CCC;margin-bottom:10px;padding:10px 0;position:relative}
+
-	.toolbarBox .pageTitle{line-height:48px;margin-left:10px}
+	
-	.toolbarBox .pageTitle h3{font-size:2em;font-weight:700;line-height:48px;margin:0;padding:0}
-	.toolbarBox ul.cc_button{float:right;margin:0;padding:0}
-	.toolbarBox ul.cc_button li{color:#666;float:left;height:48px;list-style:none outside none;padding:1px 1px 3px 4px;text-align:center}
-	.toolbarBox a.toolbar_btn{border:1px solid #f8f8f8;border-width:1px;cursor:pointer;display:block;float:left;font-size:11px;min-width:50px;padding:1px 5px;white-space:nowrap}
-	.toolbarBox a.toolbar_btn:hover{background-color:#fff;border:1px inset #ccc}
-	.toolbarBox .toolbar_btn span{display:block;float:none;height:32px;margin:0 auto;position:relative}
 	.toolbarBox .process-icon-delete{background-image:url(../img/process-icon-delete.png)}
 	.toolbarBox .process-icon-duplicate{background-image:url(../img/process-icon-duplicate.png)}
 	.toolbarBox .process-icon-stats{background-image:url(../img/process-icon-stats.png)}
@@ -147,6 +140,7 @@
 	.toolbarBox .process-icon-help{background-image:url(../img/process-icon-help.png)}
 	.toolbarBox .process-icon-help-new{background-image:url(../img/process-icon-help-new.png)}
 	.toolbarBox .process-icon-modules-list{background-image:url(../img/process-icon-modules-list.png)}
+	
 	.toolbarReduced{margin-right:221px}
 	#modules_list_button{background-image:url(../img/modules_list_button.png);border:none;cursor:pointer;font-size:1.6em;height:63px;padding-left:45px;position:absolute;right:0;top:0;width:211px}
 	.toolbarBox #modules_list_container{background:none repeat scroll 0 0 #FFF;border:solid 1px #CCC;display:block;float:right;height:auto;position:absolute;right:13px;top:63px;width:500px;z-index:100}
@@ -340,7 +334,7 @@
 	#moduleContainer .moduleGridDesc,#modules_list_container_tab .moduleGridDesc{display:block;height:30px;position:relative}
 	#moduleContainer ul.listing-grid-module li select,#modules_list_container_tab ul.listing-grid-module li select{position:absolute;right:0;top:0}
 	//root css
-	*{font-family:Arial,Verdana,Helvetica,sans-serif}
+
 	body{color:#000;font-size:12px;margin:0;padding:0}
 	a img{border:0}
 	a{color:#000;outline:0;text-decoration:none}
@@ -353,7 +347,7 @@
 	h3{font-size:1.1em}
 	h5{font-size:.83em}
 	h6{font-size:.67em}
-	h3.blue{color:#268CCD}
+	.blue{color:#268CCD}
 	.red{color:red}
 	form p{margin:.5em 0 0;padding:0 0 .5em}
 	form sup{color:#C00;font-weight:700;vertical-align:text-top}
@@ -696,45 +690,6 @@
 	#BoxUseSpecialSyntax .warn{margin:0 auto;width:500px}
 	#BoxUseSpecialSyntax ul{list-style-type:disc;margin-left:30px}
 	.id_customization .customization_field{min-width:205px;width:205px}
-	#carrier_wizard.swMain{display:block;float:left;margin:0;min-width:980px;padding:0;position:relative;width:100%}
-	#carrier_wizard.swMain .stepContainer{clear:both;display:block;margin:0;overflow:hidden;padding:0;position:relative}
-	#carrier_wizard.swMain .stepContainer div.content{clear:both;display:block;float:left;margin:0;overflow:visible;padding:0;position:absolute;text-align:left;width:100%;z-index:88}
-	#carrier_wizard.swMain div.actionBar{background-color:#f7f8f7;border:1px solid #caccca;clear:both;display:block;height:37px;margin-bottom:20px;overflow:auto;padding:0;position:relative;text-align:left;z-index:88}
-	#carrier_wizard.swMain .stepContainer .StepTitle{clear:both;display:block;margin:0;padding:5px;position:relative;text-align:left;z-index:88}
-	#carrier_wizard.swMain ul.anchor{clear:both;display:block;float:left;list-style:none;margin:0 0 10px;padding:0;position:relative;width:100%}
-	#carrier_wizard.swMain ul.anchor li{display:block;float:left;margin:0;padding:0;position:relative}
-	#carrier_wizard.swMain ul.nbr_steps_4.anchor li{width:25%}
-	#carrier_wizard.swMain ul.nbr_steps_5.anchor li{width:20%}
-	#carrier_wizard.swMain ul.anchor li a{display:block;height:32px;margin:0;outline-style:none;overflow:hidden;padding-right:25px;position:relative;text-decoration:none;z-index:99}
-	#carrier_wizard.swMain ul.anchor li a .stepNumber{color:#fffffe;float:left;font-size:30px;font-style:normal;font-weight:400;height:32px;line-height:32px;padding:0 5px;position:relative;text-align:center;width:24px}
-	#carrier_wizard.swMain ul.anchor li a .stepDesc{display:table-cell;font-size:15px;height:32px;line-height:13px;position:relative;text-align:left;vertical-align:middle}
-	#carrier_wizard.swMain ul.anchor li a.selected{background:#404956 url(../img/admin/steps-carrierwizard.png) no-repeat right -32px;color:#F8F8F8;cursor:text}
-	#carrier_wizard.swMain ul.anchor li a.done,#carrier_wizard.swMain ul.anchor li.done.selected a.selected{background:url(../img/admin/steps-carrierwizard.png) right 0 no-repeat #3f4856;color:#FFF;position:relative;z-index:99}
-	#carrier_wizard.swMain ul.anchor li a.disabled{background:url(../img/admin/steps-carrierwizard.png) right -64px no-repeat #cbcccb;color:#878787;cursor:text}
-	#carrier_wizard.swMain .buttonDisabled{background-color:#CCC!important;border:1px solid #CCC!important;color:#F8F8F8!important;cursor:text}
-	#carrier_wizard.swMain .buttonFinish{background-color:#5A5655;border:1px solid #5A5655;color:#FFF;display:block;float:right;margin:5px 10px 0 3px;outline-style:none;padding:5px;text-align:center;text-decoration:none;width:100px}
-	#carrier_logo_block{margin:0;padding:0;position:absolute;right:10px}
-	#carrier_wizard.swMain .msgBox{background-color:#FFD;border:1px solid #FFD700;color:#5A5655;display:none;float:left;margin:4px 0 0 5px;min-width:200px;padding:5px;position:relative;z-index:999}
-	#carrier_wizard.swMain .msgBox .content{float:left;padding:0}
-	#carrier_wizard.swMain .msgBox .close{border:1px solid #CCC;color:#CCC;display:block;float:right;margin:0 0 0 5px;outline-style:none;padding:0 2px;position:relative;text-align:center;text-decoration:none}
-	#carrier_wizard.swMain .msgBox .close:hover{border:1px solid #EA8511;color:#EA8511}
-	#carrier_wizard .border_top{border-top:solid 1px silver}
-	#carrier_wizard .border_bottom{border-bottom:solid 1px silver}
-	#carrier_wizard .border_left{border-left:solid 1px silver}
-	#carrier_wizard .border_right{border-right:solid 1px silver}
-	#carrier_wizard .border_all{border:solid 1px silver}
-	#carrier_wizard input.field_error{background-color:#FCC;border:solid 1px red}
-	#carrier_wizard .new_range,#carrier_wizard .validate_range{float:left;margin:35px 0 0 10px;width:130px}
-	#carrier_wizard tr.fees_all{background:#CCC}
-	#carrier_wizard #zones_table input[type=text]{width:45px}
-	#carrier_wizard #fieldset_form{min-height:190px}
-	#carrier_wizard #zone_ranges label{float:none;width:inherit}
-	#carrier_wizard #step_carrier_summary label{width:40px}
-	#carrier_wizard #step_carrier_summary .margin-form{padding-left:60px}
-	#carrier_wizard #summary_zones,#carrier_wizard #summary_groups,#carrier_wizard #summary_shops{list-style:disc;margin-left:20px;margin-top:10px}
-	#carrier_wizard .ranges_not_follow label{float:none;width:inherit}
-	#carrier_wizard .ranges_not_follow{margin-bottom:0;width:300px}
-	#carrier_wizard .assoShop{min-height:inherit}
 	.float,span.defaultSkin table.mceLayout tr.mceFirst td,#customer_part #customers ul,#MeaningStatus,#CustomerThreadContacts div#MeaningStatus,#conditions #condition_list a{float:left}
 	.floatr,#customer_part #customers ul li a.id_customer.button{float:right}
 	a.link,.warn a,#content .conf a:hover,#content .warn a:hover,#content .error a:hover{text-decoration:underline}
@@ -762,6 +717,4 @@
 	#conditions .condition_group h3,#conditions #condition_list h4{margin:0 0 10px}
 	#container-customer,#container-multishop{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;padding:10px}
 	#block_tips,#block_partner_tips{float:right;width:48.1%}
-	#carrier_wizard.swMain .buttonNext,#carrier_wizard.swMain .buttonPrevious{background-color:#5A5655;border:1px solid #5A5655;color:#FFF;display:block;float:right;margin:5px 3px 0;outline-style:none;padding:5px;text-align:center;text-decoration:none;width:100px}
-	#carrier_wizard.swMain ul.anchor li a.done .stepNumber,#carrier_wizard.swMain ul.anchor li a.done .stepDesc{color:#A9B6C8}
 }

admin-dev/themes/default/scss/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl

@@ -27,11 +27,11 @@
 
 {block name="label"}
 	{if $input['type'] == 'modules'}
-		<div style="{if !$form_id}display:none{/if}">
+		<div {if !$form_id}class="hide"{/if}>
 			<label class="control-label col-lg-3">{l s='Authorized modules:'}</label>
 		</div>
 	{elseif $input['type'] == 'group_discount_category'}
-		<div style="{if !$form_id}display:none{/if}">
+		<div {if !$form_id}class="hide"{/if}>
 			{$smarty.block.parent}
 		</div>
 	{else}
@@ -39,10 +39,9 @@
 	{/if}
 {/block}
 
-
 {block name="field"}
 	{if $input['type'] == 'group_discount_category'}
-	<div style="{if !$form_id}display:none{/if}">
+	<div {if !$form_id}class="hide"{/if}>
 		<script type="text/javascript">
 		$(document).ready(function() {
 			$("#group_discount_category").fancybox({
@@ -143,7 +142,7 @@
 					</tr>
 				{/foreach}
 			</table>
-		
+		</div>
 		<div style="display:none" id="group_discount_category_fancybox">
 			<div class="panel form-horizontal">
 				<div class="col-lg-12">
@@ -168,8 +167,7 @@
 		</div>
 	</div>
 	{elseif $input['type'] == 'modules'}
-	<div style="{if !$form_id}display:none{/if}">
+	<div {if !$form_id}class="hide"{/if}>
-		<div class="margin-form">
 		<script type="text/javascript">
 			$(document).ready(function() {
 				$('#authorized-modules').find('[value="0"]').click(function() {
@@ -185,7 +183,7 @@
 		<div class="col-lg-9" id="authorized-modules">			
 			{foreach $input['values']['auth_modules'] key=key item=module }
 			<div class="form-group">
-				<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
+				<label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
 				<div class="input-group col-lg-2">
 					<span class="switch prestashop-switch">
 						<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1" checked="checked">
@@ -200,7 +198,7 @@
 			{/foreach}
 			{foreach $input['values']['unauth_modules'] key=key item=module }
 			<div class="form-group">
-				<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
+				<label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
 				<div class="input-group col-lg-2">
 					<span class="switch prestashop-switch">
 						<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1">

admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl

@@ -26,6 +26,7 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
+<div class="row">
 	<div class="col-lg-6">
 		<div class="panel">
 			<h3><i class="icon-group"></i> {l s='Group information'}</h3>
@@ -75,9 +76,12 @@
 			{/if}
 		</div>
 	</div>
+</div>
+<div class="row">
 	<div class="col-lg-12">
 		<h2>{l s='Members of this customer group'}</h2>
 		<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
 		{$customerList}
 	</div>
+</div>
 {/block}

classes/controller/AdminController.php

@@ -1927,12 +1927,13 @@ class AdminControllerCore extends Controller
 		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
 
 		// Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility
-		if (!$this->bootstrap)
+		//if (!$this->bootstrap)
-		{
+		//{
-			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/admin.css', 'all');
+			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
-			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/bootstrap_admin_reset.css', 'all');
+			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
-		}
+		//}
 		
+		//todo csss for rtl support
 		if ($this->context->language->is_rtl)
 			$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
 
@@ -1944,8 +1945,9 @@ class AdminControllerCore extends Controller
 			_PS_JS_DIR_.'toggle.js',
 			_PS_JS_DIR_.'tools.js',
 			_PS_JS_DIR_.'ajax.js',
-			_PS_JS_DIR_.'toolbar.js',
+			//_PS_JS_DIR_.'toolbar.js',
 		));
+
 		//loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory
 		$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js');
 		$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/admin-theme.js');
@@ -1970,14 +1972,13 @@ class AdminControllerCore extends Controller
 	 * @param boolean $htmlentities if set to true(default), the return value will pass through htmlentities($string, ENT_QUOTES, 'utf-8')
 	 * @return string the translation if available, or the english default text.
 	 */
-	protected function l($string, $class = 'AdminTab', $addslashes = false, $htmlentities = true)
+	protected function l($string, $class = null, $addslashes = false, $htmlentities = true)
 	{
-		// classname has changed, from AdminXXX to AdminXXXController
+		if ($class === null || $class == 'AdminTab')
-		// So we remove 10 characters and we keep same keys
-		if (strtolower(substr($class, -10)) == 'controller')
-			$class = substr($class, 0, -10);
-		elseif ($class == 'AdminTab')
 			$class = substr(get_class($this), 0, -10);
+		// classname has changed, from AdminXXX to AdminXXXController, so we remove 10 characters and we keep same keys
+		elseif (strtolower(substr($class, -10)) == 'controller')
+			$class = substr($class, 0, -10);
 		return Translate::getAdminTranslation($string, $class, $addslashes, $htmlentities);
 	}
 

controllers/admin/AdminCategoriesController.php

@@ -356,7 +356,7 @@ class AdminCategoriesControllerCore extends AdminController
 		$helper->id = 'box-disabled-categories';
 		$helper->icon = 'icon-off';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Disabled Categories');
+		$helper->title = $this->l('Disabled Categories', null, null, false);
 		if (ConfigurationKPI::get('DISABLED_CATEGORIES') !== false)
 			$helper->value = ConfigurationKPI::get('DISABLED_CATEGORIES');
 		if (ConfigurationKPI::get('DISABLED_CATEGORIES_EXPIRE') < $time)
@@ -367,7 +367,7 @@ class AdminCategoriesControllerCore extends AdminController
 		$helper->id = 'box-empty-categories';
 		$helper->icon = 'icon-bookmark-empty';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Empty Categories');
+		$helper->title = $this->l('Empty Categories', null, null, false);
 		if (ConfigurationKPI::get('EMPTY_CATEGORIES') !== false)
 			$helper->value = ConfigurationKPI::get('EMPTY_CATEGORIES');
 		if (ConfigurationKPI::get('EMPTY_CATEGORIES_EXPIRE') < $time)
@@ -378,8 +378,8 @@ class AdminCategoriesControllerCore extends AdminController
 		$helper->id = 'box-top-category';
 		$helper->icon = 'icon-money';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Top Category');
+		$helper->title = $this->l('Top Category', null, null, false);
-		$helper->subtitle = $this->l('30 days');
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang) !== false)
 			$helper->value = ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang);
 		if (ConfigurationKPI::get('TOP_CATEGORY_EXPIRE', $this->context->employee->id_lang) < $time)

controllers/admin/AdminCustomerThreadsController.php

@@ -478,7 +478,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
 		$helper->id = 'box-pending-messages';
 		$helper->icon = 'icon-envelope';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Pending Messages');
+		$helper->title = $this->l('Pending Messages', null, null, false);
 		if (ConfigurationKPI::get('PENDING_MESSAGES') !== false)
 			$helper->value = ConfigurationKPI::get('PENDING_MESSAGES');
 		if (ConfigurationKPI::get('PENDING_MESSAGES_EXPIRE') < $time)
@@ -489,8 +489,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
 		$helper->id = 'box-age';
 		$helper->icon = 'icon-time';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Average Response Time');
+		$helper->title = $this->l('Average Response Time', null, null, false);
-		$helper->subtitle = $this->l('30 days');
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME') !== false)
 			$helper->value = ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME');
 		if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME_EXPIRE') < $time)
@@ -501,8 +501,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
 		$helper->id = 'box-messages-per-thread';
 		$helper->icon = 'icon-copy';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Messages per Thread');
+		$helper->title = $this->l('Messages per Thread', null, null, false);
-		$helper->subtitle = $this->l('30 day');
+		$helper->subtitle = $this->l('30 day', null, null, false);
 		if (ConfigurationKPI::get('MESSAGES_PER_THREAD') !== false)
 			$helper->value = ConfigurationKPI::get('MESSAGES_PER_THREAD');
 		if (ConfigurationKPI::get('MESSAGES_PER_THREAD_EXPIRE') < $time)

controllers/admin/AdminCustomersController.php

@@ -545,8 +545,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-gender';
 		$helper->icon = 'icon-male';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Customers');
+		$helper->title = $this->l('Customers', null, null, false);
-		$helper->subtitle = $this->l('All Time');
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER') !== false)
 			$helper->value = ConfigurationKPI::get('CUSTOMER_MAIN_GENDER');
 		if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER_EXPIRE') < $time)
@@ -557,8 +557,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-age';
 		$helper->icon = 'icon-calendar';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Average Age');
+		$helper->title = $this->l('Average Age', 'AdminTab', null, false);
-		$helper->subtitle = $this->l('All Time');
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('AVG_CUSTOMER_AGE') !== false)
 			$helper->value = ConfigurationKPI::get('AVG_CUSTOMER_AGE');
 		if (ConfigurationKPI::get('AVG_CUSTOMER_AGE_EXPIRE') < $time)
@@ -569,8 +569,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-orders';
 		$helper->icon = 'icon-retweet';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Orders per Customer');
+		$helper->title = $this->l('Orders per Customer', null, null, false);
-		$helper->subtitle = $this->l('All Time');
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER') !== false)
 			$helper->value = ConfigurationKPI::get('ORDERS_PER_CUSTOMER');
 		if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER_EXPIRE') < $time)
@@ -581,8 +581,8 @@ class AdminCustomersControllerCore extends AdminController
 		$helper->id = 'box-newsletter';
 		$helper->icon = 'icon-envelope';
 		$helper->color = 'color4';
-		$helper->title = $this->l('Newsletter Registrations');
+		$helper->title = $this->l('Newsletter Registrations', null, null, false);
-		$helper->subtitle = $this->l('All Time');
+		$helper->subtitle = $this->l('All Time', null, null, false);
 		if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS') !== false)
 			$helper->value = ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS');
 		if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS_EXPIRE') < $time)

controllers/admin/AdminGroupsController.php

@@ -310,7 +310,7 @@ class AdminGroupsControllerCore extends AdminController
 				),
 				array(
 					'type' => 'modules',
-					'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')),
+					'label' => $this->l('Modules Authorization'),
 					'name' => 'auth_modules',
 					'values' => $this->formatModuleListAuth($group->id)
 				)

controllers/admin/AdminModulesController.php

@@ -987,7 +987,7 @@ class AdminModulesControllerCore extends AdminController
 		$helper->id = 'box-installed-modules';
 		$helper->icon = 'icon-puzzle-piece';
 		$helper->color = 'color1';
-		$helper->title = html_entity_decode($this->l('Installed Modules'));
+		$helper->title = $this->l('Installed Modules', null, null, false);
 		if (ConfigurationKPI::get('INSTALLED_MODULES') !== false)
 			$helper->value = ConfigurationKPI::get('INSTALLED_MODULES');
 		if (ConfigurationKPI::get('INSTALLED_MODULES_EXPIRE') < $time)
@@ -998,7 +998,7 @@ class AdminModulesControllerCore extends AdminController
 		$helper->id = 'box-disabled-modules';
 		$helper->icon = 'icon-off';
 		$helper->color = 'color2';
-		$helper->title = html_entity_decode($this->l('Disabled Modules'));
+		$helper->title = $this->l('Disabled Modules', null, null, false);
 		if (ConfigurationKPI::get('DISABLED_MODULES') !== false)
 			$helper->value = ConfigurationKPI::get('DISABLED_MODULES');
 		if (ConfigurationKPI::get('DISABLED_MODULES_EXPIRE') < $time)
@@ -1009,7 +1009,7 @@ class AdminModulesControllerCore extends AdminController
 		$helper->id = 'box-update-modules';
 		$helper->icon = 'icon-refresh';
 		$helper->color = 'color3';
-		$helper->title = html_entity_decode($this->l('Modules to update'));
+		$helper->title = $this->l('Modules to update', null, null, false);
 		if (ConfigurationKPI::get('UPDATE_MODULES') !== false)
 			$helper->value = ConfigurationKPI::get('UPDATE_MODULES');
 		if (ConfigurationKPI::get('UPDATE_MODULES_EXPIRE') < $time)

controllers/admin/AdminOrdersController.php

@@ -1263,8 +1263,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->icon = 'icon-sort-by-attributes-alt';
 		//$helper->chart = true;
 		$helper->color = 'color1';
-		$helper->title = $this->l('Conversion Rate');
+		$helper->title = $this->l('Conversion Rate', null, null, false);
-		$helper->subtitle = $this->l('30 days');
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('CONVERSION_RATE') !== false)
 			$helper->value = ConfigurationKPI::get('CONVERSION_RATE');
 		if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false)
@@ -1277,8 +1277,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->id = 'box-carts';
 		$helper->icon = 'icon-shopping-cart';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Abandoned Carts');
+		$helper->title = $this->l('Abandoned Carts', null, null, false);
-		$helper->subtitle = $this->l('Today');
+		$helper->subtitle = $this->l('Today', null, null, false);
 		$helper->href = $this->context->link->getAdminLink('AdminCarts');
 		if (ConfigurationKPI::get('ABANDONED_CARTS') !== false)
 			$helper->value = ConfigurationKPI::get('ABANDONED_CARTS');
@@ -1290,8 +1290,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->id = 'box-average-order';
 		$helper->icon = 'icon-money';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Average Order Value');
+		$helper->title = $this->l('Average Order Value', null, null, false);
-		$helper->subtitle = $this->l('30 days');
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('AVG_ORDER_VALUE') !== false)
 			$helper->value = ConfigurationKPI::get('AVG_ORDER_VALUE');
 		if (ConfigurationKPI::get('AVG_ORDER_VALUE_EXPIRE') < $time)
@@ -1302,8 +1302,8 @@ class AdminOrdersControllerCore extends AdminController
 		$helper->id = 'box-net-profit-visitor';
 		$helper->icon = 'icon-user';
 		$helper->color = 'color4';
-		$helper->title = $this->l('Net Profit per Visitor');
+		$helper->title = $this->l('Net Profit per Visitor', null, null, false);
-		$helper->subtitle = $this->l('30 days');
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('NETPROFIT_VISITOR') !== false)
 			$helper->value = ConfigurationKPI::get('NETPROFIT_VISITOR');
 		if (ConfigurationKPI::get('NETPROFIT_VISITOR_EXPIRE') < $time)

controllers/admin/AdminProductsController.php

@@ -2311,7 +2311,7 @@ class AdminProductsControllerCore extends AdminController
 			$helper->id = 'box-products-stock';
 			$helper->icon = 'icon-archive';
 			$helper->color = 'color1';
-			$helper->title = $this->l('Items in Stock');
+			$helper->title = $this->l('Items in Stock', null, null, false);
 			if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK') !== false)
 				$helper->value = ConfigurationKPI::get('PERCENT_PRODUCT_STOCK');
 			if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK_EXPIRE') < $time)
@@ -2323,7 +2323,7 @@ class AdminProductsControllerCore extends AdminController
 		$helper->id = 'box-avg-gross-margin';
 		$helper->icon = 'icon-tags';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Average Gross Margin');
+		$helper->title = $this->l('Average Gross Margin', null, null, false);
 		if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN') !== false)
 			$helper->value = ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN');
 		if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN_EXPIRE') < $time)
@@ -2334,8 +2334,8 @@ class AdminProductsControllerCore extends AdminController
 		$helper->id = 'box-8020-sales-catalog';
 		$helper->icon = 'icon-beaker';
 		$helper->color = 'color3';
-		$helper->title = $this->l('80% of your sales');
+		$helper->title = $this->l('80% of your sales', null, null, false);
-		$helper->subtitle = $this->l('30 days');
+		$helper->subtitle = $this->l('30 days', null, null, false);
 		if (ConfigurationKPI::get('8020_SALES_CATALOG') !== false)
 			$helper->value = ConfigurationKPI::get('8020_SALES_CATALOG');
 		if (ConfigurationKPI::get('8020_SALES_CATALOG_EXPIRE') < $time)
@@ -2346,7 +2346,7 @@ class AdminProductsControllerCore extends AdminController
 		$helper->id = 'box-disabled-products';
 		$helper->icon = 'icon-off';
 		$helper->color = 'color4';
-		$helper->title = $this->l('Disabled Products');
+		$helper->title = $this->l('Disabled Products', null, null, false);
 		if (ConfigurationKPI::get('DISABLED_PRODUCTS') !== false)
 			$helper->value = ConfigurationKPI::get('DISABLED_PRODUCTS');
 		if (ConfigurationKPI::get('DISABLED_PRODUCTS_EXPIRE') < $time)

controllers/admin/AdminTranslationsController.php

@@ -1294,7 +1294,7 @@ class AdminTranslationsControllerCore extends AdminController
 		$helper->id = 'box-languages';
 		$helper->icon = 'icon-microphone';
 		$helper->color = 'color1';
-		$helper->title = $this->l('Enabled Languages');
+		$helper->title = $this->l('Enabled Languages', null, null, false);
 		if (ConfigurationKPI::get('ENABLED_LANGUAGES') !== false)
 			$helper->value = ConfigurationKPI::get('ENABLED_LANGUAGES');
 		if (ConfigurationKPI::get('ENABLED_LANGUAGES_EXPIRE') < $time)
@@ -1305,8 +1305,8 @@ class AdminTranslationsControllerCore extends AdminController
 		$helper->id = 'box-country';
 		$helper->icon = 'icon-home';
 		$helper->color = 'color2';
-		$helper->title = $this->l('Main Country');
+		$helper->title = $this->l('Main Country', null, null, false);
-		$helper->subtitle = $this->l('30 Days');
+		$helper->subtitle = $this->l('30 Days', null, null, false);
 		if (ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id) !== false)
 			$helper->value = ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id);
 		if (ConfigurationKPI::get('MAIN_COUNTRY_EXPIRE', $this->context->language->id) < $time)
@@ -1317,7 +1317,7 @@ class AdminTranslationsControllerCore extends AdminController
 		$helper->id = 'box-translations';
 		$helper->icon = 'icon-list';
 		$helper->color = 'color3';
-		$helper->title = $this->l('Front Office Translations');
+		$helper->title = $this->l('Front Office Translations', null, null, false);
 		if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS') !== false)
 			$helper->value = ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS');
 		if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS_EXPIRE') < $time)

js/validate.js

@@ -44,7 +44,8 @@ var unicode_hack = (function() {
 	};
 	/* Also supports the general category (only the first letter) */
 	var firstLetters = {};
-    for ( var p in unicodeCategories ) {
+	for (var p in unicodeCategories)
+	{
 		if (firstLetters[p[0]])
 			firstLetters[p[0]] = unicodeCategories[p].substring(0,unicodeCategories[p].length-1) + firstLetters[p[0]].substring(1);
 		else
@@ -55,7 +56,8 @@ var unicode_hack = (function() {
 
 	/* Gets a regex written in a dialect that supports unicode categories and
 	   translates it to a dialect supported by JavaScript. */
-    return function(regexpString) {
+	return function(regexpString, classes) 
+	{
 		var modifiers = "";
 		if ( regexpString instanceof RegExp ) {
 			modifiers = (regexpString.global ? "g" : "") +
@@ -64,10 +66,14 @@ var unicode_hack = (function() {
 			regexpString = regexpString.source;
 		}
 		regexpString = regexpString.replace(/\\p\{(..?)\}/g, function(match,group) {
-            return unicodeCategories[group] || match;
+		var unicode_categorie = unicodeCategories[group];
+		if (!classes)
+			unicode_category = unicode_categorie.replace(/\[(.*?)\]/g,"$1")
+			return unicode_category || match;
 		});
 		return new RegExp(regexpString,modifiers);
 	};
+
 })();
 /*
 * 2007-2013 PrestaShop
@@ -143,7 +149,7 @@ function validate_isDniLite(s)
 
 function validate_isEmail(s)
 {
-	var reg = unicode_hack('^[a-z\p{L}0-9!#$%&\'*+\/=?^`{}|~_-]+[.a-z\p{L}0-9!#$%&\'*+\/=?^`{}|~_-]*@[a-z\p{L}0-9]+[._a-z\p{L}0-9-]*\.[a-z0-9]+$');
+	var reg = unicode_hack(/^[a-z\p{L}0-9!#$%&'*+\/=?^`{}|~_-]+[.a-z\p{L}0-9!#$%&'*+\/=?^`{}|~_-]*@[a-z\p{L}0-9]+[._a-z\p{L}0-9-]*\.[a-z\p{L}0-9]+$/i, false);
 	return reg.test(s);	
 }
 

modules/dashgoals/controllers/admin/AdminDashgoalsController.php

@@ -25,12 +25,21 @@
  *  International Registered Trademark & Property of PrestaShop SA
  */
 
-class DashGoalsAjaxModuleAdminController extends ModuleAdminController
+class AdminDashgoalsController extends ModuleAdminController
 {
-	public function initContent()
+	public function ajaxProcessChangeConfYear()
 	{	
-		parent::initContent();
+		$year = (int)Tools::getValue('year');
+		Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', $year);
+		$months = $this->module->setMonths($year);
 
-		die ('Todo');
+		$this->context->smarty->assign(array(
+			'currency' => $this->context->currency,
+			'goals_year' => $year,
+			'goals_months' => $months,
+			'link' => $this->context->link
+		));
+
+		echo $this->module->display(_PS_MODULE_DIR_.$this->module->name.DIRECTORY_SEPARATOR.$this->module->name.'.php', 'config.tpl');
 	}
 }

modules/dashgoals/dashgoals.php

@@ -60,6 +60,7 @@ class Dashgoals extends Module
 
 	public function install()
 	{
+		Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', date('Y'));
 		for ($month = '01'; $month <= 12; $month = sprintf('%02d', $month + 1))
 		{
 			$key = strtoupper('dashgoals_traffic_'.$month.'_'.date('Y'));
@@ -73,23 +74,44 @@ class Dashgoals extends Module
 				ConfigurationKPI::updateValue($key, 80);
 		}
 
+		// Prepare tab
+		$tab = new Tab();
+		$tab->active = 1;
+		$tab->class_name = "AdminDashgoals";
+		$tab->name = array();
+		foreach (Language::getLanguages(true) as $lang)
+			$tab->name[$lang['id_lang']] = 'Dashgoals';
+		$tab->id_parent = -1;
+		$tab->module = $this->name;
+
 		return (
-			parent::install()
+			$tab->add()
+			&& parent::install()
 			&& $this->registerHook('dashboardZoneTwo')
 			&& $this->registerHook('dashboardData')
 			&& $this->registerHook('displayBackOfficeHeader')
 		);
 	}
 
+	public function uninstall()
+	{
+		$id_tab = (int)Tab::getIdFromClassName('AdminDashgoals');
+		if ($id_tab)
+		{
+			$tab = new Tab($id_tab);
+			$tab->delete();
+		}
+		return parent::uninstall();
+	}
+	
 	public function hookDisplayBackOfficeHeader()
 	{
 		if (get_class($this->context->controller) == 'AdminDashboardController')
 			$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
 	}
 	
-	public function hookDashboardZoneTwo($params)
+	public function setMonths($year)
 	{
-		$year = date('Y');
 		$months = array();
 		for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1))
 			$months[$i.'_'.$year] = array('label' => Dashgoals::$month_labels[$i], 'values' => array());
@@ -102,16 +124,26 @@ class Dashgoals extends Module
 					ConfigurationKPI::updateValue(strtoupper($key), (float)Tools::getValue($key));
 				$month_row['values'][$type] = ConfigurationKPI::get(strtoupper($key));
 			}
+		return $months;
+	}
 
-		$this->context->smarty->assign('currency', $this->context->currency);
+	public function hookDashboardZoneTwo($params)
-		$this->context->smarty->assign('goals_year', $year);
+	{
-		$this->context->smarty->assign('goals_months', $months);
+		$year = Configuration::get('PS_DASHGOALS_CURRENT_YEAR');
+		$months = $this->setMonths($year);
+
+		$this->context->smarty->assign(array(
+			'currency' => $this->context->currency,
+			'goals_year' => $year,
+			'goals_months' => $months,
+			'dashgoals_ajax_link' => $this->context->link->getAdminLink('AdminDashgoals')
+		));
 		return $this->display(__FILE__, 'dashboard_zone_two.tpl');
 	}
 
 	public function hookDashboardData($params)
 	{
-		$year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : date('Y'));
+		$year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : Configuration::get('PS_DASHGOALS_CURRENT_YEAR'));
 		return array('data_chart' => array('dash_goals_chart1' => $this->getChartData($year)));
 	}
 	

modules/dashgoals/views/js/dashgoals.js

@@ -35,24 +35,30 @@ function dashgoals_changeYear(xward)
 		new_year = dashgoals_year + 1;
 	else if (xward == 'backward')
 		new_year = dashgoals_year - 1;
+
+	$.ajax({
+		url: dashgoals_ajax_link,
+		data: {
+			ajax: true,
+			action: 'changeconfyear',
+			year: new_year
+		},
+		success : function(result){
 			$('#dashgoals_title').text($('#dashgoals_title').text().replace(dashgoals_year, new_year));
+			var hide_conf = $('#dashgoals_config').hasClass('hide');
+			$('#dashgoals_config').replaceWith(result);
+			dashgoals_calc_sales();
+			if (!hide_conf)
+				$('#dashgoals_config').removeClass('hide');
+			$('.dashgoals_config_input').off();
+			$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
 			dashgoals_year = new_year;
 			refreshDashboard('dashgoals', false, dashgoals_year);
 		}
-
+	});
-function dashgoals_changeConfYear(xward)
-{
-	// Todo
-	// getModuleLink('dashgoals', 'ajax', array('year' => $('#dashgoals_conftitle').text()), $ssl = null, $id_lang = null, $id_shop = null)
-	if (xward == 'forward')
-		$('#dashgoals_conftitle').text(parseInt($('#dashgoals_conftitle').text()) + 1);
-	else if (xward == 'backward')
-		$('#dashgoals_conftitle').text(parseInt($('#dashgoals_conftitle').text()) - 1);
 }
 
 $(document).ready(function() {
-	$('.dashgoals_config_input').keyup(function() {
+	$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
-		dashgoals_calc_sales();
-	});
 	dashgoals_calc_sales();
 });

modules/dashgoals/views/templates/hook/config.tpl

@@ -0,0 +1,73 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<section id="dashgoals_config" class="dash_config hide">
+	<header><i class="icon-wrench"></i> {l s='Configuration' mod='dashgoals'}</header>
+	<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')}">
+		<table class="table table-condensed table-striped table-bordered">
+			<thead>
+				<tr>
+					<th>{$goals_year}</th>
+					<th>{l s='Traffic' mod='dashgoals'}</th>
+					<th>{l s='Conversion Rate' mod='dashgoals'}</th>
+					<th>{l s='Average Cart Value' mod='dashgoals'}</th>
+					<th>{l s='Sales' mod='dashgoals'}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{foreach $goals_months as $month}
+				<tr>
+					<td>
+						{$month.label}
+					</td>
+					<td>
+						<div class="input-group">
+							<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
+								value="{$month.values.traffic|intval}" />
+						</div>
+					</td>
+					<td>
+						<div class="input-group">
+							<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
+								value="{$month.values.conversion|floatval}" />
+							<span class="input-group-addon">%</span>
+						</div>
+					</td>
+					<td>
+						<div class="input-group">
+							<span class="input-group-addon">{$currency->iso_code|escape}</span>
+							<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
+								value="{$month.values.avg_cart_value|intval}" />
+						</div>
+					</td>
+					<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
+					</td>
+				</tr>
+				{/foreach}
+			</tbody>
+		</table>
+		<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
+	</form>
+</section>

modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl

@@ -30,6 +30,8 @@
 	var priceDisplayPrecision = 0;
 	
 	var dashgoals_year = {$goals_year|intval};
+	
+	var dashgoals_ajax_link = '{$dashgoals_ajax_link|addslashes}';
 </script>
 
 <section id="dashgoals" class="panel widget">
@@ -46,58 +48,7 @@
 			</a>
 		</span>
 	</header>
-	<section id="dashgoals_config" class="dash_config hide">
+	{include file='./config.tpl'}
-		<header><i class="icon-wrench"></i> {l s='Configuration' mod='dashgoals'}</header>
-		<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')}">
-			<table class="table table-condensed table-striped table-bordered">
-				<thead>
-					<tr>
-						<th>
-							<a href="javascript:void(0);" onclick="dashgoals_changeConfYear('backward');" class="icon-backward"></a>
-							<span id="dashgoals_conftitle">{$goals_year}</span>
-							<a href="javascript:void(0);" onclick="dashgoals_changeConfYear('forward');" class="icon-forward"></a>
-						</th>
-						<th>{l s='Traffic' mod='dashgoals'}</th>
-						<th>{l s='Conversion Rate' mod='dashgoals'}</th>
-						<th>{l s='Average Cart Value' mod='dashgoals'}</th>
-						<th>{l s='Sales' mod='dashgoals'}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{foreach $goals_months as $month}
-					<tr>
-						<td>
-							{$month.label}
-						</td>
-						<td>
-							<div class="input-group">
-								<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
-									value="{$month.values.traffic|intval}" />
-							</div>
-						</td>
-						<td>
-							<div class="input-group">
-								<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
-									value="{$month.values.conversion|floatval}" />
-								<span class="input-group-addon">%</span>
-							</div>
-						</td>
-						<td>
-							<div class="input-group">
-								<span class="input-group-addon">{$currency->iso_code|escape}</span>
-								<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
-									value="{$month.values.avg_cart_value|intval}" />
-							</div>
-						</td>
-						<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
-						</td>
-					</tr>
-					{/foreach}
-				</tbody>
-			</table>
-			<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
-		</form>
-	</section>
 	<section class="loading">
 		<div id="dash_goals_chart1" class="chart with-transitions">
 			<svg></svg>

themes/default-bootstrap/product.tpl

@@ -208,7 +208,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
 		{if isset($images) && count($images) > 0}
 		<!-- thumbnails -->
 		<div id="views_block" class="clearfix {if isset($images) && count($images) < 2}hidden{/if}">
-		{if isset($images) && count($images) > 3}<span class="view_scroll_spacer"><a id="view_scroll_left" class="" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Previous'}</a></span>{/if}
+		{if isset($images) && count($images) > 4}<span class="view_scroll_spacer"><a id="view_scroll_left" class="" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Previous'}</a></span>{/if}
 		<div id="thumbs_list">
 			<ul id="thumbs_list_frame">
 				{if isset($images)}
@@ -223,7 +223,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
 				{/if}
 			</ul>
 		</div>
-		{if isset($images) && count($images) > 3}<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Next'}</a>{/if}
+		{if isset($images) && count($images) > 4}<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Next'}</a>{/if}
 		</div>
 		{/if}
 		{if isset($images) && count($images) > 1}<p class="resetimg clear"><span id="wrapResetImages" style="display: none;">