mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-11-10 20:09:57 +00:00
Merge branch 'master' into multi-wiki-support
This commit is contained in:
Jeremy Ruston
commit
c73311684b
@ -133,6 +133,7 @@ Excise/Caption/Replace/Link: link
|
||||
Excise/Caption/Replace/Transclusion: transclusion
|
||||
Excise/Caption/Tag: Tag new tiddler with the title of this tiddler
|
||||
Excise/Caption/TiddlerExists: Warning: tiddler already exists
|
||||
Excise/DefaultTitle: New Excision
|
||||
Excise/Hint: Excise the selected text into a new tiddler
|
||||
Heading1/Caption: heading 1
|
||||
Heading1/Hint: Apply heading level 1 formatting to lines containing selection
|
||||
|
||||
@ -14,11 +14,12 @@ Text editor operation to excise the selection to a new tiddler
|
||||
|
||||
exports["excise"] = function(event,operation) {
|
||||
var editTiddler = this.wiki.getTiddler(this.editTitle),
|
||||
editTiddlerTitle = this.editTitle;
|
||||
editTiddlerTitle = this.editTitle,
|
||||
excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
|
||||
if(editTiddler && editTiddler.fields["draft.of"]) {
|
||||
editTiddlerTitle = editTiddler.fields["draft.of"];
|
||||
}
|
||||
var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
|
||||
var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
|
||||
this.wiki.addTiddler(new $tw.Tiddler(
|
||||
this.wiki.getCreationFields(),
|
||||
this.wiki.getModificationFields(),
|
||||
|
||||
@ -58,15 +58,15 @@ caption: {{$:/language/Search/Standard/Caption}}
|
||||
configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
|
||||
searchListState="$:/temp/advancedsearch/selected-item">
|
||||
<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
|
||||
<$list-empty>
|
||||
<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude mode="block"/></$list>
|
||||
</$list-empty>
|
||||
<$macrocall $name="tabs"
|
||||
tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
|
||||
default={{$:/config/SearchResults/Default}}
|
||||
actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
|
||||
explicitState="$:/state/tab/search-results/advancedsearch" />
|
||||
</$list>
|
||||
<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]] :else[[]]">
|
||||
<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"><$transclude mode="block"/></$list>
|
||||
</$list>
|
||||
</$vars>
|
||||
</$list>
|
||||
</$reveal>
|
||||
|
||||
@ -9,6 +9,6 @@ type: text/vnd.tiddlywiki
|
||||
<$link to={{{ [<__version__>addprefix[Release ]] }}} class="doc-from-version">{{$:/core/images/warning}} New in: <$text text=<<__version__>>/></$link>
|
||||
\end
|
||||
|
||||
\define .deprecated-since(version, superseded:"TODO-Link")
|
||||
<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: <$text text=<<__version__>>/></$link> (see <$link to=<<__superseded__>>><$text text=<<__superseded__>>/></$link>)
|
||||
\define .deprecated-since(version, superseded:"")
|
||||
<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated from v<$text text=<<__version__>>/></$link> <%if [<__superseded__>else[]!match[]] %>(see <$link to=<<__superseded__>>><$text text=<<__superseded__>>/></$link>)<%endif%>
|
||||
\end
|
||||
|
||||
@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki
|
||||
\end
|
||||
|
||||
\define .deprecated-since(version, superseded:"TODO-Link")
|
||||
<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. Utilisez [[$superseded$]] à la place
|
||||
<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. <%if [<__superseded__>else[]!match[]] %>Utilisez [[$superseded$]] à la place<%endif%>
|
||||
\end
|
||||
|
||||
<pre><$view field="text"/></pre>
|
||||
@ -26,13 +26,15 @@ type: text/vnd.tiddlywiki
|
||||
<% endif %>
|
||||
\end
|
||||
|
||||
\procedure .deprecated-since(version, superseded:"TODO-Link")
|
||||
\procedure .deprecated-since(version, superseded:"")
|
||||
<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">
|
||||
{{$:/core/images/warning}}
|
||||
<span class="tc-tiny-gap">Deprecated since:</span>
|
||||
<$text text=<<version>>/>
|
||||
<span class="tc-tiny-gap">Deprecated from </span>
|
||||
v<$text text=<<version>>/>
|
||||
</$link>
|
||||
<span class="tc-tiny-gap-left">
|
||||
(see <$link class="tc-tiny-gap-left" to=<<superseded>>><$text text=<<superseded>>/></$link>)
|
||||
</span>
|
||||
<%if [<superseded>else[]!match[]] %>
|
||||
<span class="tc-tiny-gap-left">
|
||||
(see <$link class="tc-tiny-gap-left" to=<<superseded>>><$text text=<<superseded>>/></$link>)
|
||||
</span>
|
||||
<%endif%>
|
||||
\end
|
||||
|
||||
@ -133,6 +133,7 @@ Excise/Caption/Replace/Link: 链接
|
||||
Excise/Caption/Replace/Transclusion: 嵌入
|
||||
Excise/Caption/Tag: 将新条目的标签设为此条目的名称
|
||||
Excise/Caption/TiddlerExists: 提醒：条目已经存在
|
||||
Excise/DefaultTitle: 新的剪切
|
||||
Excise/Hint: 剪切所选文本到一个新条目
|
||||
Heading1/Caption: 标题 1
|
||||
Heading1/Hint: 套用标题级别 1 的格式于包含所选文本的列
|
||||
|
||||
@ -199,6 +199,12 @@ Settings/TitleLinks/Caption: 条目标题
|
||||
Settings/TitleLinks/Hint: 可选地显示条目标题为链接
|
||||
Settings/TitleLinks/No/Description: 不显示条目标题为链接
|
||||
Settings/TitleLinks/Yes/Description: 显示条目标题为链接
|
||||
SocialCard/Caption: 社交媒体卡
|
||||
SocialCard/Domain/Prompt: 显示链接的网域名称（例如 ''tiddlywiki.com''）
|
||||
SocialCard/Hint: 社交和消息服务使用此信息来显示在线托管时指向此 TiddlyWiki 的链接的预览卡
|
||||
SocialCard/PreviewUrl/Prompt: 用于预览此 TiddlyWiki 图像的完整网址
|
||||
SocialCard/PreviewUrl/Preview: 预览图像：
|
||||
SocialCard/Url/Prompt: 此 TiddlyWiki 的完整网址
|
||||
StoryTiddler/Caption: 故事条目
|
||||
StoryTiddler/Hint: 此规则级联用于动态选择模板，以便在故事河中显示条目。
|
||||
StoryView/Caption: 视图模式
|
||||
|
||||
@ -133,6 +133,7 @@ Excise/Caption/Replace/Link: 鏈接
|
||||
Excise/Caption/Replace/Transclusion: 嵌入
|
||||
Excise/Caption/Tag: 將新條目的標籤設為此條目的名稱
|
||||
Excise/Caption/TiddlerExists: 警示：條目已經存在
|
||||
Excise/DefaultTitle: 新的剪切
|
||||
Excise/Hint: 剪切所選文字到一個新條目
|
||||
Heading1/Caption: 標題 1
|
||||
Heading1/Hint: 套用標題級別 1 的格式於包含所選文字的列
|
||||
|
||||
@ -199,6 +199,12 @@ Settings/TitleLinks/Caption: 條目標題
|
||||
Settings/TitleLinks/Hint: 可選地顯示條目標題為鏈接
|
||||
Settings/TitleLinks/No/Description: 不顯示條目標題為鏈接
|
||||
Settings/TitleLinks/Yes/Description: 顯示條目標題為鏈接
|
||||
SocialCard/Caption: 社交媒體卡
|
||||
SocialCard/Domain/Prompt: 顯示連結的網域名稱（例如 ''tiddlywiki.com''）
|
||||
SocialCard/Hint: 社交和訊息服務使用此資訊來顯示線上託管時指向此 TiddlyWiki 的連結的預覽卡
|
||||
SocialCard/PreviewUrl/Prompt: 用於預覽此 TiddlyWiki 圖像的完整網址
|
||||
SocialCard/PreviewUrl/Preview: 預覽圖像：
|
||||
SocialCard/Url/Prompt: 此 TiddlyWiki 的完整網址
|
||||
StoryTiddler/Caption: 故事條目
|
||||
StoryTiddler/Hint: 此規則級聯用於動態選擇範本，以便在故事河中顯示條目。
|
||||
StoryView/Caption: 檢視模式
|
||||
|
||||
@ -75,12 +75,16 @@ input[type="search"] {
|
||||
outline-offset: initial;
|
||||
}
|
||||
|
||||
button, textarea, input, select {
|
||||
outline-color: <<colour primary>>;
|
||||
button:focus-visible, input:focus-visible, textarea:focus-visible, select:focus-visible {
|
||||
outline: 2px solid <<colour primary>>;
|
||||
outline-offset: -2px;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
:-moz-focusring {
|
||||
button:-moz-focusring, input:-moz-focusring, textarea:-moz-focusring, select:-moz-focusring {
|
||||
outline: 2px solid <<colour primary>>;
|
||||
outline-offset: -2px;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user