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

GRN2-xx: General bug fixes and performance upgrades (#734)

Browse Source 
* General bug fixes and performance upgrades

* Removed unused lines
This commit is contained in:
farhatahmad
2019-08-14 09:59:34 -04:00
committed by Jesus Federico
parent 4d69d06ba1
commit 98405c7d86
14 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,10 +18,10 @@
<h1 class="h3 mb-2"><%= t("errors.migration_error.notice").html_safe %></h1>
<p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.migration_error.contact_admin") %></p>
<h1 class="h3 mb-3"><%= t("errors.migration_error.version") %></h1>
<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 class="btn btn-success mt-3 mx-3" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10" target="_blank" rel="noopener">
<i class="far fa-star mr-2"></i><%= t("errors.migration_error.upgrade") %>
</a>
<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 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" rel="noopener">
<i class="far fa-hand-paper mr-2"></i><%= t("errors.migration_error.continue") %>
</a>
</div>

11
app/views/layouts/application.html.erb
View File

@ -19,8 +19,6 @@
<title><%= t("bigbluebutton") %></title>
<%= csrf_meta_tags %>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
<!-- Global javascript variables and helpers. -->
<script type="text/javascript">
window.GreenLight = {};
@ -28,16 +26,9 @@
window.GreenLight.RELATIVE_ROOT = "<%= relative_root %>"
</script>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500" rel="stylesheet">
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<!-- Because of turbolinks, this will only load once -->
<%= stylesheet_link_tag "https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/monolith.min.css" %>
<%= javascript_include_tag "https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.min.js" %>
<!-- Primary color styling -->
<%= stylesheet_link_tag themes_primary_path %>
@ -71,7 +62,7 @@
<div class="flash alert d-inline">
<i class="fas fa-exclamation-triangle"></i>
<p class="d-inline"><%= t("test_install",
href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank")
href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank", rel: "noopener")
).html_safe %>
</div>
</div>

2
app/views/main/index.html.erb
View File

@ -18,7 +18,7 @@
<div class="row">
<div class="col-md-12 col-sm-12 text-center">
<h1 id="main-text" class="display-4 mb-4"> <%= t("landing.welcome").html_safe %></h1>
<p class="lead offset-lg-2 col-lg-8 col-sm-12 "><%= t("landing.about", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank")).html_safe %></p>
<p class="lead offset-lg-2 col-lg-8 col-sm-12 "><%= t("landing.about", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %></p>
<%= link_to "https://youtu.be/Hso8yLzkqj8", target: "_blank" do %>
<h4><%= t("landing.video") %> <i class="far fa-play-circle ml-1"></i></h4>
<% end %>

2
app/views/shared/_footer.html.erb
View File

@ -14,7 +14,7 @@
%>
<footer class="footer pt-3">
<p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank")).html_safe %> <%= Greenlight::Application::VERSION %></p>
<p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %> <%= Greenlight::Application::VERSION %></p>
</footer>
<%= render "shared/components/cookie_warning" %>

2
app/views/shared/_header.html.erb
View File

@ -73,7 +73,7 @@
<% end %>
<% end %>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="http://docs.bigbluebutton.org/install/greenlight-v2.html" target="_blank">
<a class="dropdown-item" href="http://docs.bigbluebutton.org/install/greenlight-v2.html" target="_blank" rel="noopener">
<i class="dropdown-icon far fa-question-circle"></i> <%= t("header.dropdown.help") %>
</a>
<%= link_to logout_path, class: "dropdown-item" do %>