Skip to content

Commit 89a556c

Browse files
GilbNnintendo424
andauthored
1.15.1 (#534)
* qbittorrent: 💄Fixes for #526 * Unraid: Fix login script github.io URL Unraid: Fix the navbar scroll overflow. * Move from subversion to git for pulling the qbittorrent webui (#530) * Move from subversion to git for pulling the qbittorrent webui * slight verbage changes --------- Co-authored-by: Blake <7227893+nintendo424@users.noreply.github.com>
1 parent 6720374 commit 89a556c

File tree

7 files changed

+29
-22
lines changed

7 files changed

+29
-22
lines changed

css/addons/unraid/login-page/custom_login.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fi
5555
case ${DOMAIN} in
5656
*"github.io"*)
5757
echo "Switching to github.io URL style"
58-
DOMAIN="${DOMAIN}\/theme.park"
58+
DOMAIN="${DOMAIN}/theme.park"
5959
;;
6060
esac
6161

css/base/qbittorrent/qbittorrent-base.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ hr {
489489

490490
.toolbarTabs {
491491
background: var(--transparency-dark-25) !important;
492+
margin: 0px 5px 0 0 !important;
492493
}
493494

494495
.progressbar_dark {
@@ -662,4 +663,9 @@ select:focus {
662663
.select-watched-folder-editable {
663664
background-color: var(--transparency-dark-05);
664665
border: solid var(--transparency-light-10) 1px;
666+
}
667+
668+
#torrentsFilterToolbar {
669+
float: right;
670+
margin-right: .5rem;
665671
}

css/base/unraid/unraid-base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ pre {
102102

103103
.nav-tile {
104104
background-color: var(--transparency-dark-50);
105+
overflow-x: auto;
105106
}
106107

107108
div.title {

docker-mods/qbittorrent/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM scratch
22

3-
43
LABEL maintainer="GilbN"
54
LABEL app="Qbittorrent"
5+
66
#copy local files.
77
COPY root/ /

docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ if [ "${TP_DISABLE_THEME}" = true ]; then
2323
exit 0
2424
fi
2525

26-
if ! [[ -x "$(command -v svn)" ]]; then
26+
if ! [[ -x "$(command -v git)" ]]; then
2727
echo '--------------------------'
28-
echo '| Installing svn package |'
28+
echo '| Installing git package |'
2929
echo '--------------------------'
3030
if [ -x "$(command -v apk)" ]; then
3131
apk update && \
32-
apk add --no-cache subversion
32+
apk add --no-cache git
3333
apk add --no-cache perl
3434
elif [ -x "$(command -v apt-get)" ]; then
3535
apt-get update && \
36-
apt-get install -y subversion
36+
apt-get install -y git
3737
apt-get install -y perl
3838
fi
3939
fi
@@ -80,15 +80,15 @@ if [[ ! -d /themepark ]]; then
8080
echo '---------------------------------------'
8181
echo '| Downloading WebUI files from github |'
8282
echo '---------------------------------------'
83-
printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
84-
svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
83+
printf '\nDownloading qBittorrent to /temp\n'
84+
git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
8585
printf '\nDownload finished\n\n'
86-
printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
87-
svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
88-
cp -a /temp/. /themepark/public/icons
89-
cp -a /temp/. /themepark/private/icons
86+
cp -a /temp/src/webui/www /themepark
87+
cp -a /temp/src/icons/. /themepark/public/icons
88+
cp -a /temp/src/icons/. /themepark/private/icons
89+
printf '\nCopy finished\n\n'
9090
rm -rf /temp
91-
printf '\nDownload finished\n\n'
91+
printf '\nCleanup finished\n\n'
9292
fi
9393

9494
sed_file(){
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/with-contenv bash
22

3-
if ! [[ -x "$(command -v svn)" ]]; then
4-
echo "subversion" >> /mod-repo-packages-to-install.list
3+
if ! [[ -x "$(command -v git)" ]]; then
4+
echo "git" >> /mod-repo-packages-to-install.list
55
echo "perl" >> /mod-repo-packages-to-install.list
66
fi

docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ if [[ ! -d /themepark ]]; then
6565
echo '---------------------------------------'
6666
echo '| Downloading WebUI files from github |'
6767
echo '---------------------------------------'
68-
printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
69-
svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
68+
printf '\nDownloading qBittorrent to /temp\n'
69+
git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
7070
printf '\nDownload finished\n\n'
71-
printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
72-
svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
73-
cp -a /temp/. /themepark/public/icons
74-
cp -a /temp/. /themepark/private/icons
71+
cp -a /temp/src/webui/www /themepark
72+
cp -a /temp/src/icons/. /themepark/public/icons
73+
cp -a /temp/src/icons/. /themepark/private/icons
74+
printf '\nCopy finished\n\n'
7575
rm -rf /temp
76-
printf '\nDownload finished\n\n'
76+
printf '\nCleanup finished\n\n'
7777
fi
7878

7979
sed_file(){

0 commit comments

Comments
 (0)