🚚 move share buttons to froide

okfde · Apr 15, 2024 · 2558c45 · 2558c45
1 parent 04783a0
commit 2558c45
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 221 deletions.
diff --git a/fragdenstaat_de/fds_cms/cms_plugins.py b/fragdenstaat_de/fds_cms/cms_plugins.py
@@ -386,20 +386,27 @@ class ShareLinksPlugin(CMSPluginBase):
     model = ShareLinksCMSPlugin
     module = _("Elements")
     name = _("Share Links")
-    render_template = "fds_cms/share_buttons.html"
+    render_template = "snippets/share_buttons.html"
     text_enabled = True
     cache = True
 
     def render(self, context, instance, placeholder):
         context = super().render(context, instance, placeholder)
-        url = ""
-        if "request" in context:
-            req = context["request"]
-            url = req.build_absolute_uri()
-        context["object"] = instance
-        context["url"] = instance.url or url
+
+        context["id"] = instance.pk
+        context["url"] = instance.url
         context["text"] = instance.title
         context["image"] = instance.image
+        context["twitter"] = instance.twitter
+        context["mastodon"] = instance.mastodon
+        context["facebook"] = instance.facebook
+        context["email"] = instance.email
+        context["clipboard"] = instance.clipboard
+        context["native_share"] = instance.native_share
+        context["native_text"] = instance.native_text
+        context["icons_only"] = instance.icons_only
+        context["links"] = instance.native_links
+
         return context
 
 

diff --git a/fragdenstaat_de/fds_cms/models.py b/fragdenstaat_de/fds_cms/models.py
@@ -365,7 +365,6 @@ class ShareLinksCMSPlugin(CMSPlugin):
     native_links = models.BooleanField(
         _("Link instead of button"),
         default=False,
-        help_text=_("Only applies to the native share button."),
     )
 
     def __str__(self):

diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html b/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html
diff --git a/frontend/javascript/main.ts b/frontend/javascript/main.ts
@@ -5,6 +5,7 @@ import 'froide/frontend/javascript/snippets/copy-text'
 import 'froide/frontend/javascript/snippets/form-ajax'
 import 'froide/frontend/javascript/snippets/misc'
 import 'froide/frontend/javascript/snippets/search'
+import 'froide/frontend/javascript/snippets/share-links'
 import 'froide/frontend/javascript/snippets/inline-edit-forms'
 import 'froide/frontend/javascript/snippets/color-mode'
 
@@ -17,7 +18,7 @@ import './smooth-scroll'
 import './top-banner'
 
 if (document.body.dataset.sentry !== undefined) {
-  void import(/* webpackChunkName: "sentry" */ './sentry').then((mod) => {
+  void import('./sentry').then((mod) => {
     if (document.body.dataset.sentry !== undefined) {
       mod.init(document.body.dataset.sentry)
     }

diff --git a/frontend/javascript/misc.ts b/frontend/javascript/misc.ts
@@ -4,7 +4,6 @@ import './misc/matomo'
 import './misc/reference-forms'
 import './misc/reveal-more'
 import './misc/secpol-violation'
-import './misc/share-links'
 import './misc/shuffle-items'
 import './misc/userfill-forms'
 import './misc/video-modals'
diff --git a/frontend/javascript/misc/share-links.ts b/frontend/javascript/misc/share-links.ts
diff --git a/frontend/styles/main.scss b/frontend/styles/main.scss
@@ -120,6 +120,7 @@ $fa-font-path: 'font-awesome/fonts';
 @import 'froide/frontend/styles/components/redacted';
 @import 'froide/frontend/styles/components/request-status';
 @import 'froide/frontend/styles/components/type';
+@import 'froide/frontend/styles/components/share-buttons';
 @import 'froide/frontend/styles/components/print';
 
 @import 'type';
@@ -132,7 +133,6 @@ $fa-font-path: 'font-awesome/fonts';
 @import 'cms_utils';
 @import 'cards';
 @import 'campaigns';
-@import 'share_buttons';
 @import 'donations';
 @import 'collapsible';
 @import 'glider';

diff --git a/frontend/styles/share_buttons.scss b/frontend/styles/share_buttons.scss