Merge pull request #120 from zach-chai/updates

Updates

app/assets/javascripts/landing.js

@@ -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) {
       var jqxhr = Meeting.getInstance().endMeeting();
       var btn = $(this);

app/assets/stylesheets/main/landing.scss

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

app/views/shared/_meeting_url.html.erb

@@ -14,7 +14,6 @@
 %>
 
 <div <%= "hidden" if hidden %> class="meeting-url-wrapper">
-  <div class="<%= 'input-group' unless @user %>">
   <div class="meeting-url-group">
     <input type="text" class="form-control meeting-url"/>
   </div>
@@ -27,7 +26,6 @@
     <% subject = t('meeting_invite.not_signed_in.subject') %>
   <% end %>
 
-    <% 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') %>"
@@ -46,27 +44,4 @@
       <%= icon('envelope-o') %>
     </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>