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

Merge pull request #120 from zach-chai/updates 

Updates
This commit is contained in:
Zachary Chai 2017-02-10 16:56:59 -05:00 committed by GitHub
parent f2dd5df845 d6c7bcfade
commit add6a95c4b
3 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/landing.js
View File

@ -75,6 +75,13 @@
} }
}); });
$('.center-panel-wrapper').on ('keypress', '.meeting-name', function (event) {
if (event.keyCode === 13) {
event.preventDefault();
$('.meeting-start').click();
}
});
$('.center-panel-wrapper').on ('click', '.meeting-end', function (event) { $('.center-panel-wrapper').on ('click', '.meeting-end', function (event) {
var jqxhr = Meeting.getInstance().endMeeting(); var jqxhr = Meeting.getInstance().endMeeting();
var btn = $(this); var btn = $(this);

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{

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

@ -14,7 +14,6 @@
%> %>
<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>
@ -27,7 +26,6 @@
<% 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') %>"
@ -46,27 +44,4 @@
<%= icon('envelope-o') %> <%= icon('envelope-o') %>
</button> </button>
</div> </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>