diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index fe2a31e..4b9f8a1 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -517,16 +517,20 @@ class ConferencesController < ApplicationController
is_post = request.post? || session[:registration_step]
set_conference
- if !@this_conference.registration_open
- do_404
- return
- end
+ #if !@this_conference.registration_open
+ # do_404
+ # return
+ #end
set_conference_registration
@register_template = nil
if logged_in?
+ unless @this_conference.registration_open || @registration
+ do_404
+ return
+ end
# if the user is logged in start them off on the policy
# page, unless they have already begun registration then
# start them off with questions
@@ -650,6 +654,11 @@ class ConferencesController < ApplicationController
@register_template = :done
end
+ # don't let the user edit registration if registration is closed
+ if !@conference.registration_open && @register_template == :questions
+ @register_template = :done
+ end
+
# prepare data for the next view
case @register_template
when :questions
diff --git a/app/views/conferences/_done.html.haml b/app/views/conferences/_done.html.haml
index b8e7049..0bfc565 100644
--- a/app/views/conferences/_done.html.haml
+++ b/app/views/conferences/_done.html.haml
@@ -45,6 +45,7 @@
%tr
%th=_'articles.conference_registration.headings.payment'
%td=_!('$' + (@amount || 0))
- = form_tag register_path(@this_conference.slug) do
- .actions
- = button_tag :edit_registration, :value => :register
+ - if @conference.registration_open
+ = form_tag register_path(@this_conference.slug) do
+ .actions
+ = button_tag :edit_registration, :value => :register
diff --git a/app/views/workshops/_workshop_previews.html.haml b/app/views/workshops/_workshop_previews.html.haml
index cdcea25..19bc81b 100644
--- a/app/views/workshops/_workshop_previews.html.haml
+++ b/app/views/workshops/_workshop_previews.html.haml
@@ -1,6 +1,6 @@
- # encoding: utf-8
%ul.workshop-previews
- - workshops.each do |w|
+ - workshops.sort_by{ |w| w.title.downcase }.each do |w|
- if w.title
%li
=link_to view_workshop_path(@this_conference.slug, w.id) do
diff --git a/app/views/workshops/index.html.haml b/app/views/workshops/index.html.haml
index ca3c646..a07e26d 100644
--- a/app/views/workshops/index.html.haml
+++ b/app/views/workshops/index.html.haml
@@ -8,6 +8,6 @@
= columns(medium: 6) do
%h3=_'articles.workshops.headings.Your_Workshops'
= render 'workshops/workshop_previews', :workshops => @my_workshops
- = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify]
+ = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify] if @conference.registration_open
= row do
= render 'workshops/workshop_previews', :workshops => @workshops
\ No newline at end of file
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html
index 052f244..bf81aa8 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html
@@ -46,7 +46,7 @@
Guadalajara, Jalisco, Mexico
-August 27 – 31, 2015
+August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
index e0e18be..a9d0dd1 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
@@ -51,7 +51,7 @@
-Sed Accumsan Felis
+
Cras Mi Pede, Malesuada In, Imperdiet Et, Commodo Vulputate, Justo
You are interested in this workshop
-
Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.
+
Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.
Facilitators
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
index 5c2caea..36b2e60 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
@@ -51,7 +51,7 @@
-Sed Accumsan Felis
+
Cras Mi Pede, Malesuada In, Imperdiet Et, Commodo Vulputate, Justo
No one is interested in this workshop yet
-
Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.
+
Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.
Facilitators
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html
index 5c2caea..36b2e60 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html
@@ -51,7 +51,7 @@
-Sed Accumsan Felis
+
Cras Mi Pede, Malesuada In, Imperdiet Et, Commodo Vulputate, Justo
No one is interested in this workshop yet
-
Proin interdum mauris non ligula pellentesque ultrices. Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.
+
Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.
Facilitators
diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html
index e4ad3d8..288fd3a 100644
--- a/config/locales/data/html_records/Broadcast-message--.html
+++ b/config/locales/data/html_records/Broadcast-message--.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 27 – 31, 2015
+August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
index d8d6f73..79ed8e2 100644
--- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
+++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
@@ -89,7 +89,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
|
diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html
index e4ad3d8..288fd3a 100644
--- a/config/locales/data/html_records/Create-workshop--.html
+++ b/config/locales/data/html_records/Create-workshop--.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 27 – 31, 2015
+August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Edit-a-conference--.html b/config/locales/data/html_records/Edit-a-conference--.html
index 1eb3f6a..7865a7a 100644
--- a/config/locales/data/html_records/Edit-a-conference--.html
+++ b/config/locales/data/html_records/Edit-a-conference--.html
@@ -46,7 +46,7 @@
Portland, Oregon
-August 27 – 31, 2015
+August 30 – September 3, 2015
diff --git a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html
index 7a17e06..0954f5c 100644
--- a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html
+++ b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html
@@ -58,7 +58,7 @@