From 7f580299b40afc958b8e616e85cc21a8fd58c877 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Fri, 22 May 2015 13:17:18 -0400 Subject: [PATCH 1/6] Remove unused partials --- app/views/layouts/static.html.erb | 1 - app/views/shared/_google_fonts.html.erb | 8 -------- app/views/shared/_hn_button.html.erb | 7 ------- app/views/shared/_olark.html.erb | 18 ------------------ app/views/users/_inline.html.erb | 1 - app/views/users/_more_button.html.erb | 10 ---------- app/views/users/avatars/_default.html.erb | 8 -------- app/views/users/avatars/_sm.html.erb | 8 -------- app/views/users/{karma.html => karma.html.erb} | 0 9 files changed, 61 deletions(-) delete mode 100644 app/views/shared/_google_fonts.html.erb delete mode 100644 app/views/shared/_hn_button.html.erb delete mode 100644 app/views/shared/_olark.html.erb delete mode 100644 app/views/users/_inline.html.erb delete mode 100644 app/views/users/_more_button.html.erb delete mode 100644 app/views/users/avatars/_default.html.erb delete mode 100644 app/views/users/avatars/_sm.html.erb rename app/views/users/{karma.html => karma.html.erb} (100%) diff --git a/app/views/layouts/static.html.erb b/app/views/layouts/static.html.erb index a5d7eafb6..025d2355c 100644 --- a/app/views/layouts/static.html.erb +++ b/app/views/layouts/static.html.erb @@ -5,7 +5,6 @@ <%= yield(:title) %> - <%= render 'shared/google_fonts' %> <%= stylesheet_link_tag 'application' %> diff --git a/app/views/shared/_google_fonts.html.erb b/app/views/shared/_google_fonts.html.erb deleted file mode 100644 index 7aaf9b347..000000000 --- a/app/views/shared/_google_fonts.html.erb +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/app/views/shared/_hn_button.html.erb b/app/views/shared/_hn_button.html.erb deleted file mode 100644 index 244387723..000000000 --- a/app/views/shared/_hn_button.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/app/views/shared/_olark.html.erb b/app/views/shared/_olark.html.erb deleted file mode 100644 index f531508d7..000000000 --- a/app/views/shared/_olark.html.erb +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/app/views/users/_inline.html.erb b/app/views/users/_inline.html.erb deleted file mode 100644 index 3480cd28f..000000000 --- a/app/views/users/_inline.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= users.collect {|u| link_to("@#{u.username}", user_path(u))}.to_sentence.html_safe %> \ No newline at end of file diff --git a/app/views/users/_more_button.html.erb b/app/views/users/_more_button.html.erb deleted file mode 100644 index c237b967c..000000000 --- a/app/views/users/_more_button.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% unless @stream_events.last_page? %> -
-
-
-
- <%= link_to 'More', user_path(@user, page: @stream_events.next_page), remote: true, class: 'more-activities btn btn-default' %> -
-
-
-<% end %> diff --git a/app/views/users/avatars/_default.html.erb b/app/views/users/avatars/_default.html.erb deleted file mode 100644 index 047562f05..000000000 --- a/app/views/users/avatars/_default.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -
- - <%= user.username %> - - <% if user.sponsored? %> -
- <% end %> -
diff --git a/app/views/users/avatars/_sm.html.erb b/app/views/users/avatars/_sm.html.erb deleted file mode 100644 index b4cbe2113..000000000 --- a/app/views/users/avatars/_sm.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -
- - <%= user.username %> - - <% if user.sponsored? %> -
- <% end %> -
diff --git a/app/views/users/karma.html b/app/views/users/karma.html.erb similarity index 100% rename from app/views/users/karma.html rename to app/views/users/karma.html.erb From 5f7e0409d040fca726c8187ddca51d7caa58f736 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Fri, 22 May 2015 13:24:42 -0400 Subject: [PATCH 2/6] Open social links on profile in new tabs --- app/views/users/_card.html.erb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/views/users/_card.html.erb b/app/views/users/_card.html.erb index 771e3421c..8535f79c5 100644 --- a/app/views/users/_card.html.erb +++ b/app/views/users/_card.html.erb @@ -30,7 +30,7 @@ <% if user.twitter_connected? %> - + <%= inline_react_component 'Icon', icon: 'twitter' %> <%= user.twitter_nickname %> @@ -41,9 +41,9 @@ <% end %> - + <% if user.github_connected? %> - + <%= inline_react_component 'Icon', icon: 'github' %> <%= @user.github_login %> @@ -56,12 +56,9 @@ <% if current_user %> <% if current_user.is_staff? %> -
- Bitcoin Assets Address -
- > - <%= user.wallet_public_address %> - +
+ Bitcoin Assets Address: + <%= link_to user.wallet_public_address, user.coinprism_url %>
<% end %> <% end %> From ece157aed5bd4a8afb97a10c74ed48328d28ebd3 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Fri, 22 May 2015 13:34:21 -0400 Subject: [PATCH 3/6] Clean up edit profile button --- app/views/users/_card.html.erb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/views/users/_card.html.erb b/app/views/users/_card.html.erb index 8535f79c5..19894c23f 100644 --- a/app/views/users/_card.html.erb +++ b/app/views/users/_card.html.erb @@ -66,13 +66,7 @@
-<% if can?(:update, @user) %> - - - Edit Profile - -
-<% end %> +<%= link_to "Edit profile", edit_user_path, class: "btn btn-default btn-block mb2" if can?(:update, @user) %> <%= react_component 'ProfileProductBadges' %> From 3b5ef500703eca1689ef7693e1f398d4bc27ff40 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Fri, 22 May 2015 13:34:40 -0400 Subject: [PATCH 4/6] Add location icon to profiles --- app/views/users/_card.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/users/_card.html.erb b/app/views/users/_card.html.erb index 19894c23f..6eae07aae 100644 --- a/app/views/users/_card.html.erb +++ b/app/views/users/_card.html.erb @@ -8,7 +8,10 @@

<%= user.username %>

<% if user.location? %> -
<%= user.location %>
+
+ <%= inline_react_component 'Icon', icon: 'map-marker' %> + <%= user.location %> +
<% end %> From 8d6abe12550d584a772e6893027e384c0b633d27 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Fri, 22 May 2015 13:35:13 -0400 Subject: [PATCH 5/6] Reduce padding on profile bios 1 word/line and p3 whitespace is unnecessary here, --- app/views/users/_card.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_card.html.erb b/app/views/users/_card.html.erb index 6eae07aae..7e8a639ff 100644 --- a/app/views/users/_card.html.erb +++ b/app/views/users/_card.html.erb @@ -16,7 +16,7 @@ <% if user.bio? %> -
+
<%= react_component 'Markdown', content: markdown(user.bio), normalized: true %>
<% end %> From 2c1347ef1f6809cc971bcaf9766504bcd0ecaad9 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Fri, 22 May 2015 13:37:17 -0400 Subject: [PATCH 6/6] Remove comments on profile --- app/views/users/_card.html.erb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/users/_card.html.erb b/app/views/users/_card.html.erb index 7e8a639ff..6e89e7ada 100644 --- a/app/views/users/_card.html.erb +++ b/app/views/users/_card.html.erb @@ -23,7 +23,6 @@
- <% if user.staff? %> <%= inline_react_component 'Icon', icon: 'coffee' %> @@ -31,7 +30,6 @@ <% end %> - <% if user.twitter_connected? %> <%= inline_react_component 'Icon', icon: 'twitter' %> @@ -44,7 +42,6 @@ <% end %> - <% if user.github_connected? %> <%= inline_react_component 'Icon', icon: 'github' %>