From 5aeeaa6bd02db6cc174ec53b6fbc967f64d8f99e Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 25 Mar 2024 09:01:38 +0000 Subject: [PATCH 1/3] Changed "Tweet it" button to X I have changed: -Colour to match new X branding. -"Tweet it" to "Share it" so we stop using Twitter altogether. --- app/assets/images/next-step-twitter.png | Bin 928 -> 662 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/assets/images/next-step-twitter.png b/app/assets/images/next-step-twitter.png index 661e5f936a65a0269a0ca28e9658b9b7992669d1..aab0ac1e1dd0f91dc86304d5d5f218ca7a95735b 100644 GIT binary patch delta 638 zcmV-^0)hRY2bKkpBYyx(P)t-s00030|NkH$Ab@~?-{0R55D>q=zd%4haBy%iFfd?X zVDInm&(F`FpPx`rP@tfokdTl7000000FRH4udlCve}4b~000000001GI(QBM000?u zQchF<|NsC0|NsC0|NsC0|NsC0?;!vG{{XMQfBBD;0005uNq(=vC`FG08u9P+x4^f7 zwX(t_wQvbxbY6l_09Ovo?(?9oLL`Wb0Nt>TZg1%Cv}%p4(ingBhJmW&FCkf!U}+?= z3~G7~Rs?Vw)8G^ly@XKuajlw;;fss92B>@wreJz1C4W*c)V-&w>g_EHc|L5jnr)>$ z#TG6u*9vZ9a}}_46%ejgoEbQ4Z2(U0J1{EAd+NhR#G1m+V6Re>xy~MpkPPc0tV;7_I0|_89|&# zd+PPbba!A}zD0^XR~$Q^(+sxIS?`9j8H{kHW?!jWDqWdrPpQ|0vx%T2O@_WOLx8Nn zSV`$g?&or<^7V0E$Owz`?@zhu$u@j6Z#ipEojP@d4ts4o=tcE$+!uj+yZ<+V%d@@z Y09?ZjD0aP3ZU6uP07*qoM6N<$f)@@kX8-^I delta 907 zcmV;619beB1)v9zBYy!kP)t-sP^HMqJ`Bbd&R<82&`Tl*t^!@(-+wS~+!1Q^(^kTE~((3%r z==*E8^0nOg+U@*ty7R5p`R4QeU9s|z$@YK2^#1<;_WS;b#r4SL`-_rt|GVD#R;}@j$M(bG`snoi{Qm#)`2Ni2 z`=8MGVYBmEukuu_@m#R-SFZBL0QQ#v000SeQchDPt?>XS@AD|~4ARXM0006JNklV)a-v1HiM1SEgG)nOgndB3uL^_d7al%r` zIGdT`2AIkulH3r8OH8=jEe@J}|)9k?-n`1nblzdVuf)oXNe`%!anVe!Ny z!b>=H&P}bsDP1YE%{2KOlW)cf-vsVF`oY*9H0<5SHZ(;XN|_>^2xQTyQDGheuzcib zj>q7v%zv?ij=_u11cx%vbVNL%VMc~epFvIOYz0o0y%6;)8P%LwJ+hUu&W26SCOxUTsF* z;+L=1(eV1s(j-5R-@beQ;Un Date: Tue, 26 Mar 2024 10:53:42 +0000 Subject: [PATCH 2/3] Update social call to actions Replace Twitter with X and related wording. --- app/views/general/blog.html.erb | 4 ++-- app/views/info_request_batch/_batch_sent.html.erb | 4 ++-- app/views/request/_act.html.erb | 4 ++-- app/views/request/_request_sent.html.erb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/general/blog.html.erb b/app/views/general/blog.html.erb index 00ecaeb6c9..4862dd9d07 100644 --- a/app/views/general/blog.html.erb +++ b/app/views/general/blog.html.erb @@ -1,4 +1,4 @@ -<% @title = _("{{site_name}} blog and tweets", :site_name => site_name) %> +<% @title = _("{{site_name}} blog", :site_name => site_name) %>

<%=@title %>

@@ -58,7 +58,7 @@ <% if !@twitter_user.empty? %>
- <%= _("Follow us on twitter") %> + <%= _("Follow us on X") %>
<% end %> diff --git a/app/views/info_request_batch/_batch_sent.html.erb b/app/views/info_request_batch/_batch_sent.html.erb index 76e6d8619c..41305b8aa3 100644 --- a/app/views/info_request_batch/_batch_sent.html.erb +++ b/app/views/info_request_batch/_batch_sent.html.erb @@ -17,10 +17,10 @@

<%= _("Share your batch request") %>

<%= link_to image_tag("next-step-twitter.png", - :alt => _("Tweet it"), + :alt => _("Share on X"), :width => "120", :height => "37"), - "https://twitter.com/intent/tweet?" << { + "https://twitter.com/intent/post?" << { :url => request.url, :via => AlaveteliConfiguration.twitter_username, :text => "'#{ @info_request_batch.title }'", diff --git a/app/views/request/_act.html.erb b/app/views/request/_act.html.erb index 844306e5f1..020eaa4402 100644 --- a/app/views/request/_act.html.erb +++ b/app/views/request/_act.html.erb @@ -2,7 +2,7 @@
- <% tweet_link = "https://twitter.com/share?" << { + <% tweet_link = "https://twitter.com/intent/post?" << { :url => request.url, :via => AlaveteliConfiguration.twitter_username, :text => "'#{ info_request.title }'", @@ -10,7 +10,7 @@ }.to_query %> - <%= link_to _("Tweet this request"), + <%= link_to _("Share on X"), tweet_link, :onclick => track_analytics_event( AnalyticsEvent::Category::OUTBOUND, diff --git a/app/views/request/_request_sent.html.erb b/app/views/request/_request_sent.html.erb index 6d6e517e6e..6359610f43 100644 --- a/app/views/request/_request_sent.html.erb +++ b/app/views/request/_request_sent.html.erb @@ -17,10 +17,10 @@

<%= _("Share your request") %>

<%= link_to image_tag("next-step-twitter.png", - :alt => _("Tweet it"), + :alt => _("Share on X"), :width => "120", :height => "37"), - "https://twitter.com/intent/tweet?" << { + "https://twitter.com/intent/post?" << { :url => request.url, :via => AlaveteliConfiguration.twitter_username, :text => "'#{ @info_request.title }'", From 42d7e23774fced47c317392672fa477581974028 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 26 Mar 2024 10:56:07 +0000 Subject: [PATCH 3/3] Update changelog --- doc/CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 5fa927762d..08a3de1cfa 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -2,6 +2,7 @@ ## Highlighted Features +* Update Twitter/X logos and wording (Lucas Cumsille Montesinos) * Fix missing headers when exporting Project data (Gareth Rees) * Reduce amount of storage related background jobs (Graeme Porteous) * Add automatic parsing of emails contain Excel spreadsheets (Graeme Porteous)