Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New user interface for wiki creation
* Refactor settings into separate tiddlers * Refactor toolbar into separate tiddlers * Add new "create wiki" toolbar button
- Loading branch information
Showing
24 changed files
with
322 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,9 @@ | ||
| title: WikiListToolbar | ||
|
|
||
| <div class="td-toolbar"> | ||
| <$list filter="[all[tiddlers+shadows]tag[toolbar]]" variable="toolbar"> | ||
| <div class="td-toolbar-item"> | ||
| <$image source="AppIcon.svg" class="td-logo"/> | ||
| <$transclude tiddler=<<toolbar>>/> | ||
| </div> | ||
| <div class="td-toolbar-item"> | ||
| <div class="td-file-input-wrapper"> | ||
| <$button class="td-button"> | ||
| {{$:/core/images/new-button}} {{$:/core/images/file}} | ||
| <$text text="Add a TiddlyWiki file"/> | ||
| </$button> | ||
| <$browse message="tiddlydesktop-add-wiki-path"/> | ||
| </div> | ||
| </div> | ||
| <div class="td-toolbar-item"> | ||
| <div class="td-file-input-wrapper"> | ||
| <$button class="td-button"> | ||
| {{$:/core/images/new-button}} {{$:/core/images/folder}} | ||
| <$text text="Add a TiddlyWiki folder"/> | ||
| </$button> | ||
| <$browse nwdirectory message="tiddlydesktop-add-wiki-path"/> | ||
| </div> | ||
| </div> | ||
| <div class="td-toolbar-item"> | ||
| <$button class="td-button"> | ||
| <$action-sendmessage $message="tiddlydesktop-add-wiki-url" $param="backstage://$:/TiddlyDesktop/Settings"/> | ||
| {{$:/core/images/options-button}} | ||
| Settings | ||
| </$button> | ||
| </div> | ||
| <div class="td-toolbar-item"> | ||
| <$button class="td-button"> | ||
| <$action-sendmessage $message="tiddlydesktop-add-wiki-url" $param="backstage://$:/TiddlyDesktop/Help"/> | ||
| {{$:/core/images/help}} | ||
| Help | ||
| </$button> | ||
| </div> | ||
| <div class="td-toolbar-item"> | ||
| <$button class="td-button"> | ||
| <$action-sendmessage $message="tiddlydesktop-open-backstage-wiki"/> | ||
| {{$:/core/images/spiral}} | ||
| Backstage | ||
| </$button> | ||
| </div> | ||
| <$select tiddler="$:/config/templatewiki/source"> | ||
| <option></option> | ||
| <$list filter="[all[tiddlers+shadows]has[source]]"> | ||
| <option value={{!!source}}>{{!!title}}</option> | ||
| </$list> | ||
| </$select> | ||
| <div class="td-toolbar-item"> | ||
| <div class="td-file-input-wrapper"> | ||
|
|
||
| <$button> | ||
| copy | ||
| </$button> | ||
| <$browse message="tiddlydesktop-clone-wiki-path" nwsaveas="nwsaveas" param={{$:/config/templatewiki/source}} /> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| title: $:/TiddlyDesktop/Settings/Backups | ||
| caption: Backups | ||
| tags: $:/TiddlyDesktop/Settings | ||
|
|
||
| Backups for TiddlyWiki 5 file-based wikis are automatically made every time saving changes results in a file being overwritten. The previous content of the file is copied to a backup file with a filename such as `\MyData\index.html_backup\index.20150107172517000.html`. | ||
|
|
||
| The path of the backup file can be an absolute path or a relative path to the directory containing the ~TiddlyWiki file. The backup path can contain the following special tokens: | ||
|
|
||
| * `$filename$` to stand for the filename portion of the URL of the ~TiddlyWiki file | ||
| * `$filepath$` to stand for the entire filepath of the URL of the ~TiddlyWiki file | ||
|
|
||
| <$edit-text tiddler="$:/TiddlyDesktop/BackupPath" class="td-big-textarea" tag="input"/> | ||
|
|
||
| <$button> | ||
| <$action-deletetiddler $tiddler="$:/TiddlyDesktop/BackupPath"/> | ||
| Reset to default | ||
| </$button> | ||
|
|
||
| (Note that backups for ~TiddlyWiki Classic wikis are managed within the TWC wiki - see "txtBackupFolder" in ~AdvancedOptions). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| title: $:/TiddlyDesktop/Settings/Flags | ||
| caption: Chromium Flags | ||
| tags: $:/TiddlyDesktop/Settings | ||
|
|
||
| These flags are used to control Chromium, the browser component within ~TiddlyDesktop. | ||
|
|
||
| [[Chromium flags reference|https://peter.sh/experiments/chromium-command-line-switches/]] | ||
|
|
||
| <$button> | ||
| <$action-sendmessage $message="tiddlydesktop-flags"/> | ||
| Open Chromium flags | ||
| </$button> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,6 @@ | ||
| title: $:/TiddlyDesktop/Settings | ||
| tags: $:/tags/Settings | ||
| list-before: $:/core/ui/Settings/Info | ||
| caption: ~TiddlyDesktop | ||
| page-title: TiddlyDesktop Settings | ||
|
|
||
| <div class="td-backstage-tiddler-window-padded"> | ||
|
|
||
| ! ~TiddlyDesktop Settings | ||
|
|
||
| Version {{$:/TiddlyDesktop/version}} | ||
|
|
||
| !! Title of the ~WikiList Window | ||
|
|
||
| <$edit-text tiddler="WikiListWindow" class="td-big-textarea" field="page-title" tag="input"/> | ||
|
|
||
| !! Backups for ~TiddlyWiki 5 Wikis | ||
|
|
||
| Backups are automatically made every time saving changes results in a file being overwritten. The previous content of the file is copied to a backup file with a filename such as `\MyData\index.html_backup\index.20150107172517000.html`. | ||
|
|
||
| The path of the backup file can be an absolute path or a relative path to the directory containing the ~TiddlyWiki file. The backup path can contain the following special tokens: | ||
|
|
||
| * `$filename$` to stand for the filename portion of the URL of the ~TiddlyWiki file | ||
| * `$filepath$` to stand for the entire filepath of the URL of the ~TiddlyWiki file | ||
|
|
||
| <$edit-text tiddler="$:/TiddlyDesktop/BackupPath" class="td-big-textarea" tag="input"/> | ||
|
|
||
| <$button> | ||
| <$action-deletetiddler $tiddler="$:/TiddlyDesktop/BackupPath"/> | ||
| Reset to default | ||
| </$button> | ||
|
|
||
| (Note that backups for ~TiddlyWiki Classic wikis are managed within the TWC wiki - see "txtBackupFolder" in ~AdvancedOptions). | ||
|
|
||
| !! Templates | ||
|
|
||
| <$navigator> | ||
|
|
||
| !!! Add a new template: | ||
| ''Title'': <$edit-text tag="input" tiddler="$:/temp/newtemplate/title" default=""/><br /> | ||
| ''Source'': <$edit-text tag="input" tiddler="$:/temp/newtemplate/source" default=""/> | ||
| <$button> | ||
| Add Template | ||
| <$action-setfield $tiddler={{$:/temp/newtemplate/title}} source={{$:/temp/newtemplate/source}} /> | ||
| </$button> | ||
|
|
||
| ''Note'': When adding a file or folder, prefix the path with `wikifile://` or `wikifolder://` respectively. | ||
|
|
||
|
|
||
| !!! Delete an existing template | ||
| <$list filter="[all[tiddlers+shadows]has[source]]"> | ||
| <$button message="tm-delete-tiddler" tooltip={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class="tc-btn-invisible tc-tiddlylink" param=<<currentTiddler>> > | ||
| {{$:/core/images/delete-button}} | ||
| </$button> | ||
| <$text text={{!!title}} />: {{!!source}}<br /> | ||
| </$list> | ||
| </$navigator> | ||
|
|
||
| !! User Configuration Folder | ||
|
|
||
| This is the folder in which ~TiddlyDesktop stores internal configuration. Notably, the subfolder `user-config-tiddlywiki` contains the backstage wiki folder. If you are experiencing problems with ~TiddlyDesktop you can delete the entire configuration folder to reset TiddlyDesktop to default settings. | ||
|
|
||
| <$button> | ||
| <$action-sendmessage $message="tiddlydesktop-open-config-folder" $param="USER_CONFIG_FOLDER"/> | ||
| Open user config folder | ||
| </$button> | ||
|
|
||
| !! Flags | ||
|
|
||
| These flags are used to control Chromium, the browser component within ~TiddlyDesktop. | ||
|
|
||
| [[Chromium flags reference|https://peter.sh/experiments/chromium-command-line-switches/]] | ||
|
|
||
| <$button> | ||
| <$action-sendmessage $message="tiddlydesktop-flags"/> | ||
| Open Chromium flags | ||
| </$button> | ||
|
|
||
| </div> | ||
| <$importvariables filter="[[$:/core/macros/toc]]"> | ||
| <$macrocall $name="toc-tabbed-internal-nav" tag="$:/TiddlyDesktop/Settings" selectedTiddler="$:/temp/setings/toc/selectedTiddler" unselectedText="<p>Version {{$:/TiddlyDesktop/version}}.</p>" missingText="<p>Missing tiddler.</p>"/> | ||
| </$importvariables> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| title: $:/TiddlyDesktop/Settings/Templates | ||
| caption: Templates | ||
| tags: $:/TiddlyDesktop/Settings | ||
|
|
||
| <$list filter="[all[tiddlers+shadows]tag[template]]"> | ||
| <div style="margin-bottom:1em;padding:0.5em;background:white;"> | ||
| <div style="float:right;"> | ||
| <$list filter="[<currentTiddler>is[shadow]is[missing]]" variable="ignore" emptyMessage=""" | ||
| <$button tooltip="Delete this template" class="tc-btn-invisible td-button"> | ||
| <$action-deletetiddler $tiddler=<<currentTiddler>>/> | ||
| {{$:/core/images/delete-button}} Delete | ||
| </$button> | ||
| """> | ||
| <span class="tc-muted">(built-in)</span> | ||
| </$list> | ||
| </div> | ||
| <div><$text text={{!!caption}}/></div> | ||
| <div class="tc-muted"> | ||
| <$list filter="[<currentTiddler>get[source]prefix[http]]" variable="ignore" emptyMessage="<$text text={{!!source}}/>"> | ||
| <$link><$text text={{!!source}}/></$link> | ||
| </$list> | ||
| </div> | ||
| </div> | ||
| </$list> | ||
|
|
||
| !! Add a new template | ||
|
|
||
| ''Caption'': <$edit-text tag="input" tiddler="$:/temp/newtemplate/caption" default=""/> | ||
|
|
||
| ''Source'': <$edit-text tag="input" tiddler="$:/temp/newtemplate/source" default=""/> | ||
|
|
||
| <$list filter="[{$:/temp/newtemplate/source}prefix[http://]] ~[{$:/temp/newtemplate/source}prefix[https://]] ~[{$:/temp/newtemplate/source}prefix[wikifile://]] ~[{$:/temp/newtemplate/source}prefix[wikifolder://]]" variable="ignore" emptyMessage="<button disabled>Invalid source</button>"> | ||
| <$button> | ||
| Add Template | ||
| <$action-createtiddler $basetitle="$:/TiddlyDesktop/Templates/Custom" caption={{$:/temp/newtemplate/caption}} source={{$:/temp/newtemplate/source}} tags="template"/> | ||
| <$action-setfield $tiddler="$:/temp/newtemplate/caption" $value=""/> | ||
| <$action-setfield $tiddler="$:/temp/newtemplate/source" $value=""/> | ||
| </$button> | ||
| </$list> | ||
|
|
||
| The source must match one of these patterns: | ||
|
|
||
| * `wikifile://<path-to-wiki-file>` | ||
| * `wikifolder://<path-to-wiki-folder>` | ||
| * `http://<url-of-wiki-file>` | ||
| * `https://<url-of-wiki-file>` | ||
|
|
||
| Examples: | ||
|
|
||
| ``` | ||
| wikifile:///Users/jobloggs/files/wiki.html | ||
| wikifolder:///MyWikiFolder | ||
| wikifolder://C:\MyWikiFolder | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| title: $:/TiddlyDesktop/Settings/UserConfig | ||
| caption: User Configuration Folder | ||
| tags: $:/TiddlyDesktop/Settings | ||
|
|
||
| This is the folder in which ~TiddlyDesktop stores internal configuration. Notably, the subfolder `user-config-tiddlywiki` contains the backstage wiki folder. If you are experiencing problems with ~TiddlyDesktop you can delete the entire configuration folder to reset TiddlyDesktop to default settings. | ||
|
|
||
| <$button> | ||
| <$action-sendmessage $message="tiddlydesktop-open-config-folder" $param="USER_CONFIG_FOLDER"/> | ||
| Open user config folder | ||
| </$button> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| title: $:/TiddlyDesktop/Settings/WikiListTitle | ||
| caption: Wiki List Window Title | ||
| tags: $:/TiddlyDesktop/Settings | ||
|
|
||
| <$edit-text tiddler="WikiListWindow" class="td-big-textarea" field="page-title" tag="input"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.