mirror of
https://github.com/YunoHost-Apps/lionwiki-t2t_ynh.git
synced 2024-09-03 19:36:27 +02:00
farvardin
GitHub
commit
0d2b4fd195
19 changed files with 571 additions and 404 deletions
57
README.md
57
README.md
|
|
@ -1,22 +1,30 @@
|
||||||
# Lionwiki-t2t for YunoHost
|
<!--
|
||||||
|
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
|
||||||
|
It shall NOT be edited by hand.
|
||||||
|
-->
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/lionwiki-t2t)  
|
# Lionwiki for YunoHost
|
||||||
[](https://install-app.yunohost.org/?app=lionwiki-t2t)
|
|
||||||
|
[](https://dash.yunohost.org/appci/app/lionwiki-t2t)  
|
||||||
|
[](https://install-app.yunohost.org/?app=lionwiki-t2t)
|
||||||
|
|
||||||
*[Lire ce readme en français.](./README_fr.md)*
|
*[Lire ce readme en français.](./README_fr.md)*
|
||||||
|
|
||||||
> *This package allow you to install Lionwiki-t2t quickly and simply on a YunoHost server.
|
> *This package allows you to install Lionwiki quickly and simply on a YunoHost server.
|
||||||
If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
|
If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
LionWiki-t2t is a minimalist Wiki engine programmed in PHP. It is extensible, templatable, file based (it doesn't need database like MySQL) and requires just one file to function (30 kb). It is suitable for small websites, personal notebooks or journals. This version is using the lightweight markup language TXT2TAGS.
|
LionWiki-t2t is a minimalist Wiki engine programmed in PHP. It is extensible, templatable, file based (it doesn't need database like MySQL) and requires just one file to function (30 kb). It is suitable for small websites, personal notebooks or journals. This version is using the lightweight markup language TXT2TAGS.
|
||||||
|
|
||||||
**Shipped version:** 3.2.12e
|
|
||||||
|
|
||||||
## Screenshot
|
**Shipped version:** 3.2.12~ynh2
|
||||||
|
|
||||||
|
## Screenshots
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Disclaimers / important information
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
|
|
@ -28,13 +36,6 @@ In the root folder of this app, there are two files: `config.php` and `config.t2
|
||||||
|
|
||||||
The `pheditor.php` tool at the root of the site allows you to edit all the necessary configuration files. You can remove or rename it from its interface. The password is the same as the one defined during installation.
|
The `pheditor.php` tool at the root of the site allows you to edit all the necessary configuration files. You can remove or rename it from its interface. The password is the same as the one defined during installation.
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
* Official documentation: https://lionwiki-t2t.sourceforge.io/
|
|
||||||
* More about txt2tags: https://github.com/farvardin/whatistxt2tags
|
|
||||||
|
|
||||||
## YunoHost specific features
|
|
||||||
|
|
||||||
#### Multi-users support
|
#### Multi-users support
|
||||||
|
|
||||||
This is only a single password for editing the wiki (it's not multi-user), and one other password for administration. Both are set to the same one defined in the lionwiki-t2t during the installation by YunoHost.
|
This is only a single password for editing the wiki (it's not multi-user), and one other password for administration. Both are set to the same one defined in the lionwiki-t2t during the installation by YunoHost.
|
||||||
|
|
@ -43,15 +44,6 @@ You can set the wiki to private (only readable when you are connected to YunoHos
|
||||||
|
|
||||||
You can install multiple instance of this app.
|
You can install multiple instance of this app.
|
||||||
|
|
||||||
#### Supported architectures
|
|
||||||
|
|
||||||
* x86-64b - [](https://ci-apps.yunohost.org/ci/apps/lionwikit2t/)
|
|
||||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/lionwikit2t/)
|
|
||||||
|
|
||||||
## Limitations
|
|
||||||
|
|
||||||
* No different user accounts.
|
|
||||||
|
|
||||||
## Additional information
|
## Additional information
|
||||||
|
|
||||||
You must define a base color during the installation (in hexadecimal format). You can choose it using this online tool for example: https://www.w3schools.com/colors/colors_picker.asp
|
You must define a base color during the installation (in hexadecimal format). You can choose it using this online tool for example: https://www.w3schools.com/colors/colors_picker.asp
|
||||||
|
|
@ -85,21 +77,26 @@ If something goes wrong, you can go back to the original default file:
|
||||||
cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css
|
cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css
|
||||||
```
|
```
|
||||||
|
|
||||||
## Links
|
|
||||||
|
|
||||||
* Report a bug: https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/issues
|
## Documentation and resources
|
||||||
* App website: https://lionwiki-t2t.sourceforge.io/
|
|
||||||
* YunoHost website: https://yunohost.org/
|
|
||||||
|
|
||||||
---
|
* Official app website: <https://lionwiki-t2t.sourceforge.io/>
|
||||||
|
* Official user documentation: <https://github.com/farvardin/whatistxt2tags>
|
||||||
|
* Official admin documentation: <https://lionwiki-t2t.sourceforge.io/>
|
||||||
|
* Upstream app code repository: <https://sourceforge.net/projects/lionwiki-t2t>
|
||||||
|
* YunoHost documentation for this app: <https://yunohost.org/app_lionwiki-t2t>
|
||||||
|
* Report a bug: <https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/issues>
|
||||||
|
|
||||||
## Developer info
|
## Developer info
|
||||||
|
|
||||||
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing).
|
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing).
|
||||||
|
|
||||||
To try the testing branch, please proceed like that.
|
To try the testing branch, please proceed like that.
|
||||||
```
|
|
||||||
|
``` bash
|
||||||
sudo yunohost app install https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
sudo yunohost app install https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
||||||
or
|
or
|
||||||
sudo yunohost app upgrade lionwiki-t2t -u https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
sudo yunohost app upgrade lionwiki-t2t -u https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
|
||||||
|
|
|
||||||
55
README_fr.md
55
README_fr.md
|
|
@ -1,22 +1,30 @@
|
||||||
# Lionwiki-t2t pour YunoHost
|
<!--
|
||||||
|
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
|
||||||
|
It shall NOT be edited by hand.
|
||||||
|
-->
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/lionwiki-t2t)  
|
# Lionwiki pour YunoHost
|
||||||
[](https://install-app.yunohost.org/?app=lionwiki-t2t)
|
|
||||||
|
[](https://dash.yunohost.org/appci/app/lionwiki-t2t)  
|
||||||
|
[](https://install-app.yunohost.org/?app=lionwiki-t2t)
|
||||||
|
|
||||||
*[Read this readme in english.](./README.md)*
|
*[Read this readme in english.](./README.md)*
|
||||||
|
|
||||||
> *Ce package vous permet d'installer Lionwiki-t2t rapidement et simplement sur un serveur Yunohost.
|
> *Ce package vous permet d'installer Lionwiki rapidement et simplement sur un serveur YunoHost.
|
||||||
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
|
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
|
||||||
|
|
||||||
## Vue d'ensemble
|
## Vue d'ensemble
|
||||||
|
|
||||||
Lionwiki-t2t est un système de type wiki minimaliste, programmé en PHP. Il est extensible et n'utilise que des fichiers plats pour sa base de données. Il est adapté pour la création de petits sites web, de notes personnelles ou de journaux. Cette version utilise le langage de balisage léger TXT2TAGS.
|
Lionwiki-t2t est un système de type wiki minimaliste, programmé en PHP. Il est extensible et n'utilise que des fichiers plats pour sa base de données. Il est adapté pour la création de petits sites web, de notes personnelles ou de journaux. Cette version utilise le langage de balisage léger TXT2TAGS.
|
||||||
|
|
||||||
**Version incluse :** 3.2.11b
|
|
||||||
|
|
||||||
## Capture d'écran
|
**Version incluse :** 3.2.12~ynh2
|
||||||
|
|
||||||
|
## Captures d'écran
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Avertissements / informations importantes
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
|
|
@ -28,28 +36,12 @@ Dans le dossier racine de l'application il y a 2 fichiers, `config.php` et `conf
|
||||||
|
|
||||||
- L'outil `pheditor.php` à la racine du site permet d'éditer tous les fichiers de configuration nécessaires. Vous pouvez le retirer ou le renommer depuis son interface. Le mot de passe est le même que celui définit lors de l'installation.
|
- L'outil `pheditor.php` à la racine du site permet d'éditer tous les fichiers de configuration nécessaires. Vous pouvez le retirer ou le renommer depuis son interface. Le mot de passe est le même que celui définit lors de l'installation.
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
* Documentation officielle : https://lionwiki-t2t.sourceforge.io/
|
|
||||||
* À propos de txt2tags : https://github.com/farvardin/whatistxt2tags
|
|
||||||
|
|
||||||
## Caractéristiques spécifiques YunoHost
|
|
||||||
|
|
||||||
#### Support multi-utilisateurs
|
#### Support multi-utilisateurs
|
||||||
|
|
||||||
Il y a un seul mot de passe pour éditer ce wiki (dans le fichier config.php), et un autre pour l'administration. C'est le même qui a a été créé lors de l'installation par YunoHost.
|
Il y a un seul mot de passe pour éditer ce wiki (dans le fichier config.php), et un autre pour l'administration. C'est le même qui a a été créé lors de l'installation par YunoHost.
|
||||||
|
|
||||||
Vous pouvez passer le wiki en mode privé ou public, selon vos usages.
|
Vous pouvez passer le wiki en mode privé ou public, selon vos usages.
|
||||||
|
|
||||||
#### Architectures supportées
|
|
||||||
|
|
||||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/lionwikit2t/)
|
|
||||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/lionwikit2t/)
|
|
||||||
|
|
||||||
## Limitations
|
|
||||||
|
|
||||||
* Un seul compte utilisateur.
|
|
||||||
|
|
||||||
## Informations additionnelles
|
## Informations additionnelles
|
||||||
|
|
||||||
Vous devez définir une couleur de base durant l'installation, au format hexadécimal. Vous pouvez la choisir en utilisant cet outil en ligne : https://www.w3schools.com/colors/colors_picker.asp
|
Vous devez définir une couleur de base durant l'installation, au format hexadécimal. Vous pouvez la choisir en utilisant cet outil en ligne : https://www.w3schools.com/colors/colors_picker.asp
|
||||||
|
|
@ -83,21 +75,26 @@ Si quelque chose se passe mal, vous pouvez revenir au fichier original :
|
||||||
cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css
|
cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css
|
||||||
```
|
```
|
||||||
|
|
||||||
## Liens
|
|
||||||
|
|
||||||
* Signaler un bug: https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/issues
|
## Documentations et ressources
|
||||||
* Site de l'application: https://lionwiki-t2t.sourceforge.io/
|
|
||||||
* Site web YunoHost: https://yunohost.org/
|
|
||||||
|
|
||||||
---
|
* Site officiel de l'app : <https://lionwiki-t2t.sourceforge.io/>
|
||||||
|
* Documentation officielle utilisateur : <https://github.com/farvardin/whatistxt2tags>
|
||||||
|
* Documentation officielle de l'admin : <https://lionwiki-t2t.sourceforge.io/>
|
||||||
|
* Dépôt de code officiel de l'app : <https://sourceforge.net/projects/lionwiki-t2t>
|
||||||
|
* Documentation YunoHost pour cette app : <https://yunohost.org/app_lionwiki-t2t>
|
||||||
|
* Signaler un bug : <https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/issues>
|
||||||
|
|
||||||
## Informations pour les développeurs
|
## Informations pour les développeurs
|
||||||
|
|
||||||
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing).
|
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing).
|
||||||
|
|
||||||
Pour essayer la branche testing, procédez comme suit.
|
Pour essayer la branche testing, procédez comme suit.
|
||||||
```
|
|
||||||
|
``` bash
|
||||||
sudo yunohost app install https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
sudo yunohost app install https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
||||||
ou
|
ou
|
||||||
sudo yunohost app upgrade lionwiki-t2t -u https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
sudo yunohost app upgrade lionwiki-t2t -u https://github.com/YunoHost-Apps/lionwiki-t2t_ynh/tree/testing --debug
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
; Manifest
|
; Manifest
|
||||||
domain="domain.tld"
|
domain="domain.tld"
|
||||||
path="/path"
|
path="/path"
|
||||||
admin="john"
|
|
||||||
language="en"
|
|
||||||
is_public=1
|
is_public=1
|
||||||
|
language="en"
|
||||||
|
admin="john"
|
||||||
password="azerty1234"
|
password="azerty1234"
|
||||||
wiki="My Wiki"
|
wiki="My Wiki"
|
||||||
color="328cc1"
|
color="328cc1"
|
||||||
|
|
@ -17,14 +17,12 @@
|
||||||
setup_private=1
|
setup_private=1
|
||||||
setup_public=1
|
setup_public=1
|
||||||
upgrade=1
|
upgrade=1
|
||||||
upgrade=1 from_commit=69db9a386081d9241f5548e09052fd58dee45463
|
# 3.2.12~ynh1
|
||||||
|
upgrade=1 from_commit=a59e01aec10bd3a749ce062d2931906151d8f8be
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=1
|
multi_instance=1
|
||||||
|
port_already_use=0
|
||||||
change_url=1
|
change_url=1
|
||||||
;;; Options
|
;;; Options
|
||||||
Email=
|
Email=
|
||||||
Notification=none
|
Notification=none
|
||||||
;;; Upgrade options
|
|
||||||
; commit=69db9a386081d9241f5548e09052fd58dee45463
|
|
||||||
name=Merge pull request #4 from YunoHost-Apps/testing
|
|
||||||
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=Yes&language=en&
|
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,33 @@
|
||||||
|
|
||||||
|
|
||||||
|
/*-----------------------
|
||||||
|
|
||||||
|
--------------
|
||||||
|
- Minimaxing -
|
||||||
|
--------------
|
||||||
|
|
||||||
|
a template for Lionwiki-t2t
|
||||||
|
https://lionwiki-t2t.sourceforge.io/
|
||||||
|
|
||||||
|
based on
|
||||||
|
|
||||||
|
https://html5up.net/minimaxing
|
||||||
|
licence Creative Commons Attribution 3.0 Unported
|
||||||
|
http://creativecommons.org/licenses/by/3.0/
|
||||||
|
|
||||||
|
----------------------------*/
|
||||||
|
|
||||||
|
|
||||||
/* This CSS file was generated from the minimaxing.less template.
|
/* This CSS file was generated from the minimaxing.less template.
|
||||||
See http://lesscss.org/
|
See http://lesscss.org/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
@MainFontFamily: Ubuntu, Open Sans,sans-serif, MyFont;
|
|
||||||
@MainFontFamilyHeader: Fengardo Neue, Archivo Narrow, LoveYaLikeASister, Ubuntu Condensed, Open Sans Condensed, sans-serif, MyFont;
|
|
||||||
@MainFontCode: Monospace,Courier;
|
|
||||||
@MainFontFamilyEdit: Ubuntu, Open Sans,sans-serif, MyFont;
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
@MainFontFamily: Ubuntu;
|
|
||||||
@MainFontFamilyHeader: Fengardo Neue;
|
|
||||||
@MainFontCode: Monospace;
|
@MainFontCode: Monospace;
|
||||||
@MainFontFamilyEdit: Ubuntu;
|
@fontEdit: @font;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Use the part above to customise your fonts.
|
Use the part above to customise your fonts.
|
||||||
|
|
@ -50,31 +61,30 @@ You can create your own manuscript / handwriting font on http://www.myscriptfont
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* This line below will use a random main color: */
|
/* This line below will use a random main color: */
|
||||||
/* @MainColor: @background-color; */
|
/* @fg: @background-color; */
|
||||||
|
|
||||||
/* if you prefer to select a fixed background color, just uncomment one color from below */
|
/* if you prefer to select a fixed background color, just uncomment one color from below */
|
||||||
/* @MainColor: #549136; */
|
|
||||||
/*@MainColor: #7E2434;*/
|
// @fg: #549136; /* Green */
|
||||||
/*@MainColor: #7e3821;*/
|
// @fg: #7E2434; /* Bordeaux */
|
||||||
/*@MainColor: #549136;*/
|
// @fg: #7e3821; /* Brick Red (darker) */
|
||||||
/*@MainColor: #549136;*/
|
// @fg: #D17732; /* Orange */
|
||||||
/*@MainColor: #D17732;*/
|
// @fg: #328cc1; /* Light Blue */
|
||||||
/*@MainColor: #328cc1;*/
|
// @fg: #847457; /* Marron */
|
||||||
|
|
||||||
/* For YunoHost config */
|
/* For YunoHost config */
|
||||||
@MainColor: #__YNH_COLOR__;
|
/* @fg: #__YNH_COLOR__; */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Header color */
|
/* Header color */
|
||||||
|
|
||||||
/* You can use a shade of MainColor: */
|
/* You can use a shade of MainColor: */
|
||||||
@HeaderColor: (@MainColor - #111);
|
@HeaderColor: (@fg - #111);
|
||||||
|
|
||||||
/* or a complementary color: */
|
/* or a complementary color: */
|
||||||
/*@HeaderColor: (#ffffff - @MainColor - (#ffffff - @MainColor)/3); */
|
/*@HeaderColor: (#ffffff - @fg - (#ffffff - @fg)/3); */
|
||||||
@HeaderColor: spin(@MainColor, 180);
|
@HeaderColor: spin(@fg, 180);
|
||||||
|
|
||||||
|
|
||||||
@MainFontColor: (#878e83 - #222);
|
@MainFontColor: (#878e83 - #222);
|
||||||
|
|
@ -82,33 +92,57 @@ You can create your own manuscript / handwriting font on http://www.myscriptfont
|
||||||
|
|
||||||
@RedBrick: #7F4736;
|
@RedBrick: #7F4736;
|
||||||
|
|
||||||
/* used in max-width (should be renamed) */
|
|
||||||
@BackgroundMain: (#999 + (@MainColor/6));
|
|
||||||
@Bg-dark: (@BackgroundMain - #121212);
|
|
||||||
@Bg-light: (@BackgroundMain + #121212);
|
|
||||||
@Bg-extra-light: (@BackgroundMain + #343434);
|
|
||||||
|
|
||||||
@MainColor-light: (@MainColor + #111);
|
|
||||||
|
|
||||||
@Main2Color: @MainColor;
|
|
||||||
|
|
||||||
@LinkColor: (@MainColor-light + #010101);
|
|
||||||
|
|
||||||
@BackgroundHead: @MainColor-light;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Background2Head: @MainColor;
|
@fg-light: (@fg + #111);
|
||||||
@Background3Head: @MainColor;
|
|
||||||
@Background4Head: @MainColor;
|
@Main2Color: @fg;
|
||||||
@BackgroundNav: @MainColor;
|
|
||||||
@MainColor-light: @MainColor;
|
@LinkColor: (@fg-light + #010101);
|
||||||
@shadow: @MainColor;
|
|
||||||
|
@BackgroundHead: @fg-light;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Background2Head: @fg;
|
||||||
|
@Background3Head: @fg;
|
||||||
|
@Background4Head: @fg;
|
||||||
|
@BackgroundNav: @fg;
|
||||||
|
@fg-light: @fg;
|
||||||
|
@shadow: @fg;
|
||||||
@buttonboxshadow: 0.0;
|
@buttonboxshadow: 0.0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* templates */
|
||||||
|
|
||||||
|
@fg: #7e3821; /* Brick Red (darker) Default color 2021 */
|
||||||
|
@bg: #fff;
|
||||||
|
@bg2: @fg;
|
||||||
|
@glow: none;
|
||||||
|
@link: @fg;
|
||||||
|
@link-hover: @bg;
|
||||||
|
@link-visited: @fg;
|
||||||
|
@heading: @fg;
|
||||||
|
@heading-weight: bold; /* normal or bold */
|
||||||
|
@font: Ubuntu;
|
||||||
|
@font-heading: Fengardo Neue;
|
||||||
|
|
||||||
|
|
||||||
|
@Bg-dark: (@fg - #121212);
|
||||||
|
@Bg-light: (@fg + #121212);
|
||||||
|
@Bg-extra-light: (#999 + (@fg/6) + #343434 + #121212);
|
||||||
|
|
||||||
|
|
||||||
|
/* overriding default values above */
|
||||||
|
@import "minimaxing_temp.less";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*@import url(http://fonts.googleapis.com/css?family=Ubuntu+Condensed);
|
/*@import url(http://fonts.googleapis.com/css?family=Ubuntu+Condensed);
|
||||||
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
|
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
|
||||||
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
|
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
|
||||||
|
|
@ -116,156 +150,23 @@ You can create your own manuscript / handwriting font on http://www.myscriptfont
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: MyFont;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url(../fonts/MyFont.ttf) format('truetype');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: MyManuscript;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url(../fonts/MyManuscript.ttf) format('truetype');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: LoveYaLikeASister;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url(../fonts/LoveYaLikeASister-Regular.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Ubuntu Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: local('Ubuntu Condensed'),local('UbuntuCondensed-Regular'),url(../fonts/ubuntu-condensed-regular.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Ubuntu';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: normal;
|
|
||||||
src: local('Ubuntu'),url(../fonts/ubuntu.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
@import "../css/font_ubuntu.less"; /* Ubuntu */
|
||||||
font-family: 'Ubuntu';
|
@import "../css/font_fengardo.less"; /* Fengardo Neue */
|
||||||
font-style: italic;
|
|
||||||
font-weight: normal;
|
|
||||||
src: local('Ubuntu Italic'),url(../fonts/ubuntu-italic.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Ubuntu';
|
|
||||||
font-style: bold;
|
|
||||||
font-weight: bold;
|
|
||||||
src: local('Ubuntu Bold'),url(../fonts/ubuntu-bold.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Ubuntu';
|
// @import "../css/font_opensans.less"; /* Open Sans */
|
||||||
font-weight: bold;
|
// @import "../css/font_archivo.less"; /* Archivo Narrow */
|
||||||
font-style: italic;
|
// @import "../css/font_loveya.less"; /* LoveYaLikeASister */
|
||||||
src: local('Ubuntu Italic Bold'),url(../fonts/ubuntu-bold-italic.woff) format('woff');
|
// @import "../css/font_myfont.less"; /* MyFont */ /* MyManuscript */
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 300;
|
|
||||||
src: local('Open Sans Light'),local('OpenSans-Light'),url(../fonts/OpenSans-Light.woff) format('woff');
|
|
||||||
}*/
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: local('Open Sans'),local('OpenSans'),url(../fonts/OpenSans.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 600;
|
|
||||||
src: local('Open Sans Semibold'),local('OpenSans-Semibold'),url(../fonts/OpenSans-Semibold.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 700;
|
|
||||||
src: local('Open Sans Bold'),local('OpenSans-Bold'),url(../fonts/OpenSans-Bold.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 800;
|
|
||||||
src: local('Open Sans Extrabold'),local('OpenSans-Extrabold'),url(../fonts/OpenSans-Extrabold.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: 300;
|
|
||||||
src: local('Open Sans Light Italic'),local('OpenSansLight-Italic'),url(../fonts/OpenSansLight-Italic.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: 400;
|
|
||||||
src: local('Open Sans Italic'),local('OpenSans-Italic'),url(../fonts/OpenSans-Italic.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: 600;
|
|
||||||
src: local('Open Sans Semibold Italic'),local('OpenSans-SemiboldItalic'),url(../fonts/OpenSans-SemiboldItalic.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: 700;
|
|
||||||
src: local('Open Sans Bold Italic'),local('OpenSans-BoldItalic'),url(../fonts/OpenSans-BoldItalic.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: 800;
|
|
||||||
src: local('Open Sans Extrabold Italic'),local('OpenSans-ExtraboldItalic'),url(../fonts/OpenSans-ExtraboldItalic.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 700;
|
|
||||||
src: local('Open Sans Condensed Bold'),local('OpenSans-CondensedBold'),url(../fonts/OpenSans-CondensedBold.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 300;
|
|
||||||
src: local('Open Sans Cond Light'),local('OpenSans-CondensedLight'),url(../fonts/OpenSans-CondensedLight.woff) format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans Condensed';
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: 300;
|
|
||||||
src: local('Open Sans Cond Light Italic'),local('OpenSans-CondensedLightItalic'),url(../fonts/OpenSans-CondensedLightItalic.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Archivo Narrow';
|
|
||||||
font-style: bold;
|
|
||||||
font-weight: 300;
|
|
||||||
src: url(../fonts/ArchivoNarrow-Bold.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Fengardo Neue';
|
|
||||||
font-style: bold;
|
|
||||||
font-weight: 200;
|
|
||||||
src: url(../fonts/fengardoneue-black.woff) format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -281,6 +182,9 @@ You can create your own manuscript / handwriting font on http://www.myscriptfont
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* LionWiki specific */
|
/* LionWiki specific */
|
||||||
|
|
||||||
a.pending {
|
a.pending {
|
||||||
|
|
@ -326,14 +230,14 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
|
||||||
}
|
}
|
||||||
.contentTextarea {
|
.contentTextarea {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
font-family: @MainFontFamilyEdit;
|
font-family: @fontEdit;
|
||||||
font-size: 105%;
|
font-size: 105%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.markItUpEditor
|
.markItUpEditor
|
||||||
{
|
{
|
||||||
width: 90%;
|
width: 90%;
|
||||||
font-family: @MainFontFamilyEdit;
|
font-family: @fontEdit;
|
||||||
color: #444;
|
color: #444;
|
||||||
font-size: 140%;
|
font-size: 140%;
|
||||||
}
|
}
|
||||||
|
|
@ -455,12 +359,34 @@ th, thead, #previewPane th, #previewPane thead {
|
||||||
/******************************************************************/
|
/******************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Mixin Macro */
|
||||||
|
|
||||||
|
.break {
|
||||||
|
overflow-wrap: break-word;
|
||||||
|
word-wrap: break-word;
|
||||||
|
|
||||||
|
-ms-word-break: break-all;
|
||||||
|
/* This is the dangerous one in WebKit, as it breaks things wherever */
|
||||||
|
word-break: break-all;
|
||||||
|
/* Instead use this non-standard one: */
|
||||||
|
word-break: break-word;
|
||||||
|
|
||||||
|
/* Adds a hyphen where the word breaks, if supported (No Blink) */
|
||||||
|
-ms-hyphens: auto;
|
||||||
|
-moz-hyphens: auto;
|
||||||
|
-webkit-hyphens: auto;
|
||||||
|
hyphens: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-size: @MainFontSize;
|
font-size: @MainFontSize;
|
||||||
font-family: sans-serif;
|
/*font-family: sans-serif;*/
|
||||||
/*background-color: (@Bg-extra-light/1.1 + #111);*/
|
/*background-color: (@Bg-extra-light/1.1 + #111);*/
|
||||||
background: #fff;
|
background-color: @bg;
|
||||||
font-family: @MainFontFamily;
|
font-family: @font;
|
||||||
color: @MainFontColor;
|
color: @MainFontColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -471,7 +397,7 @@ body {
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
h1, h2, h3, h4 {
|
h1, h2, h3, h4 {
|
||||||
font-family: @MainFontFamilyHeader;
|
font-family: @font-heading;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
color: @HeaderColor;
|
color: @HeaderColor;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
@ -480,47 +406,50 @@ h1, h2, h3, h4 {
|
||||||
padding-left: 2px;
|
padding-left: 2px;
|
||||||
padding-right: 2px;
|
padding-right: 2px;
|
||||||
}
|
}
|
||||||
h1, h2 {
|
h2 {
|
||||||
border-bottom: 1px solid grey;
|
border-bottom: 1px solid grey;
|
||||||
}
|
}
|
||||||
h1 {
|
h1 {
|
||||||
font-size: 155%;
|
/*font-size: 2.6em;*/
|
||||||
|
font-size: clamp(2em, 4vw, 6em);
|
||||||
|
text-align: center;
|
||||||
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
h1 a {
|
h1 a {
|
||||||
color: @HeaderColor;
|
color: @HeaderColor;
|
||||||
}
|
}
|
||||||
#header-wrapper h1 {
|
#header-wrapper h1 {
|
||||||
color: #fff;
|
color: @bg;
|
||||||
line-height: 1.3em;
|
line-height: 1.3em;
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
#header-wrapper {
|
#header-wrapper {
|
||||||
color: (@MainColor-light + #111);
|
color: (@fg-light + #111);
|
||||||
}
|
}
|
||||||
#header-wrapper a {
|
#header-wrapper a {
|
||||||
color: (@MainColor-light + #222);
|
color: (@fg-light + #222);
|
||||||
}
|
}
|
||||||
#header-wrapper a:hover, #header-wrapper a:hover{
|
#header-wrapper a:hover, #header-wrapper a:hover{
|
||||||
background-color: @MainColor-light;
|
background-color: @fg-light;
|
||||||
color: (@MainColor - #444);
|
color: (@fg - #444);
|
||||||
}
|
}
|
||||||
#header nav {
|
#header nav {
|
||||||
color: #111;
|
color: @bg;
|
||||||
text-transform: lowercase;
|
text-transform: lowercase;
|
||||||
}
|
}
|
||||||
#header nav a, #header nav li a {
|
#header nav a, #header nav li a {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: #fff;
|
color: @bg;
|
||||||
}
|
}
|
||||||
#header nav li a:hover, #header nav li a:active {
|
#header nav li a:hover, #header nav li a:active {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: @button-radius;
|
border-radius: @button-radius;
|
||||||
color: #111;
|
color: @fg;
|
||||||
}
|
}
|
||||||
h2 {
|
h2 {
|
||||||
font-size: 1.6em;
|
font-size: 1.6em;
|
||||||
letter-spacing: -1px;
|
letter-spacing: 1px;
|
||||||
margin-bottom: 0.0em;
|
margin-bottom: 0.0em;
|
||||||
margin-top: 1.8em;
|
margin-top: 1.8em;
|
||||||
}
|
}
|
||||||
|
|
@ -537,6 +466,7 @@ h4 {
|
||||||
}
|
}
|
||||||
p, ul {
|
p, ul {
|
||||||
margin-bottom: 1.0em;
|
margin-bottom: 1.0em;
|
||||||
|
.break();
|
||||||
}
|
}
|
||||||
p {
|
p {
|
||||||
line-height: 1.7em;
|
line-height: 1.7em;
|
||||||
|
|
@ -562,27 +492,32 @@ s {
|
||||||
}
|
}
|
||||||
|
|
||||||
::selection {
|
::selection {
|
||||||
background: @MainColor;
|
background: @fg;
|
||||||
color: #fff;
|
color: @bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
::-moz-selection {
|
::-moz-selection {
|
||||||
background: @MainColor;
|
background: @fg;
|
||||||
color: #fff;
|
color: @bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
pre {
|
pre {
|
||||||
background-color: (@Bg-extra-light + #121212);
|
background-color: (@Bg-extra-light + #121212);
|
||||||
line-height: 1.5em;
|
line-height: 1.5em;
|
||||||
font-family: @MainFontCode;
|
font-family: @MainFontCode;
|
||||||
|
font-size: @MainFontSize - 1em;
|
||||||
margin: 1.0em;
|
margin: 1.0em;
|
||||||
|
overflow:auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
code, blockquote, dt {
|
code, blockquote, dt {
|
||||||
background-color: (@Bg-extra-light + #121212);
|
background-color: (@Bg-extra-light + #121212);
|
||||||
line-height: 1.5em;
|
//background-color: (@bg + #121212);
|
||||||
font-family: mono;
|
//line-height: 1.5em;
|
||||||
|
font-family: @MainFontCode;
|
||||||
|
font-size: @MainFontSize - 1em;
|
||||||
/*margin: 1.0em;*/
|
/*margin: 1.0em;*/
|
||||||
|
overflow:auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
dd {
|
dd {
|
||||||
|
|
@ -602,7 +537,7 @@ img {
|
||||||
max-width: 50%;
|
max-width: 50%;
|
||||||
max-height: 500px;
|
max-height: 500px;
|
||||||
padding:1px;
|
padding:1px;
|
||||||
border: solid 1px (@MainColor + #222);
|
border: solid 1px (@fg + #222);
|
||||||
/*display: block;*/
|
/*display: block;*/
|
||||||
/*margin: 0 auto;*/
|
/*margin: 0 auto;*/
|
||||||
}
|
}
|
||||||
|
|
@ -622,6 +557,15 @@ img.noborder {
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.img-circle {
|
||||||
|
border-radius: 50%;
|
||||||
|
border: solid 0px ;
|
||||||
|
min-width:100px;
|
||||||
|
max-width:200px;
|
||||||
|
background: @HeaderColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
ol, ul {
|
ol, ul {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -632,10 +576,13 @@ li {
|
||||||
|
|
||||||
/* If you don't like color highlight when you're over a list, comment the next 2 entries */
|
/* If you don't like color highlight when you're over a list, comment the next 2 entries */
|
||||||
#main ul:hover {
|
#main ul:hover {
|
||||||
background-color: (@Bg-extra-light + #343434);
|
// background-color: (@Bg-extra-light + #343434);
|
||||||
|
background-color: @bg;
|
||||||
}
|
}
|
||||||
#main ul li:hover, ul li:active {
|
#main ul li:hover, ul li:active {
|
||||||
background-color: (@Bg-light + #343434);
|
// background-color: (@Bg-light + #343434);
|
||||||
|
background-color: (@bg + #111);
|
||||||
|
background-color: @Bg-extra-light;
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
|
|
@ -645,7 +592,9 @@ a {
|
||||||
a:hover {
|
a:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: (@Bg-light + #232323);
|
background-color: (@Bg-light + #232323);
|
||||||
border-radius: (@button-radius - 2);
|
//background-color: @bg;
|
||||||
|
//border-radius: (@button-radius - 2);
|
||||||
|
color: @bg;
|
||||||
}
|
}
|
||||||
* > p:last-child {
|
* > p:last-child {
|
||||||
}
|
}
|
||||||
|
|
@ -678,19 +627,19 @@ ul.link-list li:first-child {
|
||||||
border-radius: @button-radius;
|
border-radius: @button-radius;
|
||||||
text-transform: lowercase;
|
text-transform: lowercase;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: #fff;
|
color: @bg;
|
||||||
font-size: 1.0em;
|
font-size: 1.0em;
|
||||||
letter-spacing: -1px;
|
letter-spacing: -1px;
|
||||||
border: solid 1px @MainColor;
|
border: solid 1px @fg;
|
||||||
box-shadow: inset 0px 0px 0px 1px @MainColor-light;
|
box-shadow: inset 0px 0px 0px 1px @fg-light;
|
||||||
}
|
}
|
||||||
.button:hover, a.toolbarTextareaItem:hover {
|
.button:hover, a.toolbarTextareaItem:hover {
|
||||||
background-color: (@MainColor + #111);
|
background-color: (@fg + #111);
|
||||||
color: #fff;
|
color: @bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.toolbarTextareaItem b {
|
a.toolbarTextareaItem b {
|
||||||
color: #fff;
|
color: @bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
#copyright {
|
#copyright {
|
||||||
|
|
@ -718,11 +667,11 @@ a.toolbarTextareaItem b {
|
||||||
}
|
}
|
||||||
|
|
||||||
.button_txt2tags_true, input.submit {
|
.button_txt2tags_true, input.submit {
|
||||||
background-color: @MainColor;
|
background-color: @fg;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
.button_txt2tags_true:hover, input.submit:hover {
|
.button_txt2tags_true:hover, input.submit:hover {
|
||||||
background-color: (@MainColor + #222);
|
background-color: (@fg + #222);
|
||||||
}
|
}
|
||||||
|
|
||||||
.button_txt2tags_false {
|
.button_txt2tags_false {
|
||||||
|
|
@ -734,7 +683,7 @@ a.toolbarTextareaItem b {
|
||||||
}
|
}
|
||||||
|
|
||||||
.valide {
|
.valide {
|
||||||
color: @MainColor;
|
color: @fg;
|
||||||
background-color: (@Bg-extra-light/1.1);
|
background-color: (@Bg-extra-light/1.1);
|
||||||
}
|
}
|
||||||
.refuse {
|
.refuse {
|
||||||
|
|
@ -773,8 +722,8 @@ a.toolbarTextareaItem b {
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
padding: 0 40px 0 40px;
|
padding: 0 40px 0 40px;
|
||||||
border-radius: @button-radius;
|
border-radius: @button-radius;
|
||||||
border: solid 1px @MainColor;
|
//border: solid 1px @fg;
|
||||||
box-shadow: inset 0px 0px 0px 1px @MainColor-light,0px 1px 4px 0px rgba(0,0,0,@buttonboxshadow);
|
box-shadow: inset 0px 0px 0px 1px @fg-light,0px 1px 4px 0px rgba(0,0,0,@buttonboxshadow);
|
||||||
height: 66px;
|
height: 66px;
|
||||||
}
|
}
|
||||||
#header h1 {
|
#header h1 {
|
||||||
|
|
@ -782,7 +731,7 @@ a.toolbarTextareaItem b {
|
||||||
left: 10px;
|
left: 10px;
|
||||||
top: -28px;
|
top: -28px;
|
||||||
font-size: 2.4em;
|
font-size: 2.4em;
|
||||||
letter-spacing: 2px;
|
letter-spacing: 3px;
|
||||||
/*line-height: 6px;*/ /* pb in konqueror*/
|
/*line-height: 6px;*/ /* pb in konqueror*/
|
||||||
}
|
}
|
||||||
#header h1 a {
|
#header h1 a {
|
||||||
|
|
@ -824,7 +773,7 @@ a.toolbarTextareaItem b {
|
||||||
#banner-wrapper h1 {
|
#banner-wrapper h1 {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 2.2em;
|
font-size: 2.2em;
|
||||||
letter-spacing: 0px;
|
letter-spacing: 1px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
border-top: 0px;
|
border-top: 0px;
|
||||||
border-bottom: 15px;
|
border-bottom: 15px;
|
||||||
|
|
@ -848,7 +797,7 @@ a.toolbarTextareaItem b {
|
||||||
font-size: 3.3em;
|
font-size: 3.3em;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
letter-spacing: -2px;
|
letter-spacing: 1px;
|
||||||
}
|
}
|
||||||
#banner span {
|
#banner span {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
@ -865,7 +814,7 @@ a.toolbarTextareaItem b {
|
||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
}
|
}
|
||||||
#main {
|
#main {
|
||||||
background: #fff;
|
background-color: @bg;
|
||||||
padding: 2% 0 2% 0;
|
padding: 2% 0 2% 0;
|
||||||
padding-top: -20px;
|
padding-top: -20px;
|
||||||
}
|
}
|
||||||
|
|
@ -923,9 +872,9 @@ a.toolbarTextareaItem b {
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
padding: 0 40px 0 40px;
|
padding: 0 40px 0 40px;
|
||||||
border-radius: @button-radius;
|
border-radius: @button-radius;
|
||||||
border: solid 1px @MainColor-light;
|
// border: solid 1px @fg-light;
|
||||||
box-shadow: inset 0px 0px 0px 1px @MainColor-light,0px 1px 4px 0px rgba(0,0,0,@buttonboxshadow);
|
box-shadow: inset 0px 0px 0px 1px @fg-light,0px 1px 4px 0px rgba(0,0,0,@buttonboxshadow);
|
||||||
background-color: @Background4Head;
|
//background-color: @Background4Head;
|
||||||
height: 66px;
|
height: 66px;
|
||||||
}
|
}
|
||||||
#header h1 {
|
#header h1 {
|
||||||
|
|
@ -986,7 +935,7 @@ a.toolbarTextareaItem b {
|
||||||
font-size: 3em;
|
font-size: 3em;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
letter-spacing: -2px;
|
letter-spacing: 1px;
|
||||||
}
|
}
|
||||||
#banner span {
|
#banner span {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
@ -1003,7 +952,7 @@ a.toolbarTextareaItem b {
|
||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
}
|
}
|
||||||
#main {
|
#main {
|
||||||
background: #fff;
|
background-color: @bg;
|
||||||
padding: 3% 0 3% 0;
|
padding: 3% 0 3% 0;
|
||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
|
|
@ -1108,7 +1057,7 @@ a.toolbarTextareaItem b {
|
||||||
padding: 10px 25px 10px 25px;
|
padding: 10px 25px 10px 25px;
|
||||||
}
|
}
|
||||||
#banner-wrapper {
|
#banner-wrapper {
|
||||||
background: @MainColor url(images/bg1.png);
|
background: @fg url(images/bg1.png);
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
#banner {
|
#banner {
|
||||||
|
|
@ -1130,7 +1079,7 @@ a.toolbarTextareaItem b {
|
||||||
font-size: 2em;
|
font-size: 2em;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
letter-spacing: -2px;
|
letter-spacing: 1px;
|
||||||
}
|
}
|
||||||
#banner span {
|
#banner span {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
@ -1154,15 +1103,15 @@ a.toolbarTextareaItem b {
|
||||||
|
|
||||||
.contentTextarea {
|
.contentTextarea {
|
||||||
width: 96%;
|
width: 96%;
|
||||||
font-family: @MainFontFamily;
|
font-family: @font;
|
||||||
font-size: 105%;
|
font-size: 105%;
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
margin-left: -15px;
|
margin-left: -0.25px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#main {
|
#main {
|
||||||
/*overflow: auto;*/
|
/*overflow: auto;*/
|
||||||
background: #fff;
|
background-color: @bg;
|
||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
@ -1179,7 +1128,7 @@ a.toolbarTextareaItem b {
|
||||||
|
|
||||||
|
|
||||||
/* Use main color for tables */
|
/* Use main color for tables */
|
||||||
@TableColor: @MainColor ;
|
@TableColor: @fg ;
|
||||||
|
|
||||||
/* Use complementary color for tables */
|
/* Use complementary color for tables */
|
||||||
/*@TableColor: @HeaderColor;*/
|
/*@TableColor: @HeaderColor;*/
|
||||||
|
|
@ -1235,10 +1184,12 @@ font-weight: bold;
|
||||||
progress {
|
progress {
|
||||||
color: @HeaderColor;
|
color: @HeaderColor;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
border-radius: 4px;
|
/*border-radius: 4px; */
|
||||||
/*border: solid 1px;*/
|
border-radius: 0px;
|
||||||
|
border: solid 1px;
|
||||||
width: 10em;
|
width: 10em;
|
||||||
height: 1em;
|
height: 1em;
|
||||||
|
-webkit-appearance: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1252,5 +1203,125 @@ progress::-webkit-progress-value {
|
||||||
}
|
}
|
||||||
|
|
||||||
progress::-webkit-progress-bar {
|
progress::-webkit-progress-bar {
|
||||||
background: @HeaderColor;
|
background: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Big buttons */
|
||||||
|
|
||||||
|
|
||||||
|
.block {
|
||||||
|
display: inline-block;
|
||||||
|
width: 65%;
|
||||||
|
border: 2px solid @HeaderColor;
|
||||||
|
background-color: @HeaderColor;
|
||||||
|
height: 50px;
|
||||||
|
margin-top: 8px;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
font-family: @font;
|
||||||
|
padding-left: 2px;
|
||||||
|
padding-right: 2px;
|
||||||
|
font-size: 16px;
|
||||||
|
color: @Bg-extra-light;
|
||||||
|
/*cursor: pointer;*/
|
||||||
|
text-align: center;
|
||||||
|
vertical-align: middle;
|
||||||
|
|
||||||
|
/*transition: box-shadow 0.25s cubic-bezier(0.08, 0.59, 0.29, 0.99) 0s, color 0.25s cubic-bezier(0.08, 0.59, 0.29, 0.99) 0s, border-color 0.25s cubic-bezier(0.08, 0.59, 0.29, 0.99) 0s, transform 0.25s cubic-bezier(0.08, 0.59, 0.29, 0.99) 0s, background-color 0.25s cubic-bezier(0.08, 0.59, 0.29, 0.99) 0s;*/
|
||||||
|
|
||||||
|
|
||||||
|
border-radius: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block a {
|
||||||
|
display: inline-block;
|
||||||
|
min-width: 100%;
|
||||||
|
padding: 0px;
|
||||||
|
|
||||||
|
padding-top : 0px;
|
||||||
|
height: 46px;
|
||||||
|
line-height:46px;
|
||||||
|
color: #fff;
|
||||||
|
text-decoration: none;
|
||||||
|
border-radius: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*.block:hover, */
|
||||||
|
.block a:hover {
|
||||||
|
/*border: 2px solid @HeaderColor;*/
|
||||||
|
background-color: #fff;
|
||||||
|
color: @HeaderColor;
|
||||||
|
margin-left: -2px;
|
||||||
|
margin-right: -2px;
|
||||||
|
padding-left: 2px;
|
||||||
|
padding-right: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width:999px) and (min-width:01px) {
|
||||||
|
.block { width: 90%;}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Todotxt support */
|
||||||
|
|
||||||
|
|
||||||
|
.todotxt_A { color: darken(@fg,5%);}
|
||||||
|
.todotxt_B { color: desaturate(lighten(spin(@fg, 30),5%),20%); }
|
||||||
|
.todotxt_C { color: desaturate(lighten(spin(@fg, 60),10%),30%); }
|
||||||
|
.todotxt_D { color: desaturate(lighten(spin(@fg, 90),15%),40%); }
|
||||||
|
.todotxt_E { color: desaturate(lighten(spin(@fg, 120),20%),45%); }
|
||||||
|
.todotxt_F { color: desaturate(lighten(@fg,25%),50%); }
|
||||||
|
|
||||||
|
|
||||||
|
.todotxt_context { color: spin(@fg, 180); }
|
||||||
|
.todotxt_tag { color: spin(@fg, 90); }
|
||||||
|
.todotxt_deleted {opacity: 0.4; }
|
||||||
|
.todotxt_date {background-color:darken(@bg,5%); }
|
||||||
|
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
/* Invert all elements on the body while attempting to not alter the hue substantially. */
|
||||||
|
body {
|
||||||
|
filter: invert(100%) hue-rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Workarounds and optical adjustments. */
|
||||||
|
|
||||||
|
/* Firefox workaround: Set the background colour for the html
|
||||||
|
element separately because, unlike other browsers, Firefox
|
||||||
|
doesn’t apply the filter to the root element’s background. */
|
||||||
|
html {
|
||||||
|
background-color: #111;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Do not invert media (revert the invert). */
|
||||||
|
img, video, iframe {
|
||||||
|
filter: invert(100%) hue-rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
#header-wrapper {
|
||||||
|
filter: invert(100%) hue-rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
h1, h2, h3, h4 {
|
||||||
|
color: @fg;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Improve contrast on icons. */
|
||||||
|
.icon {
|
||||||
|
filter: invert(15%) hue-rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Re-enable code block backgrounds. */
|
||||||
|
pre {
|
||||||
|
filter: invert(6%);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Improve contrast on list item markers. */
|
||||||
|
li::marker {
|
||||||
|
color: #555;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
0
doc/.gitkeep
Normal file
0
doc/.gitkeep
Normal file
1
doc/DESCRIPTION.md
Normal file
1
doc/DESCRIPTION.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
LionWiki-t2t is a minimalist Wiki engine programmed in PHP. It is extensible, templatable, file based (it doesn't need database like MySQL) and requires just one file to function (30 kb). It is suitable for small websites, personal notebooks or journals. This version is using the lightweight markup language TXT2TAGS.
|
||||||
1
doc/DESCRIPTION_fr.md
Normal file
1
doc/DESCRIPTION_fr.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Lionwiki-t2t est un système de type wiki minimaliste, programmé en PHP. Il est extensible et n'utilise que des fichiers plats pour sa base de données. Il est adapté pour la création de petits sites web, de notes personnelles ou de journaux. Cette version utilise le langage de balisage léger TXT2TAGS.
|
||||||
51
doc/DISCLAIMER.md
Normal file
51
doc/DISCLAIMER.md
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
In the root folder of this app, there are two files: `config.php` and `config.t2t`
|
||||||
|
|
||||||
|
- `config.php` is for changing password, the template used, default page. You can also define an administrator password which has some more rights (it's possible to lock some pages and modify them only with the administrator password, add some IP address to a blacklist)
|
||||||
|
|
||||||
|
- `config.t2t` is for tweaking your wiki syntax. You can define more tags (using the txt2tags rules) for specific behaviors.
|
||||||
|
|
||||||
|
The `pheditor.php` tool at the root of the site allows you to edit all the necessary configuration files. You can remove or rename it from its interface. The password is the same as the one defined during installation.
|
||||||
|
|
||||||
|
#### Multi-users support
|
||||||
|
|
||||||
|
This is only a single password for editing the wiki (it's not multi-user), and one other password for administration. Both are set to the same one defined in the lionwiki-t2t during the installation by YunoHost.
|
||||||
|
|
||||||
|
You can set the wiki to private (only readable when you are connected to YunoHost SSO) or public (readable by the whole internet).
|
||||||
|
|
||||||
|
You can install multiple instance of this app.
|
||||||
|
|
||||||
|
## Additional information
|
||||||
|
|
||||||
|
You must define a base color during the installation (in hexadecimal format). You can choose it using this online tool for example: https://www.w3schools.com/colors/colors_picker.asp
|
||||||
|
|
||||||
|
It will modify the `templates/minimaxing/minimaxing.less` file and compile it using the lessc command (from the node-less package).
|
||||||
|
|
||||||
|
After the installation, you can edit the base color found in `/var/www/lionwikit2t/templates/minimaxing/minimaxing.less` file.
|
||||||
|
|
||||||
|
Search for:
|
||||||
|
|
||||||
|
```
|
||||||
|
/* For YunoHost config */
|
||||||
|
@MainColor: #D17732;
|
||||||
|
```
|
||||||
|
|
||||||
|
Go inside your installation folder (adapt it to your case, if it's the second instance you've installed, it will be named /var/www/lionwikit2t__2/):
|
||||||
|
|
||||||
|
```
|
||||||
|
cd /var/www/lionwikit2t
|
||||||
|
```
|
||||||
|
|
||||||
|
Then compile it with:
|
||||||
|
|
||||||
|
```
|
||||||
|
lessc templates/minimaxing/minimaxing.less > templates/minimaxing/minimaxing.css
|
||||||
|
```
|
||||||
|
|
||||||
|
If something goes wrong, you can go back to the original default file:
|
||||||
|
|
||||||
|
```
|
||||||
|
cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css
|
||||||
|
```
|
||||||
|
|
||||||
49
doc/DISCLAIMER_fr.md
Normal file
49
doc/DISCLAIMER_fr.md
Normal file
|
|
@ -0,0 +1,49 @@
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
Dans le dossier racine de l'application il y a 2 fichiers, `config.php` et `config.t2t`
|
||||||
|
|
||||||
|
- config.php permet de modifier le mot de passe, le choix du template utilisé et la page par défaut. Vous pouvez également définir ici un mot de passe administrateur (pour bloquer certaines pages en édition)
|
||||||
|
|
||||||
|
- `config.t2t` est pour customiser votre syntaxe wiki. Vous pouvez définir là de nouvelles balises (utilisant les règles txt2tags) pour des comportements spécifiques.
|
||||||
|
|
||||||
|
- L'outil `pheditor.php` à la racine du site permet d'éditer tous les fichiers de configuration nécessaires. Vous pouvez le retirer ou le renommer depuis son interface. Le mot de passe est le même que celui définit lors de l'installation.
|
||||||
|
|
||||||
|
#### Support multi-utilisateurs
|
||||||
|
|
||||||
|
Il y a un seul mot de passe pour éditer ce wiki (dans le fichier config.php), et un autre pour l'administration. C'est le même qui a a été créé lors de l'installation par YunoHost.
|
||||||
|
|
||||||
|
Vous pouvez passer le wiki en mode privé ou public, selon vos usages.
|
||||||
|
|
||||||
|
## Informations additionnelles
|
||||||
|
|
||||||
|
Vous devez définir une couleur de base durant l'installation, au format hexadécimal. Vous pouvez la choisir en utilisant cet outil en ligne : https://www.w3schools.com/colors/colors_picker.asp
|
||||||
|
|
||||||
|
La couleur choisie va modifier le fichier `templates/minimaxing/minimaxing.less` et le compiler en utilisant la commande lessc (du paquet node-less).
|
||||||
|
|
||||||
|
Après l'installation, vous pouvez éditer la couleur de base dans le fichier `/var/www/lionwikit2t/templates/minimaxing/minimaxing.less`
|
||||||
|
|
||||||
|
Recherchez pour :
|
||||||
|
|
||||||
|
```
|
||||||
|
/* For YunoHost config */
|
||||||
|
@MainColor: #D17732;
|
||||||
|
```
|
||||||
|
|
||||||
|
Allez dans le dossier d'installation (à adapter à votre cas, si c'est la seconde instance installée, cela sera nommé `/var/www/lionwikit2t__2/`) :
|
||||||
|
|
||||||
|
```
|
||||||
|
cd /var/www/lionwikit2t
|
||||||
|
```
|
||||||
|
|
||||||
|
Ensuite compilez le fichier avec :
|
||||||
|
|
||||||
|
```
|
||||||
|
lessc templates/minimaxing/minimaxing.less > templates/minimaxing/minimaxing.css
|
||||||
|
```
|
||||||
|
|
||||||
|
Si quelque chose se passe mal, vous pouvez revenir au fichier original :
|
||||||
|
|
||||||
|
```
|
||||||
|
cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css
|
||||||
|
```
|
||||||
|
|
||||||
0
doc/screenshots/.gitkeep
Normal file
0
doc/screenshots/.gitkeep
Normal file
0
screenshot_lionwikit2t.png → doc/screenshots/screenshot_lionwikit2t.png
Executable file → Normal file
0
screenshot_lionwikit2t.png → doc/screenshots/screenshot_lionwikit2t.png
Executable file → Normal file
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 99 KiB |
|
|
@ -6,8 +6,15 @@
|
||||||
"en": "Lightweight wiki-style CMS using the txt2tags syntax",
|
"en": "Lightweight wiki-style CMS using the txt2tags syntax",
|
||||||
"fr": "CMS léger, géré sous forme de wiki utilisant la syntaxe txt2tags"
|
"fr": "CMS léger, géré sous forme de wiki utilisant la syntaxe txt2tags"
|
||||||
},
|
},
|
||||||
"version": "3.2.12~ynh1",
|
"version": "3.2.12~ynh2",
|
||||||
"url": "https://lionwiki-t2t.sourceforge.io/",
|
"url": "https://lionwiki-t2t.sourceforge.io/",
|
||||||
|
"upstream": {
|
||||||
|
"license": "MIT",
|
||||||
|
"website": "https://lionwiki-t2t.sourceforge.io/",
|
||||||
|
"admindoc": "https://lionwiki-t2t.sourceforge.io/",
|
||||||
|
"userdoc": "https://github.com/farvardin/whatistxt2tags",
|
||||||
|
"code": "https://sourceforge.net/projects/lionwiki-t2t"
|
||||||
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"maintainer": {
|
"maintainer": {
|
||||||
"name": "Eric Forgeot"
|
"name": "Eric Forgeot"
|
||||||
|
|
@ -32,10 +39,6 @@
|
||||||
"example": "/lionwiki",
|
"example": "/lionwiki",
|
||||||
"default": "/lionwiki"
|
"default": "/lionwiki"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "admin",
|
|
||||||
"type": "user"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "is_public",
|
"name": "is_public",
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
|
|
@ -55,6 +58,10 @@
|
||||||
"choices": ["fr", "en"],
|
"choices": ["fr", "en"],
|
||||||
"default": "en"
|
"default": "en"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "admin",
|
||||||
|
"type": "user"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "password",
|
"name": "password",
|
||||||
"type": "password",
|
"type": "password",
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers
|
||||||
# MANAGE SCRIPT FAILURE
|
# MANAGE SCRIPT FAILURE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
|
# Exit if an error occurs during the execution of the script
|
||||||
ynh_abort_if_errors
|
ynh_abort_if_errors
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
|
||||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=4
|
ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=4
|
||||||
|
|
||||||
|
|
@ -40,7 +40,7 @@ ynh_clean_setup () {
|
||||||
# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
|
# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
|
||||||
ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
|
ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
|
||||||
|
|
||||||
# restore it if the upgrade fails
|
# Restore it if the upgrade fails
|
||||||
ynh_restore_upgradebackup
|
ynh_restore_upgradebackup
|
||||||
}
|
}
|
||||||
# Exit if an error occurs during the execution of the script
|
# Exit if an error occurs during the execution of the script
|
||||||
|
|
@ -62,6 +62,8 @@ then
|
||||||
change_path=1
|
change_path=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# STANDARD MODIFICATIONS
|
||||||
#=================================================
|
#=================================================
|
||||||
# MODIFY URL IN NGINX CONF
|
# MODIFY URL IN NGINX CONF
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -91,6 +93,8 @@ then
|
||||||
ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
|
ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# GENERIC FINALISATION
|
||||||
#=================================================
|
#=================================================
|
||||||
# RELOAD NGINX
|
# RELOAD NGINX
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
ynh_clean_setup () {
|
ynh_clean_setup () {
|
||||||
### Remove this function if there's nothing to clean before calling the remove script.
|
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
# Exit if an error occurs during the execution of the script
|
# Exit if an error occurs during the execution of the script
|
||||||
|
|
@ -26,9 +25,9 @@ ynh_abort_if_errors
|
||||||
|
|
||||||
domain=$YNH_APP_ARG_DOMAIN
|
domain=$YNH_APP_ARG_DOMAIN
|
||||||
path_url=$YNH_APP_ARG_PATH
|
path_url=$YNH_APP_ARG_PATH
|
||||||
admin=$YNH_APP_ARG_ADMIN
|
|
||||||
is_public=$YNH_APP_ARG_IS_PUBLIC
|
is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||||
language=$YNH_APP_ARG_LANGUAGE
|
language=$YNH_APP_ARG_LANGUAGE
|
||||||
|
admin=$YNH_APP_ARG_ADMIN
|
||||||
password=$YNH_APP_ARG_PASSWORD
|
password=$YNH_APP_ARG_PASSWORD
|
||||||
wiki=$YNH_APP_ARG_WIKI
|
wiki=$YNH_APP_ARG_WIKI
|
||||||
color=$YNH_APP_ARG_COLOR
|
color=$YNH_APP_ARG_COLOR
|
||||||
|
|
@ -53,20 +52,11 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
|
||||||
|
|
||||||
ynh_app_setting_set --app=$app --key=domain --value=$domain
|
ynh_app_setting_set --app=$app --key=domain --value=$domain
|
||||||
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
||||||
ynh_app_setting_set --app=$app --key=admin --value=$admin
|
|
||||||
ynh_app_setting_set --app=$app --key=language --value=$language
|
ynh_app_setting_set --app=$app --key=language --value=$language
|
||||||
|
ynh_app_setting_set --app=$app --key=admin --value=$admin
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STANDARD MODIFICATIONS
|
# STANDARD MODIFICATIONS
|
||||||
#=================================================
|
|
||||||
# FIND AND OPEN A PORT
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Finding an available port..." --weight=1
|
|
||||||
|
|
||||||
# Find an available port
|
|
||||||
port=$(ynh_find_port --port=8095)
|
|
||||||
ynh_app_setting_set --app=$app --key=port --value=$port
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# INSTALL DEPENDENCIES
|
# INSTALL DEPENDENCIES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -74,6 +64,14 @@ ynh_script_progression --message="Installing dependencies..." --weight=3
|
||||||
|
|
||||||
ynh_install_app_dependencies $pkg_dependencies
|
ynh_install_app_dependencies $pkg_dependencies
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# CREATE DEDICATED USER
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Configuring system user..." --weight=1
|
||||||
|
|
||||||
|
# Create a system user
|
||||||
|
ynh_system_user_create --username=$app --home_dir="$final_path"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -83,22 +81,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
|
||||||
# Download, check integrity, uncompress and patch the source from app.src
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
ynh_setup_source --dest_dir="$final_path"
|
ynh_setup_source --dest_dir="$final_path"
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# NGINX CONFIGURATION
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Configuring NGINX web server..." --weight=2
|
|
||||||
|
|
||||||
# Create a dedicated NGINX config
|
|
||||||
ynh_add_nginx_config
|
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# CREATE DEDICATED USER
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Configuring system user..." --weight=1
|
|
||||||
|
|
||||||
# Create a system user
|
|
||||||
ynh_system_user_create --username=$app
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# PHP-FPM CONFIGURATION
|
# PHP-FPM CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -108,10 +90,20 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
|
||||||
ynh_add_fpm_config
|
ynh_add_fpm_config
|
||||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# NGINX CONFIGURATION
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Configuring NGINX web server..." --weight=2
|
||||||
|
|
||||||
|
# Create a dedicated NGINX config
|
||||||
|
ynh_add_nginx_config
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# SPECIFIC SETUP
|
# SPECIFIC SETUP
|
||||||
#=================================================
|
#=================================================
|
||||||
# customise Lionwiki-t2t
|
# ADD A CONFIGURATION
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Adding a configuration file..."
|
||||||
|
|
||||||
### Copy Yunohost specific configuration
|
### Copy Yunohost specific configuration
|
||||||
# This File cannot be modified directly by wiki, only by hand or by Yunohost
|
# This File cannot be modified directly by wiki, only by hand or by Yunohost
|
||||||
|
|
@ -167,16 +159,10 @@ lessc $final_path/templates/ggp/ggp.less > $final_path/templates/ggp/ggp.css
|
||||||
|
|
||||||
#ynh_replace_string --match_string="__YNH_COLOR__" --replace_string="$color" --target_file="$final_path/templates/minimaxing/minimaxing.css"
|
#ynh_replace_string --match_string="__YNH_COLOR__" --replace_string="$color" --target_file="$final_path/templates/minimaxing/minimaxing.css"
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# STORE THE CONFIG FILE CHECKSUM
|
|
||||||
#=================================================
|
|
||||||
|
|
||||||
ynh_store_file_checksum --file="$final_path/config.php"
|
ynh_store_file_checksum --file="$final_path/config.php"
|
||||||
ynh_store_file_checksum --file="$final_path/config.t2t"
|
ynh_store_file_checksum --file="$final_path/config.t2t"
|
||||||
ynh_store_file_checksum --file="$final_path/menu.php"
|
ynh_store_file_checksum --file="$final_path/menu.php"
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# GENERIC FINALIZATION
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# SECURE FILES AND DIRECTORIES
|
# SECURE FILES AND DIRECTORIES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -187,14 +173,18 @@ chmod -R o-rwx $final_path
|
||||||
find $final_path -type d -exec chmod g=rx {} +
|
find $final_path -type d -exec chmod g=rx {} +
|
||||||
find $final_path -type f -exec chmod g=r {} +
|
find $final_path -type f -exec chmod g=r {} +
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# GENERIC FINALIZATION
|
||||||
#=================================================
|
#=================================================
|
||||||
# SETUP SSOWAT
|
# SETUP SSOWAT
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Configuring permissions..." --weight=1
|
ynh_script_progression --message="Configuring permissions..." --weight=1
|
||||||
|
|
||||||
# Make app public if necessary or protect it
|
# Make app public if necessary
|
||||||
if [ $is_public -eq 1 ]
|
if [ $is_public -eq 1 ]
|
||||||
then
|
then
|
||||||
|
# Everyone can access the app.
|
||||||
|
# The "main" permission is automatically created before the install script.
|
||||||
ynh_permission_update --permission="main" --add="visitors"
|
ynh_permission_update --permission="main" --add="visitors"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
|
||||||
app=$YNH_APP_INSTANCE_NAME
|
app=$YNH_APP_INSTANCE_NAME
|
||||||
|
|
||||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||||
port=$(ynh_app_setting_get --app=$app --key=port)
|
|
||||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -30,14 +29,6 @@ ynh_script_progression --message="Removing app main directory..." --weight=2
|
||||||
# Remove the app directory securely
|
# Remove the app directory securely
|
||||||
ynh_secure_remove --file="$final_path"
|
ynh_secure_remove --file="$final_path"
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# REMOVE DEPENDENCIES
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Removing dependencies..." --weight=2
|
|
||||||
|
|
||||||
# Remove metapackage and its dependencies
|
|
||||||
ynh_remove_app_dependencies
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# REMOVE NGINX CONFIGURATION
|
# REMOVE NGINX CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -54,6 +45,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
|
||||||
# Remove the dedicated PHP-FPM config
|
# Remove the dedicated PHP-FPM config
|
||||||
ynh_remove_fpm_config
|
ynh_remove_fpm_config
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# REMOVE DEPENDENCIES
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Removing dependencies..." --weight=2
|
||||||
|
|
||||||
|
# Remove metapackage and its dependencies
|
||||||
|
ynh_remove_app_dependencies
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALIZATION
|
# GENERIC FINALIZATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
ynh_clean_setup () {
|
ynh_clean_setup () {
|
||||||
#### Remove this function if there's nothing to clean before calling the remove script.
|
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
# Exit if an error occurs during the execution of the script
|
# Exit if an error occurs during the execution of the script
|
||||||
|
|
@ -24,7 +23,7 @@ ynh_abort_if_errors
|
||||||
#=================================================
|
#=================================================
|
||||||
# LOAD SETTINGS
|
# LOAD SETTINGS
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Loading settings..." --weight=1
|
ynh_script_progression --message="Loading installation settings..." --weight=1
|
||||||
|
|
||||||
app=$YNH_APP_INSTANCE_NAME
|
app=$YNH_APP_INSTANCE_NAME
|
||||||
|
|
||||||
|
|
@ -38,23 +37,11 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Validating restoration parameters..." --weight=1
|
ynh_script_progression --message="Validating restoration parameters..." --weight=1
|
||||||
|
|
||||||
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
|
test ! -d $final_path \
|
||||||
|
|| ynh_die --message="There is already a directory: $final_path "
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STANDARD RESTORATION STEPS
|
# STANDARD RESTORATION STEPS
|
||||||
#=================================================
|
|
||||||
# RESTORE THE NGINX CONFIGURATION
|
|
||||||
#=================================================
|
|
||||||
|
|
||||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# RESTORE THE APP MAIN DIR
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Restoring the app main directory..." --weight=2
|
|
||||||
|
|
||||||
ynh_restore_file --origin_path="$final_path"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RECREATE THE DEDICATED USER
|
# RECREATE THE DEDICATED USER
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -64,8 +51,11 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
|
||||||
ynh_system_user_create --username=$app
|
ynh_system_user_create --username=$app
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RESTORE USER RIGHTS
|
# RESTORE THE APP MAIN DIR
|
||||||
#=================================================
|
#=================================================
|
||||||
|
ynh_script_progression --message="Restoring the app main directory..." --weight=2
|
||||||
|
|
||||||
|
ynh_restore_file --origin_path="$final_path"
|
||||||
|
|
||||||
# Restore permissions on app files
|
# Restore permissions on app files
|
||||||
chown -R $app:www-data $final_path
|
chown -R $app:www-data $final_path
|
||||||
|
|
@ -73,13 +63,6 @@ chmod -R o-rwx $final_path
|
||||||
find $final_path -type d -exec chmod g=rx {} +
|
find $final_path -type d -exec chmod g=rx {} +
|
||||||
find $final_path -type f -exec chmod g=r {} +
|
find $final_path -type f -exec chmod g=r {} +
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# RESTORE THE PHP-FPM CONFIGURATION
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=3
|
|
||||||
|
|
||||||
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# SPECIFIC RESTORATION
|
# SPECIFIC RESTORATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -90,6 +73,20 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=4
|
||||||
# Define and install dependencies
|
# Define and install dependencies
|
||||||
ynh_install_app_dependencies $pkg_dependencies
|
ynh_install_app_dependencies $pkg_dependencies
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# RESTORE THE PHP-FPM CONFIGURATION
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=3
|
||||||
|
|
||||||
|
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# RESTORE THE NGINX CONFIGURATION
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Restoring the NGINX web server configuration..."
|
||||||
|
|
||||||
|
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALIZATION
|
# GENERIC FINALIZATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
||||||
|
|
@ -18,14 +18,15 @@ app=$YNH_APP_INSTANCE_NAME
|
||||||
|
|
||||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||||
|
language=$(ynh_app_setting_get --app=$app --key=language)
|
||||||
admin=$(ynh_app_setting_get --app=$app --key=admin)
|
admin=$(ynh_app_setting_get --app=$app --key=admin)
|
||||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||||
language=$(ynh_app_setting_get --app=$app --key=language)
|
|
||||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# CHECK VERSION
|
# CHECK VERSION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
ynh_script_progression --message="Checking version..."
|
||||||
|
|
||||||
upgrade_type=$(ynh_check_app_version_changed)
|
upgrade_type=$(ynh_check_app_version_changed)
|
||||||
|
|
||||||
|
|
@ -37,7 +38,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
|
||||||
# Backup the current version of the app
|
# Backup the current version of the app
|
||||||
ynh_backup_before_upgrade
|
ynh_backup_before_upgrade
|
||||||
ynh_clean_setup () {
|
ynh_clean_setup () {
|
||||||
# restore it if the upgrade fails
|
# Restore it if the upgrade fails
|
||||||
ynh_restore_upgradebackup
|
ynh_restore_upgradebackup
|
||||||
}
|
}
|
||||||
# Exit if an error occurs during the execution of the script
|
# Exit if an error occurs during the execution of the script
|
||||||
|
|
@ -61,6 +62,14 @@ if ynh_legacy_permissions_exists; then
|
||||||
ynh_app_setting_delete --app=$app --key=is_public
|
ynh_app_setting_delete --app=$app --key=is_public
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# CREATE DEDICATED USER
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
|
||||||
|
|
||||||
|
# Create a dedicated user (if not existing)
|
||||||
|
ynh_system_user_create --username=$app --home_dir="$final_path"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -73,14 +82,6 @@ then
|
||||||
ynh_setup_source --dest_dir="$final_path"
|
ynh_setup_source --dest_dir="$final_path"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# NGINX CONFIGURATION
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
|
|
||||||
|
|
||||||
# Create a dedicated nginx config
|
|
||||||
ynh_add_nginx_config
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# UPGRADE DEPENDENCIES
|
# UPGRADE DEPENDENCIES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -88,14 +89,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=3
|
||||||
|
|
||||||
ynh_install_app_dependencies $pkg_dependencies
|
ynh_install_app_dependencies $pkg_dependencies
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# CREATE DEDICATED USER
|
|
||||||
#=================================================
|
|
||||||
ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
|
|
||||||
|
|
||||||
# Create a dedicated user (if not existing)
|
|
||||||
ynh_system_user_create --username=$app
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# PHP-FPM CONFIGURATION
|
# PHP-FPM CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -104,6 +97,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
|
||||||
# Create a dedicated PHP-FPM config
|
# Create a dedicated PHP-FPM config
|
||||||
ynh_add_fpm_config
|
ynh_add_fpm_config
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# NGINX CONFIGURATION
|
||||||
|
#=================================================
|
||||||
|
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
|
||||||
|
|
||||||
|
# Create a dedicated NGINX config
|
||||||
|
ynh_add_nginx_config
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STORE THE CONFIG FILE CHECKSUM
|
# STORE THE CONFIG FILE CHECKSUM
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
@ -118,7 +119,8 @@ ynh_store_file_checksum --file="$final_path/config.php"
|
||||||
ynh_store_file_checksum --file="$final_path/config.t2t"
|
ynh_store_file_checksum --file="$final_path/config.t2t"
|
||||||
ynh_store_file_checksum --file="$final_path/menu.php"
|
ynh_store_file_checksum --file="$final_path/menu.php"
|
||||||
|
|
||||||
ynh_restore_file -o "conf/config.php"
|
#ynh_restore_file -o "conf/config.php"
|
||||||
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# SECURE FILES AND DIRECTORIES
|
# SECURE FILES AND DIRECTORIES
|
||||||
|
|
@ -130,6 +132,8 @@ chmod -R o-rwx $final_path
|
||||||
find $final_path -type d -exec chmod g=rx {} +
|
find $final_path -type d -exec chmod g=rx {} +
|
||||||
find $final_path -type f -exec chmod g=r {} +
|
find $final_path -type f -exec chmod g=r {} +
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
# GENERIC FINALIZATION
|
||||||
#=================================================
|
#=================================================
|
||||||
# RELOAD NGINX
|
# RELOAD NGINX
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue