merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated strings and added a bit of styling (#692)

This commit is contained in:
farhatahmad 2019-07-24 13:42:46 -04:00 committed by Jesus Federico
parent 9057615784
commit 453e6b7c96
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,3 +167,7 @@ table {
}
}
}
.cursor-pointer{
cursor: pointer;
}

12
app/views/shared/modals/_create_room_modal.html.erb
View File

@ -33,12 +33,12 @@
</div>
<div class="input-icon mb-2">
<span onclick="generateAccessCode()" class="input-icon-addon allow-icon-click">
<span onclick="generateAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer">
<i class="fas fa-dice"></i>
</span>
<%= f.label :access_code, t("modal.create_room.access_code_placeholder"), id: "create-room-access-code", class: "form-control" %>
<%= f.hidden_field :access_code %>
<span onclick="ResetAccessCode()" class="input-icon-addon allow-icon-click">
<span onclick="ResetAccessCode()" class="input-icon-addon allow-icon-click cursor-pointer">
<i class="far fa-trash-alt"></i>
</span>
</div>
@ -47,7 +47,7 @@
<label class="custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
<span class="custom-switch-description"><%= t("modal.room_settings.mute")%></span>
<%= f.check_box :mute_on_join, class: "custom-switch-input", checked: false %>
<span class="custom-switch-indicator float-right"></span>
<span class="custom-switch-indicator float-right cursor-pointer"></span>
</label>
<% end %>
@ -55,7 +55,7 @@
<label class="custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
<span class="custom-switch-description"><%= t("modal.room_settings.require_approval")%></span>
<%= f.check_box :require_moderator_approval, class: "custom-switch-input", checked: false %>
<span class="custom-switch-indicator float-right"></span>
<span class="custom-switch-indicator float-right cursor-pointer"></span>
</label>
<% end %>
@ -63,14 +63,14 @@
<label class="custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
<span class="custom-switch-description"><%= t("modal.room_settings.start")%></span>
<%= f.check_box :anyone_can_start, class: "custom-switch-input", checked: false %>
<span class="custom-switch-indicator float-right"></span>
<span class="custom-switch-indicator float-right cursor-pointer"></span>
</label>
<% end %>
<label id="auto-join-label" class="create-only custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
<span class="custom-switch-description"><%= t("modal.create_room.auto_join") %></span>
<%= f.check_box :auto_join, class: "custom-switch-input", checked: false %>
<span class="custom-switch-indicator float-right"></span>
<span class="custom-switch-indicator float-right cursor-pointer"></span>
</label>
<div class="mt-4">
<%= f.submit t("modal.create_room.create"), id: "create-room-submit", class: "create-only btn btn-primary btn-block" %>

2
app/views/users/new.html.erb
View File

@ -63,7 +63,7 @@
<div class="form-inline">
<label class="custom-switch">
<%= f.check_box :accepted_terms, class: "custom-switch-input form-control #{form_is_invalid?(@user, :accepted_terms)}", placeholder: t("signup.password_confirm") %>
<span class="custom-switch-indicator"></span>
<span class="custom-switch-indicator cursor-pointer"></span>
</label>
<%= f.label :accepted_terms, t("terms.accept", href: link_to(t("terms.title"), terms_path, target: "_blank", class: "ml-1 text-blue")).html_safe, class: "ml-1" %>
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:accepted_terms).first %></div>

6
config/locales/en.yml
View File

@ -151,8 +151,8 @@ en:
confirmation: doesn't match %{attribute}
inclusion: is not included in the list
no_provider:
message: The customer you provided doesn't have Greenlight configured
help: Please contact Blindside Networks to setup Greenlight
message: The site you are trying to access is not enabled
help: Please contact your system administrator to setup Greenlight
not_found:
message: Sorry! The page you are looking for does not exist.
help: Is it possible its been removed?
@ -384,7 +384,7 @@ en:
invite_participants: Invite Participants
join: Join
last_session: Last session on %{session}
login: Login
login: Enter
owner: Owner
no_sessions: This room has no sessions, yet!
recordings: Room Recordings