Commit Graph

262 Commits

Author SHA1 Message Date
Jerome Nadaud 33b5971a7a [-] BO : FixBug #PSCFV-10558 - Invalid HTML markup. 2013-10-03 09:11:26 +02:00
Vincent Augagneur 3151064daf //small fix on helper form && option 2013-09-17 12:18:37 +02:00
Rémi Gaillard 51083e17af // 2013-08-29 17:18:05 +02:00
Rémi Gaillard c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00
gRoussac a98740d25c // small change, switch two buttons in list_header 2013-08-05 16:39:29 +02:00
jeromenadaud 48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:12:04 +02:00
jeromenadaud b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
Gregory Roussac 07181a37f5 Merge pull request #413 from ccauw/patch-9
[-] BO : bug color parameter in List
2013-08-05 06:37:46 -07:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Shagshag 21cf113c44 twice class attribute in color input 2013-07-25 10:26:53 +02:00
Gregory Roussac 063fd9941c Merge pull request #189 from PrestaEdit/patch-12
[*] BO: use lang for input file
2013-07-24 03:10:00 -07:00
Gregory Roussac ffb62426d8 Merge pull request #516 from PrestaEdit/patch-41
[*] BO: more than one image in HelperForm
2013-07-17 07:44:26 -07:00
Gregory Roussac 5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39
[*] BO: hook displayAdminForm / add param fieldset
2013-07-12 08:56:42 -07:00
PrestaEdit f4a5dd1409 [*] BO: more than one image in HelperForm 2013-06-21 23:02:51 +03:00
Damien Metzger c04d2626f5 // Improved module list view 2013-06-18 15:34:58 +02:00
PrestaEdit f7f6175191 [*] BO: hook displayAdminForm / add param fieldset 2013-05-31 14:58:19 +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
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
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
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
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
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
vAugagneur 8e9826743f [-] BO : fixed Alphabetical sorting of categories 2013-03-25 17:15:57 +01:00
vAugagneur 1b599f1886 [-] BO : fixed Alphabetical sorting of categories 2013-03-25 17:15:57 +01:00
Damien Metzger c7bdca0eca // Improved module list 2013-03-25 10:15:56 +01:00
Damien Metzger 9b28184d2d // Improved module list 2013-03-25 10:15:56 +01:00
Damien Metzger db70f38a89 // Fixed module list 2013-03-22 16:50:46 +01:00
Damien Metzger 571f566af0 // Fixed module list 2013-03-22 16:50:46 +01:00
gRoussac 1b7a914008 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
gRoussac 39b120bbb4 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
gRoussac a6dbe24d28 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +01:00
gRoussac 3b091fad98 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +01:00
gRoussac dfa3e0fcb0 [-] BO : Fix bug #PSCFV-7468 required phone in address creation 2013-03-11 17:39:13 +01:00
gRoussac d73fcdf412 [-] BO : Fix bug #PSCFV-7468 required phone in address creation 2013-03-11 17:39:13 +01:00
sLorenzini 602c11079d [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini ae9b78dc0f [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini 110afe7b69 [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
sLorenzini 4ce88468df [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
vAugagneur 0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur 947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
PrestaEdit d59ea3e6dd [*] BO: use lang for input file 2013-01-17 23:29:11 +01:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00