about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-04-05 14:31:07 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-04-05 14:31:07 +0200
commitc901ae77d43bc76afc5c927c82b9b75609fa3a58 (patch)
tree41ccfe01da595433ef64e229a767ac62b7adfd92 /app/views
parent39b9a0619ab4ba68ed429152153cf0dbbfcd5a5a (diff)
parent117f6638d0c402162c60915c7b8946489f1e89df (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/dashboard/index.html.haml8
-rwxr-xr-xapp/views/layouts/application.html.haml4
-rw-r--r--app/views/layouts/embedded.html.haml2
3 files changed, 11 insertions, 3 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 249e12563..f2f0c813d 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,6 +1,14 @@
 - content_for :page_title do
   = t('admin.dashboard.title')
 
+- unless @system_checks.empty?
+  .flash-message-stack
+    - @system_checks.each do |message|
+      .flash-message.warning
+        = t("admin.system_checks.#{message.key}.message_html", message.value ? { value: content_tag(:strong, message.value) } : {})
+        - if message.action
+          = link_to t("admin.system_checks.#{message.key}.action"), message.action
+
 .dashboard__counters
   %div
     = link_to admin_accounts_url(local: 1, recent: 1) do
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 3daaf93a9..09826afb3 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -45,5 +45,5 @@
     = content_for?(:content) ? yield(:content) : yield
 
     .logo-resources
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')
+      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 431bd260c..2a2996d28 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -25,4 +25,4 @@
     = yield
 
     .logo-resources
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')