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

// Preferences - Admin bootstrap fix

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-18 16:22:05 +02:00
parent 0683ed4092
commit 1f3e717eb6
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
+15 -6
View File
@@ -27,13 +27,22 @@
{block name="field"}
{if $field['type'] == 'theme'}
{if $field['can_display_themes']}
{foreach $field.themes as $theme}
<div class="select_theme {if $theme->id == $field['id_theme']}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
{$theme->name}<br />
<img src="../themes/{$theme->directory}/preview.jpg" alt="{$theme->directory}" /><br />
<input type="radio" name="id_theme" value="{$theme->id}" {if $theme->id == $field['id_theme']}checked="checked"{/if} />
<div class="col-lg-12">
<div class="row">
{foreach $field.themes as $theme}
<div class="col-lg-2 {if $theme->id == $field['id_theme']}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
<div class="radio">
<label>
<input type="radio" name="id_theme" value="{$theme->id}" {if $theme->id == $field['id_theme']}checked="checked"{/if} /> {$theme->name}
</label>
</div>
<div class="theme_container">
<img class="thumbnail" src="../themes/{$theme->directory}/preview.jpg" alt="{$theme->directory}" />
</div>
</div>
{/foreach}
</div>
{/foreach}
</div>
{/if}
{else}
{$smarty.block.parent}
admin-dev/themes/default/template/helpers/list/list_content.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
class="{if isset($tr.class)} {$tr.class}{/if}"
{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
>
{if {$has_bulk_actions}}
{if $has_bulk_actions}
<td class="center">
{if isset($list_skip_actions.delete)}
{if !in_array($tr.$identifier, $list_skip_actions.delete)}
controllers/admin/AdminEmployeesController.php
+6 -6
View File
@@ -72,12 +72,12 @@ class AdminEmployeesControllerCore extends AdminController
$this->profiles_array[$profile['name']] = $profile['name'];
$this->fields_list = array(
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'lastname' => array('title' => $this->l('Last Name'), 'width' => 'auto'),
'firstname' => array('title' => $this->l('First Name'), 'width' => 130),
'email' => array('title' => $this->l('Email address'), 'width' => 180),
'profile' => array('title' => $this->l('Profile'), 'width' => 90, 'type' => 'select', 'list' => $this->profiles_array, 'filter_key' => 'pl!name'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'width' => 30),
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'lastname' => array('title' => $this->l('Last Name')),
'firstname' => array('title' => $this->l('First Name')),
'email' => array('title' => $this->l('Email address')),
'profile' => array('title' => $this->l('Profile'), 'type' => 'select', 'list' => $this->profiles_array, 'filter_key' => 'pl!name'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool'),
);
$this->fields_options = array(
controllers/admin/AdminPreferencesController.php
+1 -1
View File
@@ -142,7 +142,7 @@ class AdminPreferencesControllerCore extends AdminController
if (!Tools::usingSecureMode() && !Configuration::get('PS_SSL_ENABLED'))
{
$fields['PS_SSL_ENABLED']['type'] = 'disabled';
$fields['PS_SSL_ENABLED']['disabled'] = '<a href="https://'.Tools::getShopDomainSsl().Tools::safeOutput($_SERVER['REQUEST_URI']).'">'.
$fields['PS_SSL_ENABLED']['disabled'] = '<a class="btn btn-link" href="https://'.Tools::getShopDomainSsl().Tools::safeOutput($_SERVER['REQUEST_URI']).'">'.
$this->l('Please click here to use HTTPS protocol before enabling SSL.').'</a>';
}
controllers/admin/AdminThemesController.php
+1
View File
@@ -210,6 +210,7 @@ class AdminThemesControllerCore extends AdminController
'id_theme' => array(
'title' => $this->l('ID'),
'align' => 'center',
'class' => 'fixed-width-xs'
),
'name' => array(
'title' => $this->l('Name'),