diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 97f228937..146e329ed 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -2914,7 +2914,7 @@ body { min-height: 100%; height: 100%; font: 400 12px/1.42857 "Open Sans", Helve #content.bootstrap .panel, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel, #content.bootstrap #dash_version { padding: 20px; margin-bottom: 20px; border: solid 1px #dfdfdf; background-color: white; -webkit-border-radius: 5px; -moz-border-radius: 5px; -ms-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 0, white 0 0 0 3px inset; box-shadow: rgba(0, 0, 0, 0.1) 0 2px 0, white 0 0 0 3px inset; } #content.bootstrap h3:not(.modal-title), #content.bootstrap .panel-heading:not(.modal-title), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title), #content.bootstrap .panel-heading, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header { border: none; padding: 0 5px; margin: -16px -16px 15px -16px; color: contrasted(#e6e8e3); font-size: 1.2em; line-height: 30px; font-weight: 300; text-transform: uppercase; background-color: white; border-bottom: solid 1px #cccccc; } #content.bootstrap h3:not(.modal-title) i, #content.bootstrap .panel-heading:not(.modal-title) i, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) i, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) i, #content.bootstrap h3:not(.modal-title) a, #content.bootstrap .panel-heading:not(.modal-title) a, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) a, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) a, #content.bootstrap .panel-heading i, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header i, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header i, #content.bootstrap .panel-heading a, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header a, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header a { color: contrasted(#e6e8e3); } -#content.bootstrap h3:not(.modal-title) .badge, #content.bootstrap .panel-heading:not(.modal-title) .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .badge, #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading:not(.modal-title) .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .badge, #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .notifs_badge { background-color: #1ba6e5; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; height: 29px; line-height: 25px; font-size: 1.3em; margin-right: 7px; font-weight: 300; float: left; margin-left: -5px; } +#content.bootstrap h3:not(.modal-title) .badge, #content.bootstrap .panel-heading:not(.modal-title) .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .badge, #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading:not(.modal-title) .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .badge, #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .notifs_badge { background: white; border: solid 2px #bbe5f7; -webkit-border-radius: 20px; -moz-border-radius: 20px; -ms-border-radius: 20px; -o-border-radius: 20px; border-radius: 20px; color: #1ba6e5; line-height: 1.2em; font-size: 1em; padding: 0 10px; font-weight: 700; margin-left: 10px; } #content.bootstrap h3:not(.modal-title) .panel-heading-action, #content.bootstrap .panel-heading:not(.modal-title) .panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .panel-heading-action, #content.bootstrap .panel-heading .panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-heading-action { margin-right: -5px; } #content.bootstrap h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content.bootstrap .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content.bootstrap .panel-heading .panel-heading-action a.list-toolbar-btn, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-heading-action a.list-toolbar-btn { float: left; height: 30px; width: 30px; color: #1ba6e5; border-left: solid 1px #cccccc; } #content.bootstrap h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap .panel-heading .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn:hover, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-heading-action a.list-toolbar-btn:hover { text-decoration: none; color: black; } @@ -3211,6 +3211,7 @@ a.link-social:hover { text-decoration: none; } .bootstrap .btn.btn-primary { background-color: #1ba6e5; color: white; border-color: #1585b8; } .bootstrap .btn.btn-default[disabled] { border-color: #999999; color: #999999; background-color: #f2f2f2; -webkit-box-shadow: #cccccc 0 -2px 0 inset; box-shadow: #cccccc 0 -2px 0 inset; } .bootstrap .dropdown-menu { text-align: left; } +.bootstrap .dropdown-menu > li a { padding: 5px 10px; } .bootstrap .btn-group-action { width: 160px; float: right; } .bootstrap .btn-group-action .btn-group { float: right; } .bootstrap .btn-group-action a { text-decoration: none; } diff --git a/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css b/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css deleted file mode 100644 index 25fc3a7a4..000000000 --- a/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css +++ /dev/null @@ -1 +0,0 @@ -#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; } diff --git a/admin-dev/themes/default/css/modules.css b/admin-dev/themes/default/css/modules.css deleted file mode 100644 index 4db7804bd..000000000 --- a/admin-dev/themes/default/css/modules.css +++ /dev/null @@ -1,84 +0,0 @@ - -.path_bar {display:none;} -#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;} -.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;} -#orders_notif {background: url('../img/notif_order.png') no-repeat center top;} -#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;} -#messages_notif {background: url('../img/notif_message.png') no-repeat center top;} -#orders_notif.open_notifs, -#customers_notif.open_notifs, -#messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; } - -/*toolbarBox*/ -.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;} -.toolbarBox .pageTitle { margin-left:10px; line-height:48px} -.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: bold; line-height: 48px; margin: 0; padding: 0} -.toolbarBox ul.cc_button {float:right;margin:0;padding:0} -.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center} -.toolbarBox a.toolbar_btn { border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff} -.toolbarBox a.toolbar_btn:hover {} -.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px} -.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png')} -.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png')} -.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png')} -.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png')} -.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png')} -.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png')} -.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png')} -.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png')} -.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png')} -.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png')} -.toolbarBox .process-icon-refresh-index { background-image: url('../img/process-icon-refresh-index.png')} -.toolbarBox .process-icon-refresh-cache { background-image: url('../img/process-icon-refresh-cache.png')} -.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png')} -.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png')} -.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png')} - -div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:11} - - -/*FILTER MODULE*/ -.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; padding:10px; display:block; min-height:35px;} -.filter-module #filternameForm {float:left; margin-right:30px;} -.filter-module label {width:auto;} -.filter-module .select-filter { float:left;} -.filter-module .button-filter { float:right;} - -/*SIDEBAR*/ -.sidebar { position:relative; float:left; width:220px; display:inline;} -.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;} -.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;} -.sidebar ul.categorieList {} -.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;} -.sidebar ul.categorieList li:first-child { border-top:none;} -.sidebar ul.categorieList li a {color:#3a6ea7;} -.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;} -.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;} - -/*MODULECONTAINER*/ -#moduleContainer { margin-left:220px; padding:13px 0 0 20px;} -#moduleContainer .table tr th { height:40px;} -#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;} -#moduleContainer .table tr:first-child {border-top:1px solid #ccc} -#moduleContainer .table tr:hover { background-color:#FFF1B5;} -#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;} -#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;} -#moduleContainer .moduleDesc .metadata { float:left; display:block; margin:5px 0;} -#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;} -#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;} -#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;} -#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} -#moduleContainer .moduleDesc p.desc { color:#666; font-size:12px; display:block; clear:both;} -#moduleContainer .setup {background-color:#6db300; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} -#moduleContainer .setup.non-install { border: solid 1px #ec7000; background-color: #ffedb1; color: #ec7000} -#moduleContainer .setup.must-have { background-color: #ec7000;} -#moduleContainer .setup.off{ background-color:#ccc;} -#moduleContainer .row-actions-module span { padding-right:5px;} -#moduleContainer .row-actions-module span a { font-size:12px;} -#moduleContainer .button.uninstalled, -#moduleContainer .button.installed { float:right; display: inline-block; margin-top:15px; font-size:12px;} -#moduleContainer .button.updated { margin-top:15px; display: inline-block; font-size:12px;} -#list-action-button{width:175px} -#list-action-button li{margin-left:10px;display: inline;float: left;} -#moduleContainer .moduleName {font-size:12px; color:#3A6EA7;font-weight:bold;} -#moduleContainer .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;} \ No newline at end of file diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-content.sass b/admin-dev/themes/default/scss/admin-theme/_admin-content.sass index 53c9a53f5..5da8eaf85 100644 --- a/admin-dev/themes/default/scss/admin-theme/_admin-content.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-content.sass @@ -48,15 +48,15 @@ body 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 + background: white + border: solid 2px lighten($brand-primary,35%) + +border-radius(20px) + color: $brand-primary + line-height: 1.2em + font-size: 1em + padding: 0 10px + font-weight: 700 + margin-left: 10px .panel-heading-action @extend .pull-right margin-right: -5px diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass b/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass index e3c395a03..d70ed911d 100644 --- a/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass @@ -67,6 +67,8 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty @include box-shadow(lighten($gray-light,20%) 0 -2px 0 inset) .dropdown-menu text-align: left + > li a + padding: 5px 10px .btn-group-action width: 160px float: right diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 6749399a4..6f9619641 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -58,25 +58,26 @@
{*left*}
-
-
+
+
{$customer->firstname} {$customer->lastname} + [{$customer->id|string_format:"%06d"}] + - + + {$customer->email} + + + + {l s='Edit'} +
  • {l s='Title:'} {$gender->name}
    • -
  • - {l s='Email:'} - {$customer->email} -
    • -
  • - {l s='ID:'} - {$customer->id|string_format:"%06d"} -
  • {l s='Registration date:'} {$registration_date} @@ -96,7 +97,6 @@ {/if}
-
  • {l s='Language:'} @@ -109,27 +109,28 @@
  • - {l s='Newsletter:'} {if $customer->newsletter} + {if $customer->newsletter} - {l s='Registered'} + + {l s='Newsletter'} {else} - {l s='Unregistered'} + + {l s='Newsletter'} {/if}
  • - {l s='Opt in:'} {if $customer->optin} - {l s='Registered'} + {l s='Opt in'} {else} - {l s='Unregistered'} + {l s='Opt in'} {/if}
    • @@ -160,9 +161,7 @@ {/if}
- {if $customer->isGuest()} -
{l s='This customer is registered as.'} {l s='Guest'} {if !$customer_exists}
@@ -173,34 +172,31 @@ {l s='This feature generates a random password before sending an email to your customer.'}
{else} -
-
- {l s='A registered customer account using the defined email address already exists. '} +

+ {l s='A registered customer account using the defined email address already exists. '} +

{/if} -
{/if} - - {l s='Edit'} -
{l s='Orders'} {count($orders)}
{if $orders AND count($orders)} - {assign var=count_ok value=count($orders_ok)} {assign var=count_ko value=count($orders_ko)} -
- {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} + {l s='Valid orders:'} + {$count_ok} + {l s='for'} {$total_ok}
- {l s='Invalid orders:'} {$count_ko} + {l s='Invalid orders:'} + {$count_ko}
@@ -209,13 +205,13 @@ - - - - - - - + + + + + + + @@ -229,7 +225,7 @@ @@ -242,36 +238,32 @@
{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Actions'}{l s='ID'}{l s='Date'}{l s='Payment'}{l s='State'}{l s='Products'}{l s='Total spent'}
{$order['total_paid_real']} - {l s='View'} + {l s='View'}
- - - - - - - + + + + + + {foreach $orders_ko AS $key => $order} - + - - - + + {/foreach}
{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Actions'}{l s='ID'}{l s='Date'}{l s='Payment'}{l s='State'}{l s='Products'}{l s='Total spent'}
{$order['id_order']}{dateFormat date=$order['date_add'] full=0}{dateFormat date=$order['date_add'] full=0} {$order['payment']} {$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} - - {l s='View'} - - {$order['nb_products']}{$order['total_paid_real']}
{/if} {else} +

{l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} +

{/if}
@@ -283,90 +275,110 @@ - - - - - + + + + {foreach $carts AS $key => $cart} - - - - + + {/foreach}
{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}{l s='Actions'}{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}
{$cart['id_cart']}{dateFormat date=$cart['date_upd'] full=0}{$cart['name']}{$cart['total_price']} - - {l s='View'} + + + {dateFormat date=$cart['date_upd'] full=0} {$cart['name']}{$cart['total_price']}
{else} - {l s='No cart is available'}. +

+ {l s='No cart is available'} +

{/if}
- {if $products AND count($products)}
- {l s='Products:'} {count($products)} + {l s='Purchased products'} {count($products)}
- - - - + + + {foreach $products AS $key => $product} - - - + {/foreach}
{l s='Date'}{l s='Name'}{l s='Quantity'}{l s='Actions'}{l s='Date'}{l s='Name'}{l s='Quantity'}
{dateFormat date=$order['date_add'] full=0}{$product['product_name']}{$product['product_quantity']} + - {l s='View'} + {$product['product_name']} {$product['product_quantity']}
{/if} + {if count($interested)} +
+
+ {l s='Purchased products'} {count($interested)} +
+ + + + + + + + + {foreach $interested as $key => $p} + + + + + {/foreach} + +
{l s='ID'}{l s='Name'}
{$p['id']}{$p['name']}
+
+ {/if}
- {*right*}
-
{l s='Add a private note'}
{l s='This note will be displayed to all employees but not to customers.'}
-
+
- +
-
{l s='Messages'} {count($messages)} @@ -374,9 +386,9 @@ {if count($messages)} - - - + + + {foreach $messages AS $message} @@ -391,10 +403,11 @@ {/foreach}
{l s='Status'}{l s='Message'}{l s='Sent on'}{l s='Status'}{l s='Message'}{l s='Sent on'}
{else} +

{l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]} +

{/if}
-
{l s='Vouchers'} {count($discounts)} @@ -403,28 +416,31 @@ - - - - - + + + + {foreach $discounts AS $key => $discount} - + - - @@ -432,7 +448,9 @@ {/foreach}
{l s='ID'}{l s='Code'}{l s='Name'}{l s='Status'}{l s='Actions'}{l s='ID'}{l s='Code'}{l s='Name'}{l s='Status'}
{$discount['id_cart_rule']}{$discount['id_cart_rule']} {$discount['code']} {$discount['name']} - {l s='Status'} + + {if $discount['active']} + + {else} + + {/if} + - + - +
{else} - {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}. +

+ {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]} +

{/if}
@@ -444,11 +462,11 @@ - - - - - + + + + + @@ -468,25 +486,28 @@
- {l s='Groups'} {count($groups)} + + {l s='Groups'} + {count($groups)} + + {l s='Edit'} +
{if $groups AND count($groups)}
{l s='Date'}{l s='Pages viewed'}{l s='Total time'}{l s='Origin'}{l s='IP Address'}{l s='Date'}{l s='Pages viewed'}{l s='Total time'}{l s='Origin'}{l s='IP Address'}
- - - + + {foreach $groups AS $key => $group} - - @@ -494,45 +515,13 @@
{l s='ID'}{l s='Name'}{l s='Actions'}{l s='ID'}{l s='Name'}
{$group['id_group']}{$group['name']} - - {l s='View'} + + + {$group['name']}
{/if} - - {l s='Edit'} -
- {*todo add next elements*} - {if count($interested)} -
-
- {l s='Products:'} {count($interested)} -
- - - - - - - - - - {foreach $interested as $key => $p} - - - - - - {/foreach} - -
{l s='ID'}{l s='Name'}{l s='Actions'}
{$p['id']}{$p['name']} - - {l s='View'} - -
-
- {/if} +
{if count($referrers)} @@ -543,8 +532,8 @@ - - + + {if $shop_is_feature_active}{/if} @@ -575,12 +564,12 @@
{l s='Date'}{l s='Name'}{l s='Date'}{l s='Name'}{l s='Shop'}
- - - - - - + + + + + + @@ -607,9 +596,12 @@ @@ -618,7 +610,9 @@
{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'}{l s='Actions'}{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'}
{else} - {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} +

+ {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} +

{/if}
diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl index 0d877a469..a3df05fb5 100644 --- a/admin-dev/themes/default/template/footer.tpl +++ b/admin-dev/themes/default/template/footer.tpl @@ -29,7 +29,9 @@ {hook h="displayBackOfficeFooter"}