heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

realign the user admin page

Browse Source
This commit is contained in:
jpope 2014-01-06 18:18:52 -06:00
parent 45842f840f
commit a054ab3d5a
2 changed files with 134 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/static/css/base.css
View File

@ -682,7 +682,8 @@ table.admin_panel {
} }
table.admin_side_panel { table.admin_side_panel {
width: 60% width: 90%;
margin-bottom: 10px;
} }
table.admin_panel th, table.admin_side_panel th { table.admin_panel th, table.admin_side_panel th {
@ -859,6 +860,12 @@ pre {
.header_right { .header_right {
float: none; float: none;
} }
.return_to_panel {
float: none;
width: 100%;
text-align: center;
}
} }
/* Exif display */ /* Exif display */

58
mediagoblin/templates/mediagoblin/moderation/user.html
View File

@ -34,6 +34,14 @@
{% endblock %} {% endblock %}
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
<div class="row">
<a href="{{ request.urlgen('mediagoblin.moderation.users') }}"
class="return_to_panel button_action"
title="Return to Users Panel">
{% trans %}Return to Users Panel{% endtrans %}</a>
</div>
<div class="row">
<div class="eight columns">
{# If no user... #} {# If no user... #}
{% if not user %} {% if not user %}
<p>{% trans %}Sorry, no such user found.{% endtrans %}</p> <p>{% trans %}Sorry, no such user found.{% endtrans %}</p>
@ -52,10 +60,6 @@
{# Active(?) (or at least verified at some point) user, horray! #} {# Active(?) (or at least verified at some point) user, horray! #}
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.moderation.users') }}"
class="return_to_panel button_action"
title="Return to Users Panel">
{% trans %}Return to Users Panel{% endtrans %}</a>
<h1> <h1>
{%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
{% if user_banned and user_banned.expiration_date %} {% if user_banned and user_banned.expiration_date %}
@ -92,7 +96,9 @@
</p> </p>
</div> </div>
{% endif %} {% endif %}
</div>
{% if user %} {% if user %}
<div class="eight columns">
<h2> <h2>
{%- trans username=user.username -%} {%- trans username=user.username -%}
Active Reports on {{ username }} Active Reports on {{ username }}
@ -135,7 +141,8 @@
No active reports filed on {{ username }} No active reports filed on {{ username }}
{%- endtrans -%} {%- endtrans -%}
{% endif %} {% endif %}
<span class="right_align"> <p>
<span>
<a href="{{ request.urlgen( <a href="{{ request.urlgen(
'mediagoblin.moderation.reports') }}?reported_user={{user.id}}"> 'mediagoblin.moderation.reports') }}?reported_user={{user.id}}">
{%- trans {%- trans
@ -148,24 +155,13 @@
{%- endtrans %}</a> {%- endtrans %}</a>
</span> </span>
<span class=clear></span> <span class=clear></span>
</p>
</div>
</div>
<div class="row hell">
<h2>{% trans username=user.username -%} <h2>{% trans username=user.username -%}
{{ username }}'s Privileges{% endtrans %}</h2> {{ username }}'s Privileges{% endtrans %}</h2>
<form method=POST action="{{ request.urlgen( <div class="eight columns">
'mediagoblin.moderation.ban_or_unban',
user=user.username) }}" class="right_align">
{{ 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) }}
<input type=submit class="button_action"
value="{% trans %}Ban User{% endtrans %}"
id="ban_user_submit" />
{% elif request.user.has_privilege('admin') and
not user.id == request.user.id %}
<input type=submit class="button_action right_align"
value="{% trans %}UnBan User{% endtrans %}" />
{% endif %}
</form>
<form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege', <form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege',
user=user.username) }}" user=user.username) }}"
method=post > method=post >
@ -202,6 +198,25 @@
{{ csrf_token }} {{ csrf_token }}
<input type=hidden name=privilege_name id=hidden_privilege_name /> <input type=hidden name=privilege_name id=hidden_privilege_name />
</form> </form>
</div>
<div class="eight columns">
<form method=POST action="{{ request.urlgen(
'mediagoblin.moderation.ban_or_unban',
user=user.username) }}">
{{ 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) }}
<input type=submit class="button_action"
value="{% trans %}Ban User{% endtrans %}"
id="ban_user_submit" />
{% elif request.user.has_privilege('admin') and
not user.id == request.user.id %}
<input type=submit class="button_action"
value="{% trans %}UnBan User{% endtrans %}" />
{% endif %}
</form>
</div>
{% endif %} {% endif %}
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -214,4 +229,5 @@ $(document).ready(function(){
}); });
}); });
</script> </script>
</div><!--whoami-->
{% endblock %} {% endblock %}