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

move url buttons in room below the url

Browse Source
This commit is contained in:
Zachary Chai
2017-02-03 09:55:39 -05:00
parent ae7029b5f2
commit f6505df4e1
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/landing.scss
View File

@@ -49,6 +49,11 @@
} }
} }
.meeting-url-button-group {
padding-top: 5px;
width: 100px;
}
} }
.img-thumbnail{ .img-thumbnail{

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

@@ -14,29 +14,50 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
<div <%= "hidden" if hidden %> class="meeting-url-wrapper"> <div <%= "hidden" if hidden %> class="meeting-url-wrapper">
<div class="input-group"> <div class="<%= 'input-group' unless @user %>">
<div class="meeting-url-group"> <div class="meeting-url-group">
<input type="text" class="form-control meeting-url"/> <input type="text" class="form-control meeting-url"/>
</div> </div>
<span class="input-group-btn"> <% if current_user %>
<% body = t('meeting_invite.signed_in.body', user: current_user.name) %>
<% subject = t('meeting_invite.signed_in.subject', user: current_user.name) %>
<% else %>
<% body = t('meeting_invite.not_signed_in.body') %>
<% subject = t('meeting_invite.not_signed_in.subject') %>
<% end %>
<button type="button" class="btn btn-default meeting-url-copy has-tooltip" <% if @user %>
<div class="center-block meeting-url-button-group">
<button type="button" class="btn btn-default meeting-url-copy has-tooltip pull-left"
title="<%= t('url_copy_explanation') %>"
data-copied-hint="<%= t('copied') %>"
data-copy-error="<%= t('copy_error') %>"
data-copy-hint="<%= t('url_copy_explanation') %>"
>
<i class="fa fa-clipboard" aria-hidden="true"></i>
</button>
<button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
title="<%= t('meeting_invite.explanation') %>"
data-invite-body="<%= body %>"
data-invite-subject="<%= subject %>"
>
<i class="fa fa-envelope-o" aria-hidden="true"></i>
</button>
</div>
<% else %>
<span class="input-group-btn">
<button type="button" class="btn btn-default meeting-url-copy has-tooltip"
title="<%= t('url_copy_explanation') %>" title="<%= t('url_copy_explanation') %>"
data-copied-hint="<%= t('copied') %>" data-copied-hint="<%= t('copied') %>"
data-copy-error="<%= t('copy_error') %>" data-copy-error="<%= t('copy_error') %>"
data-copy-hint="<%= t('url_copy_explanation') %>" data-copy-hint="<%= t('url_copy_explanation') %>"
> >
<i class="fa fa-clipboard" aria-hidden="true"></i> <i class="fa fa-clipboard" aria-hidden="true"></i>
</button> </button>
<% if current_user %>
<% body = t('meeting_invite.signed_in.body', user: current_user.name) %>
<% subject = t('meeting_invite.signed_in.subject', user: current_user.name) %>
<% else %>
<% body = t('meeting_invite.not_signed_in.body') %>
<% subject = t('meeting_invite.not_signed_in.subject') %>
<% end %>
<button type="button" class="btn btn-default meeting-invite has-tooltip" <button type="button" class="btn btn-default meeting-invite has-tooltip"
title="<%= t('meeting_invite.explanation') %>" title="<%= t('meeting_invite.explanation') %>"
data-invite-body="<%= body %>" data-invite-body="<%= body %>"
@@ -45,6 +66,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<i class="fa fa-envelope-o" aria-hidden="true"></i> <i class="fa fa-envelope-o" aria-hidden="true"></i>
</button> </button>
</span> </span>
<% end %>
</div> </div>
</div> </div>