From 41041e03a0243507052585c720d1c349a81bc9b9 Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Sat, 21 Aug 2021 22:20:41 +0200 Subject: [PATCH 1/3] Add welcome screen on first access Change-Id: Ia0c7de18af15cbf36d0a3946361b9406872a911e --- .gitignore | 1 + index.php | 4 +++ scripts/pack-build.js | 1 + src/sass/welcome.scss | 23 ++++++++++++++ welcome.php | 72 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+) create mode 100644 src/sass/welcome.scss create mode 100644 welcome.php diff --git a/.gitignore b/.gitignore index 341c8d1a0..2bbaf02d8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ vendor/simple-translator/ /.htaccess .htpasswd *.patch +.skip_welcome .vscode diff --git a/index.php b/index.php index 62768cfe9..1b38a156a 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,8 @@ + + + + + + + + + + Welcome to <?=$config['ui']['branding']?> + + + + + + + + + + + + + + + + + + + + + +
+

Welcome to your own Photobooth

+ +

Photobooth is an OpenSource Photobooth web interface for Linux and Windows.

+
+

Photobooth was initally developped by Andre Rinas especially to run on a Raspberry Pi.
+ In 2019 Andreas Blaesius picked up the work and continued to work on the source.

+

With the help of the community Photobooth growed to a powerfull Photobooth software with a lot of features and possibilities.
+ By a lot of features, we mean a lot (!!!) and you might have some questions, now or later. You can find a lot of useful information inside + our Photobooth-Wiki or at our Telegram group.

+

+

Here are some basic information for you:

+

Location of your Photobooth installation:
+ All files and folders inside this path belong to the Webserver user "www-data".

+

Images can be found at:

+

Databases are placed at:

+

Add your own files (e.g. background images, frames, override.css) inside:
+ All files and folders inside this path will be ignored on git and won't cause trouble while updating Photobooth.

+

You can change the settings and look of Photobooth via Admin panel. +
+

You are missing some translation or your language isn't supported yet? Don't worry! You can request new language support at GitHub, + you can translate Photobooth at Crowdin.

+
+

Thanks for the reading! Enjoy your Photobooth!
+ Start Photobooth

+ +
+ + + + + + + From e909410d270d204cc9542eadd1f334f6e37efc65 Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Sun, 22 Aug 2021 10:38:36 +0200 Subject: [PATCH 2/3] welcome: inform about gallery and slideshow, small adjustments Change-Id: I970a3d15093ce6da9fffd0d62a5575fc9ba77059 --- welcome.php | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/welcome.php b/welcome.php index 2f4f6eb87..3fab9b34c 100644 --- a/welcome.php +++ b/welcome.php @@ -4,6 +4,25 @@ if (!is_file('.skip_welcome')) { touch('.skip_welcome'); } + +if ($os == 'linux') { + $get_ip = shell_exec('hostname -I | cut -d " " -f 1'); + + if (!$get_ip) { + $IP = $_SERVER['HTTP_HOST']; + } else { + $IP = $get_ip; + } + + if (getcwd() == '/var/www/html/photobooth') { + $URL = $IP . '/photobooth'; + } else { + $URL = $IP; + } +} else { + $URL = $_SERVER['HTTP_HOST']; +} + ?> @@ -38,14 +57,14 @@

Welcome to your own Photobooth

- -

Photobooth is an OpenSource Photobooth web interface for Linux and Windows.

-
+

+

OpenSource Photobooth web interface for Linux and Windows.

+

Photobooth was initally developped by Andre Rinas especially to run on a Raspberry Pi.
In 2019 Andreas Blaesius picked up the work and continued to work on the source.

With the help of the community Photobooth growed to a powerfull Photobooth software with a lot of features and possibilities.
- By a lot of features, we mean a lot (!!!) and you might have some questions, now or later. You can find a lot of useful information inside - our Photobooth-Wiki or at our Telegram group.

+ By a lot of features, we mean a lot (!!!) and you might have some questions - now or later. You can find a lot of useful information inside + the Photobooth-Wiki or at the Telegram group.

Here are some basic information for you:

Location of your Photobooth installation:
@@ -53,15 +72,16 @@

Images can be found at:

Databases are placed at:

Add your own files (e.g. background images, frames, override.css) inside:
- All files and folders inside this path will be ignored on git and won't cause trouble while updating Photobooth.

-

You can change the settings and look of Photobooth via Admin panel. -
+ All files and folders inside this path will be ignored on git and won't cause trouble while updating Photobooth.

+

You can change the settings and look of Photobooth using the Admin panel at http:///admin.
+ A standalone gallery can be found at http:///gallery.php.
+ A standalone slideshow can be found at http:///slideshow.

+

You are missing some translation or your language isn't supported yet? Don't worry! You can request new language support at GitHub, you can translate Photobooth at Crowdin.

-
-

Thanks for the reading! Enjoy your Photobooth!
- Start Photobooth

- +

+

Thanks for the reading! Enjoy your Photobooth!

+

Start Photobooth

From f29561fc1091aa71f1a0a87de0e5cc56ff8e8583 Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Sun, 22 Aug 2021 14:36:49 +0200 Subject: [PATCH 3/3] Welcome: mention FAQ --- welcome.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/welcome.php b/welcome.php index 3fab9b34c..9728e943c 100644 --- a/welcome.php +++ b/welcome.php @@ -75,7 +75,8 @@ All files and folders inside this path will be ignored on git and won't cause trouble while updating Photobooth.

You can change the settings and look of Photobooth using the Admin panel at http:///admin.
A standalone gallery can be found at http:///gallery.php.
- A standalone slideshow can be found at http:///slideshow.

+ A standalone slideshow can be found at http:///slideshow.
+ An integrated FAQ to answer a lot of questions can be found at http:///faq.

You are missing some translation or your language isn't supported yet? Don't worry! You can request new language support at GitHub, you can translate Photobooth at Crowdin.