lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Added Google calendar button (#429)

Browse Source 
* implement first version of the recording authentication, redirecting to the playback URL with the jwt token

* set default recording visibility by environment variable

* use the http header, if present, to determine the client ip address

* fix email verification when disabled

* revert playback component to link_to, change method to get

* remove unnecessary variable

* Added "Add to Google Calendar" button on Room page

* Added Google Calendar button enable to env.sample

* Updated CSS for the Google Calendar Button row

* Added correct translation when copying room link

* Fixed new Google Calendar button mobile display

* GRN-80: Allow local accounts on multitenant (#428)

* Changed the way the omniauth providers are declared

* Allow local authentication for multitenant mode based on customer settings

* Cleanead up code mandated by rubocop

* Completed implementation for signin and added the one for signup

* Fixed issue with rubocop

* Renamed customer_name to lb_user

* Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented

* Completed implementation of email_verification

* Fixed rubocop issue

* Final update

* Fix for test with loadbalancer

* Make sure loadbalancer mockup is only used when env defined

* Fix for test on rooms_controller

* Fixed most of the test failing on multitenant env

* Fixed issue detected by rubocop

* Fixed issue with activation tockens not working on resend

* Fixed new issue found by rubocop

* Updated travis script

* Harcoded credentials for mockup

* Updated expectation on start_session

* Fixed issue with duplication of home room

* Updated script for rubocop

* Restored Gemfile

* Update sample.env

* Update sample.env
This commit is contained in:
Rafael Baldasso Audibert
2019-05-13 18:05:31 -03:00
committed by Jesus Federico
parent d7b9e7a322
commit d8f6c3f872
8 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/views/rooms/show.html.erb
View File

@ -15,8 +15,8 @@
<div class="background pb-1">
<div class="container">
<div class="row pt-7">
<div class="col-lg-9 col-sm-12">
<div class="row pt-9">
<div class="col-lg-8 col-sm-12">
<div id="room-title" class="display-3 form-inline <%= 'edit_hover_class' if current_user.main_room != @room %>">
<h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400"><%= @room.name %></h1>
<% if current_user.main_room == @room %>
@ -27,20 +27,36 @@
</div>
<h4 class="text-left mb-6"><%= @room.sessions %> <%= t("room.sessions") %> | <%= @recordings.length %> <%= t("room.recordings") %></h4>
<label class="form-label"><%= t("room.invite_participants") %></label>
<form class="form-inline">
<div class="input-icon invite-link-input">
<span class="input-icon-addon">
<i class="fas fa-link"></i>
</span>
<input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
<div class="row">
<div class="col-lg-5 col-md-12 mt-2 pr-0">
<div class="input-icon invite-link-input">
<span class="input-icon-addon">
<i class="fas fa-link"></i>
</span>
<input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
</div>
</div>
<div id="copy" class="btn btn-primary mx-2">
<i class="fas fa-copy"></i>
<%= t("copy") %>
<div class="col-lg-7 col-md-12 pr-0">
<div class="row">
<div class="col-sm-6">
<a href="#" id="copy" class="btn btn-primary btn-block mt-2">
<i class="fas fa-copy"></i>
<%= t("copy") %>
</a>
</div>
<div class="col-sm-6 pl-0">
<% if Rails.configuration.enable_google_calendar_button %>
<a href="<%= google_calendar_path %>" target="__blank" id="schedule" class="btn btn-primary btn-block mt-2">
<i class="fas fa-calendar-plus"></i>
<%= t("add_to_google_calendar") %>
</a>
<% end %>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="col-lg-3 col-sm-12 force-bottom mt-5">
<div class="offset-lg-1 col-lg-3 col-sm-12 force-bottom mt-5 pr-0">
<% if @is_running %>
<%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %>
<% else %>