Merge branch 'master' of https://github.com/Jermolene/TiddlyWiki5 into de-DE
This commit is contained in:
Mario Pietsch
commit
3f7ff22280
24
boot/boot.js
24
boot/boot.js
|
|
@ -1312,23 +1312,6 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
|
|||
}
|
||||
};
|
||||
|
||||
/*
|
||||
Fallback tiddlywiki.info content
|
||||
*/
|
||||
$tw.boot.defaultWikiInfo = {
|
||||
"plugins": [
|
||||
"tiddlywiki/tiddlyweb",
|
||||
"tiddlywiki/filesystem"
|
||||
],
|
||||
"themes": [
|
||||
"tiddlywiki/vanilla",
|
||||
"tiddlywiki/snowwhite"
|
||||
],
|
||||
"languages": [
|
||||
"en-GB"
|
||||
]
|
||||
};
|
||||
|
||||
/*
|
||||
path: path of wiki directory
|
||||
parentPaths: array of parent paths that we mustn't recurse into
|
||||
|
|
@ -1342,7 +1325,7 @@ $tw.loadWikiTiddlers = function(wikiPath,parentPaths) {
|
|||
if(fs.existsSync(wikiInfoPath)) {
|
||||
wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
|
||||
} else {
|
||||
wikiInfo = $tw.boot.defaultWikiInfo;
|
||||
return null;
|
||||
}
|
||||
// Load any parent wikis
|
||||
if(wikiInfo.includeWikis) {
|
||||
|
|
@ -1492,10 +1475,7 @@ $tw.boot.startup = function(options) {
|
|||
// If the first command line argument doesn't start with `--` then we
|
||||
// interpret it as the path to the wiki folder, which will otherwise default
|
||||
// to the current folder
|
||||
if($tw.boot.argv[0] === "*") {
|
||||
$tw.boot.wikiPath = undefined;
|
||||
$tw.boot.argv = $tw.boot.argv.slice(1);
|
||||
} else if($tw.boot.argv[0] && $tw.boot.argv[0].indexOf("--") !== 0) {
|
||||
if($tw.boot.argv[0] && $tw.boot.argv[0].indexOf("--") !== 0) {
|
||||
$tw.boot.wikiPath = $tw.boot.argv[0];
|
||||
$tw.boot.argv = $tw.boot.argv.slice(1);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -53,6 +53,10 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
|
|||
// Add a click event handler
|
||||
domNode.addEventListener("click",function (event) {
|
||||
var handled = false;
|
||||
if(self.to) {
|
||||
self.dispatchEvent({type: "tw-navigate", navigateTo: self.to, tiddlerTitle: self.getVariable("currentTiddler")});
|
||||
handled = true;
|
||||
}
|
||||
if(self.message) {
|
||||
self.dispatchMessage(event);
|
||||
handled = true;
|
||||
|
|
@ -110,6 +114,7 @@ Compute the internal state of the widget
|
|||
*/
|
||||
ButtonWidget.prototype.execute = function() {
|
||||
// Get attributes
|
||||
this.to = this.getAttribute("to");
|
||||
this.message = this.getAttribute("message");
|
||||
this.param = this.getAttribute("param");
|
||||
this.set = this.getAttribute("set");
|
||||
|
|
@ -129,7 +134,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
|
|||
*/
|
||||
ButtonWidget.prototype.refresh = function(changedTiddlers) {
|
||||
var changedAttributes = this.computeAttributes();
|
||||
if(changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) {
|
||||
if(changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) {
|
||||
this.refreshSelf();
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ blockquote-bar: <<colour muted-foreground>>
|
|||
code-background: #f7f7f9
|
||||
code-border: #e1e1e8
|
||||
code-foreground: #dd1144
|
||||
download-background: #34c734
|
||||
download-background: #66cccc
|
||||
download-foreground: <<colour background>>
|
||||
dragger-background: <<colour foreground>>
|
||||
dragger-foreground: <<colour background>>
|
||||
|
|
@ -38,27 +38,27 @@ notification-border: #999999
|
|||
page-background: #ffffff
|
||||
pre-background: #f5f5f5
|
||||
pre-border: #cccccc
|
||||
primary: #5778d8
|
||||
primary: #7897f3
|
||||
sidebar-controls-foreground-hover: #000000
|
||||
sidebar-controls-foreground: #ccc
|
||||
sidebar-foreground: #acacac
|
||||
sidebar-foreground-shadow: rgba(255,255,255, 0.8)
|
||||
sidebar-muted-foreground-hover: #444444
|
||||
sidebar-muted-foreground: #c0c0c0
|
||||
sidebar-tab-background-selected: #ececec
|
||||
sidebar-tab-background-selected: #ffffff
|
||||
sidebar-tiddler-link-foreground-hover: #444444
|
||||
sidebar-tiddler-link-foreground: #5959c0
|
||||
sidebar-tiddler-link-foreground: #7897f3
|
||||
static-alert-foreground: #aaaaaa
|
||||
tab-background-selected: #ffffff
|
||||
tab-background: #eee
|
||||
tab-border-selected: #fff
|
||||
tab-background-selected: #fffffffff
|
||||
tab-background: #eeeeee
|
||||
tab-border-selected: #cccccc
|
||||
tab-border: #cccccc
|
||||
tab-divider: #d8d8d8
|
||||
tab-foreground: #666666
|
||||
table-border: #000
|
||||
table-border: #dddddd
|
||||
table-footer-background: #a8a8a8
|
||||
table-header-background: #eee
|
||||
tag-background: #ffeebb
|
||||
table-header-background: #f0f0f0
|
||||
tag-background: #ffeedd
|
||||
tag-foreground: #000
|
||||
tiddler-background: <<colour background>>
|
||||
tiddler-border: #eee
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ sidebar-foreground-shadow: rgba(255,255,255, 0.0)
|
|||
sidebar-muted-foreground-hover: #444444
|
||||
sidebar-muted-foreground: #c0c0c0
|
||||
sidebar-tab-background-selected: #000
|
||||
sidebar-tiddler-link-foreground-hover: #444444
|
||||
sidebar-tiddler-link-foreground-hover: #ffbb99
|
||||
sidebar-tiddler-link-foreground: #cc0000
|
||||
static-alert-foreground: #aaaaaa
|
||||
tab-background-selected: #ffffff
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
title: $:/core/ui/PageControls/control-panel
|
||||
tags: $:/tags/PageControls
|
||||
|
||||
<$link to="$:/ControlPanel">{{$:/core/images/options-button}}</$link>
|
||||
<$button to="$:/ControlPanel" class="btn-invisible">{{$:/core/images/options-button}}</$button>
|
||||
|
|
@ -3,10 +3,10 @@ title: $:/snippets/autosavestatus
|
|||
\define lingo-base() $:/language/ControlPanel/Saving/
|
||||
<$reveal type="match" state="$:/config/AutoSave" text="yes">
|
||||
<<lingo AutoSave/Enabled/Prompt>>
|
||||
<$linkcatcher to="$:/config/AutoSave"><$link to="no"><<lingo AutoSave/Enabled/Button>>
|
||||
</$link></$linkcatcher>
|
||||
<$linkcatcher to="$:/config/AutoSave"><$button to="no"><<lingo AutoSave/Enabled/Button>>
|
||||
</$button></$linkcatcher>
|
||||
</$reveal>
|
||||
<$reveal type="nomatch" state="$:/config/AutoSave" text="yes">
|
||||
<<lingo AutoSave/Disabled/Prompt>>
|
||||
<$linkcatcher to="$:/config/AutoSave"><$link to="yes"><<lingo AutoSave/Disabled/Button>></$link></$linkcatcher>
|
||||
<$linkcatcher to="$:/config/AutoSave"><$button to="yes"><<lingo AutoSave/Disabled/Button>></$button></$linkcatcher>
|
||||
</$reveal>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
created: 20130909151600000
|
||||
modified: 20140220224656474
|
||||
modified: 20140222134347038
|
||||
tags: community
|
||||
title: Community
|
||||
type: text/vnd.tiddlywiki
|
||||
|
|
@ -44,3 +44,11 @@ The ~TiddlyWiki discussion groups are mailing lists for talking about ~TiddlyWik
|
|||
: A study notebook for the Bible
|
||||
; http://tesis.tiddlyspot.com/
|
||||
: A thesis notebook
|
||||
|
||||
! Local ~TiddlyWiki Interest Groups
|
||||
|
||||
Local meetings of ~TiddlyWiki enthusiasts around the world:
|
||||
|
||||
* [[OXTWIG]], the ''Oxford ~TiddlyWiki Interest Group'' meets monthly in Oxford, UK to share experiences of using TiddlyWiki
|
||||
|
||||
//If you are a ~TiddlyWiki enthusiast please consider starting a local TWIG in your area, it's a great way to spread the word about using TiddlyWiki//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
created: 201308230917000
|
||||
modified: 201311091500004
|
||||
created: 20130823091700000
|
||||
modified: 20140222164415830
|
||||
tags: community
|
||||
title: TiddlyWiki Hangouts
|
||||
type: text/vnd.tiddlywiki
|
||||
|
|
@ -8,4 +8,4 @@ The TiddlyWiki community holds regular Google Hangouts, usually every Tuesday fr
|
|||
|
||||
Past Hangouts are archived in this YouTube playlist:
|
||||
|
||||
http://www.youtube.com/playlist?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u
|
||||
<iframe width="560" height="315" src="//www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
created: 20140222133223882
|
||||
modified: 20140222164126685
|
||||
tags: community
|
||||
title: OXTWIG
|
||||
type: text/vnd.tiddlywiki
|
||||
|
||||
The ''Oxford ~TiddlyWiki Interest Group'' meets monthly for discussions and demonstrations about TiddlyWiki.
|
||||
|
||||
See https://oxtwig.eventbrite.co.uk/ for details of our next meeting.
|
||||
|
||||
! OXTWIG #2
|
||||
|
||||
The second OXTWIG meeting was held on Thursday 16th January 2014:
|
||||
|
||||
<iframe width="560" height="315" src="//www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe>
|
||||
|
||||
! OXTWIG #1
|
||||
|
||||
The first OXTWIG meeting was held on Thursday 21st November 2013:
|
||||
|
||||
<iframe width="560" height="315" src="//www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
created: 20131206172428247
|
||||
modified: 20140126125217934
|
||||
modified: 20140222164239010
|
||||
tags: howto
|
||||
title: Video Tutorials
|
||||
type: text/vnd.tiddlywiki
|
||||
|
|
@ -17,3 +17,9 @@ The aim is to curate a series of videos to guide people through getting up and r
|
|||
! Introduction to TiddlyDesktop
|
||||
|
||||
{{Introducing TiddlyDesktop Video}}
|
||||
|
||||
! OXTWIG
|
||||
|
||||
This video of the second [[OXTWIG]] meeting starts with a tutorial overview demonstrating how to use ~TiddlyWiki in different scenarios:
|
||||
|
||||
<iframe width="560" height="315" src="//www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
created: 20130823203800000
|
||||
modified: 20140211195703410
|
||||
modified: 20140222134441012
|
||||
tags: planning
|
||||
title: RoadMap
|
||||
type: text/vnd.tiddlywiki
|
||||
|
|
@ -13,10 +13,8 @@ During the beta ~TiddlyWiki will be practical for cautious everyday use but as w
|
|||
The following additional features are planned or under consideration for implementation during the beta:
|
||||
|
||||
* Features required for large scale adoption
|
||||
** Multilanguage support
|
||||
** Proper use of ARIA roles
|
||||
* Features required by ~TiddlyWiki hackers
|
||||
** Making plugins in the browser
|
||||
** Pretty-printed JSON (similar to http://marianoguerra.github.io/json.human.js/)
|
||||
** A "safe mode" to disable customisations
|
||||
* Fixing hangovers from TiddlyWikiClassic
|
||||
|
|
@ -34,7 +32,6 @@ The following additional features are planned or under consideration for impleme
|
|||
** Rich link tooltips, incorporating a preview
|
||||
** Keyboard shortcuts
|
||||
** Keyboard snippet expansion in the text editor
|
||||
** Syntax highlighter plugin
|
||||
** Integration with the browser back and forwards buttons
|
||||
** List editor with drag and drop
|
||||
** Selective/weighted searching by title, body and fields
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
created: 20140126124827076
|
||||
modified: 20140126125025693
|
||||
modified: 20140222133657444
|
||||
tags: video
|
||||
title: Introducing TiddlyDesktop Video
|
||||
type: text/vnd.tiddlywiki
|
||||
|
||||
This brief introduction shows how to install and use TiddlyDesktop:
|
||||
|
||||
<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA?version=3&enablejsapi=1" frameborder="0" allowfullscreen></iframe>
|
||||
<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe>
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
title: ButtonWidget
|
||||
created: 201310241419
|
||||
modified: 201310300837
|
||||
modified: 201402220837
|
||||
tags: widget
|
||||
|
||||
! Introduction
|
||||
|
||||
The button widget displays an HTML `<button>` element that can perform a combination optional actions when clicked:
|
||||
|
||||
* Navigate to a specified tiddler
|
||||
* Dispatch a user defined [[widget message|WidgetMessages]]
|
||||
* Trigger a user defined [[popup|PopupMechanism]]
|
||||
* Assign new text to a specified tiddler
|
||||
|
|
@ -16,6 +17,7 @@ The button widget displays an HTML `<button>` element that can perform a combina
|
|||
The content of the `<$button>` widget is displayed within the button.
|
||||
|
||||
|!Attribute |!Description |
|
||||
|to |The title of the tiddler to navigate to |
|
||||
|message |The name of the [[widget message|WidgetMessages]] to send when the button is clicked |
|
||||
|param |The optional parameter to the message |
|
||||
|set |The title of a tiddler to which a new value will be assigned |
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ title: $:/language/ControlPanel/
|
|||
Advanced/Caption: Avancé
|
||||
Advanced/Hint: Informations internes sur ce ~TiddlyWiki
|
||||
Advanced/LoadedModules/Caption: Modules chargés
|
||||
Advanced/LoadedModules/Hint: Liste des modules chargés, avec leurs tiddlers sources. Les italiques indique que le tiddlers sources n'existent pas, le plus souvent parce que le module a été créé lors du processus d'amorçage.
|
||||
Advanced/LoadedModules/Hint: Liste des modules chargés, avec leurs tiddlers sources. Les italiques indique que les tiddlers sources n'existent pas, le plus souvent parce que le module a été créé lors du processus d'amorçage.
|
||||
Advanced/TiddlerFields/Caption: Champs
|
||||
Advanced/TiddlerFields/Hint: Voici la totalité des [[champs|TiddlerFields]] utilisés dans ce wiki (y compris les tiddlers système, mais non compris les tiddlers //shadow//).
|
||||
Appearance/Caption: Apparence
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ correctement — reportez-vous aux instructions détaillées sur http://tiddlywi
|
|||
Ensuite, vous pouvez :
|
||||
|
||||
* Créer de nouveaux tiddlers à l'aide du bouton « plus » de la barre latérale
|
||||
* Visitez le [[panneau de contrôle|$:/ControlPanel]] à l'aide du bouton « cog » de la barre latérale pour personnaliser votre wiki
|
||||
** Ne plus voir ce message en changeant les tiddlers par défaut dans l'onglet ''Basics''
|
||||
* Visiter le [[panneau de contrôle|$:/ControlPanel]] à l'aide du bouton « engrenage » de la barre latérale pour personnaliser votre wiki
|
||||
** Ne plus voir ce message en changeant les tiddlers par défaut dans l'onglet ''Fondamentaux''
|
||||
* Sauvegarder vos modifications à l'aide du bouton « Télécharger » de la barre latérale
|
||||
* En apprendre plus sur [[WikiText|http://tiddlywiki.com/static/WikiText.html]]
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ Filter/Hint: Recherche via une combinaison de [[filtres|http://tiddlywiki.com/st
|
|||
Matches: //<small><$count filter="[!is[system]search{$:/temp/search}]"/> correspondances</small>//
|
||||
Shadows/Caption: Shadows
|
||||
Shadows/Hint: Recherche parmi les tiddlers « shadow »
|
||||
System/Caption: System
|
||||
System/Caption: Système
|
||||
System/Hint: Recherche parmi les tiddlers système
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@ Listed/Caption: Listé
|
|||
Listed/Empty: Ce tiddler ne figure pas dans la liste d'un autre tiddler
|
||||
References/Caption: Références
|
||||
References/Empty: Aucun tiddler ne pointe vers celui-ci
|
||||
Tagging/Caption: Étiquète
|
||||
Tagging/Caption: Étiquetage
|
||||
Tagging/Empty: Le titre de ce tiddler ne sert de tag à aucun tiddler
|
||||
Loading…
Reference in New Issue