diff --git a/app/views/accounts/show.blade.php b/app/views/accounts/show.blade.php index 85fce4b3dc..90ec7be157 100644 --- a/app/views/accounts/show.blade.php +++ b/app/views/accounts/show.blade.php @@ -105,5 +105,6 @@ - +{{HTML::script('assets/javascript/highcharts/highcharts.js')}} +{{HTML::script('assets/javascript/firefly/accounts.js')}} @stop \ No newline at end of file diff --git a/app/views/index.blade.php b/app/views/index.blade.php index aada3b3d9f..c4f8d080af 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -94,7 +94,8 @@ @stop @section('scripts') - + {{HTML::script('assets/javascript/highcharts/highcharts.js')}} + {{HTML::script('assets/javascript/firefly/index.js')}} @stop @section('styles') diff --git a/public/assets/javascript/accounts.js b/public/assets/javascript/accounts.js deleted file mode 100644 index 5f0321dbb0..0000000000 --- a/public/assets/javascript/accounts.js +++ /dev/null @@ -1,14 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear in whatever order it -// gets included (e.g. say you have require_tree . then the code will appear after all the directories -// but before any files alphabetically greater than 'application.js' -// -// The available directives right now are require, require_directory, and require_tree -// -//= require_tree highcharts -//= require firefly/accounts diff --git a/public/assets/javascript/budgets.js b/public/assets/javascript/budgets.js deleted file mode 100644 index c6da4f622d..0000000000 --- a/public/assets/javascript/budgets.js +++ /dev/null @@ -1,14 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear in whatever order it -// gets included (e.g. say you have require_tree . then the code will appear after all the directories -// but before any files alphabetically greater than 'application.js' -// -// The available directives right now are require, require_directory, and require_tree -// -//= require_tree highcharts -//= require firefly/budgets diff --git a/public/assets/javascript/index.js b/public/assets/javascript/index.js deleted file mode 100644 index 6d40232c6a..0000000000 --- a/public/assets/javascript/index.js +++ /dev/null @@ -1,14 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear in whatever order it -// gets included (e.g. say you have require_tree . then the code will appear after all the directories -// but before any files alphabetically greater than 'application.js' -// -// The available directives right now are require, require_directory, and require_tree -// -//= require highcharts/highcharts -//= require firefly/index