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

oauth update

Browse Source
This commit is contained in:
Zachary Chai
2016-11-04 14:28:40 -04:00
parent e093ead683
commit b4e0e73692
21 changed files with 79 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/landing/rooms.html.erb
View File

@ -16,7 +16,7 @@
</div>
<% end %>
<div class="page-wrapper rooms" data-room="<%= @user.username %>">
<div class="page-wrapper rooms" data-room="<%= @user.encrypted_id %>">
<div class="container-fluid">
<%= render 'shared/title', title: page_title %>

8
app/views/layouts/application.html.erb
View File

@ -13,7 +13,7 @@
<!-- Messages -->
<div id='alerts'>
</div>
<!-- Header -->
<div class='header'>
<span class="logo-wrapper pull-left">
@ -22,11 +22,7 @@
<span class="signup pull-right">
<% if current_user %>
<%= current_user.name %> |
<% if current_user.username %>
<%= link_to t('my_room'), current_user.room_url %> |
<% else %>
<%= link_to t('my_room'), edit_user_path(current_user) %> |
<% end %>
<%= link_to t('my_room'), current_user.room_url %> |
<%= link_to t('logout'), user_logout_url %>
<% elsif @user %>
<%= t('are_you', name: @user.username) %> |

29
app/views/users/edit.html.erb
View File

@ -1,29 +0,0 @@
<% content_for :title do %>
<div class="title">
Enter your Username below
</div>
<% end %>
<div class="page-wrapper user-edit">
<div class="container-fluid">
<%= render 'shared/title', title: 'Complete User Profile' %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<%= form_for(@user) do |f| %>
<div class="input-group">
<%= f.text_field :username, placeholder: "Username", class: "form-control input" %>
<span class="input-group-btn">
<%= f.submit class: "btn btn-success", value: "Save" %>
</span>
</div>
<% end %>
<div class="error">
<p><%= @error %></p>
</div>
<% end %>
</div>
</div>
</div>