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

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

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-10-25 15:55:39 +02:00
2 parents f89c8ed008 aa322e4777
commit f472f3e848
18 files changed
+365 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+4 -5
View File
@@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700);/*! @import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700);/*
* Bootstrap v3.0.0 * Bootstrap v3.0.0
* *
* Copyright 2013 Twitter, Inc * Copyright 2013 Twitter, Inc
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world by @mdo and @fat. * Designed and built with all the love in the world by @mdo and @fat.
*//*! 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.Line 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 * Font Awesome 3.2.1
* the iconic font designed for Bootstrap * the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------ * ------------------------------------------------------------------------------
@@ -30,10 +30,9 @@
* Email: dave@fontawesome.io * Email: dave@fontawesome.io
* Twitter: http://twitter.com/byscuits * Twitter: http://twitter.com/byscuits
* Work: Lead Product Designer @ Kyruus - http://kyruus.com * Work: Lead Product Designer @ Kyruus - http://kyruus.com
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3:not(.modal-title) .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3:not(.modal-title) [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3:not(.modal-title) [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:nonLine truncated */@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3:not(.modal-title) .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3:not(.modal-title) [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3:not(.modal-title) [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:nonLine truncated
* Ladda
* http://lab.hakim.se/ladda * http://lab.hakim.se/ladda
* MIT licensed * MIT licensed
* *
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se * 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/admin-theme.sass
+4 -5
View File
@@ -116,12 +116,10 @@ input[type="text"],input[type="search"],input[type="password"], textarea, select
.panel-footer .panel-footer
margin: 15px -20px -20px margin: 15px -20px -20px
height: 73px height: 73px
.panel-footer
.btn.pull-right
margin-left: 3px
//todo: fix focus firefox
*:focus
outline: none!important
-moz-outline: none!important
-moz-user-focus: ignore!important
//components //components
@import "admin-theme/admin-header" @import "admin-theme/admin-header"
@@ -142,3 +140,4 @@ input[type="text"],input[type="search"],input[type="password"], textarea, select
@import "admin-theme/admin-carrier-wizard" @import "admin-theme/admin-carrier-wizard"
@import "admin-theme/admin-modules" @import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard" @import "admin-theme/admin-dashboard"
@import "admin-theme/admin-search"
admin-dev/themes/default/css/admin-theme/_admin-search.sass
+8
View File
@@ -0,0 +1,8 @@
.adminsearch
#content
.panel .panel
padding: 0
margin: 0
border: none
@include border-radius(0)
@include box-shadow(0)
admin-dev/themes/default/template/controllers/login/content.tpl
+4 -4
View File
@@ -79,7 +79,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<a href="#" class="show-forgot-password pull-right" > <a href="#" class="show-forgot-password pull-right" >
{l s='Lost password'}&hellip; {l s='Lost password'}
</a> </a>
<label class="control-label" for="passwd"> <label class="control-label" for="passwd">
{l s='Password'} {l s='Password'}
@@ -138,16 +138,16 @@
id="email_forgot" id="email_forgot"
class="form-control" class="form-control"
autofocus="autofocus" autofocus="autofocus"
tabindex="1" tabindex="5"
placeholder="test@example.com" /> placeholder="test@example.com" />
</div> </div>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<button href="#" class="btn btn-default show-login-form" tabindex="3"> <button href="#" class="btn btn-default show-login-form" tabindex="7">
<i class="icon-caret-left"></i> <i class="icon-caret-left"></i>
{l s='Back to login'} {l s='Back to login'}
</button> </button>
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="2"> <button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="6">
<i class="icon-ok text-success"></i> <i class="icon-ok text-success"></i>
{l s='Send'} {l s='Send'}
</button> </button>
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+66 -43
View File
@@ -29,19 +29,32 @@ $(function() {
}); });
</script> </script>
{if isset($features)} {if !$nb_results}
<div class="panel"> <h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2>
{if !$features} {else}
<h3>{l s='No features matching your query'} : {$query}</h3> <h2>
{if $nb_results == 1}
{l s='1 result matches your query "%s".' sprintf=$query}
{else} {else}
<h3>{l s='Features matching your query'} : {$query}</h3> {l s='%d results match your query "%s".' sprintf=[$nb_results|intval, $query]}
{/if}
</h2>
{if isset($features)}
<div class="panel">
<h3>
{if $features|@count == 1}
{l s='1 feature'}
{else}
{l s='%d features' sprintf=$features|@count}
{/if}
</h3>
<table class="table"> <table class="table">
<tbody> <tbody>
{foreach $features key=key item=feature} {foreach $features key=key item=feature}
{foreach $feature key=k item=val name=feature_list} {foreach $feature key=k item=val name=feature_list}
<tr> <tr>
<td><strong>{if $smarty.foreach.feature_list.first}{$key}{/if}</strong></td> <td><strong>{if $smarty.foreach.feature_list.first}{$key}{/if}</strong></td>
<td> <td>
<a href="{$val.link}">{$val.value}</a> <a href="{$val.link}">{$val.value}</a>
</td> </td>
@@ -50,16 +63,18 @@ $(function() {
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
{/if}
</div> </div>
{/if} {/if}
{if isset($modules)} {if isset($modules) && $modules}
<div class="panel"> <div class="panel">
{if !$modules} <h3>
<h3>{l s='No modules matching your query'} : {$query}</h3> {if $modules|@count == 1}
{else} {l s='1 module'}
<h3>{l s='Modules matching your query'} : {$query}</h3> {else}
{l s='%d modules' sprintf=$modules|@count}
{/if}
</h3>
<table class="table"> <table class="table">
<tbody> <tbody>
{foreach $modules key=key item=module} {foreach $modules key=key item=module}
@@ -70,16 +85,18 @@ $(function() {
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
{/if}
</div> </div>
{/if} {/if}
{if isset($categories)} {if isset($categories) && $categories}
<div class="panel"> <div class="panel">
{if !$categories} <h3>
<h3>{l s='No categories matching your query'} : {$query}</h3> {if $categories|@count == 1}
{else} {l s='1 category'}
<h3>{l s='Categories matching your query'} : {$query}</h3> {else}
{l s='%d categories' sprintf=$categories|@count}
{/if}
</h3>
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table">
{foreach $categories key=key item=category} {foreach $categories key=key item=category}
<tr class="alt_row"> <tr class="alt_row">
@@ -87,39 +104,45 @@ $(function() {
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
{/if}
</div> </div>
{/if} {/if}
{if isset($products)} {if isset($products) && $products}
<div class="panel"> <div class="panel">
{if !$products} <h3>
<h3>{l s='There are no products matching your query'} : {$query}</h3> {if $products|@count == 1}
{else} {l s='1 product'}
<h3>{l s='Products matching your query'} : {$query}</h3> {else}
{l s='%d products' sprintf=$products|@count}
{/if}
</h3>
{$products} {$products}
{/if}
</div> </div>
{/if} {/if}
{if isset($customers)} {if isset($customers) && $customers}
<div class="panel"> <div class="panel">
{if !$customers} <h3>
<h3>{l s='There are no customers matching your query'} : {$query}</h3> {if $customers|@count == 1}
{else} {l s='1 customer'}
<h3>{l s='Customers matching your query'} : {$query}</h3> {else}
{l s='%d customers' sprintf=$customers|@count}
{/if}
</h3>
{$customers} {$customers}
{/if}
</div> </div>
{/if} {/if}
{if isset($orders)} {if isset($orders) && $orders}
<div class="panel"> <div class="panel">
{if !$orders} <h3>
<h3>{l s='There are no orders matching your query'} : {$query}</h3> {if $orders|@count == 1}
{else} {l s='1 order'}
<h3>{l s='Orders matching your query'} : {$query}</h3> {else}
{l s='%d orders' sprintf=$orders|@count}
{/if}
</h3>
{$orders} {$orders}
{/if}
</div> </div>
{/if} {/if}
{/if}
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -105,7 +105,7 @@
</head> </head>
{if $display_header} {if $display_header}
<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if}"> <body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if} {$smarty.get.controller|escape|strtolower}">
{* begin HEADER *} {* begin HEADER *}
<header id="header"> <header id="header">
cache/class_index.php
Vendored
+4
View File
@@ -378,6 +378,8 @@
'HelperTreeCategoriesCore' => 'classes/helper/HelperTreeCategories.php', 'HelperTreeCategoriesCore' => 'classes/helper/HelperTreeCategories.php',
'HelperTreeShops' => '', 'HelperTreeShops' => '',
'HelperTreeShopsCore' => 'classes/helper/HelperTreeShops.php', 'HelperTreeShopsCore' => 'classes/helper/HelperTreeShops.php',
'HelperUploader' => '',
'HelperUploaderCore' => 'classes/helper/HelperUploader.php',
'HelperView' => '', 'HelperView' => '',
'HelperViewCore' => 'classes/helper/HelperView.php', 'HelperViewCore' => 'classes/helper/HelperView.php',
'HistoryController' => '', 'HistoryController' => '',
@@ -644,6 +646,8 @@
'TreeToolbarSearchCore' => 'classes/tree/TreeToolbarSearch.php', 'TreeToolbarSearchCore' => 'classes/tree/TreeToolbarSearch.php',
'Upgrader' => '', 'Upgrader' => '',
'UpgraderCore' => 'classes/Upgrader.php', 'UpgraderCore' => 'classes/Upgrader.php',
'Uploader' => '',
'UploaderCore' => 'classes/Uploader.php',
'Validate' => '', 'Validate' => '',
'ValidateCore' => 'classes/Validate.php', 'ValidateCore' => 'classes/Validate.php',
'Warehouse' => '', 'Warehouse' => '',
controllers/admin/AdminSearchController.php
+18 -8
View File
@@ -217,8 +217,10 @@ class AdminSearchControllerCore extends AdminController
$result = Db::getInstance()->executeS(' $result = Db::getInstance()->executeS('
SELECT class_name, name SELECT class_name, name
FROM '._DB_PREFIX_.'tab t FROM '._DB_PREFIX_.'tab t
INNER JOIN '._DB_PREFIX_.'tab_lang tl ON (t.id_tab = tl.id_tab AND tl.id_lang = '.(int)$this->context->language->id.') INNER JOIN '._DB_PREFIX_.'tab_lang tl ON (t.id_tab = tl.id_tab AND tl.id_lang = '.(int)$this->context->employee->id_lang.')
WHERE active = 1'); LEFT JOIN '._DB_PREFIX_.'access a ON (a.id_tab = t.id_tab AND a.id_profile = '.(int)$this->context->employee->id_profile.')
WHERE active = 1
'.($this->context->employee->id_profile != 1 ? 'AND view = 1' : ''));
foreach ($result as $row) foreach ($result as $row)
{ {
$tabs[strtolower($row['class_name'])] = $row['name']; $tabs[strtolower($row['class_name'])] = $row['name'];
@@ -227,6 +229,8 @@ class AdminSearchControllerCore extends AdminController
foreach (AdminTab::$tabParenting as $key => $value) foreach (AdminTab::$tabParenting as $key => $value)
{ {
$value = stripslashes($value); $value = stripslashes($value);
if (!isset($tabs[strtolower($key)]) || !isset($tabs[strtolower($value)]))
continue;
$tabs[strtolower($key)] = $tabs[strtolower($value)]; $tabs[strtolower($key)] = $tabs[strtolower($value)];
$key_match[strtolower($key)] = $key; $key_match[strtolower($key)] = $key;
} }
@@ -324,16 +328,22 @@ class AdminSearchControllerCore extends AdminController
return parent::renderView(); return parent::renderView();
else else
{ {
if (isset($this->_list['features'])) $nb_results = 0;
foreach ($this->_list as $list)
if ($list != false)
$nb_results += count($list);
$this->tpl_view_vars['nb_results'] = $nb_results;
if (isset($this->_list['features']) && count($this->_list['features']))
$this->tpl_view_vars['features'] = $this->_list['features']; $this->tpl_view_vars['features'] = $this->_list['features'];
if (isset($this->_list['categories'])) if (isset($this->_list['categories']) && count($this->_list['categories']))
{ {
$categories = array(); $categories = array();
foreach ($this->_list['categories'] as $category) foreach ($this->_list['categories'] as $category)
$categories[] = getPath($this->context->link->getAdminLink('AdminCategories', false), $category['id_category']); $categories[] = getPath($this->context->link->getAdminLink('AdminCategories', false), $category['id_category']);
$this->tpl_view_vars['categories'] = $categories; $this->tpl_view_vars['categories'] = $categories;
} }
if (isset($this->_list['products'])) if (isset($this->_list['products']) && count($this->_list['products']))
{ {
$view = ''; $view = '';
$this->initProductList(); $this->initProductList();
@@ -353,7 +363,7 @@ class AdminSearchControllerCore extends AdminController
$this->tpl_view_vars['products'] = $view; $this->tpl_view_vars['products'] = $view;
} }
if (isset($this->_list['customers'])) if (isset($this->_list['customers']) && count($this->_list['customers']))
{ {
$view = ''; $view = '';
$this->initCustomerList(); $this->initCustomerList();
@@ -376,7 +386,7 @@ class AdminSearchControllerCore extends AdminController
} }
$this->tpl_view_vars['customers'] = $view; $this->tpl_view_vars['customers'] = $view;
} }
if (isset($this->_list['orders'])) if (isset($this->_list['orders']) && count($this->_list['orders']))
{ {
$view = ''; $view = '';
$this->initOrderList(); $this->initOrderList();
@@ -396,7 +406,7 @@ class AdminSearchControllerCore extends AdminController
$this->tpl_view_vars['orders'] = $view; $this->tpl_view_vars['orders'] = $view;
} }
if (isset($this->_list['modules'])) if (isset($this->_list['modules']) && count($this->_list['modules']))
$this->tpl_view_vars['modules'] = $this->_list['modules']; $this->tpl_view_vars['modules'] = $this->_list['modules'];
return parent::renderView(); return parent::renderView();
js/admin.js
+1
View File
@@ -708,6 +708,7 @@ function checkMultishopDefaultValue(obj, key)
{ {
$('#conf_id_'+key+' input, #conf_id_'+key+' textarea, #conf_id_'+key+' select').attr('disabled', true); $('#conf_id_'+key+' input, #conf_id_'+key+' textarea, #conf_id_'+key+' select').attr('disabled', true);
$('#conf_id_'+key+' label.conf_title').addClass('isDisabled'); $('#conf_id_'+key+' label.conf_title').addClass('isDisabled');
$(obj).attr('disabled', false);
} }
else else
{ {
js/login.js
+11 -15
View File
@@ -59,18 +59,18 @@ $(document).ready(function() {
} }
}); });
$('.show-forgot-password').click(function(e) { $('.show-forgot-password').on('click',function(e) {
// Kill default behaviour
e.preventDefault(); e.preventDefault();
displayForgotPassword(); displayForgotPassword();
}); });
$('.show-login-form').click(function(e) { $('.show-login-form').on('click',function(e) {
// Kill default behaviour
e.preventDefault(); e.preventDefault();
displayLogin(); displayLogin();
}); });
$('#email').focus();
//Tab-index loop //Tab-index loop
$('form').each(function(){ $('form').each(function(){
var list = $(this).find('*[tabindex]').sort(function(a,b){ return a.tabIndex < b.tabIndex ? -1 : 1; }), var list = $(this).find('*[tabindex]').sort(function(a,b){ return a.tabIndex < b.tabIndex ? -1 : 1; }),
@@ -84,7 +84,7 @@ $(document).ready(function() {
}); });
}); });
//todo: ladda init - move to top //todo: ladda init
var l = new Object(); var l = new Object();
function feedbackSubmit() { function feedbackSubmit() {
l = Ladda.create( document.querySelector( 'button[type=submit]' ) ); l = Ladda.create( document.querySelector( 'button[type=submit]' ) );
@@ -127,16 +127,17 @@ function doAjaxLogin(redirect) {
redirect: redirect, redirect: redirect,
stay_logged_in: $('#stay_logged_in:checked').val() stay_logged_in: $('#stay_logged_in:checked').val()
}, },
beforeSend: function(){ beforeSend: function() {
feedbackSubmit(); feedbackSubmit();
l.start(); l.start();
}, },
success: function(jsonData) { success: function(jsonData) {
if (jsonData.hasErrors) if (jsonData.hasErrors) {
displayErrors(jsonData.errors); displayErrors(jsonData.errors);
l.stop(); l.stop();
else } else {
window.location.assign(jsonData.redirect); window.location.assign(jsonData.redirect);
}
}, },
error: function(XMLHttpRequest, textStatus, errorThrown) { error: function(XMLHttpRequest, textStatus, errorThrown) {
l.stop(); l.stop();
@@ -164,9 +165,9 @@ function doAjaxForgot() {
email_forgot: $('#email_forgot').val() email_forgot: $('#email_forgot').val()
}, },
success: function(jsonData) { success: function(jsonData) {
if (jsonData.hasErrors) if (jsonData.hasErrors) {
displayErrors(jsonData.errors); displayErrors(jsonData.errors);
else { } else {
alert(jsonData.confirm); alert(jsonData.confirm);
$('#forgot_password_form').hide(); $('#forgot_password_form').hide();
displayLogin(); displayLogin();
@@ -185,9 +186,4 @@ function displayErrors(errors) {
for (var error in errors) //IE6 bug fix for (var error in errors) //IE6 bug fix
if (error != 'indexOf') str_errors += '<li>' + errors[error] + '</li>'; if (error != 'indexOf') str_errors += '<li>' + errors[error] + '</li>';
$('#error').html(str_errors + '</ol>').removeClass('hide').fadeIn('slow'); $('#error').html(str_errors + '</ol>').removeClass('hide').fadeIn('slow');
// $("#login").effect("shake", {
// times: 4
// }, 100);
} }
modules/referralprogram/mails/en/src/footer.php
+15
View File
@@ -0,0 +1,15 @@
<tr>
<td class="space_footer">&nbsp;</td>
</tr>
<tr>
<td class="footer">
<span><?php echo t('<a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a>'); ?></span>
</td>
</tr>
</table>
</td>
<td class="space">&nbsp;</td>
</tr>
</table>
</body>
</html>
modules/referralprogram/mails/en/src/header.php
+54
View File
@@ -0,0 +1,54 @@
<?php
if(!function_exists('t'))
{
function t($str)
{
return $str;
}
}
if(!function_exists('findRelativePathToAdminDir'))
{
function findRelativePathToAdminDir($maxDepth=6)
{
$path = '';
for($i=0; $i<$maxDepth; $i++)
{
foreach(scandir(dirname(__FILE__).'/'.$path) as $dir)
{
$candidate = $path.$dir.'/';
if(is_dir(dirname(__FILE__).'/'.$candidate.'tabs'))
{
return $candidate;
}
}
$path .= '../';
}
return false;
}
}
$admin = findRelativePathToAdminDir();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><?php echo t('Message from {shop_name}'); ?></title>
<link rel="stylesheet" type="text/css" href="<?php echo $admin ?>themes/default/css/admin-theme/email.css">
</head>
<body>
<table class="table table-mail">
<tr>
<td class="space">&nbsp;</td>
<td align="center">
<table class="table">
<tr>
<td align="center" class="logo">
<a title="{shop_name}" href="{shop_url}">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
</td>
</tr>
modules/referralprogram/mails/en/src/referralprogram-congratulations.php
+28
View File
@@ -0,0 +1,28 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Congratulations!'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<span>
<?php echo t('Your referred friend,'); ?> <span><strong>{sponsored_firstname} {sponsored_lastname}</strong></span> <?php echo t('has placed his or her first order on <a href="{shop_url}">{shop_name}</a>!'); ?><br /><br />
<?php echo t('We are pleased to offer you a voucher worth'); ?> <span><strong>{discount_display} (voucher # {discount_name})</strong></span> <?php echo t('that you can use on your next order.'); ?>
</span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td>
<span><?php echo t('Best regards,'); ?></span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/referralprogram/mails/en/src/referralprogram-invitation.php
+31
View File
@@ -0,0 +1,31 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title">{firstname_friend} {lastname_friend}, <?php echo t('join us!'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<span>
<?php echo t('Your friend,'); ?> <span><strong>{firstname} {lastname}</strong></span> <?php echo t('wants to refer you on <a href="{shop_url}">{shop_name}</a>!'); ?><br /><br />
<?php echo t('We are pleased to offer you a voucher worth'); ?> <span><strong>{discount_display} (voucher # {discount_name})</strong></span> <?php echo t('that you can use on your next order.'); ?><br /><br />
<?php echo t('Get referred and earn a discount voucher of'); ?> <span><strong>{discount}!</strong></span>
<a title="Register" href="{link}"><?php echo t('It&#039;s very easy to sign up. Just click here!'); ?></a>
</span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td>
<span><?php echo t('When signing up, don&#039;t forget to provide the e-mail address of your referring friend:'); ?> <span><strong>{email}</strong></span>.<br/><br/>
<span><?php echo t('Best regards,'); ?>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/referralprogram/mails/en/src/referralprogram-voucher.php
+24
View File
@@ -0,0 +1,24 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('Referral Program'); ?>
</p>
<span>
<?php echo t('We have created a voucher in your name for referring a friend.'); ?><br />
<?php echo t('Here is the code of your voucher:'); ?> <span><strong>{voucher_num}</strong></span><?php echo t(', with an amount of'); ?> <span><strong>{voucher_amount}</strong></span>.<br /><br />
<?php echo t('Simply copy/paste this code during the payment process for your next order.'); ?>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/sendtoafriend/mails/en/src/footer.php
+15
View File
@@ -0,0 +1,15 @@
<tr>
<td class="space_footer">&nbsp;</td>
</tr>
<tr>
<td class="footer">
<span><?php echo t('<a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a>'); ?></span>
</td>
</tr>
</table>
</td>
<td class="space">&nbsp;</td>
</tr>
</table>
</body>
</html>
modules/sendtoafriend/mails/en/src/header.php
+54
View File
@@ -0,0 +1,54 @@
<?php
if(!function_exists('t'))
{
function t($str)
{
return $str;
}
}
if(!function_exists('findRelativePathToAdminDir'))
{
function findRelativePathToAdminDir($maxDepth=6)
{
$path = '';
for($i=0; $i<$maxDepth; $i++)
{
foreach(scandir(dirname(__FILE__).'/'.$path) as $dir)
{
$candidate = $path.$dir.'/';
if(is_dir(dirname(__FILE__).'/'.$candidate.'tabs'))
{
return $candidate;
}
}
$path .= '../';
}
return false;
}
}
$admin = findRelativePathToAdminDir();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><?php echo t('Message from {shop_name}'); ?></title>
<link rel="stylesheet" type="text/css" href="<?php echo $admin ?>themes/default/css/admin-theme/email.css">
</head>
<body>
<table class="table table-mail">
<tr>
<td class="space">&nbsp;</td>
<td align="center">
<table class="table">
<tr>
<td align="center" class="logo">
<a title="{shop_name}" href="{shop_url}">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
</td>
</tr>
modules/sendtoafriend/mails/en/src/send_to_a_friend.php
+23
View File
@@ -0,0 +1,23 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {name},'); ?></span><br/>
<span class="subtitle"><?php echo t('Thank you for creating a customer account at {shop_name}.'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
{customer} <?php echo t('has sent you a link to a product that (s)he thinks may interest you.'); ?>
</p>
<span>
<?php echo t('Click here to view this item:'); ?> <a href="{product_link}">{product}</a>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>