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

Commit

Permalink
ui: allow to hide decore lines
Browse files Browse the repository at this point in the history
- has been part of #165,
  slightly updated

Change-Id: I51883d6c5f7a31bbe4eea6430fd4c680e52fdf3d
  • Loading branch information
andi34 committed Mar 1, 2021
1 parent 9a9af18 commit 500b7be
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 6 deletions.
1 change: 1 addition & 0 deletions config/config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@
$config['background']['defaults'] = null;
$config['background']['admin'] = null;
$config['background']['chroma'] = null;
$config['ui']['decore_lines'] = true;
$config['ui']['rounded_corners'] = false;
$config['colors']['primary'] = '#0a6071';
$config['colors']['secondary'] = '#214852';
Expand Down
6 changes: 6 additions & 0 deletions lib/configsetup.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -1240,6 +1240,12 @@
'placeholder' => $defaultConfig['background']['chroma'],
'value' => htmlentities($config['background']['chroma']),
],
'ui_decore_lines' => [
'view' => 'expert',
'type' => 'checkbox',
'name' => 'ui[decore_lines]',
'value' => $config['ui']['decore_lines'],
],
'ui_rounded_corners' => [
'view' => 'expert',
'type' => 'checkbox',
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@
"manual:userinterface:background_chroma": "CSS Style for background on chromakeying page.",
"manual:userinterface:background_defaults": "CSS Style for background on start-, login- and slideshow pages.",
"manual:userinterface:button_show_fs": "If enabled, a button to toggle fullscreenmode will be added to the start screen.",
"manual:userinterface:ui_decore_lines": "If enabled, decorate lines will be visible on start page.",
"manual:userinterface:ui_font_size": "Enter the default font size used for the Photobooth interface.",
"manual:userinterface:ui_rounded_corners": "If enabled, the Photobooth UI uses smooth rounded edges.",
"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.",
Expand Down Expand Up @@ -441,6 +442,7 @@
"userinterface:colors_primary": "Primary color",
"userinterface:colors_secondary": "Secondary color",
"userinterface:colors_start_font": "Start screen font color",
"userinterface:ui_decore_lines": "Show decorate lines",
"userinterface:ui_font_size": "Default font size",
"userinterface:ui_rounded_corners": "Rounded corners",
"userinterface:ui_style": "Styling",
Expand Down
8 changes: 8 additions & 0 deletions template/classic.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
<div class="startInner">
<?php if ($config['event']['enabled']): ?>
<div class="names">
<?php if ($config['ui']['decore_lines']): ?>
<hr class="small" />
<hr>
<?php endif; ?>
<div>
<h1><?=$config['event']['textLeft']?>
<i class="fa <?=$config['event']['symbol']?>" aria-hidden="true"></i>
Expand All @@ -18,19 +20,25 @@
</h1>
<h2><?=$config['start_screen']['subtitle']?></h2>
</div>
<?php if ($config['ui']['decore_lines']): ?>
<hr>
<hr class="small" />
<?php endif; ?>
</div>
<?php else: ?>
<div class="names">
<hr class="small" />
<?php if ($config['ui']['decore_lines']): ?>
<hr>
<?php endif; ?>
<div>
<h1><?=$config['start_screen']['title']?></h1>
<h2><?=$config['start_screen']['subtitle']?></h2>
</div>
<?php if ($config['ui']['decore_lines']): ?>
<hr>
<hr class="small" />
<?php endif; ?>
</div>
<?php endif; ?>

Expand Down
14 changes: 8 additions & 6 deletions template/modern.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
<div class="divinnen2">
<?php if ($config['event']['enabled']): ?>
<div class="names">
<?php if ($config['ui']['decore_lines']): ?>
<hr class="small" />
<hr>
<?php endif; ?>
<div>
<h1>
<?=$config['event']['textLeft']?>
Expand All @@ -18,25 +20,25 @@
</h1>
<h2><?=$config['start_screen']['subtitle']?></h2>
</div>

<?php if ($config['ui']['decore_lines']): ?>
<hr>
<hr class="small" />

<?php endif; ?>
</div>
<?php else: ?>
<div class="names">

<?php if ($config['ui']['decore_lines']): ?>
<hr class="small" />
<hr>

<?php endif; ?>
<div>
<h1><?=$config['start_screen']['title']?></h1>
<h2><?=$config['start_screen']['subtitle']?></h2>
</div>

<?php if ($config['ui']['decore_lines']): ?>
<hr>
<hr class="small" />

<?php endif; ?>
</div>
<?php endif; ?>

Expand Down

0 comments on commit 500b7be

Please sign in to comment.