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

modify invite join on root page to match room page

Browse Source
This commit is contained in:
Zachary Chai
2017-02-10 16:44:51 -05:00
parent f2dd5df845
commit 88af18a642
2 changed files with 31 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,11 @@
// You should have received a copy of the GNU Lesser General Public License along // You should have received a copy of the GNU Lesser General Public License along
// with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. // with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
.meeting-url-button-group {
padding-top: 5px;
width: 100px;
}
.previously-joined { .previously-joined {
list-style-type: none; list-style-type: none;
margin:auto; margin:auto;
@@ -48,12 +53,6 @@
} }
} }
} }
.meeting-url-button-group {
padding-top: 5px;
width: 100px;
}
} }
.img-thumbnail{ .img-thumbnail{

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

@@ -14,59 +14,34 @@
%> %>
<div <%= "hidden" if hidden %> class="meeting-url-wrapper"> <div <%= "hidden" if hidden %> class="meeting-url-wrapper">
<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>
<% if current_user %> <% if current_user %>
<% body = t('meeting_invite.signed_in.body', user: current_user.name) %> <% body = t('meeting_invite.signed_in.body', user: current_user.name) %>
<% subject = t('meeting_invite.signed_in.subject', user: current_user.name) %> <% subject = t('meeting_invite.signed_in.subject', user: current_user.name) %>
<% else %> <% else %>
<% body = t('meeting_invite.not_signed_in.body') %> <% body = t('meeting_invite.not_signed_in.body') %>
<% subject = t('meeting_invite.not_signed_in.subject') %> <% subject = t('meeting_invite.not_signed_in.subject') %>
<% end %> <% end %>
<% if @user %> <div class="center-block meeting-url-button-group">
<div class="center-block meeting-url-button-group"> <button type="button" class="btn btn-default meeting-url-copy has-tooltip pull-left"
<button type="button" class="btn btn-default meeting-url-copy has-tooltip pull-left" 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') %>" >
> <%= icon('clipboard') %>
<%= icon('clipboard') %> </button>
</button>
<button type="button" class="btn btn-default meeting-invite has-tooltip pull-right" <button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
title="<%= t('meeting_invite.explanation') %>" title="<%= t('meeting_invite.explanation') %>"
data-invite-body="<%= body %>" data-invite-body="<%= body %>"
data-invite-subject="<%= subject %>" data-invite-subject="<%= subject %>"
> >
<%= icon('envelope-o') %> <%= icon('envelope-o') %>
</button> </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') %>"
data-copied-hint="<%= t('copied') %>"
data-copy-error="<%= t('copy_error') %>"
data-copy-hint="<%= t('url_copy_explanation') %>"
>
<%= icon('clipboard') %>
</button>
<button type="button" class="btn btn-default meeting-invite has-tooltip"
title="<%= t('meeting_invite.explanation') %>"
data-invite-body="<%= body %>"
data-invite-subject="<%= subject %>"
>
<%= icon('envelope-o') %>
</button>
</span>
<% end %>
</div> </div>
</div> </div>