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

Merge pull request #87 from zach-chai/update_login_text

Browse Source 
update login logout text
This commit is contained in:
Zachary Chai
2017-01-20 18:04:07 -05:00
committed by GitHub
parent afce542431 2d0ca5f16b
commit 15760ebf0b
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; width: 200px;
padding: 0; padding: 0;
} }
.login-text {
font-size: 16px;
padding-right: 5px;
}
} }
.rooms { .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>
<div class="center-block col-xs-6 login"> <div class="center-block col-xs-6 login">
<div class="text-center"> <%= render 'shared/signup' %>
<span class="login-text"><%= t('login_description') %></span> <%= link_to 'Login', '/users/login', class: 'btn btn-lg btn-primary' %>
</div>
</div> </div>
</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 %> <% end %>
</div> </div>
<%= render 'shared/signup' %>
</div> </div>
</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' %> <%= render 'rooms_center_panel' %>
</div> </div>
<%= render 'shared/signup' %>
<div class="table-wrapper"> <div class="table-wrapper">
<table id="recordings" class="table" width="100%"> <table id="recordings" class="table" width="100%">
<thead> <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"> <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>
<% unless params[:controller] == 'sessions' && params[:action] == 'new' %>
<%= render 'shared/signup' %>
<% end %>
</div> </div>
<!-- End of Header --> <!-- End of Header -->

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

@@ -1,13 +1,13 @@
<span class="signup pull-right"> <span class="signup">
<% if current_user %> <% if current_user %>
<% if !@user %> <div class="text-center">
<%= link_to current_user.name, current_user.room_url %> | <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 %> <% else %>
<%= current_user.name %> | <div class="text-center">
<% end %> <span class=""><%= t('login_description') %></span>
<%= link_to t('logout'), user_logout_url %> <div class=""><%= link_to t('login'), '/users/login' %></div>
<% elsif @user %> </div>
<%= t('are_you', name: @user.username) %> |
<%= link_to t('login'), "/auth/#{@user.provider}" %>
<% end %> <% end %>
</span> </span>

3
config/locales/en-us.yml
View File

@@ -71,7 +71,9 @@ en-US:
join_session: Join the current meeting join_session: Join the current meeting
join_session_id: Join %{id} join_session_id: Join %{id}
join_session_user: Join %{name} meeting join_session_user: Join %{name} meeting
logged_in_description_html: You are logged in as %{link}
login: login login: login
login_description: Want your own recorded meetings?
logout: logout logout: logout
meeting_invite: meeting_invite:
explanation: Send an email with an invitation to this meeting explanation: Send an email with an invitation to this meeting
@@ -97,7 +99,6 @@ en-US:
return_to_room: Return to your personal room return_to_room: Return to your personal room
session_url_explanation: The meeting will be taking place using the following URL session_url_explanation: The meeting will be taking place using the following URL
signin_text: Log in with %{provider} signin_text: Log in with %{provider}
login_description: Login for customized sessions
start: Start start: Start
start_meeting: Start Meeting start_meeting: Start Meeting
your_personal_room: Your Personal Room your_personal_room: Your Personal Room