fix issue #4: add option to hide the logo

This commit is contained in:
Simon Vieille 2020-04-15 12:17:17 +02:00
parent f85b5de28d
commit 407073dd98
Signed by: deblan
GPG Key ID: 03383D15A1D31745
7 changed files with 63 additions and 19 deletions

View File

@ -36,7 +36,8 @@ Util::addHeader(
[
'href' => $stylesheet,
'rel' => 'stylesheet'
], ''
],
''
);
Util::addScript('side_menu', 'main');

View File

@ -19,6 +19,6 @@
return [
'routes' => [
['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
['name' => 'Css#stylesheet', 'url' => '/css/stylesheet.css', 'verb' => 'GET'],
],
];

View File

@ -19,7 +19,7 @@
namespace OCA\SideMenu\Controller;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Response;
use OCP\IConfig;
use OCP\IRequest;
@ -51,24 +51,18 @@ class CssController extends Controller
public function stylesheet()
{
$parameters = [
'--side-menu-background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
'--side-menu-current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
'--side-menu-text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
'--side-menu-opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
'vars' => [
'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
],
'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
];
$css = '';
$response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
$response->addHeader('Content-Type', 'text/css');
foreach ($parameters as $key => $value) {
if ($key === '--side-menu-opener') {
$value = sprintf("url('../img/%s.svg')", $value);
}
$css.= sprintf('%s: %s;', $key, $value);
}
$css = sprintf(':root { %s }', $css);
return new DataDownloadResponse($css, 'stylesheet', 'text/css');
return $response;
}
}

View File

@ -53,6 +53,7 @@ class Admin implements ISettings
'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),
'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'),
];
return new TemplateResponse('side_menu', 'settings/admin-form', $parameters, '');

View File

@ -20,6 +20,7 @@ const elements = [
'side-menu-current-app-background-color',
'side-menu-text-color',
'side-menu-opener',
'side-menu-display-logo',
'side-menu-cache',
];

View File

@ -0,0 +1,24 @@
:root {
<?php foreach ($_['vars'] as $key => $value): ?>
<?php if ($key === 'opener'): ?>
--side-menu-<?php echo $key ?>: url('../img/<?php echo $value ?>.svg');
<?php else: ?>
--side-menu-<?php echo $key ?>: <?php echo $value ?>;
<?php endif; ?>
<?php endforeach; ?>
}
<?php if ($_['display-logo'] === false): ?>
.side-menu-logo {
display: none;
}
.side-menu-header {
height: 50px;
}
.side-menu-apps-list {
height: calc(100vh - 60px);
top: 60px;
}
<?php endif; ?>

View File

@ -86,6 +86,29 @@ style('side_menu', 'admin');
</select>
</div>
<div>
<label for="side-menu-opener" class="settings-hint">
<?php p($l->t('Display the logo')); ?>
</label>
</div>
<?php
$choices = [
'yes' => '1',
'No' => '0',
];
?>
<div>
<select id="side-menu-display-logo" name="display-logo">
<?php foreach ($choices as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
<?php echo $l->t($label); ?>
</option>
<?php endforeach; ?>
</select>
</div>
<input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
<button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>