consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dashboard

Browse Source
This commit is contained in:
decabeza
2019-03-26 16:45:48 +01:00
parent 505365f0fa 1b76a34074
commit eda6ea7f12
2476 changed files with 62613 additions and 84405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="<%= I18n.locale %>" data-current-user-id="<%= current_user.try(:id) %>">
<head>
<%= render "layouts/common_head", default_title: setting['org_name'] %>
<%= render "layouts/common_head", default_title: setting["org_name"] %>
<%= render "layouts/tracking_data" %>
<%= render "layouts/meta_tags" %>
<%= content_for :canonical %>
@@ -14,18 +14,18 @@
type: "image/png" %>
<%= content_for :social_media_meta_tags %>
<%= setting['per_page_code_head'].try(:html_safe) %>
<%= setting["html.per_page_code_head"].try(:html_safe) %>
</head>
<body class="<%= yield (:body_class) %>">
<%= setting['per_page_code_body'].try(:html_safe) %>
<%= setting["html.per_page_code_body"].try(:html_safe) %>
<h1 class="show-for-sr"><%= setting['org_name'] %></h1>
<h1 class="show-for-sr"><%= setting["org_name"] %></h1>
<div class="wrapper <%= yield (:wrapper_class) %>">
<%= render partial: 'layouts/header', locals: {with_subnavigation: true} %>
<%= render partial: "layouts/header", locals: { with_subnavigation: true } %>
<!--[if lt IE 9]>
<% if browser.ie? && cookies['ie_alert_closed'] != 'true' %>
<% if browser.ie? && cookies["ie_alert_closed"] != "true" %>
<div data-alert class="callout primary ie-callout" data-closable>
<button class="close-button ie-callout-close-js"
aria-label="<%= t("application.close") %>" type="button" data-close>
@@ -44,13 +44,14 @@
<% end %>
<![endif]-->
<%= render 'layouts/flash' %>
<%= render "layouts/flash" %>
<%= yield %>
<div class="push"></div>
</div>
<div class="footer">
<%= render 'layouts/footer' %>
<%= render "layouts/footer" %>
</div>
</body>
<!--[if lt IE 9]>