diff --git a/etc/background b/etc/background new file mode 100644 index 00000000..9e7be378 Binary files /dev/null and b/etc/background differ diff --git a/etc/logo b/etc/logo new file mode 100644 index 00000000..79131687 --- /dev/null +++ b/etc/logo @@ -0,0 +1,127 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/nextcloudpi-config.d/nc-init.sh b/etc/nextcloudpi-config.d/nc-init.sh index 0f416941..b44f785a 100644 --- a/etc/nextcloudpi-config.d/nc-init.sh +++ b/etc/nextcloudpi-config.d/nc-init.sh @@ -94,6 +94,21 @@ EOF sudo -u www-data php occ config:system:set mail_from_address --value="admin" sudo -u www-data php occ config:system:set mail_domain --value="ownyourbits.com" + # NCP theme + local ID=$( grep instanceid config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g" ) + [[ "$ID" == "" ]] && { echo "failed to get ID"; return 1; } + mkdir -p data/appdata_${ID}/theming/images + cp /usr/local/etc/logo /usr/local/etc/background data/appdata_${ID}/theming/images + chown -R www-data:www-data data/appdata_${ID} + + mysql nextcloud < + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/ncp-web/index.php b/ncp-web/index.php index 5782ae20..b3263ee7 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -32,9 +32,9 @@ ini_set('session.cookie_secure', 1); // HTTP2 push headers - header("Link: ; rel=preload; as=script;,; rel=preload; as=script;,; rel=preload; as=style;,; rel=preload; as=image;, ; rel=preload; as=image;, rel=preconnect href=ncp-launcher.php;"); + header("Link: ; rel=preload; as=script;,; rel=preload; as=script;,; rel=preload; as=style;,; rel=preload; as=image;, ; rel=preload; as=image;, rel=preconnect href=ncp-launcher.php;"); ?> - + @@ -66,7 +66,7 @@ NextCloudPi First Run Click to start the configuration wizard - + run skip diff --git a/ncp-web/ncp-logo.png b/ncp-web/ncp-logo.png deleted file mode 100644 index b19b1a25..00000000 Binary files a/ncp-web/ncp-logo.png and /dev/null differ diff --git a/ncp-web/ncp.css b/ncp-web/ncp.css index 44ced9a6..2ff5a793 100644 --- a/ncp-web/ncp.css +++ b/ncp-web/ncp.css @@ -424,7 +424,7 @@ input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after,inpu } #header .logo-icon { display:inline-block; - background-image:url('ncp-logo.png'); + background-image:url('img/ncp-logo.svg'); background-repeat:no-repeat; background-position:center center; background-size:contain; diff --git a/ncp-web/wizard/img/ncp-logo.png b/ncp-web/wizard/img/ncp-logo.png deleted file mode 100644 index c5255f56..00000000 Binary files a/ncp-web/wizard/img/ncp-logo.png and /dev/null differ diff --git a/ncp-web/wizard/img/ncp-logo.svg b/ncp-web/wizard/img/ncp-logo.svg new file mode 100644 index 00000000..94943e72 --- /dev/null +++ b/ncp-web/wizard/img/ncp-logo.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php index d670ebbe..be4b2e53 100644 --- a/ncp-web/wizard/index.php +++ b/ncp-web/wizard/index.php @@ -22,6 +22,7 @@ if ( isset($_SERVER['HTTPS']) ) ini_set('session.cookie_secure', 1); ?> + @@ -39,7 +40,7 @@ Welcome to NextCloudPi - + This wizard will help you configure your personal cloud. @@ -188,7 +189,7 @@ go to your Nextcloud - + go back to NextCloudPi web panel
Click to start the configuration wizard
This wizard will help you configure your personal cloud.