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>

app/views/shared/components/_terms_button.html.erb

@@ -0,0 +1,18 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+%>
+
+<div class="btn-list text-right pt-8">
+    <%= button_to t("terms.accept_existing"), terms_path, params: { accept: true }, class: "btn btn-primary btn-space" %>
+</div>

app/views/users/new.html.erb

@@ -57,6 +57,11 @@
               <%= f.password_field :password_confirmation, class: "form-control #{form_is_invalid?(@user, :password_confirmation)}", placeholder: t("signup.password_confirm") %>
               <div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password_confirmation).first %></div>
             </div>
+            <div class="form-inline">
+              <%= f.check_box :accepted_terms, class: "form-control #{form_is_invalid?(@user, :accepted_terms)}", placeholder: t("signup.password_confirm") %>
+              <%= f.label :accepted_terms, t("terms.accept", href: link_to(t("terms.title"), terms_path, target: "_blank", class: "ml-1 text-blue")).html_safe, class: "ml-1" %>
+              <div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:accepted_terms).first %></div>
+            </div>
             <div class="card-footer">
               <%= f.submit t("signup.title"), class: "btn btn-primary float-right ml-2" %>
               <%= link_to t("cancel"), root_path, class: "btn btn-secondary float-right ml-2" %>

app/views/users/terms.html.erb

@@ -23,9 +23,9 @@
           <div class="terms">
             <%= markdown(Rails.configuration.terms) %>
           </div>
-          <div class="btn-list text-right pt-8">
-            <%= button_to t("terms.accept"), terms_path, params: {accept: true}, class: "btn btn-primary btn-space" %>
-          </div>
+          <% if Rails.configuration.terms && current_user && !current_user.accepted_terms %>
+            <%= render "/shared/components/terms_button" %>
+          <% end %>
         </form>
       </div>
     </div>