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

[-] BO : BugFix : #PSTEST-355 : replacing "Groups Attributes and Attributes" by "Attributes and Values"

Browse Source
This commit is contained in:
vChabot committed 2012-01-11 15:49:35 +00:00
1 parent 99fc1aa711
commit f864d8ed4f
12 files changed
+670 -662
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/performance/form.tpl
+1 -1
View File
@@ -51,8 +51,8 @@
{if $input.type == 'radio' && $input.name == 'combination'} {if $input.type == 'radio' && $input.name == 'combination'}
<ul style="list-style-type:disc;margin:0 0 0 30px;"> <ul style="list-style-type:disc;margin:0 0 0 30px;">
<li>{l s='Combinations tab on product page'}</li> <li>{l s='Combinations tab on product page'}</li>
<li>{l s='Value'}</li>
<li>{l s='Attribute'}</li> <li>{l s='Attribute'}</li>
<li>{l s='Group of attribute'}</li>
</ul> </ul>
{elseif $input.type == 'radio' && $input.name == 'feature'} {elseif $input.type == 'radio' && $input.name == 'feature'}
<ul style="list-style-type:disc;margin:0 0 0 30px;"> <ul style="list-style-type:disc;margin:0 0 0 30px;">
admin-dev/themes/default/template/controllers/products/combinations.tpl
+5 -5
View File
@@ -40,9 +40,9 @@
$('#virtual_good_attributes').hide(); $('#virtual_good_attributes').hide();
{/if} {/if}
var msg_combination_1 = '{l s='Please choose a group'}'; var msg_combination_1 = '{l s='Please choose an attribute'}';
var msg_combination_2 = '{l s='Please choose an attribute'}'; var msg_combination_2 = '{l s='Please choose a value'}';
var msg_combination_3 = '{l s='You can only add one combination per type of group'}'; var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
</script> </script>
@@ -77,7 +77,7 @@
<table cellpadding="5" style="width:100%"> <table cellpadding="5" style="width:100%">
<tr> <tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top"> <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
{l s='Group:'} {l s='Attribute:'}
</td> </td>
<td style="padding-bottom:5px;"> <td style="padding-bottom:5px;">
<select name="attribute_group" id="attribute_group" style="width: 200px;" onchange="populate_attrs();"> <select name="attribute_group" id="attribute_group" style="width: 200px;" onchange="populate_attrs();">
@@ -91,7 +91,7 @@
</tr> </tr>
<tr> <tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top"> <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" valign="top">
{l s='Attribute:'} {l s='Value:'}
</td> </td>
<td style="padding-bottom:5px;"> <td style="padding-bottom:5px;">
<select name="attribute" id="attribute" style="width: 200px;"> <select name="attribute" id="attribute" style="width: 200px;">
controllers/admin/AdminAttributesGroupsController.php
+11 -11
View File
@@ -179,7 +179,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
'title' => $this->l('Attributes group'), 'title' => $this->l('Attributes'),
'image' => '../img/admin/asterisk.gif' 'image' => '../img/admin/asterisk.gif'
), ),
'input' => array( 'input' => array(
@@ -204,7 +204,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
), ),
array( array(
'type' => 'select', 'type' => 'select',
'label' => $this->l('Group type:'), 'label' => $this->l('Attribute type:'),
'name' => 'group_type', 'name' => 'group_type',
'required' => true, 'required' => true,
'options' => array( 'options' => array(
@@ -212,7 +212,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'id' => 'id', 'id' => 'id',
'name' => 'name' 'name' => 'name'
), ),
'desc' => $this->l('Choose the type of the attribute group') 'desc' => $this->l('Choose the type of the attribute')
) )
) )
); );
@@ -246,13 +246,13 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
'title' => $this->l('Attribute'), 'title' => $this->l('Values'),
'image' => '../img/admin/asterisk.gif' 'image' => '../img/admin/asterisk.gif'
), ),
'input' => array( 'input' => array(
array( array(
'type' => 'select', 'type' => 'select',
'label' => $this->l('Group type:'), 'label' => $this->l('Attribute type:'),
'name' => 'id_attribute_group', 'name' => 'id_attribute_group',
'required' => true, 'required' => true,
'options' => array( 'options' => array(
@@ -260,7 +260,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'id' => 'id_attribute_group', 'id' => 'id_attribute_group',
'name' => 'name' 'name' => 'name'
), ),
'desc' => $this->l('Choose the type of the attribute group') 'desc' => $this->l('Choose the type of the attribute')
), ),
array( array(
'type' => 'text', 'type' => 'text',
@@ -431,11 +431,11 @@ class AdminAttributesGroupsControllerCore extends AdminController
default: // list default: // list
$this->toolbar_btn['new'] = array( $this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token, 'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new Group') 'desc' => $this->l('Add new Attributes')
); );
$this->toolbar_btn['newAttributes'] = array( $this->toolbar_btn['newAttributes'] = array(
'href' => self::$currentIndex.'&amp;updateattribute&amp;token='.$this->token, 'href' => self::$currentIndex.'&amp;updateattribute&amp;token='.$this->token,
'desc' => $this->l('Add new Attributes'), 'desc' => $this->l('Add new Values'),
'class' => 'toolbar-new' 'class' => 'toolbar-new'
); );
} }
@@ -453,17 +453,17 @@ class AdminAttributesGroupsControllerCore extends AdminController
{ {
case 'edit': case 'edit':
$current_tab = array_pop($tabs); $current_tab = array_pop($tabs);
$tabs[] = array('name' => $this->l('Edit new Group')); $tabs[] = array('name' => $this->l('Edit new Attribute'));
break; break;
case 'add': case 'add':
$current_tab = array_pop($tabs); $current_tab = array_pop($tabs);
$tabs[] = array('name' => $this->l('Add new Group')); $tabs[] = array('name' => $this->l('Add new Attribute'));
break; break;
case 'editAttributes': case 'editAttributes':
$current_tab = array_pop($tabs); $current_tab = array_pop($tabs);
$tabs[] = array('name' => $this->l('Add new Attribute')); $tabs[] = array('name' => $this->l('Add new Value'));
break; break;
} }
// note : this should use a tpl file // note : this should use a tpl file
install-new/data/xml/access.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<access id="access_1_8" id_profile="SuperAdmin" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/> <access id="access_1_8" id_profile="SuperAdmin" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_9" id_profile="SuperAdmin" id_tab="Tools" view="1" add="1" edit="1" delete="1"/> <access id="access_1_9" id_profile="SuperAdmin" id_tab="Tools" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_10" id_profile="SuperAdmin" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/> <access id="access_1_10" id_profile="SuperAdmin" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_11" id_profile="SuperAdmin" id_tab="Attributes_and_Groups" view="1" add="1" edit="1" delete="1"/> <access id="access_1_11" id_profile="SuperAdmin" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_12" id_profile="SuperAdmin" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/> <access id="access_1_12" id_profile="SuperAdmin" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_13" id_profile="SuperAdmin" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/> <access id="access_1_13" id_profile="SuperAdmin" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_14" id_profile="SuperAdmin" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/> <access id="access_1_14" id_profile="SuperAdmin" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
install-new/data/xml/tab.xml
+1 -1
View File
@@ -78,7 +78,7 @@
<tab id="Suppliers" id_parent="Catalog" active="1"> <tab id="Suppliers" id_parent="Catalog" active="1">
<class_name>AdminSuppliers</class_name> <class_name>AdminSuppliers</class_name>
</tab> </tab>
<tab id="Attributes_and_Groups" id_parent="Catalog" active="1"> <tab id="Attributes_and_Values" id_parent="Catalog" active="1">
<class_name>AdminAttributesGroups</class_name> <class_name>AdminAttributesGroups</class_name>
</tab> </tab>
<tab id="Features" id_parent="Catalog" active="1"> <tab id="Features" id_parent="Catalog" active="1">
install-new/fixtures/apple/data/access.xml
+4 -4
View File
@@ -19,7 +19,7 @@
<access id="access_2_8" id_profile="Administrator" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/> <access id="access_2_8" id_profile="Administrator" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_9" id_profile="Administrator" id_tab="Tools" view="1" add="1" edit="1" delete="1"/> <access id="access_2_9" id_profile="Administrator" id_tab="Tools" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_10" id_profile="Administrator" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/> <access id="access_2_10" id_profile="Administrator" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_11" id_profile="Administrator" id_tab="Attributes_and_Groups" view="1" add="1" edit="1" delete="1"/> <access id="access_2_11" id_profile="Administrator" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_12" id_profile="Administrator" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/> <access id="access_2_12" id_profile="Administrator" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_13" id_profile="Administrator" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/> <access id="access_2_13" id_profile="Administrator" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_14" id_profile="Administrator" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/> <access id="access_2_14" id_profile="Administrator" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
@@ -118,7 +118,7 @@
<access id="access_3_8" id_profile="Logistician" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/> <access id="access_3_8" id_profile="Logistician" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
<access id="access_3_9" id_profile="Logistician" id_tab="Tools" view="0" add="0" edit="0" delete="0"/> <access id="access_3_9" id_profile="Logistician" id_tab="Tools" view="0" add="0" edit="0" delete="0"/>
<access id="access_3_10" id_profile="Logistician" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/> <access id="access_3_10" id_profile="Logistician" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/>
<access id="access_3_11" id_profile="Logistician" id_tab="Attributes_and_Groups" view="0" add="0" edit="0" delete="0"/> <access id="access_3_11" id_profile="Logistician" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
<access id="access_3_12" id_profile="Logistician" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/> <access id="access_3_12" id_profile="Logistician" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_13" id_profile="Logistician" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/> <access id="access_3_13" id_profile="Logistician" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_14" id_profile="Logistician" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/> <access id="access_3_14" id_profile="Logistician" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
@@ -215,7 +215,7 @@
<access id="access_4_8" id_profile="Translator" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/> <access id="access_4_8" id_profile="Translator" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
<access id="access_4_9" id_profile="Translator" id_tab="Tools" view="1" add="0" edit="0" delete="0"/> <access id="access_4_9" id_profile="Translator" id_tab="Tools" view="1" add="0" edit="0" delete="0"/>
<access id="access_4_10" id_profile="Translator" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/> <access id="access_4_10" id_profile="Translator" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/>
<access id="access_4_11" id_profile="Translator" id_tab="Attributes_and_Groups" view="0" add="0" edit="0" delete="0"/> <access id="access_4_11" id_profile="Translator" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
<access id="access_4_12" id_profile="Translator" id_tab="Addresses" view="0" add="0" edit="0" delete="0"/> <access id="access_4_12" id_profile="Translator" id_tab="Addresses" view="0" add="0" edit="0" delete="0"/>
<access id="access_4_13" id_profile="Translator" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/> <access id="access_4_13" id_profile="Translator" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/>
<access id="access_4_14" id_profile="Translator" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/> <access id="access_4_14" id_profile="Translator" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
@@ -313,7 +313,7 @@
<access id="access_5_8" id_profile="Salesman" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/> <access id="access_5_8" id_profile="Salesman" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
<access id="access_5_9" id_profile="Salesman" id_tab="Tools" view="0" add="0" edit="0" delete="0"/> <access id="access_5_9" id_profile="Salesman" id_tab="Tools" view="0" add="0" edit="0" delete="0"/>
<access id="access_5_10" id_profile="Salesman" id_tab="Manufacturers" view="1" add="0" edit="0" delete="0"/> <access id="access_5_10" id_profile="Salesman" id_tab="Manufacturers" view="1" add="0" edit="0" delete="0"/>
<access id="access_5_11" id_profile="Salesman" id_tab="Attributes_and_Groups" view="0" add="0" edit="0" delete="0"/> <access id="access_5_11" id_profile="Salesman" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
<access id="access_5_12" id_profile="Salesman" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/> <access id="access_5_12" id_profile="Salesman" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
<access id="access_5_13" id_profile="Salesman" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/> <access id="access_5_13" id_profile="Salesman" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/>
<access id="access_5_14" id_profile="Salesman" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/> <access id="access_5_14" id_profile="Salesman" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
install-new/langs/de/data/tab.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<tab id="Monitoring" name="Tracking"/> <tab id="Monitoring" name="Tracking"/>
<tab id="Manufacturers" name="Hersteller"/> <tab id="Manufacturers" name="Hersteller"/>
<tab id="Suppliers" name="Zulieferer"/> <tab id="Suppliers" name="Zulieferer"/>
<tab id="Attributes_and_Groups" name="Attribute und Gruppen"/> <tab id="Attributes_and_Values" name="Attribute und Werte"/>
<tab id="Features" name="Funktionen"/> <tab id="Features" name="Funktionen"/>
<tab id="Image_Mapping" name="Image Mapping"/> <tab id="Image_Mapping" name="Image Mapping"/>
<tab id="Tags" name="Tags"/> <tab id="Tags" name="Tags"/>
install-new/langs/en/data/tab.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<tab id="Monitoring" name="Monitoring"/> <tab id="Monitoring" name="Monitoring"/>
<tab id="Manufacturers" name="Manufacturers"/> <tab id="Manufacturers" name="Manufacturers"/>
<tab id="Suppliers" name="Suppliers"/> <tab id="Suppliers" name="Suppliers"/>
<tab id="Attributes_and_Groups" name="Attributes and Groups"/> <tab id="Attributes_and_Values" name="Attributes and Values"/>
<tab id="Features" name="Features"/> <tab id="Features" name="Features"/>
<tab id="Image_Mapping" name="Image Mapping"/> <tab id="Image_Mapping" name="Image Mapping"/>
<tab id="Tags" name="Tags"/> <tab id="Tags" name="Tags"/>
install-new/langs/es/data/tab.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<tab id="Monitoring" name="Rastreo"/> <tab id="Monitoring" name="Rastreo"/>
<tab id="Manufacturers" name="Fabricantes"/> <tab id="Manufacturers" name="Fabricantes"/>
<tab id="Suppliers" name="Proveedores"/> <tab id="Suppliers" name="Proveedores"/>
<tab id="Attributes_and_Groups" name="Atributos y grupos"/> <tab id="Attributes_and_Values" name="Atributos y Valores"/>
<tab id="Features" name="Caracter&#xED;sticas"/> <tab id="Features" name="Caracter&#xED;sticas"/>
<tab id="Image_Mapping" name="Mapeo de la imagen"/> <tab id="Image_Mapping" name="Mapeo de la imagen"/>
<tab id="Tags" name="Etiquetas"/> <tab id="Tags" name="Etiquetas"/>
install-new/langs/fr/data/tab.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<tab id="Monitoring" name="Suivi"/> <tab id="Monitoring" name="Suivi"/>
<tab id="Manufacturers" name="Marques"/> <tab id="Manufacturers" name="Marques"/>
<tab id="Suppliers" name="Fournisseurs"/> <tab id="Suppliers" name="Fournisseurs"/>
<tab id="Attributes_and_Groups" name="Attributs et groupes"/> <tab id="Attributes_and_Values" name="Attributs et Valeurs"/>
<tab id="Features" name="Caract&#xE9;ristiques"/> <tab id="Features" name="Caract&#xE9;ristiques"/>
<tab id="Image_Mapping" name="Sc&#xE8;nes"/> <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
<tab id="Tags" name="Tags"/> <tab id="Tags" name="Tags"/>
install-new/langs/it/data/tab.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<tab id="Monitoring" name="Rintracciare"/> <tab id="Monitoring" name="Rintracciare"/>
<tab id="Manufacturers" name="Produttori"/> <tab id="Manufacturers" name="Produttori"/>
<tab id="Suppliers" name="Fornitori"/> <tab id="Suppliers" name="Fornitori"/>
<tab id="Attributes_and_Groups" name="Attributi e Gruppi"/> <tab id="Attributes_and_Values" name="Attributi e Valori"/>
<tab id="Features" name="Caratteristiche"/> <tab id="Features" name="Caratteristiche"/>
<tab id="Image_Mapping" name="Mappatura immagine"/> <tab id="Image_Mapping" name="Mappatura immagine"/>
<tab id="Tags" name="Tag"/> <tab id="Tags" name="Tag"/>
translations/fr/admin.php
+642 -634
View File
File diff suppressed because it is too large. Load diff