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

2013-09-20 18:31:47 +02:00
parent 8e1cb5cc34 dadf83d6f6
commit 0e87409bd6
121 changed files with 231 additions and 16852 deletions
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-	<div class="blocEngine panel">
+{*
 		<form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form" class="form-horizontal">
 			<h3><i class="icon-cog"></i> {l s='Settings'}</h3>

@@ -66,5 +66,4 @@
 				<input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="btn btn-default" />
 			</p>
 		</form>
-	</div>
-</div>
+*}
@@ -34,4 +34,5 @@
 		{else}
 			{l s='No module has been installed.'}
 		{/if}
-		</nav>
+		</nav>
+	</div>