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

Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl

admin-dev/themes/default/template/controllers/images/content.tpl

@@ -76,20 +76,19 @@
 				</div>
 			</div>
 
-			<div class="form-group">
 			{foreach $types AS $k => $type}
-				<label class="control-label col-lg-3 second-select format_{$k}" style="display:none;">{l s='Select a format'}</label>
+			<div class="form-group second-select format_{$k}" style="display:none;">			
-				<div class="col-lg-9 second-select margin-form format_{$k}" style="display:none;">
+				<label class="control-label col-lg-3">{l s='Select a format'}</label>
-					<select class="second-select format_{$k}" name="format_{$k}">
+				<div class="col-lg-9 margin-form">
+					<select name="format_{$k}">
 						<option value="all">{l s='All'}</option>
 						{foreach $formats[$k] AS $format}
 							<option value="{$format['id_image_type']}">{$format['name']}</option>
 						{/foreach}
 					</select>
 				</div>
-			{/foreach}
 			</div>
-
+			{/foreach}
 			<script>
 				function changeFormat(elt)
 				{ldelim}

admin-dev/themes/default/template/helpers/options/options.tpl

@@ -362,7 +362,7 @@
 							type="submit"
 							id="{$table}_form_submit_btn"
 							name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
-							class="btn btn-default {if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
+							class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
 							>
 							{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
 						</button>

classes/controller/FrontController.php

@@ -341,6 +341,7 @@ class FrontControllerCore extends Controller
 			'request' => $link->getPaginationLink(false, false, false, true),
 			'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT'),
 			'quick_view' => Configuration::get('PS_QUICK_VIEW'),
+			'shop_phone' => Configuration::get('PS_SHOP_PHONE'),
 		));
 
 		// Add the tpl files directory for mobile

modules/bankwire/bankwire.php

@@ -215,7 +215,7 @@ class BankWire extends PaymentModule
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockadvertising/blockadvertising.php

@@ -226,7 +226,7 @@ class BlockAdvertising extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockbestsellers/blockbestsellers.php

@@ -141,7 +141,7 @@ class BlockBestSellers extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockcart/blockcart.php

@@ -270,7 +270,7 @@ class BlockCart extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockcategories/blockcategories.php

@@ -371,7 +371,7 @@ class BlockCategories extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockcontact/blockcontact.php

@@ -116,7 +116,7 @@ class Blockcontact extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockcontactinfos/blockcontactinfos.php

@@ -130,7 +130,7 @@ class Blockcontactinfos extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockcustomerprivacy/blockcustomerprivacy.php

@@ -139,7 +139,7 @@ Tip: If the customer privacy message is too long to be written directly in the f
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blocklink/blocklink.php

@@ -461,7 +461,7 @@ class BlockLink extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitLinkAdd',
 				)
 			),
@@ -498,7 +498,7 @@ class BlockLink extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitTitle',
 				)
 			),
@@ -533,7 +533,7 @@ class BlockLink extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitOrderWay',
 				)
 			),

modules/blockmanufacturer/blockmanufacturer.php

@@ -185,7 +185,7 @@ class BlockManufacturer extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blocknewproducts/blocknewproducts.php

@@ -180,7 +180,7 @@ class BlockNewProducts extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blocknewsletter/blocknewsletter.php

@@ -557,7 +557,7 @@ class Blocknewsletter extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockpaymentlogo/blockpaymentlogo.php

@@ -147,7 +147,7 @@ class BlockPaymentLogo extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockrss/blockrss.php

@@ -196,7 +196,7 @@ class Blockrss extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blocksocial/blocksocial.php

@@ -115,7 +115,7 @@ class blocksocial extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockspecials/blockspecials.php

@@ -165,7 +165,7 @@ class BlockSpecials extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blockstore/blockstore.php

@@ -135,7 +135,7 @@ class BlockStore extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blocksupplier/blocksupplier.php

@@ -194,7 +194,7 @@ class BlockSupplier extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/blocktags/blocktags.php

@@ -139,7 +139,7 @@ class BlockTags extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary')
+					'class' => 'btn btn-default')
 				),
 			);
 			

modules/blocktopmenu/blocktopmenu.php

@@ -151,6 +151,12 @@ class Blocktopmenu extends Module
 		}
 		else if (Tools::isSubmit('submitBlocktopmenuLinks'))
 		{
+			foreach ($languages as $key => $val)
+			{
+				$links_label[$val['id_lang']] = Tools::getValue('link_'.(int)$val['id_lang']);
+				$labels[$val['id_lang']] = Tools::getValue('label_'.(int)$val['id_lang']);
+			}
+			
 			if ((!count($links_label)) && (!count($labels)))
 				;
 			else if (!count($links_label))
@@ -161,7 +167,7 @@ class Blocktopmenu extends Module
 				$this->_html .= $this->displayError($this->l('Please add a label for your default language.'));
 			else
 			{
-				MenuTopLinks::add(Tools::getValue('link'), Tools::getValue('label'), Tools::getValue('new_window', 0), (int)Shop::getContextShopID());
+				MenuTopLinks::add($links_label, $labels,  Tools::getValue('new_window', 0), (int)Shop::getContextShopID());
 				$this->_html .= $this->displayConfirmation($this->l('The link has been added.'));
 			}
 			$update_cache = true;
@@ -779,7 +785,7 @@ class Blocktopmenu extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					)
 			),
 		);
@@ -851,7 +857,7 @@ class Blocktopmenu extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					)
 			),
 		);
@@ -1027,4 +1033,4 @@ class Blocktopmenu extends Module
 				
 		return $helper->generateList($links, $fields_list);
 	}
-}
+}

modules/blockviewed/blockviewed.php

@@ -188,7 +188,7 @@ class BlockViewed extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary')
+					'class' => 'btn btn-default')
 				),
 			);
 			

modules/carriercompare/carriercompare.php

@@ -307,7 +307,7 @@ class CarrierCompare extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/cheque/cheque.php

@@ -202,7 +202,7 @@ class Cheque extends PaymentModule
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/crossselling/crossselling.php

@@ -273,7 +273,7 @@ class CrossSelling extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/dateofdelivery/dateofdelivery.php

@@ -498,7 +498,7 @@ class DateOfDelivery extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
@@ -583,7 +583,7 @@ class DateOfDelivery extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitCarrierRule',
 				)
 			),

modules/homefeatured/homefeatured.php

@@ -162,7 +162,7 @@ class HomeFeatured extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/mailalerts/mailalerts.php

@@ -577,7 +577,7 @@ class MailAlerts extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitMailAlert',
 				)
 			),
@@ -668,7 +668,7 @@ class MailAlerts extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitMAMerchant',
 				)
 			),

modules/newsletter/newsletter.php

@@ -241,7 +241,7 @@ class Newsletter extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Export .CSV file'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitExport',
 				)
 			),
@@ -300,7 +300,7 @@ class Newsletter extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Export .CSV file'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitExport',
 				)
 			),

modules/productscategory/productscategory.php

@@ -222,7 +222,7 @@ class productsCategory extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/producttooltip/producttooltip.php

@@ -240,7 +240,7 @@ class ProductToolTip extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/pscleaner/pscleaner.php

@@ -543,7 +543,7 @@ class PSCleaner extends Module
 				'description' => $this->l('I understand that all the catalog data will be removed without possible rollback: products, features, categories, tags, images, prices, attachments, scenes, stocks, attribute groups and values, manufacturers, suppliers…'),
 			'submit' => array(
 				'title' => $this->l('Delete catalog'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitTruncateCatalog',
 				'id' => 'submitTruncateCatalog',
 				)
@@ -559,7 +559,7 @@ class PSCleaner extends Module
 				'description' => $this->l('I understand that all the orders and customers will be removed without possible rollback: customers, carts, orders, connections, guests, messages, stats...'),
 				'submit' => array(
 					'title' => $this->l('Delete orders & customers'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					'name' => 'submitTruncateSales',
 					'id' => 'submitTruncateSales',
 					)
@@ -574,7 +574,7 @@ class PSCleaner extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Check & fix'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitCheckAndFix',
 				)
 			),

modules/referralprogram/referralprogram.php

@@ -566,7 +566,7 @@ class ReferralProgram extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					'name' => 'submitReferralProgram',
 					)
 			),
@@ -589,7 +589,7 @@ class ReferralProgram extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					'name' => 'submitText',
 				)
 			),

modules/statsdata/statsdata.php

@@ -235,7 +235,7 @@ class StatsData extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		

modules/vatnumber/vatnumber.php

@@ -214,7 +214,7 @@ class VatNumber extends TaxManagerModule
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);