From 2a7971ab7994edf68966dcb34641078e5cad5b1e Mon Sep 17 00:00:00 2001 From: Ben Ubois Date: Wed, 7 Feb 2018 11:01:54 -0800 Subject: [PATCH] Link fixes and raw_url support. --- app/models/sharing_service.rb | 3 ++- app/views/actions/index.html.erb | 2 +- app/views/marketing_mailer/onboarding_1_welcome.html.erb | 2 +- app/views/marketing_mailer/onboarding_2_mobile.html.erb | 2 +- app/views/shared/_settings_nav.html.erb | 2 +- app/views/sharing_services/_form.html.erb | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/models/sharing_service.rb b/app/models/sharing_service.rb index 16e1d8c06b..9958bcf026 100644 --- a/app/models/sharing_service.rb +++ b/app/models/sharing_service.rb @@ -4,10 +4,11 @@ class SharingService < ApplicationRecord def link_options(entry) entry_url = entry.fully_qualified_url ? ERB::Util.url_encode(entry.fully_qualified_url) : '' + raw_url = entry.fully_qualified_url ? entry.fully_qualified_url : '' title = entry.title ? ERB::Util.url_encode(entry.title) : '' feed_name = entry.feed.title ? ERB::Util.url_encode(entry.feed.title) : '' share_url = self.url.clone - share_url = share_url.gsub('${url}', entry_url).gsub('${title}', title).gsub('${source}', feed_name).gsub('${id}', entry.id.to_s) + share_url = share_url.gsub('${url}', entry_url).gsub('${title}', title).gsub('${source}', feed_name).gsub('${id}', entry.id.to_s).gsub('${raw_url}', raw_url) if share_url.start_with?('http') target = '_blank' else diff --git a/app/views/actions/index.html.erb b/app/views/actions/index.html.erb index 06b2019e92..e1fc43d2a0 100644 --- a/app/views/actions/index.html.erb +++ b/app/views/actions/index.html.erb @@ -2,7 +2,7 @@

Actions

-

Actions can be performed on articles when they are published. Start by writing the keywords to match, just like you would when searching for something. Then select the feeds to include. Finally check the actions you would like to perform on the matched incoming articles.

+

Actions can be performed on articles when they are published. Start by writing the keywords to match, just like you would when searching for something. Then select the feeds to include. Finally check the actions you would like to perform on the matched incoming articles.

diff --git a/app/views/marketing_mailer/onboarding_1_welcome.html.erb b/app/views/marketing_mailer/onboarding_1_welcome.html.erb index 50e3899793..b78e843209 100644 --- a/app/views/marketing_mailer/onboarding_1_welcome.html.erb +++ b/app/views/marketing_mailer/onboarding_1_welcome.html.erb @@ -9,6 +9,6 @@
  • Beautiful Pixels - Design

    • I’ve been building Feedbin for four years now, and I hope you enjoy it as much as I do.

    -

    You can check out the Feedbin help site if you have any questions, or reply to this email. Enjoy!

    +

    You can check out the Feedbin help site if you have any questions, or reply to this email. Enjoy!

    Ben

    Unsubscribe

    \ No newline at end of file diff --git a/app/views/marketing_mailer/onboarding_2_mobile.html.erb b/app/views/marketing_mailer/onboarding_2_mobile.html.erb index 46af35835a..ddcebbda23 100644 --- a/app/views/marketing_mailer/onboarding_2_mobile.html.erb +++ b/app/views/marketing_mailer/onboarding_2_mobile.html.erb @@ -1,5 +1,5 @@

    Feedbin keeps you informed with all the latest posts from your favorite websites. Want to read your feed on the go? I’ve got you covered.

    Feedbin works with all the best native news readers for your iPhone, iPad, Android, Mac, or Windows devices. Connect one of these great apps to your Feedbin account today to enjoy your reading on the go.

    -

    As always, you can check out the Feedbin help site if you have any questions, or reply to this email. Cheers!

    +

    As always, you can check out the Feedbin help site if you have any questions, or reply to this email. Cheers!

    Ben

    Unsubscribe

    \ No newline at end of file diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb index 0857c9e77e..95cfbff64f 100644 --- a/app/views/shared/_settings_nav.html.erb +++ b/app/views/shared/_settings_nav.html.erb @@ -20,7 +20,7 @@
  • Home
  • Blog
  • Apps
    • -
  • Help
    • +
  • Help
  • API
  • Privacy Policy
  • Email
    • diff --git a/app/views/sharing_services/_form.html.erb b/app/views/sharing_services/_form.html.erb index 5897b3ad4a..8a3866a578 100644 --- a/app/views/sharing_services/_form.html.erb +++ b/app/views/sharing_services/_form.html.erb @@ -13,7 +13,7 @@ -

    Create your own sharing service. How does this work?

    +

    Create your own sharing service. How does this work?

    <%= f.submit "Add Service", class: 'button no-margin' %>