From 4d948c575fb8192dd3452f11dbaec703b00385db Mon Sep 17 00:00:00 2001 From: Jermolene Date: Mon, 14 Jul 2014 21:52:32 +0100 Subject: [PATCH] Improvements to one-shot upgrade UI --- core/images/download-button.tid | 4 ++ .../import.tid => ImportListing.tid} | 16 +------- core/ui/ViewTemplate/body.tid | 6 --- core/ui/ViewTemplate/plugin.tid | 8 ++++ plugins/tiddlywiki/upgrade/SiteSubtitle.tid | 3 ++ plugins/tiddlywiki/upgrade/SiteTitle.tid | 3 ++ .../tiddlywiki/upgrade/UpdateAddressBar.tid | 3 ++ plugins/tiddlywiki/upgrade/UpgradeWizard.tid | 28 ++++++++----- plugins/tiddlywiki/upgrade/sidebar.tid | 3 ++ plugins/tiddlywiki/upgrade/styles.tid | 40 +++++++++++++++++++ 10 files changed, 84 insertions(+), 30 deletions(-) create mode 100644 core/images/download-button.tid rename core/ui/{ViewTemplate/import.tid => ImportListing.tid} (62%) create mode 100644 core/ui/ViewTemplate/plugin.tid create mode 100644 plugins/tiddlywiki/upgrade/SiteSubtitle.tid create mode 100644 plugins/tiddlywiki/upgrade/SiteTitle.tid create mode 100644 plugins/tiddlywiki/upgrade/UpdateAddressBar.tid create mode 100644 plugins/tiddlywiki/upgrade/sidebar.tid create mode 100644 plugins/tiddlywiki/upgrade/styles.tid diff --git a/core/images/download-button.tid b/core/images/download-button.tid new file mode 100644 index 000000000..42e6cf72c --- /dev/null +++ b/core/images/download-button.tid @@ -0,0 +1,4 @@ +title: $:/core/images/download-button +tags: $:/tags/Image + + \ No newline at end of file diff --git a/core/ui/ViewTemplate/import.tid b/core/ui/ImportListing.tid similarity index 62% rename from core/ui/ViewTemplate/import.tid rename to core/ui/ImportListing.tid index 80d7dc322..dc27e1918 100644 --- a/core/ui/ViewTemplate/import.tid +++ b/core/ui/ImportListing.tid @@ -1,5 +1,4 @@ -title: $:/core/ui/ViewTemplate/import -tags: $:/tags/ViewTemplate +title: $:/core/ui/ImportListing \define lingo-base() $:/language/Import/ \define messageField() @@ -8,12 +7,6 @@ message-$(currentTiddler)$ \define selectionField() selection-$(currentTiddler)$ \end -<$list filter="[all[current]field:plugin-type[import]]"> - -
- -<> - @@ -44,10 +37,3 @@ selection-$(currentTiddler)$
- -<$button message="tw-delete-tiddler" param=<>><> -<$button message="tw-perform-import" param=<>><> - -
- - diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid index 1c5297631..c983fd965 100644 --- a/core/ui/ViewTemplate/body.tid +++ b/core/ui/ViewTemplate/body.tid @@ -3,12 +3,6 @@ tags: $:/tags/ViewTemplate
-<$list filter="[all[current]has[plugin-type]] -[all[current]field:plugin-type[import]]"> - -{{||$:/core/ui/TiddlerInfo/Advanced/PluginInfo}} - - - <$list filter="[all[current]!has[plugin-type]]"> <$transclude> diff --git a/core/ui/ViewTemplate/plugin.tid b/core/ui/ViewTemplate/plugin.tid new file mode 100644 index 000000000..2c7d2081c --- /dev/null +++ b/core/ui/ViewTemplate/plugin.tid @@ -0,0 +1,8 @@ +title: $:/core/ui/ViewTemplate/plugin +tags: $:/tags/ViewTemplate + +<$list filter="[all[current]has[plugin-type]] -[all[current]field:plugin-type[import]]"> + +{{||$:/core/ui/TiddlerInfo/Advanced/PluginInfo}} + + diff --git a/plugins/tiddlywiki/upgrade/SiteSubtitle.tid b/plugins/tiddlywiki/upgrade/SiteSubtitle.tid new file mode 100644 index 000000000..51b9b8f2c --- /dev/null +++ b/plugins/tiddlywiki/upgrade/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +upgrade your files to the latest version \ No newline at end of file diff --git a/plugins/tiddlywiki/upgrade/SiteTitle.tid b/plugins/tiddlywiki/upgrade/SiteTitle.tid new file mode 100644 index 000000000..132593edc --- /dev/null +++ b/plugins/tiddlywiki/upgrade/SiteTitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteTitle + +~TiddlyWiki Upgrader \ No newline at end of file diff --git a/plugins/tiddlywiki/upgrade/UpdateAddressBar.tid b/plugins/tiddlywiki/upgrade/UpdateAddressBar.tid new file mode 100644 index 000000000..4718fa658 --- /dev/null +++ b/plugins/tiddlywiki/upgrade/UpdateAddressBar.tid @@ -0,0 +1,3 @@ +title: $:/config/Navigation/UpdateAddressBar + +no \ No newline at end of file diff --git a/plugins/tiddlywiki/upgrade/UpgradeWizard.tid b/plugins/tiddlywiki/upgrade/UpgradeWizard.tid index 69e9dc275..3c5a883fa 100644 --- a/plugins/tiddlywiki/upgrade/UpgradeWizard.tid +++ b/plugins/tiddlywiki/upgrade/UpgradeWizard.tid @@ -1,34 +1,44 @@ title: $:/UpgradeWizard tags: $:/tags/StoryBackdrop +
+ +
+ +! ~TiddlyWiki Upgrade Wizard + <$list filter="[[$:/Import]is[missing]]"> -Drag a TiddlyWiki file here to upgrade it +{{$:/core/images/download-button}} -<$browse/> +Drag a ~TiddlyWiki file here to upgrade it + +or click to pick the file <$browse/> <$reveal state="$:/Import!!status" type="match" text="pending"> -And now there's a pending import +The following tiddlers will be included in the upgrade <$set name="storyTiddler" value="$:/Import"> -<$tiddler tiddler="$:/Import"> - -<$transclude tiddler="$:/core/ui/ViewTemplate/import"/> - - +{{$:/Import||$:/core/ui/ImportListing}} +<$button message="tw-perform-import" param=<>>Upgrade + <$reveal state="$:/Import!!status" type="match" text="complete"> -All done +Upgrade completed. Click the button below to save your upgraded ~TiddlyWiki file {{$:/plugins/tiddlywiki/upgrade/save}} + +
+ +
diff --git a/plugins/tiddlywiki/upgrade/sidebar.tid b/plugins/tiddlywiki/upgrade/sidebar.tid new file mode 100644 index 000000000..b87a68be3 --- /dev/null +++ b/plugins/tiddlywiki/upgrade/sidebar.tid @@ -0,0 +1,3 @@ +title: $:/state/sidebar + +no \ No newline at end of file diff --git a/plugins/tiddlywiki/upgrade/styles.tid b/plugins/tiddlywiki/upgrade/styles.tid new file mode 100644 index 000000000..dc2bc2de6 --- /dev/null +++ b/plugins/tiddlywiki/upgrade/styles.tid @@ -0,0 +1,40 @@ +title: $:/plugins/tiddlywiki/upgrade/styles +tags: $:/tags/stylesheet + +.tw-upgrade-wizard-wrapper { + width: 100%; + text-align: center; +} + +.tw-upgrade-wizard { + background: <>; + padding: 2em; + display: inline-block; + position: relative; +} + +.tw-upgrade-wizard svg.tw-image-download-button { + width: 14em; + height: 14em; + fill: <>; +} + +.tw-upgrade-wizard table { + text-align: left; +} + +.tw-upgrade-wizard input[type=file] { + position: absolute; + top: 0; + right: 0; + min-width: 100%; + min-height: 100%; + font-size: 999px; + text-align: right; + filter: alpha(opacity=0); + opacity: 0; + outline: none; + background: white; + cursor: pointer; + display: block; +} \ No newline at end of file