From 3af3c2b77950b4a93c7c806d061372859674657b Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 18 Mar 2019 19:37:52 +0100
Subject: [PATCH 1/4] Directly inject standard css + custom css and js

---
 data/templates/nginx/plain/yunohost_panel.conf.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/templates/nginx/plain/yunohost_panel.conf.inc b/data/templates/nginx/plain/yunohost_panel.conf.inc
index 34afe136d..61f0af613 100644
--- a/data/templates/nginx/plain/yunohost_panel.conf.inc
+++ b/data/templates/nginx/plain/yunohost_panel.conf.inc
@@ -1,5 +1,5 @@
 # Insert YunoHost panel
-sub_filter </head> '<script type="text/javascript" src="/ynhpanel.js"></script></head>';
+sub_filter </head> '<script type="text/javascript" src="/ynhpanel.js"></script><link type="text/css" rel="stylesheet" href="/ynhpanel.css"></link><script type="text/javascript" src="/ynhtheme/custom.js"></script><link type="text/css" rel="stylesheet" href="/ynhtheme/custom.css"></link></head>';
 sub_filter_once on;
 # Apply to other mime types than text/html
 sub_filter_types application/xhtml+xml;

From b99b22bb03bc9b1cd1e53e4491af592bcf31573a Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 19 Mar 2019 01:17:45 +0100
Subject: [PATCH 2/4] Propagate file renaming for semantic

---
 data/templates/nginx/plain/yunohost_panel.conf.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/templates/nginx/plain/yunohost_panel.conf.inc b/data/templates/nginx/plain/yunohost_panel.conf.inc
index 61f0af613..d159c29f9 100644
--- a/data/templates/nginx/plain/yunohost_panel.conf.inc
+++ b/data/templates/nginx/plain/yunohost_panel.conf.inc
@@ -1,8 +1,8 @@
-# Insert YunoHost panel
-sub_filter </head> '<script type="text/javascript" src="/ynhpanel.js"></script><link type="text/css" rel="stylesheet" href="/ynhpanel.css"></link><script type="text/javascript" src="/ynhtheme/custom.js"></script><link type="text/css" rel="stylesheet" href="/ynhtheme/custom.css"></link></head>';
+# Insert YunoHost button + portal overlay
+sub_filter </head> '<script type="text/javascript" src="/ynh_portal.js"></script><link type="text/css" rel="stylesheet" href="/ynh_overlay.css"></link><script type="text/javascript" src="/ynhtheme/custom_portal.js"></script><link type="text/css" rel="stylesheet" href="/ynhtheme/custom_overlay.css"></link></head>';
 sub_filter_once on;
 # Apply to other mime types than text/html
 sub_filter_types application/xhtml+xml;
 # Prevent YunoHost panel files from being blocked by specific app rules
-location ~ ynhpanel\.(js|json|css) {
+location ~ (ynh_portal.js|ynh_overlay.css) {
 }

From 2defd6ffa82368a6714b8850a1a1a960d345ac1e Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Fri, 22 Mar 2019 16:20:35 +0100
Subject: [PATCH 3/4] [fix] Keep user info in json format

Previously it was ynhpanel.json
---
 data/templates/nginx/plain/yunohost_panel.conf.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/templates/nginx/plain/yunohost_panel.conf.inc b/data/templates/nginx/plain/yunohost_panel.conf.inc
index d159c29f9..b36d79119 100644
--- a/data/templates/nginx/plain/yunohost_panel.conf.inc
+++ b/data/templates/nginx/plain/yunohost_panel.conf.inc
@@ -4,5 +4,5 @@ sub_filter_once on;
 # Apply to other mime types than text/html
 sub_filter_types application/xhtml+xml;
 # Prevent YunoHost panel files from being blocked by specific app rules
-location ~ (ynh_portal.js|ynh_overlay.css) {
+location ~ (ynh_portal.js|ynh_overlay.css|userinfo.json) {
 }

From c8d8e0e272b89e660f8f6ad860bb748642c4709a Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Fri, 22 Mar 2019 16:30:02 +0100
Subject: [PATCH 4/4] [fix] Avoid potential conflict with some apps

---
 data/templates/nginx/plain/yunohost_panel.conf.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/templates/nginx/plain/yunohost_panel.conf.inc b/data/templates/nginx/plain/yunohost_panel.conf.inc
index b36d79119..1c5a2d656 100644
--- a/data/templates/nginx/plain/yunohost_panel.conf.inc
+++ b/data/templates/nginx/plain/yunohost_panel.conf.inc
@@ -4,5 +4,5 @@ sub_filter_once on;
 # Apply to other mime types than text/html
 sub_filter_types application/xhtml+xml;
 # Prevent YunoHost panel files from being blocked by specific app rules
-location ~ (ynh_portal.js|ynh_overlay.css|userinfo.json) {
+location ~ (ynh_portal.js|ynh_overlay.css|ynh_userinfo.json) {
 }