1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-25 17:40:29 +00:00
Commit Graph

159 Commits

Author SHA1 Message Date
Jeremy Ruston
055bdd8d8f Added inline transclusion as well as block transclusion 2012-12-20 15:07:38 +00:00
Jeremy Ruston
a0155763ed More demo text in the new parser page template 2012-12-15 17:35:45 +00:00
Jeremy Ruston
817e6f5471 Added some test content to the new wiki parser page template 2012-12-15 11:39:42 +00:00
Jeremy Ruston
2522529aac Repaired accidental damage during debugging 2012-12-14 17:38:13 +00:00
Jeremy Ruston
d338a54370 Introduce refactored wiki parser and renderer
This is a half-way through a big refactoring of the parsing and
rendering infrastructure. The main change is to separate the parse and
render trees, which makes the code a lot cleaner. The new parser isn't
yet functional enough to replace the existing parser so for the moment
you have to manually invoke it with `$tw.testNewParser()` in your
browser console. I really ought to use branches for this kind of
thing...
2012-12-13 21:34:31 +00:00
Jeremy Ruston
91e1a38db1 Switched to use double curly braces for transclusion
For compatbility with MediaWiki and other engines
2012-11-29 18:34:27 +00:00
Jeremy Ruston
6d09b2fb9c Improve syntax for classed runs 2012-11-29 17:23:46 +00:00
Jeremy Ruston
84650b9a54 Swap over to the new mime type conventions
Discussed in
https://groups.google.com/forum/#!topic/tiddlywikidev/re8xfLqZNCE
2012-11-18 15:22:13 +00:00
Jeremy Ruston
454f892cf2 Remove old mechanism for generating empty.html 2012-11-16 22:26:33 +00:00
Jeremy Ruston
db3a4651a2 Improved crypto and password prompting mechanism
Now encrypted tiddlywikis prompt for their password with an html form,
instead of a horrible javascript prompt.
2012-11-16 16:59:47 +00:00
Jeremy Ruston
283d917a43 Use temporary tiddler for search text 2012-11-11 15:08:31 +00:00
Jeremy Ruston
f1089c1c92 Use temporary tiddlers for popup locations 2012-11-11 15:03:34 +00:00
Jeremy Ruston
e0d2985ec3 Added explicit story and history list to navigator in PageTemplate 2012-11-07 17:14:07 +00:00
Jeremy Ruston
bdc46a8bc3 Move the NewTiddler button 2012-11-07 09:19:00 +00:00
Jeremy Ruston
55783a8f5d Remove the view switcher and the zoomer and chooser 2012-11-06 17:51:08 +00:00
Jeremy Ruston
54252a5400 Made fields popup condensed 2012-11-06 14:12:20 +00:00
Jeremy Ruston
2b4d1bfd18 Add search previews 2012-11-06 14:12:09 +00:00
Jeremy Ruston
bb10222b8d Added fields macro and put it in the default view template 2012-11-05 19:00:54 +00:00
Jeremy Ruston
528c62577c Better spacing on the navigation menu 2012-11-04 19:49:13 +00:00
Jeremy Ruston
3d747499cb More enhancements to listview animations
Now we've got navigation scrolling back
2012-11-03 16:14:00 +00:00
Jeremy Ruston
5443c8243a Lots of tweaks to list view animations
There's a regression in that navigation animations are currently not
working
2012-11-03 12:34:36 +00:00
Jeremy Ruston
921162ccdf Add left navigator 2012-11-03 12:33:56 +00:00
Jeremy Ruston
f7d765da55 ViewTemplate tweak 2012-10-28 20:32:49 +00:00
Jeremy Ruston
ecd933dd25 Add support for relative dates
Including: setting date on save tiddler and adding a date to HelloThere
2012-10-28 14:15:07 +00:00
Jeremy Ruston
9797c6aada Tweaks to the listviews
Cecily gets a bit better, and we start to handle navigation events.
Scrolling seems to still be a bit iffy
2012-10-26 17:19:34 +01:00
Jeremy Ruston
495f208aa4 Extraneous space 2012-10-25 22:19:50 +01:00
Jeremy Ruston
6d397edf30 Rename the navigationcatcher macro to navigator 2012-10-25 12:55:36 +01:00
Jeremy Ruston
f623515b1c Fixed styles for the EditTemplate 2012-10-24 22:39:25 +01:00
Jeremy Ruston
f77b3a54ca Switch from the old navigator macro the new navigationcatcher macro
We'll probably rename the navigationcatcher macro, because the name is
rubbish.
2012-10-24 22:33:33 +01:00
Jeremy Ruston
ce4a14c68a Fixed tiddler styling issues 2012-10-24 22:28:25 +01:00
Jeremy Ruston
d1c396507b Update the PageTemplate to use the list macro instead of the story macro
We're going to drop the story macro, which will break some things in
the short term. But it's awesome to be using the one macro for so many
different purposes (the main story, the tags listing, recent changes,
etc.)
2012-10-24 22:15:16 +01:00
Jeremy Ruston
261ee54b5c About time we had a "new tiddler" button 2012-10-21 16:44:53 +01:00
Jeremy Ruston
1a88a12eb5 Fixing dropdown highlights
Pesky Bootstrap is a tad specific about wanting an <li> as the
immediate parent of a dropdown item <a>
2012-10-17 23:10:10 +01:00
Jeremy Ruston
c1cf82cfb8 Improve the efficiency of the search filter ordering 2012-10-17 21:00:46 +01:00
Jeremy Ruston
93f0a28c26 More search results
It's confusing limiting to 10 results unless we can show an indicator
that more results are available
2012-10-17 20:37:49 +01:00
Jeremy Ruston
81a565e608 Starting to get the behaviour of the search popup more correct 2012-10-17 19:10:18 +01:00
Jeremy Ruston
42d4be3f20 Search improvements
1. Extended edit macro to allow a search-styled input to be used
2. Moved search box into nav bar
2012-10-17 18:03:17 +01:00
Jeremy Ruston
de2cd34801 Temporarily deprecate the list macro
So that we can refactor it incompatibly
2012-10-16 10:15:12 +01:00
Jeremy Ruston
e9f262b9df Remove the experimental template mapping system
Unnecessarily complicated and JSONy
2012-10-16 10:14:41 +01:00
Jeremy Ruston
5732cd4239 Updates to tw5dropbox 2012-10-10 16:33:07 +01:00
Jeremy Ruston
35d8ff871a First commit of TiddlyWiki5 in the Sky for Dropbox
This is a new build of TiddlyWiki5 that pulls it's content from a
Dropbox App folder.

(This naming strategy is seeming increasingly stupid).
2012-10-10 10:47:05 +01:00
Jeremy Ruston
238946b32b Update story macro to use rules to choose templates
Now special mapping tiddlers are used to determine which templates are
used for a given tiddler
2012-09-12 15:33:11 +01:00
Jeremy Ruston
61c501e5a3 Added the full screen icon to the navbar
It's now getting a bit crowded.
2012-09-12 10:47:14 +01:00
Jeremy Ruston
2b578c5acc Add command for saving in encrypted form
Temporary UI
2012-09-02 20:59:53 +01:00
Jeremy Ruston
1200c8329a Add Stanford JavaScript Crypto Library for encryption of tiddlers
Initial implementation. The password is hardcoded on the server, but
properly prompted in the browser.
2012-09-02 20:29:47 +01:00
Jeremy Ruston
a95c83628d Now got exploded plugins working on the server 2012-08-31 17:25:18 +01:00
Jeremy Ruston
b2369df65a Further refactoring to the plugin mechanism 2012-08-31 16:36:57 +01:00
Jeremy Ruston
68efce20c4 Starting building an empty.html 2012-08-25 12:07:39 +01:00
Jeremy Ruston
8e6647b615 Initial tranche of the plugin implementation
This first commit adds some of the code needed for the plugin
mechanism, but it isn't all fully operational yet. I'm merging the
branch so that I can get some other pre-requisites done quickly on the
main branch, and then plan to return to this branch.
2012-08-06 22:34:16 +01:00
Jeremy Ruston
daff9c10f3 Tighten terminology for plugins vs. modules
"Plugins" are bundles of tiddlers managed as one, "modules" are
JavaScript tiddlers with a module type identifying when and how they
should be executed.
2012-08-03 15:09:48 +01:00
Jeremy Ruston
1f52b40cb6 Added parser rule for HTML format comments
And try it out in the PageTemplate, which is getting pretty
unintelligable
2012-08-02 22:06:52 +01:00
Jeremy Ruston
cc59a49b39 Improved rounder close icon 2012-07-20 22:09:34 +01:00
Jeremy Ruston
3b609ed1e5 Improving message wording 2012-07-16 10:38:14 +01:00
Jeremy Ruston
5c1881f377 Hack to make the reveal macro parse as a run 2012-07-15 23:07:41 +01:00
Jeremy Ruston
957b17a78c Introduce edit mode
There's a wizard for switching into edit mode, and selective display of
UI elements
2012-07-15 22:35:39 +01:00
Jeremy Ruston
f182463010 Improvements to the save instructions 2012-07-15 18:12:29 +01:00
Jeremy Ruston
d081de7707 Simplified top navigation bar 2012-07-15 17:37:18 +01:00
Jeremy Ruston
507460eb4e Add warning notification when viewing a document on a data: uri
The intent is to handhold the user through their first save+verification
2012-07-15 17:37:03 +01:00
Jeremy Ruston
dde26f8103 Remove CloseTiddler message to "close" 2012-07-15 17:36:02 +01:00
Jeremy Ruston
4e547a7d35 Complete renaming the include macro to serialize 2012-07-14 15:46:01 +01:00
Jeremy Ruston
73071f18ae Replace obsolete hide macro with reveal macro 2012-07-13 23:39:20 +01:00
Jeremy Ruston
80fd563ccc Get rid of obsolete linkcatcher macro 2012-07-13 23:09:45 +01:00
Jeremy Ruston
b0cc508c56 Fix PageTemplate reference in static template 2012-07-13 22:57:13 +01:00
Jeremy Ruston
898e86db79 Use the version number from the package.json file
Instead of the old separate version.txt file
2012-07-13 17:38:23 +01:00
Jeremy Ruston
c340082653 Added primitive save changes mechanism
Works in Firefox for now
2012-07-10 23:18:44 +01:00
Jeremy Ruston
69a0c46447 Split the story macro out into two macros
Now the story macro manages the story element sequence, while the
navigator macro listens for the navigation events, and modifies the
story tiddler as required. Also introduces a history tiddler that
retains the history stack so that we can animate navigation properly
(as distinct from animating the addition and removal of story elements).

Note that the zoomin storyview isn't quite finished, but this is a
stable point to commit these changes.
2012-06-26 19:54:51 +01:00
Jeremy Ruston
663fd2fe10 More styling adjustments
And started using Bootstrap's responsive stylesheets, so we can start
to look decent on phones
2012-06-24 17:07:38 +01:00
Jeremy Ruston
6b03b610e2 Added custom Twitter Bootstrap theme 2012-06-24 13:15:00 +01:00
Jeremy Ruston
d1cee98f88 Remove the reference to the pasteboard view 2012-06-22 18:02:11 +01:00
Jeremy Ruston
fd58a36140 Update tag dropdown to include link to tag tiddler 2012-06-22 14:13:21 +01:00
Jeremy Ruston
9361376767 Moved view dropdown to the left
So it doesn't get cut off so often
2012-06-22 00:09:10 +01:00
Jeremy Ruston
d82e372569 Added close button
And made the edit button be a graphic, too
2012-06-21 19:44:21 +01:00
Jeremy Ruston
8b23dc3da6 Fixed positioning of view dropdown 2012-06-21 09:11:04 +01:00
Jeremy Ruston
4bbe0cd4d3 Added new storyview that shows tiddlers stacked up sideways 2012-06-20 18:35:41 +01:00
Jeremy Ruston
08e80d6e02 Completed renaming the scroller storyview to "classic" 2012-06-20 18:03:19 +01:00
Jeremy Ruston
b3c0bec838 Fixed support for storyviewTiddler parameter for story macro 2012-06-20 17:59:38 +01:00
Jeremy Ruston
122e7bc770 Added dropdown for choosing the current view
It doesn't work fully yet
2012-06-20 17:42:49 +01:00
Jeremy Ruston
cabc11d517 Use the transclude macro instead of list tagging in the tag popup 2012-06-19 10:40:30 +01:00
Jeremy Ruston
0d928c05a5 Added new transclude wikitext rule and macro
Which allows us to get rid of the tags macro
2012-06-19 08:57:29 +01:00
Jeremy Ruston
6765d3c04d Tidying up 2012-06-14 15:05:16 +01:00
Jeremy Ruston
27f77f729f Clearer name for the state tiddler 2012-06-14 11:36:41 +01:00
Jeremy Ruston
ccfa7e1322 Fixed the appearance of tag dropdowns 2012-06-13 16:09:07 +01:00
Jeremy Ruston
28fd037c47 Got the tag dropdowns working
They don't get dismissed correctly, though
2012-06-13 13:19:55 +01:00
Jeremy Ruston
e5b6d9a722 Adjusted tag dropdown
Slowly getting the tag dropdowns working properly
2012-06-13 09:12:41 +01:00
Jeremy Ruston
f59c24f053 Change chooser macro to use embedded content
Not quite done with this yet.
2012-06-11 17:37:34 +01:00
Jeremy Ruston
ed70b4a34b Removed unnecessary class from PageTemplate 2012-06-11 13:07:51 +01:00
Jeremy Ruston
9f86f98cb1 Got the zooming navigator working again
Albeit, it doesn't play well with the fixed navbar
2012-06-11 12:44:10 +01:00
Jeremy Ruston
ef8b9d81de Added navbar to PageTemplate 2012-06-10 22:02:16 +01:00
Jeremy Ruston
006efb0d44 Add div around body in ViewTemplate 2012-06-10 22:01:53 +01:00
Jeremy Ruston
fc49d7dffd Added tags and color macros
Which enables us to do nice colour coded tags. Soon they'll have a drop
down on them too
2012-06-10 19:47:24 +01:00
Jeremy Ruston
18ae0c5922 Adjustments to default tiddler templates 2012-06-10 18:09:34 +01:00
Jeremy Ruston
e0b630686e Refactored wikitext parser to deal better with terminated blocks 2012-06-10 17:26:54 +01:00
Jeremy Ruston
0ffa882d09 The start of better styling 2012-06-10 14:46:34 +01:00
Jeremy Ruston
ca56de0495 Add a span around the title
We can measure the dimensions of the span to get the dimensions of the
title
2012-06-09 22:25:58 +01:00
Jeremy Ruston
34311e230f Wrap the title and subtitle of tiddlers in their own divs 2012-06-09 11:25:49 +01:00
Jeremy Ruston
3202928c79 Added Bootstrap JavaScript modules and moved CSS into core 2012-06-08 11:49:14 +01:00
Jeremy Ruston
5322d3cdfd Added library modules to browser template
Now we can include things like jQuery easily
2012-06-08 10:41:58 +01:00
Jeremy Ruston
e2707ae49d Updated story macro to allow for contained content
This allows us to fix the zooming chooser and zooming navigator
2012-06-07 13:10:15 +01:00
Jeremy Ruston
6319a7dee5 Renamed wiki folder 2012-06-06 20:52:30 +01:00
Jeremy Ruston
22b836e4ac Added 'isShadow' flag for system tiddlers
Shadow tiddlers are omitted from lists by default
2012-06-06 13:21:20 +01:00