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

Fixed conflict with master

Browse Source
This commit is contained in:
jfederico
2017-08-15 20:44:06 +00:00
parent 9db643a533 0719cbd1bf
commit 22d0f4423d
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/shared/_center_panel.html.erb
View File

@@ -18,6 +18,9 @@
<div class="center-block center-panel-size col-xs-12">
<div class="panel panel-default">
<div class="panel-body">
<% if bigbluebutton_endpoint_default? %>
<div class="panel-alert alert alert-danger"><%= t('warning_bigbluebutton_endpoint_default') %></div>
<% end %>
<h3 class="title-wrapper text-center">
<%= yield :title %>
</h3>

2
app/views/shared/_meeting_url.html.erb
View File

@@ -44,7 +44,7 @@
<%= icon('envelope-o') %>
</button>
<% if qrcode_generation_enabled %>
<% if qrcode_generation_enabled? %>
<button type="button" class="btn btn-default meeting-url-qrcode has-tooltip"
title="<%= t('qrcode.explanation') %>"
data-qrcode-generated-hint="<%= t('qrcode.generated') %>"