From 64ac93f65f42fd2909362e9666adc6c0522ec9b0 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 16 Feb 2017 17:03:58 -0500 Subject: [PATCH 1/2] getting started page --- app/assets/stylesheets/main/help.scss | 52 +++++++++++++++++++++ app/controllers/help_controller.rb | 20 +++++++++ app/views/help/getting_started.html.erb | 57 ++++++++++++++++++++++++ config/locales/en-us.yml | 5 +++ config/routes.rb | 2 + test/controllers/help_controller_test.rb | 9 ++++ 6 files changed, 145 insertions(+) create mode 100644 app/assets/stylesheets/main/help.scss create mode 100644 app/controllers/help_controller.rb create mode 100644 app/views/help/getting_started.html.erb create mode 100644 test/controllers/help_controller_test.rb diff --git a/app/assets/stylesheets/main/help.scss b/app/assets/stylesheets/main/help.scss new file mode 100644 index 00000000..3704ac1a --- /dev/null +++ b/app/assets/stylesheets/main/help.scss @@ -0,0 +1,52 @@ +// BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +// +// Copyright (c) 2016 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 . + +.help { + + .title { + padding-bottom: 40px; + } + + .videos-wrapper { + width: 1000px; + height: 100%; + } + + .video-btn { + position: relative; + width: 304px; + height: 169px; + } + + img { + max-width: 100%; + max-height: 100%; + } + + .video-icon { + position: absolute; + left: 0; + right: 0; + margin-left: auto; + margin-right: auto; + top: 40%; + text-align: center; + z-index: 100; + color: #fff; + font-size: 40px; + } + +} diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb new file mode 100644 index 00000000..f0669954 --- /dev/null +++ b/app/controllers/help_controller.rb @@ -0,0 +1,20 @@ +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# +# Copyright (c) 2016 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 . + +class HelpController < ApplicationController + def getting_started + end +end diff --git a/app/views/help/getting_started.html.erb b/app/views/help/getting_started.html.erb new file mode 100644 index 00000000..4077c71e --- /dev/null +++ b/app/views/help/getting_started.html.erb @@ -0,0 +1,57 @@ +<% +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# Copyright (c) 2016 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 . +%> + +
+
+
+
+

<%= t('getting_started_page.title') %>

+
+
+
+
+
+ +
+ Setting Up Audio +
+
+ +

<%= t('getting_started_page.setting_up_audio') %>

+
+ +
+ +
+ BigBlueButton Viewer Overview Video +
+
+ +

<%= t('getting_started_page.viewer_overview') %>

+
+ +
+ +
+ Moderator/Presenter Overview Video +
+
+ +

<%= t('getting_started_page.presenter_overview') %>

+
+
+
+
+
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index fe2cd741..5af5c874 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -71,6 +71,11 @@ en-US: enter_name: Enter your name enter_meeting_name: Enter a meeting name to start footer_html: Powered by %{bbb_link} + getting_started_page: + title: Getting Started Quickly + setting_up_audio: Setting Up Audio + viewer_overview: Viewer Overview + presenter_overview: Moderator/Presenter Overview hi_all: Hi Everyone home_title: Welcome to BigBlueButton invite: Invite diff --git a/config/routes.rb b/config/routes.rb index 83bb56d1..1ee0f760 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,6 +16,8 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html Rails.application.routes.draw do + get 'help/getting_started' + mount ActionCable.server => '/cable' resources :users, only: [:edit, :update] diff --git a/test/controllers/help_controller_test.rb b/test/controllers/help_controller_test.rb new file mode 100644 index 00000000..e956ee24 --- /dev/null +++ b/test/controllers/help_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class HelpControllerTest < ActionDispatch::IntegrationTest + test "should get getting_started" do + get help_getting_started_url + assert_response :success + end + +end From 6637983d4e83dbd3fbedc19ca323da6db095e222 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 16 Feb 2017 17:17:55 -0500 Subject: [PATCH 2/2] add help link to center panel --- app/assets/stylesheets/main/shared.scss | 11 +++++++++++ app/views/shared/_center_panel.html.erb | 3 +++ config/locales/en-us.yml | 1 + config/routes.rb | 2 +- test/controllers/help_controller_test.rb | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/main/shared.scss b/app/assets/stylesheets/main/shared.scss index 0febf358..73486b80 100644 --- a/app/assets/stylesheets/main/shared.scss +++ b/app/assets/stylesheets/main/shared.scss @@ -79,6 +79,10 @@ body[data-controller=landing].app-background { max-width: 1100px; } + .panel { + position: relative; + } + .input-spacing { margin-top: 15px; } @@ -173,3 +177,10 @@ a.signin-link { .invite-join-wrapper { position: relative; } + +.help-link { + position: absolute; + top: 0; + right: 0; + padding-right: 3px; +} diff --git a/app/views/shared/_center_panel.html.erb b/app/views/shared/_center_panel.html.erb index 2348a252..58963960 100644 --- a/app/views/shared/_center_panel.html.erb +++ b/app/views/shared/_center_panel.html.erb @@ -24,6 +24,9 @@ <%= yield %> <%= yield :footer %> +
+ <%= link_to t('help'), help_url %> +
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 5af5c874..fb58117e 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -76,6 +76,7 @@ en-US: setting_up_audio: Setting Up Audio viewer_overview: Viewer Overview presenter_overview: Moderator/Presenter Overview + help: Help hi_all: Hi Everyone home_title: Welcome to BigBlueButton invite: Invite diff --git a/config/routes.rb b/config/routes.rb index 1ee0f760..002f365d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,7 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html Rails.application.routes.draw do - get 'help/getting_started' + get 'help/getting_started', as: :help mount ActionCable.server => '/cable' diff --git a/test/controllers/help_controller_test.rb b/test/controllers/help_controller_test.rb index e956ee24..4ea75abd 100644 --- a/test/controllers/help_controller_test.rb +++ b/test/controllers/help_controller_test.rb @@ -2,7 +2,7 @@ require 'test_helper' class HelpControllerTest < ActionDispatch::IntegrationTest test "should get getting_started" do - get help_getting_started_url + get help_url assert_response :success end