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

// Add new color option for lists

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9894 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-11-04 15:22:34 +00:00
parent 698da37899
commit 4f2edd0d27
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/list/list_content.tpl
+6
View File
@@ -50,6 +50,9 @@
{else} {else}
> >
{/if} {/if}
{if isset($params.color) && isset($tr[$params.color])}
<span class="color_field" style="background-color: {$tr.color}">
{/if}
{if isset($params.active)} {if isset($params.active)}
{$tr.$key} {$tr.$key}
{elseif isset($params.activeVisu)} {elseif isset($params.activeVisu)}
@@ -89,6 +92,9 @@
-- --
{/if} {/if}
{if isset($params.suffix)}{$params.suffix}{/if} {if isset($params.suffix)}{$params.suffix}{/if}
{if isset($params.color) && isset($tr.color)}
</span>
{/if}
</td> </td>
{/foreach} {/foreach}
controllers/admin/AdminStatusesController.php
+9 -4
View File
@@ -33,7 +33,7 @@ class AdminStatusesControllerCore extends AdminController
$this->className = 'OrderState'; $this->className = 'OrderState';
$this->lang = true; $this->lang = true;
$this->deleted = false; $this->deleted = false;
$this->colorOnBackground = true; $this->colorOnBackground = false;
$this->imageType = 'gif'; $this->imageType = 'gif';
$this->fieldImageSettings = array( $this->fieldImageSettings = array(
@@ -57,12 +57,14 @@ class AdminStatusesControllerCore extends AdminController
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
'width' => 130 'width' => 'auto',
'color' => 'color'
), ),
'logo' => array( 'logo' => array(
'title' => $this->l('Icon'), 'title' => $this->l('Icon'),
'align' => 'center', 'align' => 'center',
'image' => 'os', 'image' => 'os',
'width' => 25,
'orderby' => false, 'orderby' => false,
'search' => false 'search' => false
), ),
@@ -73,12 +75,14 @@ class AdminStatusesControllerCore extends AdminController
'1' => 'enabled.gif', '1' => 'enabled.gif',
'0' => 'disabled.gif' '0' => 'disabled.gif'
), ),
'width' => 25,
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false
), ),
'invoice' => array( 'invoice' => array(
'title' => $this->l('Invoice'), 'title' => $this->l('Invoice'),
'align' => 'center', 'align' => 'center',
'width' => 25,
'icon' => array( 'icon' => array(
'1' => 'enabled.gif', '1' => 'enabled.gif',
'0' => 'disabled.gif' '0' => 'disabled.gif'
@@ -136,8 +140,9 @@ class AdminStatusesControllerCore extends AdminController
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
'align' => 'center', 'align' => 'left',
'width' => 200 'width' => 'auto',
'color' => 'color'
) )
); );