diff --git a/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css b/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css
index d4e9dab0..e32ffdeb 100644
--- a/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css
+++ b/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css
@@ -24,4 +24,9 @@
width: 120px;
height: 40px;
opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png");
+ width: auto;
}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css
index 2a50ecc0..5b7b7880 100644
--- a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css
+++ b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css
@@ -13,4 +13,8 @@
[class*="LoadingPage-logoFull-"] {
content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.psd b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.psd
deleted file mode 100644
index ed41d7ec..00000000
Binary files a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.psd and /dev/null differ
diff --git a/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css b/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css
index 0805aae0..68287a51 100644
--- a/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css
+++ b/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css
@@ -11,7 +11,7 @@
[class*="PageHeader-logo-"] {
width: 32px;
height: 32px;
- margin-left: 0px;
+ margin-left: 0;
content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
}
}
@@ -24,4 +24,9 @@
width: 120px;
height: 40px;
opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png");
+ width: auto;
}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue-logo.css b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue-logo.css
new file mode 100644
index 00000000..5ad6b9f2
--- /dev/null
+++ b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue-logo.css
@@ -0,0 +1,20 @@
+@media (min-width: 752px) {
+ [class*="PageHeader-logo-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
+ }
+}
+
+@media only screen and (max-width: 768px) {
+ [class*="PageHeader-logo-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
+ }
+}
+
+[class*="LoadingPage-logoFull-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
+ opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png
new file mode 100644
index 00000000..75bd857e
Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png differ
diff --git a/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text-logo.css b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text-logo.css
new file mode 100644
index 00000000..cbf5744c
--- /dev/null
+++ b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text-logo.css
@@ -0,0 +1,32 @@
+@media (min-width: 752px) {
+ [class*="PageHeader-logo-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png");
+ margin-left: 15px;
+ width: 120px;
+ height: 40px;
+ }
+}
+
+@media only screen and (max-width: 768px) {
+ [class*="PageHeader-logo-"] {
+ width: 32px;
+ height: 32px;
+ margin-left: 0;
+ content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
+ }
+}
+
+[class*="LoadingPage-logoFull-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png");
+ margin-top: 50px;
+ margin-right: auto;
+ margin-left: auto;
+ width: 120px;
+ height: 40px;
+ opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png");
+ width: auto;
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png
new file mode 100644
index 00000000..c2df9b96
Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png differ
diff --git a/css/addons/sonarr/sonarr-anime-logo/sonarr-anime-logo.css b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime-logo.css
new file mode 100644
index 00000000..2470a46e
--- /dev/null
+++ b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime-logo.css
@@ -0,0 +1,20 @@
+@media (min-width: 752px) {
+ [class*="PageHeader-logo-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
+ }
+}
+
+@media only screen and (max-width: 768px) {
+ [class*="PageHeader-logo-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
+ }
+}
+
+[class*="LoadingPage-logoFull-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
+ opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png
new file mode 100644
index 00000000..209dd13f
Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png differ
diff --git a/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text-logo.css b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text-logo.css
new file mode 100644
index 00000000..281de114
--- /dev/null
+++ b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text-logo.css
@@ -0,0 +1,32 @@
+@media (min-width: 752px) {
+ [class*="PageHeader-logo-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png");
+ margin-left: 15px;
+ width: 120px;
+ height: 40px;
+ }
+}
+
+@media only screen and (max-width: 768px) {
+ [class*="PageHeader-logo-"] {
+ width: 32px;
+ height: 32px;
+ margin-left: 0;
+ content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
+ }
+}
+
+[class*="LoadingPage-logoFull-"] {
+ content: url("/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png");
+ margin-top: 50px;
+ margin-right: auto;
+ margin-left: auto;
+ width: 120px;
+ height: 40px;
+ opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png");
+ width: auto;
+}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png
new file mode 100644
index 00000000..50e9d374
Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png differ
diff --git a/css/addons/sonarr/sonarr-logo.md b/css/addons/sonarr/sonarr-logo.md
new file mode 100644
index 00000000..742e0e2e
--- /dev/null
+++ b/css/addons/sonarr/sonarr-logo.md
@@ -0,0 +1,74 @@
+# sonarr-*-logo
+
+Source files:
+
+1. [sonarr-logo.psd](sonarr-logo.psd) contains 256x256 sonarr logo and 3 more layers:
+
+- sonarr-4k-logo
+- sonarr-anime-logo
+- sonarr-anime-blue-logo
+
+1. [sonarr-text.psd](sonarr-text.psd) contains 900x29 sonarr with text logo and 2 more layers:
+ - sonarr-anime-text-logo
+ - sonarr-anime-blue-text-logo
+
+Preview:
+
+
+
+ sonarr-4k-logo |
+ |
+ |
+ |
+ |
+ |
+
+
+ sonarr-anime-logo |
+ |
+ |
+ |
+ |
+ |
+
+
+ sonarr-anime-blue-logo |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+ sonarr-text-logo |
+ |
+ |
+ |
+ |
+
+
+ sonarr-4k-text-logo |
+ |
+ |
+ |
+ |
+
+
+ sonarr-anime-text-logo |
+ |
+ |
+ |
+ |
+
+
+ sonarr-anime-blue-text-logo |
+ |
+ |
+ |
+ |
+
+
diff --git a/css/addons/sonarr/sonarr-logo.psd b/css/addons/sonarr/sonarr-logo.psd
new file mode 100644
index 00000000..8f9bcd68
Binary files /dev/null and b/css/addons/sonarr/sonarr-logo.psd differ
diff --git a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
index f38b37a2..d1de0145 100644
--- a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
+++ b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
@@ -16,4 +16,9 @@
width: 120px;
height: 40px;
opacity: 1;
+}
+
+.panel-header > img.logo {
+ content: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
+ width: auto;
}
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-text.psd b/css/addons/sonarr/sonarr-text.psd
new file mode 100644
index 00000000..d1e6aec2
Binary files /dev/null and b/css/addons/sonarr/sonarr-text.psd differ
diff --git a/docker-mods/swag/root/etc/cont-init.d/98-themepark b/docker-mods/swag/root/etc/cont-init.d/98-themepark
index 8f2e5733..5e69ebf4 100644
--- a/docker-mods/swag/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/swag/root/etc/cont-init.d/98-themepark
@@ -4,19 +4,6 @@ echo '-------------------------'
echo '| SWAG theme.park Mod |'
echo '-------------------------'
-if ! [[ -x "$(command -v svn)" ]]; then
-echo '--------------------------'
-echo '| Installing svn package |'
-echo '--------------------------'
- if [ -x "$(command -v apk)" ]; then
- apk update && \
- apk add --no-cache subversion
- elif [ -x "$(command -v apt-get)" ]; then
- apt-get update && \
- apt-get install -y subversion
- fi
-fi
-
# Display variables for troubleshooting
echo -e "Variables set:\\n\
'TP_BRANCH'=${TP_BRANCH}\\n"
@@ -41,7 +28,7 @@ fi
mkdir -p /config/www/themepark
-SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
+SHA_RELEASE=$(curl -sL "https://api.github.com/repos/themepark-dev/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
if [[ ! -f "/config/www/themepark/sha.txt" ]]; then
SHA=""
else
@@ -50,13 +37,21 @@ fi
# Downloading fresh webui files from source.
if [[ $SHA != $SHA_RELEASE ]]; then
echo "-----------------------------------------------------"
- echo "| Downloading latest files from ${TP_BRANCH} branch |"
+ echo "| Cloning latest files from ${TP_BRANCH} branch |"
+ echo "-----------------------------------------------------"
+ rm -rf /tmp/themepark
+ git clone --depth 1 --quiet --branch ${TP_BRANCH} https://github.com/themepark-dev/theme.park.git /tmp/themepark
+ echo "-----------------------------------------------------"
+ echo "| Copying files to /config/www/themepark |"
+ echo "-----------------------------------------------------"
+ cp -a /tmp/themepark/css /config/www/themepark/
+ cp -a /tmp/themepark/resources /config/www/themepark/
+ cp -a /tmp/themepark/themes.json /config/www/themepark/
+ cp -a /tmp/themepark/index.html /config/www/themepark/
+ rm -rf /tmp/themepark
+ echo "-----------------------------------------------------"
+ echo '| Clone and copy finished |'
echo "-----------------------------------------------------"
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark
- printf '\nDownload finished\n\n'
fi
cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt"
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
deleted file mode 100755
index a37649f8..00000000
--- a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if ! [[ -x "$(command -v svn)" ]]; then
- echo "subversion" >> /mod-repo-packages-to-install.list
-fi
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/type b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/type
deleted file mode 100644
index 3d92b15f..00000000
--- a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
\ No newline at end of file
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/up b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/up
deleted file mode 100644
index 12d7a60e..00000000
--- a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
\ No newline at end of file
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/dependencies.d/init-mods b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods
similarity index 100%
rename from docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/dependencies.d/init-mods
rename to docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods-package-install b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods-package-install
deleted file mode 100644
index e69de29b..00000000
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
index b2162488..5e69ebf4 100755
--- a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
+++ b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
@@ -28,7 +28,7 @@ fi
mkdir -p /config/www/themepark
-SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
+SHA_RELEASE=$(curl -sL "https://api.github.com/repos/themepark-dev/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
if [[ ! -f "/config/www/themepark/sha.txt" ]]; then
SHA=""
else
@@ -37,13 +37,21 @@ fi
# Downloading fresh webui files from source.
if [[ $SHA != $SHA_RELEASE ]]; then
echo "-----------------------------------------------------"
- echo "| Downloading latest files from ${TP_BRANCH} branch |"
+ echo "| Cloning latest files from ${TP_BRANCH} branch |"
+ echo "-----------------------------------------------------"
+ rm -rf /tmp/themepark
+ git clone --depth 1 --quiet --branch ${TP_BRANCH} https://github.com/themepark-dev/theme.park.git /tmp/themepark
+ echo "-----------------------------------------------------"
+ echo "| Copying files to /config/www/themepark |"
+ echo "-----------------------------------------------------"
+ cp -a /tmp/themepark/css /config/www/themepark/
+ cp -a /tmp/themepark/resources /config/www/themepark/
+ cp -a /tmp/themepark/themes.json /config/www/themepark/
+ cp -a /tmp/themepark/index.html /config/www/themepark/
+ rm -rf /tmp/themepark
+ echo "-----------------------------------------------------"
+ echo '| Clone and copy finished |'
echo "-----------------------------------------------------"
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark
- svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark
- printf '\nDownload finished\n\n'
fi
cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt"
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-themepark-add-package b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-themepark-add-package
deleted file mode 100644
index e69de29b..00000000
diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-themepark-add-package b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-themepark-add-package
deleted file mode 100644
index e69de29b..00000000
diff --git a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
index ef0ae520..7131ccba 100755
--- a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
@@ -55,7 +55,7 @@ if [[ -z ${TP_THEME} ]]; then
fi
RELEASE_FILEPATH='/vuetorrent/release.json'
NEEDS_UPDATE=false
-CURRENT_RELEASE=$(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
+CURRENT_RELEASE=$(curl -Ls https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
# ===============================================
install_deps() {
@@ -146,4 +146,4 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then
sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}"
sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}"
printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
-fi
\ No newline at end of file
+fi
diff --git a/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
index 84cc2afd..4d1a687c 100755
--- a/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
+++ b/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
@@ -55,7 +55,7 @@ if [[ -z ${TP_THEME} ]]; then
fi
RELEASE_FILEPATH='/vuetorrent/release.json'
NEEDS_UPDATE=false
-CURRENT_RELEASE=$(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
+CURRENT_RELEASE=$(curl -Ls https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
# ===============================================
check_updates() {
@@ -131,4 +131,4 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then
sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}"
sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}"
printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
-fi
\ No newline at end of file
+fi