diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png
new file mode 100644
index 000000000..881947506
Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png differ
diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta
new file mode 100644
index 000000000..aa3f9d11a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta
@@ -0,0 +1,3 @@
+title: $:/_tw_shared/favicons/marketplace
+type: image/png
+tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid b/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid
new file mode 100644
index 000000000..53b14585d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid
@@ -0,0 +1,6 @@
+title: $:/_tw_shared/sites/marketplace
+tags: $:/tags/TiddlyWikiSites TiddlyWikiSitesMenu
+caption: marketplace
+description: Commercial Products and Services
+url: https://talk.tiddlywiki.org/c/marketplace/22
+icon: $:/_tw_shared/favicons/marketplace
diff --git a/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid b/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid
index 0dadeb2e3..00e567510 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid
+++ b/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid
@@ -1,3 +1,3 @@
title: $:/tags/TiddlyWikiSites
-list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com
+list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com $:/_tw_shared/sites/marketplace
tags: TiddlyWikiSitesMenu
diff --git a/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid
new file mode 100644
index 000000000..938631d55
--- /dev/null
+++ b/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid
@@ -0,0 +1,19 @@
+title: Funding TiddlyWiki
+tags: About HelloThere
+modified: 20221204165636777
+created: 20221204165636777
+
+TiddlyWiki is more useful to everybody if it is free to use, with no financial barriers to long term adoption. It is not altruism; we believe that removing or reducing barriers to adoption will help to ensure TiddlyWiki's future by making the community larger and stronger.
+
+Nonetheless, TiddlyWiki is a relatively big, complex machine that requires a significant amount of ongoing work to maintain and improve. Some community infrastructure also requires monthly fees to operate (notably the [[TiddlyWiki forum|Forums]]).
+
+The people in the community that do the work have widely varying needs:
+
+* At one end, a good proportion of the work on TiddlyWiki is performed by community members on a purely voluntary basis. For those people, the satisfaction of helping others is sufficient reward. Indeed, for many people, unpaid voluntary activities are a satisfying antidote to everyday paid work
+* At the other extreme, JeremyRuston and some other contributors are trying to make a full-time living working on TiddlyWiki by offering commercial products and services around it
+* In between, there are other people who would appreciate an ocassional token to reward them for their work
+
+To support these needs in the community, we have two initiatives:
+
+* We use [[Open Collective]] to collect donations for the infrastructure costs of the Community and to crowdfund specific developments by individuals or organisations
+* The [[TiddlyWiki Marketplace]] provides a shop window for individuals and organisations offering commercial products and services
diff --git a/editions/tw5.com/tiddlers/about/Open Collective.tid b/editions/tw5.com/tiddlers/about/Open Collective.tid
new file mode 100644
index 000000000..8d096cdc8
--- /dev/null
+++ b/editions/tw5.com/tiddlers/about/Open Collective.tid
@@ -0,0 +1,14 @@
+title: Open Collective
+modified: 20221204165636777
+created: 20221204165636777
+tags: About HelloThere [[Open Collective]]
+
+Open Collective is a platform for transparent fundraising and expenses for projects like TiddlyWiki. It is the official TiddlyWiki community fundraising space.
+
+https://opencollective.com/tiddlywikidotorg
+
+You can make a fixed one-time donation, or setup a recurring contribution.
+
+The main goals listed for donations are to cover basic costs for community infrastructure like the Discourse forum, and a new goal for supporting the TiddlyWiki Core.
+
+Additionally, the community can make use of the platform for special projects - to pool funds to pay for development, design, or anything else. The [[File Upload Plugin|https://opencollective.com/tiddlywikidotorg/projects/tiddlywiki-file-upload]] is the first of these, and we want to welcome others to launch projects here.
diff --git a/editions/tw5.com/tiddlers/definitions/Federatial.tid b/editions/tw5.com/tiddlers/definitions/Federatial.tid
index b2ebdf83b..ce256709d 100644
--- a/editions/tw5.com/tiddlers/definitions/Federatial.tid
+++ b/editions/tw5.com/tiddlers/definitions/Federatial.tid
@@ -1,9 +1,21 @@
created: 20130825154900000
modified: 20170718160846820
+modified: 20221204165636777
tags: Definitions
title: Federatial
type: text/vnd.tiddlywiki
-Federatial Limited is a software consultancy founded by JeremyRuston, the creator of TiddlyWiki. Federatial helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools.
+Federatial Limited helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. Services include:
+
+* Consultancy advice on TiddlyWiki adoption
+* Development of custom solutions based on TiddlyWiki
+* Multi-user TiddlyWiki hosting – no outages since 2016
+* Sponsorship of TiddlyWiki core development
See https://federatial.com/ and https://twitter.com/federatial for more information.
+
+JeremyRuston founded Federatial Limited in 2011 to support his work on TiddlyWiki for the advertised 25 years. Since then, Federatial has been privileged to have worked with a wide range of fantastic clients in very different sectors, on some very diverse projects:
+
+* For a law firm in the Washington DC, developing a custom multi-user ~TiddlyWiki application. It replaced a Microsoft Word document hosted on ~SharePoint that had grown to 18,000 pages and 10 million words, and was increasingly unwieldy to manage. We converted the document to a non-linear TiddlyWiki structure. Startup, searching and browsing are an order of magnitude faster than using Word and ~SharePoint
+* For a publishing firm in Paris, devising a new TiddlyWiki-based format for interactive electronic publications (including conversion from the established EPUB format). See https://twpub-tools.org/
+* For a charity in London, maintaining a multiuser instance of TiddlyWiki running on Amazon's serverless infrastructure. It has more than 1,000 users, and over 15,000 tiddlers in 500 interlinked wikis. See https://manuals.annafreud.org/ambit
diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid
index 583abf9bc..7af89352c 100644
--- a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid
+++ b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid
@@ -4,6 +4,8 @@ tags: Definitions
title: TiddlyWikiClassic
type: text/vnd.tiddlywiki
-"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten from the ground up. TiddlyWiki Classic is still being maintained at:
+[img[TiddlyWiki Classic.png]]
+
+"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten. TiddlyWiki Classic is still actively maintained at:
https://classic.tiddlywiki.com/
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
index 25b5856eb..dec5d87b4 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@@ -1,33 +1,37 @@
created: 20130822170200000
list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
-modified: 20220802122551819
+modified: 20221204165636777
tags: TableOfContents
title: HelloThere
type: text/vnd.tiddlywiki
-''Have you ever had the feeling that your head is not quite big enough to hold everything you need to remember?''
-
-Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information.
+!! ''Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information''
Use it to keep your [[to-do list|TaskManagementExample]], to plan an [[essay or novel|"TiddlyWiki for Scholars" by Alberto Molina]], or to organise your wedding. Record every thought that crosses your brain, or build a flexible and responsive website.
-
-<>
-
-
Unlike conventional online services, TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will [[still be able to use|Future Proof]] the notes you take today.
-
+!! ''Find Out More''
+
+
+<$list filter="[tag[HelloThumbnail]]">
+<$macrocall $name="flex-card" captionField="caption" descriptionField="text"/>
+$list>
+
+
+!! ''~TiddlyWiki Hubs''
+
+
-<<<.tc-big-quote
-''The ~TiddlyWiki is the best software I've ever found for organising my ideas.''
+!! ''Testimonials & Reviews''
-It's well worth spending an hour or so playing with it to see how it can help you. This will be time well-spent and will change how you think and how you organise your ideas.
-<<< [[Joe Armstrong, Co-inventor of Erlang|https://joearms.github.io/]]
-
-<<<.tc-big-quote
-''~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good).''
-
-Finding code that works flawlessly after just two or three years is magical enough but after seven years?!
-<<< [[Mark Gibbs, Network World|http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html]]
-
-
{{Product Hunt Link}}
+
+<$list filter="[tag[Testimonial]]">
+<$macrocall $name="flex-card" class="tc-card-quote" captionField="caption" descriptionField="text"/>
+$list>
+
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid
index f50bccca6..cd304e703 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid
@@ -1,5 +1,5 @@
created: 20150414070451144
-list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Firefox Apocalypse]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - TiddlyMap]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Classic]]
+list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Federatial]]
modified: 20150414070948246
title: HelloThumbnail
type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid
new file mode 100644
index 000000000..bc48ec0c0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid
@@ -0,0 +1,10 @@
+background-color: #EDB431
+caption: How is ~TiddlyWiki Funded?
+color: #ff0
+image: Funding.png
+link: Funding TiddlyWiki
+tags: HelloThumbnail
+title: HelloThumbnail - Funding
+ribbon-text: NEW
+
+Find out how you can help support ~TiddlyWiki financially
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid
index a8cb2d5be..f076ced60 100644
--- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid
@@ -4,3 +4,5 @@ color: #D5B7EA
image: Grok TiddlyWiki Banner
caption: Grok ~TiddlyWiki
link: "Grok TiddlyWiki" by Soren Bjornstad
+
+A guided tutorial through ~TiddlyWiki
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid
index 15ce2b073..aa34f87b5 100644
--- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid
@@ -6,3 +6,5 @@ icon: {{$:/core/images/video}}
caption: Introduction to ~TiddlyWiki
link: Introduction Video
image: Introduction Video Thumbnail.jpg
+
+Short video introducing basic ~TiddlyWiki concepts
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid
index 32498bfc4..5ed5eb0cf 100644
--- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid
@@ -1,6 +1,8 @@
title: HelloThumbnail - Latest Version
tags: HelloThumbnail
-caption: What's New in <
>
+caption: What's New in v<>
link: Releases
image: New Release Banner
color: #fff
+
+The latest version v<> of ~TiddlyWiki (released on <$view field="released" tiddler={{{ [addprefix[Release ]] }}} format="date" template="DDth MMM YYYY"/>)
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid
new file mode 100644
index 000000000..39a72569c
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid
@@ -0,0 +1,10 @@
+title: HelloThumbnail - Marketplace
+tags: HelloThumbnail
+color: #6B6E98
+background-color: #EAE57D
+image: TiddlyWiki Marketplace Banner
+caption: ~TiddlyWiki Marketplace
+link: TiddlyWiki Marketplace
+ribbon-text: NEW
+
+Explore commercial products and services for ~TiddlyWiki
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid
index a5b3e44ad..221a3ae10 100644
--- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid
@@ -2,5 +2,7 @@ title: HelloThumbnail - TiddlyWikiLinks
tags: HelloThumbnail
color: #D5B7EA
image: TiddlyWikiLinks
-caption: links.tiddlywiki.com
+caption: links.tiddlywiki.org
link: Community Links Aggregator
+
+Links to ~TiddlyWiki-related content collected by the community
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid
new file mode 100644
index 000000000..9d76619a7
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid
@@ -0,0 +1,11 @@
+background-color: #EDB431
+caption: Federatial
+color: #ff0
+image: Federatial.png
+link: Federatial
+tags: HelloThumbnail
+title: HelloThumbnail - Federatial
+type: text/vnd.tiddlywiki
+ribbon-text: NEW
+
+Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Federatial Limited
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/Federatial.png b/editions/tw5.com/tiddlers/images/Federatial.png
new file mode 100644
index 000000000..3adde3a11
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Federatial.png differ
diff --git a/editions/tw5.com/tiddlers/images/Federatial.png.meta b/editions/tw5.com/tiddlers/images/Federatial.png.meta
new file mode 100644
index 000000000..528629786
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/Federatial.png.meta
@@ -0,0 +1,3 @@
+title: Federatial.png
+type: image/png
+tags: picture
diff --git a/editions/tw5.com/tiddlers/images/Funding.png b/editions/tw5.com/tiddlers/images/Funding.png
new file mode 100644
index 000000000..b55be8441
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Funding.png differ
diff --git a/editions/tw5.com/tiddlers/images/Funding.png.meta b/editions/tw5.com/tiddlers/images/Funding.png.meta
new file mode 100644
index 000000000..b9caa4a72
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/Funding.png.meta
@@ -0,0 +1,3 @@
+title: Funding.png
+type: image/png
+tags: picture
diff --git a/editions/tw5.com/tiddlers/images/Marketplace Banner.png b/editions/tw5.com/tiddlers/images/Marketplace Banner.png
new file mode 100644
index 000000000..51275547a
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Marketplace Banner.png differ
diff --git a/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta b/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta
new file mode 100644
index 000000000..b693c99e3
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta
@@ -0,0 +1,3 @@
+title: TiddlyWiki Marketplace Banner
+type: image/jpeg
+tags: picture
diff --git a/editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid b/editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid
new file mode 100644
index 000000000..3de695de3
--- /dev/null
+++ b/editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid
@@ -0,0 +1,18 @@
+title: TiddlyWiki Marketplace
+tags: Community
+modified: 20221204165636777
+created: 20221204165636777
+
+[img width=200px [TiddlyWiki Marketplace Banner]]
+
+Welcome to the TiddlyWiki Marketplace. This new forum is designed to provide a space for individuals and organizations to offer commercial products and services that are built around TiddlyWiki:
+
+* Paid hosting services
+* Custom solution development
+* Training courses
+* One-to-one training sessions
+* "Fix my wiki" debugging sessions
+
+
+~TiddlyWiki Marketplace
+
diff --git a/editions/tw5.com/tiddlers/saving/Saving with Polly.tid b/editions/tw5.com/tiddlers/saving/Saving with Polly.tid
index 60ae74087..103c9e0c7 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with Polly.tid
+++ b/editions/tw5.com/tiddlers/saving/Saving with Polly.tid
@@ -9,6 +9,7 @@ modified: 20220223160414274
tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows Edge
title: Saving with Polly
type: text/vnd.tiddlywiki
+ribbon-text: NEW
[[Polly|https://github.com/Marxsal/polly]] is a batch file system using Windows //~PowerShell// to restore ~TiddlyWiki files from a specified download directory to their original home directory.
diff --git a/editions/tw5.com/tiddlers/saving/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid
index 8210bba1f..9b55b1d1d 100644
--- a/editions/tw5.com/tiddlers/saving/Saving.tid
+++ b/editions/tw5.com/tiddlers/saving/Saving.tid
@@ -54,7 +54,7 @@ Available methods for saving changes with ~TiddlyWiki:
-
+
<$wikify text=<
> name="alltagsfilterwikified">
<$list filter=<>>
{{||$:/_tw5.com-card-template}}
diff --git a/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid b/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid
index 272f22bbc..d4aefdb0e 100644
--- a/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid
+++ b/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid
@@ -8,6 +8,7 @@ modified: 20221126192853897
tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows iOS Edge
title: TiddlyBucket - Save to AWS or Google Storage
type: text/vnd.tiddlywiki
+ribbon-text: NEW
~TiddlyBucket - Save to AWS or Google Storage using Go
diff --git a/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid b/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid
index 50d0b1163..a2400a739 100644
--- a/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid
+++ b/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid
@@ -3,19 +3,4 @@ modified: 20220719134613555
title: $:/_tw5.com-card-template
type: text/vnd.tiddlywiki
-\define tw-card-template(bordercolor:"")
-\whitespace trim
-
- <$link>
- <$let tv-wikilinks=no>
-
<$transclude field="caption"><$view field="title"/>$transclude>
-
- <$list filter="[is[current]has[community-author]]">by {{!!community-author}}$list>
-
-
<$view field="description"/>
- $let>
- $link>
-
-\end
-
-<$macrocall $name="tw-card-template" bordercolor={{!!color}}/>
+<$macrocall $name="flex-card" bordercolor={{!!color}} captionField="caption" subtitle={{{ [{!!community-author}!is[blank]addprefix[by ]] }}}/>
diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
index 251851457..d4ce76a8e 100644
--- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
+++ b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
@@ -122,62 +122,181 @@ type: text/vnd.tiddlywiki
margin-left: 10px;
}
-.tc-card {
- margin: 15px;
- padding: 10px 20px;
- border-radius: 10px;
- border-top: 5px solid #45D3D3;
- box-shadow: 0 8px 17px -8px #A3A5AE;
- background-color: #FFF;
- width: 200px;
- transition: box-shadow 0.3s ease-in-out;
- font-size: 13px;
- line-height: 18px;
+.tc-cards {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-evenly;
+ width: 100%;
+ padding: 0.5em;
+ background: <>;
+ border-color: rgba(34,36,38,.15);
+ box-shadow: 0 2px 25px 0 rgb(34 36 38 / 5%) inset;
}
-.tc-card:hover {
- box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
+.tc-tiddlylink.tc-card {
+ font-weight: normal;
+ max-width: 100%;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ background: <>;
+ color: <>;
+ width: 200px;
+ min-height: 0;
+ padding: 0 0 0.5em 0;
+ margin: 0.5em;
+ border: none;
+ border-radius: 8px;
+ box-shadow: 0 1px 3px 0 #d4d4d5, 0 0 0 1px #d4d4d5;
+ transition: box-shadow 0.3s ease,transform .3s ease;
}
-.tc-card:hover .tc-card-title {
- color: #1462ff;
+
+@media (max-width: 500px) {
+
+ .tc-cards {
+ padding: 0;
+ }
+
+ .tc-tiddlylink.tc-card {
+ margin: 0.25em;
+ width: 45%;
+ }
+
+}
+
+.tc-tiddlylink.tc-card.tc-card-quote {
+ width: 320px;
+ box-shadow: none;
+ background-color: #effdff;
+}
+
+.tc-card-accent {
+ border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+}
+
+.tc-tiddlylink.tc-card:hover {
+ color: <>;
+ background: <>;
+ text-decoration: none;
+ cursor: pointer;
+ box-shadow: 0 1px 5px 0 #bcbdbd, 0 0 0 1px #d4d4d5;
+ transform: translateY(-3px);
+}
+
+.tc-card-ribbon-wrapper {
+ line-height: 0;
+ width: 75px;
+ height: 75px;
+ position: absolute;
+ right: 0;
+ overflow: hidden;
+ top: 0;
+ z-index: 999;
+ pointer-events: none;
+}
+
+.tc-card-ribbon {
+ transition: top 0.3s ease-in-out;
+ top: 15px;
+ right: -77px;
+ position: absolute;
+ transform: rotate(45deg);
+ background-color: red;
+ box-shadow: 0px 0px 2px 0px rgb(0 0 0 / 50%);
+}
+
+.tc-tiddlylink.tc-card:hover .tc-card-ribbon {
+ top: -77px;
+}
+
+.tc-card-ribbon-inner {
+ font-size: 10px;
+ line-height: 13px;
+ font-weight: 700;
+ color: white;
+ text-decoration: none;
+ text-shadow: 0 -1px rgb(0 0 0 / 50%);
+ width: 200px;
+ display: inline-block;
+ padding: 2px 0;
+ text-align: center;
+}
+
+.tc-card-image {
+ line-height: 0;
+ overflow: hidden;
+}
+
+.tc-card-image img {
+ border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+ width: 100%;
+ transition: transform 0.3s ease-in-out;
+}
+
+.tc-tiddlylink.tc-card:hover .tc-card-image img {
+ transform: scale(1.05);
}
.tc-card-title {
- text-align: center;
font-size: 1.2em;
+ line-height: 1.2;
font-weight: 600;
- transition: color 0.2s ease-in-out;
- padding: 10px 0;
+ transition: color 0.3s ease-in-out;
+ padding: 0 10px;
+ margin: 0.5em 0;
}
+.tc-card-subtitle,
.tc-card-author {
- text-align: center;
+ font-size: 0.8em;
+ line-height: 1.2;
+ color: <>;
+ padding: 0 10px;
+ margin: 0.5em 0;
font-style: italic;
}
-.tc-card p {
- height: 67px;
- overflow: hidden;
+.tc-card-body {
+ font-size: 0.9em;
+ line-height: 1.2;
+ padding: 0 10px;
margin: 0;
- padding: 13px 0;
}
-.tc-card a {
- color: #222;
+.tc-card-body-wrapper {
+ position: relative;
}
-.tc-card a:hover {
- text-decoration:none;
+.tc-tiddlylink.tc-card.tc-card-quote .tc-card-body:before {
+ font-family: Georgia, serif;
+ color: <>;
+ content: open-quote;
+ font-size: 5em;
+ line-height: 1;
+ float: left;
+}
+
+.tc-tiddlylink.tc-card.tc-card-quote .tc-card-body:after {
+ font-family: Georgia, serif;
+ color: <>;
+ content: close-quote;
+ font-size: 5em;
+ line-height: 1;
+ float: right;
+}
+
+.tc-tiddlylink.tc-card .tc-card-body-clear {
+ clear: both;
+}
+
+.tc-card-body > p {
+ margin: 0.25em 0;
}
.tc-card a:active, .tc-card a:focus, .tc-btn-download:active, .tc-btn-download:focus{
- outline: none;
-}
-
-div.content {
- padding: 1px 16px;
- display: flex;
- flex-wrap: wrap;
+ outline: none;
}
.tc-btn-download {
diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid
index 70f62bfb7..a867def4f 100644
--- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid
+++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid
@@ -94,3 +94,38 @@ That renders as:
<>
\end
+
+\define flex-card(class,bordercolor:"",imageField:"image",captionField:"caption",subtitle:"",descriptionField:"description",linkField:"link")
+\whitespace trim
+<$link class={{{ [<__class__>addprefix[tc-card ]] }}} to={{{ [get<__linkField__>else] }}}>
+ !is[blank]addprefix[5px solid ]] }}}>
+ <$list filter="[
has[ribbon-text]]" variable="ignore">
+
+
get[ribbon-color]else[red]] }}}>
+
+ <$text text={{!!ribbon-text}}/>
+
+
+
+ $list>
+ <$list filter="[has<__imageField__>]" variable="ignore">
+
+ <$image source={{{ [get<__imageField__>] }}}/>
+
+ $list>
+ <$transclude field=<<__captionField__>>><$view field="title"/>$transclude>
+ <$list filter="[<__subtitle__>!is[blank]]" variable="ignore">
+
+ <$text text=<<__subtitle__>>/>
+
+ $list>
+
+
+ <$transclude field=<<__descriptionField__>> mode="block"/>
+
+
+
+
+
+$link>
+\end
diff --git a/editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid b/editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid
new file mode 100644
index 000000000..2f110d20f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid
@@ -0,0 +1,8 @@
+title: Testimonials - Joe Armstrong
+tags: Testimonial
+caption: Joe Armstrong, Co-inventor of Erlang
+extlink: https://joearms.github.io/
+
+The ~TiddlyWiki is the best software I've ever found for organising my ideas.
+
+It's well worth spending an hour or so playing with it to see how it can help you. This will be time well-spent and will change how you think and how you organise your ideas.
diff --git a/editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid b/editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid
new file mode 100644
index 000000000..9c78f84cc
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid
@@ -0,0 +1,8 @@
+title: Testimonials - Network World
+tags: Testimonial
+caption: Mark Gibbs, Network World
+extlink: http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html
+
+~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good).
+
+Finding code that works flawlessly after just two or three years is magical enough but after seven years?!
diff --git a/editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid b/editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid
new file mode 100644
index 000000000..388b1daa6
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid
@@ -0,0 +1,6 @@
+title: Testimonials - Product Hunt
+tags: Testimonial
+caption: Product Hunt
+extlink: https://www.producthunt.com/posts/tiddlywiki-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-tiddlywiki-2
+
+{{Product Hunt Link}}