Fix #260 issues with privacy policy (#261)

* <fixed privacy policy workflow>

* <fixed privacy policy workflow>

* <changed rspec tests to handle new privacy flow>

* <changed rspec tests to handle new privacy flow>

* <deleted previous term validation due to changed workflow>

* <fixed code style>

* <reverted configuration settings>

* <Updated terms and conditions for existing users (not omniauth)>

* <Fix code style>

* <Fixed privacy policy for omniauth>

* <Fixed Travis C.I test>

* <Minor code changes>

* <Undo routes.rb change>

* <reconfigured routes.rb>

config/locales/en.yml

@@ -17,6 +17,10 @@
 # English (en) locale.
 
 en:
+  activerecord:
+    attributes:
+      user:
+        accepted_terms: "Terms and Conditions"
   bigbluebutton: BigBlueButton
   cancel: Cancel
   copy: Copy
@@ -152,7 +156,8 @@ en:
     title: Signup
     with: Signup with %{provider}
   terms:
-    accept: I accept the terms and conditions.
+    accept: I accept the %{href}
+    accept_existing: I accept the terms and conditions
     title: Terms and Conditions
   test_install: >
     This deployment is using a pre-configured testing server, you should replace this with your own.

config/routes.rb

@@ -26,12 +26,13 @@ Rails.application.routes.draw do
   get '/signup', to: 'users#new', as: :signup
   post '/signup', to: 'users#create', as: :create_user
 
+  # Redirect to terms page
+  match '/terms', to: 'users#terms', via: [:get, :post]
+
   # User resources.
   scope '/u' do
-    match '/terms', to: 'users#terms', via: [:get, :post]
-
     # Handles login of greenlight provider accounts.
-    post '/login',  to: 'sessions#create', as: :create_session
+    post '/login', to: 'sessions#create', as: :create_session
 
     # Log the user out of the session.
     get '/logout', to: 'sessions#destroy'