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

recenter errors and missing locales

This commit is contained in:
Joshua Arts 2018-07-27 14:55:32 -04:00
parent 572134f344
commit 4b9ca3f13e
6 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,10 +51,6 @@ a {
min-height: calc(100% - #{$header-height} - #{$footer-height}); min-height: calc(100% - #{$header-height} - #{$footer-height});
} }
.flex-center {
transform: translateY(25%);
}
.footer { .footer {
height: $footer-height; height: $footer-height;
width: 100%; width: 100%;

26
app/views/application/migration_error.html.erb
View File

@ -1,16 +1,12 @@
<div class="page mt-0"> <div class="container text-center pt-9">
<div class="page-content mt-0"> <i class="fas fa-database fa-6x mb-4"></i>
<div class="container text-center"> <h1 class="h3 mb-2"><%= t("errors.migration_error.notice").html_safe %></h1>
<i class="fas fa-database fa-6x mb-4"></i> <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.migration_error.contact_admin") %></p>
<h1 class="h3 mb-2"><%= t("errors.migration_error.notice") %></h1> <h1 class="h3 mb-3"><%= t("errors.migration_error.version") %></h1>
<p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.migration_error.contact_admin") %></p> <a class="btn btn-success mt-3 mx-3" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10" target="_blank">
<h1 class="h3 mb-3"><%= t("errors.migration_error.version") %></h1> <i class="far fa-star mr-2"></i><%= t("errors.migration_error.upgrade") %>
<a class="btn btn-success mt-3 mx-3" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10" target="_blank"> </a>
<i class="far fa-star mr-2"></i><%= t("errors.migration_error.upgrade") %> <a class="btn btn-info mt-3 mx-3 w-20" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#remaining-on-greenlight-10" target="_blank">
</a> <i class="far fa-hand-paper mr-2"></i><%= t("errors.migration_error.continue") %>
<a class="btn btn-info mt-3 mx-3 w-20" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#remaining-on-greenlight-10" target="_blank"> </a>
<i class="far fa-hand-paper mr-2"></i><%= t("errors.migration_error.continue") %>
</a>
</div>
</div>
</div> </div>

18
app/views/errors/internal_error.html.erb
View File

@ -1,12 +1,8 @@
<div class="page"> <div class="container text-center pt-9">
<div class="page-content"> <div class="display-1 text-muted mb-5">500</div>
<div class="container text-center"> <h1 class="h2 mb-3"><%= t("errors.internal.message") %></h1>
<div class="display-1 text-muted mb-5">500</div> <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.internal.help") %></p>
<h1 class="h2 mb-3"><%= t("errors.internal.message") %></h1> <a class="btn btn-primary" href="javascript:history.back()">
<p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.internal.help") %></p> <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
<a class="btn btn-primary" href="javascript:history.back()"> </a>
<i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
</a>
</div>
</div>
</div> </div>

18
app/views/errors/not_found.html.erb
View File

@ -1,12 +1,8 @@
<div class="page"> <div class="container text-center pt-9">
<div class="page-content"> <div class="display-1 text-muted mb-5">404</div>
<div class="container text-center"> <h1 class="h2 mb-3"><%= t("errors.not_found.message") %></h1>
<div class="display-1 text-muted mb-5">404</div> <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.help") %></p>
<h1 class="h2 mb-3"><%= t("errors.not_found.message") %></h1> <a class="btn btn-primary" href="javascript:history.back()">
<p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.help") %></p> <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
<a class="btn btn-primary" href="javascript:history.back()"> </a>
<i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
</a>
</div>
</div>
</div> </div>

18
app/views/errors/unprocessable.html.erb
View File

@ -1,12 +1,8 @@
<div class="page"> <div class="container text-center pt-9">
<div class="page-content"> <div class="display-1 text-muted mb-5">422</div>
<div class="container text-center"> <h1 class="h2 mb-3"><%= t("errors.unprocessable.message") %></h1>
<div class="display-1 text-muted mb-5">422</div> <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.unprocessable.help") %></p>
<h1 class="h2 mb-3"><%= t("errors.unprocessable.message") %></h1> <a class="btn btn-primary" href="javascript:history.back()">
<p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.unprocessable.help") %></p> <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
<a class="btn btn-primary" href="javascript:history.back()"> </a>
<i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
</a>
</div>
</div>
</div> </div>

2
config/locales/en.yml
View File

@ -18,6 +18,8 @@ en:
notice: > notice: >
Greenlight encountered a database migration error.<br> Greenlight encountered a database migration error.<br>
This may be because you haven't updated to Greenlight 2.0. This may be because you haven't updated to Greenlight 2.0.
upgrade: Show me how to upgrade to 2.0!
version: We've released a new version of Greenlight, but your database isn't compatible.
not_found: not_found:
message: Whoops! Looks like we can't find that. message: Whoops! Looks like we can't find that.
help: Is it possible its been removed? help: Is it possible its been removed?