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

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

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-20 17:29:46 +01:00
parent 12f3a150a7 9e2dac8ece
commit 5b6cfa3cdb
207 changed files with 3200 additions and 4213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1836 -2497
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme/_admin-backward.css
+1
View File
@@ -0,0 +1 @@
#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
admin-dev/themes/default/css/backward-admin-bootstrap-reset.css
+1 -1
View File
@@ -1 +1 @@
#nobootstrap{width:100%;background-color:#fff;margin:-20px 0 0 -20px;padding:20px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap fieldset h1,#nobootstrap fieldset h2,#nobootstrap fieldset h3,#nobootstrap fieldset h4,#nobootstrap fieldset h5,#nobootstrap fieldset h6{margin:0 !important;padding:0 !important;background-color:transparent !important;border:none !important;text-transform:none !important}#nobootstrap a{line-height:normal}#nobootstrap .categorieList a{line-height:20px}#nobootstrap p{line-height:normal}#nobootstrap legend{font-size:13px;line-height:20px;width:auto}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px;border-radius:none !important}#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"]{margin:0}#nobootstrap input[type="text"]{height:14px !important}#nobootstrap table.table{margin:0;padding:0;width:100%;border-collapse:collapse}#nobootstrap table.widthfull{width:100%}#nobootstrap .table thead th{vertical-align:top}#nobootstrap .table th,#nobootstrap .table td{line-height:normal;vertical-align:middle;border-top:none}#nobootstrap [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}
#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
admin-dev/themes/default/css/backward-admin-old.css
+707 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/scss/admin-theme.sass
+73 -139
View File
@@ -1,150 +1,84 @@
//Compass is required to pre-compile this stylesheets to .css
@import "compass"
@import "admin-theme/admin-theme-colors"
@import "admin-theme/_bootstrap-variables"
@import "admin-theme/_bootstrap-init"
@import "admin-theme/_font-awesome"
@import "admin-theme/animate"
@import "admin-theme/bootstrap-variables"
@import "admin-theme/font-awesome"
@import "admin-theme/vendor/animate"
html, body
min-height: 100%
height: 100%
//Bootstrap from bower-components
#header
z-index: 20
#main
z-index: 10
float: left
width: 100%
min-height: 100%
padding: 36px 0 60px
margin: 0 0 -60px 0
background-color: $bg-content-color
background-image: url('../img/patterns/bedge_grunge.png') // texture
//Bootstrap Core : Variables + Mixins + Reset + Print
@import "../bower_components/sass-bootstrap/lib/variables"
@import "../bower_components/sass-bootstrap/lib/mixins"
@import "../bower_components/sass-bootstrap/lib/normalize"
@import "../bower_components/sass-bootstrap/lib/print"
#content
padding: 80px 10px 0
@include transition-property(margin)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
.panel
padding: 20px
margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%)
background-color: lighten($bg-content-color,20%)
@include border-radius(5px)
@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
.panel-heading
@extend h3
h3:not(.modal-title), .panel-heading
border: none
padding: 0 5px
margin: -16px -16px 15px -16px
color: contrasted($bg-panel-heading-color)
font-size: 1.2em
line-height: 30px
font-weight: 300
text-transform: uppercase
background-color: white
border-bottom: solid 1px #ccc
i, a
color: contrasted($bg-panel-heading-color)
.badge
background-color: $brand-primary
+border-radius(0)
height: 29px
line-height: 25px
font-size: 1.3em
margin-right: 7px
font-weight: 300
float: left
margin-left: -5px
.panel-heading-action
@extend .pull-right
margin-right: -5px
a.list-toolbar-btn
float: left
height: 30px
width: 30px
color: $brand-primary
border-left: solid 1px #ccc
&:hover
text-decoration: none
color: black
i
text-align: center
font-size: 1.3em
line-height: 30px
.panel-danger .panel-heading
background-color: $badge-notif-color!important
form .alert
clear: both
@media (max-width: $screen-phone)
margin: 0
padding: 80px 5px 0
//bootstrap rules apply only on div#content.bootstrap, nav.bootstrap, header.bootstrap, footer.bootstrap
.bootstrap
// Core CSS
@import "../bower_components/sass-bootstrap/lib/scaffolding"
@import "../bower_components/sass-bootstrap/lib/type"
@import "../bower_components/sass-bootstrap/lib/code"
@import "../bower_components/sass-bootstrap/lib/grid"
@import "../bower_components/sass-bootstrap/lib/tables"
@import "../bower_components/sass-bootstrap/lib/forms"
@import "../bower_components/sass-bootstrap/lib/buttons"
// Components
@import "../bower_components/sass-bootstrap/lib/component-animations"
@import "../bower_components/sass-bootstrap/lib/glyphicons"
@import "../bower_components/sass-bootstrap/lib/dropdowns"
@import "../bower_components/sass-bootstrap/lib/button-groups"
@import "../bower_components/sass-bootstrap/lib/input-groups"
@import "../bower_components/sass-bootstrap/lib/navs"
@import "../bower_components/sass-bootstrap/lib/navbar"
@import "../bower_components/sass-bootstrap/lib/breadcrumbs"
@import "../bower_components/sass-bootstrap/lib/pagination"
@import "../bower_components/sass-bootstrap/lib/pager"
@import "../bower_components/sass-bootstrap/lib/labels"
@import "../bower_components/sass-bootstrap/lib/badges"
@import "../bower_components/sass-bootstrap/lib/jumbotron"
@import "../bower_components/sass-bootstrap/lib/thumbnails"
@import "../bower_components/sass-bootstrap/lib/alerts"
@import "../bower_components/sass-bootstrap/lib/progress-bars"
@import "../bower_components/sass-bootstrap/lib/media"
@import "../bower_components/sass-bootstrap/lib/list-group"
@import "../bower_components/sass-bootstrap/lib/panels"
@import "../bower_components/sass-bootstrap/lib/wells"
@import "../bower_components/sass-bootstrap/lib/close"
// Components w/ JavaScript
@import "../bower_components/sass-bootstrap/lib/modals"
@import "../bower_components/sass-bootstrap/lib/tooltip"
@import "../bower_components/sass-bootstrap/lib/popovers"
@import "../bower_components/sass-bootstrap/lib/carousel"
//backward
#nobootstrap
float: left
// Utility classes
@import "../bower_components/sass-bootstrap/lib/utilities"
@import "../bower_components/sass-bootstrap/lib/responsive-utilities"
//data-focus
.data-focus
&.data-focus-primary
background-color: $brand-primary
color: white
@include border-radius(10px)
//orders
#customer_part
.customerCard
&.selected-customer .panel
color: $brand-success
border: solid 2px $brand-success
//modal
body.display-modal
#content, #main
margin: 0
padding: 0
background: #F8F8F8
//todo: remove temp fix for bootstrap RC1 -> final
input[type="text"],input[type="search"],input[type="password"], textarea, select
@extend .form-control
//panels
#content
.panel
.panel-footer
margin: 15px -20px -20px
height: 73px
.panel-footer
.btn.pull-right
margin-left: 3px
//colors
.attributes-color-container
width: 40px
height: 25px
display: block
border: solid 1px black
//components
//PrestaShop Elements
@import "admin-theme/admin-content"
@import "admin-theme/admin-header"
@import "admin-theme/admin-footer"
@import "admin-theme/admin-nav"
@import "admin-theme/admin-commons"
@import "admin-theme/admin-tables"
@import "admin-theme/admin-tree"
@import "admin-theme/admin-forms"
@import "admin-theme/admin-kpi"
@import "admin-theme/admin-switch"
@import "admin-theme/admin-toolbar"
@import "admin-theme/admin-date-range-picker"
@import "admin-theme/ladda"
//page specific
@import "admin-theme/admin-login"
@import "admin-theme/admin-carrier-wizard"
@import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard"
@import "admin-theme/admin-search"
.bootstrap
//components
@import "admin-theme/admin-commons"
@import "admin-theme/admin-tables"
@import "admin-theme/admin-tree"
@import "admin-theme/admin-forms"
@import "admin-theme/admin-kpi"
@import "admin-theme/admin-switch"
@import "admin-theme/admin-toolbar"
@import "admin-theme/admin-date-range-picker"
@import "admin-theme/ladda"
//page specific
@import "admin-theme/admin-carrier-wizard"
@import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard"
@import "admin-theme/admin-search"
//backward compatibility
@import "admin-theme/admin-backward"
admin-dev/themes/default/scss/admin-theme/_admin-backward.sass
+4
View File
@@ -0,0 +1,4 @@
#content.nobootstrap
background-color: white
width: 1200px
padding: 80px 40px
admin-dev/themes/default/scss/admin-theme/_admin-content.sass
+128
View File
@@ -0,0 +1,128 @@
html
min-height: 100%
height: 100%
font-size: 62.5%
-webkit-tap-highlight-color: rgba(0,0,0,0)
body
min-height: 100%
height: 100%
font: 400 #{$font-size-base}/#{$line-height-base} $font-family-base
color: $text-color
background-color: $body-bg
#main
z-index: 10
float: left
width: 100%
min-height: 100%
padding: 36px 0 60px
margin: 0 0 -60px 0
background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png') // texture
#content.bootstrap
padding: 80px 10px 0
@include transition-property(margin)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
.panel
padding: 20px
margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%)
background-color: lighten($bg-content-color,20%)
@include border-radius(5px)
@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
.panel-heading
@extend h3
h3:not(.modal-title), .panel-heading
border: none
padding: 0 5px
margin: -16px -16px 15px -16px
color: contrasted($bg-panel-heading-color)
font-size: 1.2em
line-height: 30px
font-weight: 300
text-transform: uppercase
background-color: white
border-bottom: solid 1px #ccc
i, a
color: contrasted($bg-panel-heading-color)
.badge
background-color: $brand-primary
+border-radius(0)
height: 29px
line-height: 25px
font-size: 1.3em
margin-right: 7px
font-weight: 300
float: left
margin-left: -5px
.panel-heading-action
@extend .pull-right
margin-right: -5px
a.list-toolbar-btn
float: left
height: 30px
width: 30px
color: $brand-primary
border-left: solid 1px #ccc
&:hover
text-decoration: none
color: black
i
text-align: center
font-size: 1.3em
line-height: 30px
.panel-danger .panel-heading
background-color: $badge-notif-color!important
form .alert
clear: both
@media (max-width: $screen-phone)
margin: 0
padding: 80px 5px 0
//data-focus
.data-focus
&.data-focus-primary
background-color: $brand-primary
color: white
@include border-radius(10px)
//orders
#customer_part
.customerCard
&.selected-customer .panel
color: $brand-success
border: solid 2px $brand-success
//modal
body.display-modal
#content, #main
margin: 0
padding: 0
background: #F8F8F8
//todo: remove temp fix for bootstrap RC1 -> final
.bootstrap
input[type="text"],input[type="search"],input[type="password"], textarea, select
@extend .form-control
//panels
.bootstrap
.panel
.panel-footer
margin: 15px -20px -20px
height: 73px
.btn.pull-right
margin-left: 3px
#header
.panel-footer
margin: 15px 0 0!important
height: 40px!important
//colors
.attributes-color-container
width: 40px
height: 25px
display: block
border: solid 1px black
admin-dev/themes/default/scss/admin-theme/_admin-header.sass
+34 -39
View File
@@ -1,3 +1,5 @@
#header
z-index: 20
#header_infos
@extend .navbar
@extend .navbar-inverse
@@ -7,20 +9,21 @@
@extend .navbar-brand
font: 300 1.3em/100% $headings-font-family
position: relative
padding: 0 0 0 45px
margin: 0 20px 0 0
height: 37px
line-height: 37px
height: 36px
padding-left: 45px!important
line-height: 36px
img
position: absolute
top: 0
left: 0
width: 37px
height: 37px
width: 36px
height: 36px
#header_notifs_icon_wrapper
@extend .hidden-xs
@extend .nav
@extend .navbar-nav
height: 36px
li a
padding: 9px 5px
> li > a > i
@@ -47,7 +50,6 @@
margin: 0
.notifs_panel_footer
@extend .panel-footer
#header_nav_toggle
background-color: black
border: none
@@ -64,7 +66,7 @@
#header_search
@extend .navbar-form
@extend .navbar-left
width: 160px
width: 160px!important
padding: 0 0 0 10px
position: relative
@media (max-width: $screen-tablet)
@@ -77,39 +79,32 @@
top: 0
left: 10px
width: 400px
#employee_infos
.employee_name
position: relative
padding-left: 34px!important
.employee_avatar_small
height: 30px
width: 30px
display: inline-block
position: absolute
top: 4px
left: 0
img
width: 100%
height: 100%
@include border-radius(30px)
.employee_avatar
height: 100px
width: 100px
display: block
margin: 10px auto 10px auto
overflow: hidden
@include border-radius(120px)
@include box-shadow(white 0 0 0 2px, #ccc 0 0 10px 3px)
img
width: 100%
height: 100%
.employee_name
position: relative
padding-left: 34px!important
.employee_avatar_small
height: 30px
width: 30px
display: inline-block
position: absolute
top: 4px
left: 0
img
width: 100%
height: 100%
@include border-radius(30px)
.employee_avatar
height: 100px
width: 100px
display: block
margin: 10px auto
overflow: hidden
@include border-radius(120px)
@include box-shadow(white 0 0 0 2px, #ccc 0 0 10px 3px)
img
width: 100%
height: 100%
#header_quick
@extend .nav
@extend .navbar-nav
admin-dev/themes/default/scss/admin-theme/_admin-login.sass
+10 -6
View File
@@ -1,10 +1,14 @@
#login
height: 100%
height: 100%
@include background(radial-gradient(color-stops(rgba(104,128,138,.4) 10%,rgba(138,114,76,0) 40%), top left),linear-gradient(top,rgba(57,173,219,.25),rgba(42,60,87,.4)),linear-gradient(left top,#670D10,#092756))
#login-header
margin: 0 0 60px 0
padding-top: 40px
margin-bottom: 30px
color: white
h1, h4
margin: 0
padding: 0
#login-panel
margin: 0 auto
@@ -22,12 +26,13 @@
.flipper
@include transition-duration(0.6s)
@include transform-style(preserve-3d)
@include transform-style
position: relative
.front, .back
@include backface-visibility(hidden)
width: 420px
padding: 20px
position: absolute
top: 0
left: 0
@@ -88,8 +93,7 @@
-webkit-animation-name: fadeInDown
-moz-animation-name: fadeInDown
-o-animation-name: fadeInDown
animation-name: fadeInDown
//animation-name: fadeInDown
@-webkit-keyframes fadeIn
0%
@@ -119,4 +123,4 @@
-webkit-animation-name: fadeIn
-moz-animation-name: fadeIn
-o-animation-name: fadeIn
animation-name: fadeIn
//animation-name: fadeIn
admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
-1
View File
@@ -396,4 +396,3 @@
[class^="icon-Admin"]
margin-right: 6px
admin-dev/themes/default/scss/admin-theme/_admin-toolbar.sass
+7
View File
@@ -116,4 +116,11 @@
@extend .icon-refresh
.process-icon-configure
@extend .icon-cog
.process-icon-uninstall
@extend .icon-trash
.process-icon-off
@extend .icon-off
.process-icon-reset
@extend .icon-rotate-left
admin-dev/themes/default/scss/admin-theme/_bootstrap-init.scss
-59
View File
@@ -1,59 +0,0 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
// Core variables and mixins
@import "../bower_components/sass-bootstrap/lib/variables";
@import "../bower_components/sass-bootstrap/lib/mixins";
// Reset
@import "../bower_components/sass-bootstrap/lib/normalize";
@import "../bower_components/sass-bootstrap/lib/print";
// Core CSS
@import "../bower_components/sass-bootstrap/lib/scaffolding";
@import "../bower_components/sass-bootstrap/lib/type";
@import "../bower_components/sass-bootstrap/lib/code";
@import "../bower_components/sass-bootstrap/lib/grid";
@import "../bower_components/sass-bootstrap/lib/tables";
@import "../bower_components/sass-bootstrap/lib/forms";
@import "../bower_components/sass-bootstrap/lib/buttons";
// Components
@import "../bower_components/sass-bootstrap/lib/component-animations";
@import "../bower_components/sass-bootstrap/lib/glyphicons";
@import "../bower_components/sass-bootstrap/lib/dropdowns";
@import "../bower_components/sass-bootstrap/lib/button-groups";
@import "../bower_components/sass-bootstrap/lib/input-groups";
@import "../bower_components/sass-bootstrap/lib/navs";
@import "../bower_components/sass-bootstrap/lib/navbar";
@import "../bower_components/sass-bootstrap/lib/breadcrumbs";
@import "../bower_components/sass-bootstrap/lib/pagination";
@import "../bower_components/sass-bootstrap/lib/pager";
@import "../bower_components/sass-bootstrap/lib/labels";
@import "../bower_components/sass-bootstrap/lib/badges";
@import "../bower_components/sass-bootstrap/lib/jumbotron";
@import "../bower_components/sass-bootstrap/lib/thumbnails";
@import "../bower_components/sass-bootstrap/lib/alerts";
@import "../bower_components/sass-bootstrap/lib/progress-bars";
@import "../bower_components/sass-bootstrap/lib/media";
@import "../bower_components/sass-bootstrap/lib/list-group";
@import "../bower_components/sass-bootstrap/lib/panels";
@import "../bower_components/sass-bootstrap/lib/wells";
@import "../bower_components/sass-bootstrap/lib/close";
// Components w/ JavaScript
@import "../bower_components/sass-bootstrap/lib/modals";
@import "../bower_components/sass-bootstrap/lib/tooltip";
@import "../bower_components/sass-bootstrap/lib/popovers";
@import "../bower_components/sass-bootstrap/lib/carousel";
// Utility classes
@import "../bower_components/sass-bootstrap/lib/utilities";
@import "../bower_components/sass-bootstrap/lib/responsive-utilities";
admin-dev/themes/default/scss/admin-theme/_bootstrap-variables.scss
+3 -3
View File
@@ -73,7 +73,7 @@ $border-radius-base: 3px ;
// -------------------------
// $table-bg: transparent ; overall background-color
// $table-bg-accent: #f9f9f9 ; for striping
$table-bg-accent: #f9f9f9 ; //for striping
$table-bg-hover: $bg-panel-heading-color ;
// $table-border-color: #ddd ; table and cell border
@@ -136,8 +136,8 @@ $input-height-base: ($line-height-computed + ($padding-base-vertica
// $dropdown-link-active-bg: $component-active-bg ;
// $dropdown-link-color: $gray-dark ;
// $dropdown-link-hover-color: #fff ;
// $dropdown-link-hover-bg: $dropdown-link-active-bg ;
$dropdown-link-hover-color: white ;
$dropdown-link-hover-bg: $brand-primary ;
// Grid system
admin-dev/themes/default/scss/admin-theme/_animate.sass → admin-dev/themes/default/scss/admin-theme/vendor/_animate.sass
Vendored
View File
admin-dev/themes/default/scss/backward-admin-bootstrap-reset.sass
-63
View File
@@ -1,63 +0,0 @@
@import compass
#nobootstrap
width: 100%
background-color: white
margin: -20px 0 0 -20px
padding: 20px
@include box-sizing(content-box)
*, *:before, *:after
@include box-sizing(content-box)
fieldset
h1, h2, h3, h4, h5, h6
margin: 0!important
padding: 0!important
background-color: transparent!important
border: none!important
text-transform: none!important
a
line-height: normal
.categorieList a
line-height: 20px
p
line-height: normal
legend
font-size: 13px
line-height: 20px
width: auto
label
font-size: 13px
display: inline
line-height: normal
.breadcrumb
padding: 0
li
line-height: normal
select, textarea, input
height: inherit
label, input, button, select, textarea
font-size: 12px
line-height: 13px
border-radius: none!important
input[type="radio"], input[type="checkbox"]
margin: 0
input[type="text"]
height: 14px!important
table.table
margin: 0
padding: 0
width: 100%
border-collapse: collapse
table.widthfull
width: 100%
.table thead th
vertical-align: top
.table th, .table td
line-height: normal
vertical-align: middle
border-top: none
[class^="icon-"], [class*=" icon-"]
width: auto
.toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"]
text-indent: -9000px
overflow: hidden
admin-dev/themes/default/scss/backward-admin-old.scss
+1 -1
View File
@@ -1,4 +1,4 @@
#nobootstrap {
#content.nobootstrap {
//old admin theme
h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}
h2{font-size:1.7em}
admin-dev/themes/default/template/controllers/login/header.tpl
+2 -2
View File
@@ -46,5 +46,5 @@
<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
</head>
<body class="page-topbar">
<div id="login">
<div id="content" class="page-content">
<div id="login" class="bootstrap">
<div id="content">
admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+15 -18
View File
@@ -22,26 +22,23 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="panel">
<div class="bootstrap">
<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
<div class="row">
<div class="input-group">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{l s='Manage translations'}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$module_languages item=language}
<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
{/foreach}
</ul>
</div>
<div class="input-group">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<i class="icon-flag"></i>
{l s='Manage translations'}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$module_languages item=language}
<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
{/foreach}
</ul>
</div>
{if isset($display_multishop_checkbox) && $display_multishop_checkbox}
<div class="row">
<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if}
onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
{l s='Activate module for '}{$shop_context}
</div>
<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if}
onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
{l s='Activate module for '}{$shop_context}
{/if}
</div>
admin-dev/themes/default/template/controllers/modules/configure.tpl
+48 -46
View File
@@ -22,52 +22,54 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="page-head">
<h2 class="page-title">
{l s='Configure:'} {$module_display_name} ({$module_name})
</h2>
<div class="page-bar toolbarBox">
<div class="btn-toolbar">
<ul class="cc_button nav nav-pills pull-right">
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
<i class="process-icon-off"></i>
<div>{l s='Disable'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
<i class="process-icon-minus-sign-alt"></i>
<div>{l s='Uninstall'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
<i class="process-icon-share-alt"></i>
<div>{l s='Reset'}</div>
</a>
</li>
{if isset($module_update_link)}
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
<i class="process-icon-refresh"></i>
<div>{l s='Update'}</div>
</a>
</li>
{/if}
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
<i class="process-icon-anchor"></i>
<div>{l s='Manage hooks'}</div>
</a>
</li>
<li>
<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
<i class="process-icon-back" ></i>
<div>{l s='Back'}</div>
</a>
</li>
</ul>
<div class="bootstrap">
<div class="page-head">
<h2 class="page-title">
{l s='Configure:'} {$module_display_name} ({$module_name})
</h2>
<div class="page-bar toolbarBox">
<div class="btn-toolbar">
<ul class="cc_button nav nav-pills pull-right">
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
<i class="process-icon-off"></i>
<div>{l s='Disable'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
<i class="process-icon-uninstall"></i>
<div>{l s='Uninstall'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
<i class="process-icon-reset"></i>
<div>{l s='Reset'}</div>
</a>
</li>
{if isset($module_update_link)}
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
<i class="process-icon-refresh"></i>
<div>{l s='Update'}</div>
</a>
</li>
{/if}
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
<i class="process-icon-anchor"></i>
<div>{l s='Manage hooks'}</div>
</a>
</li>
<li>
<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
<i class="process-icon-back" ></i>
<div>{l s='Back'}</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+15 -25
View File
@@ -26,7 +26,6 @@
<div class="leadin">{block name="leadin"}{/block}</div>
<form action="{$url_submit}" id="{$table}_form" method="post" class="form-horizontal">
{if $display_key}
<input type="hidden" name="show_modules" value="{$display_key}" />
{/if}
@@ -35,9 +34,9 @@
<i class="icon-paste"></i>
{l s='Transplant a module'}
</h3>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required"> {l s='Module:'}</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="id_module" {if $edit_graft} disabled="disabled"{/if}>
{foreach $modules as $module}
<option value="{$module->id}" {if $id_module == $module->id || (!$id_module && $show_modules == $module->id)}selected="selected"{/if}>{$module->displayName|stripslashes}</option>
@@ -45,9 +44,9 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required"> {l s='Hook into'} :</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="id_hook" {if $edit_graft} disabled="disabled"{/if}>
{foreach $hooks as $hook}
<option value="{$hook['id_hook']}" {if $id_hook == $hook['id_hook']} selected="selected"{/if}>{$hook['name']}{if $hook['name'] != $hook['title']} ({$hook['title']}){/if}</option>
@@ -55,10 +54,10 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3">{l s='Exceptions'} :</label>
<div class="col-lg-6">
<div class="alert alert-warning">
<div class="col-lg-9">
<div class="well">
<p>
{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
{l s='Please input each filename, separated by a comma.'}<br />
@@ -73,22 +72,18 @@
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
{if $edit_graft}
<input type="hidden" name="id_module" value="{$id_module}" />
<input type="hidden" name="id_hook" value="{$id_hook}" />
{/if}
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
</div>
<div class="panel-footer">
{if $edit_graft}
<input type="hidden" name="id_module" value="{$id_module}" />
<input type="hidden" name="id_hook" value="{$id_hook}" />
{/if}
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
</div>
</div>
</form>
<script type="text/javascript">
//<![CDATA
function position_exception_textchange()
{
function position_exception_textchange() {
// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
var obj = $(this);
var shopID = obj.attr('id').replace(/\D/g, '');
@@ -100,21 +95,16 @@
for (var i = 0; i < len; i++)
list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
}
function position_exception_listchange()
{
function position_exception_listchange() {
var obj = $(this);
var shopID = obj.attr('id').replace(/\D/g, '');
var str = obj.val().join(', ');
obj.closest('form').find('#em_text_' + shopID).val(str);
}
$(document).ready(function(){
$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
$(this).change(position_exception_textchange).change();
});
$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
$(this).change(position_exception_listchange);
});
admin-dev/themes/default/template/footer.tpl
+16 -5
View File
@@ -27,7 +27,7 @@
</div>
{if $display_footer}
{hook h="displayBackOfficeFooter"}
<div id="footer">
<div id="footer" class="bootstrap">
<div class="col-sm-5 hidden-xs">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a> - <span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div>
@@ -47,10 +47,21 @@
</div>
<div class="col-sm-5">
<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
|&nbsp;<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Contact'}
</a>
|&nbsp;
<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Bug Tracker'}
</a>
|&nbsp;
<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Forum'}
</a>
|&nbsp;
<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Addons'}
</a>
{if $iso_is_fr}
<p>Questions / Renseignements / Formations :
<strong>+33 (0)1.40.18.30.04</strong>
admin-dev/themes/default/template/header.tpl
+9 -6
View File
@@ -102,11 +102,11 @@
{/if}
</head>
{if $display_header}
<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if} {$smarty.get.controller|escape|strtolower}">
{* begin HEADER *}
<header id="header">
{* begin HEADER *}
<header id="header" class="bootstrap">
<nav id="header_infos" role="navigation">
<div class="navbar-header">
<button id="header_nav_toggle" type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-primary">
@@ -341,12 +341,15 @@
<div id="main">
{include file='nav.tpl'}
<div id="content" class="page-content">
<div id="content" class="{if !$bootstrap}nobootstrap{else}bootstrap{/if}">
{if $install_dir_exists}
<div class="alert alert-warning">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="panel multishop_toolbar">
<div class="col-lg-12 form-horizontal">
@@ -355,10 +358,10 @@
</div>
</div>
{/if}
{* end display_header*}
{* end display_header*}
{else}
<body{if isset($lite_display) && $lite_display} class="display-modal"{/if}>
<div id="main">
<div id="content" class="page-content">
<div id="content" class="{if !$bootstrap}nobootstrap{else}bootstrap{/if}">
{/if}
admin-dev/themes/default/template/layout.tpl
-3
View File
@@ -87,8 +87,5 @@
{/if}
</div>
{/if}
{if !$bootstrap}<div id="nobootstrap">{/if}
{$page}
{if !$bootstrap}</div>{/if}
{$footer}
admin-dev/themes/default/template/nav.tpl
+1 -1
View File
@@ -1,4 +1,4 @@
<nav id="nav-sidebar" role="navigation">
<nav id="nav-sidebar" class="bootstrap" role="navigation">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
classes/Product.php
+1 -1
View File
@@ -3380,7 +3380,7 @@ class ProductCore extends ObjectModel
{
$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`');
$sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
$where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\'';
$where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\' OR pa.`ean13` LIKE \'%'.pSQL($query).'%\'';
}
$sql->where($where);
$sql->join(Product::sqlStock('p', 'pa', false, $context->shop));
classes/controller/AdminController.php
+3 -2
View File
@@ -1940,8 +1940,9 @@ class AdminControllerCore extends Controller
{
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all', 1);
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all', 2);
//$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all', 1);
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all', 2);
}
public function setMedia()
classes/tax/TaxRulesTaxManager.php
+2 -2
View File
@@ -111,10 +111,10 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface
break;
}
self::$cache_tax_calculator[$postcode.'-'.$this->type] = new TaxCalculator($taxes, $behavior);
self::$cache_tax_calculator[(int)$this->address->id_country.'-'.$postcode.'-'.$this->type] = new TaxCalculator($taxes, $behavior);
}
return self::$cache_tax_calculator[$postcode.'-'.$this->type];
return self::$cache_tax_calculator[(int)$this->address->id_country.'-'.$postcode.'-'.$this->type];
}
}
modules/themeconfigurator/images/banner-img4.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 27 KiB

modules/themeconfigurator/images/banner-img5.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 49 KiB

modules/themeconfigurator/images/banner-img6.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 41 KiB

themes/default-bootstrap/css/global.css
-60
View File
@@ -228,37 +228,6 @@ span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large,
border: none;
}
/* input button */
input.button_mini, input.button_small, input.button, input.button_large,
input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large,
input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled {
/*padding-bottom: 2px*/
}
/* disabled button */
input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled,
span.button_mini, span.button_small, span.button, span.button_large,
span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled {
/*background-position: left -36px;
cursor: default;
color: #888!important*/
}
/* exclusive button */
input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large,
input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled,
a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large,
span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled {
/*color: white!important*/
}
/* exclusive disabled button */
input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large {
/*color: #488c40!important*/
}
/* hover button */
input.button_mini:hover, input.button_small:hover, input.button:hover, input.button_large:hover,
input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover,
@@ -268,11 +237,6 @@ a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_
background-position: left -50px;
}
/* exclusive hover button */
input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover {
/*color: white!important*/
}
/* active button */
input.button_mini:active, input.button_small:active, input.button:active, input.button_large:active,
input.exclusive_mini:active, input.exclusive_small:active, input.exclusive:active, input.exclusive_large:active,
@@ -281,17 +245,6 @@ a.exclusive_mini:active, a.exclusive_small:active, a.exclusive:active, a.exclusi
background-position: left -100px;
}
/* classic buttons */
input.button_mini, input.button_mini_disabled, input.exclusive_mini, input.exclusive_mini_disabled, a.button_mini, a.exclusive_mini, span.button_mini, span.exclusive_mini {
/*width: 30px;
background-image: url('../img/button-mini.png')*/
}
input.button_small, input.button_small_disabled, input.exclusive_small, input.exclusive_small_disabled, a.button_small, a.exclusive_small, span.button_small, span.exclusive_small {
/*width: 60px;
background-image: url('../img/button-small.png')*/
}
input.button_disabled, input.exclusive_disabled, span.exclusive {
border: 1px solid #ccc;
color: #999;
@@ -299,11 +252,6 @@ input.button_disabled, input.exclusive_disabled, span.exclusive {
cursor: default;
}
input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled {
/*width: 180px;
background-image: url('../img/button-large.png')*/
}
.btn.disabled, .btn[disabled]:hover {
opacity: 0.3;
}
@@ -2972,14 +2920,6 @@ p.cheque-indent {
#manufacturer .bottom-pagination-content, #manufacturer .top-pagination-content, #supplier .bottom-pagination-content, #supplier .top-pagination-content {
min-height: 69px;
}
#manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
margin-right: 0;
}
@media (min-width: 1200px) {
#manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
margin-right: 201px;
}
}
#manufacturer .top-pagination-content.bottom-line, #supplier .top-pagination-content.bottom-line {
border-bottom: 1px solid #d6d4d4;
}
themes/default-bootstrap/css/jquery/footable.core.css
+13
View File
@@ -59,3 +59,16 @@
.footable .footable-row-detail-value {
display: table-cell;
}
.footable .footable-sortable .footable-sort-indicator:after {
float: right;
margin: 0px 0px 0 0;
content: "";
font-family: "FontAwesome";
display: block;
}
.footable .footable-sortable.footable-sorted .footable-sort-indicator:after {
content: "";
}
.footable .footable-sortable.footable-sorted-desc .footable-sort-indicator:after {
content: "";
}
themes/default-bootstrap/css/modules/tmhtmlcontent/views/css/hooks.css → themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css
+2 -2
View File
@@ -20,11 +20,11 @@
min-width: 100%;
}
}
#htmlcontent_home ul li.htmlcontent-item-4 {
#htmlcontent_home ul li.htmlcontent-item-5 {
width: 66.6667%;
}
@media (max-width: 479px) {
#htmlcontent_home ul li.htmlcontent-item-4 {
#htmlcontent_home ul li.htmlcontent-item-5 {
width: 100%;
}
}
themes/default-bootstrap/discount.tpl
+7 -7
View File
@@ -30,12 +30,12 @@
<table class="discount table table-bordered footab">
<thead>
<tr>
<th class="discount_code first_item">{l s='Code'}</th>
<th class="discount_description item">{l s='Description'}</th>
<th data-sort-ignore="true" class="discount_code first_item">{l s='Code'}</th>
<th data-sort-ignore="true" class="discount_description item">{l s='Description'}</th>
<th class="discount_quantity item">{l s='Quantity'}</th>
<th data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
<th data-hide="phone,tablet" class="discount_minimum item">{l s='Minimum'}</th>
<th data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
<th data-hide="phone" class="discount_expiration_date last_item">{l s='Expiration date'}</th>
</tr>
</thead>
@@ -44,7 +44,7 @@
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
<td class="discount_code">{$discountDetail.code}</td>
<td class="discount_description">{$discountDetail.name}</td>
<td class="discount_quantity">{$discountDetail.quantity_for_user}</td>
<td date-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
<td class="discount_value">
{if $discountDetail.id_discount_type == 1}
{$discountDetail.value|escape:'htmlall':'UTF-8'}%
@@ -56,7 +56,7 @@
-
{/if}
</td>
<td class="discount_minimum">
<td class="discount_minimum" date-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}">
{if $discountDetail.minimal == 0}
{l s='None'}
{else}
@@ -70,7 +70,7 @@
<i class="icon-remove icon"></i> {l s='No'}
{/if}
</td>
<td class="discount_expiration_date">{dateFormat date=$discountDetail.date_to}</td>
<td class="discount_expiration_date" date-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$discountDetail.date_to}</td>
</tr>
{/foreach}
</tbody>
themes/default-bootstrap/header.tpl
+2 -1
View File
@@ -29,7 +29,7 @@
<!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}">
<head>
<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
<title>{$meta_title|escape:'html':'UTF-8'}</title>
{if isset($meta_description) AND $meta_description}
<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
{/if}
@@ -88,6 +88,7 @@
<script src="{$js_dir}/jquery/highdpi.js"></script>
<script src="{$js_dir}/jquery/jquery.bxslider.js"></script>
<script src="{$js_dir}/jquery/footable.js"></script>
<script src="{$js_dir}/jquery/footable.sort.js"></script>
<script src="{$js_dir}/jquery/resonsive_utilites.js"></script>
{$HOOK_HEADER}
</head>
themes/default-bootstrap/history.tpl
+22 -7
View File
@@ -36,13 +36,13 @@
<table id="order-list" class="table table-bordered footab">
<thead>
<tr>
<th class="first_item">{l s='Order reference'}</th>
<th class="first_item" data-sort-ignore="true">{l s='Order reference'}</th>
<th class="item">{l s='Date'}</th>
<th data-hide="phone" class="item">{l s='Total price'}</th>
<th data-hide="phone,tablet" class="item">{l s='Payment'}</th>
<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Payment'}</th>
<th class="item">{l s='Status'}</th>
<th data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
<th data-hide="phone,tablet" class="last_item">&nbsp;</th>
<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
<th data-sort-ignore="true" data-hide="phone,tablet" class="last_item">&nbsp;</th>
</tr>
</thead>
<tbody>
@@ -52,10 +52,10 @@
{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Products to download'}" title="{l s='Products to download'}" />{/if}
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{Order::getUniqReferenceOf($order.id_order)}</a>
</td>
<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
<td data-value="{$order.date_add|regex_replace:"/[\-\:\ ]/":""}" class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
<td class="history_price" data-value="{$order.total_paid}"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
<td class="history_method">{$order.payment|escape:'htmlall':'UTF-8'}</td>
<td class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
<td data-value="{$order.id_order_state}" class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
<td class="history_invoice">
{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
<a class="link-button" href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}" title="{l s='Invoice'}" class="_blank"><i class="icon-file-text large"></i>{l s='PDF'}</a>
@@ -75,6 +75,21 @@
{/foreach}
</tbody>
</table>
<script type="text/javascript">
$(function () {
$('.sort-column').click(function (e) {
e.preventDefault();
//get the footable sort object
var footableSort = $('table').data('footable-sort');
//get the index we are wanting to sort by
var index = $(this).data('index');
footableSort.doSort(index, 'toggle');
});
});
</script>
<div id="block-order-detail" class="unvisible">&nbsp;</div>
{else}
<p class="alert alert-warning">{l s='You have not placed any orders.'}</p>
themes/default-bootstrap/img/address_alias_full_width.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

themes/default-bootstrap/img/address_alias_left.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 928 B

themes/default-bootstrap/img/address_alias_right.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 928 B

themes/default-bootstrap/img/arrow_right_1.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 155 B

themes/default-bootstrap/img/arrow_right_2.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 155 B

themes/default-bootstrap/img/arrow_rotate_anticlockwise.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 608 B

themes/default-bootstrap/img/bg_404.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

themes/default-bootstrap/img/bg_account.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 415 B

themes/default-bootstrap/img/bg_address_title.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 240 B

themes/default-bootstrap/img/bg_bt_newsletter_ok.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 572 B

themes/default-bootstrap/img/bg_cart_voucher_submit.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 218 B

themes/default-bootstrap/img/bg_discount_name.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 133 B

themes/default-bootstrap/img/bg_form_h3.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 254 B

themes/default-bootstrap/img/bg_gif.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

themes/default-bootstrap/img/bg_li_idTabs.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 243 B

themes/default-bootstrap/img/bg_reduction.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 212 B

themes/default-bootstrap/img/bg_search_input.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 141 B

themes/default-bootstrap/img/bg_search_submit.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 232 B

themes/default-bootstrap/img/block_bg.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 361 B

themes/default-bootstrap/img/block_bg_myaccount.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 394 B

themes/default-bootstrap/img/block_category_item_bg.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 380 B

themes/default-bootstrap/img/block_exclusive_bg.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 375 B

themes/default-bootstrap/img/block_exclusive_footer.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 744 B

themes/default-bootstrap/img/block_footer.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 261 B

themes/default-bootstrap/img/block_footer.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 207 B

themes/default-bootstrap/img/block_footer_myaccount.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 852 B

themes/default-bootstrap/img/block_footer_page.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

themes/default-bootstrap/img/block_footer_page_footer.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 357 B

themes/default-bootstrap/img/block_header.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

themes/default-bootstrap/img/block_header.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 966 B

themes/default-bootstrap/img/block_header_exclusive.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

themes/default-bootstrap/img/block_header_exclusive.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 960 B

themes/default-bootstrap/img/block_header_exclusive_cart.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

themes/default-bootstrap/img/block_header_exclusive_cart.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

themes/default-bootstrap/img/block_header_large.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

themes/default-bootstrap/img/block_header_large.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 777 B

themes/default-bootstrap/img/block_header_myaccount.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

themes/default-bootstrap/img/block_languages_top_p_bg.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 190 B

themes/default-bootstrap/img/block_myaccount_header_large.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

themes/default-bootstrap/img/block_search_bg.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

themes/default-bootstrap/img/bullet.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 85 B

themes/default-bootstrap/img/bullet_alt.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 710 B

themes/default-bootstrap/img/bullet_myaccount.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 B

themes/default-bootstrap/img/bullet_price.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 B

themes/default-bootstrap/img/button-account-large.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

themes/default-bootstrap/img/button-account-mini.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 932 B

themes/default-bootstrap/img/button-account-small.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

themes/default-bootstrap/img/button-account.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

themes/default-bootstrap/img/button-large.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

themes/default-bootstrap/img/button-large.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

themes/default-bootstrap/img/button-large_exclusive.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

themes/default-bootstrap/img/button-medium.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

themes/default-bootstrap/img/button-medium.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

themes/default-bootstrap/img/button-medium_exclusive.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

themes/default-bootstrap/img/button-medium_exclusive.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

themes/default-bootstrap/img/button-mini.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

themes/default-bootstrap/img/button-mini.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

themes/default-bootstrap/img/button-mini_exclusive.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

themes/default-bootstrap/img/button-small.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

themes/default-bootstrap/img/button-small.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

themes/default-bootstrap/img/button-small_exclusive.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

themes/default-bootstrap/img/flag_new_bg.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 359 B

themes/default-bootstrap/img/footer_account.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 243 B

themes/default-bootstrap/img/form-input-bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 93 B

Some files were not shown because too many files have changed in this diff Show More