Integration of Assetic in SmartyParser, extended it to Admin (we can now

use loops !), added the Thelia ControllerResolver and fixed config and routing accordingly.²:wq
2013-06-19 02:07:43 +02:00
parent 7351edeb46
commit 89abfaad48
35 changed files with 763 additions and 244 deletions
--- a/templates/admin/default/includes/footer.inc.html
+++ b/templates/admin/default/includes/footer.inc.html
@@ -0,0 +1,13 @@
+ 		{* Include required JS files *}
+
+		{javascripts file='../assets/js/jquery.min.js'}
+			<link rel="stylesheet" href="{$asset_url}" target="screen">
+		{/javascripts}
+
+		{javascripts file='../assets/bootstrap/js/bootstrap.min.js'}
+			<link rel="stylesheet" href="{$asset_url}" target="screen">
+		{/javascripts}
+
+ 		{* TODO allow modules to include JS here *}
+	</body>
+</html>
--- a/templates/admin/default/includes/header.inc.html
+++ b/templates/admin/default/includes/header.inc.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="{$lang}">
+<head>
+	<title>{intl l='Thelia Back Office'}{if ! empty($page_title)} - {$page_title}{/if}</title>
+
+	{images file='../assets/img/favicon.ico'}<link rel="shortcut icon" href="{$asset_url}" />{/images}
+
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+	{stylesheets file='../assets/css/*' filters='less,cssembed'}
+		<link rel="stylesheet" href="{$asset_url}">
+	{/stylesheets}
+
+	{stylesheets file='../assets/bootstrap/css/bootstrap.css' filters='cssembed'}
+		<link rel="stylesheet" href="{$asset_url}">
+	{/stylesheets}
+
+	{stylesheets file='../assets/bootstrap/css/bootstrap-responsive.css' filters='cssembed'}
+		<link rel="stylesheet" href="{$asset_url}">
+	{/stylesheets}
+
+	{* TODO allow modules to include CSS here *}
+</head>
+<body>
--- a/templates/admin/default/includes/menu.html
+++ b/templates/admin/default/includes/menu.html