Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add view template for normal compound tiddlers #8451

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions core/ui/CompoundTemplate.tid
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
title: $:/core/ui/CompoundTemplate

\whitespace trim
<$let
linkTarget="yes"
displayFormat={{!!display-format}}
testcaseTiddler=<<currentTiddler>>
>
<$testcase
template="$:/core/ui/testcases/CompoundTemplate"
>
<$data $compound-tiddler=<<currentTiddler>>/>
</$testcase>
</$let>
50 changes: 50 additions & 0 deletions core/ui/TestCases/CompoundTemplate.tid
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
title: $:/core/ui/testcases/CompoundTemplate
code-body: yes

\whitespace trim
\procedure linkcatcherActions()
<%if [<navigateTo>has[title]] %>
<$qualify title=<<state>> name="qualifiedState">
<$action-setfield $tiddler=<<qualifiedState>> text=<<navigateTo>>/>
</$qualify>
<%endif%>
\end

<$let
state={{{ [<qualify "$:/state/testcase">] }}}
>
<h2>
<span class="tc-test-case-toolbar">
<$button popup=`$(state)$-more`
tooltip={{$:/language/Buttons/More/Hint}}
aria-label={{$:/language/Buttons/More/Caption}}
class="tc-btn-invisible"
selectedClass="tc-selected"
>
{{$:/core/images/down-arrow}}
</$button>
<$let
tv-config-toolbar-icons="yes"
tv-config-toolbar-text="yes"
tv-config-toolbar-class="tc-btn-invisible"
>
<$reveal state=`$(state)$-more` type="popup" position="belowleft" animate="yes">
<div class="tc-drop-down">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
variable="listItem"
>
<$transclude $tiddler=<<listItem>> $mode="inline"/>
</$list>
</div>
</$reveal>
</$let>
</span>
</h2>
<$linkcatcher actions=<<linkcatcherActions>>>
<div class="tc-test-case-panes">
<div class="tc-test-case-source">
<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix[$:/state/]] -[has[plugin-type]]" default=`${ [all[tiddlers]sort[]] -[prefix[$:/state/]] -[has[plugin-type]] +[first[]] }$` state=<<state>> template="$:/core/ui/testcases/CompoundTemplate/SourceTabs"/>
</div>
</div>
</$linkcatcher>
</$let>
31 changes: 31 additions & 0 deletions core/ui/TestCases/CompoundTemplateSourceTabs.tid
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
title: $:/core/ui/testcases/CompoundTemplate/SourceTabs

\whitespace trim

\procedure body()
<$list filter="[<currentTab>fields[]] -text +[limit[1]]" variable="ignore">
<table class="tc-field-table">
<tbody>
<$list filter="[<currentTab>fields[]sort[]] -text -title title +[putfirst[]]" variable="fieldName">
<tr>
<td>
<$text text=<<fieldName>>/>
</td>
<td>
<$view tiddler=<<currentTab>> field=<<fieldName>>/>
</td>
</tr>
</$list>
</tbody>
</table>
</$list>
<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
<pre><$view tiddler=<<currentTab>> format="plainwikified" mode="block"/></pre>
<%else%>
<$tiddler tiddler=<<currentTab>>>
<$transclude $tiddler=<<currentTab>> $mode="block"/>
</$tiddler>
<%endif%>
\end

<$transclude $variable="body" $mode="inline"/>
1 change: 1 addition & 0 deletions core/wiki/config/ViewTemplateBodyFilters.multids
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ system: [prefix[$:/boot/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [pre
code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]
plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]]
compound: [type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/CompoundTemplate]]
hide-body: [field:hide-body[yes]then[$:/core/ui/ViewTemplate/body/blank]]
default: [[$:/core/ui/ViewTemplate/body/default]]
2 changes: 1 addition & 1 deletion core/wiki/tags/ViewTemplateBodyFilter.tid
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
title: $:/tags/ViewTemplateBodyFilter
list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/compound $:/config/ViewTemplateBodyFilters/default
Loading