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

This commit is contained in:
Jerome Nadaud
2013-10-23 16:49:05 +02:00
9 changed files with 215 additions and 99 deletions
@@ -86,7 +86,7 @@
</div>
<div class="col-lg-7" id="hookDashboardZoneTwo">
{$hookDashboardZoneTwo}
<div id="dashaddons" class="widget">
<div id="dashaddons">
<a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank">
<i class="icon-plus"></i> {l s='Add more graph and data'}
</a>
@@ -139,4 +139,4 @@
$('#date-end').focus();
});
});
</script>
</script>