Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.

Commit 792f340

Browse files
committed
general: allow to hide title and subtitle on start screen
- has been part of #165, slightly updated Change-Id: Ie783b3e4d91c01179943eda1de2ea78e97bdf7ca
1 parent 500b7be commit 792f340

File tree

5 files changed

+32
-0
lines changed

5 files changed

+32
-0
lines changed

config/config.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
$config['adminpanel']['view'] = 'basic';
1313
$config['dev']['enabled'] = false;
1414
$config['start_screen']['title'] = 'Photobooth';
15+
$config['start_screen']['title_visible'] = true;
1516
$config['start_screen']['subtitle'] = NULL;
17+
$config['start_screen']['subtitle_visible'] = true;
1618
// possible thumb_size values: '360px', '540px', '900px', '1080px', '1260px'
1719
$config['picture']['thumb_size'] = '540px';
1820
$config['dev']['error_messages'] = true;

lib/configsetup.inc.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,22 @@
117117
'name' => 'start_screen[title]',
118118
'value' => htmlentities($config['start_screen']['title']),
119119
],
120+
'start_screen_title_visible' => [
121+
'type' => 'checkbox',
122+
'name' => 'start_screen[title_visible]',
123+
'value' => $config['start_screen']['title_visible'],
124+
],
120125
'start_screen_subtitle' => [
121126
'type' => 'input',
122127
'placeholder' => $defaultConfig['start_screen']['subtitle'],
123128
'name' => 'start_screen[subtitle]',
124129
'value' => htmlentities($config['start_screen']['subtitle']),
125130
],
131+
'start_screen_subtitle_visible' => [
132+
'type' => 'checkbox',
133+
'name' => 'start_screen[subtitle_visible]',
134+
'value' => $config['start_screen']['subtitle_visible'],
135+
],
126136
'picture_thumb_size' => [
127137
'view' => 'advanced',
128138
'type' => 'select',

resources/lang/en.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@
107107
"general:picture_time_to_live": "Show image after capture:",
108108
"general:qr_enabled": "Use QR Codes",
109109
"general:start_screen_subtitle": "Start screen (subtitle)",
110+
"general:start_screen_subtitle_visible": "Show subtitle on start screen",
110111
"general:start_screen_title": "Start screen (title)",
112+
"general:start_screen_title_visible": "Show title on start screen",
111113
"general:ui_language": "Choose Language",
112114
"general:webserver_ip": "IP address of the Photobooth web server",
113115
"general:webserver_ssid": "Wireless network name (SSID) used to access the photobooth",
@@ -220,7 +222,9 @@
220222
"manual:general:picture_time_to_live": "Enter a value used as milliseconds. This value defines the time your picture is visible on the result screen after taking a picture.",
221223
"manual:general:qr_enabled": "If enabled, a QR-Button is visible on the result screen and inside gallery. User can download a picture while scanning the QR-Code. If you're accessing Photobooth via \"localhost\", \"127.0.0.1\" or if you have Photobooth installed inside a subfolder, please define IP address of the Photobooth web server to make the QR-Code working. <p>Example if Photobooth can be accessed directly: <code>192.168.0.50</code>.</p><p>Example if Photobooth is installed inside a subfolder: <code>192.168.0.50/photobooth</code>.</p>",
222224
"manual:general:start_screen_subtitle": "Enter the subtitle visible on startpage.",
225+
"manual:general:start_screen_subtitle_visible": "If enabled, entered subtitle is visible on start screen.",
223226
"manual:general:start_screen_title": "Enter the title visible on startpage.",
227+
"manual:general:start_screen_title_visible": "If enabled, entered title is visible on start screen.",
224228
"manual:general:ui_language": "Choose interface language.<p>If you're missing a language or like to help improving translations visit the <a href=\"https://github.com/andi34/photobooth/wiki/FAQ#how-to-update-or-add-translations\" target=\"_blank\">\"How to update or add translations?\"</a> inside the Photobooth Wiki for instructions.</p>",
225229
"manual:general:webserver_ip": "Please define the IP address of the Photobooth web server to make the QR-Code working if you're accessing Photobooth via \"localhost\", \"127.0.0.1\" or if you have Photobooth installed inside a subfolder. <p>Example if Photobooth can be accessed directly: <code>192.168.0.50</code>.</p><p>Example if Photobooth is installed inside a subfolder: <code>192.168.0.50/photobooth</code>.</p>",
226230
"manual:general:webserver_ssid": "Please define the wireless network name (SSID) to be used to access the Photobooth. The wireless network name (SSID) is displayed on the results page when the QR code is called up.",

template/classic.template.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
<h1><?=$config['event']['textLeft']?>
1616
<i class="fa <?=$config['event']['symbol']?>" aria-hidden="true"></i>
1717
<?=$config['event']['textRight']?>
18+
<?php if ($config['start_screen']['title_visible']): ?>
1819
<br>
1920
<?=$config['start_screen']['title']?>
21+
<?php endif; ?>
2022
</h1>
23+
<?php if ($config['start_screen']['subtitle_visible']): ?>
2124
<h2><?=$config['start_screen']['subtitle']?></h2>
25+
<?php endif; ?>
2226
</div>
2327
<?php if ($config['ui']['decore_lines']): ?>
2428
<hr>
@@ -32,8 +36,12 @@
3236
<hr>
3337
<?php endif; ?>
3438
<div>
39+
<?php if ($config['start_screen']['title_visible']): ?>
3540
<h1><?=$config['start_screen']['title']?></h1>
41+
<?php endif; ?>
42+
<?php if ($config['start_screen']['subtitle_visible']): ?>
3643
<h2><?=$config['start_screen']['subtitle']?></h2>
44+
<?php endif; ?>
3745
</div>
3846
<?php if ($config['ui']['decore_lines']): ?>
3947
<hr>

template/modern.template.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
<?=$config['event']['textLeft']?>
1616
<i class="fa <?=$config['event']['symbol']?>" aria-hidden="true"></i>
1717
<?=$config['event']['textRight']?>
18+
<?php if ($config['start_screen']['title_visible']): ?>
1819
<br>
1920
<?=$config['start_screen']['title']?>
21+
<?php endif; ?>
2022
</h1>
23+
<?php if ($config['start_screen']['subtitle_visible']): ?>
2124
<h2><?=$config['start_screen']['subtitle']?></h2>
25+
<?php endif; ?>
2226
</div>
2327
<?php if ($config['ui']['decore_lines']): ?>
2428
<hr>
@@ -32,8 +36,12 @@
3236
<hr>
3337
<?php endif; ?>
3438
<div>
39+
<?php if ($config['start_screen']['title_visible']): ?>
3540
<h1><?=$config['start_screen']['title']?></h1>
41+
<?php endif; ?>
42+
<?php if ($config['start_screen']['subtitle_visible']): ?>
3643
<h2><?=$config['start_screen']['subtitle']?></h2>
44+
<?php endif; ?>
3745
</div>
3846
<?php if ($config['ui']['decore_lines']): ?>
3947
<hr>

0 commit comments

Comments
 (0)