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

// Fields resizing

Browse Source
This commit is contained in:
Damien Metzger
2013-10-25 11:25:13 +02:00
parent d59c83e64d
commit 087d0d8206
9 changed files with 90 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+1 -1
View File
@@ -85,7 +85,7 @@
});
</script>
<div class="col-lg-9">
<div class="col-lg-4">
<input type="text" id="email" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}"/>
</div>
{/if}
admin-dev/themes/default/template/helpers/form/form.tpl
+2 -2
View File
@@ -76,7 +76,7 @@
{/block}
{block name="field"}
<div class="col-lg-{if isset($input.col)}{$input.col|intval}{else}9{/if}{if !isset($input.label)} col-lg-offset-3{/if}">
<div class="col-lg-{if isset($input.col)}{$input.col|intval}{else}9{/if} {if !isset($input.label)}col-lg-offset-3{/if}">
{block name="input"}
{if $input.type == 'text' || $input.type == 'tags'}
{if isset($input.lang) AND $input.lang}
@@ -516,7 +516,7 @@
{elseif $input.type == 'birthday'}
<div class="form-group">
{foreach $input.options as $key => $select}
<div class="col-lg-4">
<div class="col-lg-2">
<select name="{$key}" class="{if isset($input.class)}{$input.class}{/if}">
<option value="">-</option>
{if $key == 'months'}
controllers/admin/AdminAddressesController.php
+14
View File
@@ -114,6 +114,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Identification Number'),
'name' => 'dni',
'required' => false,
'col' => '4',
'hint' => $this->l('DNI / NIF / NIE')
),
array(
@@ -121,6 +122,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Address alias'),
'name' => 'alias',
'required' => true,
'col' => '4',
'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}'
),
array(
@@ -128,6 +130,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Home phone'),
'name' => 'phone',
'required' => false,
'col' => '4',
'hint' => Configuration::get('PS_ONE_PHONE_AT_LEAST') ? sprintf($this->l('You must register at least one phone number')) : ''
),
array(
@@ -135,6 +138,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Mobile phone'),
'name' => 'phone_mobile',
'required' => false,
'col' => '4',
'hint' => Configuration::get('PS_ONE_PHONE_AT_LEAST') ? sprintf($this->l('You must register at least one phone number')) : ''
),
array(
@@ -182,11 +186,13 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Company'),
'name' => 'company',
'required' => false,
'col' => '4',
'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}'
);
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('VAT number'),
'col' => '2',
'name' => 'vat_number'
);
}
@@ -205,6 +211,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Last Name'),
'name' => 'lastname',
'required' => true,
'col' => '4',
'hint' => $this->l('Invalid characters:').' 0-9!&amp;lt;&amp;gt;,;?=+()@#"�{}_$%:',
'default_value' => $default_value,
);
@@ -224,6 +231,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('First Name'),
'name' => 'firstname',
'required' => true,
'col' => '4',
'hint' => $this->l('Invalid characters:').' 0-9!&amp;lt;&amp;gt;,;?=+()@#"�{}_$%:',
'default_value' => $default_value,
);
@@ -234,6 +242,7 @@ class AdminAddressesControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Address'),
'name' => 'address1',
'col' => '6',
'required' => true,
);
}
@@ -243,6 +252,7 @@ class AdminAddressesControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Address').' (2)',
'name' => 'address2',
'col' => '6',
'required' => false,
);
}
@@ -252,6 +262,7 @@ class AdminAddressesControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Zip/Postal Code'),
'name' => 'postcode',
'col' => '2',
'required' => true,
);
}
@@ -261,6 +272,7 @@ class AdminAddressesControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('City'),
'name' => 'city',
'col' => '4',
'required' => true,
);
}
@@ -271,6 +283,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('Country'),
'name' => 'id_country',
'required' => false,
'col' => '4',
'default_value' => (int)$this->context->country->id,
'options' => array(
'query' => Country::getCountries($this->context->language->id),
@@ -283,6 +296,7 @@ class AdminAddressesControllerCore extends AdminController
'label' => $this->l('State'),
'name' => 'id_state',
'required' => false,
'col' => '4',
'options' => array(
'query' => array(),
'id' => 'id_state',
controllers/admin/AdminContactsController.php
+3
View File
@@ -60,6 +60,7 @@ class AdminContactsControllerCore extends AdminController
'name' => 'name',
'required' => true,
'lang' => true,
'col' => 4,
'hint' => $this->l('Contact name (e.g. Customer Support)'),
),
array(
@@ -67,6 +68,7 @@ class AdminContactsControllerCore extends AdminController
'label' => $this->l('Email address'),
'name' => 'email',
'required' => false,
'col' => 4,
'hint' => $this->l('Emails will be sent to this address'),
),
array(
@@ -96,6 +98,7 @@ class AdminContactsControllerCore extends AdminController
'name' => 'description',
'required' => false,
'lang' => true,
'col' => 6,
'hint' => $this->l('Further information regarding this contact'),
),
),
controllers/admin/AdminCustomersController.php
+31 -24
View File
@@ -284,6 +284,7 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('First name:'),
'name' => 'firstname',
'required' => true,
'col' => '4',
'hint' => $this->l('Forbidden characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:'
),
array(
@@ -291,12 +292,14 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('Last name:'),
'name' => 'lastname',
'required' => true,
'col' => '4',
'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:'
),
array(
'type' => 'text',
'label' => $this->l('Email address:'),
'name' => 'email',
'col' => '4',
'required' => true
),
array(
@@ -304,6 +307,7 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('Password:'),
'name' => 'passwd',
'required' => ($obj->id ? false : true),
'col' => '4',
'hint' => ($obj->id ? $this->l('Leave this field blank if there\'s no change') : $this->l('Minimum of five characters (only letters and numbers).').' -_')
),
array(
@@ -392,32 +396,35 @@ class AdminCustomersControllerCore extends AdminController
unset($groups[$key]);
}
$this->fields_form['input'] = array_merge($this->fields_form['input'],
$this->fields_form['input'] = array_merge(
$this->fields_form['input'],
array(
array(
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => $groups,
'required' => true,
'hint' => $this->l('Select all the groups that you would like to apply to this customer.')
),
array(
'type' => 'select',
'label' => $this->l('Default customer group:'),
'name' => 'id_default_group',
'options' => array(
'query' => $groups,
'id' => 'id_group',
'name' => 'name'
),
'hint' => array(
$this->l('The group will be as applied by default.'),
$this->l('Apply the discount\'s price of this group.')
)
)
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => $groups,
'required' => true,
'col' => '6',
'hint' => $this->l('Select all the groups that you would like to apply to this customer.')
),
array(
'type' => 'select',
'label' => $this->l('Default customer group:'),
'name' => 'id_default_group',
'options' => array(
'query' => $groups,
'id' => 'id_group',
'name' => 'name'
),
'col' => '4',
'hint' => array(
$this->l('The group will be as applied by default.'),
$this->l('Apply the discount\'s price of this group.')
)
);
)
)
);
// if customer is a guest customer, password hasn't to be there
if ($obj->id && ($obj->is_guest && $obj->id_default_group == Configuration::get('PS_GUEST_GROUP')))
controllers/admin/AdminGendersController.php
+4
View File
@@ -110,6 +110,7 @@ class AdminGendersControllerCore extends AdminController
'label' => $this->l('Name:'),
'name' => 'name',
'lang' => true,
'col' => 4,
'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:',
'required' => true
),
@@ -141,18 +142,21 @@ class AdminGendersControllerCore extends AdminController
'type' => 'file',
'label' => $this->l('Image:'),
'name' => 'image',
'col' => 6,
'value' => true
),
array(
'type' => 'text',
'label' => $this->l('Image Width:'),
'name' => 'img_width',
'col' => 2,
'hint' => $this->l('Image width in pixels. Enter "0" to use the original size.')
),
array(
'type' => 'text',
'label' => $this->l('Image Height:'),
'name' => 'img_height',
'col' => 2,
'hint' => $this->l('Image height in pixels. Enter "0" to use the original size.')
)
),
controllers/admin/AdminGroupsController.php
+4 -1
View File
@@ -240,7 +240,7 @@ class AdminGroupsControllerCore extends AdminController
'icon' => 'icon-group'
),
'submit' => array(
'title' => $this->l('Save '),
'title' => $this->l('Save'),
'class' => 'btn btn-default'
),
'input' => array(
@@ -250,18 +250,21 @@ class AdminGroupsControllerCore extends AdminController
'name' => 'name',
'required' => true,
'lang' => true,
'col' => 4,
'hint' => $this->l('Forbidden characters:').' 0-9!&amp;lt;&amp;gt;,;?=+()@#"�{}_$%:'
),
array(
'type' => 'text',
'label' => $this->l('Discount (%):'),
'name' => 'reduction',
'col' => 2,
'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.')
),
array(
'type' => 'select',
'label' => $this->l('Price display method:'),
'name' => 'price_display_method',
'col' => 2,
'hint' => $this->l('How prices are displayed in the order summary for this customer group.'),
'options' => array(
'query' => array(
controllers/admin/AdminManufacturersController.php
+20 -1
View File
@@ -279,6 +279,7 @@ class AdminManufacturersControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Name:'),
'name' => 'name',
'col' => 4,
'required' => true,
'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}'
),
@@ -290,6 +291,7 @@ class AdminManufacturersControllerCore extends AdminController
'cols' => 60,
'rows' => 10,
'autoload_rte' => 'rte', //Enable TinyMCE editor for short description
'col' => 6,
'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}'
),
array(
@@ -299,6 +301,7 @@ class AdminManufacturersControllerCore extends AdminController
'lang' => true,
'cols' => 60,
'rows' => 10,
'col' => 6,
'autoload_rte' => 'rte', //Enable TinyMCE editor for description
'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}'
),
@@ -307,6 +310,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Logo:'),
'name' => 'logo',
'display_image' => true,
'col' => 6,
'hint' => $this->l('Upload a manufacturer logo from your computer.')
),
array(
@@ -314,6 +318,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Meta title:'),
'name' => 'meta_title',
'lang' => true,
'col' => 4,
'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}'
),
array(
@@ -321,6 +326,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Meta description:'),
'name' => 'meta_description',
'lang' => true,
'col' => 6,
'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}'
),
array(
@@ -328,6 +334,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Meta keywords:'),
'name' => 'meta_keywords',
'lang' => true,
'col' => 6,
'hint' => array(
$this->l('Forbidden characters:').' &lt;&gt;;=#{}',
$this->l('To add "tags," click inside the field, write something, and then press "Enter."')
@@ -432,6 +439,7 @@ class AdminManufacturersControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Manufacturer:'),
'name' => 'name',
'col' => 4,
'disabled' => true,
);
@@ -456,6 +464,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Last name:'),
'name' => 'lastname',
'required' => true,
'col' => 4,
'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:'
);
$form['input'][] = array(
@@ -463,24 +472,28 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('First name:'),
'name' => 'firstname',
'required' => true,
'col' => 4,
'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:'
);
$form['input'][] = array(
'type' => 'text',
'label' => $this->l('Address:'),
'name' => 'address1',
'col' => 6,
'required' => true,
);
$form['input'][] = array(
'type' => 'text',
'label' => $this->l('Address (2):'),
'name' => 'address2',
'col' => 6,
'required' => false,
);
$form['input'][] = array(
'type' => 'text',
'label' => $this->l('Zip Code/Postal Code'),
'name' => 'postcode',
'col' => 2,
'required' => true,
'required' => false,
);
@@ -488,6 +501,7 @@ class AdminManufacturersControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('City:'),
'name' => 'city',
'col' => 4,
'required' => true,
);
$form['input'][] = array(
@@ -496,6 +510,7 @@ class AdminManufacturersControllerCore extends AdminController
'name' => 'id_country',
'required' => false,
'default_value' => (int)$this->context->country->id,
'col' => 4,
'options' => array(
'query' => Country::getCountries($this->context->language->id),
'id' => 'id_country',
@@ -507,6 +522,7 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('State:'),
'name' => 'id_state',
'required' => false,
'col' => 4,
'options' => array(
'query' => array(),
'id' => 'id_state',
@@ -517,12 +533,14 @@ class AdminManufacturersControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Home phone:'),
'name' => 'phone',
'col' => 4,
'required' => false,
);
$form['input'][] = array(
'type' => 'text',
'label' => $this->l('Mobile phone:'),
'name' => 'phone_mobile',
'col' => 4,
'required' => false,
);
$form['input'][] = array(
@@ -532,7 +550,8 @@ class AdminManufacturersControllerCore extends AdminController
'required' => false,
'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}',
'rows' => 2,
'cols' => 10
'cols' => 10,
'col' => 6,
);
$form['submit'] = array(
'title' => $this->l('Save '),
controllers/admin/AdminSuppliersController.php
+11
View File
@@ -103,6 +103,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Name'),
'name' => 'name',
'required' => true,
'col' => 4,
'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}',
),
array(
@@ -121,6 +122,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Phone:'),
'name' => 'phone',
'maxlength' => 16,
'col' => 4,
'hint' => $this->l('Phone number for this supplier')
),
array(
@@ -128,12 +130,14 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Address:'),
'name' => 'address',
'maxlength' => 128,
'col' => 6,
'required' => true
),
array(
'type' => 'text',
'label' => $this->l('Address:').' (2)',
'name' => 'address2',
'col' => 6,
'maxlength' => 128,
),
array(
@@ -141,6 +145,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Postal Code/Zip Code:'),
'name' => 'postcode',
'maxlength' => 12,
'col' => 2,
'required' => true,
),
array(
@@ -148,6 +153,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('City:'),
'name' => 'city',
'maxlength' => 32,
'col' => 4,
'required' => true,
),
array(
@@ -155,6 +161,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Country:'),
'name' => 'id_country',
'required' => true,
'col' => 4,
'default_value' => (int)$this->context->country->id,
'options' => array(
'query' => Country::getCountries($this->context->language->id, false),
@@ -166,6 +173,7 @@ class AdminSuppliersControllerCore extends AdminController
'type' => 'select',
'label' => $this->l('State'),
'name' => 'id_state',
'col' => 4,
'options' => array(
'id' => 'id_state',
'query' => array(),
@@ -184,6 +192,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Meta title:'),
'name' => 'meta_title',
'lang' => true,
'col' => 4,
'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}'
),
array(
@@ -191,6 +200,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Meta description:'),
'name' => 'meta_description',
'lang' => true,
'col' => 6,
'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}'
),
array(
@@ -198,6 +208,7 @@ class AdminSuppliersControllerCore extends AdminController
'label' => $this->l('Meta keywords:'),
'name' => 'meta_keywords',
'lang' => true,
'col' => 6,
'hint' => array(
$this->l('To add "tags" click in the field, write something and then press "Enter"'),
$this->l('Forbidden characters:').' &lt;&gt;;=#{}'