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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-10-02 17:50:50 +02:00
2 parents 2a984186a9 19af1cfda5
commit c88ea275ab
4 files changed
+28 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/helpers/list/list_content.tpl
+9 -4
View File
@@ -59,7 +59,7 @@
{block name="td_content"} {block name="td_content"}
{if isset($params.prefix)}{$params.prefix}{/if} {if isset($params.prefix)}{$params.prefix}{/if}
{if isset($params.color) && isset($tr[$params.color])} {if isset($params.color) && isset($tr[$params.color])}
<span class="label color_field" style="font-size:100%;background-color:{$tr[$params.color]};color:{if Tools::getBrightness($tr[$params.color]) < 128}white{else}#383838{/if}"> <span class="label color_field" style="background-color:{$tr[$params.color]};color:{if Tools::getBrightness($tr[$params.color]) < 128}white{else}#383838{/if}">
{/if} {/if}
{if isset($tr.$key)} {if isset($tr.$key)}
{if isset($params.active)} {if isset($params.active)}
@@ -87,7 +87,11 @@
{$tr.$key} {$tr.$key}
{elseif isset($params.icon)} {elseif isset($params.icon)}
{if is_array($tr[$key])} {if is_array($tr[$key])}
<img src="../img/admin/{$tr[$key]['src']}" alt="{$tr[$key]['alt']}" title="{$tr[$key]['alt']}" /> {if isset($tr[$key]['class'])}
<i class="{$tr[$key]['class']}"></i>
{else}
<img src="../img/admin/{$tr[$key]['src']}" alt="{$tr[$key]['alt']}" title="{$tr[$key]['alt']}" />
{/if}
{/if} {/if}
{elseif isset($params.price)} {elseif isset($params.price)}
{$tr.$key} {$tr.$key}
@@ -107,7 +111,7 @@
{elseif isset($params.callback)} {elseif isset($params.callback)}
{$tr.$key} {$tr.$key}
{elseif $key == 'color'} {elseif $key == 'color'}
<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div> <div style="background-color: {$tr.$key}"></div>
{elseif isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength} {elseif isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength}
<span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span> <span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span>
{else} {else}
@@ -132,7 +136,8 @@
{$tr.shop_short_name} {$tr.shop_short_name}
{else} {else}
{$tr.shop_name} {$tr.shop_name}
{/if}</td> {/if}
</td>
{/if} {/if}
{if $has_actions} {if $has_actions}
<td class="text-right"> <td class="text-right">
classes/controller/AdminController.php
+1
View File
@@ -1861,6 +1861,7 @@ class AdminControllerCore extends Controller
$helper->position_identifier = $this->position_identifier; $helper->position_identifier = $this->position_identifier;
$helper->controller_name = $this->controller_name; $helper->controller_name = $this->controller_name;
$helper->list_id = isset($this->list_id) ? $this->list_id : $this->table; $helper->list_id = isset($this->list_id) ? $this->list_id : $this->table;
$helper->bootstrap = $this->bootstrap;
// For each action, try to add the corresponding skip elements list // For each action, try to add the corresponding skip elements list
$helper->list_skip_actions = $this->list_skip_actions; $helper->list_skip_actions = $this->list_skip_actions;
classes/helper/Helper.php
+1
View File
@@ -36,6 +36,7 @@ class HelperCore
public $show_toolbar = true; public $show_toolbar = true;
public $context; public $context;
public $toolbar_scroll = false; public $toolbar_scroll = false;
public $bootstrap = false;
/** /**
* @var Module * @var Module
classes/helper/HelperList.php
+17 -9
View File
@@ -266,16 +266,24 @@ class HelperListCore extends Helper
} }
elseif (isset($params['icon']) && isset($tr[$key]) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default']))) elseif (isset($params['icon']) && isset($tr[$key]) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default'])))
{ {
if (isset($params['icon'][$tr[$key]]) && is_array($params['icon'][$tr[$key]])) if (!$this->bootstrap)
$this->_list[$index][$key] = array( {
'src' => $params['icon'][$tr[$key]]['src'], if (isset($params['icon'][$tr[$key]]) && is_array($params['icon'][$tr[$key]]))
'alt' => $params['icon'][$tr[$key]]['alt'], $this->_list[$index][$key] = array(
); 'src' => $params['icon'][$tr[$key]]['src'],
'alt' => $params['icon'][$tr[$key]]['alt'],
);
else
$this->_list[$index][$key] = array(
'src' => isset($params['icon'][$tr[$key]]) ? $params['icon'][$tr[$key]] : $params['icon']['default'],
'alt' => isset($params['icon'][$tr[$key]]) ? $params['icon'][$tr[$key]] : $params['icon']['default'],
);
}
else else
$this->_list[$index][$key] = array( if (isset($params['icon'][$tr[$key]]))
'src' => isset($params['icon'][$tr[$key]]) ? $params['icon'][$tr[$key]] : $params['icon']['default'], $this->_list[$index][$key] = array(
'alt' => isset($params['icon'][$tr[$key]]) ? $params['icon'][$tr[$key]] : $params['icon']['default'], 'class' => $params['icon'][$tr[$key]],
); );
} }
elseif (isset($params['type']) && $params['type'] == 'float') elseif (isset($params['type']) && $params['type'] == 'float')
$this->_list[$index][$key] = rtrim(rtrim($tr[$key], '0'), '.'); $this->_list[$index][$key] = rtrim(rtrim($tr[$key], '0'), '.');