Admin sidebar: show schedule instead of edit

app/controllers/admin/schedules_controller.rb

@@ -4,7 +4,7 @@ module Admin
     skip_before_filter :verify_authenticity_token, only: [:update]
     layout 'schedule'
 
-    def show
+    def edit
       if @conference.nil?
         redirect_to admin_conference_index_path
         return

app/controllers/schedule_controller.rb

@@ -1,18 +1,17 @@
 class ScheduleController < ApplicationController
+  layout 'application'
 
-  layout "application"
-  
   def index
-    @conference = Conference.includes(:rooms, {:events => [:speakers, :track, :event_type]}).where("conferences.short_title" => params[:conference_id]).first
+    @conference = Conference.includes(:rooms, events: [:speakers, :track, :event_type]).
+                  where('conferences.short_title' => params[:conference_id]).first
     @rooms = @conference.rooms
     @events = @conference.events
     @dates = @conference.start_date..@conference.end_date
 
     if @dates === Date.current
-      @today = Date.current.strftime("%Y-%m-%d")
+      @today = Date.current.strftime('%Y-%m-%d')
     else
-      @today = @conference.start_date.strftime("%Y-%m-%d")
+      @today = @conference.start_date.strftime('%Y-%m-%d')
     end
   end
-
 end

app/views/admin/schedules/edit.html.haml

@@ -1,6 +1,7 @@
 .schedule-content
   %h2
-    = "Schedule for #{@conference.title}"
+    = "Edit schedule for #{@conference.title} or go back to"
+    = link_to 'schedule', conference_schedule_path(@conference.short_title)
   #unscheduled.unscheduled
     .unscheduled-header
       Unscheduled Events
@@ -45,4 +46,4 @@
                                         $(this).css("background-color", "#ffffff");
                                       }
                                   });
-  });
+  });

app/views/layouts/_admin_sidebar.html.haml

@@ -32,8 +32,8 @@
     = link_to(admin_conference_registrations_path(@conference.short_title)) do
       %span.glyphicon.glyphicon-user
       Registrations
-  %li{class: active_nav_li(admin_conference_schedule_path(@conference.short_title))}
-    = link_to(admin_conference_schedule_path(@conference.short_title), target: '_blank') do
+  %li{class: active_nav_li(conference_schedule_path(@conference.short_title))}
+    = link_to(conference_schedule_path(@conference.short_title), target: '_blank') do
       %span.glyphicon.glyphicon-calendar
       Schedule
   %li{class: active_nav_li(admin_conference_campaigns_path(@conference.short_title))}

app/views/schedule/index.html.erb

@@ -1,5 +1,9 @@
 <div id="schedule-content">
-  <h2> Schedule for <%= @conference.title %></h2>
+  <h2> Schedule for <%= @conference.title %>
+    <% if has_role?(current_user, 'Admin')%>
+      <%= link_to "Edit", edit_admin_conference_schedule_path(@conference.short_title), :class => "btn btn-mini btn-primary pull-right"%>
+    <% end %>
+  </h2>
   <ul class="nav nav-tabs">
     <% @dates.each do |date| %>
       <li <%= "class=active" if @dates.first == date %>>
@@ -94,18 +98,18 @@
   </div>
 
 <%= javascript_tag do %>
-  jQuery( function($) { 
-    $('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) { 
+  jQuery( function($) {
+    $('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) {
       if(e.which===1)
       {
-        window.location = $(this).attr('data-href'); 
+        window.location = $(this).attr('data-href');
       }
       else if(e.which===2)
       {
       window.open($(this).attr('data-href'), '_blank');
       }
-    }); 
-}); 
+    });
+});
 
 $(function() {
   // add a hash to the URL when the user clicks on a tab