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

// Added field (bootstrap) size in helper form

Browse Source
This commit is contained in:
Damien Metzger
2013-10-25 10:16:39 +02:00
parent 139ee8f62d
commit 0ca5a24e84
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/customization.tpl
+2 -2
View File
@@ -60,7 +60,7 @@
<label class="control-label col-lg-3"> <label class="control-label col-lg-3">
{l s='Define the label of the file fields:'} {l s='Define the label of the file fields:'}
</label> </label>
<div class="col-lg-9"> <div class="col-lg-6">
{$display_file_labels} {$display_file_labels}
</div> </div>
</div> </div>
@@ -71,7 +71,7 @@
<label class="control-label col-lg-3"> <label class="control-label col-lg-3">
{l s='Define the label of the text fields:'} {l s='Define the label of the text fields:'}
</label> </label>
<div class="col-lg-9"> <div class="col-lg-6">
{$display_text_labels} {$display_text_labels}
</div> </div>
</div> </div>
admin-dev/themes/default/template/controllers/products/prices.tpl
+10 -10
View File
@@ -312,7 +312,7 @@ $(document).ready(function () {
<div id="add_specific_price" class="well" style="display: none;"> <div id="add_specific_price" class="well" style="display: none;">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For'}</label> <label class="control-label col-lg-2" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For'}</label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row"> <div class="row">
{if !$multi_shop} {if !$multi_shop}
@@ -356,8 +356,8 @@ $(document).ready(function () {
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="customer">{l s='Customer'}</label> <label class="control-label col-lg-2" for="customer">{l s='Customer'}</label>
<div class="col-lg-9"> <div class="col-lg-4">
<input type="hidden" name="sp_id_customer" id="id_customer" value="0" /> <input type="hidden" name="sp_id_customer" id="id_customer" value="0" />
<div class="input-group"> <div class="input-group">
<input type="text" name="customer" value="{l s='All customers'}" id="customer" autocomplete="off" /> <input type="text" name="customer" value="{l s='All customers'}" id="customer" autocomplete="off" />
@@ -371,7 +371,7 @@ $(document).ready(function () {
{if $combinations|@count != 0} {if $combinations|@count != 0}
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="sp_id_product_attribute">{l s='Combination:'}</label> <label class="control-label col-lg-2" for="sp_id_product_attribute">{l s='Combination:'}</label>
<div class="col-lg-4"> <div class="col-lg-4">
<select id="sp_id_product_attribute" name="sp_id_product_attribute"> <select id="sp_id_product_attribute" name="sp_id_product_attribute">
<option value="0">{l s='Apply to all combinations'}</option> <option value="0">{l s='Apply to all combinations'}</option>
@@ -384,17 +384,17 @@ $(document).ready(function () {
{/if} {/if}
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="sp_from">{l s='Available'}</label> <label class="control-label col-lg-2" for="sp_from">{l s='Available'}</label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-4">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon">{l s='from'}</span> <span class="input-group-addon">{l s='from'}</span>
<input class="datepicker" type="text" name="sp_from" value="" style="text-align: center" id="sp_from" /> <input class="datepicker" type="text" name="sp_from" value="" style="text-align: center" id="sp_from" />
<span class="input-group-addon"><i class="icon-calendar-empty"></i></span> <span class="input-group-addon"><i class="icon-calendar-empty"></i></span>
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-4">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon">{l s='to'}</span> <span class="input-group-addon">{l s='to'}</span>
<input class="datepicker" type="text" name="sp_to" value="" style="text-align: center" id="sp_to" /> <input class="datepicker" type="text" name="sp_to" value="" style="text-align: center" id="sp_to" />
@@ -406,7 +406,7 @@ $(document).ready(function () {
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="sp_from_quantity">{l s='Starting at'}</label> <label class="control-label col-lg-2" for="sp_from_quantity">{l s='Starting at'}</label>
<div class="input-group col-lg-4"> <div class="input-group col-lg-4">
<span class="input-group-addon">{l s='unit'}</span> <span class="input-group-addon">{l s='unit'}</span>
<input type="text" name="sp_from_quantity" id="sp_from_quantity" value="1" /> <input type="text" name="sp_from_quantity" id="sp_from_quantity" value="1" />
@@ -414,7 +414,7 @@ $(document).ready(function () {
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="sp_price">{l s='Product price'} <label class="control-label col-lg-2" for="sp_price">{l s='Product price'}
{if $country_display_tax_label} {if $country_display_tax_label}
{l s='(tax excl.):'} {l s='(tax excl.):'}
{/if} {/if}
@@ -436,7 +436,7 @@ $(document).ready(function () {
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3" for="sp_reduction">{l s='Apply a discount of:'}</label> <label class="control-label col-lg-2" for="sp_reduction">{l s='Apply a discount of:'}</label>
<div class="col-lg-4"> <div class="col-lg-4">
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
admin-dev/themes/default/template/helpers/form/form.tpl
+1 -1
View File
@@ -76,7 +76,7 @@
{/block} {/block}
{block name="field"} {block name="field"}
<div class="col-lg-9{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"} {block name="input"}
{if $input.type == 'text' || $input.type == 'tags'} {if $input.type == 'text' || $input.type == 'tags'}
{if isset($input.lang) AND $input.lang} {if isset($input.lang) AND $input.lang}
controllers/admin/AdminAttributesGroupsController.php
+3
View File
@@ -185,6 +185,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'name' => 'name', 'name' => 'name',
'lang' => true, 'lang' => true,
'required' => true, 'required' => true,
'col' => '4',
'hint' => $this->l('Invalid characters:').' <>;=#{}' 'hint' => $this->l('Invalid characters:').' <>;=#{}'
), ),
array( array(
@@ -193,6 +194,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'name' => 'public_name', 'name' => 'public_name',
'lang' => true, 'lang' => true,
'required' => true, 'required' => true,
'col' => '4',
'hint' => $this->l('Group name displayed to the customer').'&nbsp;'.$this->l('Invalid characters:').' <>;=#{}' 'hint' => $this->l('Group name displayed to the customer').'&nbsp;'.$this->l('Invalid characters:').' <>;=#{}'
), ),
array( array(
@@ -205,6 +207,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
'id' => 'id', 'id' => 'id',
'name' => 'name' 'name' => 'name'
), ),
'col' => '2',
'hint' => $this->l('Choose the type of the attribute') 'hint' => $this->l('Choose the type of the attribute')
) )
) )
controllers/admin/AdminCategoriesController.php
+7
View File
@@ -402,6 +402,7 @@ class AdminCategoriesControllerCore extends AdminController
'lang' => true, 'lang' => true,
'required' => true, 'required' => true,
'class' => 'copy2friendlyUrl', 'class' => 'copy2friendlyUrl',
'col' => '4',
'hint' => $this->l('Invalid characters:').' <>;=#{}', 'hint' => $this->l('Invalid characters:').' <>;=#{}',
), ),
array( array(
@@ -446,6 +447,7 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Image:'), 'label' => $this->l('Image:'),
'name' => 'image', 'name' => 'image',
'display_image' => true, 'display_image' => true,
'col' => '4',
'hint' => $this->l('Upload a category logo from your computer.') 'hint' => $this->l('Upload a category logo from your computer.')
), ),
array( array(
@@ -453,6 +455,7 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Meta title:'), 'label' => $this->l('Meta title:'),
'name' => 'meta_title', 'name' => 'meta_title',
'lang' => true, 'lang' => true,
'col' => '4',
'hint' => $this->l('Forbidden characters:').' <>;=#{}' 'hint' => $this->l('Forbidden characters:').' <>;=#{}'
), ),
array( array(
@@ -460,6 +463,7 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Meta description:'), 'label' => $this->l('Meta description:'),
'name' => 'meta_description', 'name' => 'meta_description',
'lang' => true, 'lang' => true,
'col' => '6',
'hint' => $this->l('Forbidden characters:').' <>;=#{}' 'hint' => $this->l('Forbidden characters:').' <>;=#{}'
), ),
array( array(
@@ -467,6 +471,7 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Meta keywords:'), 'label' => $this->l('Meta keywords:'),
'name' => 'meta_keywords', 'name' => 'meta_keywords',
'lang' => true, 'lang' => true,
'col' => '6',
'hint' => $this->l('To add "tags," click in the field, write something, and then press "Enter."').'&nbsp;'.$this->l('Forbidden characters:').' <>;=#{}' 'hint' => $this->l('To add "tags," click in the field, write something, and then press "Enter."').'&nbsp;'.$this->l('Forbidden characters:').' <>;=#{}'
), ),
array( array(
@@ -475,6 +480,7 @@ class AdminCategoriesControllerCore extends AdminController
'name' => 'link_rewrite', 'name' => 'link_rewrite',
'lang' => true, 'lang' => true,
'required' => true, 'required' => true,
'col' => '4',
'hint' => $this->l('Only letters and the minus (-) character are allowed.') 'hint' => $this->l('Only letters and the minus (-) character are allowed.')
), ),
array( array(
@@ -486,6 +492,7 @@ class AdminCategoriesControllerCore extends AdminController
'unidentified' => $unidentified_group_information, 'unidentified' => $unidentified_group_information,
'guest' => $guest_group_information, 'guest' => $guest_group_information,
'customer' => $default_group_information, 'customer' => $default_group_information,
'col' => '6',
'hint' => $this->l('Mark all of the customer groups you;d like to have access to this category.') 'hint' => $this->l('Mark all of the customer groups you;d like to have access to this category.')
) )
), ),