Update travel info page

.gitignore

@@ -13,4 +13,5 @@
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
-/tmp
+/tmp
+.DS_Store

Gemfile

@@ -36,12 +36,13 @@ gem 'activeadmin', github: 'gregbell/active_admin'
 gem 'bluecloth'
 gem 'activeadmin_pagedown'
 
+gem 'devise'
+
 # URL Validation
 gem "validate_url"
 
 # Better Errors
 group :development do
-	gem 'sqlite3'
 	gem "better_errors"
 	gem "binding_of_caller"
 end

Gemfile.lock

@@ -49,6 +49,7 @@ GEM
       activesupport (>= 3.0.0)
     arel (4.0.2)
     bcrypt (3.1.7)
+    bcrypt (3.1.7-x86-mingw32)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -111,6 +112,7 @@ GEM
     multi_json (1.9.3)
     orm_adapter (0.5.0)
     pg (0.17.1)
+    pg (0.17.1-x86-mingw32)
     polyamorous (1.0.0)
       activerecord (>= 3.0)
     polyglot (0.3.4)
@@ -164,7 +166,6 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.3)
     tilt (1.4.1)
@@ -184,6 +185,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   activeadmin!
@@ -193,6 +195,7 @@ DEPENDENCIES
   bluecloth
   bootstrap-sass (~> 3.0.3.0)
   coffee-rails (~> 4.0.0)
+  devise
   jbuilder (~> 1.2)
   jquery-rails
   jquery-turbolinks
@@ -201,7 +204,6 @@ DEPENDENCIES
   rails_12factor
   sass-rails (~> 4.0.0)
   sdoc
-  sqlite3
   turbolinks
   uglifier (>= 1.3.0)
   validate_url

app/admin/course.rb

@@ -32,7 +32,7 @@ def permitted_params
       (i.instructors.map { |e| e.name }).join(', ')
     end
     column :semester
-    default_actions
+    actions
   end
 
   show do

app/admin/event.rb

@@ -14,8 +14,13 @@ def permitted_params
       f.input :date
       f.input :start_time
       f.input :end_time
+      f.input :sponsor, :as => :select
+      f.input :mentors, :as => :check_boxes
       f.input :semester, :as => :select
     end
+    f.inputs "Description &nbsp;&nbsp;(use <a href='http://daringfireball.net/projects/markdown/syntax'>markdown</a>)" do
+      f.input :markdown_content, :label => "Description", :as => :pagedown_text
+    end
     f.actions
   end
 
@@ -25,18 +30,27 @@ def permitted_params
     column :date
     column :start_time
     column :end_time
-    column :semester
-    default_actions
-  end
+    column :sponsor
+    column :mentors do |m|
+     (m.mentors.map { |e| e.name }).join(', ')
+   end
+   column :semester
+   actions
+ end
 
-  show do
-    attributes_table do
-      row :name
-      row :location
-      row :date
-      row :start_time
-      row :end_time
-      row :semester
-    end
+ show do
+  attributes_table do
+    row :name
+    row :location
+    row :date
+    row :start_time
+    row :end_time
+    row :sponsor
+    row :mentors do |m|
+      (m.mentors.map { |e| e.name }).join(', ')
+    end  
+    row :markdown_content
+    row :semester
   end
 end
+end

app/admin/faq.rb

@@ -24,7 +24,7 @@ def permitted_params
     column :semesters do |s|
       (s.semesters.map { |e| ([e.season, e.year.year]).join(' ')  }).join(', ')
     end
-    default_actions
+    actions
   end
 
   show do

app/admin/instructor.rb

@@ -22,7 +22,7 @@ def permitted_params
     column :courses do |c|
       (c.courses.map { |e| e.title }).join(' , ')
     end
-    default_actions
+    actions
   end
 
   show do

app/admin/map.rb

@@ -20,7 +20,7 @@ def permitted_params
     column :name
     column :image_url
     column :semester
-    default_actions
+    actions
   end
 
   show do

app/admin/medium.rb

@@ -24,14 +24,16 @@ def permitted_params
     column :semester
     column :link_url
     column :media_type
-    default_actions
+    actions
   end
 
   show do
     attributes_table do
-      row :name
+      row :title
       row :image_url
       row :semester
+      row :link_url
+      row :media_type
     end
   end
 end

app/admin/mentor.rb

@@ -29,7 +29,7 @@ def permitted_params
     column :semesters do |s|
       (s.semesters.map { |e| ([e.season, e.year.year]).join(' ')  }).join(', ')
     end
-    default_actions
+    actions
   end
 
   show do

app/admin/organizer.rb

@@ -24,7 +24,7 @@ def permitted_params
     column :semesters do |s|
       (s.semesters.map { |e| ([e.season, e.year.year]).join(' ')  }).join(', ')
     end
-    default_actions
+    actions
   end
 
   show do

app/admin/partner.rb

@@ -34,7 +34,7 @@ def permitted_params
     column :semesters do |s|
       (s.semesters.map { |e| ([e.season, e.year.year]).join(' ') }).join(' , ')
     end
-    default_actions
+    actions
   end
 
   show do

app/admin/prize.rb

@@ -13,6 +13,7 @@ def permitted_params
       f.input :sponsor, :as => :select
       f.input :partners, :as => :check_boxes, :collection => Partner.all.where(:partnership_type => "Non-Profit Partner")
       f.input :semester, :as => :select
+      f.input :api
     end
     f.inputs "Description &nbsp;&nbsp;(use <a href='http://daringfireball.net/projects/markdown/syntax'>markdown</a>)" do
       f.input :markdown_content, :label => "Description", :as => :pagedown_text
@@ -24,18 +25,20 @@ def permitted_params
     column :title
     column :markdown_content
     column :sponsor
+    column :api
     column :partners do |p|
       (p.partners.map { |e| e.name }).join(' , ')
     end
     column :semester
-    default_actions
+    actions
   end
 
   show do
     attributes_table do
       row :title
       row :markdown_content
       row :sponsor
+      row :api
       row :partners do |p|
         (p.partners.map { |e| e.name }).join(' , ')
       end

app/admin/sponsor.rb

@@ -12,6 +12,7 @@ def permitted_params
       f.input :name
       f.input :image_url, :hint => "Use 'company-name'.png and make sure the image file is in the public/sponsors folder"
       f.input :link_url
+      f.input :tier, :as => :select, :collection => ["small", "medium", "large"]
       f.input :semesters, :as => :check_boxes
     end
     f.actions
@@ -21,17 +22,19 @@ def permitted_params
     column :name
     column :image_url
     column :link_url
+    column :tier
     column :semesters do |s|
       (s.semesters.map { |e| ([e.season, e.year.year]).join(' ')  }).join(', ')
     end
-    default_actions
+    actions
   end
 
   show do
     attributes_table do
       row :name
       row :image_url
       row :link_url
+      row :tier
       row :semesters do |s|
         (s.semesters.map { |e| ([e.season, e.year.year]).join(' ')  }).join(', ')
       end    

app/admin/winnner.rb

@@ -25,7 +25,7 @@ def permitted_params
     column :link_url
     column :prize_type
     column :semester
-    default_actions
+    actions
   end
 
   show do