Merge branch 'refs/heads/develop' into dev-sekretaerbaer.de

Show page-specific title before site name

src/App/Page.php

@@ -201,8 +201,8 @@ class Page implements ArrayAccess
 			$this->page['title'] = $l10n->t(ucfirst($args->getModuleName()));
 		}
 
-		// Prepend the sitename to the page title
-		$this->page['title'] = $config->get('config', 'sitename', '') . (!empty($this->page['title']) ? ' | ' . $this->page['title'] : '');
+		// Append the sitename to the page title
+		$this->page['title'] = (!empty($this->page['title']) ? $this->page['title'] . ' | ' : '') . $config->get('config', 'sitename', '');
 
 		if (!empty(Renderer::$theme['stylesheet'])) {
 			$stylesheet = Renderer::$theme['stylesheet'];

view/theme/frio/css/style.css

@@ -2460,7 +2460,7 @@ input[type="range"].form-control {
 
 .form-group-search .form-button-search {
 	position: absolute;
-	top: 4px;
+	top: 2px;
 	right: 4px;
 	border-radius: 30px;
 }

view/theme/frio/scheme/bookface_auto.php

@@ -0,0 +1,35 @@
+ <?php
+/*
+ * Copyright (C) 2010-2025, the Friendica project
+ * SPDX-FileCopyrightText: 2010-2025 the Friendica project
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ *
+ * Name: Bookface Auto Color Mode
+ * Licence: AGPL
+ * Author: Pygoscelis Papua @randompenguin@friendica.world feb @feb@loma.ml Phil @phil@loma.ml
+ * Overwrites: nav_bg, nav_icon_color, background_color, background_image, contentbg_transp
+ * Accented: Yes
+ * Version: 1.7
+ */
+// if there is no cookie create one
+use Friendica\DI;
+require_once 'view/theme/frio/php/PHPColors/Color.php';
+
+$accentColor = new Color($scheme_accent);
+$customColor = DI::pConfig()->get($uid, 'frio', 'link_color') ?: '';
+if ($customColor){
+	$customColor = new Color(''.$customColor.'');
+}
+$menu_background_hover_color = 'rgba(128,128,128,.1)';
+$nav_bg = '#ffffff';
+$background_color = '#f2f4f7';
+$link_color = ($customColor) ? '#'.$customColor->getHex() : '#'.$accentColor->getHex();
+	// override ugly blue accent color and prevent setting accent to nav or bg color
+	if ( $link_color == "#1e87c2" || $link_color == $nav_bg || $link_color == $background_color ){
+		 $link_color = "#0066ff";
+	}
+$nav_icon_color = '#65686C';
+$font_color = '#313131';
+$font_color_darker = '#333';
+$contentbg_transp = '0';

view/theme/frio/scheme/bookface_dark.php

@@ -0,0 +1,37 @@
+ <?php
+/*
+ * Copyright (C) 2010-2025, the Friendica project
+ * SPDX-FileCopyrightText: 2010-2025 the Friendica project
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ *
+ * Name: Bookface Dark
+ * Licence: AGPL
+ * Author: Pygoscelis Papua @randompenguin@friendica.world feb @feb@loma.ml Phil @phil@loma.ml
+ * Overwrites: nav_bg, nav_icon_color, background_color, background_image, contentbg_transp
+ * Accented: yes
+ * Version: 1.7
+ */
+use Friendica\DI;
+require_once 'view/theme/frio/php/PHPColors/Color.php';
+
+$accentColor = new Color($scheme_accent);
+$customColor = DI::pConfig()->get($uid, 'frio', 'link_color') ?: '';
+if ($customColor){
+	$customColor = new Color(''.$customColor.'');
+}
+//$customColor = ($customColor) ?: new Color(''.$customColor.'');
+
+$menu_background_hover_color = ($customColor) ? '#'.$customColor->darken(20) : '#'.$accentColor->darken(20);
+$nav_bg = '#252728';
+$background_color = '#1C1C1D';
+$link_color = ($customColor) ? '#'.$customColor->getHex() : '#'.$accentColor->lighten(10);
+	// override ugly blue accent color and prevent setting accent to nav or bg color
+	if ( $link_color == "#33a2e0" || $link_color == $nav_bg || $link_color == $background_color ){
+		 $link_color = "#0066ff";
+	}
+$nav_icon_color = '#B0B3B8';
+$font_color = '#cccccc';
+$font_color_darker = '#acacac';
+$font_color_lighter = '#444444';
+$contentbg_transp = '0';

view/theme/frio/scheme/bookface_light.php

@@ -0,0 +1,35 @@
+ <?php
+/*
+ * Copyright (C) 2010-2025, the Friendica project
+ * SPDX-FileCopyrightText: 2010-2025 the Friendica project
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ *
+ * Name: Bookface Light
+ * Licence: AGPL
+ * Author: Pygoscelis Papua @randompenguin@friendica.world feb @feb@loma.ml Phil @phil@loma.ml
+ * Overwrites: nav_bg, nav_icon_color, background_color, background_image, contentbg_transp
+ * Accented: yes
+ * Version: 1.7
+ */
+use Friendica\DI;
+require_once 'view/theme/frio/php/PHPColors/Color.php';
+
+$accentColor = new Color($scheme_accent);
+$customColor = DI::pConfig()->get($uid, 'frio', 'link_color') ?: '';
+if ($customColor){
+	$customColor = new Color(''.$customColor.'');
+}
+$menu_background_hover_color = ($customColor) ? '#'.$customColor->lighten(45) : '#'.$accentColor->lighten(45);
+$nav_bg = '#ffffff';
+$background_color = '#f2f4f7';
+$link_color = ($customColor) ? '#'.$customColor->getHex() : '#'.$accentColor->lighten(10);
+	// override ugly blue accent color and prevent setting accent to nav or bg color
+	if ( $link_color == "#33a2e0" || $link_color == $nav_bg || $link_color == $background_color ){
+		 $link_color = "#0066ff";
+	}
+$nav_icon_color = '#65686C';
+$font_color = '#313131';
+$font_color_darker = '#333';
+$contentbg_transp = 100;
+