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:
djfm
2013-10-18 08:20:32 +00:00
parent 37656c2df9 e17c5f7c91
commit 901f5aeb08
16 changed files with 269 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+131 -86
View File
@@ -7801,7 +7801,7 @@ a.link-social:hover {
/* line 1, admin-theme/_admin-nav.sass */ /* line 1, admin-theme/_admin-nav.sass */
#nav-sidebar { #nav-sidebar {
float: left; position: fixed;
width: 240px; width: 240px;
height: 100% !important; height: 100% !important;
overflow-y: auto; overflow-y: auto;
@@ -7845,33 +7845,33 @@ a.link-social:hover {
#nav-sidebar ul.menu li.maintab.active a.title i, #nav-sidebar ul.menu li.maintab.active a.title:hover i { #nav-sidebar ul.menu li.maintab.active a.title i, #nav-sidebar ul.menu li.maintab.active a.title:hover i {
color: black; color: black;
background-color: white; } background-color: white; }
/* line 40, admin-theme/_admin-nav.sass */ /* line 39, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.active a.title:hover { #nav-sidebar ul.menu li.maintab.active a.title:hover {
color: white; } color: white; }
/* line 43, admin-theme/_admin-nav.sass */ /* line 42, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.expanded a.title { #nav-sidebar ul.menu li.maintab.expanded a.title {
color: white; color: white;
background-color: #3a3d45; background-color: #3a3d45;
border-bottom: solid 1px #17181c; } border-bottom: solid 1px #17181c; }
/* line 47, admin-theme/_admin-nav.sass */ /* line 46, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.expanded a.title:hover { #nav-sidebar ul.menu li.maintab.expanded a.title:hover {
background-color: #686d7d; } background-color: #686d7d; }
/* line 49, admin-theme/_admin-nav.sass */ /* line 48, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.expanded a.title i { #nav-sidebar ul.menu li.maintab.expanded a.title i {
color: white; } color: white; }
/* line 53, admin-theme/_admin-nav.sass */ /* line 52, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.expanded ul.submenu { #nav-sidebar ul.menu li.maintab.expanded ul.submenu {
display: block; } display: block; }
/* line 55, admin-theme/_admin-nav.sass */ /* line 54, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.expanded ul.submenu a { #nav-sidebar ul.menu li.maintab.expanded ul.submenu a {
color: #9da1ae; color: #9da1ae;
background-color: #2e3037; background-color: #2e3037;
border-bottom: solid 1px #17181c; } border-bottom: solid 1px #17181c; }
/* line 59, admin-theme/_admin-nav.sass */ /* line 58, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab.expanded ul.submenu a:hover { #nav-sidebar ul.menu li.maintab.expanded ul.submenu a:hover {
color: white; color: white;
background-color: #454953; } background-color: #454953; }
/* line 62, admin-theme/_admin-nav.sass */ /* line 61, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab a.title { #nav-sidebar ul.menu li.maintab a.title {
display: block; display: block;
position: relative; position: relative;
@@ -7893,7 +7893,7 @@ a.link-social:hover {
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
transition-timing-function: ease-out; } transition-timing-function: ease-out; }
/* line 77, admin-theme/_admin-nav.sass */ /* line 76, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab a.title i { #nav-sidebar ul.menu li.maintab a.title i {
color: #9094a2; color: #9094a2;
background-color: #17181c; background-color: #17181c;
@@ -7907,14 +7907,14 @@ a.link-social:hover {
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
transition-timing-function: ease-out; } transition-timing-function: ease-out; }
/* line 83, admin-theme/_admin-nav.sass */ /* line 82, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab a.title:hover { #nav-sidebar ul.menu li.maintab a.title:hover {
background-color: #686d7d; background-color: #686d7d;
color: white; } color: white; }
/* line 86, admin-theme/_admin-nav.sass */ /* line 85, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab a.title:hover i { #nav-sidebar ul.menu li.maintab a.title:hover i {
color: white; } color: white; }
/* line 88, admin-theme/_admin-nav.sass */ /* line 87, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab span.submenu_expand { #nav-sidebar ul.menu li.maintab span.submenu_expand {
position: absolute; position: absolute;
right: 10px; right: 10px;
@@ -7926,15 +7926,15 @@ a.link-social:hover {
color: black; color: black;
background-color: transparent; background-color: transparent;
text-shadow: #686d7d 1px 1px 0; } text-shadow: #686d7d 1px 1px 0; }
/* line 101, admin-theme/_admin-nav.sass */ /* line 99, admin-theme/_admin-nav.sass */
#nav-sidebar ul.menu li.maintab span.submenu_expand:hover { #nav-sidebar ul.menu li.maintab span.submenu_expand:hover {
color: white; color: white;
text-shadow: #232429 -1px -1px 0; } text-shadow: #232429 -1px -1px 0; }
/* line 104, admin-theme/_admin-nav.sass */ /* line 102, admin-theme/_admin-nav.sass */
#nav-sidebar ul.submenu { #nav-sidebar ul.submenu {
list-style: none; list-style: none;
padding: 0; } padding: 0; }
/* line 108, admin-theme/_admin-nav.sass */ /* line 106, admin-theme/_admin-nav.sass */
#nav-sidebar ul.submenu li a { #nav-sidebar ul.submenu li a {
display: block; display: block;
padding: 4px 5px 4px 10px; padding: 4px 5px 4px 10px;
@@ -7942,15 +7942,15 @@ a.link-social:hover {
border: none; border: none;
border-bottom: solid 1px #eeeeee; border-bottom: solid 1px #eeeeee;
background-color: white; } background-color: white; }
/* line 115, admin-theme/_admin-nav.sass */ /* line 113, admin-theme/_admin-nav.sass */
#nav-sidebar ul.submenu li a:hover { #nav-sidebar ul.submenu li a:hover {
color: #515561; color: #515561;
background-color: #edeeef; background-color: #edeeef;
text-decoration: none; } text-decoration: none; }
/* line 119, admin-theme/_admin-nav.sass */ /* line 117, admin-theme/_admin-nav.sass */
#nav-sidebar ul.submenu li:last-child a { #nav-sidebar ul.submenu li:last-child a {
border-bottom: none; } border-bottom: none; }
/* line 121, admin-theme/_admin-nav.sass */ /* line 119, admin-theme/_admin-nav.sass */
#nav-sidebar ul.submenu li.active a { #nav-sidebar ul.submenu li.active a {
color: white; color: white;
background-color: #1ba6e5; background-color: #1ba6e5;
@@ -7960,7 +7960,7 @@ a.link-social:hover {
#nav-sidebar { #nav-sidebar {
display: none; } } display: none; } }
/* line 128, admin-theme/_admin-nav.sass */ /* line 126, admin-theme/_admin-nav.sass */
#nav-topbar { #nav-topbar {
position: fixed; position: fixed;
height: 28px; height: 28px;
@@ -7969,14 +7969,14 @@ a.link-social:hover {
width: 100%; width: 100%;
z-index: 600; z-index: 600;
background-color: white; } background-color: white; }
/* line 136, admin-theme/_admin-nav.sass */ /* line 134, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu { #nav-topbar ul.menu {
height: 28px; height: 28px;
margin: 0; margin: 0;
padding: 0; padding: 0;
display: block; display: block;
list-style: none; } list-style: none; }
/* line 142, admin-theme/_admin-nav.sass */ /* line 140, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li { #nav-topbar ul.menu > li {
height: 28px; height: 28px;
padding: 0; padding: 0;
@@ -7985,46 +7985,46 @@ a.link-social:hover {
list-style: none; list-style: none;
position: relative; position: relative;
float: left; } float: left; }
/* line 150, admin-theme/_admin-nav.sass */ /* line 148, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li > a { #nav-topbar ul.menu > li > a {
display: block; display: block;
line-height: 28px; line-height: 28px;
color: #515561; color: #515561;
padding: 0 6px; padding: 0 6px;
margin: 0; } margin: 0; }
/* line 156, admin-theme/_admin-nav.sass */ /* line 154, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li > a i { #nav-topbar ul.menu > li > a i {
margin: 0; margin: 0;
width: 15px; width: 15px;
background-color: transparent; background-color: transparent;
font-size: 18px; } font-size: 18px; }
/* line 161, admin-theme/_admin-nav.sass */ /* line 159, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li > a:hover { #nav-topbar ul.menu > li > a:hover {
text-decoration: none; text-decoration: none;
background-color: #515561; background-color: #515561;
color: white; } color: white; }
/* line 165, admin-theme/_admin-nav.sass */ /* line 163, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li > a:hover i { #nav-topbar ul.menu > li > a:hover i {
color: white !important; } color: white !important; }
/* line 168, admin-theme/_admin-nav.sass */ /* line 166, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li.active > a { #nav-topbar ul.menu > li.active > a {
color: white; color: white;
background-color: #515561; } background-color: #515561; }
/* line 171, admin-theme/_admin-nav.sass */ /* line 169, admin-theme/_admin-nav.sass */
#nav-topbar ul.menu > li.active > a i { #nav-topbar ul.menu > li.active > a i {
color: white; } color: white; }
/* line 173, admin-theme/_admin-nav.sass */ /* line 171, admin-theme/_admin-nav.sass */
#nav-topbar .menu-collapse { #nav-topbar .menu-collapse {
display: none; } display: none; }
/* line 175, admin-theme/_admin-nav.sass */ /* line 173, admin-theme/_admin-nav.sass */
#nav-topbar ul.submenu { #nav-topbar ul.submenu {
display: none !important; display: none !important;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px;
box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px; } box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px; }
/* line 179, admin-theme/_admin-nav.sass */ /* line 177, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li.expanded ul.submenu { #nav-topbar > ul.menu > li.expanded ul.submenu {
display: block !important; } display: block !important; }
/* line 182, admin-theme/_admin-nav.sass */ /* line 180, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li ul.submenu { #nav-topbar > ul.menu > li ul.submenu {
display: none !important; display: none !important;
position: absolute; position: absolute;
@@ -8033,33 +8033,33 @@ a.link-social:hover {
left: 0; left: 0;
top: 28px; top: 28px;
width: 200px !important; } width: 200px !important; }
/* line 190, admin-theme/_admin-nav.sass */ /* line 188, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li ul.submenu li { #nav-topbar > ul.menu > li ul.submenu li {
width: 200px; width: 200px;
padding: 0; padding: 0;
list-style: none; } list-style: none; }
/* line 194, admin-theme/_admin-nav.sass */ /* line 192, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li ul.submenu li a { #nav-topbar > ul.menu > li ul.submenu li a {
display: block; display: block;
padding: 4px 5px 4px 10px; padding: 4px 5px 4px 10px;
font-size: 12px; font-size: 12px;
background-color: white; background-color: white;
border-bottom: solid 1px #eeeeee; } border-bottom: solid 1px #eeeeee; }
/* line 200, admin-theme/_admin-nav.sass */ /* line 198, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li ul.submenu li a:hover { #nav-topbar > ul.menu > li ul.submenu li a:hover {
color: #515561; color: #515561;
background-color: #edeeef; background-color: #edeeef;
text-decoration: none; } text-decoration: none; }
/* line 204, admin-theme/_admin-nav.sass */ /* line 202, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li ul.submenu li:last-child a { #nav-topbar > ul.menu > li ul.submenu li:last-child a {
border-bottom: none; } border-bottom: none; }
/* line 206, admin-theme/_admin-nav.sass */ /* line 204, admin-theme/_admin-nav.sass */
#nav-topbar > ul.menu > li ul.submenu li.active a { #nav-topbar > ul.menu > li ul.submenu li.active a {
color: white; color: white;
background-color: #1ba6e5; background-color: #1ba6e5;
border-bottom: solid 1px #1585b8; } border-bottom: solid 1px #1585b8; }
/* line 211, admin-theme/_admin-nav.sass */ /* line 209, admin-theme/_admin-nav.sass */
.menu-collapse { .menu-collapse {
height: 54px; height: 54px;
width: 100%; width: 100%;
@@ -8071,25 +8071,26 @@ a.link-social:hover {
border-bottom: 3px solid #3a3d45; border-bottom: 3px solid #3a3d45;
color: #0b0c0e; } color: #0b0c0e; }
/* line 223, admin-theme/_admin-nav.sass */ /* line 221, admin-theme/_admin-nav.sass */
.page-topbar #main { .page-topbar #main {
padding-top: 64px; } padding-top: 64px; }
/* line 225, admin-theme/_admin-nav.sass */ /* line 223, admin-theme/_admin-nav.sass */
.page-topbar #nav-sidebar { .page-topbar #nav-sidebar {
display: none; } display: none; }
/* line 227, admin-theme/_admin-nav.sass */ /* line 225, admin-theme/_admin-nav.sass */
.page-topbar .page-head { .page-topbar .page-head {
top: 63px; } top: 63px; }
/* line 229, admin-theme/_admin-nav.sass */ /* line 227, admin-theme/_admin-nav.sass */
.page-topbar #content { .page-topbar #content {
margin-left: 0; margin-left: 0;
width: 100%; } width: 100%; }
/* line 232, admin-theme/_admin-nav.sass */ /* line 230, admin-theme/_admin-nav.sass */
.page-topbar #content .page-head h2.page-title { .page-topbar #content .page-head h2.page-title {
padding: 0 0 0 20px; } padding: 0 0 0 20px; }
/* line 236, admin-theme/_admin-nav.sass */ /* line 234, admin-theme/_admin-nav.sass */
.page-sidebar-closed #nav-sidebar { .page-sidebar-closed #nav-sidebar {
overflow: visible;
width: 50px; width: 50px;
-webkit-transition-property: width; -webkit-transition-property: width;
-moz-transition-property: width; -moz-transition-property: width;
@@ -8101,10 +8102,10 @@ a.link-social:hover {
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
transition-timing-function: ease-out; } transition-timing-function: ease-out; }
/* line 241, admin-theme/_admin-nav.sass */ /* line 240, admin-theme/_admin-nav.sass */
.page-sidebar-closed #nav-sidebar span.title { .page-sidebar-closed #nav-sidebar span.title {
display: none; } display: none; }
/* line 243, admin-theme/_admin-nav.sass */ /* line 242, admin-theme/_admin-nav.sass */
.page-sidebar-closed #nav-sidebar ul.submenu { .page-sidebar-closed #nav-sidebar ul.submenu {
display: none !important; display: none !important;
padding-top: 37px; padding-top: 37px;
@@ -8112,39 +8113,39 @@ a.link-social:hover {
top: 0; top: 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px; -webkit-box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px;
box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px; } box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px; }
/* line 249, admin-theme/_admin-nav.sass */ /* line 248, admin-theme/_admin-nav.sass */
.page-sidebar-closed #nav-sidebar > ul > li:hover { .page-sidebar-closed #nav-sidebar > ul > li:hover {
width: 250px !important; width: 250px !important;
position: relative; } position: relative; }
/* line 252, admin-theme/_admin-nav.sass */ /* line 251, admin-theme/_admin-nav.sass */
.page-sidebar-closed #nav-sidebar > ul > li:hover span.title { .page-sidebar-closed #nav-sidebar > ul > li:hover span.title {
display: inline-block; } display: inline-block; }
/* line 254, admin-theme/_admin-nav.sass */ /* line 253, admin-theme/_admin-nav.sass */
.page-sidebar-closed #nav-sidebar > ul > li:hover ul.submenu { .page-sidebar-closed #nav-sidebar > ul > li:hover ul.submenu {
display: block !important; display: block !important;
position: absolute; position: absolute;
left: 50px; left: 50px;
width: 200px !important; } width: 200px !important; }
/* line 259, admin-theme/_admin-nav.sass */ /* line 258, admin-theme/_admin-nav.sass */
.page-sidebar-closed #content { .page-sidebar-closed #content {
margin-left: 50px; } margin-left: 50px; }
/* line 261, admin-theme/_admin-nav.sass */ /* line 260, admin-theme/_admin-nav.sass */
.page-sidebar-closed #content .page-head h2.page-title { .page-sidebar-closed #content .page-head h2.page-title {
padding: 0 0 0 70px; } padding: 0 0 0 70px; }
@media (max-width: 768px) { @media (max-width: 768px) {
/* line 261, admin-theme/_admin-nav.sass */ /* line 260, admin-theme/_admin-nav.sass */
.page-sidebar-closed #content .page-head h2.page-title { .page-sidebar-closed #content .page-head h2.page-title {
padding: 0 0 0 20px; } } padding: 0 0 0 20px; } }
@media (max-width: 768px) { @media (max-width: 768px) {
/* line 259, admin-theme/_admin-nav.sass */ /* line 258, admin-theme/_admin-nav.sass */
.page-sidebar-closed #content { .page-sidebar-closed #content {
margin-left: 0; margin-left: 0;
width: 100%; } } width: 100%; } }
/* line 268, admin-theme/_admin-nav.sass */ /* line 267, admin-theme/_admin-nav.sass */
.page-sidebar-closed .submenu_expand { .page-sidebar-closed .submenu_expand {
display: none; } display: none; }
/* line 299, admin-theme/_admin-nav.sass */ /* line 298, admin-theme/_admin-nav.sass */
[class^="icon-Admin"] { [class^="icon-Admin"] {
margin-right: 6px; } margin-right: 6px; }
@@ -8176,39 +8177,43 @@ a.link-social:hover {
.row-margin-bottom { .row-margin-bottom {
margin-bottom: 15px; } margin-bottom: 15px; }
/* line 17, admin-theme/_admin-commons.sass */ /* line 16, admin-theme/_admin-commons.sass */
.row-padding-top {
padding-top: 15px; }
/* line 19, admin-theme/_admin-commons.sass */
.thumbnail { .thumbnail {
background-color: white; background-color: white;
border-color: #cccccc !important; } border-color: #cccccc !important; }
/* line 21, admin-theme/_admin-commons.sass */ /* line 23, admin-theme/_admin-commons.sass */
.badge, #header_notifs_icon_wrapper .notifs_badge, .badge.badge-success, .badge.badge-error { .badge, #header_notifs_icon_wrapper .notifs_badge, .badge.badge-success, .badge.badge-error {
background-color: #8fc04d; } background-color: #8fc04d; }
/* line 23, admin-theme/_admin-commons.sass */ /* line 25, admin-theme/_admin-commons.sass */
#header_notifs_icon_wrapper .badge-success.notifs_badge, .badge-success.badge { #header_notifs_icon_wrapper .badge-success.notifs_badge, .badge-success.badge {
background-color: #5cb85c; } background-color: #5cb85c; }
/* line 26, admin-theme/_admin-commons.sass */ /* line 28, admin-theme/_admin-commons.sass */
#header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge { #header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge {
background-color: #d9534f; } background-color: #d9534f; }
/* line 31, admin-theme/_admin-commons.sass */ /* line 33, admin-theme/_admin-commons.sass */
.nav-tabs { .nav-tabs {
border-bottom: none; } border-bottom: none; }
/* line 33, admin-theme/_admin-commons.sass */ /* line 35, admin-theme/_admin-commons.sass */
.nav-tabs li a { .nav-tabs li a {
font-size: 1.1em; font-size: 1.1em;
font-family: "Ubuntu", sans-serif; font-family: "Ubuntu", sans-serif;
text-transform: uppercase; text-transform: uppercase;
font-weight: 300; } font-weight: 300; }
/* line 39, admin-theme/_admin-commons.sass */ /* line 41, admin-theme/_admin-commons.sass */
.nav-tabs li.active a, .nav-tabs li.active a:hover { .nav-tabs li.active a, .nav-tabs li.active a:hover {
background-color: white; } background-color: white; }
/* line 42, admin-theme/_admin-commons.sass */ /* line 44, admin-theme/_admin-commons.sass */
.alert.alert-danger, #carrier_wizard .wizard_error { .alert.alert-danger, #carrier_wizard .wizard_error {
padding-left: 60px; padding-left: 60px;
position: relative; } position: relative; }
/* line 45, admin-theme/_admin-commons.sass */ /* line 47, admin-theme/_admin-commons.sass */
.alert.alert-danger:before, #carrier_wizard .wizard_error:before { .alert.alert-danger:before, #carrier_wizard .wizard_error:before {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -8224,7 +8229,31 @@ a.link-social:hover {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
content: "\f00d"; } content: "\f00d"; }
/* line 61, admin-theme/_admin-commons.sass */ /* line 62, admin-theme/_admin-commons.sass */
.alert.alert-success, #carrier_wizard .alert-success.wizard_error {
padding-left: 60px;
position: relative; }
/* line 65, admin-theme/_admin-commons.sass */
.alert.alert-success:before, #carrier_wizard .alert-success.wizard_error:before {
position: absolute;
top: 0;
left: 10px;
display: block;
min-height: 25px;
min-width: 25px;
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
font-size: 35px;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
content: "\f00c"; }
/* line 81, admin-theme/_admin-commons.sass */
.panel .panel-footer, #header_notifs_icon_wrapper .notifs_panel .panel-footer, #dash_version .panel-footer, #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer {
margin: 0 -20px -20px; }
/* line 86, admin-theme/_admin-commons.sass */
.overflow-y { .overflow-y {
height: 200px; height: 200px;
overflow-y: auto; } overflow-y: auto; }
@@ -9099,6 +9128,14 @@ textarea {
font-weight: 700; font-weight: 700;
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 174, admin-theme/_admin-date-range-picker.sass */ /* line 174, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.end-selected.start-selected.range-compare {
background-color: #4ca0b1;
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0; }
/* line 177, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.end-selected-compare.start-selected-compare { #datepicker .daterangepicker td.end-selected-compare.start-selected-compare {
color: white; color: white;
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
@@ -9108,24 +9145,32 @@ textarea {
border-radius: 15px; border-radius: 15px;
font-weight: 700; font-weight: 700;
background-color: #ff8000; } background-color: #ff8000; }
/* line 179, admin-theme/_admin-date-range-picker.sass */ /* line 182, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.end-selected-compare.start-selected-compare.range {
background-color: #ba924c;
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0; }
/* line 185, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range { #datepicker .daterangepicker td.range {
color: #cef1ff; color: #cef1ff;
background-color: #1bbdff; } background-color: #1bbdff; }
/* line 182, admin-theme/_admin-date-range-picker.sass */ /* line 188, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range.range-compare { #datepicker .daterangepicker td.range.range-compare {
background-color: #8dab99; } background-color: #8dab99; }
/* line 184, admin-theme/_admin-date-range-picker.sass */ /* line 190, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range-compare { #datepicker .daterangepicker td.range-compare {
color: #fff2e5; color: #fff2e5;
background-color: #ff9933; } background-color: #ff9933; }
/* line 187, admin-theme/_admin-date-range-picker.sass */ /* line 193, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range-compare.range { #datepicker .daterangepicker td.range-compare.range {
background-color: #8dab99; } background-color: #8dab99; }
/* line 189, admin-theme/_admin-date-range-picker.sass */ /* line 195, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.today { #datepicker .daterangepicker td.today {
background-color: white; } background-color: white; }
/* line 191, admin-theme/_admin-date-range-picker.sass */ /* line 197, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span { #datepicker .daterangepicker td span {
padding: 0; padding: 0;
display: block; display: block;
@@ -9136,31 +9181,31 @@ textarea {
float: left; float: left;
text-transform: uppercase; text-transform: uppercase;
cursor: pointer; } cursor: pointer; }
/* line 201, admin-theme/_admin-date-range-picker.sass */ /* line 207, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span:hover { #datepicker .daterangepicker td span:hover {
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 203, admin-theme/_admin-date-range-picker.sass */ /* line 209, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span.active { #datepicker .daterangepicker td span.active {
background-color: #00a4e7; background-color: #00a4e7;
color: white; } color: white; }
/* line 206, admin-theme/_admin-date-range-picker.sass */ /* line 212, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span.old { #datepicker .daterangepicker td span.old {
color: #cccccc; } color: #cccccc; }
/* line 209, admin-theme/_admin-date-range-picker.sass */ /* line 215, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker th.switch { #datepicker .daterangepicker th.switch {
width: 145px; } width: 145px; }
/* line 211, admin-theme/_admin-date-range-picker.sass */ /* line 217, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker th.next, #datepicker .daterangepicker th.prev { #datepicker .daterangepicker th.next, #datepicker .daterangepicker th.prev {
font-size: 1.3em; } font-size: 1.3em; }
/* line 213, admin-theme/_admin-date-range-picker.sass */ /* line 219, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker thead tr:first-child th { #datepicker .daterangepicker thead tr:first-child th {
cursor: pointer; } cursor: pointer; }
/* line 217, admin-theme/_admin-date-range-picker.sass */ /* line 223, admin-theme/_admin-date-range-picker.sass */
.chevron-left, .chevron-right { .chevron-left, .chevron-right {
position: relative; } position: relative; }
/* line 219, admin-theme/_admin-date-range-picker.sass */ /* line 225, admin-theme/_admin-date-range-picker.sass */
.chevron-left:before, .chevron-right:before { .chevron-left:before, .chevron-right:before {
display: block; display: block;
content: ""; content: "";
@@ -9169,7 +9214,7 @@ textarea {
border-style: solid; border-style: solid;
position: absolute; } position: absolute; }
/* line 226, admin-theme/_admin-date-range-picker.sass */ /* line 232, admin-theme/_admin-date-range-picker.sass */
.chevron-left:before { .chevron-left:before {
right: 0; right: 0;
top: 0; top: 0;
@@ -9177,7 +9222,7 @@ textarea {
border-color: transparent transparent transparent #00a4e7; border-color: transparent transparent transparent #00a4e7;
background-color: #1bbdff; } background-color: #1bbdff; }
/* line 232, admin-theme/_admin-date-range-picker.sass */ /* line 238, admin-theme/_admin-date-range-picker.sass */
.chevron-right:before { .chevron-right:before {
left: 0; left: 0;
top: 0; top: 0;
@@ -9185,7 +9230,7 @@ textarea {
border-color: transparent transparent transparent #1bbdff; border-color: transparent transparent transparent #1bbdff;
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 238, admin-theme/_admin-date-range-picker.sass */ /* line 244, admin-theme/_admin-date-range-picker.sass */
.input-complete { .input-complete {
-webkit-animation: one 0.2s ease-in-out; -webkit-animation: one 0.2s ease-in-out;
-moz-animation: one 0.2s ease-in-out; -moz-animation: one 0.2s ease-in-out;
@@ -9194,21 +9239,21 @@ textarea {
animation: one 0.2s ease-in-out; } animation: one 0.2s ease-in-out; }
@-webkit-keyframes one { @-webkit-keyframes one {
/* line 246, admin-theme/_admin-date-range-picker.sass */ /* line 252, admin-theme/_admin-date-range-picker.sass */
0% { 0% {
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 248, admin-theme/_admin-date-range-picker.sass */ /* line 254, admin-theme/_admin-date-range-picker.sass */
100% { 100% {
background-color: white; } } background-color: white; } }
@-webkit-keyframes two { @-webkit-keyframes two {
/* line 252, admin-theme/_admin-date-range-picker.sass */ /* line 258, admin-theme/_admin-date-range-picker.sass */
0% { 0% {
-webkit-box-shadow: #00a4e7 0 0 0 20px inset; -webkit-box-shadow: #00a4e7 0 0 0 20px inset;
box-shadow: #00a4e7 0 0 0 20px inset; } box-shadow: #00a4e7 0 0 0 20px inset; }
/* line 254, admin-theme/_admin-date-range-picker.sass */ /* line 260, admin-theme/_admin-date-range-picker.sass */
100% { 100% {
-webkit-box-shadow: #00a4e7 0 0 0 inset; -webkit-box-shadow: #00a4e7 0 0 0 inset;
box-shadow: #00a4e7 0 0 0 inset; } } box-shadow: #00a4e7 0 0 0 inset; } }
admin-dev/themes/default/css/admin-theme/_admin-commons.sass
+25
View File
@@ -13,6 +13,8 @@
.row-margin-bottom .row-margin-bottom
margin-bottom: 15px margin-bottom: 15px
.row-padding-top
padding-top: 15px
.thumbnail .thumbnail
background-color: white background-color: white
@@ -57,6 +59,29 @@
-webkit-font-smoothing: antialiased -webkit-font-smoothing: antialiased
content: "\f00d" content: "\f00d"
.alert.alert-success
padding-left: 60px
position: relative
&:before
position: absolute
top: 0
left: 10px
display: block
min-height: 25px
min-width: 25px
font-family: FontAwesome
font-weight: normal
font-style: normal
font-size: 35px
text-decoration: inherit
-webkit-font-smoothing: antialiased
content: "\f00c"
.panel
.panel-footer
margin: 0 -20px -20px
.overflow-y .overflow-y
height: 200px height: 200px
admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass
+6
View File
@@ -171,11 +171,17 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
+border-radius(15px) +border-radius(15px)
font-weight: 700 font-weight: 700
background-color: $color-calendar-day-selected background-color: $color-calendar-day-selected
&.range-compare
background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%)
+border-radius(0)
&.end-selected-compare.start-selected-compare &.end-selected-compare.start-selected-compare
color: $color-bright color: $color-bright
+border-radius(15px) +border-radius(15px)
font-weight: 700 font-weight: 700
background-color: $color-calendar-day-selected-compare background-color: $color-calendar-day-selected-compare
&.range
background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%)
+border-radius(0)
&.range &.range
color: lighten($color-calendar-range,35%) color: lighten($color-calendar-range,35%)
background-color: $color-calendar-range background-color: $color-calendar-range
admin-dev/themes/default/css/admin-theme/_admin-nav.sass
+2 -3
View File
@@ -1,5 +1,5 @@
#nav-sidebar #nav-sidebar
float: left position: fixed
width: 240px width: 240px
height: 100%!important height: 100%!important
overflow-y: auto overflow-y: auto
@@ -35,7 +35,6 @@
i i
color: black color: black
background-color: white background-color: white
&.active &.active
a.title:hover a.title:hover
color: contrast-color($main-color, white, #333, 10%) color: contrast-color($main-color, white, #333, 10%)
@@ -97,7 +96,6 @@
background-color: transparent background-color: transparent
@extend .icon-angle-down @extend .icon-angle-down
@include text-shadow(lighten($main-color,10%) 1px 1px 0) @include text-shadow(lighten($main-color,10%) 1px 1px 0)
&:hover &:hover
color: white color: white
@include text-shadow(darken($main-color,20%) -1px -1px 0) @include text-shadow(darken($main-color,20%) -1px -1px 0)
@@ -234,6 +232,7 @@
.page-sidebar-closed .page-sidebar-closed
#nav-sidebar #nav-sidebar
overflow: visible
width: 50px width: 50px
@include transition-property(width) @include transition-property(width)
@include transition-duration(0.4s) @include transition-duration(0.4s)
admin-dev/themes/default/css/admin-theme/_ladda-theme.sass
-27
View File
@@ -1,27 +0,0 @@
$green: #2aca76
$blue: #53b5e6
$red: #ea8557
$purple: #9973C2
$mint: #16a085
.ladda-button
&[disabled],
&[data-loading]
border-color: rgba( 0, 0, 0, 0.07 )
cursor: default
background-color: #999
&:hover
cursor: default
background-color: #999
&[data-size=xs]
padding: 4px 8px
.ladda-label
font-size: 0.7em
&[data-size=s]
padding: 6px 10px
.ladda-label
font-size: 0.9em
&[data-size=l] .ladda-label
font-size: 1.2em
&[data-size=xl] .ladda-label
font-size: 1.5em
admin-dev/themes/default/js/date-range-picker.js
+4
View File
@@ -307,6 +307,10 @@
} }
if (endCompare && startCompare) { if (endCompare && startCompare) {
$(this).removeClass("range-compare")
.removeClass("start-selected-compare")
.removeClass("end-selected-compare");
if(date_val > startCompare && date_val < endCompare) { if(date_val > startCompare && date_val < endCompare) {
$(this).not(".old").not(".new").addClass("range-compare"); $(this).not(".old").not(".new").addClass("range-compare");
} }
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+1 -1
View File
@@ -60,7 +60,7 @@
html.append($('<li>').html(file)) html.append($('<li>').html(file))
}); });
$('#changedFiles') $('#changedFiles')
.append($('<h3>').html(lang+' ('+json[key].length+')')) .append($('<h4>').html(lang+' ('+json[key].length+')'))
.append(html); .append(html);
} }
}); });
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+6 -1
View File
@@ -32,7 +32,12 @@
{/if} {/if}
{$smarty.block.parent} {$smarty.block.parent}
{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'} {if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'}
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache & Autoload cache'}</a> <div class="clearfix row-padding-top">
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default" href="">
<i class="icon-eraser"></i>
{l s='Clear Smarty cache & Autoload cache'}
</a>
</div>
{/if} {/if}
{/block} {/block}
admin-dev/themes/default/template/controllers/products/informations.tpl
+29 -27
View File
@@ -94,8 +94,10 @@
<div id="warn_virtual_combinations" class="alert alert-warning" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div> <div id="warn_virtual_combinations" class="alert alert-warning" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="simple_product">{$bullet_common_field} {l s='Type:'}</label> <label class="control-label col-lg-3" for="simple_product">
{$bullet_common_field} {l s='Type:'}
</label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="radio"> <div class="radio">
<label for="simple_product"> <label for="simple_product">
@@ -120,7 +122,7 @@
<hr/> <hr/>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3 required" for="name_{$id_lang}"> <label class="control-label col-lg-3 required" for="name_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='Invalid characters:'} &lt;&gt;;=#{}"> title="{l s='Invalid characters:'} &lt;&gt;;=#{}">
@@ -128,18 +130,16 @@
</span> </span>
</label> </label>
<div class="col-lg-5"> <div class="col-lg-5">
<div class="row"> {include file="controllers/products/input_text_lang.tpl"
{include file="controllers/products/input_text_lang.tpl" languages=$languages
languages=$languages input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText" input_value=$product->name
input_value=$product->name input_name="name"
input_name="name" }
}
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="reference"> <label class="control-label col-lg-3" for="reference">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='Special characters allowed:'} .-_#\"> title="{l s='Special characters allowed:'} .-_#\">
@@ -151,7 +151,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="ean13"> <label class="control-label col-lg-3" for="ean13">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='(Europe, Japan)'}"> title="{l s='(Europe, Japan)'}">
@@ -163,7 +163,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="upc"> <label class="control-label col-lg-3" for="upc">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='(US, Canada)'}"> title="{l s='(US, Canada)'}">
@@ -178,7 +178,7 @@
<hr/> <hr/>
{* status informations *} {* status informations *}
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3"> <label class="control-label col-lg-3">
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""} {include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
{l s='Status:'} {l s='Status:'}
@@ -187,18 +187,20 @@
<span class="switch prestashop-switch"> <span class="switch prestashop-switch">
<input onclick="toggleDraftWarning(false);showOptions(true);showRedirectProductOptions(false);" type="radio" name="active" id="active_on" value="1" {if $product->active || !$product->isAssociatedToShop()}checked="checked" {/if} /> <input onclick="toggleDraftWarning(false);showOptions(true);showRedirectProductOptions(false);" type="radio" name="active" id="active_on" value="1" {if $product->active || !$product->isAssociatedToShop()}checked="checked" {/if} />
<label for="active_on" class="radioCheck"> <label for="active_on" class="radioCheck">
<i class="icon-check-sign"></i> {l s='Enabled'} <i class="icon-check-sign text-success"></i>
{l s='Enabled'}
</label> </label>
<input onclick="toggleDraftWarning(true);showOptions(false);showRedirectProductOptions(true);" type="radio" name="active" id="active_off" value="0" {if !$product->active && $product->isAssociatedToShop()}checked="checked"{/if} /> <input onclick="toggleDraftWarning(true);showOptions(false);showRedirectProductOptions(true);" type="radio" name="active" id="active_off" value="0" {if !$product->active && $product->isAssociatedToShop()}checked="checked"{/if} />
<label for="active_off" class="radioCheck"> <label for="active_off" class="radioCheck">
<i class="icon-ban-circle"></i> {l s='Disabled'} <i class="icon-ban-circle text-danger"></i>
{l s='Disabled'}
</label> </label>
<span class="slide-button btn btn-default"></span> <span class="slide-button btn btn-default"></span>
</span> </span>
</div> </div>
</div> </div>
<div class="row redirect_product_options" style="display:none"> <div class="form-group redirect_product_options" style="display:none">
<label class="control-label col-lg-3" for="redirect_type"> <label class="control-label col-lg-3" for="redirect_type">
{include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""} {include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""}
{l s='Redirect when disabled'} {l s='Redirect when disabled'}
@@ -211,7 +213,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="row redirect_product_options" style="display:none"> <div class="form-group redirect_product_options" style="display:none">
<div class="col-lg-9 col-lg-offset-3"> <div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info"> <div class="alert alert-info">
{l s='404 Not Found = Do not redirect and display a 404 page'}<br/> {l s='404 Not Found = Do not redirect and display a 404 page'}<br/>
@@ -221,7 +223,7 @@
</div> </div>
</div> </div>
<div class="row redirect_product_options redirect_product_options_product_choise" style="display:none"> <div class="form-group redirect_product_options redirect_product_options_product_choise" style="display:none">
<label class="control-label col-lg-3" for="related_product_autocomplete_input"> <label class="control-label col-lg-3" for="related_product_autocomplete_input">
{include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""} {include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""}
{l s='Related product:'} {l s='Related product:'}
@@ -248,7 +250,7 @@
</script> </script>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="visibility"> <label class="control-label col-lg-3" for="visibility">
{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"} {include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
{l s='Visibility:'} {l s='Visibility:'}
@@ -263,7 +265,7 @@
</div> </div>
</div> </div>
<div id="product_options" class="row" {if !$product->active}style="display:none"{/if} > <div id="product_options" class="form-group" {if !$product->active}style="display:none"{/if} >
<div class="col-lg-12"> <div class="col-lg-12">
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="available_for_order"> <label class="control-label col-lg-3" for="available_for_order">
@@ -347,7 +349,7 @@
</div> </div>
{if $images} {if $images}
<div class="row"> <div class="form-group">
<div class="col-lg-9 col-lg-offset-3"> <div class="col-lg-9 col-lg-offset-3">
<div class="alert alert-info"> <div class="alert alert-info">
{l s='Would you like to add an image in your description?'} {l s='Would you like to add an image in your description?'}
@@ -357,7 +359,7 @@
</div> </div>
<div id="createImageDescription" class="panel" style="display:none"> <div id="createImageDescription" class="panel" style="display:none">
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="smallImage_0">{l s='Select your image:'}</label> <label class="control-label col-lg-3" for="smallImage_0">{l s='Select your image:'}</label>
<div class="col-lg-9"> <div class="col-lg-9">
<ul class="list-inline"> <ul class="list-inline">
@@ -372,7 +374,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label> <label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label>
<div class="col-lg-5"> <div class="col-lg-5">
<p class="checkbox"> <p class="checkbox">
@@ -385,7 +387,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="imageTypes_0">{l s='Select the type of picture:'}</label> <label class="control-label col-lg-3" for="imageTypes_0">{l s='Select the type of picture:'}</label>
<div class="col-lg-5"> <div class="col-lg-5">
{foreach from=$imagesTypes key=key item=type} {foreach from=$imagesTypes key=key item=type}
@@ -398,7 +400,7 @@
{/foreach} {/foreach}
</div> </div>
</div> </div>
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="resultImage"> <label class="control-label col-lg-3" for="resultImage">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='The tag to copy/paste into the description.'}"> title="{l s='The tag to copy/paste into the description.'}">
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+8 -6
View File
@@ -25,12 +25,14 @@
{foreach from=$languages item=language} {foreach from=$languages item=language}
{if $languages|count > 1} {if $languages|count > 1}
<div class="translatable-field lang-{$language.id_lang}"> <div class="translatable-field row lang-{$language.id_lang}">
<div class="col-lg-9"> <div class="col-lg-9">
{/if} {/if}
{if isset($maxchar)} {if isset($maxchar)}
<div class="input-group"> <div class="input-group">
<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon"><span class="text-count-down">{$maxchar}</span></span> <span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon">
<span class="text-count-down">{$maxchar}</span>
</span>
{/if} {/if}
<input type="text" <input type="text"
id="{$input_name}_{$language.id_lang}" id="{$input_name}_{$language.id_lang}"
@@ -42,8 +44,8 @@
{if isset($maxchar)} data-maxchar="{$maxchar}"{/if} {if isset($maxchar)} data-maxchar="{$maxchar}"{/if}
{if isset($maxlength)} maxlength="{$maxlength}"{/if} /> {if isset($maxlength)} maxlength="{$maxlength}"{/if} />
{if isset($maxchar)} {if isset($maxchar)}
</div> </div>
{/if} {/if}
{if $languages|count > 1} {if $languages|count > 1}
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+21 -10
View File
@@ -191,7 +191,15 @@
datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1)); datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1));
} }
}).data('daterangepicker'); }).data('daterangepicker');
{/literal}
startDate = parseDate($("#date-start").val(), parseFormat('{$date_format}'));
endDate = parseDate($("#date-end").val(), parseFormat('{$date_format}'));
if (startDate.getFullYear() == endDate.getFullYear() && startDate.getMonth() == endDate.getMonth())
datepickerStart.setValue(startDate.setMonth(startDate.getMonth()-1));
{literal}
var datepickerEnd = $('.datepicker2').daterangepicker({ var datepickerEnd = $('.datepicker2').daterangepicker({
"dates": translated_dates, "dates": translated_dates,
"weekStart": 1, "weekStart": 1,
@@ -220,6 +228,7 @@
$("#date-start-compare").focus(function() { $("#date-start-compare").focus(function() {
datepickerStart.setCompare(true); datepickerStart.setCompare(true);
datepickerEnd.setCompare(true); datepickerEnd.setCompare(true);
$('#compare-options').val(3);
$(".date-input").removeClass("input-selected"); $(".date-input").removeClass("input-selected");
$(this).addClass("input-selected"); $(this).addClass("input-selected");
}); });
@@ -227,6 +236,7 @@
$("#date-end-compare").focus(function() { $("#date-end-compare").focus(function() {
datepickerStart.setCompare(true); datepickerStart.setCompare(true);
datepickerEnd.setCompare(true); datepickerEnd.setCompare(true);
$('#compare-options').val(3);
$(".date-input").removeClass("input-selected"); $(".date-input").removeClass("input-selected");
$(this).addClass("input-selected"); $(this).addClass("input-selected");
}); });
@@ -241,16 +251,9 @@
$('#datepicker-compare').click(function() { $('#datepicker-compare').click(function() {
if ($(this).attr("checked")) { if ($(this).attr("checked")) {
if ($("#date-start-compare").val().replace(/^\s+|\s+$/g, '').length == 0) $('#compare-options').trigger('change');
$('#compare-options').trigger('change');
datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
$('#form-date-body-compare').show(); $('#form-date-body-compare').show();
$('#compare-options').prop('disabled', false); $('#compare-options').prop('disabled', false);
$('#date-start-compare').focus();
} else { } else {
datepickerStart.setStartCompare(null); datepickerStart.setStartCompare(null);
datepickerStart.setEndCompare(null); datepickerStart.setEndCompare(null);
@@ -268,8 +271,16 @@
if (this.value == 2) if (this.value == 2)
setPreviousYear(); setPreviousYear();
$('#date-start-compare').focus(); datepickerStart.setStartCompare($("#date-start-compare").val());
datepickerStart.setEndCompare($("#date-end-compare").val());
datepickerEnd.setStartCompare($("#date-start-compare").val());
datepickerEnd.setEndCompare($("#date-end-compare").val());
datepickerStart.setCompare(true);
datepickerEnd.setCompare(true);
if (this.value == 3)
$('#date-start-compare').focus();
}); });
if ($('#datepicker-compare').attr("checked")) if ($('#datepicker-compare').attr("checked"))
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -256,7 +256,7 @@
-- --
{else} {else}
{if $params.type == 'bool'} {if $params.type == 'bool'}
<select class="filter" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}"> <select class="filter fixed-width-sm" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
<option value="">--</option> <option value="">--</option>
<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option> <option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option> <option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
admin-dev/themes/default/template/nav.tpl
+1 -2
View File
@@ -1,4 +1,4 @@
<nav id="nav-sidebar" data-spy="affix" data-offset-top="0" role="navigation"> <nav id="nav-sidebar" role="navigation">
{if !$tab} {if !$tab}
<div class="mainsubtablist" style="display:none"></div> <div class="mainsubtablist" style="display:none"></div>
{/if} {/if}
@@ -31,5 +31,4 @@
{/if} {/if}
{/foreach} {/foreach}
</ul> </ul>
</nav> </nav>
controllers/admin/AdminFeaturesController.php
+11 -28
View File
@@ -31,10 +31,10 @@ class AdminFeaturesControllerCore extends AdminController
public function __construct() public function __construct()
{ {
$this->table = 'feature'; $this->table = 'feature';
$this->className = 'Feature'; $this->className = 'Feature';
$this->list_id = 'feature'; $this->list_id = 'feature';
$this->lang = true; $this->lang = true;
$this->fields_list = array( $this->fields_list = array(
'id_feature' => array( 'id_feature' => array(
@@ -63,7 +63,7 @@ class AdminFeaturesControllerCore extends AdminController
) )
); );
$this->bulk_actions = array( $this->bulk_actions = array(
'delete' => array( 'delete' => array(
'text' => $this->l('Delete selected'), 'text' => $this->l('Delete selected'),
'icon' => $this->l('icon-trash'), 'icon' => $this->l('icon-trash'),
@@ -82,15 +82,15 @@ class AdminFeaturesControllerCore extends AdminController
$this->addRowAction('edit'); $this->addRowAction('edit');
$this->addRowAction('delete'); $this->addRowAction('delete');
$this->addRowAction('view'); $this->addRowAction('view');
$this->_defaultOrderBy = 'position'; $this->_defaultOrderBy = 'position';
// Added specific button in toolbar // Added specific button in toolbar
$this->toolbar_btn['newAttributes'] = array( $this->toolbar_btn['newAttributes'] = array(
'href' => self::$currentIndex.'&amp;addfeature_value&amp;token='.$this->token, 'href' => self::$currentIndex.'&amp;addfeature_value&amp;token='.$this->token,
'desc' => $this->l('Add new feature values') 'desc' => $this->l('Add new feature values')
); );
$this->toolbar_btn['new'] = array( $this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;addfeature&amp;token='.$this->token, 'href' => self::$currentIndex.'&amp;addfeature&amp;token='.$this->token,
'desc' => $this->l('Add a new feature') 'desc' => $this->l('Add a new feature')
); );
@@ -137,6 +137,7 @@ class AdminFeaturesControllerCore extends AdminController
} }
$this->feature_name = $obj->name; $this->feature_name = $obj->name;
$this->toolbar_title = $this->feature_name;
$this->fields_list = array( $this->fields_list = array(
'id_feature_value' => array( 'id_feature_value' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
@@ -149,27 +150,9 @@ class AdminFeaturesControllerCore extends AdminController
); );
$this->_where = sprintf('AND `id_feature` = %d', (int)$id); $this->_where = sprintf('AND `id_feature` = %d', (int)$id);
self::$currentIndex = self::$currentIndex.'&id_feature='.(int)$id.'&viewfeature';
// get list and force no limit clause in the request $this->processFilter();
$this->getList($this->context->language->id, 'id_feature_value', 'ASC'); return parent::renderList();
// Render list
$helper = new HelperList();
$helper->actions = $this->actions;
$helper->no_link = true;
$helper->shopLinkType = '';
$helper->identifier = $this->identifier;
$helper->toolbar_scroll = false;
$helper->currentIndex = self::$currentIndex;
$helper->token = $this->token;
$helper->table = $this->table;
$helper->simple_header = true;
$helper->show_toolbar = false;
$helper->bulk_actions = $this->bulk_actions;
$content = $helper->generateList($this->_list, $this->fields_list);
echo Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content));
exit;
} }
} }
controllers/admin/AdminGroupsController.php
+22
View File
@@ -205,6 +205,8 @@ class AdminGroupsControllerCore extends AdminController
$this->lang = false; $this->lang = false;
$this->list_id = 'customer_group'; $this->list_id = 'customer_group';
$this->actions = array(); $this->actions = array();
$this->addRowAction('edit');
$this->identifier = 'id_customer';
$this->bulk_actions = false; $this->bulk_actions = false;
$this->list_no_link = true; $this->list_no_link = true;
$this->fields_list = (array( $this->fields_list = (array(
@@ -553,4 +555,24 @@ class AdminGroupsControllerCore extends AdminController
$this->displayInformation($default_group_information); $this->displayInformation($default_group_information);
return parent::renderList(); return parent::renderList();
} }
public function displayEditLink($token = null, $id, $name = null)
{
$tpl = $this->createTemplate('helpers/list/list_action_edit.tpl');
if (!array_key_exists('Edit', self::$cache_lang))
self::$cache_lang['Edit'] = $this->l('Edit', 'Helper');
$href = self::$currentIndex.'&'.$this->identifier.'='.$id.'&update'.$this->table.'&token='.($token != null ? $token : $this->token);
if ($this->display == 'view')
$href = Context::getContext()->link->getAdminLink('AdminCustomers').'&id_customer='.(int)$id.'&updatecustomer';
$tpl->assign(array(
'href' => $href,
'action' => self::$cache_lang['Edit'],
'id' => $id
));
return $tpl->fetch();
}
} }
modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
<ul class="data_list_large"> <ul class="data_list_large">
<li> <li>
<span class="data_label size_l"> <span class="data_label size_l">
{l s='Online Visitor' mod='dashactivity'} {l s='Online Visitors' mod='dashactivity'}
<small class="text-muted"><br/> <small class="text-muted"><br/>
{l s='In the last 30 minutes' mod='dashactivity'} {l s='In the last 30 minutes' mod='dashactivity'}
</small> </small>