forked from deblan/side_menu
add feature: order categories
This commit is contained in:
parent
77e27bcc1a
commit
64da45e676
|
@ -68,3 +68,21 @@
|
|||
.side-menu-toggler {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.side-menu-setting#categories-list ul {
|
||||
margin: 10px 4px 4px 0px;
|
||||
}
|
||||
|
||||
.side-menu-setting#categories-list li {
|
||||
padding: 5px 10px;
|
||||
border: 1px solid #ccc;
|
||||
max-width: 300px;
|
||||
margin: 2px 0;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.side-menu-setting.arrow {
|
||||
color: #ccc;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ use OC;
|
|||
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
|
||||
use OC\User\User;
|
||||
use OCA\SideMenu\Service\AppRepository;
|
||||
use OCA\SideMenu\Service\CategoryRepository;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\App;
|
||||
use OCP\IUserSession;
|
||||
|
@ -84,8 +85,12 @@ class Application extends App
|
|||
return new AppRepository();
|
||||
});
|
||||
|
||||
$container->registerService('CategoryRepository', function (ContainerInterface $c) {
|
||||
return new CategoryRepository();
|
||||
});
|
||||
|
||||
$container->registerService('ConfigProxy', function (ContainerInterface $c) {
|
||||
return new ConfigProxy($this->config);
|
||||
return new ConfigProxy();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -21,13 +21,11 @@ namespace OCA\SideMenu\Controller;
|
|||
use OC;
|
||||
use OC\App\AppStore\Fetcher\CategoryFetcher;
|
||||
use OC\URLGenerator;
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCA\SideMenu\Service\AppRepository;
|
||||
use OCA\SideMenu\Service\CategoryRepository;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\IConfig;
|
||||
use OCP\IL10N;
|
||||
use OCP\IRequest;
|
||||
use OCP\IUserSession;
|
||||
use OCP\L10N\IFactory;
|
||||
|
@ -39,11 +37,6 @@ class NavController extends Controller
|
|||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var IConfig
|
||||
*/
|
||||
protected $iConfig;
|
||||
|
||||
/**
|
||||
* @var AppRepository
|
||||
*/
|
||||
|
@ -67,20 +60,17 @@ class NavController extends Controller
|
|||
public function __construct(
|
||||
string $appName,
|
||||
IRequest $request,
|
||||
IConfig $iConfig,
|
||||
ConfigProxy $config,
|
||||
AppRepository $appRepository,
|
||||
CategoryFetcher $categoryFetcher,
|
||||
CategoryRepository $categoryRepository,
|
||||
URLGenerator $router,
|
||||
IL10N $trans,
|
||||
IFactory $l10nFactory
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->config = $config;
|
||||
$this->iConfig = $iConfig;
|
||||
$this->appRepository = $appRepository;
|
||||
$this->categoryFetcher = $categoryFetcher;
|
||||
$this->categoryRepository = $categoryRepository;
|
||||
$this->l10nFactory = $l10nFactory;
|
||||
$this->router = $router;
|
||||
}
|
||||
|
@ -94,14 +84,7 @@ class NavController extends Controller
|
|||
*/
|
||||
public function items()
|
||||
{
|
||||
$apps = $this->appRepository->getVisibleApps();
|
||||
$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
|
||||
$externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
|
||||
$hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
|
||||
$user = OC::$server[IUserSession::class]->getUser();
|
||||
$isForced = $this->config->getAppValueBool('force', '0');
|
||||
$appsCategories = [];
|
||||
$categoriesAppsCount = [];
|
||||
$items = [];
|
||||
|
||||
if (!$user) {
|
||||
|
@ -110,34 +93,19 @@ class NavController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
$categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
|
||||
|
||||
if (empty($categoriesLabels)) {
|
||||
$categoriesLabels = $this->categoryFetcher->get();
|
||||
|
||||
$this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
|
||||
}
|
||||
|
||||
$apps = $this->appRepository->getVisibleApps();
|
||||
$categoriesLabels = $this->categoryRepository->getOrderedCategories();
|
||||
$hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
|
||||
$isForced = $this->config->getAppValueBool('force', '0');
|
||||
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
|
||||
$userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
|
||||
$appsCategories = [];
|
||||
$categoriesAppsCount = [];
|
||||
|
||||
if (!$isForced && !empty($userTopMenuApps)) {
|
||||
$topMenuApps = $userTopMenuApps;
|
||||
}
|
||||
|
||||
foreach ($categoriesLabels as $k => $category) {
|
||||
$categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
|
||||
|
||||
unset($categoriesLabels[$k]);
|
||||
}
|
||||
|
||||
$categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
|
||||
|
||||
$items['other'] = [
|
||||
'name' => '',
|
||||
'apps' => [],
|
||||
];
|
||||
|
||||
foreach ($apps as $app) {
|
||||
if (in_array($app['id'], $topMenuApps)) {
|
||||
continue;
|
||||
|
@ -158,6 +126,7 @@ class NavController extends Controller
|
|||
if (!isset($items[$category])) {
|
||||
$items[$category] = [
|
||||
'name' => $categoriesLabels[$category] ?? $category,
|
||||
'categoryId' => $category,
|
||||
'apps' => [],
|
||||
];
|
||||
}
|
||||
|
@ -216,8 +185,16 @@ class NavController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
usort($items, function ($a, $b) {
|
||||
return ($a['name'] < $b['name']) ? -1 : 1;
|
||||
usort($items, function ($a, $b) use ($categoriesLabels) {
|
||||
foreach ($categoriesLabels as $key => $value) {
|
||||
if ($a['categoryId'] === $key) {
|
||||
return -1;
|
||||
} elseif ($b['categoryId'] === $key) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
|
||||
return new JSONResponse([
|
||||
|
|
101
lib/Service/CategoryRepository.php
Normal file
101
lib/Service/CategoryRepository.php
Normal file
|
@ -0,0 +1,101 @@
|
|||
<?php
|
||||
|
||||
namespace OCA\SideMenu\Service;
|
||||
|
||||
use OC\App\AppStore\Fetcher\CategoryFetcher;
|
||||
use OCP\IConfig;
|
||||
use OCP\L10N\IFactory;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
|
||||
/**
|
||||
* class CategoryRepository.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class CategoryRepository
|
||||
{
|
||||
/**
|
||||
* @var CategoryFetcher
|
||||
*/
|
||||
protected $categoryFetcher;
|
||||
|
||||
/**
|
||||
* @var IFactory
|
||||
*/
|
||||
protected $l10nFactory;
|
||||
|
||||
/**
|
||||
* @var ConfigProxy
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var IConfig
|
||||
*/
|
||||
protected $iConfig;
|
||||
|
||||
public function __construct(
|
||||
CategoryFetcher $categoryFetcher,
|
||||
ConfigProxy $config,
|
||||
IConfig $iConfig,
|
||||
IFactory $l10nFactory
|
||||
)
|
||||
{
|
||||
$this->categoryFetcher = $categoryFetcher;
|
||||
$this->l10nFactory = $l10nFactory;
|
||||
$this->config = $config;
|
||||
$this->iConfig = $iConfig;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves categories.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getOrderedCategories()
|
||||
{
|
||||
$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
|
||||
$type = $this->config->getAppValueArray('categories-order-type', 'default');
|
||||
$order = $this->config->getAppValueArray('categories-order', '[]');
|
||||
|
||||
$categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
|
||||
|
||||
if (empty($categoriesLabels)) {
|
||||
$categoriesLabels = $this->categoryFetcher->get();
|
||||
|
||||
$this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
|
||||
}
|
||||
|
||||
foreach ($categoriesLabels as $k => $category) {
|
||||
$categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
|
||||
|
||||
unset($categoriesLabels[$k]);
|
||||
}
|
||||
|
||||
$categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
|
||||
$categoriesLabels['other'] = '';
|
||||
|
||||
asort($categoriesLabels);
|
||||
|
||||
if ('custom' === $type || true) {
|
||||
$ordered = [];
|
||||
|
||||
foreach ($order as $id) {
|
||||
if (isset($categoriesLabels[$id])) {
|
||||
$ordered[$id] = $categoriesLabels[$id];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($categoriesLabels as $id => $value) {
|
||||
if (!isset($ordered[$id])) {
|
||||
$ordered[$id] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
$categoriesLabels = $ordered;
|
||||
}
|
||||
|
||||
return $categoriesLabels;
|
||||
}
|
||||
}
|
|
@ -20,6 +20,7 @@ namespace OCA\SideMenu\Settings;
|
|||
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCA\SideMenu\Service\AppRepository;
|
||||
use OCA\SideMenu\Service\CategoryRepository;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\IL10N;
|
||||
|
@ -48,12 +49,23 @@ class Admin implements ISettings
|
|||
*/
|
||||
private $appRepository;
|
||||
|
||||
public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, AppRepository $appRepository)
|
||||
{
|
||||
/**
|
||||
* @var CategoryRepository
|
||||
*/
|
||||
private $categoryRepository;
|
||||
|
||||
public function __construct(
|
||||
IL10N $l,
|
||||
ILogger $logger,
|
||||
ConfigProxy $config,
|
||||
AppRepository $appRepository,
|
||||
CategoryRepository $categoryRepository
|
||||
) {
|
||||
$this->l = $l;
|
||||
$this->logger = $logger;
|
||||
$this->config = $config;
|
||||
$this->appRepository = $appRepository;
|
||||
$this->categoryRepository = $categoryRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -92,7 +104,10 @@ class Admin implements ISettings
|
|||
'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
|
||||
'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
|
||||
'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
|
||||
'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
|
||||
'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
|
||||
'apps' => $this->appRepository->getVisibleApps(),
|
||||
'categories' => $this->categoryRepository->getOrderedCategories(),
|
||||
];
|
||||
|
||||
return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');
|
||||
|
|
16
src/admin.js
16
src/admin.js
|
@ -129,4 +129,20 @@ jQuery(document).ready(() => {
|
|||
|
||||
elementToggler(element)
|
||||
})
|
||||
|
||||
jQuery("#categories-list ul").sortable({
|
||||
forcePlaceholderSize: true,
|
||||
placeholder: 'placeholder',
|
||||
stop: function (event, ui) {
|
||||
let value = []
|
||||
|
||||
jQuery('#categories-list li').each(function() {
|
||||
value.push(jQuery(this).attr('data-id'))
|
||||
});
|
||||
|
||||
value = JSON.stringify(value)
|
||||
|
||||
jQuery('input[name="categories-order"]').val(value)
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
@ -67,3 +67,10 @@
|
|||
"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
|
||||
"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit der Anzeige <code> Großes Menü </ code>."
|
||||
"The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
|
||||
"Others": "Andere"
|
||||
"Categories": "Kategorien"
|
||||
"Customize sorting": "Sortierung anpassen"
|
||||
"Order by": "Sortieren nach"
|
||||
"Name": "Name"
|
||||
"Customed": "Kundenspezifisch"
|
||||
"Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
|
||||
|
|
|
@ -67,3 +67,10 @@
|
|||
"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu"
|
||||
"This feature is only compatible with the <code>big menu</code> display.": "Compatible avec l'affichage <code>Menu large</code>."
|
||||
"The logo is a link to the default app": "Le logo est un lien vers l'application par défaut"
|
||||
"Others": "Autres"
|
||||
"Categories": "Catégories"
|
||||
"Customize sorting": "Personnaliser le tri"
|
||||
"Order by": "Trier par"
|
||||
"Name": "Nom"
|
||||
"Customed": "Personnalisé"
|
||||
"Show and hide the list of categories": "Afficher et masquer la liste des catégories"
|
||||
|
|
|
@ -529,6 +529,61 @@ $choicesSizes = [
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="section">
|
||||
<h2>
|
||||
<?php p($l->t('Categories')); ?>
|
||||
</h2>
|
||||
<div>
|
||||
<label for="side-menu-top-menu-apps">
|
||||
<?php p($l->t('Order by')); ?>
|
||||
</label>
|
||||
|
||||
<?php
|
||||
$choices = [
|
||||
'Name' => 'default',
|
||||
'Customed' => 'custom',
|
||||
];
|
||||
?>
|
||||
|
||||
<select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting">
|
||||
<?php foreach ($choices as $label => $value): ?>
|
||||
<option value="<?php echo $value ?>" <?php if ($value === $_['category-order-type']): ?>selected<?php endif; ?>>
|
||||
<?php echo $l->t($label); ?>
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="side-menu-top-menu-apps">
|
||||
<?php p($l->t('Customize sorting')); ?>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<a class="side-menu-toggler" data-target="#categories-list" href="#_">
|
||||
🖱️ <?php p($l->t('Show and hide the list of categories')); ?>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<div class="side-menu-setting" data-name="categories" id="categories-list" style="display: none">
|
||||
<ul>
|
||||
<?php foreach ($_['categories'] as $key => $label): ?>
|
||||
<li data-id="<?php echo $key; ?>">
|
||||
<span class="arrow">
|
||||
⇅
|
||||
</span>
|
||||
|
||||
<?php echo $label ? $l->t($label) : $l->t('Others'); ?>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<input type="hidden" value='<?php echo json_encode(array_keys($_['categories'])) ?>' name="categories-order" class="side-menu-setting">
|
||||
</div>
|
||||
|
||||
<div class="section">
|
||||
<h2>
|
||||
<?php p($l->t('Tips')); ?>
|
||||
|
@ -574,14 +629,15 @@ $choicesSizes = [
|
|||
|
||||
<input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting">
|
||||
|
||||
</div>
|
||||
|
||||
<div class="section" id="more">
|
||||
<button id="side-menu-save" class="btn btn-info">
|
||||
<?php p($l->t('Save')); ?>
|
||||
</button>
|
||||
|
||||
<span id="side-menu-message" class="msg"></span>
|
||||
</div>
|
||||
|
||||
<div class="section" id="more">
|
||||
<a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
|
||||
<button class="btn btn-primary" >
|
||||
<?php p($l->t('Export the configuration')); ?>
|
||||
|
|
Loading…
Reference in a new issue