diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index 00cb3c99c..5a30c2986 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -40,6 +40,10 @@ Error/RetrievingSkinny: Error retrieving skinny tiddler list Error/SavingToTWEdit: Error saving to TWEdit Error/WhileSaving: Error while saving Error/XMLHttpRequest: XMLHttpRequest error code +Globals/Caption: Global <>: ''<>'' +Globals/ListItem: ''<>'' (<>) +Globals/Parameters/Caption: Parameters: +Globals/Text/Caption: Text: InternalJavaScriptError/Title: Internal JavaScript Error InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser LayoutSwitcher/Description: Open the layout switcher diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids index c4fda9c81..5c46555c9 100644 --- a/core/language/en-GB/SideBar.multids +++ b/core/language/en-GB/SideBar.multids @@ -5,6 +5,7 @@ All/Caption: All Contents/Caption: Contents Drafts/Caption: Drafts Explorer/Caption: Explorer +Globals/Caption: Globals Missing/Caption: Missing More/Caption: More Open/Caption: Open diff --git a/core/ui/MoreSideBar/Globals.tid b/core/ui/MoreSideBar/Globals.tid new file mode 100644 index 000000000..b621e7e04 --- /dev/null +++ b/core/ui/MoreSideBar/Globals.tid @@ -0,0 +1,16 @@ +title: $:/core/ui/MoreSideBar/Globals +tags: $:/tags/MoreSideBar +caption: {{$:/language/SideBar/Globals/Caption}} + +<$list filter="[all[tiddlers+shadows]prefix[$:/global/]sort[]]"> +
+<$link> +<$let + name={{{ [removeprefix[$:/global/]] }}} + type={{{ [{!!_is_macro}match[yes]then[macro]] :else[{!!_is_function}match[yes]then[function]] :else[{!!_is_procedure}match[yes]then[procedure]] :else[{!!_is_widget}match[yes]then[widget]] :else[[variable]] }}} +> +{{$:/language/Globals/ListItem}} + + +
+ diff --git a/core/ui/ViewTemplate/body/global.tid b/core/ui/ViewTemplate/body/global.tid new file mode 100644 index 000000000..66b132554 --- /dev/null +++ b/core/ui/ViewTemplate/body/global.tid @@ -0,0 +1,24 @@ +title: $:/core/ui/ViewTemplate/body/global + +\procedure display-global() +
+
+

+<$let + name={{{ [removeprefix[$:/global/]] }}} + type={{{ [{!!_is_macro}match[yes]then[macro]] :else[{!!_is_function}match[yes]then[function]] :else[{!!_is_procedure}match[yes]then[procedure]] :else[{!!_is_widget}match[yes]then[widget]] :else[[variable]] }}} +> +{{$:/language/Globals/Caption}} + +

+<$list filter="[has[_parameters]]" variable="ignore"> +{{$:/language/Globals/Parameters/Caption}} +
<$text text={{!!_parameters}}/>
+ +
+{{$:/language/Globals/Text/Caption}} +<$transclude tiddler="$:/core/ui/ViewTemplate/body/code"/> +
+\end + +<$transclude $variable="display-global" $mode="inline"/> diff --git a/core/ui/ViewTemplate/title/global.tid b/core/ui/ViewTemplate/title/global.tid new file mode 100644 index 000000000..d1efaf89b --- /dev/null +++ b/core/ui/ViewTemplate/title/global.tid @@ -0,0 +1,6 @@ +title: $:/core/ui/ViewTemplate/title/global + +\whitespace trim +

+$:/global/<$text text={{{ [removeprefix[$:/global/]] }}}/> +

\ No newline at end of file diff --git a/core/wiki/config/ViewTemplateBodyFilters.multids b/core/wiki/config/ViewTemplateBodyFilters.multids index 6348cc036..83d0cd3da 100644 --- a/core/wiki/config/ViewTemplateBodyFilters.multids +++ b/core/wiki/config/ViewTemplateBodyFilters.multids @@ -1,6 +1,7 @@ title: $:/config/ViewTemplateBodyFilters/ tags: $:/tags/ViewTemplateBodyFilter +global: [prefix[$:/global/]then[$:/core/ui/ViewTemplate/body/global]] stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]] system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/core/ui/]split[/]count[]compare:number:eq[4]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]] code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]] diff --git a/core/wiki/config/ViewTemplateTitleFilters.multids b/core/wiki/config/ViewTemplateTitleFilters.multids index 938211311..50f64f5a5 100644 --- a/core/wiki/config/ViewTemplateTitleFilters.multids +++ b/core/wiki/config/ViewTemplateTitleFilters.multids @@ -1,5 +1,6 @@ title: $:/config/ViewTemplateTitleFilters/ tags: $:/tags/ViewTemplateTitleFilter +global: [prefix[$:/global/]then[$:/core/ui/ViewTemplate/title/global]] system: [prefix[$:/]then[$:/core/ui/ViewTemplate/title/system]] default: [[$:/core/ui/ViewTemplate/title/default]] diff --git a/core/wiki/tags/MoreSideBar.tid b/core/wiki/tags/MoreSideBar.tid index f3371ef4b..215a7f37f 100644 --- a/core/wiki/tags/MoreSideBar.tid +++ b/core/wiki/tags/MoreSideBar.tid @@ -1,3 +1,3 @@ title: $:/tags/MoreSideBar -list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] [[$:/core/ui/MoreSideBar/Explorer]] [[$:/core/ui/MoreSideBar/Plugins]] +list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] [[$:/core/ui/MoreSideBar/Explorer]] [[$:/core/ui/MoreSideBar/Globals]] [[$:/core/ui/MoreSideBar/Plugins]] diff --git a/core/wiki/tags/ViewTemplateBodyFilter.tid b/core/wiki/tags/ViewTemplateBodyFilter.tid index ab7ff262a..3211e15ee 100644 --- a/core/wiki/tags/ViewTemplateBodyFilter.tid +++ b/core/wiki/tags/ViewTemplateBodyFilter.tid @@ -1,3 +1,3 @@ title: $:/tags/ViewTemplateBodyFilter -list: $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default +list: $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/global $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default diff --git a/core/wiki/tags/ViewTemplateTitleFilter.tid b/core/wiki/tags/ViewTemplateTitleFilter.tid index 24f3fb580..b27b3aed0 100644 --- a/core/wiki/tags/ViewTemplateTitleFilter.tid +++ b/core/wiki/tags/ViewTemplateTitleFilter.tid @@ -1,3 +1,3 @@ title: $:/tags/ViewTemplateTitleFilter -list: $:/config/ViewTemplateTitleFilters/system $:/config/ViewTemplateTitleFilters/default +list: $:/config/ViewTemplateTitleFilters/global $:/config/ViewTemplateTitleFilters/system $:/config/ViewTemplateTitleFilters/default diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 9c4a342ff..3a50a6c1b 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -3068,6 +3068,36 @@ select { background: <>; } +/* +** Classes for displaying globals +*/ + +.tc-global-tiddler-body { + padding: 0.25em; + border: 1px solid <>; + background-color: <>; + border-radius: 3px; +} + +.tc-global-tiddler-body-heading { + margin: 0 0 0.25em 0; + font-weight: normal; +} + +.tc-global-tiddler-body-type { + margin: 0 0 0.25em 0; + border-bottom: 1px solid <>; +} + +.tc-global-tiddler-body-details { + background-color: <>; +} + +.tc-global-tiddler-body pre { + margin: 0; + border: 1px solid <>; +} + /* ** Utility classes for SVG icons */