From 704dab1e5c34a4e72776405cb2d52d8229ba4b1a Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 6 Jul 2017 13:17:12 -0400 Subject: [PATCH] add footer to Youtube prompt --- app/assets/stylesheets/main/landing.scss | 6 ++++++ app/controllers/sessions_controller.rb | 2 +- app/views/landing/rooms.html.erb | 1 + config/locales/en-us.yml | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/main/landing.scss b/app/assets/stylesheets/main/landing.scss index 664d8524..99d10488 100644 --- a/app/assets/stylesheets/main/landing.scss +++ b/app/assets/stylesheets/main/landing.scss @@ -114,3 +114,9 @@ .tooltip-wrapper { display: inline-block; } + + #youtube-footer{ + font-size: 10px; + text-align: center; + margin-top: 10px; + } diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index eeb9d325..3c723844 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -43,7 +43,7 @@ class SessionsController < ApplicationController def auth_failure if params[:message] == 'invalid_credentials' - redirect_to '/', flash: {danger: 'Invalid login credentials.' } + redirect_to '/', flash: {danger: t('invalid_login') } else redirect_to '/' end diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index 0ec86587..a1dda2b7 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -76,6 +76,7 @@ <%= t('upload') %> +
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 3016c399..36c5f549 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -92,6 +92,7 @@ en-US: home_page: Home page home_title: Welcome to BigBlueButton invalid_file: You may only upload an image file (jpg, gif, png). + invalid_login: Invalid log in credentials. invite: Invite invite_description: (share this link below to invite others to this meeting) join: Join @@ -182,6 +183,7 @@ en-US: watch: Watch 'yes': 'Yes' youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}. + youtube_footer: this will upload all webcam and audio data youtube_privacy_options: public: Public private: Private