From 97d2af7ebd9cd53790cc0baaa88aa916c53eb343 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Thu, 30 Jul 2020 19:14:53 +0100 Subject: [PATCH] TiddlySpot Saver: Add link to control panel Thanks @twmat Fixes #4778 --- core/language/en-GB/ControlPanel.multids | 1 + core/ui/ControlPanel/Saving/TiddlySpot.tid | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 86d352202..c75aa5679 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -117,6 +117,7 @@ Saving/GitService/Gitea/Caption: Gitea Saver Saving/GitService/Gitea/Password: Personal access token for API (via Gitea’s web interface: `Settings | Applications | Generate New Token`) Saving/TiddlySpot/Advanced/Heading: Advanced Settings Saving/TiddlySpot/BackupDir: Backup Directory +Saving/TiddlySpot/ControlPanel: ~TiddlySpot Control Panel Saving/TiddlySpot/Backups: Backups Saving/TiddlySpot/Caption: ~TiddlySpot Saver Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server diff --git a/core/ui/ControlPanel/Saving/TiddlySpot.tid b/core/ui/ControlPanel/Saving/TiddlySpot.tid index 0832b92cd..2497b300e 100644 --- a/core/ui/ControlPanel/Saving/TiddlySpot.tid +++ b/core/ui/ControlPanel/Saving/TiddlySpot.tid @@ -4,14 +4,14 @@ caption: {{$:/language/ControlPanel/Saving/TiddlySpot/Caption}} \define lingo-base() $:/language/ControlPanel/Saving/TiddlySpot/ -\define backupURL() -http://$(userName)$.tiddlyspot.com/backup/ +\define siteURL(path) +http://$(userName)$.tiddlyspot.com/$path$/ \end -\define backupLink() +\define siteLink(path) <$reveal type="nomatch" state="$:/UploadName" text=""> <$set name="userName" value={{$:/UploadName}}> <$reveal type="match" state="$:/UploadURL" text=""> -<> +<> <$reveal type="nomatch" state="$:/UploadURL" text=""> <$macrocall $name=resolvePath source={{$:/UploadBackupDir}} root={{$:/UploadURL}}>> @@ -24,7 +24,8 @@ http://$(userName)$.tiddlyspot.com/backup/ |<> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> | |<> |<$password name="upload"/> | -|<> |<> | +|<> |<> | +|<> |<> | ''<>''