Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
fix bug 809495 - Add user ban front-end
Browse files Browse the repository at this point in the history
  • Loading branch information
darkwing committed Jun 10, 2013
1 parent 36731b1 commit c0882a1
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 1 deletion.
33 changes: 32 additions & 1 deletion apps/users/templates/users/user_banned.html
@@ -1 +1,32 @@
You have been banned.
{# vim: set ts=2 et sts=2 sw=2: #}
{% extends "users/base.html" %}
{% set title = _('You\'ve Been Banned') %}
{% set classes = 'profile' %}
{% block title %}{{ page_title(title) }}{% endblock %}

{% block content %}
<section id="content">
<div class="wrap">
<div id="content-main" class="full">
<article id="profile-banned" class="main">
<h1>{{ title }}</h1>
<p>
{{ _('You have been banned for the following reason:') }}
</p>
<ul>
{% if bans | length %}
{% for ban in bans %}
<li>{{ ban.reason }}</li>
{% endfor %}
{% endif %}
</ul>

{% trans %}
<p><a href="mailto:mdn-admins@mozilla.org?subject=Ban Appeal">Click here</a> to appeal this ban.</p>
{% endtrans %}

</article>
</div>
</div>
</section>
{% endblock %}
4 changes: 4 additions & 0 deletions apps/wiki/templates/wiki/revision.html
Expand Up @@ -38,6 +38,10 @@ <h1 class="title">{{ document.title }}</h1>
<li>
<mark>{{ _('Creator:') }}</mark>
<span>{{ revision.creator }}</span>

{% if user.has_perm('users.add_userban') and revision.creator != request.user %}
(<a href="{{ url('admin:users_userban_add') }}?user={{revision.creator.id}}&by={{request.user.id}}">Ban user</a>)
{% endif %}
</li>
<li class="revision-is-reviewed">
<mark>{{ _('Is reviewed?') }}</mark>
Expand Down
4 changes: 4 additions & 0 deletions media/css/mdn-screen.css
Expand Up @@ -1029,6 +1029,10 @@ li.tag-expert label:hover { border-color: #bbb; }
#elsewhere .remove:hover { background-position: center -48px; }
#elsewhere .errorlist { margin-left: 150px; width: 500px; }

/* @Banned User *********/
#profile-banned ul { padding-left: 22px; list-style-type: disc; }
#profile-banned ul li { line-height: 1.5em; }

/* @Error pages *********/
.beast { float: right; margin: 20px 0 20px 20px; }

Expand Down

0 comments on commit c0882a1

Please sign in to comment.