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

// Add row break to color element

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-26 16:43:57 +02:00
parent bc80846d7d
commit fa2f10ffc6
2 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/helpers/form/form.tpl
+11 -7
View File
@@ -528,13 +528,17 @@
{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop} {elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
{$asso_shop} {$asso_shop}
{elseif $input.type == 'color'} {elseif $input.type == 'color'}
<div class="input-group col-lg-2"> <div class="col-lg-2">
<input type="color" <div class="row">
data-hex="true" <div class="input-group">
{if isset($input.class)}class="{$input.class}" <input type="color"
{else}class="color mColorPickerInput"{/if} data-hex="true"
name="{$input.name}" {if isset($input.class)}class="{$input.class}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" /> {else}class="color mColorPickerInput"{/if}
name="{$input.name}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
</div>
</div>
</div> </div>
{elseif $input.type == 'date'} {elseif $input.type == 'date'}
<div class="row"> <div class="row">
controllers/admin/AdminStatusesController.php
+12 -6
View File
@@ -73,7 +73,8 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_order_state' => array( 'id_order_state' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
@@ -85,7 +86,8 @@ class AdminStatusesControllerCore extends AdminController
'align' => 'center', 'align' => 'center',
'image' => 'os', 'image' => 'os',
'orderby' => false, 'orderby' => false,
'search' => false 'search' => false,
'class' => 'fixed-width-xs'
), ),
'send_email' => array( 'send_email' => array(
'title' => $this->l('Send email to customer'), 'title' => $this->l('Send email to customer'),
@@ -95,7 +97,8 @@ class AdminStatusesControllerCore extends AdminController
'0' => 'disabled.gif' '0' => 'disabled.gif'
), ),
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'class' => 'fixed-width-sm'
), ),
'delivery' => array( 'delivery' => array(
'title' => $this->l('Delivery'), 'title' => $this->l('Delivery'),
@@ -105,7 +108,8 @@ class AdminStatusesControllerCore extends AdminController
'0' => 'disabled.gif' '0' => 'disabled.gif'
), ),
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'class' => 'fixed-width-sm'
) )
, ,
'invoice' => array( 'invoice' => array(
@@ -116,7 +120,8 @@ class AdminStatusesControllerCore extends AdminController
'0' => 'disabled.gif' '0' => 'disabled.gif'
), ),
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'class' => 'fixed-width-sm'
), ),
'template' => array( 'template' => array(
'title' => $this->l('Email template') 'title' => $this->l('Email template')
@@ -140,7 +145,8 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_order_return_state' => array( 'id_order_return_state' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),