diff --git a/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css b/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css index a5646eda..8fb74945 100644 --- a/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css +++ b/css/addons/bazarr/bazarr-4k-logo/bazarr-4k-logo.css @@ -1,4 +1,4 @@ -/* Desktop */ +/* Desktop */ @media (min-width: 752px) { .header-icon.px-3.m-0.d-none.d-md-block img { display: none !important; diff --git a/css/addons/plex/overseerr-side-menu/overseerr-side-menu.css b/css/addons/plex/overseerr-side-menu/overseerr-side-menu.css index 7f5a1539..5049d520 100644 --- a/css/addons/plex/overseerr-side-menu/overseerr-side-menu.css +++ b/css/addons/plex/overseerr-side-menu/overseerr-side-menu.css @@ -108,4 +108,4 @@ [class*="SourceSidebarLink-sourceLink-"]:hover [class*="SourceSidebarLink-iconContainer-"], [class*="SourceSidebarLink-sourceLink-"]:hover [class*="SourceSidebarLink-title-"] { color: white; -} +} \ No newline at end of file diff --git a/css/base/adguard/adguard-base.css b/css/base/adguard/adguard-base.css index b2a411c9..1bbf6d55 100644 --- a/css/base/adguard/adguard-base.css +++ b/css/base/adguard/adguard-base.css @@ -674,4 +674,4 @@ select:focus { ::-webkit-input-placeholder { color: var(--text); -} +} \ No newline at end of file diff --git a/css/base/bitwarden/bitwarden-base.css b/css/base/bitwarden/bitwarden-base.css index 20ddd11a..a5c8e2aa 100644 --- a/css/base/bitwarden/bitwarden-base.css +++ b/css/base/bitwarden/bitwarden-base.css @@ -49,7 +49,7 @@ app-org-vault-groupings .card li.active>div a:first-of-type, .groupings .card li.active>a:first-of-type, .groupings .card li.active>div a:first-of-type, html[class*="theme_"] a { - color: var(--link-color-hover); + color: var(--link-color); } html[class*="theme_"] app-vault-groupings .card li.active>a:first-of-type, @@ -69,7 +69,8 @@ html[class*="theme_"] .table td>a:not(.badge) { color: var(--link-color); } -html[class*="theme_"] .table td>a:not(.badge):hover { +html[class*="theme_"] .table td>a:not(.badge):hover, +html[class*="theme_"] .card-header a:hover:not(.badge) { color: var(--link-color-hover); } @@ -531,7 +532,7 @@ html[class*="theme_"] .nav-tabs .nav-link.active { border-color: rgba(255, 255, 255, 0.15); } -.org-nav { +html[class*="theme_"] .org-nav { background: var(--main-bg-color); background-repeat: repeat, no-repeat; background-attachment: fixed, fixed; @@ -542,7 +543,9 @@ html[class*="theme_"] .nav-tabs .nav-link.active { -o-background-size: auto, cover; } -.org-nav .nav-tabs a { +html[class*="theme_"] .org-nav .nav-tabs a, +html[class*="theme_"] .org-nav .org-name span, +html[class*="theme_"] .org-nav .nav-tabs a:not(.active) { color: var(--text); } @@ -570,6 +573,12 @@ app-org-vault-groupings .card li.active>div a:first-of-type { color: rgb(var(--accent-color)); } +/* Font Awesome */ + +html[class*="theme_"] .table td [class*="fa-"] { + color: rgb(var(--accent-color)); +} + /* PLACEHOLDER TEXT */ input::-webkit-input-placeholder { color: var(--text); diff --git a/css/base/lidarr/lidarr-base.css b/css/base/lidarr/lidarr-base.css index 97365451..e036ca2b 100644 --- a/css/base/lidarr/lidarr-base.css +++ b/css/base/lidarr/lidarr-base.css @@ -717,6 +717,10 @@ a:hover { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewArtistSearchResult-year-"] { color: #fff; } @@ -854,6 +858,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"] { background: rgb(var(--calendar-available) / .7) !important; border-left-color: transparent !important; @@ -894,12 +902,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-downloading-"] { +[class*="CalendarEvent-downloading-"], +[class*="CalendarEvent-queue-"] { background: rgb(var(--calendar-downloading) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover { +[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover, +[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover { background: rgb(var(--calendar-downloading) / .5) !important; border-left-color: transparent !important; } diff --git a/css/base/plex/plex-base.css b/css/base/plex/plex-base.css index f69aaa2f..004b5ab3 100644 --- a/css/base/plex/plex-base.css +++ b/css/base/plex/plex-base.css @@ -94,7 +94,8 @@ a, [class*="PrePlayDetailsGroupItem-groupItem-"] a, [class*="MetadataPosterCardTitle-title-"] a, a[class*="MetadataPosterCardTitle-title-"], -[class*="PrePlayTagListLink-tagsListLink-"][class*="Link-default-"] { +[class*="PrePlayTagListLink-tagsListLink-"][class*="Link-default-"], +[class*="MetadataPosterCardTitle-title-"] { color: var(--link-color) } @@ -239,6 +240,11 @@ body,[class*="FullPageBackground-backgroundContainer-"] { /* ACCENTS */ +.heart-rating.user-rating, .star-rating.user-rating { + color: rgb(var(--accent-color)); + opacity: 1; +} + [class*="Badge-primary-"], .nav-header>li>a.selected .badge { background-color: rgb(var(--accent-color)); @@ -506,7 +512,7 @@ circle { .well, .files ul li { color: var(--text); - background-color: rgb(255 255 255 / 10%); + background-color: rgb(0 0 0 / 10%); border: 1px solid transparent; -webkit-box-shadow: inset 0 1px 1px rgb(0 0 0 / 5%); box-shadow: inset 0 1px 1px rgb(0 0 0 / 5%); diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css index 338f3071..37612e0c 100644 --- a/css/base/radarr/radarr-base.css +++ b/css/base/radarr/radarr-base.css @@ -723,6 +723,10 @@ a:hover { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewMovieSearchResult-searchResult-"], [class*="AddNewMovieSearchResult-underlay-"] { background-color: transparent !important; @@ -871,6 +875,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"] { background: rgb(var(--calendar-available) / .7) !important; border-left-color: transparent !important; @@ -903,12 +911,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-unreleased-"] { +[class*="CalendarEvent-unreleased-"], +[class*="CalendarEvent-continuing-"] { background: rgb(var(--calendar-unaired) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover { +[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover, +[class*="Calendar-calendar-"] [class*="CalendarEvent-continuing-"]:hover { background: rgb(var(--calendar-unaired) / .5) !important; border-left-color: transparent !important; } @@ -933,12 +943,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-downloading-"] { +[class*="CalendarEvent-downloading-"], +[class*="CalendarEvent-queue-"] { background: rgb(var(--calendar-downloading) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover { +[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover, +[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover { background: rgb(var(--calendar-downloading) / .5) !important; border-left-color: transparent !important; } diff --git a/css/base/readarr/readarr-base.css b/css/base/readarr/readarr-base.css index 63f38d74..7872b8bd 100644 --- a/css/base/readarr/readarr-base.css +++ b/css/base/readarr/readarr-base.css @@ -721,6 +721,10 @@ a:hover { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewAuthorSearchResult-year-"] { color: #fff; } @@ -857,6 +861,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"]:not([class*="AgendaEvent-"]) { background: rgb(var(--calendar-downloaded) / .7) !important; border-left-color: transparent !important; @@ -897,12 +905,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]) { +[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]), +[class*="CalendarEvent-queue-"]:not([class*="AgendaEvent-"]) { background: rgb(var(--calendar-downloading) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover:not([class*="AgendaEvent-"]) { +[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover:not([class*="AgendaEvent-"]), +[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover:not([class*="AgendaEvent-"]) { background: rgb(var(--calendar-downloading) / .5) !important; border-left-color: transparent !important; } diff --git a/css/base/sonarr/sonarr-base.css b/css/base/sonarr/sonarr-base.css index fdbb24c2..5285fe2e 100644 --- a/css/base/sonarr/sonarr-base.css +++ b/css/base/sonarr/sonarr-base.css @@ -629,6 +629,7 @@ a:hover { [class*="EnhancedSelectInput-options-"] { border: 1px solid rgba(var(--accent-color)) !important; + background-color: transparent; } [class*="EnhancedSelectInputOption-isSelected-"], @@ -749,6 +750,10 @@ input:focus:-ms-input-placeholder { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewSeriesSearchResult-underlay-"] { background-color: transparent !important; } @@ -830,6 +835,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"] { background: rgb(var(--calendar-tv-available) / .7) !important; border-left-color: transparent !important; diff --git a/css/base/tautulli/tautulli-base.css b/css/base/tautulli/tautulli-base.css index 6f24bb2d..a9469325 100644 --- a/css/base/tautulli/tautulli-base.css +++ b/css/base/tautulli/tautulli-base.css @@ -218,7 +218,8 @@ select, } /* Buttons */ -.btn-dark { +.btn-dark, +.btn-dark.inactive:hover { background-color: var(--button-color); border-color: var(--button-color); color: var(--button-text); @@ -231,6 +232,7 @@ select, } .btn-dark:active, +.btn-dark:active:hover, .btn-dark.active, .open>.dropdown-toggle.btn-dark, .btn-dark.active:focus { @@ -239,6 +241,11 @@ select, border-color: var(--button-color-hover); } +.btn-filter.active, .btn-filter.active.focus, +.btn-filter.active:hover { + background-color: var(--button-color-hover) !important; +} + .btn:focus:not(select), .btn.focus:not(select), .btn-dark:focus:not(select), @@ -252,10 +259,6 @@ select, background-color: var(--button-color-hover); } -.btn-dark.inactive:hover { - background-color: rgba(255, 255, 255, 0.08); -} - .btn-danger.btn-edit { background-color: rgba(255, 255, 255, 0.25); } diff --git a/css/base/unraid/unraid-base.css b/css/base/unraid/unraid-base.css index 71d50c6e..2e1b19ae 100644 --- a/css/base/unraid/unraid-base.css +++ b/css/base/unraid/unraid-base.css @@ -373,6 +373,12 @@ div.tab [type=radio]+label { } /* CA */ +hr { + +color: var(--text); +background-color: var(--text); +} + .ca_holderDocker { background-color: rgb(0 0 0 / 10%) !important; border-color: rgb(0 0 0 / 25%) !important; @@ -457,18 +463,19 @@ li.caMenuItem:hover { } .supportButton, -.actionsPopup, -.supportPopup, -.popupProfile, -.repoPopup, -.ca_favouriteRepo, -.donate { +#sidenavContent .actionsPopup, +#sidenavContent .pinPopup, +#sidenavContent .supportPopup, +#sidenavContent .popupProfile, +#sidenavContent .repoPopup, +#sidenavContent .ca_favouriteRepo, +#sidenavContent .donate { color: var(--button-text) !important; background: var(--button-color) !important; border-color: var(--button-color) !important; } -.infoButton { +.ca_holder .infoButton { color: var(--button-text) !important; background: var(--button-color) !important; border-color: var(--button-color) !important; @@ -479,13 +486,14 @@ li.caMenuItem:hover { border-color: var(--button-color-hover) !important; } -.supportButton:hover, -.actionsPopup:hover, -.supportPopup:hover, -.popupProfile:hover, -.repoPopup:hover, -.ca_favouriteRepo:hover, -.donate:hover{ +#sidenavContent .supportButton:hover, +#sidenavContent .actionsPopup:hover, +#sidenavContent .pinPopup:hover, +#sidenavContent .supportPopup:hover, +#sidenavContent .popupProfile:hover, +#sidenavContent .repoPopup:hover, +#sidenavContent .ca_favouriteRepo:hover, +#sidenavContent .donate:hover{ background: var(--button-color-hover) !important; color: var(--button-text-hover) !important; border-color: var(--button-color-hover) !important; @@ -564,7 +572,7 @@ li.caMenuItem:hover { color: var(--link-color-hover) !important; } -.actionsButton { +.ca_holder .actionsButton { color: var(--button-text) !important; background: var(--button-color) !important; } diff --git a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark index 8d954e41..c3b07812 100644 --- a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark @@ -9,6 +9,7 @@ echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_ADDON'=${TP_ADDON}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" APP_FILEPATH='/app/bazarr/bin/frontend/build/index.html' @@ -22,6 +23,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -45,12 +50,12 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark index 01b64324..19b1417e 100644 --- a/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark +++ b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '--------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /app/calibre-web/cps/templates/layout.html; echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /app/calibre-web/cps/templates/layout.html - sed -i "s/<\/head>/<\/head> /g" /app/calibre-web/cps/templates/layout.html + sed -i "s/<\/head>/<\/head> /g" /app/calibre-web/cps/templates/layout.html + sed -i "s/<\/head>/<\/head> /g" /app/calibre-web/cps/templates/layout.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi diff --git a/docker-mods/deluge/root/etc/cont-init.d/98-themepark b/docker-mods/deluge/root/etc/cont-init.d/98-themepark index 9bbd3ea8..1f8265c2 100644 --- a/docker-mods/deluge/root/etc/cont-init.d/98-themepark +++ b/docker-mods/deluge/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -39,8 +44,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" ${DELUGE_INDEX_PATH}; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" ${DELUGE_INDEX_PATH} - sed -i "s/<\/head>/<\/head> /g" ${DELUGE_INDEX_PATH} + sed -i "s/<\/head>/<\/head> /g" ${DELUGE_INDEX_PATH} + sed -i "s/<\/head>/<\/head> /g" ${DELUGE_INDEX_PATH} printf 'Stylesheet set to %s\n' "${TP_THEME} " fi diff --git a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark index 9a28300e..1c1fa3ed 100644 --- a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark +++ b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark @@ -11,6 +11,7 @@ echo -e "Variables set:\\n\ 'APP_FILEPATH'=${APP_FILEPATH}\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -18,6 +19,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -37,8 +42,8 @@ if [[ -z ${TP_THEME} ]]; then fi sed_file(){ - sed -i "s/<\/head>/<\/head> /g" $1 - sed -i "s/<\/head>/<\/head> /g" $1 + sed -i "s/<\/head>/<\/head> /g" $1 + sed -i "s/<\/head>/<\/head> /g" $1 printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1" } diff --git a/docker-mods/emby/root/etc/cont-init.d/98-themepark b/docker-mods/emby/root/etc/cont-init.d/98-themepark index 91f67ef5..215209dc 100644 --- a/docker-mods/emby/root/etc/cont-init.d/98-themepark +++ b/docker-mods/emby/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -34,5 +39,5 @@ if [[ -z ${TP_THEME} ]]; then fi # Adding stylesheets -printf '%s\n' "@import url('https://${TP_DOMAIN}/css/${THEME_TYPE}/${TP_THEME}.css');" "@import url('https://${TP_DOMAIN}/css/base/emby/emby-base.css');" > /app/emby/dashboard-ui/modules/themes/light/theme.css +printf '%s\n' "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/${THEME_TYPE}/${TP_THEME}.css');" "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/base/emby/emby-base.css');" > /app/emby/dashboard-ui/modules/themes/light/theme.css printf 'Stylesheet set to %s\n' "${TP_THEME}" diff --git a/docker-mods/jackett/root/etc/cont-init.d/98-themepark b/docker-mods/jackett/root/etc/cont-init.d/98-themepark index 3dd618d4..abaf1b50 100644 --- a/docker-mods/jackett/root/etc/cont-init.d/98-themepark +++ b/docker-mods/jackett/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" APP_FILEPATH='/app/Jackett/Content/index.html' @@ -21,6 +22,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -44,8 +49,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark index edfb5e08..18e53c79 100644 --- a/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark +++ b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-----------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /usr/share/jellyfin/web/index.html; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/body>/<\/body> /g" /usr/share/jellyfin/web/index.html - sed -i "s/<\/body>/<\/body> /g" /usr/share/jellyfin/web/index.html + sed -i "s/<\/body>/<\/body> /g" /usr/share/jellyfin/web/index.html + sed -i "s/<\/body>/<\/body> /g" /usr/share/jellyfin/web/index.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark index 5959143b..d8714131 100644 --- a/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark +++ b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '----------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /app/lazylibrarian/data/interfaces/bookstra echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html - sed -i "s/<\/head>/<\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html + sed -i "s/<\/head>/<\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html + sed -i "s/<\/head>/<\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark index 1dff5682..6d1ccf9c 100644 --- a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark +++ b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /usr/share/webapps/librespeed/index.html; t echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /usr/share/webapps/librespeed/index.html - sed -i "s/<\/head>/<\/head> /g" /usr/share/webapps/librespeed/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/share/webapps/librespeed/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/share/webapps/librespeed/index.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark index d135e134..0b1471c2 100644 --- a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_ADDON'=${TP_ADDON}\\n\ 'TP_THEME'=${TP_THEME}\\n" @@ -24,6 +25,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -47,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark index b737f741..65732690 100644 --- a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark +++ b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark @@ -16,6 +16,7 @@ echo -e "Variables set:\\n\ 'TP_HOTIO'=${TP_HOTIO}\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -23,6 +24,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -42,8 +47,8 @@ if [[ -z ${TP_THEME} ]]; then fi sed_file(){ - sed -i "s/<\/head>/<\/head> /g" $1 - sed -i "s/<\/head>/<\/head> /g" $1 + sed -i "s/<\/head>/<\/head> /g" $1 + sed -i "s/<\/head>/<\/head> /g" $1 printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1" } diff --git a/docker-mods/nzbget/root/etc/cont-init.d/98-themepark b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark index 11627c1b..3e94d1e1 100644 --- a/docker-mods/nzbget/root/etc/cont-init.d/98-themepark +++ b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" APP_FILEPATH='/app/nzbget/webui/index.html' @@ -20,6 +21,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -43,7 +48,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" fi \ No newline at end of file diff --git a/docker-mods/plex/root/etc/cont-init.d/98-themepark b/docker-mods/plex/root/etc/cont-init.d/98-themepark index f6c4449f..eabe9546 100644 --- a/docker-mods/plex/root/etc/cont-init.d/98-themepark +++ b/docker-mods/plex/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" APP_FILEPATH='' @@ -21,6 +22,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -44,12 +49,12 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark index 6ebe7163..37afbbbd 100644 --- a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_ADDON'=${TP_ADDON}\\n\ 'TP_THEME'=${TP_THEME}\\n" @@ -24,6 +25,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -47,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark index 99dd3caa..fe5df1d8 100644 --- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark @@ -43,6 +43,7 @@ echo -e "Variables set:\\n\ 'TP_HOTIO'=${TP_HOTIO}\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -50,6 +51,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -85,8 +90,8 @@ if [[ ! -d /themepark ]]; then fi sed_file(){ - sed -i "s/<\/body>/<\/body> /g" $1 - sed -i "s/<\/body>/<\/body> /g" $1 + sed -i "s/<\/body>/<\/body> /g" $1 + sed -i "s/<\/body>/<\/body> /g" $1 printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1" } diff --git a/docker-mods/radarr/root/etc/cont-init.d/98-themepark b/docker-mods/radarr/root/etc/cont-init.d/98-themepark index e35a34f8..4051c1fd 100644 --- a/docker-mods/radarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/radarr/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_ADDON'=${TP_ADDON}\\n\ 'TP_THEME'=${TP_THEME}\\n" @@ -24,6 +25,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -47,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/readarr/root/etc/cont-init.d/98-themepark b/docker-mods/readarr/root/etc/cont-init.d/98-themepark index 8b2ae8c2..28f2b78d 100644 --- a/docker-mods/readarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/readarr/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_ADDON'=${TP_ADDON}\\n\ 'TP_THEME'=${TP_THEME}\\n" @@ -24,6 +25,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -47,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark index 9cd87d4d..f57b9c48 100644 --- a/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /app/rutorrent/index.html; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /app/rutorrent/index.html - sed -i "s/<\/head>/<\/head> /g" /app/rutorrent/index.html + sed -i "s/<\/head>/<\/head> /g" /app/rutorrent/index.html + sed -i "s/<\/head>/<\/head> /g" /app/rutorrent/index.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark index 6e16bb53..129cf6ea 100644 --- a/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark +++ b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '----------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" APP_FILEPATH='/app/sabnzbd' @@ -21,6 +22,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -44,13 +49,13 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}/interfaces/Glitter/templat echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl" printf 'Stylesheet set to %s\n' "${TP_THEME}" fi \ No newline at end of file diff --git a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark index d11aa64e..636eb2ae 100644 --- a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_ADDON'=${TP_ADDON}\\n\ 'TP_THEME'=${TP_THEME}\\n" @@ -24,6 +25,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -47,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/synclounge/root/etc/cont-init.d/98-themepark b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark index f3ea1e80..1b0a160e 100644 --- a/docker-mods/synclounge/root/etc/cont-init.d/98-themepark +++ b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/node_modules/synclounge/dist/index echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html - sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/tautulli/root/etc/cont-init.d/98-themepark b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark index 58a7fdfa..4013d706 100644 --- a/docker-mods/tautulli/root/etc/cont-init.d/98-themepark +++ b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-----------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" APP_FILEPATH='/app/tautulli/data/interfaces/default/base.html' @@ -21,6 +22,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -44,7 +49,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" + sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" fi \ No newline at end of file diff --git a/docker-mods/thelounge/root/etc/cont-init.d/98-themepark b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark index c7b85b00..96bc372b 100644 --- a/docker-mods/thelounge/root/etc/cont-init.d/98-themepark +++ b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '-------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/node_modules/thelounge/client/inde echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl - sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl + sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl + sed -i "s/<\/head>/<\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file diff --git a/docker-mods/transmission/root/etc/cont-init.d/98-themepark b/docker-mods/transmission/root/etc/cont-init.d/98-themepark index 2dfab788..45c27963 100644 --- a/docker-mods/transmission/root/etc/cont-init.d/98-themepark +++ b/docker-mods/transmission/root/etc/cont-init.d/98-themepark @@ -8,6 +8,7 @@ echo '---------------------------------' echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -15,6 +16,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -38,8 +43,8 @@ if ! grep -q "${TP_DOMAIN}/css/base" /usr/share/transmission/web/index.html; the echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" /usr/share/transmission/web/index.html - sed -i "s/<\/head>/<\/head> /g" /usr/share/transmission/web/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/share/transmission/web/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/share/transmission/web/index.html printf 'Stylesheet set to %s\n' "${TP_THEME} " fi \ No newline at end of file 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 28f360a3..d0cb8981 100644 --- a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark @@ -24,6 +24,7 @@ fi echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ +'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -31,6 +32,10 @@ if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' TP_DOMAIN='theme-park.dev' fi +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi THEME_TYPE='theme-options' if [ "${TP_COMMUNITY_THEME}" = true ]; then @@ -138,7 +143,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then echo '---------------------------------------------------------' echo '| Adding the stylesheet to /vuetorrent/public/index.html |' echo '---------------------------------------------------------' - sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}" - sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}" + 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 diff --git a/docker/root/defaults/default b/docker/root/defaults/default new file mode 100644 index 00000000..f4502341 --- /dev/null +++ b/docker/root/defaults/default @@ -0,0 +1,37 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name _; + + ssl_certificate /config/keys/cert.crt; + ssl_certificate_key /config/keys/cert.key; + + index index.html index.htm index.php; + + #location#/ {return 302 $scheme://TP_DOMAIN/TP_URLBASE$request_uri;} + + location / { + alias /config/www/; + sub_filter_types *; + sub_filter 'https://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter 'http://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter 'https://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter 'http://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter_once off; + try_files $uri $uri/ /index.html; + + #SUBFOLDER SUBFILTERS + #sub_filter 'https://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE; + #sub_filter 'http://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE; + } + + # Don't cache + add_header Last-Modified $date_gmt; + add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; + if_modified_since off; + expires -1; + etag off; +} diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config new file mode 100644 index 00000000..4480bde0 --- /dev/null +++ b/docker/root/etc/cont-init.d/50-config @@ -0,0 +1,69 @@ +#!/usr/bin/with-contenv bash + +echo '------------------' +echo '| theme.park |' +echo '------------------' + +# Display variables for troubleshooting +echo -e "Variables set:\\n\ +PUID=${PUID}\\n\ +PGID=${PGID}\\n\ +TZ=${TZ}\\n\ +TP_SCHEME=${TP_SCHEME}\\n\ +TP_URLBASE=${TP_URLBASE}\\n\ +TP_DOMAIN=${TP_DOMAIN}\\n" + +if [[ -z ${TP_DOMAIN} ]]; then + echo 'No domain set, defaulting to $http_host' + TP_DOMAIN='$http_host' +fi + +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to $scheme' + TP_SCHEME='$scheme' +fi + +if [[ -z ${TP_URLBASE} ]]; then + TP_URLBASE='' +fi + +# Remove forward slash +case ${TP_URLBASE} in + *"/"*) + TP_URLBASE=$(echo "${TP_URLBASE}" | sed 's/\///g') + ;; +esac + +DEFAULT='/defaults/default' +if [[ ${TP_URLBASE} ]]; then + if ! grep -q "location /${TP_URLBASE} {" "${DEFAULT}"; then + sed -i "s/location \//location \/${TP_URLBASE}/g" ${DEFAULT} + sed -i "s/TP_DOMAIN/${TP_DOMAIN}/g" ${DEFAULT} + sed -i "s/TP_URLBASE/${TP_URLBASE}/g" ${DEFAULT} + sed -i "s/#sub_filter/sub_filter/g" ${DEFAULT} + sed -i "s/#location#/location /g" ${DEFAULT} + sed -i "s/\$scheme/${TP_SCHEME}/g" ${DEFAULT} + fi +elif [[ -z ${TP_URLBASE} ]]; then + sed -i "s/TP_DOMAIN\/TP_URLBASE/${TP_DOMAIN}/g" ${DEFAULT} + sed -i "s/\$scheme/${TP_SCHEME}/g" ${DEFAULT} +fi +cp /defaults/default /config/nginx/site-confs + +# make our folders and links +mkdir -p \ + /config/www/{css,resources} + +# copy theme files +cp -R /app/themepark/css /config/www +cp -R /app/themepark/resources /config/www +cp /app/themepark/index.html /config/www +cp /app/themepark/themes.py /config/www +cp /app/themepark/CNAME /config/www + +echo 'Creating CSS files' +python3 /config/www/themes.py + +# permissions +chown -R abc:abc \ + /config \ No newline at end of file diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile new file mode 100644 index 00000000..5d1e5de9 --- /dev/null +++ b/linux-amd64.Dockerfile @@ -0,0 +1,23 @@ +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 + +# set version label +ARG BUILD_DATE +ARG TP_RELEASE +LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}" +LABEL maintainer="gilbn" +LABEL org.opencontainers.image.description DESCRIPTION + +RUN \ +echo " ## Installing packages ## " && \ +apk add --no-cache --virtual=build-dependencies \ + python3 && \ + echo "**** install theme.park ****" && \ + mkdir -p /app/themepark + +# copy local files +WORKDIR /app +COPY css/ /app/themepark/css/ +COPY resources/ /app/themepark/resources/ +COPY themes.py index.html CNAME /app/themepark/ + +COPY docker/root/ / \ No newline at end of file diff --git a/linux-arm-v7.Dockerfile b/linux-arm-v7.Dockerfile new file mode 100644 index 00000000..5f868fb9 --- /dev/null +++ b/linux-arm-v7.Dockerfile @@ -0,0 +1,23 @@ +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 + +# set version label +ARG BUILD_DATE +ARG TP_RELEASE +LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}" +LABEL maintainer="gilbn" +LABEL org.opencontainers.image.description DESCRIPTION + +RUN \ +echo " ## Installing packages ## " && \ +apk add --no-cache --virtual=build-dependencies \ + python3 && \ + echo "**** install theme.park ****" && \ + mkdir -p /app/themepark + +# copy local files +WORKDIR /app +COPY css/ /app/themepark/css/ +COPY resources/ /app/themepark/resources/ +COPY themes.py index.html CNAME /app/themepark/ + +COPY docker/root/ / \ No newline at end of file diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile new file mode 100644 index 00000000..2ebba47a --- /dev/null +++ b/linux-arm64.Dockerfile @@ -0,0 +1,23 @@ +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 + +# set version label +ARG BUILD_DATE +ARG TP_RELEASE +LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}" +LABEL maintainer="gilbn" +LABEL org.opencontainers.image.description DESCRIPTION + +RUN \ +echo " ## Installing packages ## " && \ +apk add --no-cache --virtual=build-dependencies \ + python3 && \ + echo "**** install theme.park ****" && \ + mkdir -p /app/themepark + +# copy local files +WORKDIR /app +COPY css/ /app/themepark/css/ +COPY resources/ /app/themepark/resources/ +COPY themes.py index.html CNAME /app/themepark/ + +COPY docker/root/ / \ No newline at end of file diff --git a/resources/landing-page/css/custom.css b/resources/landing-page/css/custom.css index 062da18a..b58be3ce 100644 --- a/resources/landing-page/css/custom.css +++ b/resources/landing-page/css/custom.css @@ -66,15 +66,27 @@ section { /* slightly transparent fallback for Firefox (not supporting backdrop-filter) */ @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) { - #mainNav, #mainNav.navbar-scrolled { box-shadow: none; - background-color: rgba(0, 0, 0, 0.9); + background-color: rgba(var(--accent-color), 1); } } +#mainNav .navbar-nav .nav-item .nav-link { + color: var(--label-text-color); + } +#mainNav .navbar-nav .nav-item .nav-link:hover, +#mainNav .navbar-nav .nav-item .nav-link:active { + color: var(--label-text-color); + opacity: .8; +} @media (min-width: 992px) { + @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) { + #mainNav { + background-color: rgba(var(--accent-color), 0.95) !important; + } + } #mainNav { box-shadow: none; background-color: rgba(var(--accent-color), 0.25); @@ -127,10 +139,6 @@ section { } } -#mainNav .navbar-nav .nav-item .nav-link:hover, -#mainNav .navbar-nav .nav-item .nav-link:active { - color: var(--text-hover); -} #mainNav .navbar-nav .nav-item .nav-link.active { color: var(--link-color-hover) !important; diff --git a/resources/landing-page/css/styles.css b/resources/landing-page/css/styles.css index 032a1d56..14d9d79f 100644 --- a/resources/landing-page/css/styles.css +++ b/resources/landing-page/css/styles.css @@ -11006,7 +11006,7 @@ hr.light { } #mainNav .navbar-nav .nav-item .nav-link { - color: #6c757d; + color: var(--label-text-color); font-family: "Merriweather Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-weight: 700; font-size: 0.9rem; diff --git a/resources/landing-page/js/scripts.js b/resources/landing-page/js/scripts.js index fddf655c..16df8d7d 100644 --- a/resources/landing-page/js/scripts.js +++ b/resources/landing-page/js/scripts.js @@ -56,7 +56,7 @@ function injectTheme(theme,container="head") { } else html_element = document.body; let themeOption = document.getElementById("theme-option") let link = themeOption ? themeOption : document.createElement("link"); - url = "/css/theme-options" + url = `${window.location.pathname}css/theme-options` link.type = "text/css"; link.rel = "stylesheet"; link.href = `${url}/${themeLower}.css`; @@ -69,7 +69,7 @@ function injectTheme(theme,container="head") { var themeOptions; function addThemeData() { - let themeJsonUrl = "/themes.json" + let themeJsonUrl = "themes.json" fetch(themeJsonUrl) .then(response => response.json()) .then(json => { @@ -145,7 +145,7 @@ function fadeOutIn(speed) { } function updateMetaThemeColor() { - fetch(`/css/theme-options/${Object.keys(themeOptions)[currentIndex].toLowerCase()}.css`) + fetch(`${window.location.pathname}css/theme-options/${Object.keys(themeOptions)[currentIndex].toLowerCase()}.css`) .then(response => response.text()) .then(text => { let re = text.match("--accent-color:.*;")[0] diff --git a/themes.py b/themes.py index 4b369a2e..84a187c9 100644 --- a/themes.py +++ b/themes.py @@ -1,12 +1,15 @@ -from os import listdir -from os.path import isdir, isfile, join +#! /usr/bin/env python3 + +from os import listdir, environ as env, chdir +from os.path import isdir, isfile, join, dirname, abspath from json import dump, dumps, loads, load import subprocess -import shutil + +chdir(dirname(abspath(__file__))) # Set working dir def get_shas(output): """Returns a dict of CSS files and SHAs""" - output_lines = output.splitlines() + output_lines = output.splitlines() if output else [] sha_dict = {} for line in output_lines: line = line.decode('utf-8').replace("0\t", "").split(" ") @@ -17,8 +20,7 @@ def get_shas(output): def create_addons_json(): - addon_shas = subprocess.check_output( - ["git", "ls-files", "-s", "./css/addons/*.css"]) + addon_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/addons/*.css"]) if isdir(".git") else [] SHAS = get_shas(addon_shas) ADDONS = {"addons": {}} addon_root = './css/addons' @@ -36,12 +38,12 @@ def create_addons_json(): f"{addon_root}/{app}/{addon}") if isfile(join(f"{addon_root}/{app}/{addon}", file))] if len([f for f in files if f.endswith('.css')]) > 1: ADDONS["addons"][app][addon].update({ - "css": [f"https://{DOMAIN}/css/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css"] + "css": [f"{scheme}://{DOMAIN}/css/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css"] } ) else: ADDONS["addons"][app].update({ - addon: f"https://{DOMAIN}/css/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css" + addon: f"{scheme}://{DOMAIN}/css/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css" } ) extra_dirs = [dir for dir in listdir( @@ -52,7 +54,7 @@ def create_addons_json(): f"{addon_root}/{app}/{addon}/{dir}") if isfile(join(f"{addon_root}/{app}/{addon}/{dir}", file))] ADDONS["addons"][app][addon].update({ dir: { - "css": [f"https://{DOMAIN}/css/addons/{app}/{addon}/{dir}/{extra_file}?sha={SHAS.get(extra_file)}" for extra_file in extra_dir_files if extra_file.split(".")[1] == "css"] + "css": [f"{scheme}://{DOMAIN}/css/addons/{app}/{addon}/{dir}/{extra_file}?sha={SHAS.get(extra_file)}" for extra_file in extra_dir_files if extra_file.split(".")[1] == "css"] } } ) @@ -62,18 +64,18 @@ def create_addons_json(): def create_json(app_folders: list = None, themes: list = None, community_themes: list = None, no_sub_folders=False): if no_sub_folders: THEMES_DICT = {} - theme_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/theme-options/*.css"]) - community_theme_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/community-theme-options/*.css"]) + theme_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/theme-options/*.css"]) if isdir(".git") else [] + community_theme_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/community-theme-options/*.css"]) if isdir(".git") else [] THEME_SHAS = get_shas(theme_shas) COMMUNITY_THEME_SHAS = get_shas(community_theme_shas) THEMES = { theme.split(".")[0].capitalize(): { - "url": f"https://{DOMAIN}/css/theme-options/{theme}?sha={THEME_SHAS.get(theme)}" + "url": f"{scheme}://{DOMAIN}/css/theme-options/{theme}?sha={THEME_SHAS.get(theme)}" }for theme in themes } COMMUNITY_THEMES = { theme.split(".")[0].capitalize(): { - "url": f"https://{DOMAIN}/css/community-theme-options/{theme}?sha={COMMUNITY_THEME_SHAS.get(theme)}" + "url": f"{scheme}://{DOMAIN}/css/community-theme-options/{theme}?sha={COMMUNITY_THEME_SHAS.get(theme)}" }for theme in community_themes } THEMES_DICT.update(dict(sorted({ @@ -91,12 +93,12 @@ def create_json(app_folders: list = None, themes: list = None, community_themes: else: ADDONS = loads(create_addons_json()) APPS = {} - app_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/base/*base.css"]) + app_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/base/*base.css"]) if isdir(".git") else [] SHAS = get_shas(app_shas) APPS.update(dict(sorted({ "applications": { app: { - "base_css": f"https://{DOMAIN}/css/base/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}", + "base_css": f"{scheme}://{DOMAIN}/css/base/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}", "addons": ADDONS["addons"][app] if app in ADDONS["addons"] else {} } for app in app_folders if not isfile(f'./css/base/{app}/.deprecated') } @@ -104,7 +106,7 @@ def create_json(app_folders: list = None, themes: list = None, community_themes: APPS.update(dict(sorted({ "deprecated": { app: { - "base_css": f"https://{DOMAIN}/css/base/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}", + "base_css": f"{scheme}://{DOMAIN}/css/base/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}", "addons": ADDONS["addons"][app] if app in ADDONS["addons"] else {} } for app in app_folders if isfile(f'./css/base/{app}/.deprecated') } @@ -114,49 +116,35 @@ def create_json(app_folders: list = None, themes: list = None, community_themes: APPS.update(THEMES) return dumps(APPS) -# def temporary_copy_files(): -# shutil.rmtree("./CSS", ignore_errors=True) -# shutil.rmtree("./Resources", ignore_errors=True) -# src_dst = { -# "./css/base/": "./CSS/themes", -# "./css/theme-options": "./CSS/variables", -# "./css/community-theme-options": "./CSS/variables", -# "./resources/": "./Resources/", -# "./css/addons/": "./CSS/addons", -# "./css/defaults/": "./CSS/defaults", -# "./css/theme-options/organizr.css": "./CSS/variables/organizr-dark.css", -# "./css/theme-options/organizr.css": "./css/theme-options/organizr-dark.css" -# } -# for src in src_dst: -# if ".css" in src: -# shutil.copy(src,src_dst[src]) -# continue -# shutil.copytree(src,src_dst[src],dirs_exist_ok=True) - def create_theme_options(): def create_css(folder): with open(f"{folder}/{app}/{theme.lower()}.css", "w") as create_app: - content = f'@import url("{applications[app]["base_css"]}");\n@import url("{themes[theme]["url"]}");' + content = f'@import url("{applications[app]["base_css"]}");\n@import url("{all_themes[theme]["url"]}");' create_app.write(content) with open("themes.json") as themes: data = load(themes) - themes = data["all-themes"] + all_themes = data["all-themes"] applications = data["applications"] for app in applications: - for theme in themes: + for theme in all_themes: folders = ["./css/base"] for folder in folders: create_css(folder) +env_domain = env.get('TP_DOMAIN') +scheme = env.get('TP_SCHEME','https') if env.get('TP_SCHEME') != '$scheme' else 'https' if __name__ == "__main__": app_folders = [name for name in listdir('./css/base') if isdir(join('./css/base', name))] themes = [name for name in listdir('./css/theme-options') if isfile(join('./css/theme-options', name))] community_themes = [name for name in listdir('./css/community-theme-options') if isfile(join('./css/community-theme-options', name))] - with open("CNAME", "rt", closefd=True) as cname: - CNAME = cname.readline() - develop = True if subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"]).decode('ascii').strip() == "develop" else False - DOMAIN = CNAME if not develop else f"develop.{CNAME}" + develop = True if isdir(".git") and subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"]).decode('ascii').strip() == "develop" else False + if env_domain and env_domain != '$http_host': + DOMAIN = env_domain + else: + with open("CNAME", "rt", closefd=True) as cname: + CNAME = cname.readline() + DOMAIN = CNAME if not develop else f"develop.{CNAME}" apps = loads(create_json(app_folders=app_folders, themes=themes, community_themes=community_themes)) with open("themes.json", "w") as outfile: dump(apps, outfile, indent=2, sort_keys=True)