From c0873303ec0779f59ad1f920d531f89444f15878 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Fri, 28 Nov 2014 17:27:28 +0000 Subject: Add some inline editing --- app/assets/javascripts/admin.js | 1 + 1 file changed, 1 insertion(+) (limited to 'app/assets/javascripts/admin.js') diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 4925a65a4..c4eb7d114 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -7,4 +7,5 @@ //= require admin/bootstrap-tab //= require admin/admin //= require admin/category-order +//= require admin/holidays //= require jquery_ujs -- cgit v1.2.3 From cb53e9a0cfbb53c848c1b9c30ccd696e86f0ef36 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 11 Dec 2014 15:01:01 +0000 Subject: Remove bootstrap libs in favour of using the bootstrap-sass gem. --- app/assets/javascripts/admin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts/admin.js') diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index c4eb7d114..3c35f23df 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -3,8 +3,8 @@ //= require jquery.ui.tabs //= require jquery.ui.sortable //= require jquery.ui.effect-highlight -//= require admin/bootstrap-collapse -//= require admin/bootstrap-tab +//= require bootstrap-collapse +//= require bootstrap-tab //= require admin/admin //= require admin/category-order //= require admin/holidays -- cgit v1.2.3 From 1d6acb2af8e3f4c4926f47f097466c5e2acdac68 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 11 Dec 2014 15:01:56 +0000 Subject: Add holidays admin link Use dropdown to group related authority pages. --- app/assets/javascripts/admin.js | 1 + 1 file changed, 1 insertion(+) (limited to 'app/assets/javascripts/admin.js') diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 3c35f23df..9402f7f6c 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -5,6 +5,7 @@ //= require jquery.ui.effect-highlight //= require bootstrap-collapse //= require bootstrap-tab +//= require bootstrap-dropdown //= require admin/admin //= require admin/category-order //= require admin/holidays -- cgit v1.2.3