WIP: Make classic rounded a own theme

Change-Id: I6a12c936f2fdea4d0571778fa5e9fb7a0fbc3587
andi34 · Jun 21, 2022 · 9b2a07e · 9b2a07e
1 parent d05a18a
commit 9b2a07e
Show file tree

Hide file tree

Showing 37 changed files with 249 additions and 170 deletions.
diff --git a/admin/diskusage.php b/admin/diskusage.php
@@ -43,16 +43,13 @@
 	<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="../resources/css/login.css" />
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" href="../resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("../private/overrides.css")): ?>
 	<link rel="stylesheet" href="../private/overrides.css" />
 	<?php endif; ?>
 </head>
 
 <body class="loginbody">
-	<div class="login-panel">
+	<div class="login-panel shape--<?php echo $config['ui']['style']; ?>">
 		<h2><?=$config['ui']['branding']?> <span data-i18n="disk_usage"></span></h2>
 		<a class="btn btn--tiny btn--flex back-to-admin" href="./"><i class="fa fa-arrow-left"></i></a>
 		<button class="download-zip-btn btn btn--tiny btn--flex">

diff --git a/admin/index.php b/admin/index.php
@@ -34,9 +34,9 @@
         <link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
         <link rel="stylesheet" type="text/css" href="../node_modules/selectize/dist/css/selectize.css">
         <link rel="stylesheet" type="text/css" href="../resources/css/<?php echo $config['ui']['style']; ?>_admin.css">
-	<?php if (is_file("../private/overrides.css")): ?>
-	<link rel="stylesheet" href="../private/overrides.css" />
-	<?php endif; ?>
+        <?php if (is_file("../private/overrides.css")): ?>
+        <link rel="stylesheet" href="../private/overrides.css" />
+        <?php endif; ?>
 </head>
 <body>
 <!-- NavBar content -->

diff --git a/chromakeying.php b/chromakeying.php
@@ -47,9 +47,6 @@
 		<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
 		<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
 		<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_chromakeying.css" />
-		<?php if ($config['ui']['rounded_corners']): ?>
-		<link rel="stylesheet" href="resources/css/rounded.css" />
-		<?php endif; ?>
 		<?php if (is_file("private/overrides.css")): ?>
 		<link rel="stylesheet" href="private/overrides.css" />
 		<?php endif; ?>

diff --git a/dependencies.php b/dependencies.php
@@ -43,9 +43,6 @@
 	<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_style.css" />
 	<link rel="stylesheet" href="resources/css/update.css" />
-	<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>

diff --git a/gallery.php b/gallery.php
@@ -52,9 +52,6 @@
 	<?php if ($config['gallery']['bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 	<?php endif; ?>
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>

diff --git a/index.php b/index.php
@@ -73,9 +73,6 @@
 	<?php if ($config['gallery']['bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 	<?php endif; ?>
-	<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>

diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
@@ -1840,6 +1840,7 @@
             'placeholder' => $defaultConfig['ui']['style'],
             'options' => [
                 'classic' => 'classic',
+                'classic_rounded' => 'classic_rounded',
                 'modern' => 'modern',
                 'modern_squared' => 'squared',
                 'custom' => 'custom',
@@ -1853,6 +1854,7 @@
             'placeholder' => $defaultConfig['ui']['button'],
             'options' => [
                 'classic' => 'classic',
+                'classic_rounded' => 'classic_rounded',
                 'modern' => 'modern',
                 'modern_squared' => 'squared',
                 'custom' => 'custom',
@@ -1938,12 +1940,6 @@
             'name' => 'ui[decore_lines]',
             'value' => $config['ui']['decore_lines'],
         ],
-        'ui_rounded_corners' => [
-            'view' => 'expert',
-            'type' => 'checkbox',
-            'name' => 'ui[rounded_corners]',
-            'value' => $config['ui']['rounded_corners'],
-        ],
         'colors_primary' => [
             'view' => 'expert',
             'type' => 'color',

diff --git a/livechroma.php b/livechroma.php
@@ -52,9 +52,6 @@
 		<?php if ($config['gallery']['bottom_bar']): ?>
 		<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 		<?php endif; ?>
-		<?php if ($config['ui']['rounded_corners']): ?>
-		<link rel="stylesheet" href="resources/css/rounded.css" />
-		<?php endif; ?>
 		<?php if (is_file("private/overrides.css")): ?>
 		<link rel="stylesheet" href="private/overrides.css" />
 		<?php endif; ?>

diff --git a/login/index.php b/login/index.php
@@ -19,7 +19,7 @@
 }
 // END LOGIN
 
-
+$btnClass = 'btn btn--login shape--' . $config['ui']['button'];
 ?>
 <!DOCTYPE html>
 <html>
@@ -46,16 +46,13 @@
 	<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="../resources/css/login.css" />
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" href="../resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("../private/overrides.css")): ?>
 	<link rel="stylesheet" href="../private/overrides.css" />
 	<?php endif; ?>
 </head>
 
 <body class="loginbody">
-	<div class="login-panel">
+	<div class="login-panel shape--<?php echo $config['ui']['style']; ?>">
 		<h2><?=$config['ui']['branding']?> Login</h2>
 		<hr>
 		<?php if($config['login']['enabled'] && !(isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
@@ -74,28 +71,28 @@
 		<hr>
 		<?php endif; ?>
 		<?php if(!$config['protect']['admin'] || (!$config['protect']['localhost_admin'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../admin" class="btn btn--login"><i class="fa fa-cog"></i> <span data-i18n="admin_panel"></span></a></p>
-		<p><a href="../dependencies.php" class="btn btn--login"><i class="fa fa-list-ul"></i> <span data-i18n="dependencies_check"></span></a></p>
+		<p><a href="../admin" class="<?php echo $btnClass; ?>"><i class="fa fa-cog"></i> <span data-i18n="admin_panel"></span></a></p>
+		<p><a href="../dependencies.php" class="<?php echo $btnClass; ?>"><i class="fa fa-list-ul"></i> <span data-i18n="dependencies_check"></span></a></p>
 		<?php endif; ?>
 		<?php if(!$config['protect']['update'] || (!$config['protect']['localhost_update'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../update.php" class="btn btn--login"><i class="fa fa-tasks"></i> <span data-i18n="updater"></span></a></p>
+		<p><a href="../update.php" class="<?php echo $btnClass; ?>"><i class="fa fa-tasks"></i> <span data-i18n="updater"></span></a></p>
 		<?php endif; ?>
-		<p><a href="../gallery.php" class="btn btn--login"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a></p>
-		<p><a href="../slideshow" class="btn btn--login"><i class="fa fa-play"></i> <span data-i18n="slideshow"></span></a></p>
+		<p><a href="../gallery.php" class="<?php echo $btnClass; ?>"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a></p>
+		<p><a href="../slideshow" class="<?php echo $btnClass; ?>"><i class="fa fa-play"></i> <span data-i18n="slideshow"></span></a></p>
 		<?php if(!$config['protect']['index'] || (!$config['protect']['localhost_index'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../livechroma.php" class="btn btn--login"><i class="fa fa-paint-brush"></i> <span data-i18n="livechroma"></span></a></p>
+		<p><a href="../livechroma.php" class="<?php echo $btnClass; ?>"><i class="fa fa-paint-brush"></i> <span data-i18n="livechroma"></span></a></p>
 		<?php endif; ?>
 		<?php if(!$config['protect']['manual'] || (!$config['protect']['localhost_manual'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<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>
-		<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>
-		<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>
+		<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>
+		<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>
+		<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>
 		<?php endif; ?>
-		<p><a href="./" class="btn btn--login"><i class="fa fa-refresh"></i> <span data-i18n="reload"></span></a></p>
+		<p><a href="./" class="<?php echo $btnClass; ?>"><i class="fa fa-refresh"></i> <span data-i18n="reload"></span></a></p>
 		<?php if(!$config['protect']['index'] || (!$config['protect']['localhost_index'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../" class="btn btn--login" ><i class="fa fa-times"></i> <span data-i18n="close"></span></a></p>
+		<p><a href="../" class="<?php echo $btnClass; ?>" ><i class="fa fa-times"></i> <span data-i18n="close"></span></a></p>
 		<?php endif; ?>
 		<?php if(isset($_SESSION['auth']) && $_SESSION['auth'] === true): ?>
-		<p><a href="logout.php" class="btn btn--login"><i class="fa fa-sign-out"></i> <span data-i18n="logout"></span></a></p>
+		<p><a href="logout.php" class="<?php echo $btnClass; ?>"><i class="fa fa-sign-out"></i> <span data-i18n="logout"></span></a></p>
 		<?php endif; ?>
 	</div>
 

diff --git a/manual/index.php b/manual/index.php
@@ -36,15 +36,12 @@
 	<link rel="stylesheet" type="text/css" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" type="text/css" href="../resources/css/manual.css" />
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" type="text/css" href="../resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("../private/overrides.css")): ?>
 	<link rel="stylesheet" href="../private/overrides.css" />
 	<?php endif; ?>
 </head>
 <body class="manualwrapper">
-	<div class="manual-panel">
+	<div class="manual-panel shape--<?php echo $config['ui']['style']; ?>">
 		<h2><?=$config['ui']['branding']?> Manual</h2>
 		<h3><a class="back-to-pb" href="../">Photobooth</a></h3>
 
@@ -61,7 +58,7 @@
 						if($i == 0){
 							$open = ' open init';
 						}
-						echo '<div class="panel'.$open.'"';
+						echo '<div class="panel'.$open. ' shape--'.$config['ui']['style'].'"';
 						switch ($fields['view'])
 						{
 							case 'expert':

diff --git a/resources/lang/.i18n-editor-metadata b/resources/lang/.i18n-editor-metadata
@@ -1,7 +1,7 @@
-flatten_json=0
-minify_resources=0
 preserve_comments=0
+minify_resources=0
 resource_definition={LOCALE}
 resource_structure=Flat
-resource_type=JSON
 use_single_quotes=0
+resource_type=JSON
+flatten_json=0
diff --git a/resources/lang/de.json b/resources/lang/de.json
@@ -449,7 +449,6 @@
   "manual:userinterface:ui_decore_lines": "Wenn aktiviert, werden Linien auf der Startseite angezeigt.",
   "manual:userinterface:ui_font_size": "Geben Sie die Standardschriftgröße für die Photobooth-Oberfläche ein.",
   "manual:userinterface:ui_result_buttons": "Wenn aktiviert, werden die Nachbearbeitungs-Schaltflächen auf dem Ergebnisbildschirm sichtbar. Wenn deaktiviert, wird die gesamte Schaltflächenleiste ausgeblendet.",
-  "manual:userinterface:ui_rounded_corners": "Wenn diese Option aktiviert ist, verwendet die Photobooth-Benutzeroberfläche abgerundete Kanten.",
   "manual:userinterface:ui_shutter_animation": "Wenn aktiviert, wird während der Aufnahme eines Fotos eine Verschlussanimation angezeigt.",
   "manual:userinterface:ui_style": "Wählen Sie einen Startseitenstil. Um einen eigenen Startseitenstil zu verwenden, erstellen und verwenden Sie \"/template/custom.template.php\" und \"/resources/css/custom_style.css\", falls eine dieser Dateien nicht lesbar ist, wird auf den Standard-Startseitenstil zurückgegriffen.",
   "manual:version:check_version": "Dies prüft online über das Github Projektarchiv auf die neueste Photobooth-Version.",
@@ -638,7 +637,6 @@
   "userinterface:ui_decore_lines": "Dekorationslinien anzeigen",
   "userinterface:ui_font_size": "Standardschriftgröße",
   "userinterface:ui_result_buttons": "Schaltflächenleiste auf Ergebnisbildschirm anzeigen",
-  "userinterface:ui_rounded_corners": "Abgerundete Ecken",
   "userinterface:ui_shutter_animation": "Verschlussanimation",
   "userinterface:ui_style": "Stil",
   "using_latest_version": "Photobooth ist auf dem aktuellen Stand.",

diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -465,7 +465,6 @@
   "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_result_buttons": "If enabled, post-processing buttons will be visible on the on result screen. If disabled the whole button bar will be hidden.",
-  "manual:userinterface:ui_rounded_corners": "If enabled, the Photobooth UI uses smooth rounded edges.",
   "manual:userinterface:ui_shutter_animation": "If enabled, a shutter animation will be visible while taking a picture.",
   "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.",
   "manual:version:check_version": "This will check online against the Github repository for the latest Photobooth version.",
@@ -661,7 +660,6 @@
   "userinterface:ui_decore_lines": "Show decorate lines",
   "userinterface:ui_font_size": "Default font size",
   "userinterface:ui_result_buttons": "Show button bar on result screen",
-  "userinterface:ui_rounded_corners": "Rounded corners",
   "userinterface:ui_shutter_animation": "Shutter animation",
   "userinterface:ui_style": "Styling",
   "using_latest_version": "You are using the latest version of photobooth.",

diff --git a/resources/lang/es.json b/resources/lang/es.json
@@ -270,7 +270,6 @@
   "manual:userinterface:background_defaults": "Estilo CSS para fondo en páginas de inicio, inicio de sesión y presentación de diapositivas.",
   "manual:userinterface:button_show_fs": "Si está activado, se agregará un botón para alternar el modo de pantalla completa a la pantalla de inicio.",
   "manual:userinterface:ui_font_size": "Introduzca el tamaño de fuente predeterminado utilizado para la interfaz Photobooth.",
-  "manual:userinterface:ui_rounded_corners": "Si está habilitada, la interfaz de usuario de Photobooth utiliza bordes redondeados suaves.",
   "milliseconds": "milisegundos",
   "newCollage": "Un collage más",
   "newPhoto": "Una foto más",
@@ -380,6 +379,5 @@
   "userinterface:colors_secondary": "Color secundario",
   "userinterface:colors_start_font": "Color de fuente de la pantalla de inicio",
   "userinterface:ui_font_size": "Tamaño de fuente predeterminado",
-  "userinterface:ui_rounded_corners": "Esquinas redondeadas",
   "using_latest_version": "Estás utilizando la última versión de photobooth"
 }
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -451,7 +451,6 @@
   "manual:userinterface:ui_decore_lines": "Si activé, les lignes de décoration seront visibles sur la page de démarrage.",
   "manual:userinterface:ui_font_size": "Entrez la taille de police par défaut utilisée pour l'interface Photobooth.",
   "manual:userinterface:ui_result_buttons": "Si activé, les boutons de post-traitement seront visibles sur l'écran de résultat. Si désactivé, la barre de boutons entière sera masquée.",
-  "manual:userinterface:ui_rounded_corners": "Si activé, l'interface utilisateur du Photobooth utilise des bords arrondis lisses.",
   "manual:userinterface:ui_shutter_animation": "Si activé, une animation d'obturateur sera visible lors de la prise d'une photo.",
   "manual:userinterface:ui_style": "Choisissez un style de page de démarrage. Pour utiliser un style personnalisé, veuillez créer et utiliser \"/template/custom.template. hp\" et \"/resources/css/custom_style.css\", si l'un de ces fichiers n'est pas lisible, nous utiliserons le thème par défaut.",
   "manual:version:check_version": "Ceci vérifiera en ligne le répertoire GitHub pour la dernière version de Photobooth.",
@@ -642,7 +641,6 @@
   "userinterface:ui_decore_lines": "Afficher les lignes décoratives",
   "userinterface:ui_font_size": "Taille de police par défaut",
   "userinterface:ui_result_buttons": "Afficher la barre de boutons sur l'écran de résultat",
-  "userinterface:ui_rounded_corners": "Angles arrondis",
   "userinterface:ui_shutter_animation": "Animation d'obturation",
   "userinterface:ui_style": "Stylisation",
   "using_latest_version": "Vous utilisez la dernière version du Photobooth.",

diff --git a/resources/lang/it.json b/resources/lang/it.json
@@ -392,7 +392,6 @@
   "manual:userinterface:button_show_fs": "Se abilitata, verrà aggiunto alla schermata iniziale un pulsante per attivare o disattivare la modalità schermo intero.",
   "manual:userinterface:ui_decore_lines": "Se abilitata, le linee decorate saranno visibili alla pagina iniziale.",
   "manual:userinterface:ui_font_size": "Inserisci la dimensione predefinita del carattere usata per l'interfaccia Photobooth.",
-  "manual:userinterface:ui_rounded_corners": "Se abilitata, l'interfaccia utente di Photobooth utilizza bordi arrotondati lisci.",
   "manual:userinterface:ui_style": "Scegli uno stile di pagina iniziale. Per usare lo stile personalizzato, crea e usa \"/template/custom.template.php\" e \"/resources/css/custom_style.css\", se uno di questi file non è leggibile, sarà utilizzato il tema predefinito.",
   "milliseconds": "millisecondi",
   "newCollage": "Nuovo Collage",
@@ -518,7 +517,6 @@
   "userinterface:colors_start_font": "Colore carattere schermata iniziale",
   "userinterface:ui_decore_lines": "Mostra linee decorative",
   "userinterface:ui_font_size": "Grandezza carattere di default",
-  "userinterface:ui_rounded_corners": "Spigoli arrotondati",
   "userinterface:ui_style": "Stile",
   "using_latest_version": "Stai usando l'ultima versione di photobooth."
 }
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
@@ -282,6 +282,5 @@
   "userinterface:colors_secondary": "Kolor Dodatkowy",
   "userinterface:colors_start_font": "Kolor czcionki ekranu startowego",
   "userinterface:ui_font_size": "Domyślny rozmiar czcionki",
-  "userinterface:ui_rounded_corners": "Zaokrąglone narożniki",
   "using_latest_version": "Używasz najnowszej dostępnej wersji Fotobudki."
 }