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

change youtube popover UI

This commit is contained in:
Josh 2017-05-23 17:24:43 -04:00
parent 7d96eadbbf
commit 3e31be3885
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,10 @@ class @Recordings
options.title = I18n.mail_recording options.title = I18n.mail_recording
$('#recordings').tooltip(options) $('#recordings').tooltip(options)
options.selector = '.disabled-tooltip'
options.title = I18n.youtube_disabled
$('#recordings').tooltip(options)
$(document).one "turbolinks:before-cache", => $(document).one "turbolinks:before-cache", =>
@getTable().api().clear().draw().destroy() @getTable().api().clear().draw().destroy()

4
app/assets/stylesheets/main/landing.scss
View File

@ -101,3 +101,7 @@
.top-buffer { .top-buffer {
margin-top: 8px; margin-top: 8px;
} }
.tooltip-wrapper {
display: inline-block;
}

23
app/views/landing/rooms.html.erb
View File

@ -58,21 +58,22 @@
<div class="youtube-popover"> <div class="youtube-popover">
<form class = "form-inline"> <form class = "form-inline">
<div class = "row"> <div class = "row">
<div class="col-xs-5"> <div class="col-xs-12">
<input type="title" class="form-control" id="video-title" placeholder="<%= t('video_title') %>"> <input type="title" class="form-control" id="video-title" placeholder="<%= t('video_title') %>">
</div> </div>
<div class="col-xs-4 col-xs-offset-2">
<button type="button" class="btn btn-success upload-button centered" data-dismiss="popover">
<%= t('upload') %>
</button>
</div>
</div> </div>
<div class = "row top-buffer text-center"> <div class = "row top-buffer text-center">
<form class="privacy_form"> <form class="privacy_form">
<label class="radio-inline"><input type="radio" name="privacy_status" value="public" checked><%= t('youtube_privacy_options.public') %> </label> <label class="radio-inline"><input type="radio" name="privacy_status" value="public" checked><%= t('youtube_privacy_options.public') %> </label>
<label class="radio-inline"><input type="radio" name="privacy_status" value="private" checked><%= t('youtube_privacy_options.private') %> </label>
<label class="radio-inline"><input type="radio" name="privacy_status" value="unlisted"><%= t('youtube_privacy_options.unlisted') %></label> <label class="radio-inline"><input type="radio" name="privacy_status" value="unlisted"><%= t('youtube_privacy_options.unlisted') %></label>
</form> </form>
</div> </div>
<div class="row top-buffer text-center">
<button type="button" class="btn btn-success upload-button centered" data-dismiss="popover">
<%= t('upload') %>
</button>
</div>
</form> </form>
</div> </div>
<div class='mail_youtube_popover'> <div class='mail_youtube_popover'>
@ -80,14 +81,20 @@
<%= icon('envelope-o') %> <%= icon('envelope-o') %>
</button> </button>
<button type="button" class="btn btn-default has-popover youtube-upload youtube-tooltip" <button type="button" class="btn btn-default has-popover youtube-upload youtube-tooltip"
data-placement="top" data-popover-body=".youtube-popover"> data-placement="top" data-popover-body=".youtube-popover"
data-popover-title="<%= t('upload_to_youtube') %>" >
<div class = 'youtube-red'> <%= icon('youtube-play') %> </div> <div class = 'youtube-red'> <%= icon('youtube-play') %> </div>
</button> </button>
</div> </div>
<div class='mail_popover'> <div class='mail_popover'>
<button type="button" class="btn btn-default mail-recording mail-tooltip"> <button type="button" class="btn btn-default mail-recording mail-tooltip fa-2x">
<%= icon('envelope-o') %> <%= icon('envelope-o') %>
</button> </button>
<div class="tooltip-wrapper disabled disabled-tooltip">
<button type="button" class="btn btn-default" disabled>
<%= icon('youtube-play') %>
</button>
</div>
</div> </div>
<div class="recording-visibility-popover"> <div class="recording-visibility-popover">
<button type="button" class="btn btn-default btn-success recording-update" data-visibility="published"> <button type="button" class="btn btn-default btn-success recording-update" data-visibility="published">

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

@ -70,6 +70,7 @@ en-US:
upload_youtube: Youtube upload_youtube: Youtube
user_waiting_body: "%{user} is waiting to join %{meeting}!" user_waiting_body: "%{user} is waiting to join %{meeting}!"
user_waiting_title: A user is waiting user_waiting_title: A user is waiting
youtube_disabled: Recording did not contain any video.
copied: Copied copied: Copied
copy_error: Use Ctrl-c to copy copy_error: Use Ctrl-c to copy
create_your_session: Create your own meeting create_your_session: Create your own meeting
@ -160,6 +161,7 @@ en-US:
phrase1: This is a test email sent to %{email} phrase1: This is a test email sent to %{email}
thumbnails: Thumbnails thumbnails: Thumbnails
upload: Upload upload: Upload
upload_to_youtube: Upload to Youtube
url_copy_explanation: Copy this URL to invite others to the meeting url_copy_explanation: Copy this URL to invite others to the meeting
user_person_room: "%{name} personal room" user_person_room: "%{name} personal room"
video: Video video: Video