From 15e2ca815de0c719700d3dff1b90e3c96d71ed57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Tue, 3 Nov 2015 14:34:04 +0100
Subject: [PATCH] adds activity page with user's proposals

---
 app/views/users/_activity_page.html.erb |  4 ++++
 app/views/users/_comments.html.erb      |  0
 app/views/users/_debates.html.erb       |  0
 app/views/users/_proposals.html.erb     | 13 +++++++++++++
 app/views/users/show.html.erb           |  4 +++-
 5 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_activity_page.html.erb
 create mode 100644 app/views/users/_comments.html.erb
 create mode 100644 app/views/users/_debates.html.erb
 create mode 100644 app/views/users/_proposals.html.erb

diff --git a/app/views/users/_activity_page.html.erb b/app/views/users/_activity_page.html.erb
new file mode 100644
index 000000000..0b39ad241
--- /dev/null
+++ b/app/views/users/_activity_page.html.erb
@@ -0,0 +1,4 @@
+<%= render "proposals" if @proposals.present? %>
+<%= render "debates" if @debates.present? %>
+<%= render "comments" if @comments.present? %>
+
diff --git a/app/views/users/_comments.html.erb b/app/views/users/_comments.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/users/_debates.html.erb b/app/views/users/_debates.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb
new file mode 100644
index 000000000..d2adebed0
--- /dev/null
+++ b/app/views/users/_proposals.html.erb
@@ -0,0 +1,13 @@
+<table class="clear">
+  <% @proposals.each do |proposal| %>
+    <tr id="proposal_<%= proposal.id %>">
+      <td>
+        <%= link_to proposal.title, proposal %>
+        <br/>
+        <%= proposal.summary %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= paginate @proposals %>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8850a3586..133592150 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -12,4 +12,6 @@
     <% end %>
   <% end %>
   <%= t("users.show.no_activity") if @activity_counts.values.inject(&:+) == 0 %>
-</dl>
\ No newline at end of file
+</dl>
+
+<%= render "activity_page" %>
\ No newline at end of file