minor fixes

This commit is contained in:
Josh
2018-06-19 16:43:27 -04:00
parent d1b81a385f
commit e1eca134fc
8 changed files with 12 additions and 11 deletions

View File

@ -1,4 +1,4 @@
//@import "tabler/functions";
@import "tabler/functions";
@import "tabler/core";
@import "tabler/type";

View File

@ -47,7 +47,8 @@ class ApplicationController < ActionController::Base
user_is_moderator: false,
meeting_logout_url: request.base_url + logout_room_path(@room),
meeting_recorded: true,
moderator_message: "To invite someone to the meeting, send them this link:\n\n#{request.base_url + room_path(@room)}"
moderator_message: "To invite someone to the meeting, send them this link:\n\n
#{request.base_url + Rails.configuration.relative_url_root + room_path(@room)}"
}
end
end

View File

@ -10,7 +10,7 @@ module ApplicationHelper
# Generates the login URL for a specific provider.
def omniauth_login_url(provider)
"/auth/#{provider}"
"#{Rails.configuration.relative_url_root}/auth/#{provider}"
end
# Determine if Greenlight is configured to allow user signups.

View File

@ -21,7 +21,7 @@
<span class="input-icon-addon">
<i class="fas fa-at"></i>
</span>
<%= f.text_field :email, class: "form-control", placeholder: "Email" %>
<%= f.text_field :email, class: "form-control", placeholder: "Email", value: "" %>
</div>
</div>
@ -30,7 +30,7 @@
<span class="input-icon-addon">
<i class="fas fa-key"></i>
</span>
<%= f.password_field :password, class: "form-control", placeholder: "Password" %>
<%= f.password_field :password, class: "form-control", placeholder: "Password", value: "" %>
</div>
</div>