Pre registration

config/environments/development.rb

@@ -30,10 +30,11 @@ BikeBike::Application.configure do
 	# This option may cause significant delays in view rendering with a large
 	# number of complex assets.
 	config.assets.debug = false
+	config.assets.digest = false
+	config.assets.compile = true
 
 	config.action_mailer.delivery_method = :smtp
 	config.action_mailer.smtp_settings = {
-		:enable_starttls_auto => true,
 		:address => 'mail.bikebike.org',
 		:domain => 'preview.bikebike.org',
 		:port => 587,
@@ -45,15 +46,10 @@ BikeBike::Application.configure do
 	}
 	config.action_mailer.raise_delivery_errors = true
 	config.action_mailer.perform_deliveries = true
-	#config.force_ssl = true
-	#config.action_mailer.default_charset = 'utf-8'
 
-	#Carmen.i18n_backend.locale_paths = ''
-	#puts "CARMEN\t" + Carmen.i18n_backend.locale_paths
 
-	#PerfTools::CpuProfiler.start('/tmp/dev_prof')
 	config.serve_static_files = true
-	#config.assets.precompile = false
+	# config.action_controller.perform_caching = true
+
 	Paypal.sandbox!
-	#Paypal.sandbox = false
 end

config/environments/preview.rb

@@ -87,7 +87,6 @@ BikeBike::Application.configure do
 
 	config.action_mailer.delivery_method = :smtp
 	config.action_mailer.smtp_settings = {
-		:enable_starttls_auto => true,
 		:address => 'mail.bikebike.org',
 		:domain => 'preview.bikebike.org',
 		:port => 587,

config/environments/production.rb

@@ -88,7 +88,6 @@ BikeBike::Application.configure do
 
 	config.action_mailer.delivery_method = :smtp
 	config.action_mailer.smtp_settings = {
-		:enable_starttls_auto => true,
 		:address => 'mail.bikebike.org',
 		:domain => 'preview.bikebike.org',
 		:port => 587,

config/initializers/assets.rb

@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+Rails.application.config.assets.precompile += %w( map.js pen.js editor.js markdown.js main.js favicon.ico )

config/initializers/sorcery.rb

@@ -3,7 +3,19 @@
 # Available submodules are: :user_activation, :http_basic_auth, :remember_me,
 # :reset_password, :session_timeout, :brute_force_protection, :activity_logging, :external
 # Rails.application.config.sorcery.submodules = [:remember_me, :reset_password, :user_activation, :brute_force_protection, :external]
-Rails.application.config.sorcery.submodules = [:remember_me, :reset_password, :brute_force_protection, :external]
+require 'sorcery'
+require 'openssl'
+
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
+
+ENV['bb_host'] = {
+  test:        'localhost:3000',
+  development: 'development.bikebike.org:3000',
+  preview:     'preview.bikebike.org',
+  production:  'bikebike.org',
+}[Rails.env]
+
+Rails.application.config.sorcery.submodules = [:external]
 
 # Here you can configure each submodule's features.
 Rails.application.config.sorcery.configure do |config|
@@ -112,11 +124,13 @@ Rails.application.config.sorcery.configure do |config|
   
   config.facebook.key = "257350517701074"
   config.facebook.secret = "2f6ab1fd7eeff9aee73140991fc68314"
-  config.facebook.callback_url = "http://dev.bikebike.org/oauth/callback?provider=facebook"
-  config.facebook.user_info_mapping = {:email => "email", :username => "username", :avatar => "picture/data/url"}
+  config.facebook.callback_url = "#{ENV['bb_host']}/oauth/callback?provider=facebook"
+  config.facebook.user_info_mapping = {:email => "email", :username => "username"}
   config.facebook.scope = "email"
   config.facebook.display = "popup"
-  
+  config.facebook.api_version = "v2.5"
+  config.facebook.user_info_path = "me?fields=email,name"
+ 
   # config.github.key = ""
   # config.github.secret = ""
   # config.github.callback_url = "http://0.0.0.0:3000/oauth/callback?provider=github"
@@ -213,6 +227,7 @@ Rails.application.config.sorcery.configure do |config|
     # make this configuration inheritable for subclasses. Useful for ActiveRecord's STI.
     # Default: `false`
     #
+    user.subclasses_inherit_config = true
 
 
     # -- remember_me --
@@ -306,7 +321,7 @@ Rails.application.config.sorcery.configure do |config|
     # mailer class. Needed.
     # Default: `nil`
     #
-    user.reset_password_mailer = UserMailer
+    # user.reset_password_mailer = UserMailer
 
 
     # reset password email method on your mailer class.
@@ -378,7 +393,7 @@ Rails.application.config.sorcery.configure do |config|
     # Unlock token mailer class
     # Default: `nil`
     #
-    user.unlock_token_mailer = UserMailer
+    # user.unlock_token_mailer = UserMailer
 
     # -- activity logging --
     # Last login attribute name.

config/locales/en.yml

@@ -5212,6 +5212,7 @@ en:
       un_translated: Untranslated content
       outdated_translation: Outdated content
       not_translation: Not a translation
+      Translation_of: Translation of
     volunteer:
       become_a_volunteer: Become a volunteer translator
       volunteer: Can you help us translate it?
@@ -5294,6 +5295,7 @@ en:
     conference_registration:
       headings:
         Policy_Agreement: Safer Space Agreement
+        policy: Policy
         arrival_and_departure: For what days will you need housing? (If you don't
           need housing, just tell us how long you plan to hang out with Bike!Bike!)
         other: Is there anything else you'd like to tell us?
@@ -5316,6 +5318,7 @@ en:
         Allergies: Allergies
         Stats: Stats
         Workshops: Workshops
+        workshops: Workshops
         Your_Workshops: Your Workshops
         payment_confirm: Please confirm your payment
         Preview: Preview
@@ -5323,8 +5326,13 @@ en:
         date: Date
         email: Email
         fees_paid: Fees Paid
+        Contact_Info: Contact Info
+        contact_info: Contact Info
+        Add_Workshop: Propose a Workshop
+        Workshops_Looking_For_Facilitators: Workshops Looking for Facilitators
+        All_Workshops: All Workshops
       paragraphs:
-        Policy_Agreement: Safer Space Agreement
+        Policy_Agreement: Ensuring that all attendees feel welcome, safe, and respected at all times is especially important to us all. Please ensure that you have fully read and understand our safer spaces policy below, if you have any questions or concerns you can reach out to the organizers at any time.
         Confirm_Agreement: By clicking the "I Agree" button, you are pledging to do
           your best to uphold Bike!Bike!'s safer space agreement. Thank you!
         Registration_Info: Please fill in this registration form to help us prepare
@@ -5361,6 +5369,10 @@ en:
         participants_emailed: Your email has been sent to all participants of %%{conference_title}.
         workshops: You can now take a look at proposed workshops and even propose
           one yourself if you like.
+        Contact_Info: Please let us know a little bit about you.
+        Create_Workshop: At Bike!Bike! anyone can lead a workshop or just propose and idea that someone else can volunteer to lead. If, where, and when the workshop will be scheduled will ultimately be decided by the conference organizers.
+        Workshops_Looking_For_Facilitators: Would you like to lend a hand facilitating a workshop proposed by someone else? Below is a list of workshops that are actively looking for volunteers, if you are interested in helping out you can make a facilitation request.
+        Your_Workshops: The following is a list of all the workshops that you have created or have requested to facilitate.
       questions:
         bike:
           large: Large
@@ -5462,13 +5474,13 @@ en:
         Workshops: Workshops
         Your_Workshops: Your Workshops
         facilitate: Request to Facilitate ‘%{workshop_title}’
+        add_facilitator: Add a facilitator
+        needs_facilitators: Looking for help?
       paragraphs:
         Proposed_Workshops: Would you like to facilitate your own workshop? Simply
           register and visit the workshops page. If you have already registered you
           can access the page by restarting the registration process.
-        info: Please accurately describe your workshop in detail. This will help hosts
-          decide if they wish to add it to the schedule and when it should best be
-          scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics)
+        info: Describe your workshop in detail; highlighting text will reveal formatting controls.
         space: What kind of space do you need for your workshop?
         theme: Which of the themes below best match your workshop? This will help
           hosts to avoid scheduling conflicts. Select other if none of the options
@@ -5495,6 +5507,9 @@ en:
         facilitate_request_sent: Your request has been sent. You will receive an email
           once your request is approved or denied or if the current facilitators have
           any questions.
+        languages: What language will the workshop be presented in? Will there be translations or translators available?
+        needs: If you need any of the following the conference organizers will do their best to make sure you have them. If you have any other requests, you can include them in the notes section.
+        needs_facilitators: Are you actively looking for help running this workshop? Anyone who is registered for the conference can request to facilitate at any time but checking this box will improve your chances of finding collaborators.
       info:
         interested_count:
           one: One person is interested in this workshop
@@ -5522,7 +5537,7 @@ en:
         name: Name
         subject: Subject
         title: Title
-        info: Info
+        info: Description
         content: Content
         notes: Notes
         message: 'Your Message:'
@@ -5546,6 +5561,8 @@ en:
         remove_interest: "-1"
         show_interest: "+1"
         add: "+"
+        previous: Previous
+        next: Next
   page_titles:
     '403':
       Please_Confirm_Email: Please confirm your email
@@ -5562,8 +5579,9 @@ en:
       Registration_Stats: Registration Stats
       View_Workshop: View Workshop
       Workshops: Workshops
-      Delete_Workshop: Create Workshop
+      Delete_Workshop: Delete Workshop
       Edit_Workshop: Edit Workshop
+      Translate_Workshop: Edit %{language} Workshop Translation
       Edit: Edit Conference
       Facilitate_Workshop: Workshop Facilitation Request
     policy:
@@ -5572,6 +5590,8 @@ en:
       Page_Not_Found: Page Not Found
     Policy: 'Policy'
     About: 'About'
+    Register: 'Register'
+    Pre_Register: 'Pre-Register'
   links:
     footer:
       help_text:
@@ -5640,6 +5660,7 @@ en:
         organization: Organizational Concerns
         other: Other
         race_gender: Race, Gender, or Class Politics
+      needs_facilitators: Needs Additional Facilitators
   email:
     confirmation:
       paragraph:
@@ -5650,10 +5671,13 @@ en:
     subject:
       confirm_email: Confirmation Email
       registration_confirmed: Thank you for registering for %{conference_title}
+      pre_registration_confirmed: Thank you for pre-registering for %{conference_title}
       workshop_facilitator_request: Request to facilitate %{workshop_title} from %{requester_name}
       workshop_request_approved: You have been added as a facilitator of %{workshop_title}
       workshop_request_denied: Your request to facilitate %{workshop_title} has been
         denied
+      workshop_translated: The %{language} translation for %{workshop_title} has been modified
+      workshop_original_content_changed: Original content for %{workshop_title} has been modified
     general:
       paragraph:
         see_you: See you in %{conference_location}!
@@ -5665,7 +5689,14 @@ en:
           the registration process. If you have yet to pay or add your workshops and
           plan to do so, we ask that you take care of it as soon as possible to help
           us prepare in advance of your arrival.
-    workshop:
+    translations:
+      headings:
+        new_value: 'New Value: '
+        old_value: 'Old Value: '
+        diff: 'Difference: '
+      paragraph:
+        workshop_translated: '%{user_name} has modified the %{language} translation for %{workshop_title}.'
+        workshop_original_content_changed: '%{user_name} has modified the original content for %{workshop_title}. Translations may need to be updated.'
       paragraph:
         request_approved: You have been added as a facilitator of %{workshop_title}.
         request_denied: Your request to become a facilitator of %{workshop_title}

config/locales/es.yml

@@ -702,7 +702,7 @@ es:
     actions:
       Register: Registrate
   donate:
-    button_label: donar
+    button_label: Donar
   articles:
     conference_registration:
       headings:
@@ -744,7 +744,6 @@ es:
           en: bikebike@gdlenbici.org
         Workshops: 'Título de la actividad: Que necesitas? Tipo de espacio? Tema?
           Quién es responsable? Descripción? Tiempo?'
-        Policy_Agreement: Acuerdo de Espacios Más Seguros
         Confirm_Agreement: Al hacer click en el botón "Acepto", estás comprometiéndote
           a cumplir el Acuerdo de Espacios Más Seguros de Bike!Bike!. ¡Gracias!
         Email_Participants: Esta página se usa para contactar a todxs lxs participantes.
@@ -851,8 +850,6 @@ es:
         Proposed_Workshops: ¿Te gustaría facilitar tu propio taller? Simplemente regístrate
           y visita la página de Talleres. Si ya te registraste puedes acceder a la
           página reiniciando el proceso de registro.
-        info: 'Título de la actividad: Que necesitas? Tipo de espacio? Tema? Quién
-          es responsable? Descripción? Tiempo?'
         Workshops: ¿Tienes alguna habilidad emocionante que quieres compartir con
           nosotros? ¿Quieres charlar sobre crear espacios comunitarios seguros? ¿Quieres
           asegurarte de que hagamos un buen paseo el fin de semana? ¡Propón un taller!
@@ -1012,6 +1009,8 @@ es:
       Page_Not_Found: Crear un taller
     Policy: 'Política'
     About: 'Acerca de'
+    Register: 'Registrate'
+    Pre_Register: 'Pre-Registrate'
   actions:
     workshops:
       create: Crear

config/routes.rb

@@ -6,6 +6,7 @@ BikeBike::Application.routes.draw do
     post  '/conferences/:slug/save' => 'conferences#save', :as => :save_conference
 
     match '/conferences/:slug/register' => 'conferences#register', :as => :register, via: [:get, :post]
+    get   '/conferences/:slug/register/:step' => 'conferences#register', :as => :register_step
     match '/conferences/:slug/broadcast' => 'conferences#broadcast', :as => :broadcast, via: [:get, :post]
     get   '/conferences/:slug/stats' => 'conferences#stats', :as => :stats
     get   '/conferences/:slug/register/:button/:confirmation_token' => 'conferences#register', :as => :register_paypal_confirm
@@ -24,12 +25,13 @@ BikeBike::Application.routes.draw do
     get   '/conferences/:slug/schedule/event/:id' => 'conferences#view_event', :as => :view_event
     get   '/conferences/:slug/schedule/event/:id/edit' => 'conferences#edit_event', :as => :edit_event
 
-    get   '/conferences/:slug/workshops' => 'conferences#workshops', :as => :workshops
+    # get   '/conferences/:slug/workshops' => 'conferences#workshops', :as => :workshops
     match '/conferences/:slug/workshops/create' => 'conferences#create_workshop', :as => :create_workshop, via: [:get, :post]
     post  '/conferences/:slug/workshops/save' => 'conferences#save_workshop', :as => :save_workshop
     get   '/conferences/:slug/workshops/:workshop_id' => 'conferences#view_workshop', :as => :view_workshop
     post  '/conferences/:slug/workshops/:workshop_id/toggle-interest' => 'conferences#toggle_workshop_interest', :as => :toggle_workshop_interest
     match '/conferences/:slug/workshops/:workshop_id/edit' => 'conferences#edit_workshop', :as => :edit_workshop, via: [:get, :post]
+    match '/conferences/:slug/workshops/:workshop_id/translate/:locale' => 'conferences#translate_workshop', :as => :translate_workshop, via: [:get, :post]
     match '/conferences/:slug/workshops/:workshop_id/delete' => 'conferences#delete_workshop', :as => :delete_workshop, via: [:get, :post]
     get   '/conferences/:slug/workshops/:workshop_id/facilitate' => 'conferences#facilitate_workshop', :as => :facilitate_workshop
     post  '/conferences/:slug/workshops/:workshop_id/facilitate_request' => 'conferences#facilitate_request', :as => :facilitate_workshop_request
@@ -43,7 +45,9 @@ BikeBike::Application.routes.draw do
     get   '/confirm/:token' => 'application#confirm', :as => :confirm
     match '/doconfirm' => 'application#do_confirm', :as => :do_confirm, via: [:get, :post]
     #post '/doconfirm' => 'application#do_confirm', :as => :do_confirm
-    post  '/logout' => 'application#user_logout', :as => :logout
+    match '/logout' => 'application#user_logout', :as => :logout, :via => [:get, :post]
+    match '/oauth/callback' => 'oauths#callback', :via => [:get, :post]
+    get   '/oauth/:provider' => 'oauths#oauth', :as => :auth_at_provider
     post  '/translator-request' => 'application#translator_request', :as => :translator_request
 
     get   '/error_404' => 'application#error_404'