diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 385fa99e..5c9156f1 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -134,6 +134,14 @@
}
});
+ $('.center-panel-wrapper').on('keyup', '.meeting-name', function (event, msg) {
+ var newId = $(this).val();
+ Meeting.getInstance().setMeetingId(newId);
+ $(".page-wrapper.meetings").data('id', newId);
+ $('.meeting-url').val(Meeting.getInstance().getURL());
+ $('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
+ })
+
// enable tooltips
var options = {
selector: '.has-tooltip',
@@ -148,7 +156,9 @@
$(document).tooltip(options);
// focus name input or join button
- if ($('.meeting-user-name').is(':visible')) {
+ if ($('.meeting-name').is(':visible')) {
+ $('.meeting-name').focus();
+ } else if ($('.meeting-user-name').is(':visible')) {
$('.meeting-user-name').focus();
} else {
$('.meeting-join').focus();
@@ -156,15 +166,6 @@
};
var initIndex = function() {
- $('.generate-link').click (function (e) {
- e.preventDefault();
- var newId = Math.trunc(Math.random() * 1000000000);
- Meeting.getInstance().setMeetingId(newId);
- $(".page-wrapper.meetings").data('id', newId);
- $('.meeting-url').val(Meeting.getInstance().getURL());
- });
-
- $('.generate-link').click();
$('ul.previously-joined').empty();
var joinedMeetings = localStorage.getItem('joinedMeetings');
diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/shared.scss
index 62b47c8f..d0a2e32f 100644
--- a/app/assets/stylesheets/shared.scss
+++ b/app/assets/stylesheets/shared.scss
@@ -26,6 +26,10 @@ html, body {
background: #ffffff;
}
+.container-fluid {
+ height: 100%;
+}
+
.background {
height: 350px;
width: 100%;
@@ -68,11 +72,16 @@ body[data-controller=landing][data-action=rooms].app-background {
.center-block {
float: none;
}
+.center-panel-wrapper {
+ height: 100%;
+}
.center-panel {
+ height: 100%;
.center-panel-size {
max-width: 1200px
}
.center-panel-content-size {
+ height: 100%;
max-width: 1100px;
}
@@ -157,3 +166,16 @@ a.signin-link {
color: #444;
}
}
+
+.verticle-line {
+ // parent must be position relative to work
+ width: 1px;
+ background-color: lightgray;
+ height: 100%;
+ position: absolute;
+ left: 50%;
+}
+
+.invite-join-wrapper {
+ position: relative;
+}
diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index 7cba2273..3bd3f593 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -36,20 +36,21 @@ with BigBlueButton; if not, see