Fix

conf/settings.json

@@ -113,7 +113,7 @@
    * "full-width-editor" variant (by default editor is rendered as a page, with
    * a max-width of 900px).
    */
-  "skinVariants": "super-light-toolbar super-light-editor light-background",
+   "skinVariants": "light-toolbar super-light-editor dark-background",
 
   /*
    * IP and port which Etherpad should bind at.

manifest.json

@@ -50,8 +50,8 @@
 				"name": "admin",
 				"type": "user",
 				"ask": {
-					"en": "Choose the Etherpad MyPads administrator (must be an existing YunoHost user)",
+					"en": "Choose the Etherpad MyPads administrator",
-					"fr": "Choisissez l'administrateur Etherpad MyPads (doit être un utilisateur YunoHost existant)"
+					"fr": "Choisissez l'administrateur Etherpad MyPads"
 				},
 				"example": "john"
 			},
@@ -71,7 +71,7 @@
 					"en": "Choose your language",
 					"fr": "Choisissez la langue"
 				},
-				"choices" : ["en", "fr"],
+				"choices": ["de", "en", "es", "fr", "it", "pt"],
 				"default" : "en"
 			},
 			{

scripts/_common.sh

@@ -4,6 +4,35 @@
 # PERSONAL HELPERS
 #=================================================
 
+# Dependencies for AbiWord
+abiword_app_depencencies="abiword"
+
+# Dependencies for LibreOffice
+libreoffice_app_dependencies="unoconv libreoffice-writer"
+
+# NodeJS version
+nodejs_version=14
+
+# MyPads version
+# This variable is mostly used to force an upgrade of the package in case of new versions of MyPads.
+# mypads_version=1.7.19
+
+# Plugin versions
+# ep_align_version=0.3.31
+# ep_author_hover_version=0.3.17
+# ep_automatic_logut_version=1.0.8
+# ep_comments_page_version=0.1.51
+# ep_countable_version=0.0.8
+# ep_delete_empty_pads_version=0.0.6
+# ep_font_color_version=0.0.38
+# ep_font_size_version=0.4.18
+# ep_headings2_version=0.2.24
+# ep_markdown_version=0.1.30
+# ep_page_view_version=0.5.26
+# ep_spellcheck_version=0.0.25
+# ep_subscript_and_superscript_version=0.2.21
+# ep_table_of_contents_version=0.3.17
+
 #=================================================
 # BACKUP
 #=================================================

scripts/_variables

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Dependencies for AbiWord
-abiword_app_depencencies="abiword"
-
-# Dependencies for LibreOffice
-libreoffice_app_dependencies="unoconv libreoffice-writer"
-
-# NodeJS version
-nodejs_version=14
-
-# MyPads version
-# This variable is mostly used to force an upgrade of the package in case of new versions of MyPads.
-mypads_version=1.7.19
-
-# Plugin versions
-ep_align_version=0.3.31
-ep_author_hover_version=0.3.17
-ep_automatic_logut_version=1.0.8
-ep_comments_page_version=0.1.51
-ep_countable_version=0.0.8
-ep_delete_empty_pads_version=0.0.6
-ep_font_color_version=0.0.38
-ep_font_size_version=0.4.18
-ep_headings2_version=0.2.24
-ep_markdown_version=0.1.30
-ep_page_view_version=0.5.26
-ep_spellcheck_version=0.0.25
-ep_subscript_and_superscript_version=0.2.21
-ep_table_of_contents_version=0.3.17

scripts/config

@@ -7,8 +7,6 @@
 #=================================================
 
 # Load common variables for all scripts.
-source _variables
-
 source _common.sh
 source /usr/share/yunohost/helpers
 

scripts/install

@@ -7,8 +7,6 @@
 #=================================================
 
 # Load common variables for all scripts.
-source _variables
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -331,8 +329,7 @@ ynh_systemd_action --action=reload --service_name=nginx
 ynh_script_progression --message="Restarting Etherpad..." --weight=20
 
 # Wait for Etherpad to be fully started
-ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" #--timeout="120"
+ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is"
-sleep 120
 
 if [ $mypads -eq 1 ]
 then
@@ -340,8 +337,7 @@ then
 	mysql -u $db_name -p$db_pwd $db_name < "../conf/lang_mypads.sql"
 
 	# Wait for Etherpad to be fully started
-	ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" #--timeout="120"
+	ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is"
-	sleep 120
 fi
 
 #=================================================

scripts/restore

@@ -7,8 +7,6 @@
 #=================================================
 
 # Load common variables for all scripts.
-source ../settings/scripts/_variables
-
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 

scripts/upgrade

@@ -7,8 +7,6 @@
 #=================================================
 
 # Load common variables for all scripts.
-source _variables
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -209,7 +207,7 @@ fi
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
-# Overwrite the nginx configuration only if it's allowed
+# Overwrite the NGINX configuration only if it's allowed
 if [ $overwrite_nginx -eq 1 ]
 then
 	ynh_add_nginx_config