From 183a323ef68ce71f0f881a83fcced3b79230130c Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 23 Sep 2014 21:48:19 +0200 Subject: [PATCH] Replaced budget*.js --- app/views/budgets/show.blade.php | 9 +++++---- public/assets/javascript/budgets-default.js | 14 -------------- public/assets/javascript/budgets-limit.js | 14 -------------- public/assets/javascript/budgets-nolimit.js | 14 -------------- public/assets/javascript/budgets-session.js | 14 -------------- 5 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 public/assets/javascript/budgets-default.js delete mode 100644 public/assets/javascript/budgets-limit.js delete mode 100644 public/assets/javascript/budgets-nolimit.js delete mode 100644 public/assets/javascript/budgets-session.js diff --git a/app/views/budgets/show.blade.php b/app/views/budgets/show.blade.php index 9ebaf9a28f..96ed5af5e6 100644 --- a/app/views/budgets/show.blade.php +++ b/app/views/budgets/show.blade.php @@ -100,19 +100,20 @@ @stop @section('scripts') +{{HTML::script('assets/javascript/highcharts/highcharts.js')}} @if($view == 1) - +{{HTML::script('assets/javascript/firefly/budgets/limit.js')}} @endif @if($view == 2) - +{{HTML::script('assets/javascript/firefly/budgets/nolimit.js')}} @endif @if($view == 3) - +{{HTML::script('assets/javascript/firefly/budgets/session.js')}} @endif @if($view == 4) - +{{HTML::script('assets/javascript/firefly/budgets/default.js')}} @endif @stop \ No newline at end of file diff --git a/public/assets/javascript/budgets-default.js b/public/assets/javascript/budgets-default.js deleted file mode 100644 index 84ef7a1402..0000000000 --- a/public/assets/javascript/budgets-default.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/default diff --git a/public/assets/javascript/budgets-limit.js b/public/assets/javascript/budgets-limit.js deleted file mode 100644 index 03b84cc11f..0000000000 --- a/public/assets/javascript/budgets-limit.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/limit diff --git a/public/assets/javascript/budgets-nolimit.js b/public/assets/javascript/budgets-nolimit.js deleted file mode 100644 index 54f42944fe..0000000000 --- a/public/assets/javascript/budgets-nolimit.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/nolimit diff --git a/public/assets/javascript/budgets-session.js b/public/assets/javascript/budgets-session.js deleted file mode 100644 index c8798ad459..0000000000 --- a/public/assets/javascript/budgets-session.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/session