forked from External/greenlight
		
	update login logout text
This commit is contained in:
		@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -43,5 +43,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
      <% end %>
 | 
			
		||||
    </div>
 | 
			
		||||
 | 
			
		||||
    <%= render 'shared/signup' %>
 | 
			
		||||
 | 
			
		||||
  </div>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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 -->
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user