Merge pull request 'release v3.8.0' (#255) from develop into master
Reviewed-on: #255
This commit is contained in:
commit
29f0ead9cc
|
|
@ -50,20 +50,20 @@ pipeline:
|
|||
when:
|
||||
event: [tag]
|
||||
|
||||
check-code-quality:
|
||||
image: sonarsource/sonar-scanner-cli
|
||||
secrets: [sonar_token, sonar_host, sonar_project]
|
||||
commands:
|
||||
- sonar-scanner
|
||||
-Dsonar.projectKey=$SONAR_PROJECT
|
||||
-Dsonar.sources=.
|
||||
-Dsonar.host.url=$SONAR_HOST
|
||||
-Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
|
||||
-Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
|
||||
-Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
|
||||
failure: ignore
|
||||
when:
|
||||
event: [pull_request]
|
||||
# check-code-quality:
|
||||
# image: sonarsource/sonar-scanner-cli
|
||||
# secrets: [sonar_token, sonar_host, sonar_project]
|
||||
# commands:
|
||||
# - sonar-scanner
|
||||
# -Dsonar.projectKey=$SONAR_PROJECT
|
||||
# -Dsonar.sources=.
|
||||
# -Dsonar.host.url=$SONAR_HOST
|
||||
# -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
|
||||
# -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
|
||||
# -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
|
||||
# failure: ignore
|
||||
# when:
|
||||
# event: [pull_request]
|
||||
|
||||
create-package:
|
||||
image: deblan/php:8.0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
## [Unreleased]
|
||||
|
||||
## 3.8.0
|
||||
### Added
|
||||
* add option to show hovered label only on top menu (fix #253)
|
||||
|
||||
## 3.7.4
|
||||
### Fixed
|
||||
* fix Integrity failed (#247)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ Notice
|
|||
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
|
||||
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
|
||||
]]></description>
|
||||
<version>3.7.4</version>
|
||||
<version>3.8.0</version>
|
||||
<licence>agpl</licence>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||
<namespace>SideMenu</namespace>
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ class JsController extends Controller
|
|||
'avatar' => $avatar,
|
||||
'top-menu-apps' => $topMenuApps,
|
||||
'top-side-menu-apps' => $topSideMenuApps,
|
||||
'top-menu-mouse-over-hidden-label' => $this->config->getAppValueBool(
|
||||
'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt(
|
||||
'top-menu-mouse-over-hidden-label',
|
||||
'0'
|
||||
),
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@
|
|||
<nav class="app-menu show">
|
||||
<ul
|
||||
class="app-menu-main"
|
||||
:class="{ 'app-menu-main__hidden-label': hiddenLabels }"
|
||||
:class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
|
||||
v-if="apps !== null"
|
||||
>
|
||||
<li v-for="app in mainAppList()"
|
||||
:key="app.id"
|
||||
:data-app-id="app.id"
|
||||
class="app-menu-entry"
|
||||
:class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels }"
|
||||
:class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
|
||||
:style="makeStyle(app)"
|
||||
>
|
||||
<a :href="app.href"
|
||||
|
|
@ -233,8 +233,8 @@ $header-icon-size: 20px;
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
&:not(.app-menu-entry__hidden-label):hover,
|
||||
&:not(.app-menu-entry__hidden-label):focus-within {
|
||||
&:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
|
||||
&:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
|
||||
opacity: 1;
|
||||
.app-menu-entry--label {
|
||||
opacity: 1;
|
||||
|
|
@ -245,7 +245,6 @@ $header-icon-size: 20px;
|
|||
overflow: visible;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Show labels
|
||||
|
|
@ -256,8 +255,8 @@ $header-icon-size: 20px;
|
|||
opacity: 1;
|
||||
}
|
||||
|
||||
&:not(.app-menu-main__hidden-label):hover,
|
||||
&:not(.app-menu-main__hidden-label):focus-within,
|
||||
&:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):hover,
|
||||
&:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
|
||||
.app-menu-entry:not(.app-menu-entry__hidden-label):hover,
|
||||
.app-menu-entry:not(.app-menu-entry__hidden-label):focus {
|
||||
img {
|
||||
|
|
@ -273,6 +272,22 @@ $header-icon-size: 20px;
|
|||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.app-menu-main__show-hovered .app-menu-entry:hover,
|
||||
&.app-menu-main__show-hovered .app-menu-entry:focus {
|
||||
img {
|
||||
margin-top: -6px;
|
||||
}
|
||||
|
||||
.app-menu-entry--label {
|
||||
opacity: 1;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
&::before, .app-menu-entry::before {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .app-menu-more .button-vue--vue-tertiary {
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
|
||||
"These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
|
||||
"Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
|
||||
"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
|
||||
"Hide labels on mouse over": "Hide labels on mouse over"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
|
||||
"These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
|
||||
"Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Applications conservées dans le menu supérieur mais également affichées dans le menu latéral"
|
||||
"These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente."
|
||||
"Hide labels on mouse over": "Masquer le libellé des applications au passage de la souris"
|
||||
"Except the hovered app": "À l'exception de l'application survolée"
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Applicaties blijven in het topmenu maar worden ook in het zijmenu getoond"
|
||||
"These applications must be selected in the previous option.": "Deze toepassingen moeten bij de vorige optie zijn geselecteerd."
|
||||
"Hide labels on mouse over": "Hide labels on mouse over"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
|
||||
"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
|
||||
"Hide labels on mouse over": "Скрыть название при наведении мыши"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
|
|
|
|||
|
|
@ -93,3 +93,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": ""
|
||||
"These applications must be selected in the previous option.": ""
|
||||
"Hide labels on mouse over": ""
|
||||
"Except the hovered app": ""
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@
|
|||
"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
|
||||
"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
|
||||
"Hide labels on mouse over": "Hide labels on mouse over"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
|
|
|
|||
|
|
@ -878,9 +878,15 @@ $labelAlwaysDisplayed = 'Always displayed';
|
|||
<div class="side-menu-setting-label">
|
||||
<?php p($l->t('Hide labels on mouse over')); ?>
|
||||
</div>
|
||||
<?php
|
||||
$choices = array_merge(
|
||||
$choicesYesNo,
|
||||
['Except the hovered app' => '2']
|
||||
);
|
||||
?>
|
||||
<div class="side-menu-setting-form">
|
||||
<select id="side-menu-top-menu-mouse-over-hidden-label" name="top-menu-mouse-over-hidden-label" class="side-menu-setting">
|
||||
<?php foreach ($choicesYesNo as $label => $value): ?>
|
||||
<?php foreach ($choices as $label => $value): ?>
|
||||
<option value="<?php echo $value ?>" <?php if ($value === $_['top-menu-mouse-over-hidden-label']): ?>selected<?php endif; ?>>
|
||||
<?php echo $l->t($label); ?>
|
||||
</option>
|
||||
|
|
|
|||
Loading…
Reference in a new issue