From 1f3e717eb698d5e06ceefa229461ffdc1ca57cc7 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Wed, 18 Sep 2013 16:22:05 +0200
Subject: [PATCH] // Preferences - Admin bootstrap fix

---
 .../themes/helpers/options/options.tpl        | 21 +++++++++++++------
 .../template/helpers/list/list_content.tpl    |  2 +-
 .../admin/AdminEmployeesController.php        | 12 +++++------
 .../admin/AdminPreferencesController.php      |  2 +-
 controllers/admin/AdminThemesController.php   |  1 +
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
index 18840f005..c75802f45 100644
--- a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
@@ -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}
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index 8c623ccfc..ee51e0bc4 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -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)}
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index 8ac6b9d9e..ff28ae30d 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -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(
diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php
index 039b9ccf8..3959a2634 100644
--- a/controllers/admin/AdminPreferencesController.php
+++ b/controllers/admin/AdminPreferencesController.php
@@ -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>';
 			}
 
diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index c012b7358..93d5b5ed4 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -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'),