Commit Graph

4313 Commits

Author SHA1 Message Date
sLorenzini dc2b69f699 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Damien Metzger 548ef7691a // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Damien Metzger e56ec2f234 // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
ccauw 8331ab0c1a [-]BO : bug color parameter in List
[-]BO : bug color parameter in List

In field list, if there is another field with 'color' => 'color_field', (and color_field column in the select), the background color is always the value of field list column 'color', never 'color_field'

the lines:
			{block name="td_content"}
				...
				{if isset($params.color) && isset($tr[$params.color])}
					<span class="color_field" style="background-color:{$tr.color};...
				{/if}

must be:
			{block name="td_content"}
				...
				{if isset($params.color) && isset($tr[$params.color])}
					<span class="color_field" style="background-color:{$tr[$params.color])};...
				{/if}

In the fields list, for display list, there is :
'osname' => array(
	'title' => $this->l('Status'),
	'color' => 'color',
	...
),
'color parameter gives the name of column in _List to be used as color background.
Currently, it is the same 'color' parameter which is used for one field and the row: (ex:osname)
		<span class="color_field" style="background-color:{$tr.color};...

But if there is another field with 'color' => 'color_field', (and color_field in the select), the background color is always 'color', never 'color_field'
That can be fixed with :
		<span class="color_field" style="background-color:{$tr[$params.color])};...

So the background color of the row (if colorOnBackground = true) and one row's field will be the value of the column given by 'color'=>'color', and The background color of others fields will be the value of the column given by their parameter 'color'=>'<color_field>'

$this->_select = '..color ..., ... color_field2 ...';

$this->fields_list = array(
		'field1' => array(
			'title' => $this->l('Status'),
			'color' => 'color',			// will also be the bg color of the row
			...
		),
		'field2' => array(
			'title' => $this->l('Status'),
			'color' => 'color_field2',
			...
		),
		'field2' => array(
			'title' => $this->l('Status'),
			'color' => 'color_field3',
			...
		),
2013-04-28 16:01:55 +03:00
Damien Metzger 6251815c37 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Damien Metzger 1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
François Gaillard 6106066ef1 // Release branch merged 2013-04-25 17:00:56 +02:00
Francois Gaillard 8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
gRoussac 125884d8c0 [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
gRoussac 91ab0362db [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
Damien Metzger b2b17eb041 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger 7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
gRoussac 1975755d8a [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
gRoussac 7081e6d0d0 [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
Damien Metzger d16f30f322 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Damien Metzger 9eb84825a6 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Damien Metzger 4162591e3e // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Damien Metzger c191b36fb6 // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Vincent Augagneur d1c7f9c012 Merge pull request #390 from ccauw/patch-7
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
Vincent Augagneur 5e9ba185ef Merge pull request #390 from ccauw/patch-7
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
Damien Metzger 4be1bef203 // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Damien Metzger d8313760ec // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Damien Metzger 4e21c56d1b // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
Damien Metzger 7ce6502600 // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
vAugagneur 5fb2bb9ee2 [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
vAugagneur 3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
Damien Metzger 141772725b // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Damien Metzger e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Vincent Augagneur 7c43ae05fc Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
Vincent Augagneur c643abcfa2 Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
gRoussac f93c7ec8c7 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
gRoussac 6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
ldecoker 624fed3710 Update form.tpl 2013-04-16 19:15:45 +03:00
ldecoker 4783cb17c5 ";" in wrong place
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ldecoker a40f61e922 ";" in wrong place
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ccauw f7ef4e0350 [*] BO : Add block "override_form_extra" in helper
[*] BO : Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
ccauw 205e21ba16 [*] BO : Add block "override_form_extra" in helper
[*] BO : Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
vAugagneur 7c626218df Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur e271524cc4 Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur 70176f07e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:35:33 +02:00
vAugagneur 621ca4a29b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:35:33 +02:00
vAugagneur 661ddd7548 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
vAugagneur 5757e56864 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
ccauw 7711c710d4 [*] BO : Add block "close_td" in list_content.tpl
[*] BO : Add block "close_td" in list_content.tpl

{block name="td_content"}
.....
{/block}
{block name="close_td"}

{/block}

So now we can override "td" and "/td" tags.
So we can create

"td" "a" ... content.... "/a" "/td"

when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
ccauw 6e58a24325 [*] BO : Add block "close_td" in list_content.tpl
[*] BO : Add block "close_td" in list_content.tpl

{block name="td_content"}
.....
{/block}
{block name="close_td"}

{/block}

So now we can override "td" and "/td" tags.
So we can create

"td" "a" ... content.... "/a" "/td"

when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
sLorenzini 1ebd625563 [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
sLorenzini a7d61c551e [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
Rémi Gaillard 305cf4dd9c [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
Rémi Gaillard 4a1892843a [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
gRoussac a0db01db58 // removed slash 2013-04-09 17:47:34 +02:00