diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c7a319709..18350bee4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -22,6 +22,7 @@ class UsersController < ApplicationController def show @user = User.find(params[:id]) + @presenter = UserPresenter.new(@user) respond_with(@user) end diff --git a/app/models/user.rb b/app/models/user.rb index 6d114b7ea..f496aaed8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -30,7 +30,7 @@ class User < ActiveRecord::Base has_many :feedback, :class_name => "UserFeedback", :dependent => :destroy has_many :posts, :foreign_key => "uploader_id" has_one :ban - has_many :subscriptions, :class_name => "TagSubscription" + has_many :subscriptions, :class_name => "TagSubscription", :foreign_key => "creator_id" has_many :note_versions, :foreign_key => "updater_id" belongs_to :inviter, :class_name => "User" scope :named, lambda {|name| where(["lower(name) = ?", name])} diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index 9b3fb0e64..8776e9e57 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -5,6 +5,10 @@ class UserPresenter @user = user end + def join_date + user.created_at.strftime("%Y-%m-%d") + end + def level user.level_string end @@ -26,7 +30,7 @@ class UserPresenter def upload_limit deleted_count = Post.for_user(user.id).deleted.count pending_count = Post.for_user(user.id).pending.count - approved_count = Post.where("is_flagged = false and is_pending = false and user_id = ?", user.id).count + approved_count = Post.where("is_flagged = false and is_pending = false and uploader_id = ?", user.id).count if user.base_upload_limit limit = user.base_upload_limit - pending_count @@ -89,7 +93,7 @@ class UserPresenter if user.inviter_id template.link_to(user.inviter.name, template.user_path(user.inviter_id)) else - nil + "None" end end @@ -102,6 +106,16 @@ class UserPresenter neutral = UserFeedback.for_user(user.id).neutral.count negative = UserFeedback.for_user(user.id).negative.count - template.link_to("positive:#{positive} neutral:#{neutral} negative:#{negative}", user_feedbacks_path(:search => {:user_id_rq => user.id})) + template.link_to("positive:#{positive} neutral:#{neutral} negative:#{negative}", template.user_feedbacks_path(:search => {:user_id_rq => user.id})) + end + + def subscriptions(template) + if user.subscriptions.any? + user.subscriptions.map do |subscription| + template.link_to(subscription.name, template.posts_path(:tags => "sub:#{user.name}:#{subscription.name}")) + end.join(", ").html_safe + else + "None" + end end end diff --git a/app/views/advertisements/edit.html.erb b/app/views/advertisements/edit.html.erb index ca4e7466b..61a745a01 100644 --- a/app/views/advertisements/edit.html.erb +++ b/app/views/advertisements/edit.html.erb @@ -1,3 +1,9 @@ -<%= image_tag(@advertisement.image_url) %> -<%= render "form" %> +
+
+

Edit Advertisement

+ <%= image_tag(@advertisement.image_url) %> + <%= render "form" %> +
+
+ <%= render "secondary_links" %> diff --git a/app/views/advertisements/index.html.erb b/app/views/advertisements/index.html.erb index 17a5381db..3ee38a416 100644 --- a/app/views/advertisements/index.html.erb +++ b/app/views/advertisements/index.html.erb @@ -1,22 +1,26 @@ -

Advertisements

+
+
+

Advertisements

- - - - - - - - - - <% @advertisements.each do |advertisement| %> - - - - - - <% end %> - -
Hits
<%= image_tag(advertisement.image_url, :width => advertisement.preview_width, :height => advertisement.preview_height) %><%= advertisement.hits.between(@start_date, @end_date).count %><%= link_to "Edit", edit_advertisement_path(advertisement) %>
+ + + + + + + + + + <% @advertisements.each do |advertisement| %> + + + + + + <% end %> + +
Hits
<%= image_tag(advertisement.image_url, :width => advertisement.preview_width, :height => advertisement.preview_height) %><%= advertisement.hits.between(@start_date, @end_date).count %><%= link_to "Edit", edit_advertisement_path(advertisement) %>
+
+
<%= render "secondary_links" %> diff --git a/app/views/advertisements/new.html.erb b/app/views/advertisements/new.html.erb index 319fd8451..0bf018729 100644 --- a/app/views/advertisements/new.html.erb +++ b/app/views/advertisements/new.html.erb @@ -1,3 +1,9 @@ -<%= error_messages_for :advertisement %> -<%= render "form" %> +
+
+

New Advertisement

+ <%= error_messages_for :advertisement %> + <%= render "form" %> +
+
+ <%= render "secondary_links" %> diff --git a/app/views/advertisements/show.html.erb b/app/views/advertisements/show.html.erb index 302d08888..0248fc5ca 100644 --- a/app/views/advertisements/show.html.erb +++ b/app/views/advertisements/show.html.erb @@ -1,7 +1,14 @@ -
<%= image_tag(@advertisement.image_url, :width => @advertisement.preview_width, :height => @advertisement.preview_height) %>
+
+
+

Show Advertisement

+ + <%= image_tag(@advertisement.image_url, :width => @advertisement.preview_width, :height => @advertisement.preview_height) %> + + +
+
- <%= render "secondary_links" %> diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb index 9de28e6bc..003ef1a7d 100644 --- a/app/views/artists/index.html.erb +++ b/app/views/artists/index.html.erb @@ -1,5 +1,7 @@
+

Artists

+ diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb index 11f8196fa..6f15f1670 100644 --- a/app/views/bans/index.html.erb +++ b/app/views/bans/index.html.erb @@ -1,5 +1,7 @@
+

Bans

+
diff --git a/app/views/comments/index_by_comment.html.erb b/app/views/comments/index_by_comment.html.erb index 1360609df..b91a566ac 100644 --- a/app/views/comments/index_by_comment.html.erb +++ b/app/views/comments/index_by_comment.html.erb @@ -1,5 +1,7 @@
+

Comments

+
<% @comments.each do |comment| %> diff --git a/app/views/comments/search.html.erb b/app/views/comments/search.html.erb index f287ed913..9b514fca1 100644 --- a/app/views/comments/search.html.erb +++ b/app/views/comments/search.html.erb @@ -1,6 +1,7 @@