4 files changed, 33 insertions, 0 deletions
diff --git a/app/controllers/admin_holidays_controller.rb b/app/controllers/admin_holidays_controller.rb
index 51edfcaac..d62b8f741 100644
--- a/app/controllers/admin_holidays_controller.rb
+++ b/app/controllers/admin_holidays_controller.rb
@@ -4,6 +4,10 @@ class AdminHolidaysController < AdminController
         get_all_holidays
     end
 
+    def new
+        @holiday = Holiday.new
+    end
+
 
     def edit
         @holiday = Holiday.find(params[:id])
diff --git a/app/views/admin_holidays/_new_form.html.erb b/app/views/admin_holidays/_new_form.html.erb
new file mode 100644
index 000000000..733d6d862
--- /dev/null
+++ b/app/views/admin_holidays/_new_form.html.erb
@@ -0,0 +1,10 @@
+<table class="table table-striped table-condensed">
+  <tbody>
+    <tr>
+      <td><%= form_for(holiday, :url => admin_holidays_path, :html => { :class => 'form-inline new-holiday-form'}) do |f| -%>
+        <%= render :partial => 'form', :locals => { :f => f, :holiday => holiday, :context => :new } %>
+      <% end %>
+      </td>
+   </tr>
+  </tbody>
+</table>
diff --git a/app/views/admin_holidays/new.html.erb b/app/views/admin_holidays/new.html.erb
new file mode 100644
index 000000000..3cc67429a
--- /dev/null
+++ b/app/views/admin_holidays/new.html.erb
@@ -0,0 +1,4 @@
+<% @title = 'New public holiday' %>
+<h1><%= @title %></h1>
+
+<%= render :partial => 'new_form', :locals => { :holiday => @holiday } %>
diff --git a/spec/controllers/admin_holidays_controller_spec.rb b/spec/controllers/admin_holidays_controller_spec.rb
index 087a77b32..dd431584e 100644
--- a/spec/controllers/admin_holidays_controller_spec.rb
+++ b/spec/controllers/admin_holidays_controller_spec.rb
@@ -30,6 +30,21 @@ describe AdminHolidaysController do
 
     end
 
+    describe :new do
+
+        before do
+            get :new
+        end
+
+        it 'renders the new template' do
+            expect(response).to render_template('new')
+        end
+
+        it 'creates a new holiday' do
+            assigns[:holiday].should be_an_instance_of(Holiday)
+        end
+
+    end
     describe :edit do
 
         before do