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

move signup area

This commit is contained in:
Zachary Chai 2017-01-19 17:54:52 -05:00
parent e5932d805b
commit ceeafa3208
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,5 +40,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% end %> <% end %>
</div> </div>
<%= render 'shared/signup' %>
</div> </div>
</div> </div>

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

@ -35,35 +35,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<span class="logo-wrapper pull-left"> <span class="logo-wrapper pull-left">
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %> <%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
</span> </span>
<span class="signup pull-right">
<% if current_user %>
<% if !@user %>
<%= link_to current_user.name, current_user.room_url %> |
<% else %>
<%= current_user.name %> |
<% end %>
<%= link_to t('logout'), user_logout_url %>
<% elsif @user %>
<%= t('are_you', name: @user.username) %> |
<%= link_to t('login'), "/auth/#{@user.provider}" %>
<% else %>
<% if omniauth_providers_configured.present? %>
<span class="signup-description hidden-xs">
<%= t('oauth_signup') %>
</span>
<% end %>
<% if omniauth_providers_configured(:twitter) %>
<%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %>
<span class="fa fa-twitter"></span>
<% end %>
<% end %>
<% if omniauth_providers_configured(:google) %>
<%= link_to('/auth/google', :class => "btn icon btn-lg btn-social-icon btn-google") do %>
<span class="fa fa-google"></span>
<% end %>
<% end %>
<% end %>
</span>
</div> </div>
<!-- End of Header --> <!-- End of Header -->

29
app/views/shared/_signup.html.erb Normal file
View File

@ -0,0 +1,29 @@
<span class="signup pull-right">
<% if current_user %>
<% if !@user %>
<%= link_to current_user.name, current_user.room_url %> |
<% else %>
<%= current_user.name %> |
<% end %>
<%= link_to t('logout'), user_logout_url %>
<% elsif @user %>
<%= t('are_you', name: @user.username) %> |
<%= link_to t('login'), "/auth/#{@user.provider}" %>
<% else %>
<% if omniauth_providers_configured.present? %>
<span class="signup-description hidden-xs">
<%= t('oauth_signup') %>
</span>
<% end %>
<% if omniauth_providers_configured(:twitter) %>
<%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %>
<span class="fa fa-twitter"></span>
<% end %>
<% end %>
<% if omniauth_providers_configured(:google) %>
<%= link_to('/auth/google', :class => "btn icon btn-lg btn-social-icon btn-google") do %>
<span class="fa fa-google"></span>
<% end %>
<% end %>
<% end %>
</span>