From 136e8d7b779d0e18ab4d8f82d490806977c9a95d Mon Sep 17 00:00:00 2001 From: mrflos Date: Fri, 17 May 2024 17:22:19 +0200 Subject: [PATCH] fix(install): add PageRapideHaut and typo bash --- conf/CLIC/default-content.sql | 19 ++++++++++++++++--- scripts/install | 8 ++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/conf/CLIC/default-content.sql b/conf/CLIC/default-content.sql index d6db4df..f496622 100644 --- a/conf/CLIC/default-content.sql +++ b/conf/CLIC/default-content.sql @@ -340,12 +340,13 @@ Double cliquer sur ce texte pour éditer cette colonne. ('PageMenuHaut', now(), ' - [[?PagePrincipale#Cooperer Coopérer]] - [[?PagePrincipale#S-informer S\'informer]] - [[?PagePrincipale#Echanger Echanger]]', '', '{{WikiName}}', '{{WikiName}}', 'Y', 'page', ''), -('{{rootPage}}', now(), '{{section bgcolor=\"var(--primary-color)\" class=\"shape-rounded\" pattern=\"border-solid\" }}=====Bienvenue===== +('{{rootPage}}', now(), ' +{{section bgcolor=\"var(--primary-color)\" class=\"shape-rounded\" pattern=\"border-solid\" }}=====Bienvenue===== Vous êtes sur un espace auto-hébergé de partage de ressource et d\'outils numériques coopératifs sous license libre. Tout est à disposition pour que vous puissiez consulter cela localement, chez vous en auto-hébergement. -Ces services ont été mis en place par {{button class=\"btn-primary new-window\" link=\"https://colibris-outilslibres.org/\" nobtn=\"1\" text=\"Colibris\" title=\"mouvement Colibris\" }}, {{button class=\"new-window\" link=\"https://distrilab.fr\" nobtn=\"1\" text=\"le DistriLab\" title=\"le DistriLab\"}}, {{button class=\"new-window\" link=\"https://www.ritimo.org/\" nobtn=\"1\" text=\"Ritimo\" title=\"Ritimo\"}}, {{button class=\"new-window\" link=\"https://yeswiki.net\" nobtn=\"1\" text=\"YesWiki\" title=\"YesWiki\"}}, {{button class=\"new-window\" link=\"https://yunohost.org\" nobtn=\"1\" text=\"YUNoHost\" title=\"YUNoHost\"}}, {{button class=\"new-window\" link=\"https://framasoft.org\" nobtn=\"1\" text=\"Framasoft\" title=\"Framasoft\"}} -{{end elem=\"section\"}},… +Ces services ont été mis en place par {{button class=\"btn-primary new-window\" link=\"https://colibris-outilslibres.org/\" nobtn=\"1\" text=\"Colibris\" title=\"mouvement Colibris\" }}, {{button class=\"new-window\" link=\"https://distrilab.fr\" nobtn=\"1\" text=\"le DistriLab\" title=\"le DistriLab\"}}, {{button class=\"new-window\" link=\"https://www.ritimo.org/\" nobtn=\"1\" text=\"Ritimo\" title=\"Ritimo\"}}, {{button class=\"new-window\" link=\"https://yeswiki.net\" nobtn=\"1\" text=\"YesWiki\" title=\"YesWiki\"}}, {{button class=\"new-window\" link=\"https://yunohost.org\" nobtn=\"1\" text=\"YUNoHost\" title=\"YUNoHost\"}}, {{button class=\"new-window\" link=\"https://framasoft.org\" nobtn=\"1\" text=\"Framasoft\" title=\"Framasoft\"}},… +{{end elem=\"section\"}} \"\"
\"\" =====Coopérer===== @@ -367,6 +368,18 @@ Ces services ont été mis en place par {{button class=\"btn-primary new-window\ \"\"
\"\" =====Echanger===== ', '', '{{WikiName}}', '{{WikiName}}', 'Y', 'page', ''), +('PageRapideHaut', now(), '{{moteurrecherche template=\"moteurrecherche_button.tpl.html\"}} +{{buttondropdown icon=\"cog\" caret=\"0\" title=\"Roue crantée\"}} + - {{button nobtn=\"1\" icon=\"fa fa-tachometer-alt\" text=\"Tableau de bord\" link=\"TableauDeBord\"}} + - {{button nobtn=\"1\" icon=\"fa fa-question\" text=\"Documentation\" link=\"doc\"}} + - ------ + - {{button nobtn=\"1\" icon=\"fa fa-wrench\" text=\"Gestion du site\" link=\"GererSite\"}} + - {{button nobtn=\"1\" icon=\"fas fa-user\" text=\"Mes contenus\" link=\"MesContenus\"}} + - {{button nobtn=\"1\" icon=\"fa fa-briefcase\" text=\"Formulaires\" link=\"BazaR\"}} + - ------ + - {{button nobtn=\"1\" icon=\"fas fa-cog\" text=\"Admin Yunohost\" link=\"yunohost/admin\"}} +{{end elem=\"buttondropdown\"}} +{{login template=\"modal.tpl.html\"}}', '', '{{WikiName}}', '{{WikiName}}', 'Y', 'page', ''), ('PageTitre', now(), '![logo CLIC](files/logoclic.png)', '', '{{WikiName}}', '{{WikiName}}', 'Y', 'page', ''), ('ParametresUtilisateur', now(), '{{UserSettings}}', '', '{{WikiName}}', '{{WikiName}}', 'Y', 'page', ''), ('RechercheTexte', now(), '{{newtextsearch}}', '', '{{WikiName}}', '{{WikiName}}', 'Y', 'page', ''), diff --git a/scripts/install b/scripts/install index fbcc4c0..1c71263 100755 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ admin_temp_pass=$(ynh_string_random 20) wiki_name_escaped=$(echo "$wiki_name" | sed 's/ /%20/g') -if [ $wikimodel = "CLIC" ]; then +if [ "${wikimodel}" = "CLIC" ]; then # replace default yeswiki model with CLIC model mv $install_dir/setup/sql/default-content.sql $install_dir/setup/sql/default-content.sql.original cp ../conf/CLIC/default-content.sql $install_dir/setup/sql/default-content.sql @@ -63,7 +63,7 @@ ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language "admin_name=$admin" "admin_password=$admin_temp_pass" "admin_password_conf=$admin_temp_pass" \ "admin_email=$admin%40$domain" "submit=Continue" -if [ $wikimodel = "CLIC" ]; then +if [ "${wikimodel}" = "CLIC" ]; then # restore original yeswiki model mv -f $install_dir/setup/sql/default-content.sql.original $install_dir/setup/sql/default-content.sql fi @@ -72,7 +72,7 @@ fi # (kind of strange, should be doable using the previous curl?) ynh_replace_string --match_string="'allow_raw_html' => false," --replace_string="'allow_raw_html' => true," --target_file="$install_dir/wakka.config.php" -if [ $authprovider = "Yunohost LDAP" ]; then +if [ "${authprovider}" = "Yunohost LDAP" ]; then #================================================= # DOWNLOAD AND CONFIGURE LDAP PLUGIN #================================================= @@ -88,7 +88,7 @@ if [ $authprovider = "Yunohost LDAP" ]; then ynh_replace_string --match_string=");" --replace_string=" 'ldap_base' => 'ou=users,dc=yunohost,dc=org'\n);" --target_file="$install_dir/wakka.config.php" fi -if [ $wikimodel = "CLIC" ]; then +if [ "${wikimodel}" = "CLIC" ]; then #================================================= # DOWNLOAD AND CONFIGURE FERME PLUGIN #=================================================