mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 20:10:03 +00:00
Code Issues Releases Wiki Activity
6,001 Commits 101 Branches 68 Tags 91 MiB
1f610c22f8
Commit Graph

390 Commits

Author SHA1 Message Date
Jermolene
e939a00be5 Rename "sidebar-header" class to "tc-sidebar-header" 
Part of #764
 2014-08-28 17:27:03 +01:00
Jermolene
87cb520343 Rename "story-river" class to "tc-story-river" 
Part of #764
 2014-08-28 17:26:21 +01:00
Jermolene
90f0fc22ff Rename "title" class to "tc-title" 
Part of #764
 2014-08-28 17:25:07 +01:00
Jermolene
63d7fd8457 Rename "titlebar" class to "tc-titlebar" 
Part of #764
 2014-08-28 17:21:40 +01:00
Jermolene
748caecca0 Fix tiddler info default tab 
Mistakenly omitted from b437f1b450
 2014-08-28 15:16:54 +01:00
Jermolene
b437f1b450 Allow default tiddler info tab to be configured 2014-08-28 09:12:00 +01:00
Jermolene
a105b52399 Refactor saver handler 
Fixing problems caused by c4b76ceb0b:

* We still need to initialise the saver-handler even when syncing to a
server, otherwise offline snapshots can’t be saved
* We need to override the default save template a bit further up the
stack, to avoid the server side serving the offline version of the wiki
at `/`
 2014-08-20 10:02:44 +01:00
Jermolene
0dfe23e0db Rename tw-refresh message to tw-browser-refresh 2014-08-19 13:11:18 +01:00
Jermolene
920e11e792 Introduce refresh button and revert home button 
Now the home button behaves as it did in 5.0.13, and the new refresh
button does a full page refresh.
 2014-08-19 12:12:36 +01:00
Jermolene
727638c12d Clean up CSS macros 
Move the CSS macros into global macros, and allow the colour macro to
fallback to the vanilla palette if the required colour isn’t found in
the current palette.
 2014-08-18 10:14:19 +01:00
Jermolene
32a7ee2683 Make it possible to disable plugins 2014-08-15 21:10:40 +01:00
Jermolene
04e049df97 Add message for empty plugin lists 2014-08-15 16:48:02 +01:00
Jermolene
4b05608ad5 Add tag manager button 2014-08-14 08:49:03 +01:00
Jermolene
be8c753f28 Fix formatting of edit fields 2014-08-10 09:13:56 +01:00
Jermolene
69de66ef80 Avoid localisable strings in the tag manager icon dropdown 2014-08-09 20:52:31 +01:00
Jermolene
e74a598aeb Better organisation for the tag image dropdown 2014-08-09 20:50:28 +01:00
Jermolene
f6d7d87a3d Add icon previews to tag manager 2014-08-09 13:12:23 +01:00
Jermolene
2ff2092615 More improvements to control panel plugin formatting 2014-08-08 17:19:48 +01:00
Jermolene
878689f92e Improved formatting for control panel plugins 2014-08-08 16:35:17 +01:00
Jermolene
bd92dc3692 Improve plugin tab layout 
It’s still a bit of a mess, and the vertical alignment isn’t working
properly
 2014-08-08 10:01:21 +01:00
Jermolene
2c4e9a64e9 Extend control panel plugins tab 
Now we display plugin icons, and an accordion containing information
tabs exposed by the plugin.
 2014-08-07 15:48:38 +01:00
Jermolene
e38f924eb5 Update language flags to generic plugin icon convention 2014-08-07 15:45:56 +01:00
Jermolene
1573f5840e Fix styling of "more" page button 2014-08-02 22:31:09 +01:00
Jermolene
1a9bd683e4 Add theme toolbar button 2014-08-02 22:13:54 +01:00
Jermolene
1d8e3ef288 Trim sidebar tools 
Just got to add a theme button
 2014-08-02 13:38:22 +01:00
Jermolene
bf39a45fc0 Fixes for import button position 2014-08-02 12:16:14 +01:00
Jermolene
7816c1d944 Add import button 2014-08-02 11:59:07 +01:00
Jermolene
120203a8e0 Refactor sidebar tools tab 
It’s going to be like the tools tab of tiddler info
 2014-08-02 11:58:55 +01:00
Jermolene
5291f33c84 Clearer current selection for language and storyview 2014-08-01 22:07:07 +01:00
Jermolene
9774c763b1 Add a storyview button 2014-08-01 21:40:13 +01:00
Jermolene
c23f6af4b5 Add CSS classes for each tag 2014-08-01 17:48:26 +01:00
Jermolene
6a2f1be9d7 Typo in stylesheet processing 2014-08-01 17:48:11 +01:00
Jermolene
d357e1706c Allow visible edit fields to be configured 
Create a tiddler “$:/config/EditTemplateFields/Visibility/fieldname”
with the text “hide” to hide a particular field
 2014-08-01 17:03:53 +01:00
Jermolene
52bbd6d583 Add tick alongside current language 2014-08-01 16:52:24 +01:00
Jermolene
799a5b059a Move fullscreen button into core from plugin 2014-08-01 16:52:12 +01:00
Jermolene
099919f61e Fix whitespace issues 2014-08-01 08:43:00 +01:00
Jermolene
789ba1e85d Add language toolbar button 
Also adds flag icon for each language.

One limitation is that the language button doesn’t work properly when
accessed via the “more” menu of the page controls.

@BramChen - could you help me choose the most appropriate flags to use
for the variants of Chinese?
 2014-07-31 18:07:37 +01:00
Jermolene
2d43003841 Add descriptions to toolbar buttons 2014-07-31 09:28:46 +01:00
Jermolene
f589e56692 Highlight savewiki text as well as icon 2014-07-31 08:07:31 +01:00
Jermolene
c4c4c3d270 Add "more" page control button 2014-07-30 22:25:52 +01:00
Jermolene
56945d91d3 Add unsaved changes indicator 
The “save” icon changes to red to indicate that there are unsaved
changes.
 2014-07-30 16:46:13 +01:00
Jermolene
73d7e85e11 Ensure sticky titles theme works in edit mode 2014-07-30 12:19:15 +01:00
Jermolene
f4b834aa2a Add close-all page control button 2014-07-30 11:40:06 +01:00
Jermolene
2380392f35 Add a page control for encryption 2014-07-29 15:43:10 +01:00
Jermolene
4de1a1adbe Normalise titles of toolbar button tiddlers 
The title shouldn’t include the toolbar name if we’re starting to have
buttons which can be placed on more than one toolbar.
 2014-07-29 13:37:57 +01:00
Jermolene
4bb8c4e8a7 Add toolbar tabs to control panel 2014-07-29 10:20:13 +01:00
Jermolene
30f60c400e Add tiddler info tools tab 2014-07-28 14:38:17 +01:00
Jermolene
46ae9bd34e Add tiddler info tools tab 2014-07-28 14:37:42 +01:00
Jermolene
536c697c9f 'more' toolbar button highlights when selected 2014-07-28 14:20:45 +01:00
Jermolene
ad4db0de97 Add 'more' toolbar button 2014-07-28 11:29:06 +01:00
Jermolene
497d9812c8 More buttons for the view toolbar 
The arrangement of disabling and enabling buttons within the tiddler
info panel is temporary.
 2014-07-27 11:43:26 +01:00
Jermolene
71ae63e24f Temporary commit losing power 2014-07-25 17:17:02 +01:00
Jermolene
3d5f68f7a8 Add a close others button 2014-07-25 13:09:20 +01:00
Jermolene
218ce09605 Add permalink/permaview/clone to tiddler info bar 
I’m open to suggestions for better ways to expose this functionality
 2014-07-24 15:50:18 +01:00
Jermolene
22468990a2 Fix typo 2014-07-23 20:51:06 +01:00
Jermolene
0cf63ab9f0 Add theme tweaks upgrader 2014-07-18 20:00:05 +01:00
Jermolene
8612bc4006 Rename $:/tags/AboveStory and $:/tags/BelowStory 2014-07-18 11:29:09 +01:00
Jermolene
2322be3f41 Add preview to upgrade wizard 
The tiddlers are wikified in the context of the host wiki, which means
that mutual transclusions between imported tiddlers won’t appear
correct in the preview.
 2014-07-17 18:42:04 +01:00
Jermolene
7a034560d1 Refactor ImportListing 
Better to avoid relying on the storyTiddler variable, which is a pain
for people trying to reuse the import listing.
 2014-07-16 20:31:10 +01:00
Jermolene
58cd874f22 Missed off last commit 2014-07-14 21:52:46 +01:00
Jermolene
4d948c575f Improvements to one-shot upgrade UI 2014-07-14 21:52:32 +01:00
Jermolene
07f13b310d Display plugin content in view template 2014-07-14 14:52:31 +01:00
Jermolene
1f6e16318a First pass at upgrade mechanism 2014-07-12 09:09:36 +01:00
Jermolene
91acad0f7c Add support for story backdrop and frontdrop 
Allows elements to be added above or below the story river
 2014-07-08 10:16:10 +01:00
Jermolene
0fae9ee992 Improve handling of popup state 
An improvement to 6fb992690d

By making sure that all the popup state tiddlers have the prefix
$:/state/popup/ we can be more selective and just exclude popup state
tiddlers when we save. The end result is that once again other kinds of
state are persisted as expected (eg tabs, and sidebar visibility).
 2014-06-22 11:14:11 +01:00
Jermolene
0b38cd640c Reverse accidentally making Contents the default tab 2014-06-21 11:18:59 +01:00
Jermolene
fb5c44a875 Remove indenting 
It didn’t work very well, and was giving us spans where there should be
divs in the tab control.
 2014-06-21 11:16:35 +01:00
Jermolene
0bdc5b5c70 Add editor type mappings to control panel 2014-06-18 13:52:22 +01:00
Jermolene
34e4166dc5 Add label and title for show/hide sidebar buttons 
More fixes for #650
 2014-06-17 11:39:18 +01:00
Jermolene
346b2f8611 Add label for advanced search link 2014-06-17 07:56:36 +01:00
Jermolene
6f859c8d44 Add label for close button in open sidebar tab 2014-06-17 07:56:27 +01:00
Jermolene
325a93f3c3 Move button language to $:/language/Buttons 2014-06-17 07:56:13 +01:00
Jermolene
401349a1d6 Improve a11y of close buttons in open tab 
a11y === accessibility
 2014-06-16 17:40:38 +01:00
Jermolene
bc9b67cbc3 Use H1 for page title and H2 for tiddler titles 
Ideally, we’d also rebase the headings within tiddlers so that `!
Heading` would be an H3. Hopefully we’ll do that later.
 2014-06-16 17:34:20 +01:00
Jermolene
bf2f88ba8b Use H1 for tiddler titles 
Part of #650
 2014-06-15 08:37:58 +01:00
Jermolene
eeedcb6d94 First pass at accessibility improvements for #650 2014-06-14 18:06:56 +01:00
Jermolene
9ab0c84140 Support global macros via the importvariables widget 
The new importvariables widget imports macro/variable definitions from
the specified tiddlers and makes them available to its children.

Allows us to split PageMacros up into separate tiddlers.

We still support loading macros from $:/core/ui/PageMacros to help
people upgrading.

Fixes #644 and #559
 2014-06-12 18:01:33 +01:00
Jermolene
9547a1f01c First pass at external image support 
A bunch of little changes that together enable external image support.
Try:

```
tiddlywiki editions/tw5.com --verbose --build externalimages
```

Then open `externalimages.html`, look for the images in the more/types
tab of the sidebar, open them and verify that they are set with an
external SRC attribute, not a data URI.
 2014-06-12 08:36:30 +01:00
Jermolene
9b576f2a8d Add group headings to type dropdown 
We’re also reverting to the old custom dropdown. Using the select
widget didn’t work out because it couldn’t cleanly work with a text box
allowing custom types to be specified.
 2014-06-06 09:32:14 +01:00
Jermolene
c8e98c1567 Use the select widget tiddler content types 2014-05-31 22:39:32 +01:00
Jermolene
ffd9df670d Fix problem with tabs switching on language change 
In 5.0.12-beta, if you change the current language setting then the
current sidebar tab setting is lost. This was because the qualified
title generated for the tabs was incorporating the current language
title, by virtue of a trick used in the PageTemplate to set the
“languageTitle” variable to a field of the current language plugin.
This trick left the current tiddler set to the current language, and
this current tiddler was still in force for the transclusion of the
page template segments.
 2014-05-31 19:20:51 +01:00
Jermolene
4d70d5780e Use radio buttons in navigation settings 
Radio buttons are much clearer
 2014-05-31 18:36:59 +01:00
Jermolene
1b37d660ea Restore "escape" as shortcut to abandon edits 
Thus reverting a defensive change back in January:
d72d245523
 2014-05-27 15:42:33 +01:00
nameanyone
157ca0c8aa Rename $:/temp/NewFieldName to $:/temp/newfieldname 
As per "Naming of System Tiddlers"
 2014-05-15 22:54:46 -07:00
nameanyone
01b3962b2c Rename $:/ShowEditPreview to $:/state/showeditpreview 
According to "Naming of System Tiddlers"
 2014-05-15 22:47:21 -07:00
Jermolene
93566cdc33 Add standard search to advanced search 2014-05-15 23:09:31 +01:00
Jermolene
f9f8ad725b Fix problem with advanced search counts 
Apologies to TiddlyWiki’s translators for disrupting existing work!
 2014-05-14 20:12:38 +01:00
Jermolene
da41879fc1 Fix dropdown behaviour in advanced settings 2014-05-13 16:21:01 +01:00
Jermolene
ad43958571 Make permalink behaviour configurable 
In the process introducing a new advanced settings tab

Fixes #600
 2014-05-13 14:16:58 +01:00
Jermolene
b3032d452f Refactor vertical tabs for reusability 
In practice, if you look at TabsMacro you’ll see that the width of the
tab content is wrong, and will usually overflow the container. Next
step is to fix that by using flexbox…
 2014-05-11 18:47:14 +01:00
Jermolene
ffb6c8ab81 Add hex colours to tag manager 
Fixes #597
 2014-05-05 18:42:25 +01:00
Jermolene
a4294b55f0 Add banner for binary tiddlers in edit mode 
Makes it easier to add tags to a binary tiddler (eg a PDF).
 2014-05-02 09:43:39 +01:00
Jermolene
84cd296c58 Minor tweaks to shadow warning infrastructure 
1. Moved some methods out of boot.js because they are not needed until
after bootup
2. Added alternate message for editing an overridden shadow tiddler
3. Minor style tweaks
 2014-04-28 15:16:31 +01:00
Devin Weaver
075cf544e4 Use new get filter from commit 570cad1c 2014-04-27 17:15:42 -04:00
Devin Weaver
3bbe53a58e Move shadowWarning to it's own template segment 2014-04-27 17:15:42 -04:00
Devin Weaver
3be21853e1 Add warning box while editing a shadow tiddler 
This addresses the third line item of issue #570

TODO: The filter is not working.
TODO: The message is too genaric and needs help.
 2014-04-27 17:15:42 -04:00
Jermolene
61c204366f Replace hamburger icon with double chevron 
Fixes #580

Seems much better, especially since the chevron gives us two clear
visual states (left vs. right). The hamburger doesn’t really have a
commonly accepted way of indicating whether the menu is currently open
or not.
 2014-04-27 19:28:30 +01:00
Jermolene
148e77b0e4 Clean up obsolete macro definition 
Fixes #576
 2014-04-24 11:58:42 +01:00
Jermolene
61c3f8a5ba Remove wikitext tiddlers from "types" sidebar tab 2014-04-22 11:44:27 +01:00
Jermolene
7684891285 Move topbar out of the way of scrollbars 
In the process getting rid of some extraneous `<p>` tags.

Fixes #566
 2014-04-19 11:32:56 +01:00
Jermolene
9fbe72a877 Rearrange system tag configuration 
By rearranging the `[all[]]` operator we are able to ensure that shadow
tiddlers get processed before ordinary tiddlers. This makes it easier
to create custom stylesheets that override the core.
 2014-04-18 09:28:14 +01:00
Jermolene
d336ffea02 Fix incorrect background colour for sidebar tag pills 
Fixes #568.
 2014-04-17 15:11:59 +01:00
Jermolene
cd1463cbb0 Get rid of the home button 
I’m not keen on it because it ends up being very visually prominent for
something that’s not particularly useful.
 2014-04-15 20:33:58 +01:00
Jermolene
fe0ed5e4ce Tweaks to themes 
And shaking out some paragraph tags in the sidebar
 2014-04-14 18:37:09 +01:00
Jermolene
a3cf925e56 Add classes for the current theme and language 
Add the classes to the tw-page-container DIV
 2014-04-11 21:37:58 +01:00
Jermolene
442bc35bcb Remove dropdown from edit mode tags 
Firefox didn’t like the nested buttons.

The better fix would be to switch the tag pills to being links instead
of buttons.

Fixes #515
 2014-04-10 22:49:46 +01:00
Jermolene
1bc9bf541a Remove headings from Tiddler Info advanced tab 
Fixes #518
 2014-04-10 21:44:56 +01:00
Jermolene
fc407d079c Pixel accuracy for restoring pre-refactor layout 
Two problems:

* Extraneous whitespace shows up as whitespace in the HTML, making it
hard to style
* Fix some padding
 2014-04-09 22:19:27 +01:00
Mario Pietsch
70a2db34d1 these changes remove most of the <p> tags from the right sidebar, without changing the layout too much. The tab buttons are a little bit higher but this will be adjusted with the next CSS tweaks. 2014-04-09 21:12:10 +02:00
Jermolene
f08c4aa525 Arrange fields alphabetically in the edit template 2014-04-09 11:31:27 +01:00
Jermolene
597b8ca4b1 Ensure fieldnames are not wikified 
`__proto__` was being wikified into underlined text
 2014-04-06 22:49:59 +01:00
Jermolene
c7b4febae3 Optimise ordering of filter expressions 
We get a significant speed improvement of >10% by rearranging filter
operators to bring to the front the operators likely to reduce the size
working list.
 2014-04-06 11:50:16 +01:00
Jermolene
b7f674c51a First pass at refactoring filter execution 
This is the beginning of addressing #523.
 2014-04-03 20:49:16 +01:00
Mario Pietsch
1940bd4dce right menue SiteTitle and SiteSubtitle decoupled from tiddler title and tiddler subtitle. Otherwise it is not possible to modify the tiddler title styling, without affecting the site title. 2014-04-01 10:34:58 +02:00
Jermolene
c58852a67b On narrow screens ensure there is a background behind the home and menu buttons 2014-03-26 14:11:26 +00:00
Jermolene
45a362c285 Add a dropdown to tags in edit mode 
As discussed in TW Hangout 40
 2014-03-26 13:06:11 +00:00
Jermolene
871630be88 Fix the menu hamburger 2014-03-26 10:16:00 +00:00
Jermolene
59ac38a3da Remove the scrollable from the story river 
The problem was that the scrollable required that the mouse be over the
story river itself in order to scroll it with the wheel. If we fallback
to scrolling the story by scrolling the browser body then we are able
to scroll even if the mouse is over the sidebar.
 2014-03-25 22:15:54 +00:00
Jermolene
80b65b1651 Add a top-left and top-right menu 2014-03-25 21:54:06 +00:00
Jermolene
7c235566c4 Rejig the page layout to use the scrollable widget 
This is the start of some refactoring of the main layout CSS intended
to give us more flexibility and control.
 2014-03-25 14:29:16 +00:00
Jermolene
d3e178becc Add scrollable widget 
A new widget to handle scrollable areas. We’ll use it both for the
story river and the sidebar.
 2014-03-25 14:26:54 +00:00
Jeremy Ruston
03cfa61ae8 Merge pull request #494 from nameanyone/master 
Stop using obsoleted "-moz-border-radius" and "-webkit-border-radius" pr...
 2014-03-20 22:19:45 +00:00
Jermolene
178cfb1084 Make more core strings be translateable 
Now we’re translating strings that occur in JavaScript modules.

Partially fixing #491
 2014-03-20 20:55:59 +00:00
nameanyone
7616c4ce7d Stop using obsoleted "-moz-border-radius" and "-webkit-border-radius" properties 
Fixes #480
 2014-03-18 16:38:52 -07:00
Jermolene
499730c458 Remove whitespace between toolbar icons 2014-03-15 17:04:12 +00:00
Jermolene
baa8cf3dd0 Add a warning segment to templates for TWC tiddlers 
Now there’s a warning banner on all TWC tiddlers. It includes an
`upgrade` button that currently just flips the tiddler type to TW5
 2014-03-15 17:03:50 +00:00
Jermolene
afa677b9a0 Add a class to tiddler frames in view mode 
We’re already marking tiddlers in edit mode with tw-tiddler-edit-mode,
makes sense to make view mode tiddlers too.
 2014-03-15 11:20:33 +00:00
Jermolene
42c67cfeb7 Add tiddler info "advanced" panel 2014-03-14 15:23:28 +00:00
Jermolene
96457d8011 Rejig plugins tab of control panel 
Now we divide the plugins into categories and organise the displayed
information a bit better
 2014-03-13 17:43:18 +00:00
Jermolene
3d9f61f041 More whitespace in core templates 2014-03-13 17:42:29 +00:00
Jermolene
f48701544e Enhance tiddler title for system tiddlers 
Now the $:/ part of the name is rendered in grey, making the main part
of the title more prominent.

@tobibeer suggested this a long time ago; good idea!
 2014-03-13 17:40:53 +00:00
Jermolene
dd3ee2a603 Extend tag manager to edit icons assigned to tags 
Add a dropdown for choosing available images for a tag.

As part of this change we need to tag tiddlers that contain images
typed as wikitext (these are inline SVG icons) so that we can display
them in the dropdown.
 2014-03-12 21:56:46 +00:00
Jermolene
5ba92fe274 Update to latest version of normalize.css and fix tab styling 
Tab styling was inconsistent on Firefox due to some line-height issues.
 2014-03-12 20:05:34 +00:00
Jermolene
62bc20a181 Restore visibility of system tags in view template 
On discussion at Hangout #38 we felt that hiding them was confusing,
and that there were few situations where a user would see system tags
except on system tiddlers.
 2014-03-11 18:25:41 +00:00
Jermolene
2608a323eb Hide system tags from the sidebar tags list 
Part of #478
 2014-03-10 19:40:07 +00:00
Jermolene
8239275edb Add dropdown of canned filter searches 
Now you can pick from a dropdown of predefined filtered searches in the
advanced search filter tab.
 2014-03-10 18:16:10 +00:00
Jermolene
be6509a17f Remove system tags from sidebar tags listing 2014-03-10 18:15:12 +00:00
Jermolene
f04527ae32 Correct filter for count of overridden shadow tiddlers 2014-03-10 15:05:07 +00:00
Jermolene
70d2d4b7a1 Remove the "create" button from the missing tiddler template 2014-03-04 18:55:43 +00:00
Jermolene
2f2a257745 Improve the descriptive text for missing tiddlers 
Now we explain that it’s a missing tiddler, and add a “create” button
 2014-03-02 18:43:22 +00:00
Jermolene
bcc282016e Use proper tag pills in the tag manager 2014-02-25 21:22:15 +00:00
Jermolene
cf4eed0129 Add first pass at a tag manager 
As independently suggested by @Skeeve and @Spangenhelm
 2014-02-25 20:14:16 +00:00
Jermolene
2ab0facf3a Extend button widget to allow navigating to a tiddler 
Fixes #327
 2014-02-22 16:13:16 +00:00
Jermolene
9e0f1240c5 Change SiteTitle/SiteSubtitle into $:/SiteTitle and $:/SiteSubtitle 
To make things more consistent
 2014-02-22 11:39:18 +00:00
Jermolene
4ee277f41b Fix some missing translateables 2014-02-21 14:27:49 +00:00
Jermolene
c17844b815 Another fix for the block vs inline handline 2014-02-20 22:43:04 +00:00
Jermolene
279f32080d Start to make the core templates more readable 
Yay for line breaks.
 2014-02-20 22:22:45 +00:00
Jermolene
06a0d21734 Use double linebreaks to indicate content of a widget or html element should be parsed in block mode 
Fixes #82.

The old behaviour was to parse the content of a widget or html element
in block mode if the opening tag was followed by a line break. The new
behaviour requires two line breaks.

This makes it possible to include linebreaks more liberally within
wikitext, although care must still be taken to only use double line
breaks when the block mode behaviour is desired.

The code change here is very simple, just a single line change in
html.js. Most of the other changes are to convert various single line
breaks into double line breaks.
 2014-02-20 21:42:31 +00:00
Jermolene
e88f8ad4e9 Fix typo with <<color>> macro 2014-02-20 19:12:05 +00:00
Jermolene
e3c1906eaf Make the show/hide editor button be translateable 
Missed by accident from earlier commit
 2014-02-20 17:53:23 +00:00