Compare commits
17 commits
Author | SHA1 | Date | |
---|---|---|---|
Simon Vieille | 7b33271d00 | ||
Simon Vieille | 012c660fed | ||
Simon Vieille | e4e054835d | ||
Simon Vieille | 9c5be63f16 | ||
Simon Vieille | eae8ce80fb | ||
Simon Vieille | 71f5dfef9a | ||
Simon Vieille | afa48c6239 | ||
Simon Vieille | a94a94b564 | ||
Simon Vieille | 3e7dcac307 | ||
Simon Vieille | 54b64cc54e | ||
Simon Vieille | 45d4e5f24c | ||
Simon Vieille | 972c69d880 | ||
Simon Vieille | 56904c5aa0 | ||
Simon Vieille | 32cd25b736 | ||
Simon Vieille | a9a3ba36c1 | ||
Simon Vieille | 2cecd0d6f4 | ||
Simon Vieille | 28085d9aa7 |
30
.gitea/issue_template/QUESTION_TEMPLATE.yml
Normal file
30
.gitea/issue_template/QUESTION_TEMPLATE.yml
Normal file
|
@ -0,0 +1,30 @@
|
|||
name: New question
|
||||
about: Use this template when you don't know how to do something
|
||||
title: "[Question] "
|
||||
labels:
|
||||
- question
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for taking the time to fill information.
|
||||
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: Environment
|
||||
value: |
|
||||
* Custom menu version:
|
||||
* Nextcloud version:
|
||||
* PHP version:
|
||||
* Web server (Nginx, Apache2):
|
||||
* Web browser and version (Firefox 80, Google Chrome 74, etc):
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: question
|
||||
attributes:
|
||||
label: Question
|
||||
validations:
|
||||
required: true
|
8
.gitea/issue_template/config.yml
Normal file
8
.gitea/issue_template/config.yml
Normal file
|
@ -0,0 +1,8 @@
|
|||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: Documentation
|
||||
url: https://deblan.gitnet.page/side_menu_doc/
|
||||
about: Official documentation web site
|
||||
- name: Ask a question in our Matrix room
|
||||
about: If you prefer a chat-like conversation or in need for quick help, this might be an alternative to opening an issue.
|
||||
url: https://matrix.to/#/#custommenu:neutralnetwork.org
|
103
.woodpecker.yml
103
.woodpecker.yml
|
@ -1,103 +0,0 @@
|
|||
steps:
|
||||
"Verify tag and app version":
|
||||
image: alpine
|
||||
commands:
|
||||
- TAG=${CI_COMMIT_TAG/v//}
|
||||
- grep "<version>$TAG</version>" appinfo/info.xml
|
||||
when:
|
||||
event: [tag]
|
||||
|
||||
"Install dependencies":
|
||||
image: node:16
|
||||
pull: true
|
||||
commands:
|
||||
- npm i
|
||||
when:
|
||||
event: [tag, push, pull_request, manual]
|
||||
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
|
||||
|
||||
"Check dependencies":
|
||||
image: gitnet.fr/deblan/osv-detector:v0.10
|
||||
commands:
|
||||
- osv-detector package-lock.json
|
||||
failure: ignore
|
||||
|
||||
"Build JS":
|
||||
image: node:16
|
||||
commands:
|
||||
- npm run build
|
||||
when:
|
||||
event: [tag, push, pull_request, manual]
|
||||
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
|
||||
|
||||
"Build translations":
|
||||
image: deblan/php:8.0
|
||||
commands:
|
||||
- php bin/generate_l10n.php
|
||||
when:
|
||||
event: [tag, push, pull_request, manual]
|
||||
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
|
||||
|
||||
"Create signature":
|
||||
image: nextcloud:25
|
||||
secrets: [app_certificate, app_public_certificate]
|
||||
environment:
|
||||
SQLITE_DATABASE: /var/www/data/data.db
|
||||
NEXTCLOUD_ADMIN_USER: admin
|
||||
NEXTCLOUD_ADMIN_PASSWORD: admin
|
||||
commands:
|
||||
- echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
|
||||
- echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
|
||||
- mkdir /tmp/app
|
||||
- cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
|
||||
- /usr/src/nextcloud/occ integrity:sign-app
|
||||
--privateKey=/tmp/side_menu.key
|
||||
--certificate=/tmp/side_menu.crt
|
||||
--path=/tmp/app
|
||||
- mv /tmp/app/appinfo/signature.json appinfo/
|
||||
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]
|
||||
|
||||
"Create package":
|
||||
image: deblan/php:8.0
|
||||
volumes:
|
||||
- /var/www/html/artifacts:/var/www/html/artifacts
|
||||
secrets: [app_certificate]
|
||||
commands:
|
||||
- apt-get update
|
||||
- apt-get install -y zip make
|
||||
- mkdir -p "$HOME/.nextcloud/certificates"
|
||||
- echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
|
||||
- export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
|
||||
- export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
|
||||
- make release
|
||||
when:
|
||||
event: [tag]
|
||||
|
||||
"Push release":
|
||||
image: plugins/gitea-release
|
||||
volumes:
|
||||
- /var/www/html/artifacts:/var/www/html/artifacts
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: gitnet_api_key
|
||||
base_url: https://gitnet.fr
|
||||
note: ${CI_COMMIT_MESSAGE}
|
||||
files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
|
||||
when:
|
||||
event: [tag]
|
28
.woodpecker/.build.yml
Normal file
28
.woodpecker/.build.yml
Normal file
|
@ -0,0 +1,28 @@
|
|||
variables:
|
||||
volumes: &volumes
|
||||
- /data/${CI_REPO}:/builds
|
||||
|
||||
when:
|
||||
event: [tag, push, pull_request, manual]
|
||||
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
|
||||
|
||||
steps:
|
||||
"Install dependencies":
|
||||
image: node:16
|
||||
pull: true
|
||||
commands:
|
||||
- npm i
|
||||
|
||||
"Build JS":
|
||||
image: node:16
|
||||
commands:
|
||||
- npm run build
|
||||
|
||||
"Build translations":
|
||||
image: deblan/php:8.3
|
||||
commands:
|
||||
- php bin/generate_l10n.php
|
||||
|
||||
"Build cache":
|
||||
image: gitnet.fr/deblan/woodpecker-cache
|
||||
volumes: *volumes
|
61
.woodpecker/.publish.yml
Normal file
61
.woodpecker/.publish.yml
Normal file
|
@ -0,0 +1,61 @@
|
|||
variables:
|
||||
volumes: &volumes
|
||||
- /data/${CI_REPO}:/builds
|
||||
- /var/www/html/artifacts:/var/www/html/artifacts
|
||||
|
||||
depends_on:
|
||||
- build
|
||||
|
||||
when:
|
||||
event: [tag]
|
||||
|
||||
steps:
|
||||
"Verify tag and app version":
|
||||
image: alpine
|
||||
commands:
|
||||
- TAG=${CI_COMMIT_TAG/v//}
|
||||
- grep "<version>$TAG</version>" appinfo/info.xml
|
||||
|
||||
"Create signature":
|
||||
image: nextcloud:25
|
||||
secrets: [app_certificate, app_public_certificate]
|
||||
volumes: *volumes
|
||||
environment:
|
||||
SQLITE_DATABASE: /var/www/data/data.db
|
||||
NEXTCLOUD_ADMIN_USER: admin
|
||||
NEXTCLOUD_ADMIN_PASSWORD: admin
|
||||
commands:
|
||||
- cd "/builds/$CI_COMMIT_SHA"
|
||||
- echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
|
||||
- echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
|
||||
- mkdir /tmp/app
|
||||
- cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
|
||||
- /usr/src/nextcloud/occ integrity:sign-app
|
||||
--privateKey=/tmp/side_menu.key
|
||||
--certificate=/tmp/side_menu.crt
|
||||
--path=/tmp/app
|
||||
- mv /tmp/app/appinfo/signature.json appinfo/
|
||||
|
||||
"Create package":
|
||||
image: deblan/php:8.3
|
||||
volumes: *volumes
|
||||
secrets: [app_certificate]
|
||||
commands:
|
||||
- cd "/builds/$CI_COMMIT_SHA"
|
||||
- apt-get update
|
||||
- apt-get install -y zip make
|
||||
- mkdir -p "$HOME/.nextcloud/certificates"
|
||||
- echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
|
||||
- export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
|
||||
- export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
|
||||
- make release
|
||||
|
||||
"Push release":
|
||||
image: plugins/gitea-release
|
||||
volumes: *volumes
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: gitnet_api_key
|
||||
base_url: https://gitnet.fr
|
||||
note: ${CI_COMMIT_MESSAGE}
|
||||
files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
|
17
.woodpecker/.security.yml
Normal file
17
.woodpecker/.security.yml
Normal file
|
@ -0,0 +1,17 @@
|
|||
variables:
|
||||
volumes: &volumes
|
||||
- /data/${CI_REPO}:/builds
|
||||
|
||||
depends_on:
|
||||
- build
|
||||
|
||||
skip_clone: true
|
||||
|
||||
steps:
|
||||
"Check dependencies":
|
||||
image: gitnet.fr/deblan/osv-detector:v0.10
|
||||
volumes: *volumes
|
||||
commands:
|
||||
- cd "/builds/$CI_COMMIT_SHA"
|
||||
- osv-detector package-lock.json
|
||||
failure: ignore
|
|
@ -1,5 +1,13 @@
|
|||
## [Unreleased]
|
||||
|
||||
## 3.12.0
|
||||
### Added
|
||||
* add compatibility with NC29
|
||||
|
||||
## 3.11.8
|
||||
### Fixed
|
||||
* move the logo inside #nextcloud element (fix #278 #239) [NC26]
|
||||
|
||||
## 3.11.7
|
||||
### Added
|
||||
* update translations
|
||||
|
|
|
@ -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.11.7</version>
|
||||
<version>3.11.8</version>
|
||||
<licence>agpl</licence>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||
<namespace>SideMenu</namespace>
|
||||
|
@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
|
|||
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
|
||||
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
|
||||
<dependencies>
|
||||
<nextcloud min-version="25" max-version="28"/>
|
||||
<nextcloud min-version="25" max-version="29"/>
|
||||
<php min-version="7.4"/>
|
||||
</dependencies>
|
||||
<settings>
|
||||
|
|
|
@ -42,13 +42,11 @@
|
|||
top: 49px;
|
||||
}
|
||||
|
||||
#side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer
|
||||
{
|
||||
#side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
#side-menu.hide-opener.side-menu-with-categories .side-menu-search
|
||||
{
|
||||
#side-menu.hide-opener.side-menu-with-categories .side-menu-search {
|
||||
float: none;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ if ($_['always-displayed']) {
|
|||
const body = document.querySelector('body')
|
||||
const html = document.querySelector('html')
|
||||
const nextcloud = document.querySelector('#nextcloud')
|
||||
const logo = document.querySelector('.header-left .logo')
|
||||
|
||||
const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
|
||||
|
||||
|
@ -170,6 +171,10 @@ if ($_['always-displayed']) {
|
|||
<?php endif; ?>
|
||||
|
||||
if (nextcloud) {
|
||||
if (logo && logo.parentNode !== nextcloud) {
|
||||
nextcloud.appendChild(logo)
|
||||
}
|
||||
|
||||
<?php if ($_['opener-position'] === 'before'): ?>
|
||||
nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
|
||||
<?php else: ?>
|
||||
|
|
Loading…
Reference in a new issue