Skip to content

Commit

Permalink
Link fixes and raw_url support.
Browse files Browse the repository at this point in the history
  • Loading branch information
benubois committed Feb 7, 2018
1 parent b748290 commit 2a7971a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion app/models/sharing_service.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/actions/index.html.erb
Expand Up @@ -2,7 +2,7 @@
<div class="settings-outer">
<h2>Actions</h2>

<p class="muted">Actions can be performed on articles when they are published. Start by writing the keywords to match, just like you would when <a href="http://help.feedbin.com/search-syntax/">searching</a> for something. Then select the feeds to include. Finally check the actions you would like to perform on the matched incoming articles.</p>
<p class="muted">Actions can be performed on articles when they are published. Start by writing the keywords to match, just like you would when <a href="https://feedbin.com/help/search-syntax/">searching</a> for something. Then select the feeds to include. Finally check the actions you would like to perform on the matched incoming articles.</p>
</div>

<div class="push-options hide" id="push-data" data-website-id="<%= ENV['APPLE_PUSH_WEBSITE_ID'] %>" data-authentication-token="<%= @authentication_token %>" data-web-service-url="<%= @web_service_url %>">
Expand Down
2 changes: 1 addition & 1 deletion app/views/marketing_mailer/onboarding_1_welcome.html.erb
Expand Up @@ -9,6 +9,6 @@
<li><a href="<%= subscribe_url(subscribe: 'https://feedpress.me/beautifulpixels') %>"> Beautiful Pixels</a> - Design</li>
</ul>
<p>I’ve been building Feedbin for four years now, and I hope you enjoy it as much as I do.</p>
<p>You can check out the <a href="http://help.feedbin.com">Feedbin help site</a> if you have any questions, or reply to this email. Enjoy!</p>
<p>You can check out the <a href="https://feedbin.com/help">Feedbin help site</a> if you have any questions, or reply to this email. Enjoy!</p>
<p class="border">Ben</p>
<p><small><a href="<%= unsubscribe_link(@user) %>">Unsubscribe</a></small></p>
2 changes: 1 addition & 1 deletion app/views/marketing_mailer/onboarding_2_mobile.html.erb
@@ -1,5 +1,5 @@
<p>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.</p>
<p>Feedbin works with all the best native news readers for your iPhone, iPad, Android, Mac, or Windows devices. <a href="https://feedbin.com/apps">Connect one of these great apps</a> to your Feedbin account today to enjoy your reading on the go.</p>
<p>As always, you can check out the <a href="http://help.feedbin.com">Feedbin help site</a> if you have any questions, or reply to this email. Cheers!</p>
<p>As always, you can check out the <a href="https://feedbin.com/help">Feedbin help site</a> if you have any questions, or reply to this email. Cheers!</p>
<p class="border">Ben</p>
<p><small><a href="<%= unsubscribe_link(@user) %>">Unsubscribe</a></small></p>
2 changes: 1 addition & 1 deletion app/views/shared/_settings_nav.html.erb
Expand Up @@ -20,7 +20,7 @@
<li><a href="/home">Home</a></li>
<li><a href="http://blog.feedbin.com">Blog</a></li>
<li><a href="/apps">Apps</a></li>
<li><a href="http://help.feedbin.com">Help</a></li>
<li><a href="https://feedbin.com/help">Help</a></li>
<li><a href="https://github.com/feedbin/feedbin-api#readme">API</a></li>
<li><a href="/privacy-policy">Privacy Policy</a></li>
<li><a href="mailto:support@feedbin.com">Email</a></li>
Expand Down
2 changes: 1 addition & 1 deletion app/views/sharing_services/_form.html.erb
Expand Up @@ -13,7 +13,7 @@
</li>
</ul>

<p class="control-group-description">Create your own sharing service. <a href="http://help.feedbin.com/sharing-read-it-later-services/">How does this work</a>?</p>
<p class="control-group-description">Create your own sharing service. <a href="https://feedbin.com/help/sharing-read-it-later-services/">How does this work</a>?</p>

<div class="description-inset">
<%= f.submit "Add Service", class: 'button no-margin' %>
Expand Down

0 comments on commit 2a7971a

Please sign in to comment.