diff --git a/core/images/close-all-button.tid b/core/images/close-all-button.tid new file mode 100644 index 000000000..0d3e0f46d --- /dev/null +++ b/core/images/close-all-button.tid @@ -0,0 +1,15 @@ +title: $:/core/images/close-all-button +tags: $:/tags/Image + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 9d5c1896a..0317ba1ba 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -8,6 +8,8 @@ Clone/Caption: clone Clone/Hint: Clone this tiddler Close/Caption: close Close/Hint: Close this tiddler +CloseAll/Caption: close all +CloseAll/Hint: Close all tiddlers CloseOthers/Caption: close others CloseOthers/Hint: Close other tiddlers ControlPanel/Caption: control panel diff --git a/core/modules/widgets/checkbox.js b/core/modules/widgets/checkbox.js index 64d4b2389..d13496c95 100644 --- a/core/modules/widgets/checkbox.js +++ b/core/modules/widgets/checkbox.js @@ -87,7 +87,8 @@ CheckboxWidget.prototype.getValue = function() { CheckboxWidget.prototype.handleChangeEvent = function(event) { var checked = this.inputDomNode.checked, tiddler = this.wiki.getTiddler(this.checkboxTitle), - newFields = {title: this.checkboxTitle, text: ""}, + fallbackFields = {text: ""}, + newFields = {title: this.checkboxTitle}, hasChanged = false; // Set the tag if specified if(this.checkboxTag && (!tiddler || tiddler.hasTag(this.checkboxTag) !== checked)) { @@ -110,7 +111,7 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) { } } if(hasChanged) { - this.wiki.addTiddler(new $tw.Tiddler(tiddler,newFields,this.wiki.getModificationFields())); + this.wiki.addTiddler(new $tw.Tiddler(fallbackFields,tiddler,newFields,this.wiki.getModificationFields())); } }; diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid index e4a574317..f2cfd6692 100644 --- a/core/ui/EditTemplate/controls.tid +++ b/core/ui/EditTemplate/controls.tid @@ -4,4 +4,8 @@ tags: $:/tags/EditTemplate \define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$ \end +
+<$view field="title"/> <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<> text="hide"><$transclude tiddler=<>/> +
+
diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid index af0ebced0..6953ae072 100644 --- a/core/ui/EditTemplate/title.tid +++ b/core/ui/EditTemplate/title.tid @@ -1,6 +1,4 @@ title: $:/core/ui/EditTemplate/title tags: $:/tags/EditTemplate -<$view field="title"/> - <$edit-text field="draft.title" class="titlebar tw-edit-texteditor"/> diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid new file mode 100644 index 000000000..5c5c30b95 --- /dev/null +++ b/core/ui/PageControls/closeall.tid @@ -0,0 +1,12 @@ +title: $:/core/ui/Buttons/close-all +tags: $:/tags/PageControls +caption: {{$:/core/images/close-all-button}} {{$:/language/Buttons/CloseAll/Caption}} + +<$button message="tw-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<>> +<$list filter="[prefix[yes]]"> +{{$:/core/images/close-all-button}} + +<$list filter="[prefix[yes]]"> +<$text text={{$:/language/Buttons/CloseAll/Caption}}/> + + diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids index 7d80b6d44..76bfbbfe7 100644 --- a/core/wiki/config/PageControlButtons.multids +++ b/core/wiki/config/PageControlButtons.multids @@ -3,3 +3,4 @@ title: $:/config/PageControlButtons/Visibility/$:/ core/ui/Buttons/encryption: hide core/ui/Buttons/home: hide core/ui/Buttons/permaview: hide +core/ui/Buttons/close-all: hide diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids index 50930a1d5..ff1e417cc 100644 --- a/languages/de-DE/Buttons.multids +++ b/languages/de-DE/Buttons.multids @@ -4,22 +4,41 @@ AdvancedSearch/Caption: erweiterte suche AdvancedSearch/Hint: Erweiterte Suche Cancel/Caption: abbrechen Cancel/Hint: Tiddler bearbeiten abbrechen +Clone/Caption: klone +Clone/Hint: Klone diesen Tiddler Close/Caption: schließen Close/Hint: Schließe diesen Tiddler +CloseAll/Caption: alle schließen +CloseAll/Hint: Alle Tiddler schließen +CloseOthers/Caption: andere schließen +CloseOthers/Hint: Alle anderen Tiddler schließen ControlPanel/Caption: Control Panel ControlPanel/Hint: Öffne das "Control Panel" Delete/Caption: löschen Delete/Hint: Lösche diesen Tiddler Edit/Caption: bearbeiten Edit/Hint: Bearbeite diesen Tiddler +Encryption/Caption: verschlüsseln +Encryption/ClearPassword/Caption: lösche Passwort +Encryption/ClearPassword/Hint: Lösche das Passwort und speichere ohne Verschlüsselung +Encryption/SetPassword/Caption: ativiere Passwort +Encryption/SetPassword/Hint: Definiert ein Passwort, um dieses Wiki zu verschlüsseln Info/Caption: info Info/Hint: Informationen zu diesem Tiddler anzeigen -NewTiddler/Caption: Neuer Tiddler +Home/Caption: home +Home/Hint: Öffne die "default" Tiddler +NewTiddler/Caption: neuer Tiddler NewTiddler/Hint: Erstelle einen neuen Tiddler +More/Caption: mehr +More/Hint: Weitere Aktionen +Permalink/Caption: permalink +Permalink/Hint: Die Browser Address Leiste enthält einen Link zu diesem Tiddler +Permaview/Caption: permaview +Permaview/Hint: Die Browser Address Leiste enthält einen Link zu allen offenen Tiddlern in dieser "Story" Save/Caption: speichern Save/Hint: Speichere diesen Tiddler -SaveWiki/Caption: Speichere Änderungen -SaveWiki/Hint: Speicher Änderungen +SaveWiki/Caption: speichere Änderungen +SaveWiki/Hint: Speichere Änderungen HideSideBar/Caption: Sidebar ausblenden HideSideBar/Hint: Sidebar ausblenden ShowSideBar/Caption: Sidebar einblenden diff --git a/languages/de-DE/ControlPanel.multids b/languages/de-DE/ControlPanel.multids index 4b962cba6..5364ed775 100644 --- a/languages/de-DE/ControlPanel.multids +++ b/languages/de-DE/ControlPanel.multids @@ -19,6 +19,10 @@ Advanced/Settings/NavigationHistory/Caption: Browser Chronik Advanced/Settings/NavigationHistory/Hint: Die Browser Chronik ändern, wenn ein Tiddler angezeigt wird: Advanced/Settings/NavigationHistory/No/Description: Browser Chronik nicht ändern. Advanced/Settings/NavigationHistory/Yes/Description: Browser Chronik ändern. +Advanced/Settings/ToolbarButtons/Caption: Toolbar Buttons +Advanced/Settings/ToolbarButtons/Hint: Standard Toolbar Button Erscheinungsbild: +Advanced/Settings/ToolbarButtons/Text/Description: Text anzeigen +Advanced/Settings/ToolbarButtons/Icons/Description: Icon anzeigen Advanced/TiddlerFields/Caption: Tiddler Felder Advanced/TiddlerFields/Hint: Hier finden sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exclusive ~Schatten-Tiddler. Appearance/Caption: Design @@ -36,6 +40,14 @@ Appearance/StoryView/Caption: Anzeige Appearance/StoryView/Prompt: Ausgewählte Anzeige: Appearance/Theme/Caption: Thema Appearance/Theme/Prompt: Ausgewähltes Thema: +Appearance/Toolbars/Caption: Toolbar +Appearance/Toolbars/Hint: Auswählen, welche "Toolbar Button" angezeigt werden +Appearance/Toolbars/EditToolbar/Caption: Edit Toolbar +Appearance/Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden: +Appearance/Toolbars/ViewToolbar/Caption: View Toolbar +Appearance/Toolbars/ViewToolbar/Hint: Auswählen, welche Buttons im "View Modus" angezeigt werden: +Appearance/Toolbars/PageControls/Caption: Page Toolbar +Appearance/Toolbars/PageControls/Hint: Ausweählen, welche Buttons im Hauptmenü angezeigt werden: Basics/AnimDuration/Prompt: Animation Dauer: Basics/Caption: Basis Basics/DefaultTiddlers/BottomHint: Verwenden sie [[doppelte eckige Klammern]] für Titel mit Lehrzeichen oder wählen sie <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Offene Tiddler beim Laden wiederherstellen. diff --git a/languages/de-DE/Import.multids b/languages/de-DE/Import.multids new file mode 100644 index 000000000..9e9e6e5ce --- /dev/null +++ b/languages/de-DE/Import.multids @@ -0,0 +1,12 @@ + title: $:/language/Import/ + +Listing/Cancel/Caption: Abbrechen +Listing/Hint: Diese Tiddler können importiert werden: +Listing/Import/Caption: Importieren +Listing/Select/Caption: Auswahl +Listing/Status/Caption: Status +Listing/Title/Caption: Titel +Upgrader/Plugins/Suppressed: Einige "plugins" weden unterdrückt! Importierte plugins: <> sind älter als existierende: <>. +Upgrader/Plugins/Upgraded: Aktualisieren der plugins von: <> nach: <> +Upgrader/System/Suppressed: Unterdrückte "System Tiddler" +Upgrader/ThemeTweaks/Created: Migrieren der "theme tweaks" von: <$text text=<>/> diff --git a/languages/de-DE/TiddlerInfo.multids b/languages/de-DE/TiddlerInfo.multids index 4dc237bc9..64b4b2af2 100644 --- a/languages/de-DE/TiddlerInfo.multids +++ b/languages/de-DE/TiddlerInfo.multids @@ -18,3 +18,4 @@ References/Caption: Referenzen References/Empty: Kein Tiddler linkt zu Diesem. Tagging/Caption: Tagging Tagging/Empty: Kein Tiddler ist mit diesem "getagged". +Tools/Caption: Tools diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index d10d64857..3119cffc6 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -8,6 +8,8 @@ Clone/Caption: 克隆 Clone/Hint: 克隆此条目 Close/Caption: 关闭 Close/Hint: 关闭此条目 +CloseAll/Caption: 全部关闭 +CloseAll/Hint: 关闭所有条目 CloseOthers/Caption: 关闭其他 CloseOthers/Hint: 关闭其他条目 ControlPanel/Caption: 控制台 @@ -16,8 +18,17 @@ Delete/Caption: 删除 Delete/Hint: 删除此条目 Edit/Caption: 编辑 Edit/Hint: 编辑此条目 +Encryption/Caption: 加密 +Encryption/ClearPassword/Caption: 清除密码 +Encryption/ClearPassword/Hint: 清除密码且不加密保存此维基 +Encryption/SetPassword/Caption: 设置密码 +Encryption/SetPassword/Hint: 设置加密保存此维基的密码 +Home/Caption: 首页 +Home/Hint: 开启首页条目 Info/Caption: 信息 Info/Hint: 显示此条目的信息 +More/Caption: 更多 +More/Hint: 更多动作 NewTiddler/Caption: 添加条目 NewTiddler/Hint: 创建一新条目 Permalink/Caption: 引用连结 diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index 5056591f5..5877c14bc 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -19,6 +19,10 @@ Advanced/Settings/NavigationHistory/Caption: 历史记录导览 Advanced/Settings/NavigationHistory/Hint: 当导览到条目时,更新浏览器历史记录: Advanced/Settings/NavigationHistory/No/Description: 不更新历史记录 Advanced/Settings/NavigationHistory/Yes/Description: 更新历史记录 +Advanced/Settings/ToolbarButtons/Caption: 工具栏按钮 +Advanced/Settings/ToolbarButtons/Hint: 默认的工具栏按钮外观: +Advanced/Settings/ToolbarButtons/Text/Description: 包含文字 +Advanced/Settings/ToolbarButtons/Icons/Description: 包含图示 Advanced/TiddlerFields/Caption: 条目栏位 Advanced/TiddlerFields/Hint: 这是本维基使用中的所有条目栏位(含系统条目的栏位,但默认条目的栏位除外)。 Appearance/Caption: 视觉外观 @@ -36,6 +40,14 @@ Appearance/StoryView/Caption: 查看模式 Appearance/StoryView/Prompt: 当前的查看模式: Appearance/Theme/Caption: 布景主题 Appearance/Theme/Prompt: 当前的布景主题: +Appearance/Toolbars/Caption: 工具栏 +Appearance/Toolbars/Hint: 选择将显示哪些工具栏按钮 +Appearance/Toolbars/EditToolbar/Caption: 编辑工具栏 +Appearance/Toolbars/EditToolbar/Hint: 选择将显示哪些按钮于条目的编辑模式工具栏 +Appearance/Toolbars/ViewToolbar/Caption: 检视工具栏 +Appearance/Toolbars/ViewToolbar/Hint: 选择将显示哪些按钮于条目的检视模式工具栏 +Appearance/Toolbars/PageControls/Caption: 页面工具栏 +Appearance/Toolbars/PageControls/Hint: 选择将显示哪些按钮于主页面的工具栏 Basics/AnimDuration/Prompt: 动画持续时间: Basics/Caption: 基本 Basics/DefaultTiddlers/BottomHint: 标题含空白时请使用 [[双中括弧]],
或者您可用 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保留开启中的条目顺序 diff --git a/languages/zh-Hans/TiddlerInfo.multids b/languages/zh-Hans/TiddlerInfo.multids index b882e7c1c..65c5cd99e 100644 --- a/languages/zh-Hans/TiddlerInfo.multids +++ b/languages/zh-Hans/TiddlerInfo.multids @@ -18,3 +18,4 @@ References/Caption: 参照 References/Empty: 无条目链接至此 Tagging/Caption: 子条目 Tagging/Empty: 无任何条目以此条目之标题为标签 +Tools/Caption: 工具 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index 6b3be97fa..b037dd085 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -8,6 +8,8 @@ Clone/Caption: 複製 Clone/Hint: 複製此條目 Close/Caption: 關閉 Close/Hint: 關閉此條目 +CloseAll/Caption: 全部關閉 +CloseAll/Hint: 關閉所有條目 CloseOthers/Caption: 關閉其他 CloseOthers/Hint: 關閉其他條目 ControlPanel/Caption: 控制台 @@ -16,8 +18,17 @@ Delete/Caption: 刪除 Delete/Hint: 刪除此條目 Edit/Caption: 編輯 Edit/Hint: 編輯此條目 +Encryption/Caption: 加密 +Encryption/ClearPassword/Caption: 清除密碼 +Encryption/ClearPassword/Hint: 清除密碼且不加密儲存此維基 +Encryption/SetPassword/Caption: 設定密碼 +Encryption/SetPassword/Hint: 設定加密儲存此維基的密碼 +Home/Caption: 首頁 +Home/Hint: 開啟首頁條目 Info/Caption: 資訊 Info/Hint: 顯示此條目的資訊 +More/Caption: 更多 +More/Hint: 更多動作 NewTiddler/Caption: 新增條目 NewTiddler/Hint: 建立一新條目 Permalink/Caption: 引用連結 diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index 2aef165b4..6b2e42799 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -19,6 +19,10 @@ Advanced/Settings/NavigationHistory/Caption: 歷史記錄導覽 Advanced/Settings/NavigationHistory/Hint: 當導覽到條目時,更新瀏覽器歷史記錄: Advanced/Settings/NavigationHistory/No/Description: 不更新歷史記錄 Advanced/Settings/NavigationHistory/Yes/Description: 更新歷史記錄 +Advanced/Settings/ToolbarButtons/Caption: 工具列按鈕 +Advanced/Settings/ToolbarButtons/Hint: 預設的工具列按鈕外觀: +Advanced/Settings/ToolbarButtons/Text/Description: 包含文字 +Advanced/Settings/ToolbarButtons/Icons/Description: 包含圖示 Advanced/TiddlerFields/Caption: 條目欄位 Advanced/TiddlerFields/Hint: 這是本維基使用中的所有條目欄位(含系統條目的欄位,但預設條目的欄位除外)。 Appearance/Caption: 視覺外觀 @@ -36,6 +40,14 @@ Appearance/StoryView/Caption: 檢視模式 Appearance/StoryView/Prompt: 當前的檢視模式: Appearance/Theme/Caption: 佈景主題 Appearance/Theme/Prompt: 當前的佈景主題: +Appearance/Toolbars/Caption: 工具列 +Appearance/Toolbars/Hint: 選擇將顯示哪些工具列按鈕 +Appearance/Toolbars/EditToolbar/Caption: 編輯工具列 +Appearance/Toolbars/EditToolbar/Hint: 選擇將顯示哪些按鈕於條目的編輯模式工具列 +Appearance/Toolbars/ViewToolbar/Caption: 檢視工具列 +Appearance/Toolbars/ViewToolbar/Hint: 選擇將顯示哪些按鈕於條目的檢視模式工具列 +Appearance/Toolbars/PageControls/Caption: 頁面工具列 +Appearance/Toolbars/PageControls/Hint: 選擇將顯示哪些按鈕於主頁面的工具列 Basics/AnimDuration/Prompt: 動畫持續時間: Basics/Caption: 基本 Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 [[雙中括弧]],
或者您可用 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保留開啟中的條目順序 diff --git a/languages/zh-Hant/TiddlerInfo.multids b/languages/zh-Hant/TiddlerInfo.multids index 5a4bacc0d..dab4c0c08 100644 --- a/languages/zh-Hant/TiddlerInfo.multids +++ b/languages/zh-Hant/TiddlerInfo.multids @@ -18,3 +18,4 @@ References/Caption: 參照 References/Empty: 無條目連結至此 Tagging/Caption: 子條目 Tagging/Empty: 無任何條目以此條目之標題為標籤 +Tools/Caption: 工具