From e2f65a84cd56e653d6be80c62f513390fe1f2582 Mon Sep 17 00:00:00 2001
From: farvardin <eforgeot@gmail.com>
Date: Wed, 7 Feb 2024 14:23:10 +0100
Subject: [PATCH 1/6] trying to fix #24 (can't upgrade/replace main.txt)

---
 conf/config.php      | 10 ++++++----
 conf/mimoza.css      | 11 +++++++++++
 conf/minimaxing.html |  8 ++++++++
 scripts/upgrade      |  5 +++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/conf/config.php b/conf/config.php
index c523952..fd82e20 100755
--- a/conf/config.php
+++ b/conf/config.php
@@ -22,11 +22,11 @@ $PROTECTED_READ = false;
 
 // Some of those templates are using markitup, a convenient and advanced toolbar to edit the wiki.
 
-//$TEMPLATE = 'templates/minimaxing/minimaxing.html'; // this one is the default skin for lionwiki-t2t
+//$TEMPLATE = 'templates/minimaxing/minimaxing.html'; // this one was once the default skin for lionwiki-t2t
 //$TEMPLATE = 'templates/minimaxing/minimaxing_links.html'; // this one is for a basic landpage without menu
 
 //$TEMPLATE = 'templates/red.html';
-//$TEMPLATE = 'templates/txt2tags/txt2tags.html';  // used on the txt2tags wiki
+//$TEMPLATE = 'templates/txt2tags/txt2tags.html';  // used once on the old txt2tags wiki (now offline)
 
 
 //$TEMPLATE = 'templates/ElectricObsidian/ElectricObsidian.html';  // dark theme
@@ -43,7 +43,7 @@ $PROTECTED_READ = false;
 //$TEMPLATE = 'templates/newspaper/newspaper.html';      // light theme
 //$TEMPLATE = 'templates/stellar/index.html';     // in development
 //$TEMPLATE = 'templates/editorial/index0.html';  // in development
-//$TEMPLATE = 'templates/blazekiss/blazekiss.html';
+//$TEMPLATE = 'templates/blazekiss/blazekiss.html';  // deprecated
 //$TEMPLATE = 'templates/sissou.html';
 //$TEMPLATE = 'templates/fravashyo/fravashyo.html';
 //$TEMPLATE = 'templates/dandelion.html';
@@ -58,7 +58,9 @@ $PROTECTED_READ = false;
 //$TEMPLATE = 'templates/light.html';
 //$TEMPLATE = 'templates/print.html';
 //$TEMPLATE = 'templates/paper/paper.html';
-$TEMPLATE = 'templates/mimoza/mimoza.html';
+$TEMPLATE = 'templates/mimoza/mimoza.html';  // current default template
+//$TEMPLATE = 'templates/cafe.html';
+// $TEMPLATE = 'templates/smallweb/smallweb.html';    // not finished and not very good
 //$TEMPLATE = 'templates/wikiss.html';
 //$TEMPLATE = 'templates/skeleton/skeleton.html';    // deprecated
 //$TEMPLATE = 'templates/simple.html';  //
diff --git a/conf/mimoza.css b/conf/mimoza.css
index 434d8b7..39513af 100644
--- a/conf/mimoza.css
+++ b/conf/mimoza.css
@@ -232,6 +232,17 @@ h6:hover span.par-edit {
   font-size: small;
 }
 
+/* makes the top edit link invisible */
+.editlink a {
+  text-decoration: none;  
+  color: var(--couleur-primaire); 
+}
+
+.editlink2 a {
+  text-decoration: none;  
+  color: #eee; 
+}
+
 /* Progress bar */
 progress {
   color: var(--couleur-primaire);
diff --git a/conf/minimaxing.html b/conf/minimaxing.html
index dd5348f..049bd16 100755
--- a/conf/minimaxing.html
+++ b/conf/minimaxing.html
@@ -35,6 +35,13 @@
 		<link rel="stylesheet" href="templates/minimaxing/minimaxing.css" />
 		
 		<script src="templates/js/less.js" type="text/javascript"></script>
+		
+		
+		<!-- Remove "alternate" in one of the style to make it default -->
+		<link rel="alternate stylesheet" type="text/css" media="screen" title="theme01 (Brick Red)" href="templates/minimaxing/minimaxing_theme01.css" />
+		<link rel="alternate stylesheet" type="text/css" media="screen" title="theme02 (Marron)" href="templates/minimaxing/minimaxing_theme02.css" />
+		<link rel="alternate stylesheet" type="text/css" media="screen" title="terminal solarized" href="templates/minimaxing/terminal_solarized.css" />
+		
 		<script type="text/javascript" >
 <!--
 $(document).ready(function()	{
@@ -150,6 +157,7 @@ $(document).ready(function()	{
 					{SEARCH_FORM}{SEARCH_INPUT}{SEARCH_SUBMIT}{/SEARCH_FORM} 
 					<br />
 						Design CC-BY-SA based on <a href="https://html5up.net/minimaxing">Minimaxing</a>. Powered by <a href="https://sourceforge.net/p/lionwiki-t2t/code/">LionWiki-t2t</a> 
+					<br /> {RSS}
 					</div>
 
 				</div>
diff --git a/scripts/upgrade b/scripts/upgrade
index 0dbd4f9..499eaca 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 if [[ -z "${password:-}" ]] || [[ -z "${color:-}" ]] || [[ -z "${wiki:-}" ]]; then
     password=$( grep -oP '^\$PASSWORD = sha1\(\"\K.*(?=\"\);$)' "$install_dir/config.php")
     wiki=$(     grep -oP '^\$WIKI_TITLE = '"'\K.*(?=';)" "$install_dir/config.php")
-    color=$(grep -A1 'For YunoHost config' "$install_dir/templates/minimaxing/minimaxing.css" | grep -oP '^/\* @fg: #\K.*(?=;)')
+    color=$(grep -A1 'For YunoHost config' "$install_dir/templates/minimaxing/minimaxing.css" | grep -oP '^/\* @fg: #\K.*(?=;)'|| true)
 
     if [[ -z "$password" ]] || [[ -z "$wiki" ]] || [[ -z "$color" ]]; then
         yunohost_app="yunohost app"
@@ -50,7 +50,8 @@ ynh_app_setting_set --app="$app" --key=color --value="$color"
 ynh_script_progression --message="Upgrading source files..." --weight=3
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.php pheditor.php menu.php config.t2t"
+ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.php pheditor.php menu.php config.t2t var/pages/main.txt var/pages/todo.txt var/pages/sandbox.txt var/pages/links.txt var/pages/admin.txt"
+
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"

From 039170d686973d46643526372a44816858aa69e3 Mon Sep 17 00:00:00 2001
From: farvardin <eforgeot@gmail.com>
Date: Wed, 7 Feb 2024 14:51:39 +0100
Subject: [PATCH 2/6] fix upgrade / remove color restoration

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 499eaca..ee82cfa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,8 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 if [[ -z "${password:-}" ]] || [[ -z "${color:-}" ]] || [[ -z "${wiki:-}" ]]; then
     password=$( grep -oP '^\$PASSWORD = sha1\(\"\K.*(?=\"\);$)' "$install_dir/config.php")
     wiki=$(     grep -oP '^\$WIKI_TITLE = '"'\K.*(?=';)" "$install_dir/config.php")
-    color=$(grep -A1 'For YunoHost config' "$install_dir/templates/minimaxing/minimaxing.css" | grep -oP '^/\* @fg: #\K.*(?=;)'|| true)
+    # color=$(grep -A1 'For YunoHost config' "$install_dir/templates/minimaxing/minimaxing.css" | grep -oP '^/\* @fg: #\K.*(?=;)'|| true)
+    color=787878
 
     if [[ -z "$password" ]] || [[ -z "$wiki" ]] || [[ -z "$color" ]]; then
         yunohost_app="yunohost app"

From a14ab1e9f5feb0ea8a665656337d116d3eb80cd7 Mon Sep 17 00:00:00 2001
From: farvardin <eforgeot@gmail.com>
Date: Wed, 7 Feb 2024 15:29:53 +0100
Subject: [PATCH 3/6] trying to keep already installed config

---
 scripts/upgrade | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ee82cfa..58dd47e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,7 +51,8 @@ ynh_app_setting_set --app="$app" --key=color --value="$color"
 ynh_script_progression --message="Upgrading source files..." --weight=3
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.php pheditor.php menu.php config.t2t var/pages/main.txt var/pages/todo.txt var/pages/sandbox.txt var/pages/links.txt var/pages/admin.txt"
+# ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.php pheditor.php menu.php config.t2t var/pages/main.txt var/pages/todo.txt var/pages/sandbox.txt var/pages/links.txt var/pages/admin.txt"
+ynh_setup_source --dest_dir="$install_dir" --keep="config.php pheditor.php menu.php config.t2t var/pages/main.txt var/pages/todo.txt var/pages/sandbox.txt var/pages/links.txt var/pages/admin.txt"
 
 
 chmod -R o-rwx "$install_dir"
@@ -73,8 +74,21 @@ ynh_backup_if_checksum_is_different --file="$install_dir/pheditor.php"
 ynh_delete_file_checksum --file="$install_dir/config.php"
 ynh_delete_file_checksum --file="$install_dir/pheditor.php"
 
-ynh_add_config --template="config.php" --destination="$install_dir/config.php"
-ynh_add_config --template="pheditor.php" --destination="$install_dir/pheditor.php"
+# Do not overwrite existing configuration as it could have user customization's and settings.
+# Create file if it does not exist
+if [ ! -f "$install_dir/config.php" ]; then
+	# Set the default settings
+	ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
+fi
+
+if [ ! -f "$install_dir/pheditor.php" ]; then
+	# Set the default settings
+	ynh_add_config --template="../conf/pheditor.php" --destination="$install_dir/pheditor.php"
+fi
+
+
+# ynh_add_config --template="config.php" --destination="$install_dir/config.php"
+# ynh_add_config --template="pheditor.php" --destination="$install_dir/pheditor.php"
 
 mkdir -p "$install_dir/templates/minimaxing/"
 ynh_delete_file_checksum --file="$install_dir/templates/minimaxing/minimaxing.less"

From 34e6d93d57454153ce1b7c1573e3b307b1b26b82 Mon Sep 17 00:00:00 2001
From: farvardin <eforgeot@gmail.com>
Date: Wed, 7 Feb 2024 16:18:28 +0100
Subject: [PATCH 4/6] fix #24 (css doesn't load)

---
 scripts/install | 2 ++
 scripts/upgrade | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 28473e5..ae7735d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -33,6 +33,8 @@ ynh_setup_source --dest_dir="$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
+chmod -R 755 "$install_dir"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 58dd47e..117c6da 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,7 +51,6 @@ ynh_app_setting_set --app="$app" --key=color --value="$color"
 ynh_script_progression --message="Upgrading source files..." --weight=3
 
 # Download, check integrity, uncompress and patch the source from app.src
-# ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.php pheditor.php menu.php config.t2t var/pages/main.txt var/pages/todo.txt var/pages/sandbox.txt var/pages/links.txt var/pages/admin.txt"
 ynh_setup_source --dest_dir="$install_dir" --keep="config.php pheditor.php menu.php config.t2t var/pages/main.txt var/pages/todo.txt var/pages/sandbox.txt var/pages/links.txt var/pages/admin.txt"
 
 

From 2418cd8d2ca5755894bef23dc55a70fe64be6556 Mon Sep 17 00:00:00 2001
From: farvardin <eforgeot@gmail.com>
Date: Wed, 7 Feb 2024 16:21:09 +0100
Subject: [PATCH 5/6] trying again for missing css

---
 scripts/install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index ae7735d..b96ce5a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,6 @@ ynh_setup_source --dest_dir="$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
-chmod -R 755 "$install_dir"
 
 #=================================================
 # SPECIFIC SETUP
@@ -70,6 +69,10 @@ ynh_add_fpm_config
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+
+# 
+chmod -R 755 "$install_dir"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From a587949dbce00ca010311c5d3cd15d76f53c45b9 Mon Sep 17 00:00:00 2001
From: farvardin <eforgeot@gmail.com>
Date: Wed, 7 Feb 2024 16:23:36 +0100
Subject: [PATCH 6/6] fixes css problem from issue #24

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index b96ce5a..ab15b95 100755
--- a/scripts/install
+++ b/scripts/install
@@ -70,7 +70,7 @@ ynh_add_fpm_config
 ynh_add_nginx_config
 
 
-# 
+# chmod again to fix unaccessible templates / css files
 chmod -R 755 "$install_dir"
 
 #=================================================