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

// BO fix + work on helpers + compass/codekit config

Browse Source
This commit is contained in:
Kevin Granger committed 2013-07-22 16:43:16 +02:00
1 parent 288c0d3ca8
commit 9d16eb1d1b
18 files changed
+3443 -133
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/codekit-config.json
+3235
View File
File diff suppressed because it is too large. Load diff
admin-dev/themes/default/config.rb
+25
View File
@@ -0,0 +1,25 @@
# Require any additional compass plugins here.
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "css"
images_dir = "img"
javascripts_dir = "js"
fonts_dir = "font"
output_style = :nested
environment = :development
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
line_comments = false
color_output = false
# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
admin-dev/themes/default/css/_toggle-switch.scss
+10 -11
View File
@@ -241,29 +241,28 @@ https://github.com/ghinda/css-toggle-switch
@-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } } @-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } }
/* Standalone Themes */ /* Standalone Themes */
.prestashop-switch label{
font-weight: 500;
}
.prestashop-switch { .prestashop-switch {
min-width: 150px; min-width: 150px;
color: #999; color: #999;
font-weight: 300;
text-align: center; text-align: center;
border-radius: 3px; border-radius: 3px;
@include box-shadow(rgba(#48525F,0.3) 0 0 6px 1px inset) @include box-shadow(rgba(#48525F,0.3) 0 0 6px 1px inset)
} }
.prestashop-switch input:checked + label { .prestashop-switch input:checked + label {
color: #fff; color: lighten($brand-primary,10%);
text-shadow: none; @include text-shadow(rgba(white,0.7) 1px 1px 0);
} }
.prestashop-switch .slide-button { .prestashop-switch .slide-button {
@extend .btn;
@extend .btn-primary;
border-radius: 3px;
position: relative; position: relative;
margin-right: 3px; margin-right: 3px;
border-bottom: 2px solid darken($brand-primary,7%); border-color: darken($bg-content-color,20%);
color: lighten($brand-primary,50%); color: lighten($bg-content-color,50%);
text-shadow: 1px 1px 0 rgba(black,0.6); @include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%)));
@include background(linear-gradient(top, lighten($brand-primary,15%), $brand-primary)); @include box-shadow(rgba(white,1) 0 0 0 1px inset);
@include box-shadow(rgba(black,0.15) 0 3px 0, rgba(white,0.1) 0 0 0 1px inset);
} }
.prestashop-switch p { .prestashop-switch p {
color: #333; color: #333;
admin-dev/themes/default/css/admin-theme.css
+107 -67
View File
@@ -5003,33 +5003,33 @@ https://github.com/ghinda/css-toggle-switch
position: relative; } } position: relative; } }
/* Standalone Themes */ /* Standalone Themes */
.prestashop-switch label {
font-weight: 500; }
.prestashop-switch { .prestashop-switch {
min-width: 150px; min-width: 150px;
color: #999; color: #999;
font-weight: 300;
text-align: center; text-align: center;
border-radius: 3px; border-radius: 3px;
-webkit-box-shadow: rgba(72, 82, 95, 0.3) 0 0 6px 1px inset; -webkit-box-shadow: rgba(72, 82, 95, 0.3) 0 0 6px 1px inset;
box-shadow: rgba(72, 82, 95, 0.3) 0 0 6px 1px inset; } box-shadow: rgba(72, 82, 95, 0.3) 0 0 6px 1px inset; }
.prestashop-switch input:checked + label { .prestashop-switch input:checked + label {
color: #fff; color: #465363;
text-shadow: none; } text-shadow: rgba(255, 255, 255, 0.7) 1px 1px 0; }
.prestashop-switch .slide-button { .prestashop-switch .slide-button {
border-radius: 3px;
position: relative; position: relative;
margin-right: 3px; margin-right: 3px;
border-bottom: 2px solid #222830; border-color: #cac4b9;
color: #afb9c6; color: white;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.6); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f5f3), color-stop(100%, #e0ddd6));
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #516072), color-stop(100%, #313a45)); background: -webkit-linear-gradient(top, #f6f5f3, #e0ddd6);
background: -webkit-linear-gradient(top, #516072, #313a45); background: -moz-linear-gradient(top, #f6f5f3, #e0ddd6);
background: -moz-linear-gradient(top, #516072, #313a45); background: -o-linear-gradient(top, #f6f5f3, #e0ddd6);
background: -o-linear-gradient(top, #516072, #313a45); background: linear-gradient(top, #f6f5f3, #e0ddd6);
background: linear-gradient(top, #516072, #313a45); -webkit-box-shadow: white 0 0 0 1px inset;
-webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 3px 0, rgba(255, 255, 255, 0.1) 0 0 0 1px inset; box-shadow: white 0 0 0 1px inset; }
box-shadow: rgba(0, 0, 0, 0.15) 0 3px 0, rgba(255, 255, 255, 0.1) 0 0 0 1px inset; }
.prestashop-switch p { .prestashop-switch p {
color: #333; } color: #333; }
@@ -5099,8 +5099,11 @@ body.fixed-top {
background-color: #e2dfdd; } background-color: #e2dfdd; }
#content form .alert.alert-info { #content form .alert.alert-info {
background-color: white; background-color: white;
color: #90857c; color: #59a1e0;
border: solid 1px #e0ddd6; } border: none;
border-bottom: solid 1px #e0ddd6;
-webkit-box-shadow: white 0 0 0 1px inset;
box-shadow: white 0 0 0 1px inset; }
.page-head { .page-head {
width: 1278px; width: 1278px;
@@ -5154,55 +5157,62 @@ body.fixed-top {
.page-sidebar > ul li.expanded ul { .page-sidebar > ul li.expanded ul {
display: block; display: block;
background-color: white; } background-color: white; }
.page-sidebar > ul > li { .page-sidebar > ul > li:hover > a, .page-sidebar > ul > li.active > a {
-webkit-transition-property: background-color; color: white;
-moz-transition-property: background-color; background-color: #272c33;
-o-transition-property: background-color; border-top: 1px solid #111418;
transition-property: background-color; } border-bottom: 1px solid #1c2127;
.page-sidebar > ul > li:hover > a, .page-sidebar > ul > li.active > a { -webkit-box-shadow: #111418 -4px 0 0 inset;
color: white; box-shadow: #111418 -4px 0 0 inset;
background-color: #272c33; -webkit-transition-property: background-color, border;
border-top: 1px solid #111418; -moz-transition-property: background-color, border;
border-bottom: 1px solid #1c2127; -o-transition-property: background-color, border;
-webkit-box-shadow: #111418 -4px 0 0 inset; transition-property: background-color, border;
box-shadow: #111418 -4px 0 0 inset; } -webkit-transition-duration: 0.4s;
.page-sidebar > ul > li > a { -moz-transition-duration: 0.4s;
-o-transition-duration: 0.4s;
transition-duration: 0.4s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out; }
.page-sidebar > ul > li > a {
display: block;
padding: 5px 0 5px 5px;
border-top: 1px solid #535f6e;
border-bottom: 1px solid #323942;
color: #a1abb8;
text-transform: uppercase;
text-decoration: none;
-webkit-box-shadow: #3d4550 -4px 0 0 inset;
box-shadow: #3d4550 -4px 0 0 inset; }
.page-sidebar > ul > li img {
margin-right: 10px; }
.page-sidebar > ul > li ul {
margin: 0;
padding: 0;
border-bottom: 1px solid #cecece;
background-color: white; }
.page-sidebar > ul > li ul li a {
display: block; display: block;
padding: 5px 0 5px 5px; padding: 3px 15px 3px 20px;
border-top: 1px solid #535f6e; font-size: 12px;
border-bottom: 1px solid #323942; border: none;
color: #a1abb8; border-bottom: 1px solid whitesmoke;
text-transform: uppercase;
text-decoration: none;
-webkit-box-shadow: #3d4550 -4px 0 0 inset;
box-shadow: #3d4550 -4px 0 0 inset; }
.page-sidebar > ul > li img {
margin-right: 10px; }
.page-sidebar > ul > li ul {
margin: 0;
padding: 0;
border-bottom: 1px solid #cecece;
background-color: white; } background-color: white; }
.page-sidebar > ul > li ul li a { .page-sidebar > ul > li ul li a i {
display: block; margin-top: 3px;
padding: 3px 15px 3px 20px; color: #cecece; }
font-size: 12px; .page-sidebar > ul > li ul li a:hover {
border: none; background-color: #69788b;
border-bottom: 1px solid whitesmoke; text-decoration: none; }
background-color: white; } .page-sidebar > ul > li ul li a:hover i {
.page-sidebar > ul > li ul li a i {
margin-top: 3px;
color: #cecece; }
.page-sidebar > ul > li ul li a:hover {
background-color: #69788b;
text-decoration: none; }
.page-sidebar > ul > li ul li a:hover i {
color: #313a45; }
.page-sidebar > ul > li ul li.active a {
color: #1a1a1a;
background-color: #9ed072; }
.page-sidebar > ul > li ul li.active a i {
color: #313a45; } color: #313a45; }
.page-sidebar > ul > li ul li.active a {
color: #1a1a1a;
background-color: #9ed072; }
.page-sidebar > ul > li ul li.active a i {
color: #313a45; }
#footer { #footer {
position: fixed; position: fixed;
@@ -5301,7 +5311,8 @@ body.fixed-top {
background-color: #99c787; } background-color: #99c787; }
[class^="icon-Admin"] { [class^="icon-Admin"] {
margin-right: 6px; } margin-right: 6px;
color: #313a45 !important; }
[class^="process-icon-"], [class*=" process-icon-"] { [class^="process-icon-"], [class*=" process-icon-"] {
height: 32px; height: 32px;
@@ -5331,8 +5342,9 @@ label.control-label {
label.control-label span.label-tooltip { label.control-label span.label-tooltip {
text-decoration: none; text-decoration: none;
font-size: 13px; font-size: 13px;
border-bottom: dotted 1px #d5d1c7; background-color: #d7e1ed;
background-color: #ebe9e4; border: none;
border-bottom: solid 1px #cac4b9;
padding: 0 5px; padding: 0 5px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@@ -5340,6 +5352,9 @@ label.control-label span.label-tooltip {
-o-border-radius: 3px; -o-border-radius: 3px;
border-radius: 3px; } border-radius: 3px; }
.tooltip {
font-size: 12px; }
label.required:before { label.required:before {
content: "*"; content: "*";
color: red; color: red;
@@ -5371,13 +5386,36 @@ input[type="password"].input-tiny {
.btn, .toolbar_btn { .btn, .toolbar_btn {
text-transform: uppercase; } text-transform: uppercase; }
.btn-default {
border-color: #cac4b9;
color: #516072;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f5f3), color-stop(100%, #e0ddd6));
background: -webkit-linear-gradient(top, #f6f5f3, #e0ddd6);
background: -moz-linear-gradient(top, #f6f5f3, #e0ddd6);
background: -o-linear-gradient(top, #f6f5f3, #e0ddd6);
background: linear-gradient(top, #f6f5f3, #e0ddd6);
-webkit-box-shadow: white 0 0 0 1px inset;
box-shadow: white 0 0 0 1px inset; }
.btn-default:hover, .btn-default:focus {
border-color: #b4ac9c;
color: #516072;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e0ddd6), color-stop(100%, #cac4b9));
background: -webkit-linear-gradient(top, #e0ddd6, #cac4b9);
background: -moz-linear-gradient(top, #e0ddd6, #cac4b9);
background: -o-linear-gradient(top, #e0ddd6, #cac4b9);
background: linear-gradient(top, #e0ddd6, #cac4b9);
-webkit-box-shadow: rgba(255, 255, 255, 0.7) 0 0 0 1px inset;
box-shadow: rgba(255, 255, 255, 0.7) 0 0 0 1px inset; }
.btn-group-action { .btn-group-action {
display: inline-block; display: inline-block;
white-space: nowrap; } white-space: nowrap; }
.btn-group-action a { .btn-group-action a {
color: white;
text-decoration: none; } text-decoration: none; }
.btn .caret, .toolbar_btn .caret {
border-top-color: #516072 !important; }
hr { hr {
border-color: #e0ddd6; border-color: #e0ddd6;
border-bottom: 1px solid white; } border-bottom: 1px solid white; }
@@ -5418,7 +5456,9 @@ hr {
box-shadow: rgba(0, 0, 0, 0.15) 0 2px 0; } box-shadow: rgba(0, 0, 0, 0.15) 0 2px 0; }
.table tbody > tr:hover > td { .table tbody > tr:hover > td {
cursor: pointer; cursor: pointer;
background-color: #fff2b2; } background-color: #dddbd7;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 2px 0;
box-shadow: rgba(0, 0, 0, 0.3) 0 2px 0; }
.table td.center, .table th.center { .table td.center, .table th.center {
text-align: center; } text-align: center; }
.table tr td:first-child, .table tr td:first-child,
admin-dev/themes/default/css/admin-theme.sass
+31 -9
View File
@@ -9,7 +9,6 @@ $bg-head-color: #9ED072
@import "font-awesome" @import "font-awesome"
@import "toggle-switch" @import "toggle-switch"
html, body html, body
height: 100% height: 100%
@@ -29,6 +28,7 @@ body.fixed-top
font-size: 1.6em font-size: 1.6em
font-family: "ubuntu" font-family: "ubuntu"
font-weight: 300 font-weight: 300
#main #main
min-height: 100% min-height: 100%
height: 100% height: 100%
@@ -65,8 +65,10 @@ body.fixed-top
background-color: lighten(#D6D2CF,5%) background-color: lighten(#D6D2CF,5%)
&.alert-info &.alert-info
background-color: white background-color: white
color: darken(#D6D2CF,30%) color: darken(#DAEAF8,30%)
border: solid 1px darken($bg-content-color,10%) border: none
border-bottom: solid 1px darken($bg-content-color,10%)
@include box-shadow(white 0 0 0 1px inset)
.page-head .page-head
width: 1278px width: 1278px
@@ -103,6 +105,7 @@ body.fixed-top
width: 240px width: 240px
border-bottom: solid 1px black border-bottom: solid 1px black
@include box-shadow(darken($bg-content-color,30%) 0 4px 0) @include box-shadow(darken($bg-content-color,30%) 0 4px 0)
> ul > li > ul.sub-menu > ul > li > ul.sub-menu
display: none display: none
list-style: none list-style: none
@@ -121,14 +124,15 @@ body.fixed-top
display: block display: block
background-color: white background-color: white
> li > li
@include transition-property(background-color)
&:hover > a, &.active > a &:hover > a, &.active > a
color: white color: white
background-color: darken(#48525F,15%) background-color: darken(#48525F,15%)
border-top: 1px solid darken($brand-primary,15%) border-top: 1px solid darken($brand-primary,15%)
border-bottom: 1px solid darken($brand-primary,10%) border-bottom: 1px solid darken($brand-primary,10%)
@include box-shadow(darken($brand-primary,15%) -4px 0 0 inset) @include box-shadow(darken($brand-primary,15%) -4px 0 0 inset)
@include transition-property(background-color, border)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
> a > a
display: block display: block
padding: 5px 0 5px 5px padding: 5px 0 5px 5px
@@ -262,6 +266,7 @@ body.fixed-top
[class^="icon-Admin"] [class^="icon-Admin"]
//background-color: #9ED072 //background-color: #9ED072
margin-right: 6px margin-right: 6px
color: $brand-primary!important
[class^="process-icon-"], [class*=" process-icon-"] [class^="process-icon-"], [class*=" process-icon-"]
height: 32px height: 32px
@@ -335,11 +340,15 @@ label.control-label
label.control-label span.label-tooltip label.control-label span.label-tooltip
text-decoration: none text-decoration: none
font-size: 13px font-size: 13px
border-bottom: dotted 1px darken(#F6F5F3,15%) background-color: #D7E1ED
background-color: darken(#F6F5F3,5%) border: none
border-bottom: solid 1px darken($bg-content-color,20%)
padding: 0 5px padding: 0 5px
@include border-radius(3px) @include border-radius(3px)
.tooltip
font-size: 12px
label.required:before label.required:before
content: '*' content: '*'
color: red color: red
@@ -368,12 +377,24 @@ input[type="password"].input-tiny
.btn .btn
text-transform: uppercase text-transform: uppercase
.btn-default
border-color: darken($bg-content-color,20%)
color: lighten($brand-primary,15%)
@include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%)))
@include box-shadow(rgba(white,1) 0 0 0 1px inset)
&:hover, &:focus
border-color: darken($bg-content-color,30%)
color: lighten($brand-primary,15%)
@include background(linear-gradient(top, darken($bg-content-color,10%), darken($bg-content-color,20%)))
@include box-shadow(rgba(white,0.7) 0 0 0 1px inset)
.btn-group-action .btn-group-action
display: inline-block display: inline-block
white-space: nowrap white-space: nowrap
a a
color: white
text-decoration: none text-decoration: none
.btn .caret
border-top-color: lighten($brand-primary,15%)!important
hr hr
border-color: darken($bg-content-color,10%) border-color: darken($bg-content-color,10%)
border-bottom: 1px solid white border-bottom: 1px solid white
@@ -413,7 +434,8 @@ hr
@include box-shadow(rgba(black,0.15) 0 2px 0) @include box-shadow(rgba(black,0.15) 0 2px 0)
tbody > tr:hover > td tbody > tr:hover > td
cursor: pointer cursor: pointer
background-color: #FFF2B2 background-color: lighten(#C6C2BB,10%)
@include box-shadow(rgba(black,0.30) 0 2px 0)
td.center, th.center td.center, th.center
text-align: center text-align: center
tr td:first-child, tr td:first-child,
admin-dev/themes/default/template/controllers/tracking/helpers/list/list_header.tpl
+1 -1
View File
@@ -26,5 +26,5 @@
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name="override_header"} {block name="override_header"}
<h2>{$sub_title}</h2> <legend>{$sub_title}</legend>
{/block} {/block}
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -246,7 +246,7 @@
<div class="mainsubtablist" style="display:none"></div> <div class="mainsubtablist" style="display:none"></div>
{/if} {/if}
<ul id="menu"> <ul id="menu">
<li class="maintab {if $t.current}active{/if}"> <li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title"> <a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i> Dashboard <i class="icon-AdminDashboard"></i> Dashboard
</a> </a>
admin-dev/themes/default/template/helpers/list/list_footer.tpl
+2 -2
View File
@@ -22,8 +22,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
</table> </table>
{if $bulk_actions} {if $bulk_actions}
<p> <p>
{foreach $bulk_actions as $key => $params} {foreach $bulk_actions as $key => $params}
@@ -34,10 +34,10 @@
{if !$simple_header} {if !$simple_header}
<input type="hidden" name="token" value="{$token}" /> <input type="hidden" name="token" value="{$token}" />
</fieldset>
</form> </form>
{/if} {/if}
{hook h='displayAdminListAfter'} {hook h='displayAdminListAfter'}
{if isset($name_controller)} {if isset($name_controller)}
{capture name=hookName assign=hookName}display{$name_controller|ucfirst}ListAfter{/capture} {capture name=hookName assign=hookName}display{$name_controller|ucfirst}ListAfter{/capture}
admin-dev/themes/default/template/helpers/list/list_header.tpl
+8 -4
View File
@@ -65,7 +65,7 @@
<div class="leadin">{block name="leadin"}{/block}</div> <div class="leadin">{block name="leadin"}{/block}</div>
{/if} {/if}
{block name="override_header"}{/block}
{hook h='displayAdminListBefore'} {hook h='displayAdminListBefore'}
@@ -80,11 +80,15 @@
{if !$simple_header} {if !$simple_header}
<form method="post" action="{$action}" class="form-inline"> <form method="post" action="{$action}" class="form-inline">
<fieldset class="col-lg-12">
{block name="override_header"}{/block}
<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/> <input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
{/if} {/if}
{if !$simple_header} {if !$simple_header}
<fieldset class="well">
<span> <span>
{if $page > 1} {if $page > 1}
<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp; <input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
@@ -116,14 +120,14 @@
<span> / {$list_total} {l s='result(s)'}</span> <span> / {$list_total} {l s='result(s)'}</span>
<span class="pull-right"> <span class="pull-right">
<button type="submit" name="submitReset{$table}" class="btn btn-small"> <button type="submit" name="submitReset{$table}" class="btn btn-default btn-small">
<i class="icon-eraser"></i> {l s='Reset'} <i class="icon-eraser"></i> {l s='Reset'}
</button> </button>
<button type="submit" id="submitFilterButton{$table}" name="submitFilter" class="btn btn-default btn-small" /> <button type="submit" id="submitFilterButton{$table}" name="submitFilter" class="btn btn-default btn-small" />
<i class="icon-filter"></i> {l s='Filter'} <i class="icon-filter"></i> {l s='Filter'}
</button> </button>
</span> </span>
</fieldset>
{/if} {/if}
<table <table
controllers/admin/AdminAttachmentsController.php
+2 -2
View File
@@ -26,6 +26,7 @@
class AdminAttachmentsControllerCore extends AdminController class AdminAttachmentsControllerCore extends AdminController
{ {
public $bootstrap = true ;
protected $product_attachements = array(); protected $product_attachements = array();
@@ -41,8 +42,7 @@ class AdminAttachmentsControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_attachment' => array( 'id_attachment' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center', 'align' => 'center'
'width' => 25
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name') 'title' => $this->l('Name')
controllers/admin/AdminAttributesGroupsController.php
-4
View File
@@ -42,23 +42,19 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_attribute_group' => array( 'id_attribute_group' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'width' => 25,
'align' => 'center' 'align' => 'center'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
'width' => 'auto',
'filter_key' => 'b!name', 'filter_key' => 'b!name',
'align' => 'left' 'align' => 'left'
), ),
'count_values' => array( 'count_values' => array(
'title' => $this->l('Values count'), 'title' => $this->l('Values count'),
'width' => 120,
'align' => 'center', 'align' => 'center',
), ),
'position' => array( 'position' => array(
'title' => $this->l('Position'), 'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'a!position', 'filter_key' => 'a!position',
'position' => 'position', 'position' => 'position',
'align' => 'center' 'align' => 'center'
controllers/admin/AdminFeaturesController.php
+3 -4
View File
@@ -25,6 +25,8 @@
*/ */
class AdminFeaturesControllerCore extends AdminController class AdminFeaturesControllerCore extends AdminController
{ {
public $bootstrap = true ;
protected $position_identifier = 'id_feature'; protected $position_identifier = 'id_feature';
public function __construct() public function __construct()
@@ -35,8 +37,7 @@ class AdminFeaturesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_feature' => array( 'id_feature' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID')
'width' => 25
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
@@ -45,13 +46,11 @@ class AdminFeaturesControllerCore extends AdminController
), ),
'value' => array( 'value' => array(
'title' => $this->l('Values'), 'title' => $this->l('Values'),
'width' => 255,
'orderby' => false, 'orderby' => false,
'search' => false 'search' => false
), ),
'position' => array( 'position' => array(
'title' => $this->l('Position'), 'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'a!position', 'filter_key' => 'a!position',
'align' => 'center', 'align' => 'center',
'position' => 'position' 'position' => 'position'
controllers/admin/AdminManufacturersController.php
+1 -5
View File
@@ -26,6 +26,7 @@
class AdminManufacturersControllerCore extends AdminController class AdminManufacturersControllerCore extends AdminController
{ {
public $bootstrap = true ;
/** @var array countries list */ /** @var array countries list */
protected $countries_array = array(); protected $countries_array = array();
@@ -49,14 +50,12 @@ class AdminManufacturersControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_manufacturer' => array( 'id_manufacturer' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'width' => 25
), ),
'logo' => array( 'logo' => array(
'title' => $this->l('Logo'), 'title' => $this->l('Logo'),
'image' => 'm', 'image' => 'm',
'orderby' => false, 'orderby' => false,
'search' => false, 'search' => false,
'width' => 150,
'align' => 'center', 'align' => 'center',
), ),
'name' => array( 'name' => array(
@@ -65,19 +64,16 @@ class AdminManufacturersControllerCore extends AdminController
), ),
'addresses' => array( 'addresses' => array(
'title' => $this->l('Addresses'), 'title' => $this->l('Addresses'),
'width' => 20,
'align' => 'center', 'align' => 'center',
'havingFilter' => true 'havingFilter' => true
), ),
'products' => array( 'products' => array(
'title' => $this->l('Products:'), 'title' => $this->l('Products:'),
'havingFilter' => true, 'havingFilter' => true,
'width' => 20,
'align' => 'center', 'align' => 'center',
), ),
'active' => array( 'active' => array(
'title' => $this->l('Enabled'), 'title' => $this->l('Enabled'),
'width' => 70,
'active' => 'status', 'active' => 'status',
'type' => 'bool', 'type' => 'bool',
'align' => 'center', 'align' => 'center',
controllers/admin/AdminProductsController.php
-9
View File
@@ -202,13 +202,11 @@ class AdminProductsControllerCore extends AdminController
$this->fields_list['id_product'] = array( $this->fields_list['id_product'] = array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center', 'align' => 'center',
'width' => 40
); );
$this->fields_list['image'] = array( $this->fields_list['image'] = array(
'title' => $this->l('Photo'), 'title' => $this->l('Photo'),
'align' => 'center', 'align' => 'center',
'image' => 'p', 'image' => 'p',
'width' => 70,
'orderby' => false, 'orderby' => false,
'filter' => false, 'filter' => false,
'search' => false 'search' => false
@@ -220,13 +218,11 @@ class AdminProductsControllerCore extends AdminController
$this->fields_list['reference'] = array( $this->fields_list['reference'] = array(
'title' => $this->l('Reference'), 'title' => $this->l('Reference'),
'align' => 'left', 'align' => 'left',
'width' => 80
); );
if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP) if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP)
$this->fields_list['shopname'] = array( $this->fields_list['shopname'] = array(
'title' => $this->l('Default shop:'), 'title' => $this->l('Default shop:'),
'width' => 230,
'filter_key' => 'shop!name', 'filter_key' => 'shop!name',
); );
else else
@@ -237,14 +233,12 @@ class AdminProductsControllerCore extends AdminController
); );
$this->fields_list['price'] = array( $this->fields_list['price'] = array(
'title' => $this->l('Base price'), 'title' => $this->l('Base price'),
'width' => 90,
'type' => 'price', 'type' => 'price',
'align' => 'right', 'align' => 'right',
'filter_key' => 'a!price' 'filter_key' => 'a!price'
); );
$this->fields_list['price_final'] = array( $this->fields_list['price_final'] = array(
'title' => $this->l('Final price'), 'title' => $this->l('Final price'),
'width' => 90,
'type' => 'price', 'type' => 'price',
'align' => 'right', 'align' => 'right',
'havingFilter' => true, 'havingFilter' => true,
@@ -252,7 +246,6 @@ class AdminProductsControllerCore extends AdminController
); );
$this->fields_list['sav_quantity'] = array( $this->fields_list['sav_quantity'] = array(
'title' => $this->l('Quantity'), 'title' => $this->l('Quantity'),
'width' => 90,
'align' => 'right', 'align' => 'right',
'filter_key' => 'sav!quantity', 'filter_key' => 'sav!quantity',
'orderby' => true, 'orderby' => true,
@@ -260,7 +253,6 @@ class AdminProductsControllerCore extends AdminController
); );
$this->fields_list['active'] = array( $this->fields_list['active'] = array(
'title' => $this->l('Status'), 'title' => $this->l('Status'),
'width' => 70,
'active' => 'status', 'active' => 'status',
'filter_key' => $alias.'!active', 'filter_key' => $alias.'!active',
'align' => 'center', 'align' => 'center',
@@ -271,7 +263,6 @@ class AdminProductsControllerCore extends AdminController
if ((int)$this->id_current_category) if ((int)$this->id_current_category)
$this->fields_list['position'] = array( $this->fields_list['position'] = array(
'title' => $this->l('Position'), 'title' => $this->l('Position'),
'width' => 70,
'filter_key' => 'cp!position', 'filter_key' => 'cp!position',
'align' => 'center', 'align' => 'center',
'position' => 'position' 'position' => 'position'
controllers/admin/AdminScenesController.php
+2 -2
View File
@@ -26,6 +26,8 @@
class AdminScenesControllerCore extends AdminController class AdminScenesControllerCore extends AdminController
{ {
public $bootstrap = true ;
public function __construct() public function __construct()
{ {
$this->table = 'scene'; $this->table = 'scene';
@@ -44,7 +46,6 @@ class AdminScenesControllerCore extends AdminController
'id_scene' => array( 'id_scene' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center', 'align' => 'center',
'width' => 25
), ),
'name' => array( 'name' => array(
'title' => $this->l('Image Maps'), 'title' => $this->l('Image Maps'),
@@ -52,7 +53,6 @@ class AdminScenesControllerCore extends AdminController
), ),
'active' => array( 'active' => array(
'title' => $this->l('Activated'), 'title' => $this->l('Activated'),
'width' => 70,
'align' => 'center', 'align' => 'center',
'active' => 'status', 'active' => 'status',
'type' => 'bool', 'type' => 'bool',
controllers/admin/AdminSuppliersController.php
+2
View File
@@ -26,6 +26,8 @@
class AdminSuppliersControllerCore extends AdminController class AdminSuppliersControllerCore extends AdminController
{ {
public $bootstrap = true ;
public function __construct() public function __construct()
{ {
$this->table = 'supplier'; $this->table = 'supplier';
controllers/admin/AdminTagsController.php
+2 -2
View File
@@ -26,6 +26,8 @@
class AdminTagsControllerCore extends AdminController class AdminTagsControllerCore extends AdminController
{ {
public $bootstrap = true ;
public function __construct() public function __construct()
{ {
$this->table = 'tag'; $this->table = 'tag';
@@ -35,7 +37,6 @@ class AdminTagsControllerCore extends AdminController
'id_tag' => array( 'id_tag' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center', 'align' => 'center',
'width' => 25,
), ),
'lang' => array( 'lang' => array(
'title' => $this->l('Language'), 'title' => $this->l('Language'),
@@ -43,7 +44,6 @@ class AdminTagsControllerCore extends AdminController
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
'width' => 200,
'filter_key' => 'a!name' 'filter_key' => 'a!name'
), ),
'products' => array( 'products' => array(
controllers/admin/AdminTrackingController.php
+11 -10
View File
@@ -26,6 +26,7 @@
class AdminTrackingControllerCore extends AdminController class AdminTrackingControllerCore extends AdminController
{ {
public $bootstrap = true ;
protected $_helper_list; protected $_helper_list;
public function postprocess() public function postprocess()
@@ -92,10 +93,10 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowActionSkipList('edit', array(Category::getTopCategory()->id)); $this->addRowActionSkipList('edit', array(Category::getTopCategory()->id));
$this->fields_list = (array( $this->fields_list = (array(
'id_category' => array('title' => $this->l('ID'), 'width' => 50), 'id_category' => array('title' => $this->l('ID')),
'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name'), 'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name'),
'description' => array('title' => $this->l('Description')), 'description' => array('title' => $this->l('Description')),
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status', 'width' => 50) 'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status')
)); ));
$this->clearFilters(); $this->clearFilters();
@@ -132,10 +133,10 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowAction('delete'); $this->addRowAction('delete');
$this->fields_list = array( $this->fields_list = array(
'id_product' => array('title' => $this->l('ID'), 'width' => 50), 'id_product' => array('title' => $this->l('ID')),
'reference' => array('title' => $this->l('Reference'), 'width' => 150), 'reference' => array('title' => $this->l('Reference')),
'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name'), 'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name'),
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status', 'width' => 50) 'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status')
); );
$this->clearFilters(); $this->clearFilters();
@@ -176,10 +177,10 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowAction('delete'); $this->addRowAction('delete');
$this->fields_list = array( $this->fields_list = array(
'id_product' => array('title' => $this->l('ID'), 'width' => 50), 'id_product' => array('title' => $this->l('ID')),
'reference' => array('title' => $this->l('Reference'), 'width' => 150), 'reference' => array('title' => $this->l('Reference')),
'name' => array('title' => $this->l('Name')), 'name' => array('title' => $this->l('Name')),
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status', 'width' => 50) 'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status')
); );
$this->clearFilters(); $this->clearFilters();
@@ -219,8 +220,8 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowAction('delete'); $this->addRowAction('delete');
$this->fields_list = array( $this->fields_list = array(
'id_product' => array('title' => $this->l('ID'), 'width' => 50), 'id_product' => array('title' => $this->l('ID')),
'reference' => array('title' => $this->l('Reference'), 'width' => 150), 'reference' => array('title' => $this->l('Reference')),
'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name') 'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name')
); );