work on instructor acceptance

intermaggio · May 14, 2012 · 75cbf5a · 75cbf5a
1 parent 23ab868
commit 75cbf5a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
@@ -34,8 +34,10 @@ def accept
     link = InstructorsCourses.where(course_id: course.id, user_id: current_user.id).first
     if link && link.uuid == params[:uuid]
       link.update_attribute(:status, 'accepted')
+      render inline: 'Accepted!'
+    else
+      render nothing: true
     end
-    render nothing: true
   end
 
   def download

diff --git a/app/views/admin/manage_course.html.haml b/app/views/admin/manage_course.html.haml
@@ -27,8 +27,8 @@
 .tabbable
   %ul.nav.nav-tabs{:'data-tabs' => 'tabs'}
     %li#info-link= link_to 'Info', '#info', :'data-toggle' => 'tab'
-    %li#schedule-link= link_to 'Schedule', '#schedule', id: 'schedule-link', :'data-toggle' => 'tab'
-    %li#staffing-link= link_to 'Staffing', '#staffing', id: 'staffing-link', :'data-toggle' => 'tab'
+    %li#schedule-link= link_to 'Schedule', '#schedule', :'data-toggle' => 'tab'
+    %li#staffing-link= link_to 'Staffing', '#staffing', :'data-toggle' => 'tab'
   .tab-content
     #info.tab-pane
       - if flash[:notice] == :success

diff --git a/app/views/site/catalog.html.haml b/app/views/site/catalog.html.haml
@@ -1,4 +1,18 @@
 = content_for :title, organization.catalogDisplayName
+
+- if params[:tab]
+  :javascript
+    var tab = '#{params[:tab]}'
+- else
+  :javascript
+    var tab = 'all'
+
+:javascript
+  $(document).ready(function(){
+    $('#' + tab + '-link').addClass('active')
+    $('#' + tab).addClass('active')
+  })
+
 #google-modal.hide
 
 #calendar-modal.modal.hide.fade
@@ -49,14 +63,14 @@
       Show Past Courses
 .tabbable
   %ul.nav.nav-tabs
-    %li.active= link_to 'All Courses', '#all', :'data-toggle' => 'tab'
+    %li#all-link= link_to 'All Courses', '#all', :'data-toggle' => 'tab'
     - if current_user
-      %li= link_to 'My Enrollments', '#enrollments', :'data-toggle' => 'tab'
+      %li#enrollments-link= link_to 'My Enrollments', '#enrollments', :'data-toggle' => 'tab'
       - if current_user.instructing.first
-        %li= link_to 'My Shifts', '#shifts', :'data-toggle' => 'tab'
+        %li#shifts-link= link_to 'My Shifts', '#shifts', :'data-toggle' => 'tab'
 
   .tab-content#courses
-    #all.tab-pane.active= render partial: 'site/course_table', locals: { courses: @courses }
+    #all.tab-pane= render partial: 'site/course_table', locals: { courses: @courses }
     - if current_user
       #enrollments.tab-pane
         - if current_user.courses.mirai.first