diff --git a/app/views/screenings/_form.html.erb b/app/views/screenings/_form.html.erb index ca5628a3..3e12e1af 100644 --- a/app/views/screenings/_form.html.erb +++ b/app/views/screenings/_form.html.erb @@ -18,7 +18,7 @@ <%= f.date_field :date_watched %>
- <%= f.label :location_watched %>
+ <%= f.label :location_watched, "Location Watched"" %>
<%= f.text_field :location_watched %>
diff --git a/app/views/screenings/edit.html.erb b/app/views/screenings/edit.html.erb index a0b19ec4..d7043444 100644 --- a/app/views/screenings/edit.html.erb +++ b/app/views/screenings/edit.html.erb @@ -1,11 +1,15 @@ <% content_for(:title, "Editing") %> -

Edit Your Screening

+

+ <%= link_to 'Back', movie_screenings_path(@movie) %> +

+ +

Edit

Your <%= @screening.date_watched.stamp("12-31-2016") %> Screening of <%= @movie.title %>

<%= render 'form' %> +

- <%= link_to 'Back To Screenings', movie_screenings_path(@movie) %> - <%= link_to 'Back To ' + @movie.title, movie_path(@movie) %> + <%= link_to 'Delete', movie_screening_path(@movie, @screening), method: :delete, data: { confirm: 'Are you sure you want to delete this screening? This action cannot be undone.' } %>

diff --git a/app/views/screenings/index.html.erb b/app/views/screenings/index.html.erb index 566a4503..08d287fb 100644 --- a/app/views/screenings/index.html.erb +++ b/app/views/screenings/index.html.erb @@ -3,23 +3,19 @@

Screenings for <%= link_to "#{@movie.title}", movie_path(@movie) %>

- - - - - - - - - <% @screenings.order("date_watched DESC").each do |screening| %> - - - - + + <% end %>
Date WatchedLocation WatchedNotesManage Screenings
<%= screening.date_watched.stamp("1/2/2001") %><%= screening.location_watched %><%= screening.notes %><%= link_to 'Edit', edit_movie_screening_path(@movie, screening) %><%= link_to 'Delete', movie_screening_path(@movie, screening), method: :delete, data: { confirm: 'Are you sure you want to delete this screening? This action cannot be undone.' } %> +

+ <%= screening.location_watched %>
+ <%= screening.notes %> +

+
+ <%= link_to 'Edit', edit_movie_screening_path(@movie, screening) %> +