{% trans %}Report panel{% endtrans %}
- -- {% trans %}Here you can look up users in order to take punitive actions on them.{% endtrans %} -
- -{% trans %}Reports Filed on Comments{% endtrans %}
- -{% if report_list.count() %} -| ID | -Report Type | -Offender | -When Reported | -Reported By | -Reason | -Reported Comment or Media Entry | -|||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ report.id }} | -Comment Report | -{{ report.comment.get_author.username }} | -{{ report.created.strftime("%F %R") }} | -{{ report.reporter.username }} | -{{ report.report_content }} | -{{ report.comment.get_media_entry.title }} | - {% elif report.discriminator == "media_report" %} -{{ report.id }} | -Media Report | -{{ report.media_entry.get_uploader.username }} | -{{ report.created.strftime("%F %R") }} | -{{ report.reporter.username }} | -{{ report.report_content[0:20] }}... | -{{ report.media_entry.title }} | - {% endif %} -
{% trans %}No open reports found.{% endtrans %}
+Report #{{ report.id }}
+ {% if comment %} + Reported comment: + {% set reported_user = comment.get_author %} +
+
+ {% elif media_entry %}
+
+  }})
+
+ {{- reported_user.username -}}
+
+
+
+ {%- trans formatted_time=timesince(comment.created) -%}
+ {{ formatted_time }} ago
+ {%- endtrans -%}
+ :
+
+
+
+ {{- reported_user.username -}}
+
+
+
+ {%- trans formatted_time=timesince(comment.created) -%}
+ {{ formatted_time }} ago
+ {%- endtrans -%}
+ :
+
+ {% autoescape False %}
+ {{ comment.content_html }}
+ {% endautoescape %}
+
+
+ 
+ {{ media_entry.title }}
+
+
+ {% endif %}
+ Reason for report:
+
+
{% endif %}
-
+  }})
+
+ {{- report.reporter.username -}}
+
+
+
+ {%- trans formatted_time=timesince(report.created) -%}
+ {{ formatted_time }} ago
+ {%- endtrans -%}
+
+
+
+
+
+ {{- report.reporter.username -}}
+
+
+
+ {%- trans formatted_time=timesince(report.created) -%}
+ {{ formatted_time }} ago
+ {%- endtrans -%}
+
+
+
+ {{ report.report_content }}
+
+ {% trans %}Closed Reports on Comments{% endtrans %}
-{% if closed_report_list.count() %} -| ID | -Offender | -When Reported | -Reported By | -Reason | -Comment Posted On | -
|---|---|---|---|---|---|
| {{ report.id }} | -{{ report.comment.get_author.username }} | -{{ report.created.strftime("%F %R") }} | -{{ report.reporter.username }} | -{{ report.report_content }} | -{{ report.comment.get_media_entry.title }} | -
{% trans %}No closed reports found.{% endtrans %}
-{% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/admin/report_panel.html b/mediagoblin/templates/mediagoblin/admin/report_panel.html new file mode 100644 index 00000000..30194577 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/admin/report_panel.html @@ -0,0 +1,95 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see{% trans %}Report panel{% endtrans %}
+ ++ {% trans %}Here you can look up users in order to take punitive actions on them.{% endtrans %} +
+ +{% trans %}Reports Filed on Comments{% endtrans %}
+ +{% if report_list.count() %} +| ID | +Report Type | +Offender | +When Reported | +Reported By | +Reason | +Reported Comment or Media Entry | +|||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ report.id }} | +Comment Report | +{{ report.comment.get_author.username }} | +{{ report.created.strftime("%F %R") }} | +{{ report.reporter.username }} | +{{ report.report_content }} | +{{ report.comment.get_media_entry.title }} | + {% elif report.discriminator == "media_report" %} +{{ report.id }} | +Media Report | +{{ report.media_entry.get_uploader.username }} | +{{ report.created.strftime("%F %R") }} | +{{ report.reporter.username }} | +{{ report.report_content[0:20] }}... | +{{ report.media_entry.title }} | + {% endif %} +
{% trans %}No open reports found.{% endtrans %}
+{% endif %} +{% trans %}Closed Reports on Comments{% endtrans %}
+{% if closed_report_list.count() %} +| ID | +Offender | +When Reported | +Reported By | +Reason | +Comment Posted On | +
|---|---|---|---|---|---|
| {{ report.id }} | +{{ report.comment.get_author.username }} | +{{ report.created.strftime("%F %R") }} | +{{ report.reporter.username }} | +{{ report.report_content }} | +{{ report.comment.get_media_entry.title }} | +
{% trans %}No closed reports found.{% endtrans %}
+{% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/admin/user.html b/mediagoblin/templates/mediagoblin/admin/user.html index 6b6d226a..90b3f583 100644 --- a/mediagoblin/templates/mediagoblin/admin/user.html +++ b/mediagoblin/templates/mediagoblin/admin/user.html @@ -17,38 +17,121 @@ #} {% extends "mediagoblin/base.html" %} -{% block title -%} - {% trans %}User panel{% endtrans %} — {{ super() }} -{%- endblock %} -{% block mediagoblin_content %} - -{% trans %}User panel{% endtrans %}
- -- {% trans %}Here you can look up users in order to take punitive actions on them.{% endtrans %} -
- -{% trans %}Active Users{% endtrans %}
- -{% if user_list.count() %} -| ID | -Username | -When Joined | -# of Comments Posted | -
|---|---|---|---|
| {{ user.id }} | -{{ user.username }} | -{{ user.created.strftime("%F %R") }} | -{{ user.posted_comments.count() }} | -
{% trans %}No users found.{% endtrans %}
-{% endif %} +{% block title %} + {%- if user -%} + {%- trans username=user.username -%} + User: {{ username }} + {%- endtrans %} — {{ super() }} + {%- else -%} + {{ super() }} + {%- endif -%} +{% endblock %} + + +{% block mediagoblin_content -%} + {# If no user... #} + {% if not user %} +{% trans %}Sorry, no such user found.{% endtrans %}
+ + {# User exists, but needs verification #} + {% elif user.status == "needs_email_verification" %} +
+
+
+ {# Active(?) (or at least verified at some point) user, horray! #}
+ {% else %}
+ {% trans %}Email verification needed{% endtrans %}
+ ++ {% trans -%} + Someone has registered an account with this username, but it still has to be activated. + {%- endtrans %} +
+ ++ {% trans login_url=request.urlgen('mediagoblin.auth.login') -%} + If you are that person but you've lost your verification email, you can log in and resend it. + {%- endtrans %} +
++ {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} +
+ + {% if not user.url and not user.bio %} +
+
+
+ {% else %}
+ {%- trans %}No active reports filed on{% endtrans -%} {{ user.username }}
+ {% endif %}
+ {{ user.username }}'s report history
+
+
+
+ {% endif %}
{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/admin/user_panel.html b/mediagoblin/templates/mediagoblin/admin/user_panel.html
new file mode 100644
index 00000000..cc965b73
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/admin/user_panel.html
@@ -0,0 +1,55 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+{% else %}
+
+ {% trans -%} + This user hasn't filled in their profile (yet). + {%- endtrans %} +
+ {% else %} + + {% endif %} + {% if user %} +{%- trans %}Active Reports on{% endtrans -%} {{ user.username }}
+ {% if reports.count() %} +| {%- trans %}Report ID{% endtrans -%} | +{%- trans %}Reported Content{% endtrans -%} | +{%- trans %}Description of Report{% endtrans -%} | +|
|---|---|---|---|
|
+
+
+ {%- trans %}Report #{% endtrans -%}{{ report.id }}
+
+ |
+ + {% if report.discriminator == "comment_report" %} + {%- trans %}Reported Comment{% endtrans -%} + {% elif report.discriminator == "media_report" %} + {%- trans %}Reported Media Entry{% endtrans -%} + {% endif %} + | +{{ report.report_content[:21] }}{% if report.report_content|count >20 %}...{% endif %} | +{%- trans %}Resolve{% endtrans -%} | +
| + |
{{ user.username }}'s Privileges
+| {% trans %}Privilege{% endtrans %} | +{% trans %}User Has Privilege{% endtrans %} | + {% for privilege in privileges %} +|
|---|---|---|
| {{ privilege.privilege_name }} | +{% if privilege in user.all_privileges %}Yes{% else %}No{% endif %} | +{% if privilege in user.all_privileges and privilege.id < request.user.get_highest_privilege().id %}{% trans %}Take Away{% endtrans %}{% else %}{% trans %}Give Privilege{% endtrans %}{% endif %} | +
{% trans %}User panel{% endtrans %}
+ ++ {% trans %}Here you can look up users in order to take punitive actions on them.{% endtrans %} +
+ +{% trans %}Active Users{% endtrans %}
+ +{% if user_list.count() %} +| {% trans %}ID{% endtrans %} | +{% trans %}Username{% endtrans %} | +{% trans %}When Joined{% endtrans %} | +{% trans %}# of Comments Posted{% endtrans %} | +
|---|---|---|---|
| {{ user.id }} | +{{ user.username }} | +{{ user.created.strftime("%F %R") }} | +{{ user.posted_comments.count() }} | +
{% trans %}No users found.{% endtrans %}
+{% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 6c7c07d0..e9a18f22 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -104,7 +104,7 @@ {% if request.user.is_admin %}Admin powers: - + {%- trans %}Media processing panel{% endtrans -%}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 134a80ad..1e64ae07 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -95,17 +95,6 @@ {% trans %}Add a comment{% endtrans %} {% endif %} - - {% trans %}Report media{% endtrans %} - {% if request.user %} . +#} + +{% block report_content -%} + +{% endblock %} diff --git a/mediagoblin/user_pages/lib.py b/mediagoblin/user_pages/lib.py index 557c4853..2558b066 100644 --- a/mediagoblin/user_pages/lib.py +++ b/mediagoblin/user_pages/lib.py @@ -19,7 +19,8 @@ from mediagoblin.tools.template import render_template from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin import mg_globals from mediagoblin.db.base import Session -from mediagoblin.db.models import CollectionItem, MediaReport, CommentReport +from mediagoblin.db.models import (CollectionItem, MediaReport, CommentReport, + MediaComment, MediaEntry) from mediagoblin.user_pages import forms as user_forms @@ -99,9 +100,13 @@ def build_report_form(form_dict): if report_form.validate() and 'comment_id' in form_dict.keys(): report_model = CommentReport() report_model.comment_id = report_form.comment_id.data + report_model.reported_user_id = MediaComment.query.get( + report_model.comment_id).get_author.id elif report_form.validate() and 'media_entry_id' in form_dict.keys(): report_model = MediaReport() report_model.media_entry_id = report_form.media_entry_id.data + report_model.reported_user_id = MediaEntry.query.get( + report_model.media_entry_id).get_uploader.id else: return None