diff --git a/editions/fr-FR/tiddlers/$__core_macros_list.tid b/editions/fr-FR/tiddlers/$__core_macros_list.tid new file mode 100644 index 000000000..a9046eaff --- /dev/null +++ b/editions/fr-FR/tiddlers/$__core_macros_list.tid @@ -0,0 +1,23 @@ +created: 20141127091159720 +creator: 127.0.0.1 +modified: 20141127091212193 +modifier: 127.0.0.1 +tags: $:/tags/Macro +title: $:/core/macros/list +type: text/vnd.tiddlywiki + +\define list-links(filter,type:"ul",subtype:"li",class:"") +<$type$ class="$class$"> +<$list filter="$filter$"> +<$subtype$> +<$link to={{!!title}}> +<$transclude field="fr-title"> +<$transclude field="caption"> +<$view field="title"/> + + + + + + +\end diff --git a/editions/fr-FR/tiddlers/$__core_macros_timeline.tid b/editions/fr-FR/tiddlers/$__core_macros_timeline.tid index a3165482e..eb63d3eff 100644 --- a/editions/fr-FR/tiddlers/$__core_macros_timeline.tid +++ b/editions/fr-FR/tiddlers/$__core_macros_timeline.tid @@ -1,6 +1,6 @@ created: 20141119224138888 creator: 127.0.0.1 -modified: 20141119224210297 +modified: 20141127151713840 modifier: 127.0.0.1 tags: $:/tags/Macro title: $:/core/macros/timeline @@ -15,8 +15,10 @@ type: text/vnd.tiddlywiki
<$link to={{!!title}}> <$view field="caption"> +<$view field="fr-title"> <$view field="title"/> +
diff --git a/editions/fr-FR/tiddlers/$__core_macros_toc.tid b/editions/fr-FR/tiddlers/$__core_macros_toc.tid new file mode 100644 index 000000000..c87229154 --- /dev/null +++ b/editions/fr-FR/tiddlers/$__core_macros_toc.tid @@ -0,0 +1,183 @@ +created: 20141127152047697 +creator: 127.0.0.1 +modified: 20141127152823847 +modifier: 127.0.0.1 +tags: $:/tags/Macro +title: $:/core/macros/toc +type: text/vnd.tiddlywiki + +\define title-unless-caption() +<$transclude field='fr-title'> +<$view field='caption'> +<$view field='title'/> + + +\end +\define toc-body(rootTag,tag,sort:"",itemClassFilter) +
    +<$list filter="""[tag[$tag$]!has[draft.of]$sort$]"""> +<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> +
  1. >> +<$list filter="[is[current]toc-link[no]]" emptyMessage="<$link><>"> +<> + +<$list filter="""[all[current]] -[[$rootTag$]]"""> +<$macrocall $name="toc-body" rootTag="""$rootTag$""" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> + +
  2. + + +
+\end + +\define toc(tag,sort:"",itemClassFilter) +<> +\end + +\define toc-linked-expandable-body(tag,sort:"",itemClassFilter) +<$set name="toc-state" value=<>> +<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> +
  • >> +<$link> +<$reveal type="nomatch" state=<> text="open"> +<$button set=<> setTo="open" class="tc-btn-invisible"> +{{$:/core/images/right-arrow}} + + +<$reveal type="match" state=<> text="open"> +<$button set=<> setTo="close" class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} + + +<> + +<$reveal type="match" state=<> text="open"> +<$macrocall $name="toc-expandable" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> + +
  • + + +\end + +\define toc-unlinked-expandable-body(tag,sort:"",itemClassFilter) +<$set name="toc-state" value=<>> +<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> +
  • >> +<$reveal type="nomatch" state=<> text="open"> +<$button set=<> setTo="open" class="tc-btn-invisible"> +{{$:/core/images/right-arrow}} +<> + + +<$reveal type="match" state=<> text="open"> +<$button set=<> setTo="close" class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} +<> + + +<$reveal type="match" state=<> text="open"> +<$macrocall $name="toc-expandable" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> + +
  • + + +\end + +\define toc-expandable(tag,sort:"",itemClassFilter) +
      +<$list filter="[tag[$tag$]!has[draft.of]$sort$]"> +<$list filter="[is[current]toc-link[no]]" emptyMessage="<>"> +<> + + +
    +\end + +\define toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter) +<$set name="toc-state" value=<>> +<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> +
  • >> +<$link> +<$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}"> +<$reveal type="nomatch" state=<> text="open"> +<$button set=<> setTo="open" class="tc-btn-invisible"> +{{$:/core/images/right-arrow}} + + +<$reveal type="match" state=<> text="open"> +<$button set=<> setTo="close" class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} + + + +<> + +<$reveal type="match" state=<> text="open"> +<$macrocall $name="toc-selective-expandable" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> + +
  • + + +\end + +\define toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter) +<$set name="toc-state" value=<>> +<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> +
  • >> +<$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}} <>"> +<$reveal type="nomatch" state=<> text="open"> +<$button set=<> setTo="open" class="tc-btn-invisible"> +{{$:/core/images/right-arrow}} +<> + + +<$reveal type="match" state=<> text="open"> +<$button set=<> setTo="close" class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} +<> + + + +<$reveal type="match" state=<> text="open"> +<$macrocall $name="""toc-selective-expandable""" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> + +
  • + + +\end + +\define toc-selective-expandable(tag,sort:"",itemClassFilter) +
      +<$list filter="[tag[$tag$]!has[draft.of]$sort$]"> +<$list filter="[is[current]toc-link[no]]" variable="ignore" emptyMessage="<>"> +<> + + +
    +\end + +\define toc-tabbed-selected-item-filter(selectedTiddler) +[all[current]field:title{$selectedTiddler$}] +\end + +\define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText) +<$tiddler tiddler={{$selectedTiddler$}}> +
    +<$linkcatcher to="$selectedTiddler$"> +
    +<$macrocall $name="toc-selective-expandable" tag="""$tag$""" sort="""$sort$""" itemClassFilter=<>/> +
    + +
    +

    <>

    +<$transclude mode="block">$unselectedText$ +
    +
    + +\end + +\define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText) +<$linkcatcher to="""$selectedTiddler$"""> +<$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$"""/> + +\end diff --git a/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid b/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid index 84d305f89..b224e405d 100644 --- a/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid +++ b/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid @@ -1,13 +1,13 @@ created: 20141117221740337 creator: 127.0.0.1 -modified: 20141119225717026 +modified: 20141127153644691 modifier: 127.0.0.1 title: $:/core/ui/ListItemTemplate type: text/vnd.tiddlywiki
    <$link to={{!!title}}> -<$transclude field="caption"> +<$transclude field="fr-title"> <$view field="title"/> diff --git a/editions/fr-FR/tiddlers/$__core_ui_SideBar_Open.tid b/editions/fr-FR/tiddlers/$__core_ui_SideBar_Open.tid index fb9b24150..d396fab34 100644 --- a/editions/fr-FR/tiddlers/$__core_ui_SideBar_Open.tid +++ b/editions/fr-FR/tiddlers/$__core_ui_SideBar_Open.tid @@ -1,7 +1,7 @@ caption: {{$:/language/SideBar/Open/Caption}} created: 20141119223515194 creator: 127.0.0.1 -modified: 20141119230318907 +modified: 20141127160706002 modifier: 127.0.0.1 tags: $:/tags/SideBar title: $:/core/ui/SideBar/Open @@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki \define lingo-base() $:/language/CloseAll/ <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop"> -<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">× <$link to={{!!title}}><$transclude field="caption"><$view field="title"/> +<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">× <$link to={{!!title}}><$transclude field="fr-title"><$view field="title"/> diff --git a/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid b/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid index f0699ff28..dfaa6e1f2 100644 --- a/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid +++ b/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid @@ -1,6 +1,6 @@ created: 20141119191707140 creator: 127.0.0.1 -modified: 20141119223956119 +modified: 20141128165607841 modifier: 127.0.0.1 tags: $:/tags/ViewTemplate title: $:/core/ui/ViewTemplate/title @@ -29,9 +29,9 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$list filter="[all[current]!prefix[$:/]]">

    -<$transclude field="caption"> +<$view field="fr-title"> <$view field="title"/> - +