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

Conflicts: modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
parent 46dc93fd7e 89c65536d7
commit 2ba5dc18fd
68 changed files with 1072 additions and 861 deletions
@@ -128,6 +128,22 @@
 						<dd><a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_dashboard" target="_blank">{l s="Go to prestashop.com"}</a></dd>
 					</dl>
 			</section>
+			
+			<section class="dash_simulation panel">
+				<h3><i class="icon-link"></i> {l s="Simulation Mode"}</h3>
+				<span class="switch prestashop-switch">
+					<input id="PS_DASHBOARD_SIMULATION_on" class="ps_dashboard_simulation" type="radio" checked="checked" value="1" name="PS_DASHBOARD_SIMULATION">
+					<label class="radioCheck" for="PS_DASHBOARD_SIMULATION_on">
+						<i class="icon-check-sign color_success"></i> {l s='Yes'}
+					</label>
+					<input id="PS_DASHBOARD_SIMULATION_off" class="ps_dashboard_simulation" type="radio" value="0" name="PS_DASHBOARD_SIMULATION">
+					<label class="radioCheck" for="PS_DASHBOARD_SIMULATION_off">
+						<i class="icon-ban-circle color_danger"></i> {l s='No'}
+					</label>
+					<span class="slide-button btn btn-default"></span>
+				</span>
+			</section>
+			
 		</div>
 	</div>
 </div>
@@ -24,7 +24,7 @@
 *}
 <div class="page-head">
 	<h2 class="page-title">
-		{l s='Configure'} : {$module_display_name} ({$module_name}}
+		{l s='Configure:'} {$module_display_name} ({$module_name})
 	</h2>
 	<div class="page-bar toolbarBox">
 		<div class="btn-toolbar">