diff --git a/publisher/guides/templates.mdx b/publisher/guides/templates.mdx index b0cec6ca..ef435426 100644 --- a/publisher/guides/templates.mdx +++ b/publisher/guides/templates.mdx @@ -157,13 +157,13 @@ Additional template examples are available in the [Templates reference page][5] ## Episode Page and RSS Feed: Automatic Template Insertion -In Podlove Publisher, templates can be automatically inserted into episode content. This setting is managed in the WordPress admin interface under `wp-admin/admin.php?page=podlove_templates_settings_handle`. +In Podlove Publisher, templates can be automatically inserted into episode content. This setting is managed in the WordPress admin interface under `wp-admin/admin.php?page=podlove_templates_settings_handle`. Here, you can specify which templates should be automatically included in your episode pages. In the screenshot below, the template named `default` in automatically inserted. ### Default Template Behavior -By default, the `default` template is applied to all episodes. This template's content will be displayed on the episode's HTML page and embedded within the `` tag in the RSS feed. +By default, the `default` template is applied to all episodes. This template's content will be displayed on the episode's HTML page and embedded within the `` tag in the RSS feed. ### Web Player Insertion The default template includes the web player for the episode. To ensure that the web player does not appear in the RSS feed, the template uses the following Twig condition: @@ -217,7 +217,7 @@ is equivalent to ### API Entry Points -There are currently 4 entry points to the API: through the podcast, episode, network or Flattr. +There are currently 4 entry points to the API: through the podcast, episode or network. #### Podcast @@ -273,27 +273,6 @@ $network_lists = \Podlove\get_network()->lists(); ?> ``` -#### Flattr - -```php - 'http://wordpress.org/extend/plugins/podlove-podcasting-plugin-for-wordpress/', - 'user' => 'ericteubert' -]); -?> -``` - ### Hint: Short syntax for PHP 5.6+ If you develop a theme for PHP 5.6+ environments, you may want to use function importing for a nicer syntax, like that: diff --git a/publisher/reference/dsgvo-gdpr.mdx b/publisher/reference/dsgvo-gdpr.mdx index 83223145..6067a2c6 100644 --- a/publisher/reference/dsgvo-gdpr.mdx +++ b/publisher/reference/dsgvo-gdpr.mdx @@ -10,8 +10,6 @@ _Last Modified: 2018-06-14_ If the **Bitlove Module** is active, requests to `bitlove.org` are made. -If the **Flattr Module** is active, requests to `flattr.com` are made. - Both **Podlove Subscribe Button** and **Podlove Web Player** may be served via [GitHub](https://www.github.com) ([Github privacy statement](https://docs.github.com/en/site-policy/privacy-policies/github-privacy-statement)). You can choose to not use our CDN to serve these applications in the module settings. If **Tracking/Analytics** is enabled, user IP addresses are used to determine their geographic location. IP addresses are not saved, but anonymized and then hashed together with the User Agent to generate a `request id`, which is saved. The User Agent is saved as well but cannot be connected to the user since the user IP is never saved. @@ -44,12 +42,6 @@ This website uses [bitlove.org](http://bitlove.org) to provide downloads via bit When you access pages of this website that contain bitlove functionality, your browser connects directly to Bitlove's servers. -**Flattr** - -Within this online offer buttons of the micropayment service "Flattr" are included, which are provided by Flattr AB, Box 4111, 203 12 Malmö, Sweden. When you access pages of this website that contain these buttons, your browser connects directly to Flattr's servers. - -If users have created an account with Flattr, with which they are logged in at the same time, Flattr receives the information that users have visited the respective page of this online offer. If users have a Flattr account, are logged in and interact with the button, information about it will be transmitted to Flattr and stored there for billing purposes according to local guidelines. Even if users are not logged in, usage data may be collected and stored. To see exactly how your data is processed when you click the Flattr button, users can visit [flattr.com/privacy](https://flattr.com/privacy). - **Podlove** Both **Podlove Subscribe Button** and **Podlove Web Player** are served by [keycdn.com](https://www.keycdn.com) ([keycdn GDPR statement](https://www.keycdn.com/gdpr)). @@ -72,12 +64,6 @@ Diese Website verwendet [bitlove.org](http://bitlove.org), um Downloads via BitT Wenn Sie Seiten dieses Internetangebots, die Bitlove-Funktionalität enthalten, aufrufen, wird von Ihrem Browser eine direkte Verbindung zu Servern von Bitlove hergestellt. -**Flattr** - -Innerhalb dieses Onlineangebotes sind Schaltflächen des Micropayment-Dienstes „Flattr“ eingebunden, der von der Firma Flattr AB, Box 4111, 203 12 Malmö, Schweden betrieben wird. Wenn Sie Seiten dieses Internetangebots, die diese Schaltflächen enthalten, aufrufen, wird von Ihrem Browser eine direkte Verbindung zu Servern von Flattr hergestellt. - -Sofern Sie bei Flattr ein Konto angelegt haben, mit dem Sie gleichzeitig eingeloggt sind, erhält Flattr die Information, dass Sie die jeweilige Seite dieses Onlineangebots besucht haben. Sofern Sie ein Flattr-Konto besitzen, eingeloggt sind und mit der Schaltfläche interagieren, werden Informationen darüber an Flattr übermittelt und nach den dort geltenden Richtlinien dort zu Abrechnungszwecken gespeichert. Auch wenn Sie nicht eingeloggt sind, können ggf. Nutzungsdaten erhoben und auch gespeichert werden. Wie Ihre Daten genau verarbeitet werden, wenn Sie die Flattr-Schaltfläche anklicken, erfahren Sie unter [flattr.com/privacy](https://flattr.com/privacy). - **Podlove** Sowohl **Podlove Subscribe Button** als auch **Podlove Web Player** werden von [keycdn.com](https://www.keycdn.com) ([keycdn GDPR-Stellungnahme](https://www.keycdn.com/gdpr)) ausgeliefert. diff --git a/publisher/reference/shortcodes.mdx b/publisher/reference/shortcodes.mdx index b95253ca..5b4b77db 100644 --- a/publisher/reference/shortcodes.mdx +++ b/publisher/reference/shortcodes.mdx @@ -60,12 +60,10 @@ If you set the buttonid to "example123", your element must have the class "podlo - **groups:** One of "yes", "no". Display group title. Default: "no" - **groupby:** Set to "group" to get separated contributor groups. Each group has its name as heading. Only works with "table" preset. - **donations** One of "yes", "no". Display donation column. Default: "yes" -- **flattr:** "yes" or "no". Display Flattr column. Default: "no" ##### Examples ``` -[podlove-episode-contributor-list flattr="yes"] // enables flattr column [podlove-episode-contributor-list avatars="no" role="guest"] // show only guests, but without avatar ``` @@ -87,14 +85,3 @@ All custom shortcode parameters will be accessible in the template. Example: `[p **title:** _(required)_ Title of template to render. **autop:** _(optional)_ Wraps blocks of text in p tags. 'yes' or 'no'. Default: 'yes' - -#### Flattr - -Requires "Flattr" module. - -- `[podlove-podcast-flattr-button]` shows Flattr button for the podcast. -- `[podlove-episode-flattr-button]` shows Flattr button for the current episode. - -##### Parameters - -- **style:** Button style."large", "compact" or "static". Default: "compact". diff --git a/publisher/reference/templates/template-tags/contributor.mdx b/publisher/reference/templates/template-tags/contributor.mdx index 67b30f5c..f8d76bad 100644 --- a/publisher/reference/templates/template-tags/contributor.mdx +++ b/publisher/reference/templates/template-tags/contributor.mdx @@ -95,7 +95,7 @@ List of service profiles #### Parameters: * __category__: (optional) `social`, `donation` or `all`. Default: `all` -* __type__: (optional) Filter services by type. List of all service types: 500px, about.me, amazon wishlist, app.net, auphonic credits, bandcamp, bitbucket, bitcoin, deviantart, diaspora, dogecoin, dribbble, email, facebook, flattr, flickr, foursquare, generic wishlist, github, gittip, google+, instagram, jabber, last.fm, linkedin, litecoin, openstreetmap, orcid, patreon, paypal, miiverse, pinboard, pinterest, playstation network, researchgate, scous, skype, soundcloud, soup, steam, steam wishlist, thomann wishlist, tumblr, twitch, twitter, vimeo, website, xbox live, xing, youtube +* __type__: (optional) Filter services by type. List of all service types: 500px, about.me, amazon wishlist, app.net, auphonic credits, bandcamp, bitbucket, bitcoin, deviantart, diaspora, dogecoin, dribbble, email, facebook, flickr, foursquare, generic wishlist, github, gittip, google+, instagram, jabber, last.fm, linkedin, litecoin, openstreetmap, orcid, patreon, paypal, miiverse, pinboard, pinterest, playstation network, researchgate, scous, skype, soundcloud, soup, steam, steam wishlist, thomann wishlist, tumblr, twitch, twitter, vimeo, website, xbox live, xing, youtube #### Example: @@ -107,14 +107,6 @@ List of service profiles {% endfor %} ``` -## Flattr -### Username -> contributor.flattr - -### URL -> contributor.flattr_url -When on a WordPress page, it returns the URL for the person. Otherwise a URL for that person in this specific episode is generated. - ## Affiliation ### Organisation diff --git a/publisher/reference/templates/template-tags/flattr.mdx b/publisher/reference/templates/template-tags/flattr.mdx deleted file mode 100644 index 091afac0..00000000 --- a/publisher/reference/templates/template-tags/flattr.mdx +++ /dev/null @@ -1,38 +0,0 @@ ---- -title: Flattr ---- - -:::info - -Requires “Flattr” module. - -::: - -### Button -> flattr.button - -#### Parameters - -* __url__: URL of thing to flattr. Defaults to WordPress permalink. -* __style__: Button style. `large`, `compact` or `static`. Default: “compact`. -* __user__: Flattr user id. Defaults to Flattr account in podcast settings. - -#### Examples - -Simple button with defaults - -```twig -{{ flattr.button }} -``` - -Large button - -```twig -{{ flattr.button({ style: 'large' }) }} -``` - -Button for the Podlove Publisher plugin - -```twig -{{ flattr.button({ user: 'ericteubert', url: 'http://wordpress.org/extend/plugins/podlove-podcasting-plugin-for-wordpress/' }) }} -``` diff --git a/publisher/reference/templates/template-tags/podcast.mdx b/publisher/reference/templates/template-tags/podcast.mdx index 7a515711..85d8b5c4 100644 --- a/publisher/reference/templates/template-tags/podcast.mdx +++ b/publisher/reference/templates/template-tags/podcast.mdx @@ -221,7 +221,7 @@ List of service profiles #### Parameters * __category__: (optional) `social`, `donation` or `all`. Default: `all` -* __type__: (optional) Filter services by type. List of all service types: 500px, amazon wishlist, app.net, bandcamp, bitbucket, bitcoin, deviantart, diaspora, dogecoin, dribbble, facebook, flattr, flickr, generic wishlist, github, google+, instagram, jabber, last.fm, linkedin, litecoin, openstreetmap, paypal, miiverse, pinboard, pinterest, playstation network, skype, soundcloud, soup, steam, steam wishlist, thomann wishlist, twitch, tumblr, twitter, website, xbox live, xing, youtube +* __type__: (optional) Filter services by type. List of all service types: 500px, amazon wishlist, app.net, bandcamp, bitbucket, bitcoin, deviantart, diaspora, dogecoin, dribbble, facebook, flickr, generic wishlist, github, google+, instagram, jabber, last.fm, linkedin, litecoin, openstreetmap, paypal, miiverse, pinboard, pinterest, playstation network, skype, soundcloud, soup, steam, steam wishlist, thomann wishlist, twitch, tumblr, twitter, website, xbox live, xing, youtube #### Example diff --git a/publisher/reference/templates/templates.mdx b/publisher/reference/templates/templates.mdx index b27276ed..260a73d0 100644 --- a/publisher/reference/templates/templates.mdx +++ b/publisher/reference/templates/templates.mdx @@ -315,10 +315,6 @@ These templates come with the "Contributors" module. -{% if option.flattr == "yes" %} - {% include '@contributors/_contributor-table-flattr.twig' %} -{% endif %} - {% include '@contributors/_contributor-table-css.twig' %} ``` @@ -371,7 +367,6 @@ These templates come with the "Contributors" module. {% if groups == "yes" %}{% set colspan = colspan + 1 %}{% endif %} {% if roles == "yes" %}{% set colspan = colspan + 1 %}{% endif %} {% if donations == "yes" %}{% set colspan = colspan + 1 %}{% endif %} -{% if flattr == "yes" %}{% set colspan = colspan + 1 %}{% endif %} {% if option.title %} @@ -409,10 +404,6 @@ These templates come with the "Contributors" module.
-{% if option.flattr == "yes" %} - {% include '@contributors/_contributor-table-flattr.twig' %} -{% endif %} - {% include '@contributors/_contributor-table-css.twig' %} ``` diff --git a/publisher/sidebar.js b/publisher/sidebar.js index 8f97a4e2..b13238b9 100644 --- a/publisher/sidebar.js +++ b/publisher/sidebar.js @@ -51,7 +51,6 @@ module.exports = [ "reference/templates/template-tags/show", "reference/templates/template-tags/shownotes", "reference/templates/template-tags/license", - "reference/templates/template-tags/flattr", "reference/templates/template-tags/date-time", "reference/templates/template-tags/line", "reference/templates/template-tags/group",