From e1ed92180d67f0201324349d53bf4f54b4aa347f Mon Sep 17 00:00:00 2001
From: Alexis Lahouze <xals@lahouze.org>
Date: Fri, 29 Jan 2016 13:42:25 +0100
Subject: [PATCH] Improve Grunt integration. Wiredep.

---
 accountant/frontend/templates/layout.html | 69 +++++++++--------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/accountant/frontend/templates/layout.html b/accountant/frontend/templates/layout.html
index 665587e..08ce7b0 100644
--- a/accountant/frontend/templates/layout.html
+++ b/accountant/frontend/templates/layout.html
@@ -25,52 +25,18 @@
 
     <base href="{{ url_for('frontend.index') }}">
 
-    <!-- JQuery -->
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='jquery/dist/jquery.js') }}"></script>
-
-    <!-- Bootstrap -->
-    <link href="{{ url_for('bower.static', filename='bootstrap/dist/css/bootstrap.css') }}" rel="stylesheet">
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='bootstrap/dist/js/bootstrap.js') }}"></script>
-
-    <!-- Bootstrap Additions -->
-    <link href="{{ url_for('bower.static', filename='bootstrap-additions/dist/bootstrap-additions.css') }}" rel="stylesheet">
-
-    <!-- Bootbox.js -->
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='bootbox/bootbox.js') }}"></script>
-
-    <!-- Font Awesome -->
-    <link href="{{ url_for('bower.static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
-
     <!-- main css -->
     {% assets 'frontend_css' %}
     <link href="{{ ASSET_URL }}" rel="stylesheet">
     {% endassets %}
 
-    <!-- Moment.js -->
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='moment/min/moment-with-locales.js') }}"></script>
-
-    <!-- Highstocks -->
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='highstock-release/highstock.js') }}"></script>
-
-    <!-- AngularJS core -->
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular/angular.js') }}"></script>
-
-    <!-- AngularJS modules -->
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-resource/angular-resource.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-route/angular-route.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-strap/dist/angular-strap.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-strap/dist/angular-strap.tpl.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='highcharts-ng/dist/highcharts-ng.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-http-auth/src/http-auth-interceptor.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='meanie-angular-storage/release/meanie-angular-storage.js') }}"></script>
-
-    <!-- Angular UI Notification -->
-    <link href="{{ url_for('bower.static', filename='angular-ui-notification/dist/angular-ui-notification.css') }}" rel="stylesheet">
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-ui-notification/dist/angular-ui-notification.js') }}"></script>
-
-    <!-- xeditable -->
-    <link href="{{ url_for('bower.static', filename='angular-xeditable/dist/css/xeditable.css') }}" rel="stylesheet">
-    <script type="text/javascript" src="{{ url_for('bower.static', filename='angular-xeditable/dist/js/xeditable.js') }}"></script>
+    <!-- bower:css -->
+    <link rel="stylesheet" href="static/bower_components/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="static/bower_components/bootstrap-additions/dist/bootstrap-additions.css" />
+    <link rel="stylesheet" href="static/bower_components/angular-xeditable/dist/css/xeditable.css" />
+    <link rel="stylesheet" href="static/bower_components/angular-ui-notification/dist/angular-ui-notification.css" />
+    <link rel="stylesheet" href="static/bower_components/font-awesome/css/font-awesome.css" />
+    <!-- endbower -->
   </head>
 
   <body style="padding-bottom: 50px; padding-top: 70px">
@@ -88,6 +54,27 @@
       <div ng-view></div>
     </div>
 
+    <!-- bower:js -->
+    <script src="static/bower_components/jquery/dist/jquery.js"></script>
+    <script src="static/bower_components/moment/moment.js"></script>
+    <script src="static/bower_components/bootstrap/dist/js/bootstrap.js"></script>
+    <script src="static/bower_components/angular/angular.js"></script>
+    <script src="static/bower_components/angular-resource/angular-resource.js"></script>
+    <script src="static/bower_components/angular-route/angular-route.js"></script>
+    <script src="static/bower_components/angular-strap/dist/angular-strap.js"></script>
+    <script src="static/bower_components/angular-strap/dist/angular-strap.tpl.js"></script>
+    <script src="static/bower_components/angular-xeditable/dist/js/xeditable.js"></script>
+    <script src="static/bower_components/angular-ui-notification/dist/angular-ui-notification.js"></script>
+    <script src="static/bower_components/highcharts-ng/dist/highcharts-ng.js"></script>
+    <script src="static/bower_components/highstock-release/highstock.js"></script>
+    <script src="static/bower_components/highstock-release/highcharts-more.js"></script>
+    <script src="static/bower_components/highstock-release/modules/exporting.js"></script>
+    <script src="static/bower_components/angular-http-auth/src/http-auth-interceptor.js"></script>
+    <script src="static/bower_components/meanie-angular-storage/release/meanie-angular-storage.js"></script>
+    <script src="static/bower_components/bootbox/bootbox.js"></script>
+    <script src="static/bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+    <!-- endbower -->
+
     <!-- Custom Javascript libraries -->
     {% assets "frontend_js" %}
     <script type="text/javascript" src="{{ ASSET_URL }}"></script>