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

This commit is contained in:
Jerome Nadaud
2013-08-07 10:44:42 +02:00
31 changed files with 826 additions and 782 deletions
+285 -244
View File
@@ -264,12 +264,12 @@ textarea {
line-height: inherit; }
a {
color: #3d3d3d;
color: #272822;
text-decoration: none; }
a:hover,
a:focus {
color: #171717;
color: black;
text-decoration: underline; }
a:focus {
@@ -970,13 +970,15 @@ th {
.table-bordered > colgroup + tbody > tr:first-child > td:last-child {
border-top-right-radius: 3px; }
.table-striped > tbody > tr:nth-child(odd) > td,
.table-striped > tbody > tr:nth-child(odd) > th {
.table-striped > tbody > tr:nth-child(odd) > td, .table > tbody > tr:nth-child(odd) > td,
.table-striped > tbody > tr:nth-child(odd) > th,
.table > tbody > tr:nth-child(odd) > th {
background-color: #f9f9f9; }
.table-hover > tbody > tr:hover > td,
.table-hover > tbody > tr:hover > th {
background-color: #a3a3a3; }
.table-hover > tbody > tr:hover > td, .table > tbody > tr:hover > td,
.table-hover > tbody > tr:hover > th,
.table > tbody > tr:hover > th {
background-color: #e1f3e5; }
table col[class^="col-"] {
float: none;
@@ -1000,16 +1002,19 @@ table th[class^="col-"] {
background-color: #fcf8e3;
border-color: #fbeed5; }
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td {
.table-hover > tbody > tr > td.success:hover, .table > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table > tbody > tr.success:hover > td {
background-color: #d0e9c6;
border-color: #c9e2b3; }
.table-hover > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td {
.table-hover > tbody > tr > td.danger:hover, .table > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover,
.table > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table > tbody > tr.danger:hover > td {
background-color: #ebcccc;
border-color: #e6c1c7; }
.table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td {
.table-hover > tbody > tr > td.warning:hover, .table > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover,
.table > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table > tbody > tr.warning:hover > td {
background-color: #faf2cc;
border-color: #f8e5be; }
@@ -1496,14 +1501,14 @@ input[type="color"].input-small {
.btn-primary {
color: white;
background-color: #3d3d3d;
border-color: #3d3d3d; }
background-color: #272822;
border-color: #272822; }
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active {
background-color: #303030;
border-color: #242424; }
background-color: #1a1a16;
border-color: #0c0c0b; }
.btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:active, fieldset[disabled] .btn-primary.active {
background-color: #3d3d3d;
border-color: #3d3d3d; }
background-color: #272822;
border-color: #272822; }
.btn-warning {
color: white;
@@ -1550,7 +1555,7 @@ input[type="color"].input-small {
border-color: #5bc0de; }
.btn-link {
color: #3d3d3d;
color: #272822;
font-weight: normal;
cursor: pointer;
border-radius: 0; }
@@ -1562,7 +1567,7 @@ input[type="color"].input-small {
.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active {
border-color: transparent; }
.btn-link:hover, .btn-link:focus {
color: #171717;
color: black;
text-decoration: underline;
background-color: transparent; }
.btn-link[disabled]:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:hover, fieldset[disabled] .btn-link:focus {
@@ -1666,25 +1671,25 @@ input[type="button"].btn-block {
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
text-decoration: none;
color: white;
background-color: #303030;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3d3d3d), to(#303030));
background-image: -webkit-linear-gradient(top, #3d3d3d, #303030);
background-image: -moz-linear-gradient(top, #3d3d3d, #303030);
background-image: linear-gradient(to bottom, #3d3d3d, #303030);
background-color: #1a1a16;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#272822), to(#1a1a16));
background-image: -webkit-linear-gradient(top, #272822, #1a1a16);
background-image: -moz-linear-gradient(top, #272822, #1a1a16);
background-image: linear-gradient(to bottom, #272822, #1a1a16);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF3D3D3D', endColorstr='#FF303030', GradientType=0); }
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF272822', endColorstr='#FF1A1A16', GradientType=0); }
.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
color: white;
text-decoration: none;
outline: 0;
background-color: #303030;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3d3d3d), to(#303030));
background-image: -webkit-linear-gradient(top, #3d3d3d, #303030);
background-image: -moz-linear-gradient(top, #3d3d3d, #303030);
background-image: linear-gradient(to bottom, #3d3d3d, #303030);
background-color: #1a1a16;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#272822), to(#1a1a16));
background-image: -webkit-linear-gradient(top, #272822, #1a1a16);
background-image: -moz-linear-gradient(top, #272822, #1a1a16);
background-image: linear-gradient(to bottom, #272822, #1a1a16);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF3D3D3D', endColorstr='#FF303030', GradientType=0); }
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF272822', endColorstr='#FF1A1A16', GradientType=0); }
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
color: #999999; }
@@ -1768,12 +1773,12 @@ a.list-group-item:hover, a.list-group-item:focus {
a.list-group-item.active {
z-index: 2;
color: white;
background-color: #3d3d3d;
border-color: #3d3d3d; }
background-color: #272822;
border-color: #272822; }
a.list-group-item.active .list-group-item-heading {
color: inherit; }
a.list-group-item.active .list-group-item-text {
color: #a3a3a3; }
color: #919482; }
.panel {
padding: 15px;
@@ -1803,11 +1808,11 @@ a.list-group-item.active {
border-bottom-right-radius: 2px; }
.panel-primary {
border-color: #3d3d3d; }
border-color: #272822; }
.panel-primary .panel-heading {
color: white;
background-color: #3d3d3d;
border-color: #3d3d3d; }
background-color: #272822;
border-color: #272822; }
.panel-success {
border-color: #d6e9c6; }
@@ -1924,8 +1929,8 @@ button.close {
margin-top: 9px; }
.nav.open > a, .nav.open > a:hover, .nav.open > a:focus {
color: #fff;
background-color: #3d3d3d;
border-color: #3d3d3d; }
background-color: #272822;
border-color: #272822; }
.nav.open > a .caret, .nav.open > a:hover .caret, .nav.open > a:focus .caret {
border-top-color: #fff;
border-bottom-color: #fff; }
@@ -1965,7 +1970,7 @@ button.close {
margin-left: 2px; }
.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
color: #fff;
background-color: #3d3d3d; }
background-color: #272822; }
.nav-stacked > li {
float: none; }
@@ -2017,12 +2022,12 @@ button.close {
display: block; }
.nav .caret {
border-top-color: #3d3d3d;
border-bottom-color: #3d3d3d; }
border-top-color: #272822;
border-bottom-color: #272822; }
.nav a:hover .caret {
border-top-color: #171717;
border-bottom-color: #171717; }
border-top-color: black;
border-bottom-color: black; }
.nav-tabs .dropdown-menu {
margin-top: -1px;
@@ -2048,8 +2053,8 @@ button.close {
margin-top: 10px;
margin-bottom: 15px; }
.navbar-nav > li > a {
padding-top: 16.5px;
padding-bottom: 16.5px;
padding-top: 9px;
padding-bottom: 9px;
color: #777777;
line-height: 20px;
border-radius: 3px; }
@@ -2119,8 +2124,8 @@ button.close {
margin-top: 4px; }
.navbar-form {
margin-top: 11.5px;
margin-bottom: 11.5px; }
margin-top: 4px;
margin-bottom: 4px; }
.navbar-nav > li > .dropdown-menu {
margin-top: 0;
@@ -2217,11 +2222,11 @@ button.close {
height: auto !important;
overflow: visible !important; } }
.navbar-btn {
margin-top: 11.5px; }
margin-top: 4px; }
.navbar-text {
margin-top: 16.5px;
margin-bottom: 16.5px; }
margin-top: 9px;
margin-bottom: 9px; }
.navbar-link {
color: #777777; }
@@ -2855,7 +2860,7 @@ button.close {
a.thumbnail:hover,
a.thumbnail:focus {
border-color: #3d3d3d; }
border-color: #272822; }
.thumbnail > img {
margin-left: auto;
@@ -2883,7 +2888,7 @@ a.thumbnail:focus {
.media-heading {
margin: 0 0 5px; }
.media > .pull-left, .page-head .media > h2.page-title {
.media > .pull-left, #content .page-head .media > h2.page-title {
margin-right: 10px; }
.media > .pull-right {
margin-left: 10px; }
@@ -2959,7 +2964,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a.
.nav-pills > .active > a > .badge,
.nav-pills > .active > a > .badge-success,
.nav-pills > .active > a > .badge-error {
color: #3d3d3d;
color: #272822;
background-color: #fff; }
.nav-pills > li > a > .badge, .nav-pills > li > a > .badge-success, .nav-pills > li > a > .badge-error {
@@ -3017,7 +3022,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a.
color: #fff;
text-align: center;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #3d3d3d;
background-color: #272822;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-transition: width 0.6s ease;
@@ -3026,7 +3031,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a.
transition: width 0.6s ease; }
.progress-striped .progress-bar {
background-color: #3d3d3d;
background-color: #272822;
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3109,7 +3114,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a.
.pull-right {
float: right; }
.pull-left, .page-head h2.page-title {
.pull-left, #content .page-head h2.page-title {
float: left; }
.hide {
@@ -3434,12 +3439,12 @@ a [class*=" icon-"] {
.pull-right {
float: right; }
.pull-left, .page-head h2.page-title {
.pull-left, #content .page-head h2.page-title {
float: left; }
[class^="icon-"].pull-left, .page-head h2[class^="icon-"].page-title,
[class^="icon-"].pull-left, #content .page-head h2[class^="icon-"].page-title,
[class*=" icon-"].pull-left,
.page-head h2[class*=" icon-"].page-title {
#content .page-head h2[class*=" icon-"].page-title {
margin-right: .3em; }
[class^="icon-"].pull-right,
@@ -3500,10 +3505,10 @@ a [class*=" icon-"] {
.nav-pills [class*=" icon-"].icon-large {
line-height: .9em; }
.btn [class^="icon-"].pull-left.icon-2x, .btn .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn h2[class^="icon-"].icon-2x.page-title,
.btn [class^="icon-"].pull-left.icon-2x, .btn #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn h2[class^="icon-"].icon-2x.page-title,
.btn [class*=" icon-"].pull-left.icon-2x,
.btn .page-head h2[class*=" icon-"].icon-2x.page-title,
.page-head .btn h2[class*=" icon-"].icon-2x.page-title,
.btn #content .page-head h2[class*=" icon-"].icon-2x.page-title,
#content .page-head .btn h2[class*=" icon-"].icon-2x.page-title,
.btn [class^="icon-"].pull-right.icon-2x,
.btn [class*=" icon-"].pull-right.icon-2x {
margin-top: .18em; }
@@ -3512,10 +3517,10 @@ a [class*=" icon-"] {
.btn [class*=" icon-"].icon-spin.icon-large {
line-height: .8em; }
.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-small h2[class^="icon-"].icon-2x.page-title,
.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn.btn-small h2[class^="icon-"].icon-2x.page-title,
.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
.btn.btn-small .page-head h2[class*=" icon-"].icon-2x.page-title,
.page-head .btn.btn-small h2[class*=" icon-"].icon-2x.page-title,
.btn.btn-small #content .page-head h2[class*=" icon-"].icon-2x.page-title,
#content .page-head .btn.btn-small h2[class*=" icon-"].icon-2x.page-title,
.btn.btn-small [class^="icon-"].pull-right.icon-2x,
.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
margin-top: .25em; }
@@ -3524,18 +3529,18 @@ a [class*=" icon-"] {
.btn.btn-large [class*=" icon-"] {
margin-top: 0; }
.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title,
.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title,
.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
.btn.btn-large .page-head h2[class*=" icon-"].icon-2x.page-title,
.page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title,
.btn.btn-large #content .page-head h2[class*=" icon-"].icon-2x.page-title,
#content .page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title,
.btn.btn-large [class^="icon-"].pull-right.icon-2x,
.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
margin-top: .05em; }
.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title,
.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title,
.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
.btn.btn-large .page-head h2[class*=" icon-"].icon-2x.page-title,
.page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title {
.btn.btn-large #content .page-head h2[class*=" icon-"].icon-2x.page-title,
#content .page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title {
margin-right: .2em; }
.btn.btn-large [class^="icon-"].pull-right.icon-2x,
@@ -5013,13 +5018,12 @@ html, body {
body.fixed-top {
position: relative;
top: 53px;
top: 35px;
margin-bottom: 50px;
background-color: #e0e0e0; }
background-color: #272822; }
#header_infos {
height: 53px;
background-color: #0a0a0a;
background-color: #0c0c0b;
z-index: 9999; }
#header_infos #header_shopname {
font-size: 1.6em;
@@ -5031,15 +5035,29 @@ body.fixed-top {
background-color: #dc315e; }
#main {
min-height: 100%;
height: 100%;
position: relative; }
.container-fluid, .row-fluid {
width: 100%; }
#content {
min-height: 100%;
padding: 90px 20px 90px;
margin: 0 0 0 240px;
background-color: #e0e0e0; }
min-height: 700px;
padding: 90px 20px 20px;
margin-left: 240px;
-webkit-transition-property: margin;
-moz-transition-property: margin;
-o-transition-property: margin;
transition-property: margin;
-webkit-transition-duration: 0.4s;
-moz-transition-duration: 0.4s;
-o-transition-duration: 0.4s;
transition-duration: 0.4s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
background-color: #e0e0e0;
background-image: url("../img/patterns/bedge_grunge.png"); }
#content fieldset, #content .panel {
padding: 20px;
margin-bottom: 20px;
@@ -5062,11 +5080,11 @@ body.fixed-top {
font-size: 1.2em;
font-weight: 300;
text-transform: uppercase;
background-color: #3d3d3d; }
background-color: #272822; }
#content h3 i, #content .panel-heading i, #content h3 a, #content .panel-heading a, #content .panel-heading i, #content .panel-heading a {
color: #665d5c !important; }
color: #60c276 !important; }
#content h3 .badge, #content .panel-heading .badge, #content h3 .badge-success, #content .panel-heading .badge-success, #content h3 .badge-error, #content .panel-heading .badge-error, #content .panel-heading .badge, #content .panel-heading .badge-success, #content .panel-heading .badge-error {
background-color: #707070;
background-color: #5d5f51;
border-radius: 0;
height: 29px;
line-height: 25px;
@@ -5092,79 +5110,72 @@ body.fixed-top {
border-bottom: solid 1px #c7c7c7;
-webkit-box-shadow: white 0 0 0 1px inset;
box-shadow: white 0 0 0 1px inset; }
.page-head {
width: 100%;
height: 69px;
padding: 5px 10px 0 0;
margin: 0;
border-bottom: 4px solid #302c2c;
position: fixed;
top: 53px;
left: 0px;
z-index: 9000;
background-color: #665d5c;
-webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset;
box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset; }
.page-head h2.page-title {
padding: 0 0 0 260px;
font-size: 20px;
line-height: 25px;
color: white;
text-transform: uppercase; }
.page-head .btn-toolbar {
margin: 0; }
.page-head .btn-toolbar .nav-tabs {
#content .page-head {
width: 100%;
height: 69px;
padding: 5px 10px 0 0;
margin: 0;
border-bottom: 4px solid #348847;
position: fixed;
top: 37px;
left: 0px;
z-index: 9000;
background-color: #60c276;
-webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset;
box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset; }
#content .page-head h2.page-title {
padding: 0 0 0 260px;
font-size: 20px;
line-height: 25px;
color: white;
text-transform: uppercase; }
#content .page-head .btn-toolbar {
margin: 0; }
.page-head .btn-toolbar .nav-tabs > li > a {
color: #333333; }
.page-head .btn-toolbar .nav-tabs > li > a > .active > a, .page-head .btn-toolbar .nav-tabs > li > a > .active > a:hover {
color: #3399ff;
background: whitesmoke; }
#content .page-head .btn-toolbar .nav-tabs {
margin: 0; }
#content .page-head .btn-toolbar .nav-tabs > li > a {
color: #333333; }
#content .page-head .btn-toolbar .nav-tabs > li > a > .active > a, #content .page-head .btn-toolbar .nav-tabs > li > a > .active > a:hover {
color: #3399ff;
background: whitesmoke; }
.page-sidebar {
#sidebar {
z-index: 9001;
top: 53px;
position: fixed;
float: left;
position: absolute;
width: 240px;
border-bottom: solid 1px black;
background-color: #3d3d3d;
-webkit-box-shadow: #949494 0 4px 0;
box-shadow: #949494 0 4px 0;
min-height: 700px;
height: 100%; }
.page-sidebar > ul > li > ul.sub-menu {
background-color: #272822;
border-bottom: 1px solid #34362e;
border-right: 1px solid black; }
#sidebar > ul > li > ul.sub-menu {
display: none;
list-style: none;
clear: both;
margin: 8px 0px 8px 0px; }
.page-sidebar > ul {
height: 100%;
overflow: scroll;
#sidebar > ul {
margin: 0;
padding: 0;
padding-bottom: 100px; }
.page-sidebar > ul li {
background-color: #3d3d3d;
padding: 0; }
#sidebar > ul li {
background-color: #272822;
list-style: none; }
.page-sidebar > ul li:not(.active) ul {
#sidebar > ul li:not(.active) ul {
display: none; }
.page-sidebar > ul li.expanded ul {
#sidebar > ul li.expanded ul {
display: block;
background-color: white; }
.page-sidebar > ul > li:hover > a, .page-sidebar > ul > li.active > a {
#sidebar > ul > li:hover > a, #sidebar > ul > li.active > a {
color: white;
background-color: #303030;
-webkit-box-shadow: #665d5c -4px 0 0 inset;
box-shadow: #665d5c -4px 0 0 inset; }
.page-sidebar > ul > li:hover > a i, .page-sidebar > ul > li.active > a i {
color: #665d5c !important; }
.page-sidebar > ul > li > a {
background-color: #1a1a16;
-webkit-box-shadow: #60c276 -4px 0 0 inset;
box-shadow: #60c276 -4px 0 0 inset; }
#sidebar > ul > li:hover > a i, #sidebar > ul > li.active > a i {
color: #60c276 !important; }
#sidebar > ul > li > a {
display: block;
padding: 5px 0 5px 5px;
border-top: 1px solid #4a4a4a;
border-bottom: 1px solid #171717;
color: #b0b0b0;
border-top: 1px solid #34362e;
border-bottom: 1px solid black;
color: #9da08f;
text-transform: uppercase;
text-decoration: none;
-webkit-transition-property: background-color, border, box-shadow;
@@ -5179,9 +5190,10 @@ body.fixed-top {
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
-webkit-box-shadow: #171717 -4px 0 0 inset;
box-shadow: #171717 -4px 0 0 inset; }
.page-sidebar > ul > li > a i {
-webkit-box-shadow: black -4px 0 0 inset;
box-shadow: black -4px 0 0 inset; }
#sidebar > ul > li > a i {
color: #6a6d5d !important;
-webkit-transition-property: color;
-moz-transition-property: color;
-o-transition-property: color;
@@ -5194,33 +5206,68 @@ body.fixed-top {
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out; }
.page-sidebar > ul > li img {
#sidebar > ul > li img {
margin-right: 10px; }
.page-sidebar > ul > li ul {
#sidebar > ul > li ul {
margin: 0;
padding: 0;
border-bottom: 1px solid #cecece;
background-color: white; }
.page-sidebar > ul > li ul li a {
#sidebar > ul > li ul li a {
display: block;
padding: 3px 10px 3px 10px;
font-size: 12px;
border: none;
border-bottom: 1px solid #a69d9c;
border-bottom: 1px solid #bce5c5;
background-color: white; }
.page-sidebar > ul > li ul li a i {
#sidebar > ul > li ul li a i {
margin-top: 3px;
color: #665d5c; }
.page-sidebar > ul > li ul li a:hover {
background-color: #beb7b7;
color: #60c276; }
#sidebar > ul > li ul li a:hover {
background-color: #e1f3e5;
text-decoration: none; }
.page-sidebar > ul > li ul li a:hover i {
color: #3d3d3d; }
.page-sidebar > ul > li ul li.active a {
#sidebar > ul > li ul li a:hover i {
color: #272822; }
#sidebar > ul > li ul li.active a {
color: #1a1a1a;
background-color: #665d5c; }
.page-sidebar > ul > li ul li.active a i {
color: #3d3d3d; }
background-color: #60c276; }
#sidebar > ul > li ul li.active a i {
color: #272822; }
.page-sidebar-closed #sidebar {
width: 50px;
white-space: nowrap;
-webkit-transition-property: width;
-moz-transition-property: width;
-o-transition-property: width;
transition-property: width;
-webkit-transition-duration: 0.4s;
-moz-transition-duration: 0.4s;
-o-transition-duration: 0.4s;
transition-duration: 0.4s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out; }
.page-sidebar-closed #sidebar span.title {
display: none; }
.page-sidebar-closed #sidebar ul.submenu {
display: none !important; }
.page-sidebar-closed #content {
margin-left: 50px; }
.page-sidebar-closed #content .page-head h2.page-title {
padding: 0 0 0 70px; }
.menu-collapse {
height: 70px;
width: 100%;
font-size: 2em;
text-align: center;
line-height: 68px;
display: block;
background-color: black; }
.menu-collapse i {
color: white !important; }
#menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] {
font-size: 22px;
@@ -5233,7 +5280,7 @@ body.fixed-top {
line-height: 35px; }
.toolbar_btn {
border: solid 1px #736968;
border: solid 1px #97d7a6;
position: relative;
padding: 2px 5px !important;
margin-right: 3px;
@@ -5243,7 +5290,9 @@ body.fixed-top {
text-align: center;
text-shadow: none; }
.toolbar_btn:hover {
background-color: #736968 !important; }
color: #348847;
border-color: white;
background-color: white; }
.icon-AdminDashboard {
background-color: #87c795; }
@@ -5285,9 +5334,9 @@ body.fixed-top {
background-color: #87c795; }
[class^="icon-Admin"] {
background-color: #242424;
background-color: #0c0c0b;
margin-right: 6px;
color: #575757 !important; }
color: #424439 !important; }
[class^="process-icon-"], [class*=" process-icon-"] {
height: 32px;
@@ -5363,41 +5412,48 @@ input[type="password"].input-tiny {
.btn-default {
border-color: #adadad;
color: #636363;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e0e0e0), color-stop(100%, #c7c7c7));
background: -webkit-linear-gradient(top, #e0e0e0, #c7c7c7);
background: -moz-linear-gradient(top, #e0e0e0, #c7c7c7);
background: -o-linear-gradient(top, #e0e0e0, #c7c7c7);
background: linear-gradient(top, #e0e0e0, #c7c7c7);
-webkit-box-shadow: white 0 0 0 1px inset;
box-shadow: white 0 0 0 1px inset; }
color: #4f5145;
background-color: white;
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 -2px 0 inset;
box-shadow: rgba(0, 0, 0, 0.1) 0 -2px 0 inset; }
.btn-default:hover, .btn-default:focus {
border-color: #949494;
color: #636363;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c7c7c7), color-stop(100%, #adadad));
background: -webkit-linear-gradient(top, #c7c7c7, #adadad);
background: -moz-linear-gradient(top, #c7c7c7, #adadad);
background: -o-linear-gradient(top, #c7c7c7, #adadad);
background: linear-gradient(top, #c7c7c7, #adadad); }
color: #4f5145;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e0e0e0), color-stop(100%, #d3d3d3));
background: -webkit-linear-gradient(top, #e0e0e0, #d3d3d3);
background: -moz-linear-gradient(top, #e0e0e0, #d3d3d3);
background: -o-linear-gradient(top, #e0e0e0, #d3d3d3);
background: linear-gradient(top, #e0e0e0, #d3d3d3); }
.btn-primary {
border-color: #665d5c;
color: white;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #817574), color-stop(100%, #665d5c));
background: -webkit-linear-gradient(top, #817574, #665d5c);
background: -moz-linear-gradient(top, #817574, #665d5c);
background: -o-linear-gradient(top, #817574, #665d5c);
background: linear-gradient(top, #817574, #665d5c);
-webkit-box-shadow: #817574 0 0 0 1px inset;
box-shadow: #817574 0 0 0 1px inset; }
border-color: #60c276;
color: #4f5145;
background-color: #f3fbf5;
-webkit-box-shadow: #aadeb6 0 -2px 0 inset;
box-shadow: #aadeb6 0 -2px 0 inset; }
.btn-primary:hover, .btn-primary:focus {
border-color: #665d5c;
border-color: #60c276;
color: white;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #665d5c), color-stop(100%, #4b4544));
background: -webkit-linear-gradient(top, #665d5c, #4b4544);
background: -moz-linear-gradient(top, #665d5c, #4b4544);
background: -o-linear-gradient(top, #665d5c, #4b4544);
background: linear-gradient(top, #665d5c, #4b4544); }
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #60c276), color-stop(100%, #42ad5a));
background: -webkit-linear-gradient(top, #60c276, #42ad5a);
background: -moz-linear-gradient(top, #60c276, #42ad5a);
background: -o-linear-gradient(top, #60c276, #42ad5a);
background: linear-gradient(top, #60c276, #42ad5a); }
.btn-default[disabled] {
border-color: #858874;
color: #4f5145;
background-color: #cecfc7;
-webkit-box-shadow: #b5b8ab 0 -2px 0 inset;
box-shadow: #b5b8ab 0 -2px 0 inset; }
.btn-default[disabled]:hover, .btn-default[disabled]:focus {
border-color: #60c276;
color: white;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #60c276), color-stop(100%, #42ad5a));
background: -webkit-linear-gradient(top, #60c276, #42ad5a);
background: -moz-linear-gradient(top, #60c276, #42ad5a);
background: -o-linear-gradient(top, #60c276, #42ad5a);
background: linear-gradient(top, #60c276, #42ad5a); }
.btn-group-action {
display: inline-block;
@@ -5406,7 +5462,7 @@ input[type="password"].input-tiny {
text-decoration: none; }
.btn .caret {
border-top-color: #636363 !important; }
border-top-color: #4f5145 !important; }
hr {
border-color: #c7c7c7;
@@ -5443,23 +5499,6 @@ hr {
font-size: 12px;
-webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 1px 0;
box-shadow: rgba(0, 0, 0, 0.15) 0 1px 0; }
.table tbody > tr:hover > td {
cursor: pointer;
background-color: #8d8281;
-webkit-transition-property: background-color;
-moz-transition-property: background-color;
-o-transition-property: background-color;
transition-property: background-color;
-webkit-transition-duration: 0.4s;
-moz-transition-duration: 0.4s;
-o-transition-duration: 0.4s;
transition-duration: 0.4s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
-webkit-box-shadow: rgba(102, 93, 92, 0.8) 0 2px 0;
box-shadow: rgba(102, 93, 92, 0.8) 0 2px 0; }
.table td.center, .table th.center {
text-align: center; }
.table tr td:first-child,
@@ -5487,7 +5526,7 @@ tr.filter {
background-color: #f2f2f2; }
.badge, .badge-success, .badge-error {
background-color: #665d5c; }
background-color: #60c276; }
.badge-success {
background-color: #5cb85c; }
@@ -5506,17 +5545,43 @@ tr.filter {
margin: 0;
padding: 0;
background-color: transparent;
color: #3d3d3d;
color: #272822;
font-weight: 500; }
#footer {
z-index: 9002;
display: block;
bottom: 0;
width: 100%;
float: left;
padding: 5px 0;
background-color: lightgrey;
-webkit-box-shadow: #7a7a7a 0 2px 10px inset;
box-shadow: #7a7a7a 0 2px 10px inset; }
background-color: black;
color: #888888; }
#footer a {
color: #cccccc; }
#footer a.link-social:hover {
text-decoration: none; }
#footer a.link-social i {
font-size: 2em;
width: 30px;
height: 30px;
display: inline-block;
line-height: 30px;
text-align: center;
-webkit-border-radius: 30px;
-moz-border-radius: 30px;
-ms-border-radius: 30px;
-o-border-radius: 30px;
border-radius: 30px; }
#footer .link-twitter i {
color: white;
background-color: #7cceef; }
#footer .link-facebook i {
color: white;
background-color: #557dbb; }
#footer .link-github i {
color: black;
background-color: white; }
#footer .link-google i {
color: white;
background-color: #e6644e; }
#footer #go-top {
position: fixed;
bottom: 10px;
@@ -5538,27 +5603,3 @@ tr.filter {
color: #666666;
font-size: 22px;
margin-bottom: 5px; }
#footer .link-social:hover {
text-decoration: none; }
#footer .link-social i {
font-size: 2em;
width: 30px;
height: 30px;
display: inline-block;
line-height: 30px;
text-align: center;
-webkit-border-radius: 30px;
-moz-border-radius: 30px;
-ms-border-radius: 30px;
-o-border-radius: 30px;
border-radius: 30px; }
#footer .link-twitter i {
background-color: #7cceef; }
#footer .link-facebook i {
color: white;
background-color: #557dbb; }
#footer .link-github i {
background-color: white; }
#footer .link-google i {
color: white;
background-color: #e6644e; }
+134 -123
View File
@@ -19,27 +19,26 @@ $bg-content-color: #E0E0E0 // gris foncé
//$bg-head-color: #F8235A //rose
//$bg-head-color: #F2B100 //moutarde
//$bg-head-color: #F7854E // abricot
$bg-head-color: #665D5C // taupe clair
//$bg-head-color: #60C276
//$bg-head-color: #665D5C // taupe clair
$bg-head-color: #60C276 //vert
//light (experimental)
//light
//$brand-primary: #98958C // sable
//$brand-primary: #92979B //gris
//$brand-primary: #A9B6C1 //bleu
//dark
$brand-primary: #3D3D3D // taupe
//$brand-primary: #3D3D3D // gris
//$brand-primary: #515561 // gris bleu clair
//$brand-primary: #4D4645 //taupe
//$brand-primary: #272822 // gris vert
$brand-primary: #272822 // gris vert
//$brand-primary: #313A45 // gris
//$brand-primary: #4F2E4A // violet
//$brand-primary: #373E35 // vert camo
//$brand-primary: #262C3F // bleu nuit
$panel-color: $brand-primary
$bg-body-color: $brand-primary
$badge-panel-color: #DC315E
$bg-body-color: $bg-content-color
@import "compass"
@import "bootstrap/variables"
@@ -53,16 +52,13 @@ html, body
body.fixed-top
position: relative
top: 53px
top: 35px
margin-bottom: 50px
background-color: $bg-body-color
#header_infos
height: 53px
//border-bottom: solid 2px black
background-color: darken($brand-primary,20%)
background-color: darken($brand-primary,10%)
z-index: 9999
//@include box-shadow(rgba(black,0.15) 0 2px 0)
#header_shopname
font-size: 1.6em
font-family: "ubuntu"
@@ -74,21 +70,20 @@ body.fixed-top
background-color: $badge-panel-color
#main
min-height: 100%
height: 100%
position: relative
.container-fluid, .row-fluid
width: 100%
#content
//float: left
min-height: 100%
//width: 1278px
padding: 90px 20px 90px
margin: 0 0 0 240px
//border-left: 2px solid black
//border-right: 2px solid black
min-height: 700px
padding: 90px 20px 20px
margin-left: 240px
@include transition-property(margin)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png')
//@include box-shadow(darken($bg-content-color,30%) 0 0 0 4px)
background-image: url('../img/patterns/bedge_grunge.png')
fieldset, .panel
padding: 20px
margin-bottom: 20px
@@ -123,11 +118,9 @@ body.fixed-top
margin-left: -5px
.panel-danger .panel-heading
background-color: $badge-panel-color!important
.panel-heading-big
font-size: 2em
text-align: center
form .alert
clear: both
color: darken(#D6D2CF,40%)
@@ -139,57 +132,51 @@ body.fixed-top
border: none
border-bottom: solid 1px darken($bg-content-color,10%)
@include box-shadow(white 0 0 0 1px inset)
.page-head
width: 100%
height: 69px
padding: 5px 10px 0 0
margin: 0
border-bottom: 4px solid darken($bg-head-color,20%)
position: fixed
top: 53px
left: 0px
z-index: 9000
background-color: $bg-head-color
@include box-shadow(rgba(black,0.15) 0 7px 0, rgba(white,0.15) 0 -1px 0 inset)
h2.page-title
@extend .pull-left
padding: 0 0 0 260px
font-size: 20px
line-height: 25px
color: white
text-transform: uppercase
.btn-toolbar
.page-head
width: 100%
height: 69px
padding: 5px 10px 0 0
margin: 0
.nav-tabs
border-bottom: 4px solid darken($bg-head-color,20%)
position: fixed
top: 37px
left: 0px
z-index: 9000
background-color: $bg-head-color
@include box-shadow(rgba(black,0.15) 0 7px 0, rgba(white,0.15) 0 -1px 0 inset)
h2.page-title
@extend .pull-left
padding: 0 0 0 260px
font-size: 20px
line-height: 25px
color: white
text-transform: uppercase
.btn-toolbar
margin: 0
.nav-tabs > li > a
color: #333
> .active > a, > .active > a:hover
color: #3399ff
background: #f5f5f5
.nav-tabs
margin: 0
.nav-tabs > li > a
color: #333
> .active > a, > .active > a:hover
color: #3399ff
background: #f5f5f5
.page-sidebar
#sidebar
z-index: 9001
top: 53px
position: fixed
float: left
position: absolute
width: 240px
border-bottom: solid 1px black
background-color: $brand-primary
@include box-shadow(darken($bg-content-color,30%) 0 4px 0)
min-height: 700px
height: 100%
border-bottom: 1px solid lighten($brand-primary,5%)
border-right: 1px solid black
> ul > li > ul.sub-menu
display: none
list-style: none
clear: both
margin: 8px 0px 8px 0px
> ul
height: 100%
overflow: scroll
margin: 0
padding: 0
padding-bottom: 100px
li
background-color: lighten($brand-primary,0)
list-style: none
@@ -219,6 +206,7 @@ body.fixed-top
@include transition-timing-function(ease-out)
@include box-shadow(darken($brand-primary,15%) -4px 0 0 inset)
i
color: lighten($brand-primary,25%)!important
@include transition-property(color)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
@@ -252,6 +240,35 @@ body.fixed-top
i
color: $brand-primary
.page-sidebar-closed
#sidebar
width: 50px
white-space: nowrap
@include transition-property(width)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
span.title
display: none
ul.submenu
display: none!important
#content
margin-left: 50px
.page-head h2.page-title
padding: 0 0 0 70px
.menu-collapse
height: 70px
width: 100%
font-size: 2em
text-align: center
line-height: 68px
display: block
background-color: black
i
color: white!important
#menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"]
font-size: 22px
border-radius: 40px
@@ -264,30 +281,19 @@ body.fixed-top
// Tool bar
.toolbar_btn
//@extend .btn
//@extend .btn-primary
//background-color: $brand-primary
border: solid 1px lighten($bg-head-color,5%)
border: solid 1px lighten($bg-head-color,15%)
position: relative
padding: 2px 5px !important
margin-right: 3px
//border-bottom: 4px solid darken($brand-primary,7%)
font-size: 12px
font-weight: 600
color: white
text-align: center
text-shadow: none
//@include background(linear-gradient(top, lighten($brand-primary,15%), $brand-primary))
//@include box-shadow(rgba(black,0.15) 0 3px 0, rgba(white,0.1) 0 0 0 1px inset)
&:hover
//top: 2px
//border-color: $brand-primary
//border-bottom: 2px solid lighten($brand-primary,10%)
//color: $brand-primary
//@include text-shadow(lighten($bg-head-color,15%) 1px 1px 0)
background-color: lighten($bg-head-color,5%)!important
//@include background(linear-gradient(top left, lighten($brand-primary,75%), lighten($brand-primary,55%)))
//@include box-shadow(rgba(black,0.3) 0 1px 3px, rgba(white,0.4) 0 0 0 1px inset)
color: darken($bg-head-color,20%)
border-color: white
background-color: white
.icon-AdminDashboard
@extend .icon-dashboard
@@ -389,13 +395,10 @@ body.fixed-top
@extend .icon-bar-chart
.process-icon-duplicate
@extend .icon-copy
.process-icon-newCombination.toolbar-new
@extend .icon-plus-sign
.process-icon-newCombination.toolbar-cancel
@extend .icon-minus-sign
.process-icon-partial_refund
@extend .icon-exchange
.process-icon-cancel
@@ -456,18 +459,30 @@ input[type="password"].input-tiny
.btn-default
border-color: darken($bg-content-color,20%)
color: lighten($brand-primary,15%)
@include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%)))
@include box-shadow(rgba(white,1) 0 0 0 1px inset)
//@include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%)))
background-color: white
@include box-shadow(rgba(black,0.10) 0 -2px 0 inset)
&:hover, &:focus
border-color: darken($bg-content-color,30%)
color: lighten($brand-primary,15%)
@include background(linear-gradient(top, darken($bg-content-color,10%), darken($bg-content-color,20%)))
@include background(linear-gradient(top, darken($bg-content-color,0%), darken($bg-content-color,5%)))
.btn-primary
border-color: $bg-head-color
color: lighten($bg-head-color,70%)
@include background(linear-gradient(top,lighten($bg-head-color,10%),lighten($bg-head-color,0%)))
@include box-shadow(lighten($bg-head-color,10%) 0 0 0 1px inset)
color: lighten($brand-primary,15%)
background-color: lighten($bg-head-color,40%)
//@include background(linear-gradient(top,lighten($bg-head-color,10%),lighten($bg-head-color,0%)))
@include box-shadow(lighten($bg-head-color,20%) 0 -2px 0 inset)
&:hover, &:focus
border-color: $bg-head-color
color: lighten($bg-head-color,70%)
@include background(linear-gradient(top,darken($bg-head-color,0%),darken($bg-head-color,10%)))
.btn-default[disabled]
border-color: lighten($brand-primary,35%)
color: lighten($brand-primary,15%)
background-color: lighten($brand-primary,65%)
@include box-shadow(lighten($brand-primary,55%) 0 -2px 0 inset)
&:hover, &:focus
border-color: $bg-head-color
color: lighten($bg-head-color,70%)
@@ -488,13 +503,13 @@ hr
//table
.table
@extend .table-striped
@extend .table-hover
border-collapse: separate
border-spacing: 0 2px
margin-bottom: 5px
thead th
background-color: darken($bg-content-color,10%)
//border-bottom: solid 2px lighten($brand-primary,20%)
//@include box-shadow(rgba(black,0.15) 0 2px 3px inset)
thead > tr > th
font-weight: normal
vertical-align: top
@@ -519,13 +534,7 @@ hr
word-wrap: nowrap
font-size: 12px
@include box-shadow(rgba(black,0.15) 0 1px 0)
tbody > tr:hover > td
cursor: pointer
background-color: lighten($bg-head-color,15%)
@include transition-property(background-color)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
@include box-shadow(rgba($bg-head-color,0.80) 0 2px 0)
td.center, th.center
text-align: center
tr td:first-child,
@@ -582,14 +591,36 @@ tr.filter
font-weight: 500
#footer
z-index: 9002
display: block
//position: absolute
//width: 100%
bottom: 0
width: 100%
float: left
padding: 5px 0
background-color: darken($bg-content-color,5%)
@include box-shadow(darken($bg-content-color,40%) 0 2px 10px inset)
background-color: black
color: #888
a
color: #ccc
a.link-social
&:hover
text-decoration: none
i
font-size: 2em
width: 30px
height: 30px
display: inline-block
line-height: 30px
text-align: center
@include border-radius(30px)
.link-twitter i
color: white
background-color: #7CCEEF
.link-facebook i
color: white
background-color: #557DBB
.link-github i
color: black
background-color: white
.link-google i
color: white
background-color: #E6644E
#go-top
position: fixed
bottom: 10px
@@ -613,24 +644,4 @@ tr.filter
color: #666
font-size: 22px
margin-bottom: 5px
.link-social
&:hover
text-decoration: none
i
font-size: 2em
width: 30px
height: 30px
display: inline-block
line-height: 30px
text-align: center
@include border-radius(30px)
.link-twitter i
background-color: #7CCEEF
.link-facebook i
color: white
background-color: #557DBB
.link-github i
background-color: white
.link-google i
color: white
background-color: #E6644E
@@ -84,7 +84,7 @@ $border-radius-base: 3px ;
// $table-bg: transparent ; overall background-color
// $table-bg-accent: #f9f9f9 ; for striping
$table-bg-hover: lighten($brand-primary,40%) ;
$table-bg-hover: lighten($bg-head-color,35%) ;
// $table-border-color: #ddd ; table and cell border
@@ -180,7 +180,7 @@ $grid-gutter-width: 10px ;
// -------------------------
// Basics of a navbar
// $navbar-height: 50px ;
$navbar-height: 35px ;
// $navbar-color: #777 ;
// $navbar-bg: #eee ;
// $navbar-padding: floor($grid-gutter-width / 2) ; ~15px
@@ -157,7 +157,7 @@
{l s='Carrier selection'}
</label>
<div id="carrier_restriction_div">
<table class="col-lg-12">
<table>
<tr>
<td>
<p>{l s='Unselected carriers'}</p>
@@ -190,7 +190,7 @@
{l s='Customer group selection'}
</label>
<div id="group_restriction_div">
<table class="col-lg-12">
<table>
<tr>
<td>
<p>{l s='Unselected groups'}</p>
@@ -1,10 +1,10 @@
<div class="row-fluid">
<div class="row">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
<div class="row-fluid">
<div class="row">
<div class="productTabs">
<ul class="tab nav nav-tabs">
<li class="tab-row">
@@ -20,23 +20,22 @@
</div>
</div>
<div class="row-fluid">
<div class="row">
<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" class="form-horizontal" method="post">
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<fieldset id="cart_rule_informations" class="cart_rule_tab">
<legend>{l s='Cart-rule information'}</legend>
<h3>{l s='Cart-rule information'}</h3>
{include file='controllers/cart_rules/informations.tpl'}
</fieldset>
<fieldset id="cart_rule_conditions" class="cart_rule_tab">
<legend>{l s='Cart-rule conditions'}</legend>
<h3>{l s='Cart-rule conditions'}</h3>
{include file='controllers/cart_rules/conditions.tpl'}
</fieldset>
<fieldset id="cart_rule_actions" class="cart_rule_tab">
<legend>{l s='Cart-rule actions'}</legend>
<h3>{l s='Cart-rule actions'}</h3>
{include file='controllers/cart_rules/actions.tpl'}
</fieldset>
<hr/>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
</form>
@@ -28,7 +28,7 @@
{if isset($display_regenerate)}
<form class="form-horizontal" action="{$current}&token={$token}" method="post">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-picture"></i>
{l s='Regenerate thumbnails'}
@@ -103,7 +103,7 @@
</div>
{else}
<form action="{$current}&token={$token}" method="post" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-picture"></i>
{l s='Move images'}
@@ -104,7 +104,7 @@
*}
<form id="preview_import" action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-download"></i>
{l s='Import'}
@@ -251,7 +251,7 @@
</fieldset>
</form>
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-download"></i>
{l s='Available fields'}
@@ -69,164 +69,176 @@
});
</script>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Configuration information'}
</h3>
<p>{l s='This information must be provided when you report an issue on our bug tracker or forum.'}</p>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Server information'}
</h3>
{if count($uname)}
<p>
<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
</p>
{/if}
<p>
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
</p>
{if $apache_instaweb}
<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Database information'}
</h3>
<p>
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Store information'}
</h3>
<p>
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Mail configuration'}
</h3>
<p>
<strong>{l s='Mail method'}:</strong>
{if $mail}
{l s='You are using the PHP mail function.'}</p>
{else}
{l s='You are using your own SMTP parameters.'}</p>
<p>
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='SMTP user'}:</strong>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='SMTP password'}:</strong>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
</p>
{/if}
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Your information'}
</h3>
<p>
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<fieldset id="checkConfiguration">
<h3>
<i class="icon-info"></i>
{l s='Check your configuration'}
</h3>
<p>
<strong>{l s='Required parameters'}:</strong>
{if !$failRequired}
<span class="text-success">OK</span>
</p>
{else}
<span class="text-danger">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
<div class="row">
<div class="col-lg-6">
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Configuration information'}
</h3>
<p>{l s='This information must be provided when you report an issue on our bug tracker or forum.'}</p>
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Server information'}
</h3>
{if count($uname)}
<p>
<strong>{l s='Optional parameters'}:</strong>
{if !$failOptional}
<span>OK</span>
<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
</p>
{else}
<span class="text-success">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$key}</li>
{/if}
{/foreach}
</ul>
{/if}
</fieldset>
<p>
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
</p>
{if $apache_instaweb}
<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
</div>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='List of changed files'}
</h3>
<div id="changedFiles"><img src="../img/admin/ajax-loader.gif" /> {l s='Checking files...'}</div>
</fieldset>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Database information'}
</h3>
<p>
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
</p>
</div>
</div>
<div class="col-lg-6">
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Store information'}
</h3>
<p>
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
</p>
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Mail configuration'}
</h3>
<p>
<strong>{l s='Mail method'}:</strong>
{if $mail}
{l s='You are using the PHP mail function.'}</p>
{else}
{l s='You are using your own SMTP parameters.'}</p>
<p>
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='SMTP user'}:</strong>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='SMTP password'}:</strong>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
</p>
{/if}
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Your information'}
</h3>
<p>
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
</p>
</div>
<div class="panel" id="checkConfiguration">
<h3>
<i class="icon-info"></i>
{l s='Check your configuration'}
</h3>
<p>
<strong>{l s='Required parameters'}:</strong>
{if !$failRequired}
<span class="text-success">OK</span>
</p>
{else}
<span class="text-danger">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
<p>
<strong>{l s='Optional parameters'}:</strong>
{if !$failOptional}
<span>OK</span>
</p>
{else}
<span class="text-success">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$key}</li>
{/if}
{/foreach}
</ul>
{/if}
</div>
</div>
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='List of changed files'}
</h3>
<div id="changedFiles"><img src="../img/admin/ajax-loader.gif" /> {l s='Checking files...'}</div>
</div>
{/block}
@@ -27,7 +27,7 @@
{block name="override_header"}
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-level-up"></i>
{l s='Severity levels'}
@@ -39,6 +39,6 @@
<li class="text-warning">{l s='Error'}</li>
<li class="text-danger">{l s='Major issue (crash)!'}</li>
</ol>
</fieldset><br />
</fieldset>
{/block}
@@ -11,96 +11,94 @@
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
</fiv>
</div>
</div>
<div class="col-lg-12">&nbsp;</div>
<div id="container" class="col-lg-12">
<div id="moduleContainer">
<table class="table table-striped table-hover" cellspacing="0" cellpadding="0" id="">
<colgroup>
<col width="5%">
<col width="10%">
<col width="20%">
<col width="5%">
<col width="20%">
<col width="5%">
<col width="7%">
<col width="7%">
<col width="7%">
</colgroup>
<thead>
<tr class="nodrag nodrop">
<th>{l s='Logo'}</th>
<th>{l s='Module Name'}</th>
<th>{l s='Description'}</th>
<th>{l s='Status'}</th>
<th>{l s='Tab'}</th>
<th>{l s='Categories'}</th>
<th>{l s='Interest'}</th>
<th>{l s='Favorite'}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{foreach from=$modules key=km item=module}
<tr height="32" {if $km % 2 eq 0} class="alt_row"{/if}>
<td>
<img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="57" height="57" />
</td>
<td class="moduleName">
<h5>{$module->displayName}</h5>
</td>
<td>
<span class="moduleFavDesc">{$module->description|truncate:80:'...'}</span>
</td>
<td class="setup">
{if isset($module->id) && $module->id gt 0}
<span class="label label-success">{l s='Installed'}</span>
{else}
<span class="label label-warning">{l s='Not Installed'}</span>
{/if}
</td>
<td>
{assign var="module_name" value=$module->name}
<select name="t_{$module->name}" multiple="multiple">
{foreach $tabs AS $t}
{if $t.active}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} class="group" value="{$t.id_tab}">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</option>
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
{assign var="id_tab" value=$t.id_tab}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</option>
{/if}
{/foreach}
{/if}
{/foreach}
</select>
</td>
<td>
<span>{$module->categoryName}</span>
</td>
<td>
<select name="i_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td>
<select name="f_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td id="r_{$module->name}">
<span>&nbsp;</span>
</td>
</tr>
{/foreach}
</tbody>
</table>
<div id="moduleContainer">
<table class="table" id="">
<colgroup>
<col width="5%">
<col width="10%">
<col width="20%">
<col width="5%">
<col width="20%">
<col width="5%">
<col width="7%">
<col width="7%">
<col width="7%">
</colgroup>
<thead>
<tr class="nodrag nodrop">
<th>{l s='Logo'}</th>
<th>{l s='Module Name'}</th>
<th>{l s='Description'}</th>
<th>{l s='Status'}</th>
<th>{l s='Tab'}</th>
<th>{l s='Categories'}</th>
<th>{l s='Interest'}</th>
<th>{l s='Favorite'}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{foreach from=$modules key=km item=module}
<tr height="32" {if $km % 2 eq 0} class="alt_row"{/if}>
<td>
<img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="57" height="57" />
</td>
<td class="moduleName">
<h5>{$module->displayName}</h5>
</td>
<td>
<span class="moduleFavDesc">{$module->description|truncate:80:'...'}</span>
</td>
<td class="setup">
{if isset($module->id) && $module->id gt 0}
<span class="label label-success">{l s='Installed'}</span>
{else}
<span class="label label-warning">{l s='Not Installed'}</span>
{/if}
</td>
<td>
{assign var="module_name" value=$module->name}
<select name="t_{$module->name}" multiple="multiple">
{foreach $tabs AS $t}
{if $t.active}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} class="group" value="{$t.id_tab}">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</option>
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
{assign var="id_tab" value=$t.id_tab}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</option>
{/if}
{/foreach}
{/if}
{/foreach}
</select>
</td>
<td>
<span>{$module->categoryName}</span>
</td>
<td>
<select name="i_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td>
<select name="f_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td id="r_{$module->name}">
<span>&nbsp;</span>
</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
</div>
</div>
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="row-fluid page-head">
<div class="page-head">
<h2 class="page-title">
{l s='List of modules'}
</h2>
@@ -46,28 +46,26 @@
{if $add_permission eq '1'}
<div id="module_install" class="row" style="{if !isset($smarty.post.downloadflag)}display: none;{/if}">
<div class="col-lg-12">
<div class="row-fluid">
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<legend>{l s='Add a new module'}</legend>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-9">
<p>
<input type="file" name="file" />
</p>
<p>
<button class="btn btn-default" type="submit" name="download">
<i class="icon-upload-alt" ></i>
{l s='Upload this module'}
</button>
</p>
</div>
</form>
</div>
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<legend>{l s='Add a new module'}</legend>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-9">
<p>
<input type="file" name="file" />
</p>
<p>
<button class="btn btn-default" type="submit" name="download">
<i class="icon-upload-alt" ></i>
{l s='Upload this module'}
</button>
</p>
</div>
</form>
</div>
</div>
{/if}
@@ -68,7 +68,7 @@
</div>
</div>
<div class="row">
<div class="col-lg-10 col-offset-3">
<div class="col-lg-9 col-offset-3">
<button class="btn btn-default" id="addons_login_button" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
@@ -82,14 +82,14 @@
</div>
<div id="modules_list_container_content">
{if count($tab_modules_list.installed)}
<table id="tab_modules_list_installed" class="table table-striped table-hover">
<table id="tab_modules_list_installed" class="table">
{foreach from=$tab_modules_list.installed item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
{/foreach}
</table>
{/if}
{if count($tab_modules_list.not_installed)}
<table id="tab_modules_list_not_installed" class="table table-striped table-hover">
<table id="tab_modules_list_not_installed" class="table">
{foreach from=$tab_modules_list.not_installed item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
{/foreach}
@@ -110,7 +110,7 @@
<!-- Breadcrumb -->
<div class="col-lg-12">
<div class="breadcrumb pull-right">
<div class="breadcrumb">
<span><strong>{l s='Orders'}</strong></span> :
{if $previousOrder}
<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">
@@ -130,10 +130,10 @@
<!-- Change status form -->
<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
<fieldset>
<legend>
<h3>
<i class="icon-table"></i>
{l s='Order status'}
</legend>
</h3>
<label class="control-label col-lg-1 text-right">
{l s='Status:'}
</label>
@@ -197,10 +197,10 @@
<!-- Customer informations -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-user"></i>
{l s='Customer information'}
</legend>
</h3>
<span>
<a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}">
{$customer->firstname} {$customer->lastname}
@@ -228,10 +228,10 @@
<!-- Sources block -->
{if (sizeof($sources))}
<fieldset>
<legend>
<h3>
<i class="icon-signal"></i>
{l s='Sources'}
</legend>
</h3>
<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
{foreach from=$sources item=source}
<li>
@@ -254,10 +254,10 @@
<div class="col-lg-6">
<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
<fieldset>
<legend onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<h3 onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<i class="icon-envelope"></i>
{l s='New message'}
</legend>
</h3>
<p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if};">
<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<strong>{l s='Click here'}</strong> {l s='to add a comment or send a message to the customer.'}
@@ -302,10 +302,10 @@
{if (sizeof($messages))}
<fieldset>
<legend>
<h3>
<i class="icon-envelope"></i>
{l s='Messages'}
</legend>
</h3>
{foreach from=$messages item=message}
<div {if $message['is_new_for_me']}class="new_message"{/if}>
{if ($message['is_new_for_me'])}
@@ -328,17 +328,15 @@
{/if}
</div>
<div class="col-lg-12"></div>
<!-- Addresses -->
<div class="col-lg-6">
{if !$order->isVirtual()}
<!-- Shipping address -->
<fieldset>
<legend>
<h3>
<i class="icon-truck"></i>
{l s='Shipping address'}
</legend>
</h3>
{if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div class="col-lg-10">
@@ -385,10 +383,10 @@
<!-- Invoice address -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-file"></i>
{l s='Invoice address'}
</legend>
</h3>
{if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div class="col-lg-10">
@@ -417,16 +415,14 @@
</fieldset>
</div>
<div class="col-lg-12"></div>
<!-- linked orders block -->
{if count($order->getBrother()) > 0}
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-shopping-cart"></i>
{l s='Linked orders'}
</legend>
</h3>
<table class="table">
<thead>
<tr>
@@ -469,10 +465,10 @@
<!-- Documents block -->
<div class="col-lg-12">
<fieldset>
<legend>
<h3>
<i class="icon-file-text"></i>
{l s='Documents'}
</legend>
</h3>
{* Include document template *}
{include file='controllers/orders/_documents.tpl'}
</fieldset>
@@ -481,10 +477,10 @@
<!-- Payments block -->
<div class="col-lg-12">
<fieldset>
<legend>
<h3>
<i class="icon-money"></i>
{l s='Payment'}
</legend>
</h3>
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
@@ -518,6 +514,7 @@
{/foreach}
</p>
{/if}
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table">
<colgroup>
@@ -660,10 +657,10 @@
<!-- Shipping block -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-truck"></i>
{l s='Shipping'}
</legend>
</h3>
{if $order->recyclable}
<p>
<span class="label label-success">
@@ -716,10 +713,10 @@
<!-- Return block -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-suitcase"></i>
{l s='Merchandise returns'}
</legend>
</h3>
{if $order->getReturn()|count > 0}
<table class="table">
@@ -790,10 +787,10 @@
<div style="display: none">
<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
</div>
<legend>
<h3>
<i class="icon-shopping-cart"></i>
{l s='Products:'}
</legend>
</h3>
<div class="col-lg-12">
{if $can_edit}
{if !$order->hasBeenDelivered()}
@@ -992,15 +989,17 @@
<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="btn btn-default" />
</div>
{/if}
</fieldset>
</div>
<!-- Discount block -->
{if (sizeof($discounts) || $can_edit)}
<div class="col-lg-12">
<legend>
<fieldset>
<h3>
<i class="icon-tag"></i>
{l s='Discounts'}
</legend>
</h3>
{*
TO DO - Je voudrais placer le bouton ici mais l'apparition du formulaire ne fonctionne plus....
<a class="btn btn-default" href="#" id="add_voucher">
@@ -1068,8 +1067,4 @@
</form>
</div>
</div>
<a class="btn btn-default" href="{$current_index}&token={$smarty.get.token}">
<i class="icon-arrow-left"></i>
{l s='Back to list'}
</a>
{/block}
@@ -30,7 +30,7 @@
{$list['title']}
</h3>
<p class="help-block">{$list['desc']}</p>
<table cellpadding="0" cellspacing="0" class="table table-striped table-hover">
<table cellpadding="0" cellspacing="0" class="table">
<tr>
<th width="40%">{$list['title']}</th>
{foreach $payment_modules as $module}
@@ -232,13 +232,11 @@
<div id="product-tab-content-wait" style="display:none">
<div id="loading">{l s='Loading...'}</div>
</div>
<form id="product_form" class="form-horizontal col-lg-10" action="{$form_action}" method="post" enctype="multipart/form-data" name="product" style="display:none;">
<input type="hidden" name="id_product" value="{$id_product}" />
<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual|escape:html:'UTF-8'}" />
{if !$product->active && $product->isAssociatedToShop()}
<div class="alert draft" >
<p>
@@ -253,11 +251,11 @@
{* all input are here *}
<div class="row">
{foreach $product_tabs key=numStep item=tab}
<fieldset id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content col-lg-12" {if !$tab.selected}style="display:none"{/if}>
{if $tab.selected}
{$custom_form}
{/if}
</fieldset>
<fieldset id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
{if $tab.selected}
{$custom_form}
{/if}
</fieldset>
{/foreach}
</div>
@@ -108,7 +108,7 @@
</div>
{/if}
<table class="table table-hover">
<table class="table">
<colgroup>
<col width="50">
<col>
@@ -27,7 +27,7 @@
{block name="after"}
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-list"></i>
{l s='List of MySQL Tables:'}
@@ -26,7 +26,7 @@
{$content}
<form action="{$action_fees}" id="fees" name="fees" method="post" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-truck"></i>
{l s='Fees by carrier, geographical zone and ranges'}
@@ -25,8 +25,10 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<div class="row">
<fieldset class="col-lg-12">
<div class="row">
<div class="col-lg-6">
<fieldset>
<h3>
<i class="icon-info"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'}
@@ -63,32 +65,17 @@
</table>
</fieldset>
</div>
<div class="row">
<fieldset class="col-lg-12">
<h3>
<i class="icon-dropbox"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}
</h3>
{$supply_order_detail_content}
</fieldset>
</div>
<div class="row">
<fieldset class="col-lg-12">
<div class="col-lg-6">
<fieldset>
<h3>
<i class="icon-th-list"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'}
</h3>
<table classe="table">
<table class="table">
<tr>
<th>{l s='Designation'}</th>
<th>{l s='Value'}</th>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total (tax excl.)'}</td>
<td>{$supply_order_total_te}</td>
@@ -101,10 +88,6 @@
<td>{l s='Total with discount (tax excl.)'}</td>
<td>{$supply_order_total_with_discount_te}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total Tax'}</td>
<td>{$supply_order_total_tax}</td>
@@ -113,10 +96,6 @@
<td>{l s='Total (tax incl.)'}</td>
<td>{$supply_order_total_ti}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total to pay.'}</td>
<td>{$supply_order_total_ti}</td>
@@ -124,5 +103,13 @@
</table>
</fieldset>
</div>
</div>
<fieldset>
<h3>
<i class="icon-dropbox"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}
</h3>
{$supply_order_detail_content}
</fieldset>
{/block}
@@ -33,7 +33,8 @@
{/if}
<form method="post" action="{$currentIndex}&{$identifier}&token={$token}&id_tax_rules_group={$id_tax_rules_group}&updatetax_rules_group#{$table}" class="form">
<fieldset class="col-lg-12">
<fieldset>
<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
<table {if $table_id} id={$table_id}{/if} class="table {if $table_dnd}tableDnD{/if} {$table}">
<col width="10" />
@@ -47,7 +48,7 @@
<col width="52" />
{/if}
<thead>
<tr class="nodrag nodrop">
<tr>
<th>
{if $has_bulk_actions}
<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
@@ -41,7 +41,7 @@
{/block}
{block name="after"}
<fieldset id="prestastore-content" class="col-lg-12"></fieldset>
<fieldset id="prestastore-content"></fieldset>
<script type="text/javascript">
$.post(
"ajax-tab.php",
+8 -13
View File
@@ -22,24 +22,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
</div>
</div>
</div>
</div>
{if $display_footer}
{hook h="displayBackOfficeFooter"}
<div id="footer">
<div id="go-top"><i class="icon-arrow-up"></i></div>
<div class="col-lg-4">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
<span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div>
<div class="col-lg-8">
<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
<div class="col-lg-3">
<a class="link-social link-twitter" href="#" title="Twitter">
<i class="icon-twitter"></i>
</a>
@@ -52,17 +45,19 @@
<a class="link-social link-google" href="#" title="Google">
<i class="icon-google-plus"></i>
</a>
</div>
<div class="col-lg-4">
<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
{if $iso_is_fr}
<p>Questions / Renseignements / Formations :
<strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
<p>
{/if}
</div>
<div id="go-top"><i class="icon-arrow-up"></i></div>
</div>
<div id="ajax_confirmation" style="display:none"></div>
{* ajaxBox allows*} <div id="ajaxBox" style="display:none"></div>
+32 -22
View File
@@ -32,6 +32,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="robots" content="NOFOLLOW, NOINDEX">
@@ -115,17 +116,16 @@
</head>
<body class="fixed-top">
<body class="fixed-top page-sidebar-closed">
{if $display_header}
{* begin HEADER *}
<div class="container-fluid">
<div id="header">
<div id="header_infos" class="navbar navbar-fixed-top">
<a id="header_shopname" class="navbar-brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">{$shop_name}</a>
<ul id="notifs_icon_wrapper" class="nav navbar-nav nav-pills">
{if {$show_new_orders} == 1}
<li id="orders_notif" class="dropdown" >
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -143,6 +143,7 @@
</ul>
</li>
{/if}
{if ($show_new_customers == 1)}
<li id="customers_notif" class="notifs dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -160,6 +161,7 @@
</ul>
</li>
{/if}
{if {$show_new_messages} == 1}
<li id="customer_messages_notif" class="notifs dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -233,31 +235,41 @@
<span id="ajax_running" class="navbar-text">
<i class="icon-refresh icon-spin"></i> {l s='Loading...'}
</span>
{if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
</div>{* end header_infos*}
</div>
</div>{* end header*}
{* end header*}
{/if}
<div id="main" class="page-container row-fluid">
<div id="main">
<div class="page-sidebar">
<div id="sidebar" class="page-sidebar nav-collapse collapse">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
<span class="menu-collapse">
<i class="icon-align-justify"></i>
</span>
<script type="text/javascript">
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
</script>
<ul id="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i> {l s='Dashboard'}
<i class="icon-AdminDashboard"></i>
<span class="title">{l s='Dashboard'}</span>
</a>
</li>
{foreach $tabs as $t}
{if $t.active}
<li class="maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}">
<a href="javascript:adminNav('#maintab{$t.id_tab}');" class="title">
<i class="icon-{$t.class_name}"></i> {if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}
<i class="icon-{$t.class_name}"></i>
<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
</a>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
@@ -278,17 +290,15 @@
</div>
<div id="content" class="page-content">
<div class="container-fluid">
<div class="row-fluid">
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
</div>
{/if}
{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
</div>
{/if}
@@ -36,7 +36,7 @@
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
{foreach $fields as $f => $fieldset}
<fieldset id="fieldset_{$f}" class="col-lg-12">
<fieldset id="fieldset_{$f}">
{foreach $fieldset.form as $key => $field}
{if $key == 'legend'}
<h3>
@@ -74,7 +74,7 @@
{if !$simple_header}
<form method="post" action="{$action}" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
{block name="override_header"}{/block}
{if $show_filters}
@@ -90,13 +90,13 @@
{/if}
{/if}
<table
class="table table-hover"
class="table"
name="list_table"
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$table}"
>
<thead>
<tr class="nodrag nodrop">
<tr>
<th class="center">
</th>
{foreach $fields_display AS $key => $params}
@@ -150,7 +150,7 @@
{/if}
</tr>
{if !$simple_header && $show_filters}
<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
<tr class="filter {if $row_hover}row_hover{/if}">
<td class="center">
{if $has_bulk_actions}
--
@@ -41,7 +41,7 @@
{/foreach}
</table>
{else}
<table border="0" cellpadding="0" cellspacing="5" class="table table-striped table-hover">
<table class="table">
<tr>
<td>
<div class="alert alert-block">{l s='No modules available in this section.'}</div>
@@ -51,5 +51,4 @@
{/if}
</div>
</div>
</fieldset>
</fieldset>
@@ -41,7 +41,7 @@
enctype="multipart/form-data" class="form-horizontal">
{foreach $option_list AS $category => $categoryData}
{if isset($categoryData['top'])}{$categoryData['top']}{/if}
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if} class="col-lg-12">
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if}>
{* Options category title *}
<h3>
<i class="icon-cogs"></i>
+1 -1
View File
@@ -63,7 +63,7 @@
{foreach $confirmations as $conf}
{$conf}<br />
{/foreach}
</div><br />
</div>
{/if}
{if count($warnings)}
<div class="alert alert-block">
@@ -24,7 +24,7 @@
*}
<div class="row-fluid page-head">
<div class="page-head">
{block name=pageTitle}
<h2 class="page-title">
{if is_array($title)}{$title|end}{else}{$title}{/if}
@@ -53,11 +53,11 @@ class AdminSuppliersControllerCore extends AdminController
$this->fieldImageSettings = array('name' => 'logo', 'dir' => 'su');
$this->fields_list = array(
'id_supplier' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'logo' => array('title' => $this->l('Logo'), 'width' => 150, 'align' => 'center', 'image' => 'su', 'orderby' => false, 'search' => false),
'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
'products' => array('title' => $this->l('Number of products'), 'width' => 70, 'align' => 'right', 'filter_type' => 'int', 'tmpTableFilter' => true),
'active' => array('title' => $this->l('Enabled'), 'width' => 70, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
'id_supplier' => array('title' => $this->l('ID'), 'align' => 'center'),
'logo' => array('title' => $this->l('Logo'), 'align' => 'center', 'image' => 'su', 'orderby' => false, 'search' => false),
'name' => array('title' => $this->l('Name')),
'products' => array('title' => $this->l('Number of products'), 'align' => 'right', 'filter_type' => 'int', 'tmpTableFilter' => true),
'active' => array('title' => $this->l('Enabled'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
);
parent::__construct();