From c1c7e014c543d754cd47bad6a38aa026a0bf68a3 Mon Sep 17 00:00:00 2001 From: Antonio Tapiador del Dujo Date: Fri, 24 Sep 2010 16:29:31 +0200 Subject: [PATCH] Activities views and helper --- app/helpers/activities_helper.rb | 10 +++++ app/views/activities/_activity.html.erb | 5 +++ .../activities/_activity_options.html.erb | 9 ++++ app/views/activities/_root_activity.html.erb | 45 +++++++++++++++++++ app/views/activities/_subactivity.html.erb | 23 ++++++++++ 5 files changed, 92 insertions(+) create mode 100644 app/helpers/activities_helper.rb create mode 100644 app/views/activities/_activity.html.erb create mode 100644 app/views/activities/_activity_options.html.erb create mode 100644 app/views/activities/_root_activity.html.erb create mode 100644 app/views/activities/_subactivity.html.erb diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb new file mode 100644 index 00000000..2fb6c4c9 --- /dev/null +++ b/app/helpers/activities_helper.rb @@ -0,0 +1,10 @@ +module ActivitiesHelper + + def like_activity(activity) + if (activity.liked_by?(current_user)) + link_to t('activity.unlike'), activity_like_path(activity), :method => :delete, :remote => true + else + link_to t('activity.like'), activity_like_path(activity), :method => :post, :remote => true; + end + end +end diff --git a/app/views/activities/_activity.html.erb b/app/views/activities/_activity.html.erb new file mode 100644 index 00000000..4d0ea716 --- /dev/null +++ b/app/views/activities/_activity.html.erb @@ -0,0 +1,5 @@ +<% if activity.is_root? %> + <%= render :partial => "activities/root_activity", :object => activity %> +<% else %> + <%= render :partial => "activities/subactivity", :object => activity %> +<% end %> diff --git a/app/views/activities/_activity_options.html.erb b/app/views/activities/_activity_options.html.erb new file mode 100644 index 00000000..0153ebcf --- /dev/null +++ b/app/views/activities/_activity_options.html.erb @@ -0,0 +1,9 @@ +
+ <%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %> + + +
diff --git a/app/views/activities/_root_activity.html.erb b/app/views/activities/_root_activity.html.erb new file mode 100644 index 00000000..a096007c --- /dev/null +++ b/app/views/activities/_root_activity.html.erb @@ -0,0 +1,45 @@ +<%= div_for root_activity do %> + + +
+
+ <%= link_to(root_activity.sender_subject.name, root_activity.sender_subject) %> +
+ +
+ <%= render root_activity.activity_objects %> +
+ + <%= render :partial => 'activities/activity_options', + :locals => { :activity => root_activity } %> + +
+ <%= render root_activity.comments %> +
+ +
+ <%= form_for Comment.new(:text => t('comment.write'), + :_activity_tie_id => current_tie.id, + :_activity_parent_id => root_activity.id), + :remote => true do |f| %> + <%= f.hidden_field :_activity_tie_id %> + <%= f.hidden_field :_activity_parent_id %> + <%= f.text_field :text, :class =>"input_new_comments" %> +
+
+ <%= image_submit_tag "buttons/btn_share.png" %> +
+ <% end %> +
+
+
+ +
+
+
+<% end %> diff --git a/app/views/activities/_subactivity.html.erb b/app/views/activities/_subactivity.html.erb new file mode 100644 index 00000000..c84d8767 --- /dev/null +++ b/app/views/activities/_subactivity.html.erb @@ -0,0 +1,23 @@ +<%= div_for subactivity, :class => "subactivity" do %> + + +
+
+ <%= link_to(subactivity.sender_subject.name, subactivity.sender_subject) %> + + <%= render subactivity.activity_objects %> + +
+ + <%= render :partial => 'activities/activity_options', + :locals => { :activity => subactivity } %> + +
+
+
+<% end %>