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

Commit 500b7be

Browse files
committed
ui: allow to hide decore lines
- has been part of #165, slightly updated Change-Id: I51883d6c5f7a31bbe4eea6430fd4c680e52fdf3d
1 parent 9a9af18 commit 500b7be

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed

config/config.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@
226226
$config['background']['defaults'] = null;
227227
$config['background']['admin'] = null;
228228
$config['background']['chroma'] = null;
229+
$config['ui']['decore_lines'] = true;
229230
$config['ui']['rounded_corners'] = false;
230231
$config['colors']['primary'] = '#0a6071';
231232
$config['colors']['secondary'] = '#214852';

lib/configsetup.inc.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,12 @@
12401240
'placeholder' => $defaultConfig['background']['chroma'],
12411241
'value' => htmlentities($config['background']['chroma']),
12421242
],
1243+
'ui_decore_lines' => [
1244+
'view' => 'expert',
1245+
'type' => 'checkbox',
1246+
'name' => 'ui[decore_lines]',
1247+
'value' => $config['ui']['decore_lines'],
1248+
],
12431249
'ui_rounded_corners' => [
12441250
'view' => 'expert',
12451251
'type' => 'checkbox',

resources/lang/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@
316316
"manual:userinterface:background_chroma": "CSS Style for background on chromakeying page.",
317317
"manual:userinterface:background_defaults": "CSS Style for background on start-, login- and slideshow pages.",
318318
"manual:userinterface:button_show_fs": "If enabled, a button to toggle fullscreenmode will be added to the start screen.",
319+
"manual:userinterface:ui_decore_lines": "If enabled, decorate lines will be visible on start page.",
319320
"manual:userinterface:ui_font_size": "Enter the default font size used for the Photobooth interface.",
320321
"manual:userinterface:ui_rounded_corners": "If enabled, the Photobooth UI uses smooth rounded edges.",
321322
"manual:userinterface:ui_style": "Choose a start page styling. To use custom styling please create and use \"/template/custom.template.php\" and \"/resources/css/custom_style.css\", if one of these files is not readable we will fallback to default theme.",
@@ -441,6 +442,7 @@
441442
"userinterface:colors_primary": "Primary color",
442443
"userinterface:colors_secondary": "Secondary color",
443444
"userinterface:colors_start_font": "Start screen font color",
445+
"userinterface:ui_decore_lines": "Show decorate lines",
444446
"userinterface:ui_font_size": "Default font size",
445447
"userinterface:ui_rounded_corners": "Rounded corners",
446448
"userinterface:ui_style": "Styling",

template/classic.template.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
<div class="startInner">
88
<?php if ($config['event']['enabled']): ?>
99
<div class="names">
10+
<?php if ($config['ui']['decore_lines']): ?>
1011
<hr class="small" />
1112
<hr>
13+
<?php endif; ?>
1214
<div>
1315
<h1><?=$config['event']['textLeft']?>
1416
<i class="fa <?=$config['event']['symbol']?>" aria-hidden="true"></i>
@@ -18,19 +20,25 @@
1820
</h1>
1921
<h2><?=$config['start_screen']['subtitle']?></h2>
2022
</div>
23+
<?php if ($config['ui']['decore_lines']): ?>
2124
<hr>
2225
<hr class="small" />
26+
<?php endif; ?>
2327
</div>
2428
<?php else: ?>
2529
<div class="names">
2630
<hr class="small" />
31+
<?php if ($config['ui']['decore_lines']): ?>
2732
<hr>
33+
<?php endif; ?>
2834
<div>
2935
<h1><?=$config['start_screen']['title']?></h1>
3036
<h2><?=$config['start_screen']['subtitle']?></h2>
3137
</div>
38+
<?php if ($config['ui']['decore_lines']): ?>
3239
<hr>
3340
<hr class="small" />
41+
<?php endif; ?>
3442
</div>
3543
<?php endif; ?>
3644

template/modern.template.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
<div class="divinnen2">
77
<?php if ($config['event']['enabled']): ?>
88
<div class="names">
9+
<?php if ($config['ui']['decore_lines']): ?>
910
<hr class="small" />
1011
<hr>
12+
<?php endif; ?>
1113
<div>
1214
<h1>
1315
<?=$config['event']['textLeft']?>
@@ -18,25 +20,25 @@
1820
</h1>
1921
<h2><?=$config['start_screen']['subtitle']?></h2>
2022
</div>
21-
23+
<?php if ($config['ui']['decore_lines']): ?>
2224
<hr>
2325
<hr class="small" />
24-
26+
<?php endif; ?>
2527
</div>
2628
<?php else: ?>
2729
<div class="names">
28-
30+
<?php if ($config['ui']['decore_lines']): ?>
2931
<hr class="small" />
3032
<hr>
31-
33+
<?php endif; ?>
3234
<div>
3335
<h1><?=$config['start_screen']['title']?></h1>
3436
<h2><?=$config['start_screen']['subtitle']?></h2>
3537
</div>
36-
38+
<?php if ($config['ui']['decore_lines']): ?>
3739
<hr>
3840
<hr class="small" />
39-
41+
<?php endif; ?>
4042
</div>
4143
<?php endif; ?>
4244

0 commit comments

Comments
 (0)