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

2013-10-02 17:39:03 +02:00
parent f168dd7c50 dc06ef9c6d
commit 19af1cfda5
12 changed files with 283 additions and 138 deletions
@@ -89,6 +89,8 @@
 		<input type="hidden" name="token" value="{$token}" />
 	</fieldset>
 </form>
+{else}
+	</fieldset>
 {/if}

 {hook h='displayAdminListAfter'}
@@ -252,6 +252,10 @@
 		</script>
 		{/if}
 		</div>
+{/if}
+{if $simple_header}
+<fieldset class="col-lg-12">
+	<h3>{if is_array($title)}{$title|end}{else}{$title}{/if}</h3>
 {/if}
 	<div class="table-responsive clearfix">
 		<table