diff --git a/Wiki-OcttKB/tiddlers/System/$__HistoryList.json.meta b/Wiki-OcttKB/tiddlers/System/$__HistoryList.json.meta index bf33295..82db137 100644 --- a/Wiki-OcttKB/tiddlers/System/$__HistoryList.json.meta +++ b/Wiki-OcttKB/tiddlers/System/$__HistoryList.json.meta @@ -1,5 +1,5 @@ -created: 20230413094038640 +created: 20230413134837771 current-tiddler: GettingStarted -modified: 20230413094038640 +modified: 20230413134837771 title: $:/HistoryList type: application/json \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Config_AiLinks.ui.tid b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Config_AiLinks.ui.tid index a235771..4a6da5d 100644 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Config_AiLinks.ui.tid +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Config_AiLinks.ui.tid @@ -1,7 +1,7 @@ Enabled: 1 created: 20230413083119554 creator: Octt -modified: 20230413093847513 +modified: 20230413124203473 modifier: Octt tags: $:/GlobalOption title: $:/OcttKB/Config/AiLinks.ui diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_GlobalOptions.ui.tid b/Wiki-OcttKB/tiddlers/System/$__OcttKB_GlobalOptions.ui.tid index 120eb1a..af7be27 100644 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_GlobalOptions.ui.tid +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_GlobalOptions.ui.tid @@ -1,7 +1,7 @@ created: 20230413080548417 creator: Octt list-before: $:/core/ui/SideBarSegments/search -modified: 20230413093838715 +modified: 20230413124924940 modifier: Octt tags: $:/tags/SideBarSegment title: $:/OcttKB/GlobalOptions.ui @@ -15,6 +15,12 @@ title: $:/OcttKB/GlobalOptions.ui ) + {{$:/OcttKB/Config/LargeSidebar.ui}}

{{$:/OcttKB/Config/AiLinks.ui}} diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt deleted file mode 100644 index 640dc54..0000000 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -cd ./public - -# Build single-page no-JS wiki -tiddlywiki \ - --load index.html \ - --output ./ \ - --rendertiddler $:/core/templates/static.template.css Style.css text/plain \ - --rendertiddler $:/core/templates/alltiddlers.template.html Static.html text/plain - -# Apply patches to the static HTML -python3 ../PatchStatic.py diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt.meta deleted file mode 100644 index 4020bfc..0000000 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt.meta +++ /dev/null @@ -1,6 +0,0 @@ -created: 20230126082147025 -creator: Octt -modified: 20230307221654772 -modifier: Octt -title: $:/OcttKB/Repo/Build.sh -type: text/plain \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt deleted file mode 100644 index 6268805..0000000 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -URL="https://kb.octt.eu.org" -cd ./public -wget -O "./-1.html" "$URL" || true -wget -O "./-2.html" "$URL/-1.html" || true diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt.meta deleted file mode 100644 index dd0eb66..0000000 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt.meta +++ /dev/null @@ -1,6 +0,0 @@ -created: 20230126082330667 -creator: Octt -modified: 20230126082445095 -modifier: Octt -title: $:/OcttKB/Repo/DeployOld.sh -type: text/plain \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt new file mode 100644 index 0000000..e7376f7 --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt @@ -0,0 +1,24 @@ +#!/bin/sh + +ToLower(){ + echo "$1" | tr "[:upper:]" "[:lower:]" +} + +SetupGitProfile(){ + git config --global user.email "$GitUserEmail" + git config --global user.name "$GitUserName" + git config --global credential.helper store + echo "https://$GitUserName:$GitPassword@gitlab.com" > ~/.git-credentials +} + +TryCrossRepoSync(){ + CommitCheck="$(git log -1 --pretty=%B | ToLower)" + CommitMsg0="$("OcttKB Cross-Repo Sync" | ToLower)" + [ "$CommitCheck" != "$CommitMsg0 (html to raw)" ] && \ + [ "$CommitCheck" != "$CommitMsg0 (raw to html)" ] && \ + [ "$CommitCheck" != "$CommitMsg0 (htm to raw)" ] && \ + [ "$CommitCheck" != "$CommitMsg0 (raw to htm)" ] && \ + [ "$CommitCheck" != "$CommitMsg0 (web to raw)" ] && \ + [ "$CommitCheck" != "$CommitMsg0 (raw to web)" ] && \ + sh ./GitLab.CrossRepoSync.sh || true +} diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt.meta new file mode 100644 index 0000000..21bf78a --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt.meta @@ -0,0 +1,6 @@ +created: 20230413125137469 +creator: Octt +modified: 20230413134713676 +modifier: Octt +title: $:/OcttKB/Repo/Lib.Git.sh +type: text/plain \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt index 4459bd7..a154368 100644 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt @@ -1,3 +1,4 @@ #!/bin/sh -sh ./Build.sh -sh ./DeployOld.sh || true +. ./Lib.*.sh +sh ./Pages.BuildStatic.sh +sh ./Pages.DeployOld.sh diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt.meta index 1272f32..b35af25 100644 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt.meta +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt.meta @@ -1,6 +1,6 @@ created: 20230126081754717 creator: Octt -modified: 20230228095521738 +modified: 20230413134700295 modifier: Octt tags: title: $:/OcttKB/Repo/Main.sh diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt new file mode 100644 index 0000000..b781389 --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt @@ -0,0 +1,12 @@ +#!/bin/sh +cd ./public + +# Build single-page no-JS wiki +tiddlywiki \ + --load ./index.html \ + --output ./ \ + --rendertiddler $:/core/templates/static.template.css Style.css text/plain \ + --rendertiddler $:/core/templates/alltiddlers.template.html Static.html text/plain + +# Apply patches to the static HTML +python3 ../PatchStatic.py diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt.meta new file mode 100644 index 0000000..ace993c --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt.meta @@ -0,0 +1,6 @@ +created: 20230126082147025 +creator: Octt +modified: 20230413132417618 +modifier: Octt +title: $:/OcttKB/Repo/Pages.BuildStatic.sh +type: text/plain \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt new file mode 100644 index 0000000..df03389 --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt @@ -0,0 +1,5 @@ +#!/bin/sh +URL="https://kb.octt.eu.org" +cd ./public +wget -O ./-1.html "$URL" || true +wget -O ./-2.html "$URL/-1.html" || true diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt.meta new file mode 100644 index 0000000..e9ae52a --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt.meta @@ -0,0 +1,6 @@ +created: 20230126082330667 +creator: Octt +modified: 20230413132501058 +modifier: Octt +title: $:/OcttKB/Repo/Pages.DeployOld.sh +type: text/plain \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt index 5b87931..2e2de99 100644 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt @@ -1,5 +1,3 @@ #!/bin/sh -git config --global user.email "$GitUserEmail" -git config --global user.name "$GitUserName" -git config --global credential.helper store -echo "https://$GitUserName:$GitPassword@gitlab.com" > ~/.git-credentials +. ./Lib.Git.sh +SetupGitProfile diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt.meta b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt.meta index 7a05707..7d5449c 100644 --- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt.meta +++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt.meta @@ -1,6 +1,6 @@ created: 20230228081951095 creator: Octt -modified: 20230228082144682 +modified: 20230413134641576 modifier: Octt tags: title: $:/OcttKB/Repo/SetupGitProfile.sh diff --git a/Wiki-OcttKB/tiddlers/System/$__StoryList.tid b/Wiki-OcttKB/tiddlers/System/$__StoryList.tid index 1173014..f18f965 100644 --- a/Wiki-OcttKB/tiddlers/System/$__StoryList.tid +++ b/Wiki-OcttKB/tiddlers/System/$__StoryList.tid @@ -1,6 +1,6 @@ -created: 20230413075905806 +created: 20230413124212673 creator: Octt -list: -modified: 20230413093628410 +list: $:/OcttKB/Repo +modified: 20230413134703735 modifier: Octt title: $:/StoryList \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__state_sidebar.tid b/Wiki-OcttKB/tiddlers/System/$__state_sidebar.tid index fca55e1..400606e 100644 --- a/Wiki-OcttKB/tiddlers/System/$__state_sidebar.tid +++ b/Wiki-OcttKB/tiddlers/System/$__state_sidebar.tid @@ -1,6 +1,6 @@ created: 20220920174307633 creator: Octt -modified: 20230307214152122 +modified: 20230413132635748 modifier: Octt title: $:/state/sidebar diff --git a/Wiki-OcttKB/tiddlers/System/$__state_tab_sidebar--595412856.tid b/Wiki-OcttKB/tiddlers/System/$__state_tab_sidebar--595412856.tid index f125b5b..920d040 100644 --- a/Wiki-OcttKB/tiddlers/System/$__state_tab_sidebar--595412856.tid +++ b/Wiki-OcttKB/tiddlers/System/$__state_tab_sidebar--595412856.tid @@ -1,7 +1,7 @@ created: 20220920092307479 creator: Octt -modified: 20230413093903344 +modified: 20230413124520866 modifier: Octt title: $:/state/tab/sidebar--595412856 -OcttKB/Index \ No newline at end of file +$:/core/ui/SideBar/More \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__state_tree_$__OcttKB_Repo_Lib_.tid b/Wiki-OcttKB/tiddlers/System/$__state_tree_$__OcttKB_Repo_Lib_.tid new file mode 100644 index 0000000..794325c --- /dev/null +++ b/Wiki-OcttKB/tiddlers/System/$__state_tree_$__OcttKB_Repo_Lib_.tid @@ -0,0 +1,7 @@ +created: 20230413132442513 +creator: Octt +modified: 20230413134703183 +modifier: Octt +title: $:/state/tree/$:/OcttKB/Repo/Lib/ + +show \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__status_RequireReloadDueToPluginChange.tid b/Wiki-OcttKB/tiddlers/System/$__status_RequireReloadDueToPluginChange.tid index 9af7b08..6df5e60 100644 --- a/Wiki-OcttKB/tiddlers/System/$__status_RequireReloadDueToPluginChange.tid +++ b/Wiki-OcttKB/tiddlers/System/$__status_RequireReloadDueToPluginChange.tid @@ -1,3 +1,3 @@ title: $:/status/RequireReloadDueToPluginChange -yes \ No newline at end of file +no \ No newline at end of file diff --git a/Wiki-OcttKB/tiddlers/System/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid b/Wiki-OcttKB/tiddlers/System/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid index 018b7f0..d582c51 100644 --- a/Wiki-OcttKB/tiddlers/System/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid +++ b/Wiki-OcttKB/tiddlers/System/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid @@ -1,7 +1,7 @@ created: 20220920114844259 creator: Octt -modified: 20230413093851446 +modified: 20230413132638250 modifier: Octt title: $:/themes/tiddlywiki/vanilla/metrics/sidebarwidth -280px \ No newline at end of file +50vw \ No newline at end of file