Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 46 insertions, 0 deletions

diff --git a/app/assets/javascripts/admin/holidays.js b/app/assets/javascripts/admin/holidays.js
new file mode 100644
index 000000000..55eae9e2a
--- /dev/null
+++ b/app/assets/javascripts/admin/holidays.js
@@ -0,0 +1,46 @@
+$(function() {
+
+  // New button loads the 'new' form via AJAX
+  $('#new-holiday-button').click(function(){
+    var new_call = $.ajax({ type: 'GET', url: $(this).attr('href')});
+    new_call.done(function(response) {
+      $('#existing-holidays').before(response);
+    });
+    return false;
+
+  });
+
+  // Each edit button loads the 'edit' form for that holiday via AJAX
+  $('.holiday').each(function(index){
+    var holiday_row = $(this);
+    var edit_button = holiday_row.find('.edit-button');
+    edit_button.click(function(){
+      var edit_call = $.ajax({ type: 'GET', url: holiday_row.data('target') });
+      edit_call.done(function(response) {
+        holiday_row.html(response);
+      });
+      return false;
+    });
+  });
+
+  // Remove button removes form div for holiday from an import set
+  $('.remove-holiday').each(function(index){
+    $(this).click(function(){
+      $(this).parents('.import-holiday-info').remove();
+      return false;
+    });
+  });
+
+  if ($('#holiday_import_source_suggestions').is(':checked')){
+    $('#holiday_import_ical_feed_url').attr("disabled", "disabled");
+  }
+  // Enable and disable the feed element when that is selected as the import source
+  $('#holiday_import_source_feed').click(function(){
+    $('#holiday_import_ical_feed_url').removeAttr("disabled");
+  });
+
+  $('#holiday_import_source_suggestions').click(function(){
+    $('#holiday_import_ical_feed_url').attr("disabled", "disabled");
+  });
+
+});