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

Commit b4bbf50

Browse files
andi34andi34
committed
WIP: Make classic rounded a own theme
Change-Id: I6a12c936f2fdea4d0571778fa5e9fb7a0fbc3587
1 parent d05a18a commit b4bbf50

39 files changed

+296
-178
lines changed

‎admin/diskusage.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@
4343
<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
4444
<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
4545
<link rel="stylesheet" href="../resources/css/login.css" />
46-
<?php if ($config['ui']['rounded_corners']): ?>
47-
<link rel="stylesheet" href="../resources/css/rounded.css" />
48-
<?php endif; ?>
4946
<?php if (is_file("../private/overrides.css")): ?>
5047
<link rel="stylesheet" href="../private/overrides.css" />
5148
<?php endif; ?>
5249
</head>
5350

5451
<body class="loginbody">
55-
<div class="login-panel">
52+
<div class="login-panel shape--<?php echo $config['ui']['style']; ?>">
5653
<h2><?=$config['ui']['branding']?> <span data-i18n="disk_usage"></span></h2>
5754
<a class="btn btn--tiny btn--flex back-to-admin" href="./"><i class="fa fa-arrow-left"></i></a>
5855
<button class="download-zip-btn btn btn--tiny btn--flex">

‎admin/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
3535
<link rel="stylesheet" type="text/css" href="../node_modules/selectize/dist/css/selectize.css">
3636
<link rel="stylesheet" type="text/css" href="../resources/css/<?php echo $config['ui']['style']; ?>_admin.css">
37-
<?php if (is_file("../private/overrides.css")): ?>
38-
<link rel="stylesheet" href="../private/overrides.css" />
39-
<?php endif; ?>
37+
<?php if (is_file("../private/overrides.css")): ?>
38+
<link rel="stylesheet" href="../private/overrides.css" />
39+
<?php endif; ?>
4040
</head>
4141
<body>
4242
<!-- NavBar content -->

‎chromakeying.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
4848
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
4949
<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_chromakeying.css" />
50-
<?php if ($config['ui']['rounded_corners']): ?>
51-
<link rel="stylesheet" href="resources/css/rounded.css" />
52-
<?php endif; ?>
5350
<?php if (is_file("private/overrides.css")): ?>
5451
<link rel="stylesheet" href="private/overrides.css" />
5552
<?php endif; ?>

‎dependencies.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,14 @@
4343
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
4444
<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_style.css" />
4545
<link rel="stylesheet" href="resources/css/update.css" />
46-
<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
47-
<link rel="stylesheet" href="resources/css/rounded.css" />
48-
<?php endif; ?>
4946
<?php if (is_file("private/overrides.css")): ?>
5047
<link rel="stylesheet" href="private/overrides.css" />
5148
<?php endif; ?>
5249
</head>
5350

5451
<body class="updatewrapper">
5552

56-
<div class="white-box" id="white-box">
53+
<div class="white-box shape--<?php echo $config['ui']['style']; ?>" id="white-box">
5754
<h2><?=$config['ui']['branding']?> dependencies check</h2>
5855
<p><span data-i18n="os_check"></span></p>
5956
</div>

‎gallery.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
<?php if ($config['gallery']['bottom_bar']): ?>
5353
<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
5454
<?php endif; ?>
55-
<?php if ($config['ui']['rounded_corners']): ?>
56-
<link rel="stylesheet" href="resources/css/rounded.css" />
57-
<?php endif; ?>
5855
<?php if (is_file("private/overrides.css")): ?>
5956
<link rel="stylesheet" href="private/overrides.css" />
6057
<?php endif; ?>

‎index.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
<?php if ($config['gallery']['bottom_bar']): ?>
7474
<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
7575
<?php endif; ?>
76-
<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
77-
<link rel="stylesheet" href="resources/css/rounded.css" />
78-
<?php endif; ?>
7976
<?php if (is_file("private/overrides.css")): ?>
8077
<link rel="stylesheet" href="private/overrides.css" />
8178
<?php endif; ?>

‎lib/configsetup.inc.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,6 +1840,7 @@
18401840
'placeholder' => $defaultConfig['ui']['style'],
18411841
'options' => [
18421842
'classic' => 'classic',
1843+
'classic_rounded' => 'classic_rounded',
18431844
'modern' => 'modern',
18441845
'modern_squared' => 'squared',
18451846
'custom' => 'custom',
@@ -1853,6 +1854,7 @@
18531854
'placeholder' => $defaultConfig['ui']['button'],
18541855
'options' => [
18551856
'classic' => 'classic',
1857+
'classic_rounded' => 'classic_rounded',
18561858
'modern' => 'modern',
18571859
'modern_squared' => 'squared',
18581860
'custom' => 'custom',
@@ -1938,12 +1940,6 @@
19381940
'name' => 'ui[decore_lines]',
19391941
'value' => $config['ui']['decore_lines'],
19401942
],
1941-
'ui_rounded_corners' => [
1942-
'view' => 'expert',
1943-
'type' => 'checkbox',
1944-
'name' => 'ui[rounded_corners]',
1945-
'value' => $config['ui']['rounded_corners'],
1946-
],
19471943
'colors_primary' => [
19481944
'view' => 'expert',
19491945
'type' => 'color',

‎livechroma.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
<?php if ($config['gallery']['bottom_bar']): ?>
5353
<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
5454
<?php endif; ?>
55-
<?php if ($config['ui']['rounded_corners']): ?>
56-
<link rel="stylesheet" href="resources/css/rounded.css" />
57-
<?php endif; ?>
5855
<?php if (is_file("private/overrides.css")): ?>
5956
<link rel="stylesheet" href="private/overrides.css" />
6057
<?php endif; ?>

‎login/index.php‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
// END LOGIN
2121

22-
22+
$btnClass = 'btn btn--login shape--' . $config['ui']['button'];
2323
?>
2424
<!DOCTYPE html>
2525
<html>
@@ -46,16 +46,13 @@
4646
<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
4747
<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
4848
<link rel="stylesheet" href="../resources/css/login.css" />
49-
<?php if ($config['ui']['rounded_corners']): ?>
50-
<link rel="stylesheet" href="../resources/css/rounded.css" />
51-
<?php endif; ?>
5249
<?php if (is_file("../private/overrides.css")): ?>
5350
<link rel="stylesheet" href="../private/overrides.css" />
5451
<?php endif; ?>
5552
</head>
5653

5754
<body class="loginbody">
58-
<div class="login-panel">
55+
<div class="login-panel shape--<?php echo $config['ui']['style']; ?>">
5956
<h2><?=$config['ui']['branding']?> Login</h2>
6057
<hr>
6158
<?php if($config['login']['enabled'] && !(isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
@@ -74,28 +71,28 @@
7471
<hr>
7572
<?php endif; ?>
7673
<?php if(!$config['protect']['admin'] || (!$config['protect']['localhost_admin'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
77-
<p><a href="../admin" class="btn btn--login"><i class="fa fa-cog"></i> <span data-i18n="admin_panel"></span></a></p>
78-
<p><a href="../dependencies.php" class="btn btn--login"><i class="fa fa-list-ul"></i> <span data-i18n="dependencies_check"></span></a></p>
74+
<p><a href="../admin" class="<?php echo $btnClass; ?>"><i class="fa fa-cog"></i> <span data-i18n="admin_panel"></span></a></p>
75+
<p><a href="../dependencies.php" class="<?php echo $btnClass; ?>"><i class="fa fa-list-ul"></i> <span data-i18n="dependencies_check"></span></a></p>
7976
<?php endif; ?>
8077
<?php if(!$config['protect']['update'] || (!$config['protect']['localhost_update'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
81-
<p><a href="../update.php" class="btn btn--login"><i class="fa fa-tasks"></i> <span data-i18n="updater"></span></a></p>
78+
<p><a href="../update.php" class="<?php echo $btnClass; ?>"><i class="fa fa-tasks"></i> <span data-i18n="updater"></span></a></p>
8279
<?php endif; ?>
83-
<p><a href="../gallery.php" class="btn btn--login"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a></p>
84-
<p><a href="../slideshow" class="btn btn--login"><i class="fa fa-play"></i> <span data-i18n="slideshow"></span></a></p>
80+
<p><a href="../gallery.php" class="<?php echo $btnClass; ?>"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a></p>
81+
<p><a href="../slideshow" class="<?php echo $btnClass; ?>"><i class="fa fa-play"></i> <span data-i18n="slideshow"></span></a></p>
8582
<?php if(!$config['protect']['index'] || (!$config['protect']['localhost_index'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
86-
<p><a href="../livechroma.php" class="btn btn--login"><i class="fa fa-paint-brush"></i> <span data-i18n="livechroma"></span></a></p>
83+
<p><a href="../livechroma.php" class="<?php echo $btnClass; ?>"><i class="fa fa-paint-brush"></i> <span data-i18n="livechroma"></span></a></p>
8784
<?php endif; ?>
8885
<?php if(!$config['protect']['manual'] || (!$config['protect']['localhost_manual'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
89-
<p><a href="../manual/faq.php" class="btn btn--login" title="FAQ" target="newwin"><i class="fa fa-question-circle" aria-hidden="true"></i> <span data-i18n="show_faq"></span></a></p>
90-
<p><a href="../manual" class="btn btn--login" title="Manual" target="newwin"><i class="fa fa-info-circle" aria-hidden="true"></i> <span data-i18n="show_manual"></span></a></p>
91-
<p><a href="https://t.me/PhotoboothGroup" class="btn btn--login" title="Telegram" target="newwin"><i class="fa fa-telegram" aria-hidden="true"></i> <span data-i18n="telegram"></span></a></p>
86+
<p><a href="../manual/faq.php" class="<?php echo $btnClass; ?>" title="FAQ" target="newwin"><i class="fa fa-question-circle" aria-hidden="true"></i> <span data-i18n="show_faq"></span></a></p>
87+
<p><a href="../manual" class="<?php echo $btnClass; ?>" title="Manual" target="newwin"><i class="fa fa-info-circle" aria-hidden="true"></i> <span data-i18n="show_manual"></span></a></p>
88+
<p><a href="https://t.me/PhotoboothGroup" class="<?php echo $btnClass; ?>" title="Telegram" target="newwin"><i class="fa fa-telegram" aria-hidden="true"></i> <span data-i18n="telegram"></span></a></p>
9289
<?php endif; ?>
93-
<p><a href="./" class="btn btn--login"><i class="fa fa-refresh"></i> <span data-i18n="reload"></span></a></p>
90+
<p><a href="./" class="<?php echo $btnClass; ?>"><i class="fa fa-refresh"></i> <span data-i18n="reload"></span></a></p>
9491
<?php if(!$config['protect']['index'] || (!$config['protect']['localhost_index'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
95-
<p><a href="../" class="btn btn--login" ><i class="fa fa-times"></i> <span data-i18n="close"></span></a></p>
92+
<p><a href="../" class="<?php echo $btnClass; ?>" ><i class="fa fa-times"></i> <span data-i18n="close"></span></a></p>
9693
<?php endif; ?>
9794
<?php if(isset($_SESSION['auth']) && $_SESSION['auth'] === true): ?>
98-
<p><a href="logout.php" class="btn btn--login"><i class="fa fa-sign-out"></i> <span data-i18n="logout"></span></a></p>
95+
<p><a href="logout.php" class="<?php echo $btnClass; ?>"><i class="fa fa-sign-out"></i> <span data-i18n="logout"></span></a></p>
9996
<?php endif; ?>
10097
</div>
10198

‎manual/index.php‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,12 @@
3636
<link rel="stylesheet" type="text/css" href="../node_modules/normalize.css/normalize.css" />
3737
<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css" />
3838
<link rel="stylesheet" type="text/css" href="../resources/css/manual.css" />
39-
<?php if ($config['ui']['rounded_corners']): ?>
40-
<link rel="stylesheet" type="text/css" href="../resources/css/rounded.css" />
41-
<?php endif; ?>
4239
<?php if (is_file("../private/overrides.css")): ?>
4340
<link rel="stylesheet" href="../private/overrides.css" />
4441
<?php endif; ?>
4542
</head>
4643
<body class="manualwrapper">
47-
<div class="manual-panel">
44+
<div class="manual-panel shape--<?php echo $config['ui']['style']; ?>">
4845
<h2><?=$config['ui']['branding']?> Manual</h2>
4946
<h3><a class="back-to-pb" href="../">Photobooth</a></h3>
5047

@@ -61,7 +58,7 @@
6158
if($i == 0){
6259
$open = ' open init';
6360
}
64-
echo '<div class="panel'.$open.'"';
61+
echo '<div class="panel'.$open. ' shape--'.$config['ui']['style'].'"';
6562
switch ($fields['view'])
6663
{
6764
case 'expert':
@@ -76,10 +73,10 @@
7673
break;
7774
};
7875
echo '>';
79-
echo '<div class="panel-heading">';
76+
echo '<div class="panel-heading shape--'.$config['ui']['style'].'">';
8077
echo '<h3><span class="minus">-</span><span class="plus">+</span><span data-i18n="'.$panel.'">'.$panel.'</span></h3>';
8178
echo '</div>';
82-
echo '<div class="panel-body">';
79+
echo '<div class="panel-body shape--'.$config['ui']['style'].'">';
8380

8481
foreach($fields as $key => $field) {
8582
if ($key == 'platform' || $key == 'view') {

0 commit comments

Comments
 (0)
⚡