diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index c6ecb1d3..82444bb9 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -682,7 +682,8 @@ table.admin_panel { } table.admin_side_panel { - width: 60% + width: 90%; + margin-bottom: 10px; } table.admin_panel th, table.admin_side_panel th { @@ -859,6 +860,12 @@ pre { .header_right { float: none; } + + .return_to_panel { + float: none; + width: 100%; + text-align: center; + } } /* Exif display */ diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html index 6335ea12..efbaa0a1 100644 --- a/mediagoblin/templates/mediagoblin/moderation/user.html +++ b/mediagoblin/templates/mediagoblin/moderation/user.html @@ -34,6 +34,14 @@ {% endblock %} {% block mediagoblin_content -%} +
+ + {% trans %}Return to Users Panel{% endtrans %} +
+
+
{# If no user... #} {% if not user %}

{% trans %}Sorry, no such user found.{% endtrans %}

@@ -52,120 +60,108 @@ {# Active(?) (or at least verified at some point) user, horray! #} {% else %} - - {% trans %}Return to Users Panel{% endtrans %} -

- {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} - {% if user_banned and user_banned.expiration_date %} - — {% trans expiration_date=user_banned.expiration_date -%} - BANNED until {{ expiration_date }} - {%- endtrans %} - {% elif user_banned %} - — {% trans %}Banned Indefinitely{% endtrans %} - {% endif %} -

- {% if not user.url and not user.bio %} -
-

- {% trans -%} - This user hasn't filled in their profile (yet). - {%- endtrans %} -

- {% else %} -
- {% include "mediagoblin/utils/profile.html" %} - {% if request.user and - (request.user.id == user.id or request.user.has_privilege('admin')) %} - - {%- trans %}Edit profile{% endtrans -%} - +

+ {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} + {% if user_banned and user_banned.expiration_date %} + — {% trans expiration_date=user_banned.expiration_date -%} + BANNED until {{ expiration_date }} + {%- endtrans %} + {% elif user_banned %} + — {% trans %}Banned Indefinitely{% endtrans %} {% endif %} - {% endif %} -

- - {%- trans %}Browse collections{% endtrans -%} - -

-

- {% endif %} - {% if user %} -

- {%- trans username=user.username -%} - Active Reports on {{ username }} - {%- endtrans -%} -

- {% if reports.count() %} - - - - - - - {% for report in reports %} - - - - - - - {% endfor %} - -
{%- trans %}Report ID{% endtrans -%}{%- trans %}Reported Content{% endtrans -%}{%- trans %}Description of Report{% endtrans -%}
- - - {%- trans report_number=report.id -%} - Report #{{ report_number }} - {%- endtrans -%} - - - {% if report.discriminator == "comment_report" %} - {%- trans %}Reported Comment{% endtrans -%} - {% elif report.discriminator == "media_report" %} - {%- trans %}Reported Media Entry{% endtrans -%} + + {% if not user.url and not user.bio %} +
+

+ {% trans -%} + This user hasn't filled in their profile (yet). + {%- endtrans %} +

+ {% else %} +
+ {% include "mediagoblin/utils/profile.html" %} + {% if request.user and + (request.user.id == user.id or request.user.has_privilege('admin')) %} + + {%- trans %}Edit profile{% endtrans -%} + {% endif %} -
{{ report.report_content[:21] }} - {% if report.report_content|count >20 %}...{% endif %}{%- trans %}Resolve{% endtrans -%}
- {% else %} - {%- trans username=user.username -%} - No active reports filed on {{ username }} - {%- endtrans -%} - {% endif %} - - - {%- trans - username=user.username %}All reports on {{ username }}{% endtrans %} - · - - {%- trans username=user.username -%} - All reports that {{ username }} has filed - {%- endtrans %} - - + {% endif %} +

+ + {%- trans %}Browse collections{% endtrans -%} + +

+
+ {% endif %} +
+ {% if user %} +
+

+ {%- trans username=user.username -%} + Active Reports on {{ username }} + {%- endtrans -%} +

+ {% if reports.count() %} + + + + + + + {% for report in reports %} + + + + + + + {% endfor %} + +
{%- trans %}Report ID{% endtrans -%}{%- trans %}Reported Content{% endtrans -%}{%- trans %}Description of Report{% endtrans -%}
+ + + {%- trans report_number=report.id -%} + Report #{{ report_number }} + {%- endtrans -%} + + + {% 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 -%}
+ {% else %} + {%- trans username=user.username -%} + No active reports filed on {{ username }} + {%- endtrans -%} + {% endif %} +

+ + + {%- trans + username=user.username %}All reports on {{ username }}{% endtrans %} + · + + {%- trans username=user.username -%} + All reports that {{ username }} has filed + {%- endtrans %} + + +

+
+
+

{% trans username=user.username -%} {{ username }}'s Privileges{% endtrans %}

-
- {{ csrf_token }} - {% if request.user.has_privilege('admin') and not user_banned and - not user.id == request.user.id %} - {{ wtforms_util.render_divs(ban_form) }} - - {% elif request.user.has_privilege('admin') and - not user.id == request.user.id %} - - {% endif %} -
+
@@ -202,6 +198,25 @@ {{ csrf_token }}
+
+
+
+ {{ csrf_token }} + {% if request.user.has_privilege('admin') and not user_banned and + not user.id == request.user.id %} + {{ wtforms_util.render_divs(ban_form) }} + + {% elif request.user.has_privilege('admin') and + not user.id == request.user.id %} + + {% endif %} +
+
{% endif %} +
{% endblock %}