Overview
Comment:Update default colors in CSS, use admin_color1 and 2 even in install, if set
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA3-256: 2e065b30bb43ccd2daf51c57b14bd4fd8ee3adb9e44348fb70284e7773e13b80
User & Date: bohwaz on 2023-02-17 12:37:37
Other Links: branch diff | manifest | tags
Context
2023-02-17
12:38
Rename 'url' to 'author_url' in module/plugin.ini, add "open" button in extensions list, better handle errors in plugin.ini check-in: f95cf4f0aa user: bohwaz tags: dev
12:37
Update default colors in CSS, use admin_color1 and 2 even in install, if set check-in: 2e065b30bb user: bohwaz tags: dev
12:36
Fix install of modules and extensions check-in: b5af1e8c7e user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Template.php from [a293f28ead] to [1f5a88a96f].

91
92
93
94
95
96
97



98
99
100
101
102
103
104

		$session = null;

		if (!defined('Garradin\INSTALL_PROCESS')) {
			$session = Session::getInstance();
			$this->assign('config', Config::getInstance());
		}




		$is_logged = $session ? $session->isLogged() : null;

		$this->assign('session', $session);
		$this->assign('is_logged', $is_logged);
		$this->assign('logged_user', $is_logged ? $session->getUser() : null);








>
>
>







91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107

		$session = null;

		if (!defined('Garradin\INSTALL_PROCESS')) {
			$session = Session::getInstance();
			$this->assign('config', Config::getInstance());
		}
		else {
			$this->assign('config', null);
		}

		$is_logged = $session ? $session->isLogged() : null;

		$this->assign('session', $session);
		$this->assign('is_logged', $is_logged);
		$this->assign('logged_user', $is_logged ? $session->getUser() : null);

285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
		}

		return $n;
	}

	protected function customColors()
	{
		$config = Config::getInstance();

		$c1 = ADMIN_COLOR1;
		$c2 = ADMIN_COLOR2;
		$bg = ADMIN_BACKGROUND_IMAGE;

		if (!FORCE_CUSTOM_COLORS) {
			$c1 = $config->get('color1') ?: $c1;
			$c2 = $config->get('color2') ?: $c2;

			if ($url = $config->fileURL('admin_background')) {
				$bg = $url;
			}
		}

		$out = '
		<style type="text/css">
		:root {
			--gMainColor: %s;
			--gSecondColor: %s;
			--gBgImage: url("%s");
		}
		</style>';

		if ($url = $config->fileURL('admin_css')) {
			$out .= "\n" . sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $url);
		}

		return sprintf($out, CommonModifiers::css_hex_to_rgb($c1), CommonModifiers::css_hex_to_rgb($c2), $bg);
	}

	protected function displayDynamicField(array $params): string







|





|

















|







288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
		}

		return $n;
	}

	protected function customColors()
	{
		$config = defined('Garradin\INSTALL_PROCESS') ? null : Config::getInstance();

		$c1 = ADMIN_COLOR1;
		$c2 = ADMIN_COLOR2;
		$bg = ADMIN_BACKGROUND_IMAGE;

		if (!FORCE_CUSTOM_COLORS && $config) {
			$c1 = $config->get('color1') ?: $c1;
			$c2 = $config->get('color2') ?: $c2;

			if ($url = $config->fileURL('admin_background')) {
				$bg = $url;
			}
		}

		$out = '
		<style type="text/css">
		:root {
			--gMainColor: %s;
			--gSecondColor: %s;
			--gBgImage: url("%s");
		}
		</style>';

		if ($config && $url = $config->fileURL('admin_css')) {
			$out .= "\n" . sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $url);
		}

		return sprintf($out, CommonModifiers::css_hex_to_rgb($c1), CommonModifiers::css_hex_to_rgb($c2), $bg);
	}

	protected function displayDynamicField(array $params): string

Modified src/templates/_head.tpl from [634abc5df3] to [0fa72dd81e].

33
34
35
36
37
38
39
40
41

42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
		{/foreach}
	{/if}
	<link rel="stylesheet" type="text/css" href="{$admin_url}static/print.css?{$version_hash}" media="print" />
	<link rel="stylesheet" type="text/css" href="{$admin_url}static/handheld.css?{$version_hash}" media="handheld,screen and (max-width:981px)" />
	<link rel="manifest" href="{$admin_url}manifest.php" />
	{if isset($config)}
		<link rel="icon" type="image/png" href="{$config->fileURL('favicon')}" />
		{custom_colors config=$config}
	{/if}

</head>

<body{if !empty($layout)} class="{$layout}"{/if}>

{if !array_key_exists('_dialog', $_GET) && empty($layout)}
<header class="header">
	<nav class="menu">
		{if isset($config)}
		<figure class="logo">
		{if $url = $config->fileURL('logo', '150px')}
			<a href="{$admin_url}"><img src="{$url}" alt="" /></a>
		{/if}
		</figure>
		{/if}
	<ul>
	{if $is_logged}
	<?php
	$current_parent = substr($current, 0, strpos($current, '/'));
	?>
		<li class="home{if $current == 'home'} current{elseif $current_parent == 'home'} current_parent{/if}"><h3><a href="{$admin_url}">{icon shape="home"}<b>Accueil</b></a></h3>
			{if !empty($plugins_menu)}







<

>







<

|
|


<







33
34
35
36
37
38
39

40
41
42
43
44
45
46
47
48

49
50
51
52
53

54
55
56
57
58
59
60
		{/foreach}
	{/if}
	<link rel="stylesheet" type="text/css" href="{$admin_url}static/print.css?{$version_hash}" media="print" />
	<link rel="stylesheet" type="text/css" href="{$admin_url}static/handheld.css?{$version_hash}" media="handheld,screen and (max-width:981px)" />
	<link rel="manifest" href="{$admin_url}manifest.php" />
	{if isset($config)}
		<link rel="icon" type="image/png" href="{$config->fileURL('favicon')}" />

	{/if}
	{custom_colors config=$config}
</head>

<body{if !empty($layout)} class="{$layout}"{/if}>

{if !array_key_exists('_dialog', $_GET) && empty($layout)}
<header class="header">
	<nav class="menu">

		<figure class="logo">
		{if isset($config) && ($url = $config->fileURL('logo', '150px'))}
				<a href="{$admin_url}"><img src="{$url}" alt="" /></a>
		{/if}
		</figure>

	<ul>
	{if $is_logged}
	<?php
	$current_parent = substr($current, 0, strpos($current, '/'));
	?>
		<li class="home{if $current == 'home'} current{elseif $current_parent == 'home'} current_parent{/if}"><h3><a href="{$admin_url}">{icon shape="home"}<b>Accueil</b></a></h3>
			{if !empty($plugins_menu)}

Modified src/www/admin/static/styles/01-layout.css from [ffa6515ae2] to [03092ed7ba].

9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
    --gTextColor: 0, 0, 0;
    --gBorderColor: #666;
    --gLightBorderColor: #ccc;
    --gLightBackgroundColor: #eee;
    --gLinkColor: blue;
    --gHoverLinkColor: 127, 0, 0;

    --gMainColor: 156, 79, 21;
    --gSecondColor: 217, 134, 40;
    --gBgImage: url("../bg.png");
}

/* Dark colors */
html.dark {
    --gBgColor: 30, 30, 30;
    --gTextColor: 225, 225, 225;







|
|







9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
    --gTextColor: 0, 0, 0;
    --gBorderColor: #666;
    --gLightBorderColor: #ccc;
    --gLightBackgroundColor: #eee;
    --gLinkColor: blue;
    --gHoverLinkColor: 127, 0, 0;

    --gMainColor: 32, 120, 122;
    --gSecondColor: 133, 185, 186;
    --gBgImage: url("../bg.png");
}

/* Dark colors */
html.dark {
    --gBgColor: 30, 30, 30;
    --gTextColor: 225, 225, 225;