maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include Mastodon as social media option with rel=me attribute for verificatiion (#19015)

Browse source 
* Include Mastodon as social media option w/ rel=me attribute

* Extract social media from overloaded partial - admin config
This commit is contained in:
Fernando Valverde 2023-02-01 09:51:51 -06:00 • committed by GitHub
parent 9f04c5501e
commit de6a5a0f07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/settings/general.rb
View file

@ -92,7 +92,8 @@ module Settings
facebook: nil,
github: nil,
instagram: nil,
twitch: nil
twitch: nil,
mastodon: nil
}
setting :twitter_hashtag, type: :string

35
app/views/admin/settings/forms/_rate_limit.html.erb
View file

@ -42,38 +42,3 @@
</div>
</details>
<% end %>
<%= form_for(Settings::General.new,
url: admin_settings_general_settings_path,
html: { data: { action: "submit->config#updateConfigurationSettings" } }) do |f| %>
<details class="crayons-card">
<summary class="crayons-subtitle-2 p-6">Social Media</summary>
<div class="p-6 pt-0">
<fieldset class="grid gap-4">
<div class="crayons-field">
<%= admin_config_label :twitter_hashtag %>
<%= admin_config_description Constants::Settings::General.details[:twitter_hashtag][:description] %>
<%= f.text_field :twitter_hashtag,
class: "crayons-textfield",
value: Settings::General.twitter_hashtag.to_s,
placeholder: Constants::Settings::General.details[:twitter_hashtag][:placeholder] %>
</div>
<%= f.fields_for :social_media_handles do |social_media_field| %>
<% Settings::General.social_media_handles.each do |platform, username| %>
<div class="crayons-field">
<%= admin_config_label platform %>
<p class="crayons-field__description">
<%= platform.capitalize %> username
</p>
<%= social_media_field.text_field platform,
class: "crayons-textfield",
value: Settings::General.social_media_handles[platform],
placeholder: "" %>
</div>
<% end %>
<% end %>
</fieldset>
<%= render "update_setting_button", f: f %>
</div>
</details>
<% end %>

34
app/views/admin/settings/forms/_social_media.html.erb Normal file
View file

@ -0,0 +1,34 @@
<%= form_for(Settings::General.new,
url: admin_settings_general_settings_path,
html: { data: { action: "submit->config#updateConfigurationSettings" } }) do |f| %>
<details class="crayons-card">
<summary class="crayons-subtitle-2 p-6">Social Media</summary>
<div class="p-6 pt-0">
<fieldset class="grid gap-4">
<div class="crayons-field">
<%= admin_config_label :twitter_hashtag %>
<%= admin_config_description Constants::Settings::General.details[:twitter_hashtag][:description] %>
<%= f.text_field :twitter_hashtag,
class: "crayons-textfield",
value: Settings::General.twitter_hashtag.to_s,
placeholder: Constants::Settings::General.details[:twitter_hashtag][:placeholder] %>
</div>
<%= f.fields_for :social_media_handles do |social_media_field| %>
<% Settings::General.social_media_handles.each do |platform, username| %>
<div class="crayons-field">
<%= admin_config_label platform %>
<p class="crayons-field__description">
<%= platform == "mastodon" ? "Mastodon complete URL including \"https://\"" : "#{platform.capitalize} username" %>
</p>
<%= social_media_field.text_field platform,
class: "crayons-textfield",
value: Settings::General.social_media_handles[platform],
placeholder: platform == "mastodon" ? "https://fosstodon.org/@thepracticaldev" : "" %>
</div>
<% end %>
<% end %>
</fieldset>
<%= render "update_setting_button", f: f %>
</div>
</details>
<% end %>

1
app/views/admin/settings/show.html.erb
View file

@ -23,6 +23,7 @@
<%= render partial: "forms/newsletter" %>
<%= render partial: "forms/onboarding" %>
<%= render partial: "forms/rate_limit" %>
<%= render partial: "forms/social_media" %>
<%= render partial: "forms/tags" %>
<%= render partial: "forms/user_experience" %>
</div>

9
app/views/layouts/_social_media.html.erb
View file

@ -1,10 +1,13 @@
<% compact_margin = Settings::General.social_media_handles.values.compact_blank.count > 5 %>
<% Settings::General.social_media_handles.each do |social_media_type, handle| %>
<% next if handle.blank? %>
<%# There isn't a single Mastodon site to build the target URL so the setting should contain the complete URL %>
<% target_url = social_media_type == "mastodon" ? handle : "https://#{social_media_type}.com/#{handle}" %>
<a
href="<%= "https://#{social_media_type}.com/#{handle}" %>"
href="<%= target_url %>"
target="_blank"
class="c-link c-link--icon-alone c-link--block mx-1"
rel="noopener">
class="c-link c-link--icon-alone c-link--block <%= compact_margin ? "" : "mx-1" %>"
rel="noopener me">
<%= crayons_icon_tag(social_media_type, class: "c-link__icon", title: social_media_type.capitalize) %>
</a>
<% end %>