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

update login logout text

Browse Source
This commit is contained in:
Zachary Chai
2017-01-20 16:46:51 -05:00
parent afce542431
commit 2d0ca5f16b
7 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/landing.scss
View File

@ -21,10 +21,6 @@
width: 200px;
padding: 0;
}
.login-text {
font-size: 16px;
padding-right: 5px;
}
}
.rooms {

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

@ -41,9 +41,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</div>
<div class="center-block col-xs-6 login">
<div class="text-center">
<span class="login-text"><%= t('login_description') %></span> <%= link_to 'Login', '/users/login', class: 'btn btn-lg btn-primary' %>
</div>
<%= render 'shared/signup' %>
</div>
</div>

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

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

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

@ -26,6 +26,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<%= render 'rooms_center_panel' %>
</div>
<%= render 'shared/signup' %>
<div class="table-wrapper">
<table id="recordings" class="table" width="100%">
<thead>

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

@ -36,9 +36,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<span class="logo-wrapper pull-left">
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
</span>
<% unless params[:controller] == 'sessions' && params[:action] == 'new' %>
<%= render 'shared/signup' %>
<% end %>
</div>
<!-- End of Header -->

20
app/views/shared/_signup.html.erb
View File

@ -1,13 +1,13 @@
<span class="signup pull-right">
<span class="signup">
<% 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}" %>
<div class="text-center">
<span class=""><%= t('logged_in_description_html', link: link_to(current_user.name, current_user.room_url)) %></span>
<div class=""><%= link_to t('logout'), user_logout_url %></div>
</div>
<% else %>
<div class="text-center">
<span class=""><%= t('login_description') %></span>
<div class=""><%= link_to t('login'), '/users/login' %></div>
</div>
<% end %>
</span>