From edb0f6ae1bb72d706b725bdd64c109803baf4fc8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 29 Sep 2020 17:53:42 +0200 Subject: [PATCH] Small fixes --- README.md | 2 +- README_fr.md | 2 +- conf/config.example.js | 50 +++++++++++++++++++++--------------------- scripts/backup | 2 +- scripts/change_url | 4 ++-- scripts/install | 8 +++---- scripts/remove | 8 +++---- scripts/restore | 4 ++-- scripts/upgrade | 6 ++--- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index a7e6085..26d21c6 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Luckysheet is an online spreadsheet that is powerful, simple to configure, and c ## Documentation - * Official documentation: https://mengshukeji.github.io/LuckysheetDocs/ + * Official documentation: https://mengshukeji.github.io/LuckysheetDocs/guide/ * YunoHost documentation: ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 26f7851..f603c9c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Luckysheet est une feuille de calcul en ligne, puissante, simple à configurer e ## Documentation - * Documentation officielle : https://mengshukeji.github.io/LuckysheetDocs/ + * Documentation officielle : https://mengshukeji.github.io/LuckysheetDocs/guide/ * Documentation YunoHost : ## Caractéristiques spécifiques YunoHost diff --git a/conf/config.example.js b/conf/config.example.js index 0ca6e1a..93c0bc3 100644 --- a/conf/config.example.js +++ b/conf/config.example.js @@ -2,38 +2,38 @@ * The default luckysheet config object. */ export default { - container: "luckysheet", //ID of the container - column: 60, //Default number of columns for empty tables - row: 84, //Default row data amount for empty table - allowCopy: true, //Whether to allow copy - showtoolbar: true, //Whether to display the toolbar in the second column - showinfobar: true, //Whether to show the top name bar - showsheetbar: true, //Whether to display the bottom table name area + container: "luckysheet", //ID of the container + column: 60, //Default number of columns for empty tables + row: 84, //Default row data amount for empty table + allowCopy: true, //Whether to allow copy + showtoolbar: true, //Whether to display the toolbar in the second column + showinfobar: true, //Whether to show the top name bar + showsheetbar: true, //Whether to display the bottom table name area showstatisticBar: true, //Whether to show the bottom count bar - pointEdit: false, //Whether it is the editor insert table mode - pointEditUpdate: null, //Editor table update function - pointEditZoom: 1, //Scaling ratio during editor table editing + pointEdit: false, //Whether it is the editor insert table mode + pointEditUpdate: null, //Editor table update function + pointEditZoom: 1, //Scaling ratio during editor table editing // menu: "undo|redo|freezenrow|freezencolumn|download|share|chart|pivot", data: [{ "name": "Sheet1", color: "", "status": "1", "order": "0", "data": [], "config": {}, "index":0 }, { "name": "Sheet2", color: "", "status": "0", "order": "1", "data": [], "config": {}, "index":1 }, { "name": "Sheet3", color: "", "status": "0", "order": "2", "data": [], "config": {}, "index":2 }], //客户端sheet数据[shee1, sheet2, sheet3] title: "Luckysheet", //The name of the table userInfo: ' rabbit', //User information display style in the upper right corner userMenuItem: [{url:"", "icon":'', "name":"My form"}, {url:"www.baidu.com", "icon":'', "name":"sign out"}], //Click the pop-up menu of user information in the upper right corner - myFolderUrl: "", //The upper left corner 下载 ' showConfigWindowResize: true, //The configuration of the chart and pivot table will pop up on the right side, set whether the table will automatically indent after popping up - enableAddRow: true,//Allow additional rows - enableAddCol: true,//Allow adding columns - enablePage: false,//Allow to load next page + enableAddRow: true, //Allow additional rows + enableAddCol: true, //Allow adding columns + enablePage: false, //Allow to load next page autoFormatw: false, //Automatically format numbers exceeding 4 digits into hundreds of millions of formats Example: true or "true" or "TRUE" accuracy: undefined, //Set the exact number of digits of the transmitted value, n digits after the decimal point. The parameter is a number or a string of numbers, for example: "0" or 0 pageInfo:{ @@ -47,9 +47,9 @@ export default { "pageUrl":"", }, editMode: false, //Is it in edit mode - chartConfigChange: null,//Custom method for triggering chart update in chart plugin - beforeCreateDom: null,//Method before table creation - fireMousedown: null, //Cell data drill down - lang: 'en', //language - plugins: [], //plugins, e.g. ['chart'] + chartConfigChange: null, //Custom method for triggering chart update in chart plugin + beforeCreateDom: null, //Method before table creation + fireMousedown: null, //Cell data drill down + lang: 'en', //language + plugins: [], //plugins, e.g. ['chart'] } \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index d548f15..acdf11c 100644 --- a/scripts/backup +++ b/scripts/backup @@ -58,4 +58,4 @@ ynh_backup --src_path="/etc/systemd/system/$app.service" # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for Luckysheet. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index d61e8a8..15f91aa 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,7 +33,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up $app before changing its URL (may take a while)..." --weight=1 +ynh_script_progression --message="Backing up Luckysheet before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -122,4 +122,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression --message="Change of URL completed for Luckysheet" --last diff --git a/scripts/install b/scripts/install index b7c6650..cacaa7d 100644 --- a/scripts/install +++ b/scripts/install @@ -80,9 +80,9 @@ ynh_setup_source --dest_dir=$final_path #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring Nginx web server..." --weight=2 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -98,7 +98,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path #============================================== # INSTALL HEDGEDOC #============================================== -ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=240 +ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=20 pushd "$final_path" || ynh_die @@ -171,4 +171,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression --message="Installation of Luckysheet completed" --last diff --git a/scripts/remove b/scripts/remove index 46270e3..47be8c7 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,10 +26,10 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service..." --weight=1 + ynh_script_progression --message="Removing Luckysheet service..." --weight=1 yunohost service remove $app fi @@ -51,7 +51,7 @@ ynh_remove_nodejs #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=6 +ynh_script_progression --message="Removing Luckysheet main directory..." --weight=6 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -78,4 +78,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression --message="Removal of Luckysheet completed" --last diff --git a/scripts/restore b/scripts/restore index e41abf8..a7219c5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,7 +52,7 @@ 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=60 +ynh_script_progression --message="Restoring Luckysheet main directory..." --weight=60 ynh_restore_file --origin_path="$final_path" @@ -117,4 +117,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression --message="Restoration completed for Luckysheet" --last diff --git a/scripts/upgrade b/scripts/upgrade index aa1524f..66b9880 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=120 +ynh_script_progression --message="Backing up Luckysheet before upgrading (may take a while)..." --weight=120 # Backup the current version of the app ynh_backup_before_upgrade @@ -98,7 +98,7 @@ ynh_system_user_create --username=$app #============================================== if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=160 + ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=160 pushd "$final_path" || ynh_die @@ -154,4 +154,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression --message="Upgrade of Luckysheet completed" --last