Merge branch 'master' of github.com:blindsidenetworks/greenlight

app/views/landing/meeting.html.erb

@@ -7,7 +7,11 @@
         <% if !current_user.nil? %>
           <span class="user">Hello <%= current_user.name %></span>
           <%= link_to "Logout", user_logout_url() %>
-          <div><%= link_to 'Personal Room', current_user.room_url %></div>
+          <% if current_user.username %>
+            <div><%= link_to 'Personal Room', current_user.room_url %></div>
+          <% else %>
+            <div><%= link_to 'Set Username', edit_user_path(current_user) %></div>
+          <% end %>
         <% end %>
       </div>
     </div>

app/views/users/_form.html.erb

@@ -8,6 +8,9 @@
       </div>
       <%= f.submit class: "btn btn-success", value: "Save" %>
     <% end %>
+    <div class="error">
+      <p><%= error %></p>
+    </div>
     <div class="description">
       <p>This username will be used to identify your personal room</p>
     </div>

app/views/users/edit.html.erb

@@ -1,3 +1,3 @@
 <div class="page-wrapper user edit">
-  <%= render 'form', user: @user %>
+  <%= render 'form', user: @user, error: @error %>
 </div>