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

added footer to share email

This commit is contained in:
Josh 2017-05-26 16:49:44 -04:00
parent 93f2a83e46
commit 4c34526a57
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/recordings.coffee
View File

@ -339,7 +339,7 @@ class @Recordings
recording_url = row.playbacks[0].url recording_url = row.playbacks[0].url
webcams_url = getHostName(recording_url) + '/presentation/' + id + '/video/webcams.webm' webcams_url = getHostName(recording_url) + '/presentation/' + id + '/video/webcams.webm'
subject = username + I18n.recording_mail_subject subject = username + I18n.recording_mail_subject
body = I18n.recording_mail_body + "\n\n" + recording_url body = I18n.recording_mail_body + "\n\n" + recording_url + "\n\n" + I18n.email_footer_1 + "\n" + I18n.email_footer_2
mailto = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body); mailto = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body);
window.open(mailto); window.open(mailto);

2
app/controllers/bbb_controller.rb
View File

@ -178,7 +178,7 @@ class BbbController < ApplicationController
client = Yt::Account.new(access_token: current_user.token) client = Yt::Account.new(access_token: current_user.token)
video = client.upload_video(get_webcams_url(params[:record_id]), video = client.upload_video(get_webcams_url(params[:record_id]),
title: params[:video_title], title: params[:video_title],
description: t('youtube_description'), description: t('youtube_description', url: 'https://bigbluebutton.org/'),
privacy_status: params[:privacy_status]) privacy_status: params[:privacy_status])
rescue rescue
# In this case, they don't have a youtube channel connected to their account, so prompt to create one. # In this case, they don't have a youtube channel connected to their account, so prompt to create one.

4
config/locales/en-us.yml
View File

@ -47,6 +47,8 @@ en-US:
are_you_sure: Are you sure? are_you_sure: Are you sure?
change_visibility: Change visibility change_visibility: Change visibility
delete_recording: Delete delete_recording: Delete
email_footer_1: This e-mail is auto-generated by your friendly neighbourhood BigBlueButton server. Do no reply to this e-mail.
email_footer_2: BigBlueButton is an open source web conferencing system. For more information on BigBlueButton and it's amazing capabilities, see https://bigbluebutton.org/ .
enter_name: Enter a name to join enter_name: Enter a name to join
mail_recording: Mail mail_recording: Mail
meeting_ended: Meeting was ended meeting_ended: Meeting was ended
@ -171,7 +173,7 @@ en-US:
wait_for_mod_explanation: You will automatically join when the meeting starts wait_for_mod_explanation: You will automatically join when the meeting starts
watch: Watch watch: Watch
'yes': 'Yes' 'yes': 'Yes'
youtube_description: This recording was recorded with BigBlueButton. For more information check out https://bigbluebutton.org/ youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
youtube_privacy_options: youtube_privacy_options:
public: Public public: Public
private: Private private: Private