From d781d8daea087898b36e0961e4966cbf1c6a8ce6 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Wed, 26 Apr 2017 07:55:46 +0200 Subject: Replacing Base URL's if they have been entered into the profile --- app/views/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 03e5dd97405..075f78bca23 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -56,11 +56,11 @@ = icon('skype') - unless @user.linkedin.blank? .profile-link-holder.middle-dot-divider - = link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do + = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,"")}", title: "LinkedIn" do = icon('linkedin-square') - unless @user.twitter.blank? .profile-link-holder.middle-dot-divider - = link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do + = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,"")}", title: "Twitter" do = icon('twitter-square') - unless @user.website_url.blank? .profile-link-holder.middle-dot-divider -- cgit v1.2.1 From b7e41e9d792dab509a2e7c4b1b97a87860ba42ac Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Wed, 26 Apr 2017 08:17:38 +0200 Subject: Doing the commit again with the correct E-Mail address setup --- app/views/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 075f78bca23..8f67c1d8f5f 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -56,11 +56,11 @@ = icon('skype') - unless @user.linkedin.blank? .profile-link-holder.middle-dot-divider - = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,"")}", title: "LinkedIn" do + = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,'')}", title: "LinkedIn" do = icon('linkedin-square') - unless @user.twitter.blank? .profile-link-holder.middle-dot-divider - = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,"")}", title: "Twitter" do + = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,'')}", title: "Twitter" do = icon('twitter-square') - unless @user.website_url.blank? .profile-link-holder.middle-dot-divider -- cgit v1.2.1 From 7e7a896d9c6509fabd1fea09a835b5d7a86dcf9a Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Wed, 26 Apr 2017 07:55:46 +0200 Subject: Replacing Base URL's if they have been entered into the profile --- app/views/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 03e5dd97405..075f78bca23 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -56,11 +56,11 @@ = icon('skype') - unless @user.linkedin.blank? .profile-link-holder.middle-dot-divider - = link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do + = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,"")}", title: "LinkedIn" do = icon('linkedin-square') - unless @user.twitter.blank? .profile-link-holder.middle-dot-divider - = link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do + = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,"")}", title: "Twitter" do = icon('twitter-square') - unless @user.website_url.blank? .profile-link-holder.middle-dot-divider -- cgit v1.2.1 From 20129fd65f397d8376321960764380da0a3e0823 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Wed, 26 Apr 2017 08:17:38 +0200 Subject: Doing the commit again with the correct E-Mail address setup --- app/views/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 075f78bca23..8f67c1d8f5f 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -56,11 +56,11 @@ = icon('skype') - unless @user.linkedin.blank? .profile-link-holder.middle-dot-divider - = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,"")}", title: "LinkedIn" do + = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,'')}", title: "LinkedIn" do = icon('linkedin-square') - unless @user.twitter.blank? .profile-link-holder.middle-dot-divider - = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,"")}", title: "Twitter" do + = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,'')}", title: "Twitter" do = icon('twitter-square') - unless @user.website_url.blank? .profile-link-holder.middle-dot-divider -- cgit v1.2.1 From d6697e0b4d5d9c1437b57b2307464c93d3c66c66 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 8 May 2017 15:23:22 +0200 Subject: Created Application Helpers based on suggestion for easier parsing --- app/helpers/application_helper.rb | 19 +++++++++++++++++++ app/views/users/show.html.haml | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6d6bcbaf88a..03bc773fa2a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -278,4 +278,23 @@ module ApplicationHelper def show_user_callout? cookies[:user_callout_dismissed] == 'true' end + + def linkedin_url(user) + name = user.linkedin + if name =~ %r{\Ahttps?:\/\/(www\.)?linkedin\.com\/in\/(.*)\z} + name + else + "https://www.linkedin.com/in/#{name}" + end + end + + def twitter_url(user) + name = user.twitter + if name =~ %r{\Ahttps?:\/\/(www\.)?twitter\.com\/(.*)\z} + name + else + "https://www.twitter.com/#{name}" + end + end + end diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 8f67c1d8f5f..8e8b84e0408 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -56,11 +56,11 @@ = icon('skype') - unless @user.linkedin.blank? .profile-link-holder.middle-dot-divider - = link_to "https://www.linkedin.com/in/#{@user.linkedin.gsub(/https:\/\/www.linkedin.com\/in\//i,'')}", title: "LinkedIn" do + = link_to linkedin_url(@user), title: "LinkedIn" do = icon('linkedin-square') - unless @user.twitter.blank? .profile-link-holder.middle-dot-divider - = link_to "https://twitter.com/#{@user.twitter.gsub(/https:\/\/twitter.com\//i,'')}", title: "Twitter" do + = link_to twitter_url(@user), title: "Twitter" do = icon('twitter-square') - unless @user.website_url.blank? .profile-link-holder.middle-dot-divider -- cgit v1.2.1 From 1491ed656e528d475326a53aa4d69f6577aba6b6 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 8 May 2017 16:45:59 +0200 Subject: Fixing Static Analysis Fail with Indentation --- app/helpers/application_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 03bc773fa2a..ce9413172a5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -288,7 +288,7 @@ module ApplicationHelper end end - def twitter_url(user) + def twitter_url(user) name = user.twitter if name =~ %r{\Ahttps?:\/\/(www\.)?twitter\.com\/(.*)\z} name @@ -296,5 +296,4 @@ module ApplicationHelper "https://www.twitter.com/#{name}" end end - end -- cgit v1.2.1 From 835d4487fb7a67ff0f0254ee4120bcdf12be5a07 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Thu, 11 May 2017 09:10:29 +0200 Subject: Fixed Regex(es) --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ce9413172a5..1bca588fdc9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -281,7 +281,7 @@ module ApplicationHelper def linkedin_url(user) name = user.linkedin - if name =~ %r{\Ahttps?:\/\/(www\.)?linkedin\.com\/in\/(.*)\z} + if name =~ %r{\Ahttps?:\/\/(www\.)?linkedin\.com\/in\/} name else "https://www.linkedin.com/in/#{name}" @@ -290,7 +290,7 @@ module ApplicationHelper def twitter_url(user) name = user.twitter - if name =~ %r{\Ahttps?:\/\/(www\.)?twitter\.com\/(.*)\z} + if name =~ %r{\Ahttps?:\/\/(www\.)?twitter\.com\/} name else "https://www.twitter.com/#{name}" -- cgit v1.2.1