Merge branch 'master' of https://github.com/theinterned/batucada

apps/activity/urls.py

@@ -13,5 +13,8 @@ urlpatterns = patterns('',
     url(r'^projects/(?P<project>[\w-]+)/feed$', feeds.ProjectActivityFeed(),
         name='activity_project_feed'),
     url(r'^feed$', feeds.DashboardFeed(),
-        name='activity_dashboard_feed'),
+        name='activity_dashboard_feed'),	
+	url(r'^activity/report/$',
+		'django.views.generic.simple.direct_to_template', {'template': 'activity/report_received.html'},
+		name='activity_report')
 )

media/css/batucada.css

@@ -992,36 +992,30 @@ header {}
       height: 1px;
       line-height: 1px;
     }
-    
-    #posts .reply-to {
-      display: none;
+    #posts .action {
+	  display: none;
       float: right;
       color: #ababab;
       text-decoration: none;
       padding-left: 20px;
-      background: url("/media/images/reply.icon.png") no-repeat left 1px;
+      margin-left: 18px;
+      left: 1px;
       height: 16px;
       line-height: 16px;
-    }
-    #posts .delete {
-	display: none;
-	float: right;
-	color: #ababab;
-	text-decoration: none;
-	padding-right: 7px;
-	height: 16px;
-	line-height: 16px;
-    }
-    #posts .post-container:hover .reply-to {
-      display: block;
-    }
-    #posts .post-container:hover .delete {
-	display: block;
-    }
-    #posts .reply-to:hover {
+	}
+    #posts .action:hover {
       color: #777;
     }
-    #posts .delete:hover {
+	#posts .post-container:hover .action{
+		display: block;
+	}
+    #posts .reply-to{
+		background: url("/media/images/reply.icon.png") 0 0 no-repeat;
+	}
+	#posts .report {
+		background: url("/media/images/report.icon.png") 5px 1px no-repeat 
+	}
+    #posts .action:hover {
       color: #777;
     }
     

templates/activity/_activity_resource.html

@@ -1,7 +1,9 @@
 {% load l10n_tags %}
 
 <li class="post-container">
-
+  {% if user.is_authenticated %}
+  <a class="report abuse action" href="{% locale_url activity_report %}">{{_('Report Abuse')}}</a>
+ {% endif %}
   <a href="{{ activity.actor.get_absolute_url }}">
     <img class="member-picture" width="54" height="54" src="{{ MEDIA_URL }}{{ activity.actor.image_or_default }}">
   </a>

templates/activity/report_received.html

@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% load l10n_tags %}
+
+{% block title %}{{ _('Abuse Report Received') }}{% endblock %}
+{% block bodyclasses %}signin report{% endblock %}
+{% block body %}
+<section class="modal">
+  <article>
+    <h1>{{ _('Report Abuse') }}</h1>
+    <fieldset>
+      <h2>{{ _('Thank You,') }}</h2>
+      <p>{{ _('We have received your report and will investigate further.') }}
+    </fieldset>
+  </article>
+</section>
+{% include "_footer.html" %}
+{% endblock %}

templates/drumbeatmail/inbox.html

@@ -45,7 +45,8 @@
     {% for message in inbox %}
     <li class="post-container">
       {% if message.sender != user %}
-      <a href="{% locale_url drumbeatmail_reply message=message.id %}" class="reply-to">{{ _('Reply') }}</a>
+      <a href="{% locale_url drumbeatmail_reply message=message.id %}" class="reply-to action">{{ _('Reply') }}</a>
+      <a class="report abuse action" href="{% locale_url activity_report %}">{{_('Report Abuse')}}</a>
       {% endif %}
       
       {% if message.sender == user %}
@@ -92,6 +93,7 @@
       <li class="post-container">
 	{% if reply_url %}
 	  <a href="${reply_url}" class="reply-to">{{ _('Reply') }}</a>
+	  <a class="report abuse action" href="{% locale_url activity_report %}">{{_('Report Abuse')}}</a>
 	{% endif %}
 	<a href="${sender_url}">
 	  <img class="member-picture" width="54" height="54" src="{{ MEDIA_URL }}${sender_img}">