From ead208332bd5cd076bed8223775e438e01b90197 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 29 Apr 2015 22:11:39 +0100 Subject: [PATCH 01/13] Improvement to Contrast palette Also add a light variant --- .../{Contrast.tid => ContrastDark.tid} | 8 +- core/palettes/ContrastLight.tid | 109 ++++++++++++++++++ 2 files changed, 113 insertions(+), 4 deletions(-) rename core/palettes/{Contrast.tid => ContrastDark.tid} (95%) create mode 100644 core/palettes/ContrastLight.tid diff --git a/core/palettes/Contrast.tid b/core/palettes/ContrastDark.tid similarity index 95% rename from core/palettes/Contrast.tid rename to core/palettes/ContrastDark.tid index 438b1d159..54db0a310 100644 --- a/core/palettes/Contrast.tid +++ b/core/palettes/ContrastDark.tid @@ -1,6 +1,6 @@ -title: $:/palettes/Contrast -name: Contrast -description: High contrast and unambiguous +title: $:/palettes/ContrastDark +name: Contrast (Dark) +description: High contrast and unambiguous (dark version) tags: $:/tags/Palette type: application/x-tiddler-dictionary @@ -52,7 +52,7 @@ primary: #00f sidebar-button-foreground: <> sidebar-controls-foreground-hover: #000000 sidebar-controls-foreground: #ffffff -sidebar-foreground-shadow: rgba(255,0,0, 0.5) +sidebar-foreground-shadow: rgba(0,0,0, 0) sidebar-foreground: #ffffff sidebar-muted-foreground-hover: #444444 sidebar-muted-foreground: #fff diff --git a/core/palettes/ContrastLight.tid b/core/palettes/ContrastLight.tid new file mode 100644 index 000000000..b35f6d0fd --- /dev/null +++ b/core/palettes/ContrastLight.tid @@ -0,0 +1,109 @@ +title: $:/palettes/ContrastLight +name: Contrast (Light) +description: High contrast and unambiguous (light version) +tags: $:/tags/Palette +type: application/x-tiddler-dictionary + +alert-background: #f00 +alert-border: #fff +alert-highlight: #000 +alert-muted-foreground: #800 +background: #fff +blockquote-bar: <> +button-background: #fff +button-foreground: #000 +button-border: #000 +code-background: #fff +code-border: #000 +code-foreground: #000 +dirty-indicator: #f00 +download-background: #080 +download-foreground: <> +dragger-background: <> +dragger-foreground: <> +dropdown-background: <> +dropdown-border: <> +dropdown-tab-background-selected: #000 +dropdown-tab-background: #000 +dropzone-background: rgba(0,200,0,0.7) +external-link-background-hover: inherit +external-link-background-visited: inherit +external-link-background: inherit +external-link-foreground-hover: inherit +external-link-foreground-visited: #00a +external-link-foreground: #00e +foreground: #000 +message-background: #000 +message-border: #fff +message-foreground: #fff +modal-backdrop: <> +modal-background: <> +modal-border: #000 +modal-footer-background: #fff +modal-footer-border: #000 +modal-header-border: #000 +muted-foreground: #999 +notification-background: #fff +notification-border: #000 +page-background: #fff +pre-background: #fff +pre-border: #000 +primary: #00f +sidebar-button-foreground: <> +sidebar-controls-foreground-hover: #fff +sidebar-controls-foreground: #000 +sidebar-foreground-shadow: rgba(0,0,0, 0) +sidebar-foreground: #000 +sidebar-muted-foreground-hover: #444444 +sidebar-muted-foreground: #000 +sidebar-tab-background-selected: #fff +sidebar-tab-background: <> +sidebar-tab-border-selected: <> +sidebar-tab-border: <> +sidebar-tab-divider: <> +sidebar-tab-foreground-selected: #000 +sidebar-tab-foreground: <> +sidebar-tiddler-link-foreground-hover: #000 +sidebar-tiddler-link-foreground: <> +site-title-foreground: <> +static-alert-foreground: #aaaaaa +tab-background-selected: #fff +tab-background: #000 +tab-border-selected: #000 +tab-border: #000 +tab-divider: #000 +tab-foreground-selected: #000 +tab-foreground: #fff +table-border: #dddddd +table-footer-background: #a8a8a8 +table-header-background: #f0f0f0 +tag-background: #d5ad34 +tag-foreground: #000 +tiddler-background: <> +tiddler-border: #000 +tiddler-controls-foreground-hover: #ddd +tiddler-controls-foreground-selected: #fdd +tiddler-controls-foreground: #000 +tiddler-editor-background: #fff +tiddler-editor-border-image: #000 +tiddler-editor-border: #cccccc +tiddler-editor-fields-even: #fff +tiddler-editor-fields-odd: #fff +tiddler-info-background: #fff +tiddler-info-border: #000 +tiddler-info-tab-background: #fff +tiddler-link-background: <> +tiddler-link-foreground: <> +tiddler-subtitle-foreground: #c0c0c0 +tiddler-title-foreground: #000 +toolbar-new-button: +toolbar-options-button: +toolbar-save-button: +toolbar-info-button: +toolbar-edit-button: +toolbar-close-button: +toolbar-delete-button: +toolbar-cancel-button: +toolbar-done-button: +untagged-background: #999999 +very-muted-foreground: #888888 From 70a2019d856eb7019ad448011eb34fcbfc2a0ff5 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 29 Apr 2015 22:13:06 +0100 Subject: [PATCH 02/13] Add new feature demos to prerelease --- editions/prerelease/tiddlers/palette.tid | 2 +- .../system/TiddlyWiki Pre-release.tid | 36 +++++++++++++++++-- editions/prerelease/tiddlers/theme.tid | 2 +- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/editions/prerelease/tiddlers/palette.tid b/editions/prerelease/tiddlers/palette.tid index 7c541fcf1..afd78912b 100644 --- a/editions/prerelease/tiddlers/palette.tid +++ b/editions/prerelease/tiddlers/palette.tid @@ -1,3 +1,3 @@ title: $:/palette -$:/palettes/Contrast \ No newline at end of file +$:/palettes/Vanilla \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index cb3e8cbfb..7d0ef4911 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -1,10 +1,40 @@ title: TiddlyWiki Pre-release -modified: 20141013204930183 +modified: 20150428204930183 This is a pre-release build of TiddlyWiki. It is provided for testing purposes. Please don't try to use it for anything important -- you should use the latest official release from http://tiddlywiki.com. -Try out the experimental system tiddler browser: +! Features for 5.1.9 -[[$:/core/ui/MoreSideBar/Explore]] +!! Improvements for visually impaired users + +* Improved monochrome palettes: +** <$button> +<$action-setfield $tiddler="$:/theme" text="$:/plugins/tiddlywiki/vanilla"/> +<$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastDark"/> +Set "Contrast (Dark)" palette + +** <$button> +<$action-setfield $tiddler="$:/theme" text="$:/plugins/tiddlywiki/vanilla"/> +<$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/> +Set "Contrast (Dark)" palette + +** <$button> +<$action-setfield $tiddler="$:/theme" text="$:/plugins/tiddlywiki/snowwhite"/> +<$action-setfield $tiddler="$:/palette" text="$:/palettes/Vanilla"/> +Revert + + +! Features held back for later release + +These unfinished features are included in this prerelease build, but are not planned for inclusion in the next release. + +* <$button> +<$action-setfield $tiddler="$:/view" text="stacked"/> +Set "Stacked" story view + <$button> +<$action-setfield $tiddler="$:/view" text="classic"/> +Revert + +* [[Hierarchical system tiddler browser|$:/core/ui/MoreSideBar/Explore]] diff --git a/editions/prerelease/tiddlers/theme.tid b/editions/prerelease/tiddlers/theme.tid index 36b7610c7..58690c397 100644 --- a/editions/prerelease/tiddlers/theme.tid +++ b/editions/prerelease/tiddlers/theme.tid @@ -1,3 +1,3 @@ title: $:/theme -$:/themes/tiddlywiki/vanilla \ No newline at end of file +$:/themes/tiddlywiki/snowwhite \ No newline at end of file From f270788f33d936cfe0a7edb09d1cf8c5f083c2f1 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 29 Apr 2015 22:15:52 +0100 Subject: [PATCH 03/13] Typo --- .../prerelease/tiddlers/system/TiddlyWiki Pre-release.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index 7d0ef4911..3c611dcf8 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -11,17 +11,17 @@ It is provided for testing purposes. Please don't try to use it for anything imp * Improved monochrome palettes: ** <$button> -<$action-setfield $tiddler="$:/theme" text="$:/plugins/tiddlywiki/vanilla"/> +<$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastDark"/> Set "Contrast (Dark)" palette ** <$button> -<$action-setfield $tiddler="$:/theme" text="$:/plugins/tiddlywiki/vanilla"/> +<$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/> Set "Contrast (Dark)" palette ** <$button> -<$action-setfield $tiddler="$:/theme" text="$:/plugins/tiddlywiki/snowwhite"/> +<$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/Vanilla"/> Revert From 3e166f5fe95ecd0dfe704b8d93094cc74a6ea734 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 29 Apr 2015 22:24:36 +0100 Subject: [PATCH 04/13] Palette tweaks Making it easier to tweak the two colours in the monochrome palettes --- core/palettes/ContrastDark.tid | 109 -------------------------------- core/palettes/ContrastLight.tid | 98 ++++++++++++++-------------- 2 files changed, 49 insertions(+), 158 deletions(-) delete mode 100644 core/palettes/ContrastDark.tid diff --git a/core/palettes/ContrastDark.tid b/core/palettes/ContrastDark.tid deleted file mode 100644 index 54db0a310..000000000 --- a/core/palettes/ContrastDark.tid +++ /dev/null @@ -1,109 +0,0 @@ -title: $:/palettes/ContrastDark -name: Contrast (Dark) -description: High contrast and unambiguous (dark version) -tags: $:/tags/Palette -type: application/x-tiddler-dictionary - -alert-background: #f00 -alert-border: #000 -alert-highlight: #fff -alert-muted-foreground: #800 -background: #000 -blockquote-bar: <> -button-background: #000 -button-foreground: #fff -button-border: #fff -code-background: #000 -code-border: #fff -code-foreground: #fff -dirty-indicator: #f00 -download-background: #080 -download-foreground: <> -dragger-background: <> -dragger-foreground: <> -dropdown-background: <> -dropdown-border: <> -dropdown-tab-background-selected: #fff -dropdown-tab-background: #fff -dropzone-background: rgba(0,200,0,0.7) -external-link-background-hover: inherit -external-link-background-visited: inherit -external-link-background: inherit -external-link-foreground-hover: inherit -external-link-foreground-visited: #00a -external-link-foreground: #00e -foreground: #fff -message-background: #fff -message-border: #000 -message-foreground: #000 -modal-backdrop: <> -modal-background: <> -modal-border: #fff -modal-footer-background: #000 -modal-footer-border: #fff -modal-header-border: #fff -muted-foreground: #999 -notification-background: #000 -notification-border: #fff -page-background: #000 -pre-background: #000 -pre-border: #fff -primary: #00f -sidebar-button-foreground: <> -sidebar-controls-foreground-hover: #000000 -sidebar-controls-foreground: #ffffff -sidebar-foreground-shadow: rgba(0,0,0, 0) -sidebar-foreground: #ffffff -sidebar-muted-foreground-hover: #444444 -sidebar-muted-foreground: #fff -sidebar-tab-background-selected: #000 -sidebar-tab-background: <> -sidebar-tab-border-selected: <> -sidebar-tab-border: <> -sidebar-tab-divider: <> -sidebar-tab-foreground-selected: #fff -sidebar-tab-foreground: <> -sidebar-tiddler-link-foreground-hover: #fff -sidebar-tiddler-link-foreground: <> -site-title-foreground: <> -static-alert-foreground: #aaaaaa -tab-background-selected: #000 -tab-background: #fff -tab-border-selected: #fff -tab-border: #fff -tab-divider: #fff -tab-foreground-selected: #fff -tab-foreground: #000 -table-border: #dddddd -table-footer-background: #a8a8a8 -table-header-background: #f0f0f0 -tag-background: #d5ad34 -tag-foreground: #ffffff -tiddler-background: <> -tiddler-border: #fff -tiddler-controls-foreground-hover: #ddd -tiddler-controls-foreground-selected: #fdd -tiddler-controls-foreground: #fff -tiddler-editor-background: #000 -tiddler-editor-border-image: #fff -tiddler-editor-border: #cccccc -tiddler-editor-fields-even: #000 -tiddler-editor-fields-odd: #000 -tiddler-info-background: #000 -tiddler-info-border: #fff -tiddler-info-tab-background: #000 -tiddler-link-background: <> -tiddler-link-foreground: <> -tiddler-subtitle-foreground: #c0c0c0 -tiddler-title-foreground: #fff -toolbar-new-button: -toolbar-options-button: -toolbar-save-button: -toolbar-info-button: -toolbar-edit-button: -toolbar-close-button: -toolbar-delete-button: -toolbar-cancel-button: -toolbar-done-button: -untagged-background: #999999 -very-muted-foreground: #888888 diff --git a/core/palettes/ContrastLight.tid b/core/palettes/ContrastLight.tid index b35f6d0fd..674abaa19 100644 --- a/core/palettes/ContrastLight.tid +++ b/core/palettes/ContrastLight.tid @@ -5,17 +5,17 @@ tags: $:/tags/Palette type: application/x-tiddler-dictionary alert-background: #f00 -alert-border: #fff -alert-highlight: #000 +alert-border: <> +alert-highlight: <> alert-muted-foreground: #800 -background: #fff +background: #000 blockquote-bar: <> -button-background: #fff -button-foreground: #000 -button-border: #000 -code-background: #fff -code-border: #000 -code-foreground: #000 +button-background: <> +button-foreground: <> +button-border: <> +code-background: <> +code-border: <> +code-foreground: <> dirty-indicator: #f00 download-background: #080 download-foreground: <> @@ -23,8 +23,8 @@ dragger-background: <> dragger-foreground: <> dropdown-background: <> dropdown-border: <> -dropdown-tab-background-selected: #000 -dropdown-tab-background: #000 +dropdown-tab-background-selected: <> +dropdown-tab-background: <> dropzone-background: rgba(0,200,0,0.7) external-link-background-hover: inherit external-link-background-visited: inherit @@ -32,70 +32,70 @@ external-link-background: inherit external-link-foreground-hover: inherit external-link-foreground-visited: #00a external-link-foreground: #00e -foreground: #000 -message-background: #000 -message-border: #fff -message-foreground: #fff +foreground: #fff +message-background: <> +message-border: <> +message-foreground: <> modal-backdrop: <> modal-background: <> -modal-border: #000 -modal-footer-background: #fff -modal-footer-border: #000 -modal-header-border: #000 +modal-border: <> +modal-footer-background: <> +modal-footer-border: <> +modal-header-border: <> muted-foreground: #999 -notification-background: #fff -notification-border: #000 -page-background: #fff -pre-background: #fff -pre-border: #000 +notification-background: <> +notification-border: <> +page-background: <> +pre-background: <> +pre-border: <> primary: #00f sidebar-button-foreground: <> -sidebar-controls-foreground-hover: #fff -sidebar-controls-foreground: #000 +sidebar-controls-foreground-hover: <> +sidebar-controls-foreground: <> sidebar-foreground-shadow: rgba(0,0,0, 0) -sidebar-foreground: #000 +sidebar-foreground: <> sidebar-muted-foreground-hover: #444444 -sidebar-muted-foreground: #000 -sidebar-tab-background-selected: #fff +sidebar-muted-foreground: <> +sidebar-tab-background-selected: <> sidebar-tab-background: <> sidebar-tab-border-selected: <> sidebar-tab-border: <> sidebar-tab-divider: <> -sidebar-tab-foreground-selected: #000 +sidebar-tab-foreground-selected: <> sidebar-tab-foreground: <> -sidebar-tiddler-link-foreground-hover: #000 +sidebar-tiddler-link-foreground-hover: <> sidebar-tiddler-link-foreground: <> site-title-foreground: <> static-alert-foreground: #aaaaaa -tab-background-selected: #fff -tab-background: #000 -tab-border-selected: #000 -tab-border: #000 -tab-divider: #000 -tab-foreground-selected: #000 -tab-foreground: #fff +tab-background-selected: <> +tab-background: <> +tab-border-selected: <> +tab-border: <> +tab-divider: <> +tab-foreground-selected: <> +tab-foreground: <> table-border: #dddddd table-footer-background: #a8a8a8 table-header-background: #f0f0f0 tag-background: #d5ad34 -tag-foreground: #000 +tag-foreground: <> tiddler-background: <> -tiddler-border: #000 +tiddler-border: <> tiddler-controls-foreground-hover: #ddd tiddler-controls-foreground-selected: #fdd -tiddler-controls-foreground: #000 -tiddler-editor-background: #fff -tiddler-editor-border-image: #000 +tiddler-controls-foreground: <> +tiddler-editor-background: <> +tiddler-editor-border-image: <> tiddler-editor-border: #cccccc -tiddler-editor-fields-even: #fff -tiddler-editor-fields-odd: #fff -tiddler-info-background: #fff -tiddler-info-border: #000 -tiddler-info-tab-background: #fff +tiddler-editor-fields-even: <> +tiddler-editor-fields-odd: <> +tiddler-info-background: <> +tiddler-info-border: <> +tiddler-info-tab-background: <> tiddler-link-background: <> tiddler-link-foreground: <> tiddler-subtitle-foreground: #c0c0c0 -tiddler-title-foreground: #000 +tiddler-title-foreground: <> toolbar-new-button: toolbar-options-button: toolbar-save-button: From 6f7d80a2acfe048c0e3242e73f339b73926c860d Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 29 Apr 2015 22:24:46 +0100 Subject: [PATCH 05/13] Missed off last commit --- core/palettes/ContrastDark.tid | 109 +++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 core/palettes/ContrastDark.tid diff --git a/core/palettes/ContrastDark.tid b/core/palettes/ContrastDark.tid new file mode 100644 index 000000000..d9d0f219c --- /dev/null +++ b/core/palettes/ContrastDark.tid @@ -0,0 +1,109 @@ +title: $:/palettes/ContrastDark +name: Contrast (Dark) +description: High contrast and unambiguous (dark version) +tags: $:/tags/Palette +type: application/x-tiddler-dictionary + +alert-background: #f00 +alert-border: <> +alert-highlight: <> +alert-muted-foreground: #800 +background: #fff +blockquote-bar: <> +button-background: <> +button-foreground: <> +button-border: <> +code-background: <> +code-border: <> +code-foreground: <> +dirty-indicator: #f00 +download-background: #080 +download-foreground: <> +dragger-background: <> +dragger-foreground: <> +dropdown-background: <> +dropdown-border: <> +dropdown-tab-background-selected: <> +dropdown-tab-background: <> +dropzone-background: rgba(0,200,0,0.7) +external-link-background-hover: inherit +external-link-background-visited: inherit +external-link-background: inherit +external-link-foreground-hover: inherit +external-link-foreground-visited: #00a +external-link-foreground: #00e +foreground: #000 +message-background: <> +message-border: <> +message-foreground: <> +modal-backdrop: <> +modal-background: <> +modal-border: <> +modal-footer-background: <> +modal-footer-border: <> +modal-header-border: <> +muted-foreground: #999 +notification-background: <> +notification-border: <> +page-background: <> +pre-background: <> +pre-border: <> +primary: #00f +sidebar-button-foreground: <> +sidebar-controls-foreground-hover: <> +sidebar-controls-foreground: <> +sidebar-foreground-shadow: rgba(0,0,0, 0) +sidebar-foreground: <> +sidebar-muted-foreground-hover: #444444 +sidebar-muted-foreground: <> +sidebar-tab-background-selected: <> +sidebar-tab-background: <> +sidebar-tab-border-selected: <> +sidebar-tab-border: <> +sidebar-tab-divider: <> +sidebar-tab-foreground-selected: <> +sidebar-tab-foreground: <> +sidebar-tiddler-link-foreground-hover: <> +sidebar-tiddler-link-foreground: <> +site-title-foreground: <> +static-alert-foreground: #aaaaaa +tab-background-selected: <> +tab-background: <> +tab-border-selected: <> +tab-border: <> +tab-divider: <> +tab-foreground-selected: <> +tab-foreground: <> +table-border: #dddddd +table-footer-background: #a8a8a8 +table-header-background: #f0f0f0 +tag-background: #d5ad34 +tag-foreground: <> +tiddler-background: <> +tiddler-border: <> +tiddler-controls-foreground-hover: #ddd +tiddler-controls-foreground-selected: #fdd +tiddler-controls-foreground: <> +tiddler-editor-background: <> +tiddler-editor-border-image: <> +tiddler-editor-border: #cccccc +tiddler-editor-fields-even: <> +tiddler-editor-fields-odd: <> +tiddler-info-background: <> +tiddler-info-border: <> +tiddler-info-tab-background: <> +tiddler-link-background: <> +tiddler-link-foreground: <> +tiddler-subtitle-foreground: #c0c0c0 +tiddler-title-foreground: <> +toolbar-new-button: +toolbar-options-button: +toolbar-save-button: +toolbar-info-button: +toolbar-edit-button: +toolbar-close-button: +toolbar-delete-button: +toolbar-cancel-button: +toolbar-done-button: +untagged-background: #999999 +very-muted-foreground: #888888 From 94817911c395edfefbc2c6c13cee412b6abe4cdf Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 30 Apr 2015 09:06:21 +0100 Subject: [PATCH 06/13] Typo --- editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index 3c611dcf8..df3864e1b 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -18,7 +18,7 @@ Set "Contrast (Dark)" palette ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/> -Set "Contrast (Dark)" palette +Set "Contrast (Light)" palette ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/> From 3b78ebb9c07082a595648e0412d3338a27fd20b5 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 30 Apr 2015 11:30:32 +0100 Subject: [PATCH 07/13] Typos --- .../prerelease/tiddlers/system/TiddlyWiki Pre-release.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index df3864e1b..4b578e862 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -13,12 +13,12 @@ It is provided for testing purposes. Please don't try to use it for anything imp ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastDark"/> -Set "Contrast (Dark)" palette +Set "Contrast (Light)" palette ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/> -Set "Contrast (Light)" palette +Set "Contrast (Dark)" palette ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/> From e16453acbcd95ff434413ccc54de55d1aa2e5cbc Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 30 Apr 2015 16:22:39 +0100 Subject: [PATCH 08/13] Docs update --- .../from tw5.com/TiddlyWiki Coding Style Guidelines.tid | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid b/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid index ca2420ad7..0d2da8ece 100644 --- a/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid +++ b/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid @@ -1,4 +1,4 @@ -modified: 20141016083333808 +modified: 20150430153333808 title: TiddlyWiki Coding Style Guidelines tags: dev @@ -25,9 +25,9 @@ See the following example for layout of basic JavaScript constructs: Multiline comments are used to introduce a block of code such as a function definition */ function demoFunction(param,more) { - // Proper sentence capitalisation for comments - if(condition == "something") { - // No space between "if" and the brackets; always spaces around binary operators + // Proper sentence capitalisation for comments; prefer strict equality checks + if(condition === "something") { + // Always use braces, even when optional; no space between "if" and the brackets; always spaces around binary operators something = somethingElse; myOtherFunction(one,two); // No whitespace within function parameters do { From 825f0f4e2bc681963e20c9c6a6c4039eaa5c8230 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 30 Apr 2015 16:44:49 +0100 Subject: [PATCH 09/13] Docs updates --- .../resources/SeeAlso_by_Matias_Goldman.tid | 14 ++++++++++++++ .../resources/TWGuides by Andreas Hahn.tid | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 editions/tw5.com/tiddlers/community/resources/SeeAlso_by_Matias_Goldman.tid diff --git a/editions/tw5.com/tiddlers/community/resources/SeeAlso_by_Matias_Goldman.tid b/editions/tw5.com/tiddlers/community/resources/SeeAlso_by_Matias_Goldman.tid new file mode 100644 index 000000000..22a646aea --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/SeeAlso_by_Matias_Goldman.tid @@ -0,0 +1,14 @@ +created: 20150430154234863 +modified: 20150430154355656 +tags: Resources +title: SeeAlso by Matias Goldman +type: text/vnd.tiddlywiki +url: http://seealso.tiddlyspot.com + +A simple technique for adding tag-based cross references to the default view template. + +{{!!url}} + +<<< +See also: - is a feature to generate a "See also:" section after the tiddler text, somewhat like in Wikipedia articles. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid b/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid index 3ee84c79d..9af92fc0d 100644 --- a/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid +++ b/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid @@ -1,5 +1,5 @@ created: 20140920124011558 -modified: 20140920124011558 +modified: 20150430154230509 tags: Resources title: TWGuides by Andreas Hahn type: text/vnd.tiddlywiki @@ -7,6 +7,8 @@ url: http://twguides.org/ A collection of community tips and tutorials curated by Andreas Hahn, including a handy "customiser" that simplifies creating an empty TiddlyWiki with selected plugins and enhancements. +Updated to include [[Tinka|http://twguides.org/tinka.html]], a plugin that "provides a GUI to create and modify plugins more easily, therefore saving time on the packaging process". + {{!!url}} <<< From 7b4153f87f8b4793fa055ec287a659ece3150d99 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 30 Apr 2015 17:45:22 +0100 Subject: [PATCH 10/13] No longer autofocus the search box in the plugin library It messes things up in iOS, and perhaps other browsers too --- core/ui/ControlPanel/Modals/AddPlugins.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid index e3c0cca67..e25aa7425 100644 --- a/core/ui/ControlPanel/Modals/AddPlugins.tid +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -70,7 +70,7 @@ This plugin is already installed at version <$text text=<>/> \end \define display-server-assets(type) -Search: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input" focus="true"/> +Search: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/> <$reveal state="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" type="nomatch" text=""> <$button class="tc-btn-invisible"> <$action-setfield $tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" $field="text" $value=""/> From 52529f9b3213478ac65daf4c443bc4e4b97c2f88 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sat, 2 May 2015 12:12:31 +0100 Subject: [PATCH 11/13] Contrast palette tweaks --- core/palettes/ContrastDark.tid | 14 +++++++------- core/palettes/ContrastLight.tid | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/palettes/ContrastDark.tid b/core/palettes/ContrastDark.tid index d9d0f219c..d437369c0 100644 --- a/core/palettes/ContrastDark.tid +++ b/core/palettes/ContrastDark.tid @@ -1,6 +1,6 @@ -title: $:/palettes/ContrastDark -name: Contrast (Dark) -description: High contrast and unambiguous (dark version) +title: $:/palettes/ContrastLight +name: Contrast (Light) +description: High contrast and unambiguous (light version) tags: $:/tags/Palette type: application/x-tiddler-dictionary @@ -77,8 +77,8 @@ tab-foreground: <> table-border: #dddddd table-footer-background: #a8a8a8 table-header-background: #f0f0f0 -tag-background: #d5ad34 -tag-foreground: <> +tag-background: #000 +tag-foreground: #fff tiddler-background: <> tiddler-border: <> tiddler-controls-foreground-hover: #ddd @@ -94,7 +94,7 @@ tiddler-info-border: <> tiddler-info-tab-background: <> tiddler-link-background: <> tiddler-link-foreground: <> -tiddler-subtitle-foreground: #c0c0c0 +tiddler-subtitle-foreground: <> tiddler-title-foreground: <> toolbar-new-button: toolbar-options-button: @@ -105,5 +105,5 @@ toolbar-close-button: toolbar-delete-button: toolbar-cancel-button: toolbar-done-button: -untagged-background: #999999 +untagged-background: <> very-muted-foreground: #888888 diff --git a/core/palettes/ContrastLight.tid b/core/palettes/ContrastLight.tid index 674abaa19..37435531a 100644 --- a/core/palettes/ContrastLight.tid +++ b/core/palettes/ContrastLight.tid @@ -1,6 +1,6 @@ -title: $:/palettes/ContrastLight -name: Contrast (Light) -description: High contrast and unambiguous (light version) +title: $:/palettes/ContrastDark +name: Contrast (Dark) +description: High contrast and unambiguous (dark version) tags: $:/tags/Palette type: application/x-tiddler-dictionary @@ -77,8 +77,8 @@ tab-foreground: <> table-border: #dddddd table-footer-background: #a8a8a8 table-header-background: #f0f0f0 -tag-background: #d5ad34 -tag-foreground: <> +tag-background: #fff +tag-foreground: #000 tiddler-background: <> tiddler-border: <> tiddler-controls-foreground-hover: #ddd @@ -94,7 +94,7 @@ tiddler-info-border: <> tiddler-info-tab-background: <> tiddler-link-background: <> tiddler-link-foreground: <> -tiddler-subtitle-foreground: #c0c0c0 +tiddler-subtitle-foreground: <> tiddler-title-foreground: <> toolbar-new-button: toolbar-options-button: @@ -105,5 +105,5 @@ toolbar-close-button: toolbar-delete-button: toolbar-cancel-button: toolbar-done-button: -untagged-background: #999999 +untagged-background: <> very-muted-foreground: #888888 From 9cf5d88cc9b05f87e4560dc86667f12fbfb2a424 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sat, 2 May 2015 12:12:51 +0100 Subject: [PATCH 12/13] Add "open new window" tiddler toolbar button --- core/images/open-window.tid | 9 +++ core/language/en-GB/Buttons.multids | 2 + core/modules/startup/windows.js | 63 +++++++++++++++++++ core/ui/ViewToolbar/open-window.tid | 13 ++++ .../system/TiddlyWiki Pre-release.tid | 23 +++++-- 5 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 core/images/open-window.tid create mode 100644 core/modules/startup/windows.js create mode 100644 core/ui/ViewToolbar/open-window.tid diff --git a/core/images/open-window.tid b/core/images/open-window.tid new file mode 100644 index 000000000..337c582a1 --- /dev/null +++ b/core/images/open-window.tid @@ -0,0 +1,9 @@ +title: $:/core/images/open-window +tags: $:/tags/Image + + + + + + + \ No newline at end of file diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index f90c138ef..9cd9c6fd5 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -52,6 +52,8 @@ NewJournalHere/Caption: new journal here NewJournalHere/Hint: Create a new journal tiddler tagged with this one NewTiddler/Caption: new tiddler NewTiddler/Hint: Create a new tiddler +OpenWindow/Caption: open in new window +OpenWindow/Hint: Open tiddler in new window Permalink/Caption: permalink Permalink/Hint: Set browser address bar to a direct link to this tiddler Permaview/Caption: permaview diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js new file mode 100644 index 000000000..cb4c755f5 --- /dev/null +++ b/core/modules/startup/windows.js @@ -0,0 +1,63 @@ +/*\ +title: $:/core/modules/startup/windows.js +type: application/javascript +module-type: startup + +Setup root widget handlers for the messages concerned with opening external browser windows + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "windows"; +exports.platforms = ["browser"]; +exports.after = ["startup"]; +exports.synchronous = true; + +exports.startup = function() { + $tw.rootWidget.addEventListener("tm-open-window",function(event) { + // Get the parameters + var title = event.param || event.tiddlerTitle, + paramObject = event.paramObject || {}, + template = paramObject.template || "$:/core/ui/ViewTemplate/body", + width = paramObject.width || "700", + height = paramObject.height || "600"; + // Open the window + var srcWindow = window.open("","external-" + title,"width=" + width + ",height=" + height), + srcDocument = srcWindow.document; + srcWindow.onclose = function(event) { + console.log("closing popup"); + }; + srcWindow.addEventListener("close",function(event) { + console.log("closing2 popup"); + },false); + srcDocument.write(""); + srcDocument.close(); + // Set up the styles + var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{document: $tw.fakeDocument}), + styleContainer = $tw.fakeDocument.createElement("style"); + styleWidgetNode.render(styleContainer,null); + var styleElement = srcDocument.createElement("style"); + styleElement.innerHTML = styleContainer.textContent; + srcDocument.head.insertBefore(styleElement,srcDocument.head.firstChild); + $tw.wiki.addEventListener("change",function(changes) { + if(styleWidgetNode.refresh(changes,styleContainer,null)) { + styleElement.innerHTML = styleContainer.textContent; + } + }); + // Render the text of the tiddler + var parser = $tw.wiki.parseTiddler(template), + widgetNode = $tw.wiki.makeWidget(parser,{document: srcDocument, variables: {currentTiddler: title}}); + widgetNode.render(srcDocument.body,null); + $tw.wiki.addEventListener("change",function(changes) { + widgetNode.refresh(changes); + }); + + }); +}; + +})(); diff --git a/core/ui/ViewToolbar/open-window.tid b/core/ui/ViewToolbar/open-window.tid new file mode 100644 index 000000000..6c885fc94 --- /dev/null +++ b/core/ui/ViewToolbar/open-window.tid @@ -0,0 +1,13 @@ +title: $:/core/ui/Buttons/open-window +tags: $:/tags/ViewToolbar +caption: {{$:/core/images/open-window}} {{$:/language/Buttons/OpenWindow/Caption}} +description: {{$:/language/Buttons/OpenWindow/Hint}} + +<$button message="tm-open-window" tooltip={{$:/language/Buttons/OpenWindow/Hint}} aria-label={{$:/language/Buttons/OpenWindow/Caption}} class=<>> +<$list filter="[prefix[yes]]"> +{{$:/core/images/open-window}} + +<$list filter="[prefix[yes]]"> +<$text text={{$:/language/Buttons/OpenWindow/Caption}}/> + + \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index 4b578e862..3de79fc5a 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -1,25 +1,38 @@ title: TiddlyWiki Pre-release modified: 20150428204930183 +\define colour-picker(tiddler,colour) +<$edit-text tiddler="""$tiddler$""" index="""$colour$""" type="color" tag="input"/> +\end + This is a pre-release build of TiddlyWiki. It is provided for testing purposes. Please don't try to use it for anything important -- you should use the latest official release from http://tiddlywiki.com. ! Features for 5.1.9 +!! New Tiddler Toolbar Button: "Open in new window" + +An experimental new tiddler toolbar button opens a single tiddler in a separate pop-up browser window. The tiddler will be dynamically updated just as in the main window. There are several uses: + +* Arranging reference tiddlers for easy access while editing in the main window +* Making good use of multi-screen layouts +* Printing the content of a single tiddler +* Running presentations in a separate window while maintaining notes in the main window + !! Improvements for visually impaired users -* Improved monochrome palettes: +* Improved monochrome palette variants: ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastDark"/> -Set "Contrast (Light)" palette - +Dark palette +. Foreground: <>, Background: <> ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/> -Set "Contrast (Dark)" palette - +Light palette +. Foreground: <>, Background: <> ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/Vanilla"/> From 7667225840c0fb6ef0d6d91017b10809880943a8 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sat, 2 May 2015 12:13:01 +0100 Subject: [PATCH 13/13] Docs update --- .../from tw5.com/How to create plugins in the browser.tid | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid b/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid index f723e33b9..0314e3119 100644 --- a/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid +++ b/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid @@ -1,5 +1,5 @@ created: 2014013122133816 -modified: 20141111122437656 +modified: 20150502082437656 tags: howto title: How to create plugins in the browser type: text/vnd.tiddlywiki @@ -31,6 +31,7 @@ Click the link to the plugin tiddler to open it. Assuming it doesn't currently e |!Field |!Value | |''dependents'' |Space separated list of dependent plugins (use square brackets for titles containing spaces) | |''description'' |Plugin description | +|''name'' |Plugin name (only needed for themes) | |''plugin-type'' |Either "plugin" for a regular plugin, "theme" for a theme, or "language" for a language pack | |''type'' |Set to "application/json" | |''version'' |Set to the version number of the plugin (eg "0.0.1") |