diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 5b386803..040aca5a 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1176,7 +1176,19 @@ a.tag:hover { padding-top: 0px; padding-bottom: 4px; } - .dropdown-submenu .dropdown-menu { width: 1px; +} +.fa-heart { + font-size: 0.7em; + color: #e93250; + vertical-align: .45em; + margin-left: -.15em; +} +.fa-user { + margin-right: 0.25em; + display: inline; + font-size: 10px; + vertical-align: .1em; + margin-left: .1em; } \ No newline at end of file diff --git a/sass/_project-sass/_project-Website-Gallery.scss b/sass/_project-sass/_project-Website-Gallery.scss index 17eb828f..42629051 100644 --- a/sass/_project-sass/_project-Website-Gallery.scss +++ b/sass/_project-sass/_project-Website-Gallery.scss @@ -37,10 +37,6 @@ width: 28%; text-align: right; } - .fa-user { - margin-right: .45em; - display: inline; - } .site-tags { width: 100%; height: 1.4em; @@ -50,6 +46,9 @@ .site-tags .fa-tag { vertical-align: -2px; } + .fa-user { + margin-right: .45em; + } } .title { margin-top: 8px; diff --git a/views/_news.erb b/views/_news.erb index 9a735e5a..ddd38a5c 100644 --- a/views/_news.erb +++ b/views/_news.erb @@ -18,13 +18,13 @@
- <% actioning_site = event.actioning_site_dataset.select(:id, :username, :title, :domain).first %> - <% event_site = event.site_dataset.select(:id, :username, :title, :domain).first %> + <% actioning_site = event.actioning_site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %> + <% event_site = event.site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %> <% if current_site && current_site.id == actioning_site.id %> You <% else %> - <%= actioning_site.username %> + <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> <% end %> started following @@ -32,7 +32,7 @@ <% if current_site && event_site.id == current_site.id %> your site! <% else %> - <%= event_site.username %> + <% if event_site.supporter? && !event_site.ended_supporter? %><% end %><%= event_site.username %> <% end %> @@ -86,10 +86,10 @@
<% event.comments.each do |comment| %> - <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username).first %> + <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
- <%= comment_actioning_site.username %> + <% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><% end %><%= comment_actioning_site.username %> <%= comment.created_at.ago %> diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb index fbf3d6d9..69fc1028 100644 --- a/views/_news_profile_comment.erb +++ b/views/_news_profile_comment.erb @@ -1,5 +1,5 @@ -<% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username).first %> -<% site = profile_comment.site_dataset.select(:id, :username).first %> +<% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username, :stripe_customer_id).first %> +<% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id).first %>
@@ -7,14 +7,14 @@ <% if current_site && current_site.id == actioning_site.id && request.path == '/' %> You <% else %> - <%= actioning_site.username %> + <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> <% end %> <% if request.path == '/' %> <% if current_site && current_site.id == profile_comment.site_id %> left a comment on your profile: <% else %> - left a comment on <%= profile_comment.site.username %><%= site.username[site.username.length-1] == 's' ? "'" : "'s" %> site profile: + left a comment on <% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><% end %><%= profile_comment.site.username %><%= site.username[site.username.length-1] == 's' ? "’" : "'s" %> profile: <% end %> <% end %> diff --git a/views/browse.erb b/views/browse.erb index 7602fea6..0e60b639 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -74,7 +74,7 @@