Added Breakfast, Session 0, and Lunch sessions. Also updated and fixe…

…d Map link
minnestar · Apr 10, 2015 · b036a74 · b036a74
1 parent cbee0ee
commit b036a74
Show file tree

Hide file tree

Showing 114 changed files with 179 additions and 427 deletions.
diff --git a/src/Gemfile b/src/Gemfile
@@ -16,7 +16,8 @@ gem 'coffee-rails', '~> 4.0.0'
 # gem 'therubyracer',  platforms: :ruby
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', "2.1.4" # we need this version to work with the outdated scrollTo js package
+
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -30,7 +31,8 @@ gem 'spring',        group: :development
 gem 'haml'
 gem 'formtastic'
 
-gem "fancybox-rails", "~> 0.2.1"
+#gem "fancybox-rails", "~> 0.2.1"
+gem 'fancybox2-rails'
 
 gem 'annealer'
 

diff --git a/src/Gemfile.lock b/src/Gemfile.lock
@@ -70,8 +70,8 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    fancybox-rails (0.2.1)
-      railties (>= 3.1.0)
+    fancybox2-rails (0.2.8)
+      railties (>= 3.1.0, < 5.0)
     ffaker (2.0.0)
     ffi (1.9.8)
     ffi-compiler (0.1.3)
@@ -87,7 +87,7 @@ GEM
     jbuilder (2.2.11)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.2)
+    jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.2)
@@ -231,13 +231,13 @@ DEPENDENCIES
   coveralls
   database_cleaner
   factory_girl_rails (~> 4.0)
-  fancybox-rails (~> 0.2.1)
+  fancybox2-rails
   ffaker
   formtastic
   haml
   icalendar (~> 1.5.4)
   jbuilder (~> 2.0)
-  jquery-rails
+  jquery-rails (= 2.1.4)
   nokogiri
   pg
   poltergeist

diff --git a/src/app/assets/images/maps/master-map.png b/src/app/assets/images/maps/master-map.png
diff --git a/src/app/assets/stylesheets/application.css.scss b/src/app/assets/stylesheets/application.css.scss
@@ -11,7 +11,6 @@
  *= require_self
  *= require typeahead.min
  *= require fancybox
- *= require fancybox/jquery.fancybox-1.3.4.css
  *= require formtastic
  *= require formtastic_changes
  *= require grid

diff --git a/src/app/assets/stylesheets/fancybox/blank.gif b/src/app/assets/stylesheets/fancybox/blank.gif
diff --git a/src/app/assets/stylesheets/fancybox/fancy_close.png b/src/app/assets/stylesheets/fancybox/fancy_close.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_loading.png b/src/app/assets/stylesheets/fancybox/fancy_loading.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_nav_left.png b/src/app/assets/stylesheets/fancybox/fancy_nav_left.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_nav_right.png b/src/app/assets/stylesheets/fancybox/fancy_nav_right.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_e.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_e.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_n.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_n.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_ne.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_ne.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_nw.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_nw.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_s.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_s.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_se.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_se.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_sw.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_sw.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_shadow_w.png b/src/app/assets/stylesheets/fancybox/fancy_shadow_w.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_title_left.png b/src/app/assets/stylesheets/fancybox/fancy_title_left.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_title_main.png b/src/app/assets/stylesheets/fancybox/fancy_title_main.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_title_over.png b/src/app/assets/stylesheets/fancybox/fancy_title_over.png
diff --git a/src/app/assets/stylesheets/fancybox/fancy_title_right.png b/src/app/assets/stylesheets/fancybox/fancy_title_right.png
diff --git a/src/app/assets/stylesheets/fancybox/fancybox-x.png b/src/app/assets/stylesheets/fancybox/fancybox-x.png
diff --git a/src/app/assets/stylesheets/fancybox/fancybox-y.png b/src/app/assets/stylesheets/fancybox/fancybox-y.png
diff --git a/src/app/assets/stylesheets/fancybox/fancybox.png b/src/app/assets/stylesheets/fancybox/fancybox.png