Merge pull request #544 from themepark-dev/develop

1.16.0

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;
 }

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");
 }

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;
 }

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");
+}

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;
+}

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");
+}

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;
+}

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:
+
+<table>
+  <tr>
+    <td>sonarr-4k-logo</td>
+    <td>                                  <img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
+    <td style="background-color: #00ccff"><img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
+  </tr>
+  <tr>
+    <td>sonarr-anime-logo</td>
+    <td>                                  <img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
+    <td style="background-color: #00ccff"><img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
+  </tr>
+  <tr>
+    <td>sonarr-anime-blue-logo</td>
+    <td>                                  <img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #00ccff"><img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
+
+  </tr>
+</table>
+
+<table>
+  <tr>
+    <td>sonarr-text-logo</td>
+    <td>                                  <img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
+  </tr>
+  <tr>
+    <td>sonarr-4k-text-logo</td>
+    <td>                                  <img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
+  </tr>
+  <tr>
+    <td>sonarr-anime-text-logo</td>
+    <td>                                  <img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+  </tr>
+  <tr>
+    <td>sonarr-anime-blue-text-logo</td>
+    <td>                                  <img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: white">  <img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #2a2a2a"><img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+    <td style="background-color: #606060"><img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
+  </tr>
+</table>

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;
 }

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"

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"

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>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/vuetorrent\/vuetorrent-base.css'><\/body> /g" "${INDEX_FILEPATH}"
     sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" "${INDEX_FILEPATH}"
     printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
-fi
+fi

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>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/vuetorrent\/vuetorrent-base.css'><\/body> /g" "${INDEX_FILEPATH}"
     sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" "${INDEX_FILEPATH}"
     printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
-fi
+fi